Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 19:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 941138 - Move the code to update the cached transform. r=botond

Browse Source
This commit is contained in:
Kartikaya Gupta 2014-01-17 09:52:49 -05:00
parent 697ba5a8a2
commit 6ad34c19ec
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gfx/layers/composite/APZCTreeManager.cpp
View File

@ -400,9 +400,6 @@ APZCTreeManager::GetTouchInputBlockAPZC(const WidgetTouchEvent& aEvent,
// Prepare for possible overscroll handoff.
BuildOverscrollHandoffChain(apzc);
}
gfx3DMatrix transformToApzc, transformToGecko;
// Reset the cached apz transform
mCachedTransformToApzcForInputBlock = transformToApzc;
if (!apzc) {
return apzc.forget();
}
@ -417,10 +414,6 @@ APZCTreeManager::GetTouchInputBlockAPZC(const WidgetTouchEvent& aEvent,
apzc = RootAPZCForLayersId(apzc);
APZC_LOG("Using APZC %p as the root APZC for multi-touch\n", apzc.get());
}
if (apzc) {
// Cache apz transform so it can be used for future events in this block.
GetInputTransforms(apzc, mCachedTransformToApzcForInputBlock, transformToGecko);
}
return apzc.forget();
}
@ -439,6 +432,14 @@ APZCTreeManager::ProcessTouchEvent(const WidgetTouchEvent& aEvent,
mTouchCount++;
ScreenPoint point = ScreenPoint(aEvent.touches[0]->mRefPoint.x, aEvent.touches[0]->mRefPoint.y);
mApzcForInputBlock = GetTouchInputBlockAPZC(aEvent, point);
if (mApzcForInputBlock) {
// Cache apz transform so it can be used for future events in this block.
gfx3DMatrix transformToGecko;
GetInputTransforms(mApzcForInputBlock, mCachedTransformToApzcForInputBlock, transformToGecko);
} else {
// Reset the cached apz transform
mCachedTransformToApzcForInputBlock = gfx3DMatrix();
}
}
if (mApzcForInputBlock) {