Index: trunk/src/content/browser/renderer_host/render_widget_host_view_android.h |
=================================================================== |
--- trunk/src/content/browser/renderer_host/render_widget_host_view_android.h (revision 248975) |
+++ trunk/src/content/browser/renderer_host/render_widget_host_view_android.h (working copy) |
@@ -224,10 +224,7 @@ |
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; |
@@ -299,7 +296,11 @@ |
// 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_; |