Revert 248827 "android: Migrate old content readback to use asyn..."

trunk/src/content/browser/renderer_host/render_widget_host_view_android.h

 // 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.
 
 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_
 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_
 
 #include <map>
 #include <queue>
 
@@ skipping 206 matching lines @@
   void OnSetNeedsBeginFrame(bool enabled);
   void OnSmartClipDataExtracted(const base::string16& result);
 
   void LockResources();
   void UnlockResources();
 
   int GetNativeImeAdapter();
 
   void WasResized();
 
-  void GetScaledContentBitmap(
-      float scale,
-      gfx::Size* out_size,
-      const base::Callback<void(bool, const SkBitmap&)>& result_callback);
+  blink::WebGLId GetScaledContentTexture(float scale, gfx::Size* out_size);
   bool PopulateBitmapWithContents(jobject jbitmap);
 
   bool HasValidFrame() const;
 
   // Select all text between the given coordinates.
   void SelectRange(const gfx::Point& start, const gfx::Point& end);
 
   void MoveCaret(const gfx::Point& point);
 
   void RequestContentClipping(const gfx::Rect& clipping,
@@ skipping 51 matching lines @@
       const gfx::Rect& src_subrect_in_pixel,
       const gfx::Size& dst_size_in_pixel,
       const base::Callback<void(bool, const SkBitmap&)>& callback);
 
   // The model object.
   RenderWidgetHostImpl* host_;
 
   // Used to track whether this render widget needs a BeginFrame.
   bool needs_begin_frame_;
 
-  bool is_showing_;
+  // Whether or not this widget is potentially attached to the view hierarchy.
+  // This view may not actually be attached if this is true, but it should be
+  // treated as such, because as soon as a ContentViewCore is set the layer
+  // will be attached automatically.
+  bool are_layers_attached_;
 
   // ContentViewCoreImpl is our interface to the view system.
   ContentViewCoreImpl* content_view_core_;
 
   ImeAdapterAndroid ime_adapter_android_;
 
   // Body background color of the underlying document.
   SkColor cached_background_color_;
 
   // The texture layer for this view when using browser-side compositing.
@@ skipping 42 matching lines @@
   const bool using_synchronous_compositor_;
 
   scoped_ptr<DelegatedFrameEvictor> frame_evictor_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAndroid);
 };
 
 } // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_