summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorstuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-03 23:15:33 +0000
committerstuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-03 23:15:33 +0000
commit23607ccf23fce3ea302ba779a41e102fc3462dea (patch)
tree8a509d6c74efb53a335dacb23785a748cc6c7765 /webkit
parente150e821ae4aaeb16ed820724e1ca503de3c5319 (diff)
downloadchromium_src-23607ccf23fce3ea302ba779a41e102fc3462dea.zip
chromium_src-23607ccf23fce3ea302ba779a41e102fc3462dea.tar.gz
chromium_src-23607ccf23fce3ea302ba779a41e102fc3462dea.tar.bz2
Fix a bug in NPDrawingModelInvalidatingCoreAnimation, and make it more efficient
Fixes a conditional mistake introduced with the new drawing model. Skips unnecessary work when a NPDrawingModelInvalidatingCoreAnimation plugin calls invalidate. Removes some obsolete comments (the renaming in question already happened) BUG=None TEST=Core Animation plugins still work Review URL: http://codereview.chromium.org/2578004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48891 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/glue/plugins/webplugin_delegate_impl_mac.mm3
1 files changed, 1 insertions, 2 deletions
diff --git a/webkit/glue/plugins/webplugin_delegate_impl_mac.mm b/webkit/glue/plugins/webplugin_delegate_impl_mac.mm
index 9664534..5d85208 100644
--- a/webkit/glue/plugins/webplugin_delegate_impl_mac.mm
+++ b/webkit/glue/plugins/webplugin_delegate_impl_mac.mm
@@ -394,8 +394,7 @@ bool WebPluginDelegateImpl::PlatformInitialize() {
// Let the WebPlugin know that we are windowless (unless this is a
// Core Animation plugin, in which case BindFakePluginWindowHandle will take
// care of setting up the appropriate window handle).
- if (drawing_model != NPDrawingModelCoreAnimation ||
- drawing_model != NPDrawingModelInvalidatingCoreAnimation)
+ if (!layer_)
plugin_->SetWindow(NULL);
#ifndef NP_NO_CARBON