summaryrefslogtreecommitdiffstats
path: root/layout/base
diff options
context:
space:
mode:
authorathenian200 <athenian200@outlook.com>2020-01-16 14:07:04 -0600
committerathenian200 <athenian200@outlook.com>2020-01-16 14:07:04 -0600
commit42e48167713abfa3c1f11274179b489bb6369b57 (patch)
tree31ceba32e850ac856b09838c89e61e27df1538f0 /layout/base
parente4c4c20e7e539d891c3f10b6ef5608c08699c077 (diff)
downloadUXP-42e48167713abfa3c1f11274179b489bb6369b57.tar
UXP-42e48167713abfa3c1f11274179b489bb6369b57.tar.gz
UXP-42e48167713abfa3c1f11274179b489bb6369b57.tar.lz
UXP-42e48167713abfa3c1f11274179b489bb6369b57.tar.xz
UXP-42e48167713abfa3c1f11274179b489bb6369b57.zip
Issue #1356 - Remove -moz-user-input disabled to improve event handling.
Diffstat (limited to 'layout/base')
-rw-r--r--layout/base/nsCaret.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/layout/base/nsCaret.cpp b/layout/base/nsCaret.cpp
index eca22f3ba..8396726c6 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,8 +521,7 @@ nsCaret::GetPaintGeometry(nsRect* aRect)
const nsStyleUserInterface* userinterface = frame->StyleUserInterface();
if ((!mIgnoreUserModify &&
userinterface->mUserModify == StyleUserModify::ReadOnly) ||
- userinterface->mUserInput == StyleUserInput::None ||
- userinterface->mUserInput == StyleUserInput::Disabled) {
+ frame->IsContentDisabled()){
return nullptr;
}