From c4ed56660230a124fa3457cd5f789e78a3188515 Mon Sep 17 00:00:00 2001 From: athenian200 Date: Wed, 20 May 2020 23:25:37 -0500 Subject: Revert "Merge pull request #1357 from athenian200/form-disabled-issue" This reverts commit ed88b99849156004c04e4a0c87ea9b2360ef19b6, reversing changes made to c4b0715baaffc541670fd1158557aa7e61e521d3. --- layout/generic/nsFrame.cpp | 13 ------------- layout/generic/nsIFrame.h | 5 ----- 2 files changed, 18 deletions(-) (limited to 'layout/generic') diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp index 95420d0d5..07cdbd7e3 100644 --- a/layout/generic/nsFrame.cpp +++ b/layout/generic/nsFrame.cpp @@ -5598,19 +5598,6 @@ nsFrame::Reflow(nsPresContext* aPresContext, NS_FRAME_SET_TRUNCATION(aStatus, aReflowInput, aDesiredSize); } -bool -nsIFrame::IsContentDisabled() const -{ - // FIXME(emilio): Doing this via CSS means callers must ensure the style is up - // to date, and they don't! - if (StyleUserInterface()->mUserInput == StyleUserInput::None) { - return true; - } - - auto* element = nsGenericHTMLElement::FromContentOrNull(GetContent()); - return element && element->IsDisabled(); -} - nsresult nsFrame::CharacterDataChanged(CharacterDataChangeInfo* aInfo) { diff --git a/layout/generic/nsIFrame.h b/layout/generic/nsIFrame.h index bfe5d4118..82bcf563a 100644 --- a/layout/generic/nsIFrame.h +++ b/layout/generic/nsIFrame.h @@ -2424,11 +2424,6 @@ public: */ nsIWidget* GetNearestWidget(nsPoint& aOffset) const; - /** - * Whether the content for this frame is disabled, used for event handling. - */ - bool IsContentDisabled() const; - /** * Get the "type" of the frame. May return nullptr. * -- cgit v1.2.3