Index: android_webview/browser/in_process_renderer/in_process_view_renderer.cc |
diff --git a/android_webview/browser/in_process_renderer/in_process_view_renderer.cc b/android_webview/browser/in_process_renderer/in_process_view_renderer.cc |
index e0b9e8f63b30803e4a29d42d8eae189306ffe7dc..f43ae8c9da4a6129235ef69f3ad51be9c4997b52 100644 |
--- a/android_webview/browser/in_process_renderer/in_process_view_renderer.cc |
+++ b/android_webview/browser/in_process_renderer/in_process_view_renderer.cc |
@@ -183,8 +183,7 @@ void InProcessViewRenderer::WebContentsGone() { |
bool InProcessViewRenderer::PrepareDrawGL(int x, int y) { |
// No harm in updating |hw_rendering_scroll_| even if we return false. |
hw_rendering_scroll_ = gfx::Point(x, y); |
- return attached_to_window_ && compositor_ && compositor_->IsHwReady() && |
- !hardware_failed_; |
+ return attached_to_window_ && compositor_ && !hardware_failed_; |
} |
void InProcessViewRenderer::DrawGL(AwDrawGLInfo* draw_info) { |
@@ -199,9 +198,12 @@ void InProcessViewRenderer::DrawGL(AwDrawGLInfo* draw_info) { |
} |
if (attached_to_window_ && compositor_ && !hardware_initialized_) { |
- // TODO(boliu): Actually initialize the compositor GL path. |
+ hardware_failed_ = !compositor_->InitializeHwDraw(); |
hardware_initialized_ = true; |
egl_context_at_init_ = current_context; |
+ |
+ if (hardware_failed_) |
+ return; |
} |
if (draw_info->mode == AwDrawGLInfo::kModeProcess) |