Index: android_webview/browser/browser_view_renderer.h |
diff --git a/android_webview/browser/browser_view_renderer.h b/android_webview/browser/browser_view_renderer.h |
index 338b31d73e40698f4f36fd9533f78f141b3f7f6f..e7dcc957a31dcd5363808870d42b8e6b65cb3899 100644 |
--- a/android_webview/browser/browser_view_renderer.h |
+++ b/android_webview/browser/browser_view_renderer.h |
@@ -140,12 +140,13 @@ class BrowserViewRenderer : public content::SynchronousCompositorClient, |
virtual void SetNumTiles(size_t num_tiles, |
bool effective_immediately) OVERRIDE; |
- private: |
- void SetTotalRootLayerScrollOffset(gfx::Vector2dF new_value_dip); |
// Checks the continuous invalidate and block invalidate state, and schedule |
// invalidates appropriately. If |force_invalidate| is true, then send a view |
// invalidate regardless of compositor expectation. |
void EnsureContinuousInvalidation(bool force_invalidate); |
+ |
+ private: |
+ void SetTotalRootLayerScrollOffset(gfx::Vector2dF new_value_dip); |
bool OnDrawSoftware(jobject java_canvas); |
bool CompositeSW(SkCanvas* canvas); |
void DidComposite(); |
@@ -199,6 +200,11 @@ class BrowserViewRenderer : public content::SynchronousCompositorClient, |
gfx::Vector2d last_on_draw_scroll_offset_; |
gfx::Rect last_on_draw_global_visible_rect_; |
+ // The clip and transform from the parent compositor. These are only used for |
+ // tiling priority. |
+ gfx::Rect parent_clip_; |
boliu
2014/07/29 19:02:41
Remove
hush (inactive)
2014/07/29 21:14:21
Done.
|
+ ParentCompositorDrawConstraints parent_draw_constraints_; |
+ |
// When true, we should continuously invalidate and keep drawing, for example |
// to drive animation. This value is set by the compositor and should always |
// reflect the expectation of the compositor and not be reused for other |