Merge 93068 - Unbind currently bound surface before binding new surface.

BUG=chrome-os-partner:4967
TEST=manual

Review URL: http://codereview.chromium.org/7446008

TBR=reveman@google.com
Review URL: http://codereview.chromium.org/7446013

git-svn-id: svn://svn.chromium.org/chrome/branches/782/src@93072 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 11 insertions, 9 deletions

diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.cc b/webkit/plugins/ppapi/ppapi_plugin_instance.cc
index e73cf09..7d30d3b 100644
--- a/webkit/plugins/ppapi/ppapi_plugin_instance.cc
+++ b/webkit/plugins/ppapi/ppapi_plugin_instance.cc
@@ -510,20 +510,22 @@ PP_Var PluginInstance::GetOwnerElementObject() {
 }
 
 bool PluginInstance::BindGraphics(PP_Resource graphics_id) {
-  if (!graphics_id) {
+  if (bound_graphics_.get()) {
+    if (bound_graphics_2d()) {
+      bound_graphics_2d()->BindToInstance(NULL);
+    } else if (bound_graphics_.get()) {
+      bound_graphics_3d()->BindToInstance(false);
+    }
     // Special-case clearing the current device.
-    if (bound_graphics_.get()) {
-      if (bound_graphics_2d()) {
-        bound_graphics_2d()->BindToInstance(NULL);
-      } else if (bound_graphics_.get()) {
-        bound_graphics_3d()->BindToInstance(false);
-      }
+    if (!graphics_id) {
       setBackingTextureId(0);
       InvalidateRect(gfx::Rect());
     }
-    bound_graphics_ = NULL;
-    return true;
   }
+  bound_graphics_ = NULL;
+
+  if (!graphics_id)
+    return true;
 
   scoped_refptr<PPB_Graphics2D_Impl> graphics_2d =
       Resource::GetAs<PPB_Graphics2D_Impl>(graphics_id);