| Index: android_webview/browser/shared_renderer_state.cc
|
| diff --git a/android_webview/browser/shared_renderer_state.cc b/android_webview/browser/shared_renderer_state.cc
|
| index 42a42450ac46d8f87f8fddd6295c36f088001f57..aa09ef974fade286ea80e71bb8ef9ee8d35b2285 100644
|
| --- a/android_webview/browser/shared_renderer_state.cc
|
| +++ b/android_webview/browser/shared_renderer_state.cc
|
| @@ -16,9 +16,6 @@ DrawGLInput::DrawGLInput() : width(0), height(0) {
|
| DrawGLInput::~DrawGLInput() {
|
| }
|
|
|
| -DrawGLResult::DrawGLResult() : clip_contains_visible_rect(false) {
|
| -}
|
| -
|
| SharedRendererState::SharedRendererState(
|
| scoped_refptr<base::MessageLoopProxy> ui_loop,
|
| BrowserViewRendererClient* client)
|
| @@ -26,8 +23,6 @@ SharedRendererState::SharedRendererState(
|
| client_on_ui_(client),
|
| weak_factory_on_ui_thread_(this),
|
| ui_thread_weak_ptr_(weak_factory_on_ui_thread_.GetWeakPtr()),
|
| - compositor_(NULL),
|
| - memory_policy_dirty_(false),
|
| hardware_allowed_(false),
|
| hardware_initialized_(false),
|
| share_context_(NULL) {
|
| @@ -55,34 +50,6 @@ void SharedRendererState::ClientRequestDrawGLOnUIThread() {
|
| }
|
| }
|
|
|
| -void SharedRendererState::SetCompositorOnUiThread(
|
| - content::SynchronousCompositor* compositor) {
|
| - base::AutoLock lock(lock_);
|
| - DCHECK(ui_loop_->BelongsToCurrentThread());
|
| - compositor_ = compositor;
|
| -}
|
| -
|
| -content::SynchronousCompositor* SharedRendererState::GetCompositor() {
|
| - base::AutoLock lock(lock_);
|
| - DCHECK(compositor_);
|
| - return compositor_;
|
| -}
|
| -
|
| -void SharedRendererState::SetMemoryPolicy(
|
| - const content::SynchronousCompositorMemoryPolicy new_policy) {
|
| - base::AutoLock lock(lock_);
|
| - if (memory_policy_ != new_policy) {
|
| - memory_policy_ = new_policy;
|
| - memory_policy_dirty_ = true;
|
| - }
|
| -}
|
| -
|
| -content::SynchronousCompositorMemoryPolicy
|
| -SharedRendererState::GetMemoryPolicy() const {
|
| - base::AutoLock lock(lock_);
|
| - return memory_policy_;
|
| -}
|
| -
|
| void SharedRendererState::SetDrawGLInput(scoped_ptr<DrawGLInput> input) {
|
| base::AutoLock lock(lock_);
|
| DCHECK(!draw_gl_input_.get());
|
| @@ -126,16 +93,6 @@ gpu::GLInProcessContext* SharedRendererState::GetSharedContext() const {
|
| return share_context_;
|
| }
|
|
|
| -void SharedRendererState::SetMemoryPolicyDirty(bool is_dirty) {
|
| - base::AutoLock lock(lock_);
|
| - memory_policy_dirty_ = is_dirty;
|
| -}
|
| -
|
| -bool SharedRendererState::IsMemoryPolicyDirty() const {
|
| - base::AutoLock lock(lock_);
|
| - return memory_policy_dirty_;
|
| -}
|
| -
|
| void SharedRendererState::ReturnResources(
|
| const cc::TransferableResourceArray& input) {
|
| base::AutoLock lock(lock_);
|
|
|