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 01363f14b6a21f7fe250c31a21ddab5978af8ed3..e8e812955e497baf8891d52754365a668914b338 100644 |
| --- a/android_webview/browser/shared_renderer_state.h |
| +++ b/android_webview/browser/shared_renderer_state.h |
| @@ -5,6 +5,7 @@ |
| #ifndef ANDROID_WEBVIEW_BROWSER_SHARED_RENDERER_STATE_H_ |
| #define ANDROID_WEBVIEW_BROWSER_SHARED_RENDERER_STATE_H_ |
| +#include "android_webview/browser/parent_compositor_draw_constraints.h" |
| #include "base/memory/weak_ptr.h" |
| #include "base/message_loop/message_loop_proxy.h" |
| #include "base/synchronization/lock.h" |
| @@ -12,6 +13,7 @@ |
| #include "cc/output/compositor_frame_ack.h" |
| #include "ui/gfx/geometry/rect.h" |
| #include "ui/gfx/geometry/vector2d.h" |
| +#include "ui/gfx/transform.h" |
| namespace cc { |
| class CompositorFrameAck; |
| @@ -45,11 +47,18 @@ class SharedRendererState { |
| ~SharedRendererState(); |
| void ClientRequestDrawGL(); |
| + // Post invalidate to client if the client hasn't a pending invalidate. |
| + void ClientPostInvalidateIfNeeded(); |
|
boliu
2014/07/29 19:02:42
Why does this exist? And why is it public? Nothing
hush (inactive)
2014/07/29 21:14:21
I removed this function.
On 2014/07/29 19:02:42, b
|
| void SetDrawGLInput(scoped_ptr<DrawGLInput> input); |
| scoped_ptr<DrawGLInput> PassDrawGLInput(); |
| bool IsInsideHardwareRelease() const; |
| + void PostExternalDrawConstraintsToChildCompositor( |
| + const ParentCompositorDrawConstraints& parent_draw_constraints); |
| + |
| + const gfx::Rect& ParentClip() const; |
|
boliu
2014/07/29 19:02:42
remove
hush (inactive)
2014/07/29 21:14:21
Done.
|
| + const ParentCompositorDrawConstraints& ParentDrawConstraints() const; |
|
boliu
2014/07/29 19:02:42
Have to return a copy. Otherwise it's not thread s
hush (inactive)
2014/07/29 21:14:21
Yeah good point.
On 2014/07/29 19:02:42, boliu wro
|
| void SetSharedContext(gpu::GLInProcessContext* context); |
| gpu::GLInProcessContext* GetSharedContext() const; |
| @@ -62,6 +71,7 @@ class SharedRendererState { |
| friend class InsideHardwareReleaseReset; |
| void ClientRequestDrawGLOnUIThread(); |
| + void ClientPostInvalidateIfNeededOnUIThread(); |
| void SetInsideHardwareRelease(bool inside); |
| scoped_refptr<base::MessageLoopProxy> ui_loop_; |
| @@ -73,6 +83,7 @@ class SharedRendererState { |
| mutable base::Lock lock_; |
| scoped_ptr<DrawGLInput> draw_gl_input_; |
| bool inside_hardware_release_; |
| + ParentCompositorDrawConstraints parent_draw_constraints_; |
| gpu::GLInProcessContext* share_context_; |
| cc::ReturnedResourceArray returned_resources_; |