Index: android_webview/browser/hardware_renderer.cc |
diff --git a/android_webview/browser/hardware_renderer.cc b/android_webview/browser/hardware_renderer.cc |
index 8ee14f50318c09abe333db5e58ea8354aa6beb6c..8e75e59d597a077ddf18046b21aa8db309876298 100644 |
--- a/android_webview/browser/hardware_renderer.cc |
+++ b/android_webview/browser/hardware_renderer.cc |
@@ -23,6 +23,7 @@ |
#include "cc/scheduler/begin_frame_source.h" |
#include "cc/trees/layer_tree_host.h" |
#include "cc/trees/layer_tree_settings.h" |
+#include "content/public/browser/android/compositor.h" |
#include "gpu/command_buffer/client/gl_in_process_context.h" |
#include "gpu/command_buffer/common/gles2_cmd_utils.h" |
#include "ui/gfx/frame_time.h" |
@@ -39,7 +40,7 @@ HardwareRenderer::HardwareRenderer(SharedRendererState* state) |
stencil_enabled_(false), |
viewport_clip_valid_for_dcheck_(false), |
gl_surface_(new AwGLSurface), |
- root_layer_(cc::Layer::Create()), |
+ root_layer_(cc::Layer::Create(content::Compositor::LayerSettings())), |
loyso (OOO)
2015/05/18 07:13:34
I'm not sure about this. Do we need a special case
boliu
2015/05/18 15:39:31
This is a different cc instance, so should not re-
loyso (OOO)
2015/05/20 02:48:53
I decided to go with HardwareRenderer-local g_laye
|
resource_collection_(new cc::DelegatedFrameResourceCollection), |
output_surface_(NULL) { |
DCHECK(last_egl_context_); |
@@ -134,7 +135,8 @@ void HardwareRenderer::CommitFrame() { |
frame_provider_ = new cc::DelegatedFrameProvider( |
resource_collection_.get(), frame->delegated_frame_data.Pass()); |
- delegated_layer_ = cc::DelegatedRendererLayer::Create(frame_provider_); |
+ delegated_layer_ = cc::DelegatedRendererLayer::Create( |
+ content::Compositor::LayerSettings(), frame_provider_); |
delegated_layer_->SetBounds(frame_size_); |
delegated_layer_->SetIsDrawable(true); |