Index: android_webview/browser/hardware_renderer.cc |
diff --git a/android_webview/browser/hardware_renderer.cc b/android_webview/browser/hardware_renderer.cc |
index 511969e34f0c029d7d4a0256d319e6e2023e4bc9..969610cdb5ac438a1a223a3ac5bc34ebf772fadd 100644 |
--- a/android_webview/browser/hardware_renderer.cc |
+++ b/android_webview/browser/hardware_renderer.cc |
@@ -186,6 +186,10 @@ void HardwareRenderer::DrawGL(bool stencil_enabled, |
} |
} |
+ if (!delegated_layer_) { |
+ LOG(INFO) << "no layer"; |
no sievers
2014/07/22 20:53:17
The SurfaceView might start drawing before the chi
|
+ return; |
+ } |
viewport_.SetSize(draw_info->width, draw_info->height); |
layer_tree_host_->SetViewportSize(viewport_); |
clip_.SetRect(draw_info->clip_left, |
@@ -196,7 +200,8 @@ void HardwareRenderer::DrawGL(bool stencil_enabled, |
gfx::Transform transform(gfx::Transform::kSkipInitialization); |
transform.matrix().setColMajorf(draw_info->transform); |
- transform.Translate(scroll_offset_.x(), scroll_offset_.y()); |
+// transform.Translate(scroll_offset_.x(), scroll_offset_.y()); |
no sievers
2014/07/22 21:00:36
So here I don't understand why we scroll in the pa
|
+ DCHECK(delegated_layer_.get()); |
delegated_layer_->SetTransform(transform); |
gl_surface_->SetBackingFrameBufferObject(framebuffer_binding_ext); |
@@ -206,6 +211,7 @@ void HardwareRenderer::DrawGL(bool stencil_enabled, |
layer_tree_host_->SetNeedsRedrawRect(clip_); |
layer_tree_host_->Composite(gfx::FrameTime::Now()); |
} |
+ DCHECK(gl_surface_.get()); |
gl_surface_->ResetBackingFrameBufferObject(); |
} |