Hook up android webview synchronous compositor GL init

android_webview/browser/in_process_view_renderer.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "android_webview/browser/in_process_view_renderer.h"
 
 #include <android/bitmap.h>
 
 #include "android_webview/public/browser/draw_gl.h"
 #include "android_webview/public/browser/draw_sw.h"
 #include "base/android/jni_android.h"
+#include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "content/public/browser/android/content_view_core.h"
 #include "content/public/browser/android/synchronous_compositor.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkDevice.h"
 #include "third_party/skia/include/core/SkGraphics.h"
@@ skipping 287 matching lines @@
 }
 
 void InProcessViewRenderer::WebContentsGone() {
   web_contents_ = NULL;
   compositor_ = NULL;
 }
 
 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_ &&
+         CommandLine::ForCurrentProcess()->HasSwitch("testing-webview-gl-mode");
 }
 
 void InProcessViewRenderer::DrawGL(AwDrawGLInfo* draw_info) {
   DCHECK(view_visible_);
 
   // We need to watch if the current Android context has changed and enforce
   // a clean-up in the compositor.
   EGLContext current_context = eglGetCurrentContext();
   if (!current_context) {
     LOG(WARNING) << "No current context attached. Skipping composite.";
     return;
   }
 
   GLStateRestore state_restore;
 
   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)
     return;
 
   if (egl_context_at_init_ != current_context) {
     // TODO(boliu): Handle context lost
   }
 
   // TODO(boliu): Make sure this is not called before compositor is initialized
@@ skipping 226 matching lines @@
   // TODO(joth): BrowserViewRendererImpl had a bunch of logic for dpi and page
   // scale here. Determine what if any needs bringing over to this class.
   return CompositeSW(canvas);
 }
 
 bool InProcessViewRenderer::CompositeSW(SkCanvas* canvas) {
   return compositor_ && compositor_->DemandDrawSw(canvas);
 }
 
 }  // namespace android_webview