wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

BUG 1087478 - Transition mMayHaveTouchListener to be private. r=kats

Browse Source
This commit is contained in:
Himanshu Singh 2014-10-23 09:10:47 -04:00
parent 43c49618ad
commit dad271b26f
4 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gfx/layers/FrameMetrics.h
View File

@ -356,9 +356,6 @@ public:
// resolution.
CSSToLayoutDeviceScale mDevPixelsPerCSSPixel;
// Whether or not this frame may have touch listeners.
bool mMayHaveTouchListeners;
public:
void SetIsRoot(bool aIsRoot)
{
@ -537,10 +534,23 @@ public:
mMayHaveTouchCaret = aMayHaveTouchCaret;
}
bool GetMayHaveTouchListeners() const
{
return mMayHaveTouchListeners;
}
void SetMayHaveTouchListeners(bool aMayHaveTouchListeners)
{
mMayHaveTouchListeners = aMayHaveTouchListeners;
}
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 listeners.
bool mMayHaveTouchListeners;
// Whether or not this frame may have a touch caret.
bool mMayHaveTouchCaret;

4
gfx/layers/apz/src/AsyncPanZoomController.cpp
View File

@ -1036,7 +1036,7 @@ nsEventStatus AsyncPanZoomController::ReceiveInputEvent(const InputData& aEvent)
block->GetOverscrollHandoffChain()->CancelAnimations();
}
if (mFrameMetrics.mMayHaveTouchListeners || mFrameMetrics.GetMayHaveTouchCaret()) {
if (mFrameMetrics.GetMayHaveTouchListeners() || 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();
@ -2676,7 +2676,7 @@ void AsyncPanZoomController::NotifyLayersUpdated(const FrameMetrics& aLayerMetri
mLastContentPaintMetrics = aLayerMetrics;
UpdateTransformScale();
mFrameMetrics.mMayHaveTouchListeners = aLayerMetrics.mMayHaveTouchListeners;
mFrameMetrics.SetMayHaveTouchListeners(aLayerMetrics.GetMayHaveTouchListeners());
mFrameMetrics.SetMayHaveTouchCaret(aLayerMetrics.GetMayHaveTouchCaret());
mFrameMetrics.SetScrollParentId(aLayerMetrics.GetScrollParentId());
APZC_LOG_FM(aLayerMetrics, "%p got a NotifyLayersUpdated with aIsFirstPaint=%d", this, aIsFirstPaint);

8
gfx/tests/gtest/TestAsyncPanZoomController.cpp
View File

@ -214,7 +214,7 @@ protected:
void SetMayHaveTouchListeners()
{
apzc->GetFrameMetrics().mMayHaveTouchListeners = true;
apzc->GetFrameMetrics().SetMayHaveTouchListeners(true);
}
void MakeApzcZoomable()
@ -2176,7 +2176,7 @@ TEST_F(APZOverscrollHandoffTester, DeferredInputEventProcessing) {
// Enable touch-listeners so that we can separate the queueing of input
// events from them being processed.
childApzc->GetFrameMetrics().mMayHaveTouchListeners = true;
childApzc->GetFrameMetrics().SetMayHaveTouchListeners(true);
// Queue input events for a pan.
int time = 0;
@ -2203,7 +2203,7 @@ TEST_F(APZOverscrollHandoffTester, LayerStructureChangesWhileEventsArePending) {
// Enable touch-listeners so that we can separate the queueing of input
// events from them being processed.
childApzc->GetFrameMetrics().mMayHaveTouchListeners = true;
childApzc->GetFrameMetrics().SetMayHaveTouchListeners(true);
// Queue input events for a pan.
int time = 0;
@ -2213,7 +2213,7 @@ TEST_F(APZOverscrollHandoffTester, LayerStructureChangesWhileEventsArePending) {
// between the child and the root.
CreateOverscrollHandoffLayerTree2();
nsRefPtr<Layer> middle = layers[1];
childApzc->GetFrameMetrics().mMayHaveTouchListeners = true;
childApzc->GetFrameMetrics().SetMayHaveTouchListeners(true);
TestAsyncPanZoomController* middleApzc = ApzcOf(middle);
// Queue input events for another pan.

2
layout/base/nsDisplayList.cpp
View File

@ -758,7 +758,7 @@ nsDisplayScrollLayer::ComputeFrameMetrics(nsIFrame* aForFrame,
if (document) {
nsCOMPtr<nsPIDOMWindow> innerWin(document->GetInnerWindow());
if (innerWin) {
metrics.mMayHaveTouchListeners = innerWin->HasTouchEventListeners();
metrics.SetMayHaveTouchListeners(innerWin->HasTouchEventListeners());
}
}
metrics.SetMayHaveTouchCaret(presShell->MayHaveTouchCaret());