Chromium Code Reviews| Index: android_webview/browser/shared_renderer_state.h |
| diff --git a/android_webview/browser/shared_renderer_state.h b/android_webview/browser/shared_renderer_state.h |
| index d0555b7295d89d5d2cd1ee84d6d32b9c15432177..9eadf2cd8947977651785b9c33a9a70c8ac9d806 100644 |
| --- a/android_webview/browser/shared_renderer_state.h |
| +++ b/android_webview/browser/shared_renderer_state.h |
| @@ -41,15 +41,10 @@ class SharedRendererState { |
| // UI thread methods. |
| void SetScrollOffsetOnUI(gfx::Vector2d scroll_offset); |
| - bool HasCompositorFrameOnUI() const; |
| - void SetCompositorFrameOnUI(scoped_ptr<cc::CompositorFrame> frame, |
| - bool force_commit); |
| + void SetCompositorFrameOnUI(scoped_ptr<cc::CompositorFrame> frame); |
| void InitializeHardwareDrawIfNeededOnUI(); |
| void ReleaseHardwareDrawIfNeededOnUI(); |
| ParentCompositorDrawConstraints GetParentDrawConstraintsOnUI() const; |
| - void SetForceInvalidateOnNextDrawGLOnUI( |
|
hush (inactive)
2015/03/13 18:45:17
We've talked about this:
We need to keep this othe
|
| - bool needs_force_invalidate_on_next_draw_gl); |
| - bool NeedsForceInvalidateOnNextDrawGLOnUI() const; |
| void SwapReturnedResourcesOnUI(cc::ReturnedResourceArray* resources); |
| bool ReturnedResourcesEmptyOnUI() const; |
| scoped_ptr<cc::CompositorFrame> PassUncommittedFrameOnUI(); |
| @@ -57,14 +52,12 @@ class SharedRendererState { |
| // RT thread methods. |
| gfx::Vector2d GetScrollOffsetOnRT(); |
| scoped_ptr<cc::CompositorFrame> PassCompositorFrameOnRT(); |
| - bool ForceCommitOnRT() const; |
| void DrawGL(AwDrawGLInfo* draw_info); |
| // Returns true if the draw constraints are updated. |
| bool UpdateDrawConstraintsOnRT( |
| const ParentCompositorDrawConstraints& parent_draw_constraints); |
| void PostExternalDrawConstraintsToChildCompositorOnRT( |
| const ParentCompositorDrawConstraints& parent_draw_constraints); |
| - void DidSkipCommitFrameOnRT(); |
| void InsertReturnedResourcesOnRT(const cc::ReturnedResourceArray& resources); |
| private: |
| @@ -86,7 +79,6 @@ class SharedRendererState { |
| void ResetRequestDrawGLCallback(); |
| void ClientRequestDrawGLOnUI(); |
| void UpdateParentDrawConstraintsOnUI(); |
| - void DidSkipCommitFrameOnUI(); |
| bool IsInsideHardwareRelease() const; |
| void SetInsideHardwareRelease(bool inside); |
| @@ -106,9 +98,7 @@ class SharedRendererState { |
| mutable base::Lock lock_; |
| gfx::Vector2d scroll_offset_; |
| scoped_ptr<cc::CompositorFrame> compositor_frame_; |
| - bool force_commit_; |
| bool inside_hardware_release_; |
| - bool needs_force_invalidate_on_next_draw_gl_; |
|
hush (inactive)
2015/03/13 18:45:17
need to keep it
|
| ParentCompositorDrawConstraints parent_draw_constraints_; |
| cc::ReturnedResourceArray returned_resources_; |
| base::Closure request_draw_gl_closure_; |