diff options
| author | athenian200 <athenian200@outlook.com> | 2020-05-20 23:25:37 -0500 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-05-23 16:10:40 +0200 |
| commit | c4ed56660230a124fa3457cd5f789e78a3188515 (patch) | |
| tree | 0edc55305d449c3851ecc2ad1df8961cc2df7a3b /layout/base/nsCaret.cpp | |
| parent | 99c2e698d2a3c56649e42d8d2133706cd8c9501e (diff) | |
| download | UXP-c4ed56660230a124fa3457cd5f789e78a3188515.tar UXP-c4ed56660230a124fa3457cd5f789e78a3188515.tar.gz UXP-c4ed56660230a124fa3457cd5f789e78a3188515.tar.lz UXP-c4ed56660230a124fa3457cd5f789e78a3188515.tar.xz UXP-c4ed56660230a124fa3457cd5f789e78a3188515.zip | |
Revert "Merge pull request #1357 from athenian200/form-disabled-issue"
This reverts commit ed88b99849156004c04e4a0c87ea9b2360ef19b6, reversing
changes made to c4b0715baaffc541670fd1158557aa7e61e521d3.
Diffstat (limited to 'layout/base/nsCaret.cpp')
| -rw-r--r-- | layout/base/nsCaret.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/layout/base/nsCaret.cpp b/layout/base/nsCaret.cpp index 8396726c6..eca22f3ba 100644 --- a/layout/base/nsCaret.cpp +++ b/layout/base/nsCaret.cpp @@ -511,7 +511,7 @@ nsCaret::GetPaintGeometry(nsRect* aRect) CheckSelectionLanguageChange(); int32_t frameOffset; - nsIFrame* frame = GetFrameAndOffset(GetSelectionInternal(), + nsIFrame *frame = GetFrameAndOffset(GetSelectionInternal(), mOverrideContent, mOverrideOffset, &frameOffset); if (!frame) { return nullptr; @@ -521,7 +521,8 @@ nsCaret::GetPaintGeometry(nsRect* aRect) const nsStyleUserInterface* userinterface = frame->StyleUserInterface(); if ((!mIgnoreUserModify && userinterface->mUserModify == StyleUserModify::ReadOnly) || - frame->IsContentDisabled()){ + userinterface->mUserInput == StyleUserInput::None || + userinterface->mUserInput == StyleUserInput::Disabled) { return nullptr; } |