webkit/compositor_bindings/web_layer_tree_view_impl_for_testing.cc - Issue 12226051: Clean up RenderWidget/RenderWidgetCompositor/WebKit interactions

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: webkit/compositor_bindings/web_layer_tree_view_impl_for_testing.cc

Issue 12226051: Clean up RenderWidget/RenderWidgetCompositor/WebKit interactions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: just diff relative to https://codereview.chromium.org/12377029/ Created 7 years, 10 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

« content/renderer/gpu/render_widget_compositor.cc ('K') | « webkit/compositor_bindings/web_layer_tree_view_impl_for_testing.h ('k') | webkit/compositor_bindings/web_layer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webkit/compositor_bindings/web_layer_tree_view_impl_for_testing.cc

diff --git a/webkit/compositor_bindings/web_layer_tree_view_impl_for_testing.cc b/webkit/compositor_bindings/web_layer_tree_view_impl_for_testing.cc

index 3479acfa52476dfff4fd8a9b95e577059c7893ea..aee28218cd05c0d56e60084a2d37aad7d455b870 100644

--- a/webkit/compositor_bindings/web_layer_tree_view_impl_for_testing.cc

+++ b/webkit/compositor_bindings/web_layer_tree_view_impl_for_testing.cc

@@ -21,7 +21,6 @@

#include "third_party/WebKit/Source/Platform/chromium/public/WebInputHandler.h"

#include "third_party/WebKit/Source/Platform/chromium/public/WebLayer.h"

#include "third_party/WebKit/Source/Platform/chromium/public/WebLayerTreeView.h"

-#include "third_party/WebKit/Source/Platform/chromium/public/WebLayerTreeViewClient.h"

#include "third_party/WebKit/Source/Platform/chromium/public/WebRenderingStats.h"

#include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h"

#include "webkit/compositor_bindings/web_compositor_support_impl.h"

@@ -37,14 +36,6 @@ WebLayerTreeViewImplForTesting::WebLayerTreeViewImplForTesting(

RenderingType type,

webkit_support::DRTLayerTreeViewClient* client)

: type_(type),

- drt_client_(client),

- client_(NULL) {}

-WebLayerTreeViewImplForTesting::WebLayerTreeViewImplForTesting(

- RenderingType type,

- WebKit::WebLayerTreeViewClient* client)

- : type_(type),

- drt_client_(NULL),

client_(client) {}

WebLayerTreeViewImplForTesting::~WebLayerTreeViewImplForTesting() {}

@@ -174,10 +165,8 @@ void WebLayerTreeViewImplForTesting::animate(

}

void WebLayerTreeViewImplForTesting::layout() {

- if (drt_client_)

- drt_client_->Layout();

if (client_)

- client_->layout();

+ client_->Layout();

}

void WebLayerTreeViewImplForTesting::applyScrollAndScale(

@@ -229,10 +218,8 @@ void WebLayerTreeViewImplForTesting::didCommitAndDrawFrame() {}

void WebLayerTreeViewImplForTesting::didCompleteSwapBuffers() {}

void WebLayerTreeViewImplForTesting::scheduleComposite() {

- if (drt_client_)

- drt_client_->ScheduleComposite();

if (client_)

- client_->scheduleComposite();

+ client_->ScheduleComposite();

}

scoped_refptr<cc::ContextProvider>