third_party/WebKit/Source/platform/testing/WebLayerTreeViewImplForTesting.cpp - Issue 2887053002: Remove scroll_clip_layer dependency from viewport layer tracking

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/platform/testing/WebLayerTreeViewImplForTesting.cpp

Issue 2887053002: Remove scroll_clip_layer dependency from viewport layer tracking (Closed)

Patch Set: Cleanup return stmt Created 3 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/platform/testing/WebLayerTreeViewImplForTesting.h ('k') | third_party/WebKit/Source/web/WebViewImpl.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/testing/WebLayerTreeViewImplForTesting.cpp

diff --git a/third_party/WebKit/Source/platform/testing/WebLayerTreeViewImplForTesting.cpp b/third_party/WebKit/Source/platform/testing/WebLayerTreeViewImplForTesting.cpp

index 96140f674492b5aecf36a1ab28d56ebae245ef0d..19caa9eddcf3754fb5debf323eb66440eda02222 100644

--- a/third_party/WebKit/Source/platform/testing/WebLayerTreeViewImplForTesting.cpp

+++ b/third_party/WebKit/Source/platform/testing/WebLayerTreeViewImplForTesting.cpp

@@ -149,6 +149,8 @@ void WebLayerTreeViewImplForTesting::DidFailToInitializeCompositorFrameSink() {

void WebLayerTreeViewImplForTesting::RegisterViewportLayers(

const blink::WebLayer* overscroll_elasticity_layer,

const blink::WebLayer* page_scale_layer,

+ const blink::WebLayer* inner_viewport_container_layer,

+ const blink::WebLayer* outer_viewport_container_layer,

const blink::WebLayer* inner_viewport_scroll_layer,

const blink::WebLayer* outer_viewport_scroll_layer) {

layer_tree_host_->RegisterViewportLayers(

@@ -157,6 +159,16 @@ void WebLayerTreeViewImplForTesting::RegisterViewportLayers(

->layer()

: nullptr,

static_cast<const cc_blink::WebLayerImpl*>(page_scale_layer)->layer(),

+ inner_viewport_container_layer

+ ? static_cast<const cc_blink::WebLayerImpl*>(

+ inner_viewport_container_layer)

+ ->layer()

+ : nullptr,

+ outer_viewport_container_layer

+ ? static_cast<const cc_blink::WebLayerImpl*>(

+ outer_viewport_container_layer)

+ ->layer()

+ : nullptr,

static_cast<const cc_blink::WebLayerImpl*>(inner_viewport_scroll_layer)

->layer(),

outer_viewport_scroll_layer ? static_cast<const cc_blink::WebLayerImpl*>(

@@ -168,6 +180,7 @@ void WebLayerTreeViewImplForTesting::RegisterViewportLayers(

void WebLayerTreeViewImplForTesting::ClearViewportLayers() {

layer_tree_host_->RegisterViewportLayers(

scoped_refptr<cc::Layer>(), scoped_refptr<cc::Layer>(),

+ scoped_refptr<cc::Layer>(), scoped_refptr<cc::Layer>(),

scoped_refptr<cc::Layer>(), scoped_refptr<cc::Layer>());

}