summaryrefslogtreecommitdiffstats
path: root/chrome/browser/renderer_host
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-27 17:37:14 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-27 17:37:14 +0000
commit8ac4d049881d29f20676f702404902e96b254e09 (patch)
tree578889b3567413896ae4e5c1526a9513c7ae2ff0 /chrome/browser/renderer_host
parentec0c0387de76b0e1b9028eb14ca8ef937275e5d5 (diff)
downloadchromium_src-8ac4d049881d29f20676f702404902e96b254e09.zip
chromium_src-8ac4d049881d29f20676f702404902e96b254e09.tar.gz
chromium_src-8ac4d049881d29f20676f702404902e96b254e09.tar.bz2
Mac: Don't crash in -[AcceleratedPluginView drawView] when the RWHVMac went away.
I should've added this check in http://codereview.chromium.org/3534010 but failed to do so. BUG=58902 TEST=fewer crashes on the crash servers Review URL: http://codereview.chromium.org/4141005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64095 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/renderer_host')
-rw-r--r--chrome/browser/renderer_host/render_widget_host_view_mac.mm8
1 files changed, 5 insertions, 3 deletions
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 9e5c6e7..68435a2 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_mac.mm
+++ b/chrome/browser/renderer_host/render_widget_host_view_mac.mm
@@ -283,9 +283,11 @@ static CVReturn DrawOneAcceleratedPluginCallback(
// Called on a background thread. Synchronized via the CGL context lock.
CGLLockContext(cglContext_);
- // TODO(thakis): Pixel or view coordinates for size?
- renderWidgetHostView_->DrawAcceleratedSurfaceInstance(
- cglContext_, pluginHandle_, [self cachedSize]);
+ if (renderWidgetHostView_) {
+ // TODO(thakis): Pixel or view coordinates for size?
+ renderWidgetHostView_->DrawAcceleratedSurfaceInstance(
+ cglContext_, pluginHandle_, [self cachedSize]);
+ }
CGLFlushDrawable(cglContext_);
CGLUnlockContext(cglContext_);