| 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 89554ac8e12aea4648a4aac5b2a84a8a74030056..157833b1e62be084f0b220e78c2f55d918d9ca93 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;
|
| @@ -44,14 +46,21 @@ class SharedRendererState {
|
| ~SharedRendererState();
|
|
|
| void ClientRequestDrawGL();
|
| + void ClientPostInvalidate();
|
|
|
| void SetDrawGLInput(scoped_ptr<DrawGLInput> input);
|
| scoped_ptr<DrawGLInput> PassDrawGLInput();
|
|
|
| + void PostExternalDrawConstraintsToChildCompositor(
|
| + const ParentCompositorDrawConstraints& parent_draw_constraints);
|
| +
|
| // Set by UI and read by RT.
|
| void SetHardwareAllowed(bool allowed);
|
| bool IsHardwareAllowed() const;
|
|
|
| + const gfx::Rect& ParentClip() const;
|
| + const ParentCompositorDrawConstraints& ParentDrawConstraints() const;
|
| +
|
| void SetSharedContext(gpu::GLInProcessContext* context);
|
| gpu::GLInProcessContext* GetSharedContext() const;
|
|
|
| @@ -61,6 +70,7 @@ class SharedRendererState {
|
|
|
| private:
|
| void ClientRequestDrawGLOnUIThread();
|
| + void ClientPostInvalidateOnUIThread();
|
|
|
| scoped_refptr<base::MessageLoopProxy> ui_loop_;
|
| BrowserViewRendererClient* client_on_ui_;
|
| @@ -71,6 +81,7 @@ class SharedRendererState {
|
| mutable base::Lock lock_;
|
| scoped_ptr<DrawGLInput> draw_gl_input_;
|
| bool hardware_allowed_;
|
| + ParentCompositorDrawConstraints parent_draw_constraints_;
|
| gpu::GLInProcessContext* share_context_;
|
| cc::ReturnedResourceArray returned_resources_;
|
| };
|
|
|