| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_ACCELERATED_PLUGIN_VIEW_MAC_H | 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_ACCELERATED_PLUGIN_VIEW_MAC_H |
| 6 #define CONTENT_BROWSER_RENDERER_HOST_ACCELERATED_PLUGIN_VIEW_MAC_H | 6 #define CONTENT_BROWSER_RENDERER_HOST_ACCELERATED_PLUGIN_VIEW_MAC_H |
| 7 | 7 |
| 8 #import <Cocoa/Cocoa.h> | 8 #import <Cocoa/Cocoa.h> |
| 9 #include <QuartzCore/QuartzCore.h> | 9 #include <QuartzCore/QuartzCore.h> |
| 10 | 10 |
| (...skipping 15 matching lines...) Expand all Loading... |
| 26 scoped_nsobject<NSOpenGLPixelFormat> glPixelFormat_; | 26 scoped_nsobject<NSOpenGLPixelFormat> glPixelFormat_; |
| 27 CGLPixelFormatObj cglPixelFormat_; // weak, backed by |glPixelFormat_|. | 27 CGLPixelFormatObj cglPixelFormat_; // weak, backed by |glPixelFormat_|. |
| 28 scoped_nsobject<NSOpenGLContext> glContext_; | 28 scoped_nsobject<NSOpenGLContext> glContext_; |
| 29 CGLContextObj cglContext_; // weak, backed by |glContext_|. | 29 CGLContextObj cglContext_; // weak, backed by |glContext_|. |
| 30 | 30 |
| 31 RenderWidgetHostViewMac* renderWidgetHostView_; // weak | 31 RenderWidgetHostViewMac* renderWidgetHostView_; // weak |
| 32 gfx::PluginWindowHandle pluginHandle_; // weak | 32 gfx::PluginWindowHandle pluginHandle_; // weak |
| 33 | 33 |
| 34 // Rects that should show web content rather than plugin content. | 34 // Rects that should show web content rather than plugin content. |
| 35 scoped_nsobject<NSArray> cutoutRects_; | 35 scoped_nsobject<NSArray> cutoutRects_; |
| 36 |
| 37 BOOL handlingGlobalFrameDidChange_; |
| 36 } | 38 } |
| 37 | 39 |
| 38 - (id)initWithRenderWidgetHostViewMac:(RenderWidgetHostViewMac*)r | 40 - (id)initWithRenderWidgetHostViewMac:(RenderWidgetHostViewMac*)r |
| 39 pluginHandle:(gfx::PluginWindowHandle)pluginHandle; | 41 pluginHandle:(gfx::PluginWindowHandle)pluginHandle; |
| 40 | 42 |
| 41 // Sets the list of rectangles that should show the web page, rather than the | 43 // Sets the list of rectangles that should show the web page, rather than the |
| 42 // accelerated plugin. This is used to simulate the iframe-based trick that web | 44 // accelerated plugin. This is used to simulate the iframe-based trick that web |
| 43 // pages have long used to show web content above windowed plugins on Windows | 45 // pages have long used to show web content above windowed plugins on Windows |
| 44 // and Linux. | 46 // and Linux. |
| 45 - (void)setCutoutRects:(NSArray*)cutout_rects; | 47 - (void)setCutoutRects:(NSArray*)cutout_rects; |
| 46 | 48 |
| 47 // NSViews autorelease subviews when they die. The RWHVMac gets destroyed when | 49 // NSViews autorelease subviews when they die. The RWHVMac gets destroyed when |
| 48 // RHWVCocoa gets dealloc'd, which means the AcceleratedPluginView child views | 50 // RHWVCocoa gets dealloc'd, which means the AcceleratedPluginView child views |
| 49 // can be around a little longer than the RWHVMac. This is called when the | 51 // can be around a little longer than the RWHVMac. This is called when the |
| 50 // RWHVMac is about to be deleted (but it's still valid while this method runs). | 52 // RWHVMac is about to be deleted (but it's still valid while this method runs). |
| 51 - (void)onRenderWidgetHostViewGone; | 53 - (void)onRenderWidgetHostViewGone; |
| 52 | 54 |
| 53 // Draw the view from the UI thread. | 55 // Draw the view from the UI thread. |
| 54 - (void)drawView; | 56 - (void)drawView; |
| 55 | 57 |
| 56 @end | 58 @end |
| 57 | 59 |
| 58 #endif // CONTENT_BROWSER_RENDERER_HOST_ACCELERATED_PLUGIN_VIEW_MAC_H | 60 #endif // CONTENT_BROWSER_RENDERER_HOST_ACCELERATED_PLUGIN_VIEW_MAC_H |
| OLD | NEW |