Android WebView: fix missing an invalidate

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/lazy_instance.h"
 #include "base/location.h"
@@ skipping 63 matching lines @@
 }
 
 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()),
       inside_hardware_release_(false),
+      needs_force_invalidate_on_next_draw_gl_(false),
       share_context_(NULL) {
   DCHECK(ui_loop_->BelongsToCurrentThread());
   DCHECK(client_on_ui_);
   ResetRequestDrawGLCallback();
 }
 
 SharedRendererState::~SharedRendererState() {
   DCHECK(ui_loop_->BelongsToCurrentThread());
 }
 
@@ skipping 45 matching lines @@
   base::AutoLock lock(lock_);
   DCHECK(!draw_gl_input_.get());
   draw_gl_input_ = input.Pass();
 }
 
 scoped_ptr<DrawGLInput> SharedRendererState::PassDrawGLInput() {
   base::AutoLock lock(lock_);
   return draw_gl_input_.Pass();
 }
 
-void SharedRendererState::UpdateDrawConstraints(
+bool SharedRendererState::UpdateDrawConstraints(
     const ParentCompositorDrawConstraints& parent_draw_constraints) {
   base::AutoLock lock(lock_);
-  parent_draw_constraints_ = parent_draw_constraints;
+  if (needs_force_invalidate_on_next_draw_gl_ ||
+      !parent_draw_constraints_.Equals(parent_draw_constraints)) {
+    parent_draw_constraints_ = parent_draw_constraints;
+    return true;
+  }
+
+  return false;
 }
 
 void SharedRendererState::PostExternalDrawConstraintsToChildCompositor(
     const ParentCompositorDrawConstraints& parent_draw_constraints) {
-  UpdateDrawConstraints(parent_draw_constraints);
-
-  // No need to hold the lock_ during the post task.
-  ui_loop_->PostTask(
-      FROM_HERE,
-      base::Bind(&SharedRendererState::UpdateParentDrawConstraintsOnUIThread,
-                 ui_thread_weak_ptr_));
+  if (UpdateDrawConstraints(parent_draw_constraints)) {
+    // No need to hold the lock_ during the post task.
+    ui_loop_->PostTask(
+        FROM_HERE,
+        base::Bind(&SharedRendererState::UpdateParentDrawConstraintsOnUIThread,
+                   ui_thread_weak_ptr_));
+  }
 }
 
 const ParentCompositorDrawConstraints
 SharedRendererState::ParentDrawConstraints() const {
   base::AutoLock lock(lock_);
   return parent_draw_constraints_;
 }
 
+void SharedRendererState::SetForceInvalidateOnNextDrawGL(
+    bool needs_force_invalidate_on_next_draw_gl) {
+  base::AutoLock lock(lock_);
+  needs_force_invalidate_on_next_draw_gl_ =
+      needs_force_invalidate_on_next_draw_gl;
+}
+
+bool SharedRendererState::NeedsForceInvalidateOnNextDrawGL() const {
+  base::AutoLock lock(lock_);
+  return needs_force_invalidate_on_next_draw_gl_;
+}
+
 void SharedRendererState::SetInsideHardwareRelease(bool inside) {
   base::AutoLock lock(lock_);
   inside_hardware_release_ = inside;
 }
 
 bool SharedRendererState::IsInsideHardwareRelease() const {
   base::AutoLock lock(lock_);
   return inside_hardware_release_;
 }
 
@@ skipping 33 matching lines @@
     : shared_renderer_state_(shared_renderer_state) {
   DCHECK(!shared_renderer_state_->IsInsideHardwareRelease());
   shared_renderer_state_->SetInsideHardwareRelease(true);
 }
 
 InsideHardwareReleaseReset::~InsideHardwareReleaseReset() {
   shared_renderer_state_->SetInsideHardwareRelease(false);
 }
 
 }  // namespace android_webview