Prevent recursive calls to globalFrameDidChange.

content/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 "content/browser/renderer_host/accelerated_plugin_view_mac.h"
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/renderer_host/render_widget_host_view_mac.h"
@@ skipping 54 matching lines @@
       LOG(ERROR) << "CGLPixelFormatObj failed";
 
     // Draw at beam vsync.
     GLint swapInterval;
     if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableGpuVsync))
       swapInterval = 0;
     else
       swapInterval = 1;
     [glContext_ setValues:&swapInterval forParameter:NSOpenGLCPSwapInterval];
 
+    handlingGlobalFrameDidChange_ = NO;
     [[NSNotificationCenter defaultCenter]
          addObserver:self
             selector:@selector(globalFrameDidChange:)
                 name:NSViewGlobalFrameDidChangeNotification
               object:self];
   }
   return self;
 }
 
 - (void)dealloc {
@@ skipping 59 matching lines @@
 - (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];
 }
 
 - (void)globalFrameDidChange:(NSNotification*)notification {
-  // This call to -update can call -globalFrameDidChange: again, see
-  // http://crbug.com/55754 comments 22 and 24.
-  [glContext_ update];
+  // Short-circuit recursive calls.
+  if (!handlingGlobalFrameDidChange_) {

[Nico, 2011/10/13 02:26:07]

nit: early return instead, less nesting that way.

[Ken Russell (switch to Gerrit), 2011/10/13 18:41:20]

Right, thanks. Done.

+    handlingGlobalFrameDidChange_ = YES;
 
-  // You would think that -update updates the viewport. You would be wrong.
-  CGLSetCurrentContext(cglContext_);
-  NSSize size = [self frame].size;
-  glViewport(0, 0, size.width, size.height);
-  CGLSetCurrentContext(0);
+    // This call to -update can call -globalFrameDidChange: again, see
+    // http://crbug.com/55754 comments 22 and 24.
+    [glContext_ update];
+
+    // You would think that -update updates the viewport. You would be wrong.
+    CGLSetCurrentContext(cglContext_);
+    NSSize size = [self frame].size;
+    glViewport(0, 0, size.width, size.height);
+    CGLSetCurrentContext(0);
+
+    handlingGlobalFrameDidChange_ = NO;
+  }
 }
 
 - (void)prepareForGLRendering {
   TRACE_EVENT0("browser", "AcceleratedPluginView::prepareForGLRendering");
 
   // If we're using OpenGL, make sure it is connected.
   if ([glContext_ view] != self) {
     [glContext_ setView:self];
   }
 }
@@ skipping 65 matching lines @@
   return YES;
 }
 
 - (void)viewDidMoveToSuperview {
   TRACE_EVENT0("browser", "AcceleratedPluginView::viewDidMoveToSuperview");
   if (![self superview])
     [self onRenderWidgetHostViewGone];
 }
 @end