зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1270902 - Ensure scroll handoff parents are specified in the layer trees used by APZ gtests. r=kats
MozReview-Commit-ID: BxFheQ058y8 --HG-- extra : rebase_source : 6d686831ee1a09aabaf1e4f66d8976849900d198 extra : source : 85b2ecd2a2ece0bdcb2243595707f85fb18b34f7 extra : histedit_source : 8e77e1a4a4142bf5e94713326efae728cb4b836f
This commit is contained in:
Родитель
87090ec8ab
Коммит
dff4442cf8
|
@ -30,6 +30,7 @@ protected:
|
|||
tm = new TestAPZCTreeManager(mcc);
|
||||
apzc = new TestAsyncPanZoomController(0, mcc, tm, mGestureBehavior);
|
||||
apzc->SetFrameMetrics(TestFrameMetrics());
|
||||
apzc->GetScrollMetadata().SetIsLayersIdRoot(true);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -174,6 +174,7 @@ protected:
|
|||
root = CreateLayerTree(layerTreeSyntax, layerVisibleRegion, nullptr, lm, layers);
|
||||
SetScrollableFrameMetrics(layers[0], FrameMetrics::START_SCROLL_ID);
|
||||
SetScrollableFrameMetrics(layers[1], FrameMetrics::START_SCROLL_ID + 1);
|
||||
SetScrollHandoff(layers[1], layers[0]);
|
||||
|
||||
// Make layers[1] the root content
|
||||
ScrollMetadata childMetadata = layers[1]->GetScrollMetadata(0);
|
||||
|
|
|
@ -145,8 +145,9 @@ protected:
|
|||
};
|
||||
root = CreateLayerTree(layerTreeSyntax, layerVisibleRegions, layerTransforms, lm, layers);
|
||||
|
||||
SetScrollableFrameMetrics(layers[2], FrameMetrics::START_SCROLL_ID + 1, CSSRect(0, 0, 10, 10));
|
||||
SetScrollableFrameMetrics(layers[3], FrameMetrics::START_SCROLL_ID + 2, CSSRect(0, 0, 100, 100));
|
||||
SetScrollableFrameMetrics(layers[2], FrameMetrics::START_SCROLL_ID, CSSRect(0, 0, 10, 10));
|
||||
SetScrollableFrameMetrics(layers[3], FrameMetrics::START_SCROLL_ID + 1, CSSRect(0, 0, 100, 100));
|
||||
SetScrollHandoff(layers[3], layers[2]);
|
||||
|
||||
EventRegions regions(nsIntRegion(IntRect(0, 0, 10, 10)));
|
||||
layers[2]->SetEventRegions(regions);
|
||||
|
|
|
@ -59,10 +59,13 @@ protected:
|
|||
nsIntRegion(IntRect(0, 50, 100, 50)) // scrolling child 2
|
||||
};
|
||||
root = CreateLayerTree(layerTreeSyntax, layerVisibleRegion, nullptr, lm, layers);
|
||||
SetScrollableFrameMetrics(layers[1], FrameMetrics::START_SCROLL_ID, CSSRect(0, 0, 100, 100));
|
||||
SetScrollableFrameMetrics(layers[2], FrameMetrics::START_SCROLL_ID + 1, CSSRect(0, 0, 100, 100));
|
||||
SetScrollableFrameMetrics(layers[3], FrameMetrics::START_SCROLL_ID + 2, CSSRect(0, 50, 100, 100));
|
||||
SetScrollableFrameMetrics(layers[4], FrameMetrics::START_SCROLL_ID + 3, CSSRect(0, 50, 100, 100));
|
||||
SetScrollableFrameMetrics(layers[0], FrameMetrics::START_SCROLL_ID, CSSRect(0, 0, 100, 100));
|
||||
SetScrollableFrameMetrics(layers[1], FrameMetrics::START_SCROLL_ID + 1, CSSRect(0, 0, 100, 100));
|
||||
SetScrollableFrameMetrics(layers[2], FrameMetrics::START_SCROLL_ID + 2, CSSRect(0, 0, 100, 100));
|
||||
SetScrollableFrameMetrics(layers[3], FrameMetrics::START_SCROLL_ID + 3, CSSRect(0, 50, 100, 100));
|
||||
SetScrollableFrameMetrics(layers[4], FrameMetrics::START_SCROLL_ID + 4, CSSRect(0, 50, 100, 100));
|
||||
SetScrollHandoff(layers[1], layers[0]);
|
||||
SetScrollHandoff(layers[3], layers[0]);
|
||||
SetScrollHandoff(layers[2], layers[1]);
|
||||
SetScrollHandoff(layers[4], layers[3]);
|
||||
registration = MakeUnique<ScopedLayerTreeRegistration>(manager, 0, root, mcc);
|
||||
|
|
Загрузка…
Ссылка в новой задаче