diff --git a/gfx/layers/FrameMetrics.h b/gfx/layers/FrameMetrics.h index e1e8810c126b..49bb4215f78a 100644 --- a/gfx/layers/FrameMetrics.h +++ b/gfx/layers/FrameMetrics.h @@ -359,9 +359,6 @@ public: // Whether or not this frame may have touch listeners. bool mMayHaveTouchListeners; - // Whether or not this frame may have touch caret. - bool mMayHaveTouchCaret; - public: void SetIsRoot(bool aIsRoot) { @@ -530,10 +527,23 @@ public: mContentDescription = aContentDescription; } + bool GetMayHaveTouchCaret() const + { + return mMayHaveTouchCaret; + } + + void SetMayHaveTouchCaret(bool aMayHaveTouchCaret) + { + mMayHaveTouchCaret = aMayHaveTouchCaret; + } + private: // New fields from now on should be made private and old fields should // be refactored to be private. + // Whether or not this frame may have a touch caret. + bool mMayHaveTouchCaret; + // Whether or not this is the root scroll frame for the root content document. bool mIsRoot; diff --git a/gfx/layers/apz/src/AsyncPanZoomController.cpp b/gfx/layers/apz/src/AsyncPanZoomController.cpp index edd7bd5d530e..fdf3e9fecd92 100644 --- a/gfx/layers/apz/src/AsyncPanZoomController.cpp +++ b/gfx/layers/apz/src/AsyncPanZoomController.cpp @@ -1036,7 +1036,7 @@ nsEventStatus AsyncPanZoomController::ReceiveInputEvent(const InputData& aEvent) block->GetOverscrollHandoffChain()->CancelAnimations(); } - if (mFrameMetrics.mMayHaveTouchListeners || mFrameMetrics.mMayHaveTouchCaret) { + if (mFrameMetrics.mMayHaveTouchListeners || mFrameMetrics.GetMayHaveTouchCaret()) { // Content may intercept the touch events and prevent-default them. So we schedule // a timeout to give content time to do that. ScheduleContentResponseTimeout(); @@ -2677,7 +2677,7 @@ void AsyncPanZoomController::NotifyLayersUpdated(const FrameMetrics& aLayerMetri UpdateTransformScale(); mFrameMetrics.mMayHaveTouchListeners = aLayerMetrics.mMayHaveTouchListeners; - mFrameMetrics.mMayHaveTouchCaret = aLayerMetrics.mMayHaveTouchCaret; + mFrameMetrics.SetMayHaveTouchCaret(aLayerMetrics.GetMayHaveTouchCaret()); mFrameMetrics.SetScrollParentId(aLayerMetrics.GetScrollParentId()); APZC_LOG_FM(aLayerMetrics, "%p got a NotifyLayersUpdated with aIsFirstPaint=%d", this, aIsFirstPaint); diff --git a/layout/base/nsDisplayList.cpp b/layout/base/nsDisplayList.cpp index e420e2863ae2..60b42e18c506 100644 --- a/layout/base/nsDisplayList.cpp +++ b/layout/base/nsDisplayList.cpp @@ -760,7 +760,7 @@ nsDisplayScrollLayer::ComputeFrameMetrics(nsIFrame* aForFrame, metrics.mMayHaveTouchListeners = innerWin->HasTouchEventListeners(); } } - metrics.mMayHaveTouchCaret = presShell->MayHaveTouchCaret(); + metrics.SetMayHaveTouchCaret(presShell->MayHaveTouchCaret()); } LayoutDeviceToParentLayerScale layoutToParentLayerScale =