[Android WebView] Implement Ubercomp for Render Thread support

android_webview/native/aw_contents.cc

Index: android_webview/native/aw_contents.cc
diff --git a/android_webview/native/aw_contents.cc b/android_webview/native/aw_contents.cc
index 91443a0337c84aa35bd4750e9506955adb8d1771..92c9051ab0ab4e41d2094b353c55a545efa9c6d1 100644
--- a/android_webview/native/aw_contents.cc
+++ b/android_webview/native/aw_contents.cc
@@ -13,10 +13,12 @@
 #include "android_webview/browser/deferred_gpu_command_service.h"
 #include "android_webview/browser/gpu_memory_buffer_factory_impl.h"
 #include "android_webview/browser/hardware_renderer.h"
+#include "android_webview/browser/hardware_renderer_legacy.h"
 #include "android_webview/browser/net_disk_cache_remover.h"
 #include "android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.h"
 #include "android_webview/browser/scoped_app_gl_state_restore.h"
 #include "android_webview/common/aw_hit_test_data.h"
+#include "android_webview/common/aw_switches.h"
 #include "android_webview/common/devtools_instrumentation.h"
 #include "android_webview/native/aw_autofill_manager_delegate.h"
 #include "android_webview/native/aw_browser_dependency_factory.h"
@@ -351,16 +353,25 @@ void AwContents::DrawGL(AwDrawGLInfo* draw_info) {
 
   if (!hardware_renderer_) {
     DCHECK(!shared_renderer_state_.IsHardwareInitialized());
-    hardware_renderer_.reset(new HardwareRenderer(&shared_renderer_state_));
+    if (switches::UbercompEnabled()) {
+      hardware_renderer_.reset(new HardwareRenderer(&shared_renderer_state_));
+    } else {
+      hardware_renderer_.reset(
+          new HardwareRendererLegacy(&shared_renderer_state_));
+    }
     shared_renderer_state_.SetHardwareInitialized(true);
   }
 
-  DrawGLResult result;
+  scoped_ptr<DrawGLResult> result(new DrawGLResult);
   if (hardware_renderer_->DrawGL(state_restore.stencil_enabled(),
                                  state_restore.framebuffer_binding_ext(),
                                  draw_info,
-                                 &result)) {
-    browser_view_renderer_.DidDrawGL(result);
+                                 result.get())) {
+    if (switches::UbercompEnabled()) {
+      browser_view_renderer_.DidDrawDelegated(result.Pass());
+    } else {
+      browser_view_renderer_.DidDrawGL(result.Pass());
+    }
   }
 }