Fix hang in Android WebView release build tests

android_webview/native/aw_contents.cc

 // Copyright (c) 2012 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/native/aw_contents.h"
 
 #include <sys/system_properties.h>
 
 #include "android_webview/browser/aw_browser_main_parts.h"
 #include "android_webview/browser/net_disk_cache_remover.h"
@@ skipping 87 matching lines @@
       return NULL;
     AwContentsUserData* data = reinterpret_cast<AwContentsUserData*>(
         web_contents->GetUserData(kAwContentsUserDataKey));
     return data ? data->contents_ : NULL;
   }
 
  private:
   AwContents* contents_;
 };
 
-// Work-around for http://crbug.com/161864. TODO(joth): Remove this class when
-// that bug is closed.
-class NullCompositor : public content::Compositor {
- public:
-  NullCompositor() {}
-  virtual ~NullCompositor() {}
-
-  // Compositor
-  virtual void SetRootLayer(scoped_refptr<cc::Layer> root) OVERRIDE {}
-  virtual void SetWindowBounds(const gfx::Size& size) OVERRIDE {}
-  virtual void SetVisible(bool visible) OVERRIDE {}
-  virtual void SetWindowSurface(ANativeWindow* window) OVERRIDE {}
-  virtual bool CompositeAndReadback(void *pixels, const gfx::Rect& rect)
-      OVERRIDE {
-    return false;
-  }
-  virtual void Composite() {}
-  virtual WebKit::WebGLId GenerateTexture(gfx::JavaBitmap& bitmap) OVERRIDE {
-    return 0;
-  }
-  virtual WebKit::WebGLId GenerateCompressedTexture(gfx::Size& size,
-                                                    int data_size,
-                                                    void* data) OVERRIDE {
-    return 0;
-  }
-  virtual void DeleteTexture(WebKit::WebGLId texture_id) OVERRIDE {}
-  virtual bool CopyTextureToBitmap(WebKit::WebGLId texture_id,
-                                   gfx::JavaBitmap& bitmap) OVERRIDE {
-    return false;
-  }
-  virtual bool CopyTextureToBitmap(WebKit::WebGLId texture_id,
-                                   const gfx::Rect& src_rect,
-                                   gfx::JavaBitmap& bitmap) OVERRIDE {
-    return false;
-  }
-  virtual void SetHasTransparentBackground(bool flag) OVERRIDE {}
-};
-
 }  // namespace
 
 // static
 AwContents* AwContents::FromWebContents(WebContents* web_contents) {
   return AwContentsUserData::GetContents(web_contents);
 }
 
 AwContents::AwContents(JNIEnv* env,
                        jobject obj,
                        jobject web_contents_delegate,
@@ skipping 10 matching lines @@
   android_webview::AwBrowserDependencyFactory* dependency_factory =
       android_webview::AwBrowserDependencyFactory::GetInstance();
 
   // TODO(joth): rather than create and set the WebContents here, expose the
   // factory method to java side and have that orchestrate the construction
   // order.
   SetWebContents(dependency_factory->CreateWebContents(private_browsing));
 }
 
 void AwContents::ResetCompositor() {
-  if (UseCompositorDirectDraw()) {
-    compositor_.reset(content::Compositor::Create(this));
-    if (scissor_clip_layer_.get())
-      AttachLayerTree();
-  } else {
-    LOG(WARNING) << "Running on unsupported device: using null Compositor";
-    compositor_.reset(new NullCompositor);
-  }
+  compositor_.reset(content::Compositor::Create(this));
+  if (scissor_clip_layer_.get())
+    AttachLayerTree();
 }
 
 void AwContents::SetWebContents(content::WebContents* web_contents) {
   web_contents_.reset(web_contents);
   web_contents_->SetUserData(kAwContentsUserDataKey,
                              new AwContentsUserData(this));
 
   web_contents_->SetDelegate(web_contents_delegate_.get());
   render_view_host_ext_.reset(new AwRenderViewHostExt(web_contents_.get(),
                               this));
@@ skipping 692 matching lines @@
 
 void AwContents::OnPictureUpdated(int process_id, int render_view_id) {
   CHECK_EQ(web_contents_->GetRenderProcessHost()->GetID(), process_id);
   if (render_view_id != web_contents_->GetRoutingID())
     return;
 
   Invalidate();
 }
 
 }  // namespace android_webview