| 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 62a83c79fcd0c7a6b5a7006434a95686b49dc91c..d03a7d90de3c33e5ab914ddfa6b8a42c2f66053c 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/WebSharedGraphicsContext3D.h"
|
| #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.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();
|
| }
|
|
|
| class WebLayerTreeViewImplForTesting::MainThreadContextProvider :
|
|
|