| Index: chrome/browser/renderer_host/render_widget_host_view_mac.mm
|
| diff --git a/chrome/browser/renderer_host/render_widget_host_view_mac.mm b/chrome/browser/renderer_host/render_widget_host_view_mac.mm
|
| index a9198dc08357d941c2effe5c4ab6a366462e913e..a878ccca67af0cc6895e33f741ef917e12fdf4fd 100644
|
| --- a/chrome/browser/renderer_host/render_widget_host_view_mac.mm
|
| +++ b/chrome/browser/renderer_host/render_widget_host_view_mac.mm
|
| @@ -290,6 +290,8 @@ static CVReturn DrawOneAcceleratedPluginCallback(
|
| - (void)globalFrameDidChange:(NSNotification*)notification {
|
| globalFrameDidChangeCGLLockCount_++;
|
| CGLLockContext(cglContext_);
|
| + // 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.
|
| @@ -346,8 +348,8 @@ static CVReturn DrawOneAcceleratedPluginCallback(
|
| CVDisplayLinkStop(displayLink_);
|
| }
|
|
|
| - // If hole pushing is enabled, inform the window hosing this accelerated view
|
| - // that it needs to be opaque.
|
| + // 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)]) {
|
|
|