Fix flickering when resizing pepper plugins.

webkit/glue/plugins/pepper_plugin_instance.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/glue/plugins/pepper_plugin_instance.h"
 
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #if defined(OS_MACOSX)
 #include "base/mac_util.h"
@@ skipping 419 matching lines @@
   }
 
   scoped_refptr<Graphics2D> graphics_2d =
       Resource::GetAs<Graphics2D>(graphics_id);
   scoped_refptr<Graphics3D> graphics_3d =
       Resource::GetAs<Graphics3D>(graphics_id);
 
   if (graphics_2d) {
     if (!graphics_2d->BindToInstance(this))
       return false;  // Can't bind to more than one instance.
-    bound_graphics_ = graphics_2d;
 
     // See http://crbug.com/49403: this can be further optimized by keeping the
     // old device around and painting from it.
     if (bound_graphics_2d()) {
       // Start the new image with the content of the old image until the plugin
       // repaints.
       const SkBitmap* old_backing_bitmap =
           bound_graphics_2d()->image_data()->GetMappedBitmap();
       SkRect old_size = SkRect::MakeWH(
           SkScalar(static_cast<float>(old_backing_bitmap->width())),
           SkScalar(static_cast<float>(old_backing_bitmap->height())));
 
       SkCanvas canvas(*graphics_2d->image_data()->GetMappedBitmap());
       canvas.drawBitmap(*old_backing_bitmap, 0, 0);
 
       // Fill in any extra space with white.
       canvas.clipRect(old_size, SkRegion::kDifference_Op);
       canvas.drawARGB(255, 255, 255, 255);
     }
 
     // BindToInstance will have invalidated the plugin if necessary.
+    bound_graphics_ = graphics_2d;
   } else if (graphics_3d) {
     if (!graphics_3d->BindToInstance(this))
       return false;
 
     bound_graphics_ = graphics_3d;
     bound_graphics_3d()->SetSwapBuffersCallback(
         NewCallback(this, &PluginInstance::CommitBackingTexture));
   }
 
   return true;
@@ skipping 691 matching lines @@
 }
 
 Graphics3D* PluginInstance::bound_graphics_3d() const {
   if (bound_graphics_.get() == NULL)
     return NULL;
 
   return bound_graphics_->Cast<Graphics3D>();
 }
 
 }  // namespace pepper