summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorbrettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-15 15:40:07 +0000
committerbrettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-15 15:40:07 +0000
commit32d792580c3685b549541109bb294e7a6f5b6def (patch)
tree2c22372306839ced671ab6f0a990833f129d812b /webkit
parent25d6efeb2b684156a88e525e054a0f69e7f215d3 (diff)
downloadchromium_src-32d792580c3685b549541109bb294e7a6f5b6def.zip
chromium_src-32d792580c3685b549541109bb294e7a6f5b6def.tar.gz
chromium_src-32d792580c3685b549541109bb294e7a6f5b6def.tar.bz2
Force 2D graphics binding to require that the context be associated with the same instance. The 3D case was already handled.
BUG=75519 TEST=none Review URL: http://codereview.chromium.org/7165002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89193 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/plugins/ppapi/ppapi_plugin_instance.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.cc b/webkit/plugins/ppapi/ppapi_plugin_instance.cc
index e73cf09..a740527 100644
--- a/webkit/plugins/ppapi/ppapi_plugin_instance.cc
+++ b/webkit/plugins/ppapi/ppapi_plugin_instance.cc
@@ -534,6 +534,8 @@ bool PluginInstance::BindGraphics(PP_Resource graphics_id) {
// Refuse to bind if we're transitioning to fullscreen.
if (fullscreen_container_ && !fullscreen_)
return false;
+ if (graphics_2d->instance() != this)
+ return false; // Can't bind other instance's contexts.
if (!graphics_2d->BindToInstance(this))
return false; // Can't bind to more than one instance.