[Android] Allow redundant |StartObservingRootWindow()| calls

Redundant requests to observe the window are harmless, and should be supported given the undefined relationship and timing between |RWHVAndroid::SetContentViewCore()| and |RWHVAndroid::WasShown()|, both of which can trigger observing of the root window. BUG=406651,394604 NOTRY=true [email protected] Review URL: https://codereview.chromium.org/493053004 Cr-Commit-Position: refs/heads/master@{#291596}
crosswalk-project · Aug 23, 2014 · 789317e · 789317e
1 parent 24f0da6
commit 789317e
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc
@@ -1266,7 +1266,9 @@ void RenderWidgetHostViewAndroid::RequestVSyncUpdate(uint32 requests) {
 
 void RenderWidgetHostViewAndroid::StartObservingRootWindow() {
   DCHECK(content_view_core_);
-  DCHECK(!observing_root_window_);
+  if (observing_root_window_)
+    return;
+
   observing_root_window_ = true;
   content_view_core_->GetWindowAndroid()->AddObserver(this);