Merge 84218 - Mac: Remove switches::kDisableHolePunching

chrome/browser/renderer_host/accelerated_plugin_view_mac.mm

 // Copyright (c) 2011 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.
 
 #import "chrome/browser/renderer_host/accelerated_plugin_view_mac.h"
 
 #include "base/command_line.h"
 #import "base/mac/scoped_nsautorelease_pool.h"
 #include "chrome/browser/renderer_host/render_widget_host_view_mac.h"
 #include "chrome/common/chrome_switches.h"
@@ skipping 56 matching lines @@
     [self setAutoresizingMask:NSViewMaxXMargin|NSViewMinYMargin];
 
     NSOpenGLPixelFormatAttribute attributes[] =
         { NSOpenGLPFAAccelerated, NSOpenGLPFADoubleBuffer, 0};
 
     glPixelFormat_.reset([[NSOpenGLPixelFormat alloc]
         initWithAttributes:attributes]);
     glContext_.reset([[NSOpenGLContext alloc] initWithFormat:glPixelFormat_
                                                 shareContext:nil]);
 
-    if (!CommandLine::ForCurrentProcess()->HasSwitch(
-        switches::kDisableHolePunching)) {
-      // We "punch a hole" in the window, and have the WindowServer render the
-      // OpenGL surface underneath so we can draw over it.
-      GLint belowWindow = -1;
-      [glContext_ setValues:&belowWindow forParameter:NSOpenGLCPSurfaceOrder];
-    }
+    // We "punch a hole" in the window, and have the WindowServer render the
+    // OpenGL surface underneath so we can draw over it.
+    GLint belowWindow = -1;
+    [glContext_ setValues:&belowWindow forParameter:NSOpenGLCPSurfaceOrder];
 
     cglContext_ = (CGLContextObj)[glContext_ CGLContextObj];
     cglPixelFormat_ = (CGLPixelFormatObj)[glPixelFormat_ CGLPixelFormatObj];
 
     // Draw at beam vsync.
     GLint swapInterval;
     if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableGpuVsync))
       swapInterval = 0;
     else
       swapInterval = 1;
@@ skipping 54 matching lines @@
     return;
 
   CGLLockContext(cglContext_);
   // Deallocate the plugin handle while we still can.
   renderWidgetHostView_->DeallocFakePluginWindowHandle(pluginHandle_);
   renderWidgetHostView_ = NULL;
   CGLUnlockContext(cglContext_);
 }
 
 - (void)drawRect:(NSRect)rect {
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kDisableHolePunching)) {
-    const NSRect* dirtyRects;
-    int dirtyRectCount;
-    [self getRectsBeingDrawn:&dirtyRects count:&dirtyRectCount];
+  const NSRect* dirtyRects;
+  int dirtyRectCount;
+  [self getRectsBeingDrawn:&dirtyRects count:&dirtyRectCount];
 
-    gfx::ScopedNSGraphicsContextSaveGState scopedGState;
+  gfx::ScopedNSGraphicsContextSaveGState scopedGState;
 
-    // Mask out any cutout rects--somewhat counterintuitively cutout rects are
-    // places where clearColor is *not* drawn. The trick is that drawing nothing
-    // lets the parent view (i.e., the web page) show through, whereas drawing
-    // clearColor punches a hole in the window (letting OpenGL show through).
-    if ([cutoutRects_.get() count] > 0) {
-      NSBezierPath* path = [NSBezierPath bezierPath];
-      // Trace the bounds clockwise to give a base clip rect of the whole view.
-      NSRect bounds = [self bounds];
-      [path moveToPoint:bounds.origin];
-      [path lineToPoint:NSMakePoint(NSMinX(bounds), NSMaxY(bounds))];
-      [path lineToPoint:NSMakePoint(NSMaxX(bounds), NSMaxY(bounds))];
-      [path lineToPoint:NSMakePoint(NSMaxX(bounds), NSMinY(bounds))];
-      [path closePath];
+  // Mask out any cutout rects--somewhat counterintuitively cutout rects are
+  // places where clearColor is *not* drawn. The trick is that drawing nothing
+  // lets the parent view (i.e., the web page) show through, whereas drawing
+  // clearColor punches a hole in the window (letting OpenGL show through).
+  if ([cutoutRects_.get() count] > 0) {
+    NSBezierPath* path = [NSBezierPath bezierPath];
+    // Trace the bounds clockwise to give a base clip rect of the whole view.
+    NSRect bounds = [self bounds];
+    [path moveToPoint:bounds.origin];
+    [path lineToPoint:NSMakePoint(NSMinX(bounds), NSMaxY(bounds))];
+    [path lineToPoint:NSMakePoint(NSMaxX(bounds), NSMaxY(bounds))];
+    [path lineToPoint:NSMakePoint(NSMaxX(bounds), NSMinY(bounds))];
+    [path closePath];
 
-      // Then trace each cutout rect counterclockwise to remove that region from
-      // the clip region.
-      for (NSValue* rectWrapper in cutoutRects_.get()) {
-        [path appendBezierPathWithRect:[rectWrapper rectValue]];
-      }
-
-      [path addClip];
+    // Then trace each cutout rect counterclockwise to remove that region from
+    // the clip region.
+    for (NSValue* rectWrapper in cutoutRects_.get()) {
+      [path appendBezierPathWithRect:[rectWrapper rectValue]];
     }
 
-    // Punch a hole so that the OpenGL view shows through.
-    [[NSColor clearColor] set];
-    NSRectFillList(dirtyRects, dirtyRectCount);
+    [path addClip];
   }
 
+  // Punch a hole so that the OpenGL view shows through.
+  [[NSColor clearColor] set];
+  NSRectFillList(dirtyRects, dirtyRectCount);
+
   [self drawView];
 }
 
 - (void)rightMouseDown:(NSEvent*)event {
   // The NSResponder documentation: "Note: The NSView implementation of this
   // method does not pass the message up the responder chain, it handles it
   // directly."
   // That's bad, we want the next responder (RWHVMac) to handle this event to
   // dispatch it to the renderer.
   [[self nextResponder] rightMouseDown:event];
@@ skipping 54 matching lines @@
 - (void)viewWillMoveToWindow:(NSWindow*)newWindow {
   // Stop the display link thread while the view is not visible.
   if (newWindow) {
     if (displayLink_ && !CVDisplayLinkIsRunning(displayLink_))
       CVDisplayLinkStart(displayLink_);
   } else {
     if (displayLink_ && CVDisplayLinkIsRunning(displayLink_))
       CVDisplayLinkStop(displayLink_);
   }
 
-  // If hole punching is enabled, inform the window hosting this accelerated
-  // view that it needs to be opaque.
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kDisableHolePunching)) {
-    if ([[self window] respondsToSelector:@selector(underlaySurfaceRemoved)]) {
-      [static_cast<id>([self window]) underlaySurfaceRemoved];
-    }
-
-    if ([newWindow respondsToSelector:@selector(underlaySurfaceAdded)]) {
-      [static_cast<id>(newWindow) underlaySurfaceAdded];
-    }
+  // Inform the window hosting this accelerated view that it needs to be
+  // transparent.
+  if ([[self window] respondsToSelector:@selector(underlaySurfaceRemoved)]) {
+    [static_cast<id>([self window]) underlaySurfaceRemoved];
+  }
+  if ([newWindow respondsToSelector:@selector(underlaySurfaceAdded)]) {
+    [static_cast<id>(newWindow) underlaySurfaceAdded];
   }
 }
 
 - (void)setFrame:(NSRect)frameRect {
   [self setCachedSize:frameRect.size];
   [super setFrame:frameRect];
 }
 
 - (void)setFrameSize:(NSSize)newSize {
   [self setCachedSize:newSize];
@@ skipping 13 matching lines @@
   [[self window] makeFirstResponder:[self superview]];
   return YES;
 }
 
 - (void)viewDidMoveToSuperview {
   if (![self superview])
     [self onRenderWidgetHostViewGone];
 }
 @end