Mac gpu: on gpu<->nongpu transitions, make sure to not show uninitialized memory

chrome/browser/renderer_host/render_widget_host_view_mac.mm

 // Copyright (c) 2010 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 <QuartzCore/QuartzCore.h>
 
 #include "chrome/browser/renderer_host/render_widget_host_view_mac.h"
 
 #include "app/app_switches.h"
 #include "app/surface/io_surface_support_mac.h"
@@ skipping 432 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 // RenderWidgetHostViewMac, public:
 
 RenderWidgetHostViewMac::RenderWidgetHostViewMac(RenderWidgetHost* widget)
     : render_widget_host_(widget),
       about_to_validate_and_paint_(false),
       call_set_needs_display_in_rect_pending_(false),
       text_input_type_(WebKit::WebTextInputTypeNone),
       is_loading_(false),
       is_hidden_(false),
-      shutdown_factory_(this) {
+      shutdown_factory_(this),
+      needs_gpu_visibility_update_after_repaint_(false) {
   // |cocoa_view_| owns us and we will be deleted when |cocoa_view_| goes away.
   // Since we autorelease it, our caller must put |native_view()| into the view
   // hierarchy right after calling us.
   cocoa_view_ = [[[RenderWidgetHostViewCocoa alloc]
                   initWithRenderWidgetHostViewMac:this] autorelease];
   render_widget_host_->set_view(this);
 
   // Turn on accessibility only if VoiceOver is running.
   if (IsVoiceOverRunning()) {
     Singleton<BrowserAccessibilityState>()->OnScreenReaderDetected();
@@ skipping 215 matching lines @@
   [cocoa_view_ setCaretRect:[cocoa_view_ flipRectToNSRect:caret_rect]];
 }
 
 void RenderWidgetHostViewMac::ImeCancelComposition() {
   [cocoa_view_ cancelComposition];
 }
 
 void RenderWidgetHostViewMac::DidUpdateBackingStore(
     const gfx::Rect& scroll_rect, int scroll_dx, int scroll_dy,
     const std::vector<gfx::Rect>& copy_rects) {
-  if (is_hidden_)
-    return;
+  if (!is_hidden_) {
+    std::vector<gfx::Rect> rects(copy_rects);
 
-  std::vector<gfx::Rect> rects(copy_rects);
+    // Because the findbar might be open, we cannot use scrollRect:by: here.  For
+    // now, simply mark all of scroll rect as dirty.
+    if (!scroll_rect.IsEmpty())
+      rects.push_back(scroll_rect);
 
-  // Because the findbar might be open, we cannot use scrollRect:by: here.  For
-  // now, simply mark all of scroll rect as dirty.
-  if (!scroll_rect.IsEmpty())
-    rects.push_back(scroll_rect);
+    for (size_t i = 0; i < rects.size(); ++i) {
+      NSRect ns_rect = [cocoa_view_ flipRectToNSRect:rects[i]];
 
-  for (size_t i = 0; i < rects.size(); ++i) {
-    NSRect ns_rect = [cocoa_view_ flipRectToNSRect:rects[i]];
+      if (about_to_validate_and_paint_) {
+        // As much as we'd like to use -setNeedsDisplayInRect: here, we can't.
+        // We're in the middle of executing a -drawRect:, and as soon as it
+        // returns Cocoa will clear its record of what needs display. We
+        // instead use |performSelector:| to call |setNeedsDisplayInRect:|
+        // after returning to the main loop, at which point |drawRect:| is no
+        // longer on the stack.
+        DCHECK([NSThread isMainThread]);
+        if (!call_set_needs_display_in_rect_pending_) {
+          [cocoa_view_ performSelector:@selector(callSetNeedsDisplayInRect)
+                       withObject:nil
+                       afterDelay:0];
+          call_set_needs_display_in_rect_pending_ = true;
+          invalid_rect_ = ns_rect;
+        } else {
+          // The old invalid rect is probably invalid now, since the view has
+          // most likely been resized, but there's no harm in dirtying the
+          // union.  In the limit, this becomes equivalent to dirtying the
+          // whole view.
+          invalid_rect_ = NSUnionRect(invalid_rect_, ns_rect);
+        }
+      } else {
+        [cocoa_view_ setNeedsDisplayInRect:ns_rect];
+      }
+    }
 
-    if (about_to_validate_and_paint_) {
-      // As much as we'd like to use -setNeedsDisplayInRect: here, we can't.
-      // We're in the middle of executing a -drawRect:, and as soon as it
-      // returns Cocoa will clear its record of what needs display. We instead
-      // use |performSelector:| to call |setNeedsDisplayInRect:| after returning
-      // to the main loop, at which point |drawRect:| is no longer on the stack.
-      DCHECK([NSThread isMainThread]);
-      if (!call_set_needs_display_in_rect_pending_) {
-        [cocoa_view_ performSelector:@selector(callSetNeedsDisplayInRect)
-                     withObject:nil
-                     afterDelay:0];
-        call_set_needs_display_in_rect_pending_ = true;
-        invalid_rect_ = ns_rect;
-      } else {
-        // The old invalid rect is probably invalid now, since the view has most
-        // likely been resized, but there's no harm in dirtying the union.  In
-        // the limit, this becomes equivalent to dirtying the whole view.
-        invalid_rect_ = NSUnionRect(invalid_rect_, ns_rect);
-      }
-    } else {
-      [cocoa_view_ setNeedsDisplayInRect:ns_rect];
-    }
+    if (!about_to_validate_and_paint_)
+      [cocoa_view_ displayIfNeeded];
   }
 
+  // If |about_to_validate_and_paint_| is set, then -drawRect: is on the stack
+  // and it's not allowed to call -setHidden on the accelerated view.  In that
+  // case, -callSetNeedsDisplayInRect: will hide it later.
+  // If |about_to_validate_and_paint_| is not set, do it now.
   if (!about_to_validate_and_paint_)
-    [cocoa_view_ displayIfNeeded];
+    HandleDelayedGpuViewHiding();
 }
 
 void RenderWidgetHostViewMac::RenderViewGone() {
   // TODO(darin): keep this around, and draw sad-tab into it.
   UpdateCursorIfOverSelf();
   Destroy();
 }
 
 void RenderWidgetHostViewMac::Destroy() {
   // On Windows, popups are implemented with a popup window style, so that when
@@ skipping 197 matching lines @@
 
   plugin_container_manager_.SetSurfaceWasPaintedTo(window, surface_id);
   AcceleratedPluginView* view =
       static_cast<AcceleratedPluginView*>(it->second);
   // The surface is hidden until its first paint, to not show gargabe.
   if (plugin_container_manager_.SurfaceShouldBeVisible(window))
     [view setHidden:NO];
   [view setSurfaceWasSwapped:YES];
 }
 
-void RenderWidgetHostViewMac::GpuRenderingStateDidChange() {
-  CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+void RenderWidgetHostViewMac::UpdateRootGpuViewVisibility(
+    bool show_gpu_widget) {
   // Plugins are destroyed on page navigate. The compositor layer on the other
   // hand is created on demand and then stays alive until its renderer process
   // dies (usually on cross-domain navigation). Instead, only a flag
   // |is_gpu_rendering_active()| is flipped when the compositor output should be
   // shown/hidden.
   // Show/hide the view belonging to the compositor here.
-  plugin_container_manager_.set_gpu_rendering_active(
-      GetRenderWidgetHost()->is_gpu_rendering_active());
+  plugin_container_manager_.set_gpu_rendering_active(show_gpu_widget);
 
   gfx::PluginWindowHandle root_handle =
       plugin_container_manager_.root_container_handle();
   if (root_handle != gfx::kNullPluginWindow) {
     PluginViewMap::iterator it = plugin_views_.find(root_handle);
     DCHECK(plugin_views_.end() != it);
     if (plugin_views_.end() == it) {
       return;
     }
     bool visible =
         plugin_container_manager_.SurfaceShouldBeVisible(root_handle);
+    [[it->second window] disableScreenUpdatesUntilFlush];
     [it->second setHidden:!visible];
   }
 }
 
+void RenderWidgetHostViewMac::HandleDelayedGpuViewHiding() {
+  if (needs_gpu_visibility_update_after_repaint_) {
+    UpdateRootGpuViewVisibility(false);
+    needs_gpu_visibility_update_after_repaint_ = false;
+  }
+}
+
+void RenderWidgetHostViewMac::GpuRenderingStateDidChange() {
+  CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  if (GetRenderWidgetHost()->is_gpu_rendering_active()) {
+    UpdateRootGpuViewVisibility(
+        GetRenderWidgetHost()->is_gpu_rendering_active());
+  } else {
+    needs_gpu_visibility_update_after_repaint_ = true;
+  }
+}
+
 void RenderWidgetHostViewMac::DrawAcceleratedSurfaceInstance(
       CGLContextObj context,
       gfx::PluginWindowHandle plugin_handle,
       NSSize size) {
   // Called on the display link thread.
   CGLSetCurrentContext(context);
 
   glMatrixMode(GL_PROJECTION);
   glLoadIdentity();
   // Note that we place the origin at the upper left corner with +y
@@ skipping 510 matching lines @@
   if (renderWidgetHostView_->render_widget_host_)
     renderWidgetHostView_->render_widget_host_->WasResized();
 }
 
 - (void)callSetNeedsDisplayInRect {
   DCHECK([NSThread isMainThread]);
   DCHECK(renderWidgetHostView_->call_set_needs_display_in_rect_pending_);
   [self setNeedsDisplayInRect:renderWidgetHostView_->invalid_rect_];
   renderWidgetHostView_->call_set_needs_display_in_rect_pending_ = false;
   renderWidgetHostView_->invalid_rect_ = NSZeroRect;
+
+  renderWidgetHostView_->HandleDelayedGpuViewHiding();
 }
 
 // Fills with white the parts of the area to the right and bottom for |rect|
 // that intersect |damagedRect|.
 - (void)fillBottomRightRemainderOfRect:(gfx::Rect)rect
                              dirtyRect:(gfx::Rect)damagedRect {
   if (damagedRect.right() > rect.right()) {
     int x = std::max(rect.right(), damagedRect.x());
     int y = std::min(rect.bottom(), damagedRect.bottom());
     int width = damagedRect.right() - x;
@@ skipping 1024 matching lines @@
   if (!string) return NO;
 
   // If the user is currently using an IME, confirm the IME input,
   // and then insert the text from the service, the same as TextEdit and Safari.
   [self confirmComposition];
   [self insertText:string];
   return YES;
 }
 
 @end