aw: Ubercomp mega patch

android_webview/browser/shared_renderer_state.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "android_webview/browser/shared_renderer_state.h"
 
 #include "android_webview/browser/browser_view_renderer_client.h"
 #include "base/bind.h"
 #include "base/location.h"
 
 namespace android_webview {
 
 DrawGLInput::DrawGLInput() : frame_id(0), width(0), height(0) {}
 
+DrawGLInput::~DrawGLInput() {}
+
 DrawGLResult::DrawGLResult() : frame_id(0), clip_contains_visible_rect(false) {}
 
+DrawGLResult::~DrawGLResult() {}
+
 SharedRendererState::SharedRendererState(
     scoped_refptr<base::MessageLoopProxy> ui_loop,
     BrowserViewRendererClient* client)
     : ui_loop_(ui_loop),
       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_initialized_(false) {
@@ skipping 42 matching lines @@
     memory_policy_dirty_ = true;
   }
 }
 
 content::SynchronousCompositorMemoryPolicy
 SharedRendererState::GetMemoryPolicy() const {
   base::AutoLock lock(lock_);
   return memory_policy_;
 }
 
-void SharedRendererState::SetDrawGLInput(const DrawGLInput& input) {
+scoped_ptr<DrawGLInput> SharedRendererState::SetDrawGLInput(scoped_ptr<DrawGLInput> input) {
   base::AutoLock lock(lock_);
-  draw_gl_input_ = input;
+  scoped_ptr<DrawGLInput> old_input = draw_gl_input_.Pass();
+  draw_gl_input_ = input.Pass();
+  return old_input.Pass();
 }
 
-DrawGLInput SharedRendererState::GetDrawGLInput() const {
+scoped_ptr<DrawGLInput> SharedRendererState::PassDrawGLInput() {
   base::AutoLock lock(lock_);
-  return draw_gl_input_;
+  return draw_gl_input_.Pass();
 }
 
 void SharedRendererState::ClearClosureQueue() {
   base::AutoLock lock(lock_);
   std::queue<base::Closure> empty;
   std::swap(closure_queue_, empty);
 }
 
 void SharedRendererState::AppendClosure(const base::Closure& closure) {
   base::AutoLock lock(lock_);
@@ skipping 25 matching lines @@
 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_);
+  cc::TransferableResource::ReturnResources(input, &returned_resources_);
+}
+
+void SharedRendererState::InsertReturnedResources(
+    const cc::ReturnedResourceArray& resources) {
+  base::AutoLock lock(lock_);
+  returned_resources_.insert(
+      returned_resources_.end(), resources.begin(), resources.end());
+}
+
+void SharedRendererState::SwapReturnedResources(
+    cc::ReturnedResourceArray* resources) {
+  base::AutoLock lock(lock_);
+  resources->swap(returned_resources_);
+}
+
+bool SharedRendererState::ReturnedResourcesEmpty() const {
+  base::AutoLock lock(lock_);
+  return returned_resources_.empty();
+}
+
 }  // namespace android_webview