Mac Flash: Fix scaling bitmap

There was a bug in the Flash code that caused a render crash. To reproduce the crash you had to do the following:
  - run on a Retina device
  - disable accelerated compositing
  - enable click to play
In this case playing a flash video would crash the renderer.

The problem was that we were incorrectly calculating the scaled rect of a bitmap.

For example, when the pixel size of the bitmap is 1x1 the scaled size should be 0x0. Instead we were rounding up and returning a scaled valeu of 1x1.

Fix was to use ToEnclosedRect instead of ToEnclosingRect.

BUG=155309
TBR=brettw@chromium.org

Review URL: https://chromiumcodereview.appspot.com/11146009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162384 0039d316-1c4b-4281-b951-d872f2087c98

webkit/plugins/ppapi/mock_platform_image_2d.cc

+// Copyright (c) 2012 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/plugins/ppapi/mock_platform_image_2d.h"
+
+#include "skia/ext/platform_canvas.h"
+
+namespace webkit {
+namespace ppapi {
+
+MockPlatformImage2D::MockPlatformImage2D(int width, int height)
+  : width_(width),
+    height_(height) {
+}
+
+MockPlatformImage2D::~MockPlatformImage2D() {
+}
+
+skia::PlatformCanvas* MockPlatformImage2D::Map() {
+  return new skia::PlatformCanvas(width_, height_, true);
+}
+
+intptr_t MockPlatformImage2D::GetSharedMemoryHandle(uint32* byte_count) const {
+  *byte_count = 0;
+  return 0;
+}
+
+TransportDIB* MockPlatformImage2D::GetTransportDIB() const {
+  return NULL;
+}
+
+}  // namespace ppapi
+}  // namespace webkit

webkit/plugins/ppapi/mock_platform_image_2d.h

+// Copyright (c) 2012 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.
+
+#ifndef WEBKIT_PLUGINS_PPAPI_MOCK_PLATFORM_IMAGE_2D_H_
+#define WEBKIT_PLUGINS_PPAPI_MOCK_PLATFORM_IMAGE_2D_H_
+
+#include "webkit/plugins/ppapi/plugin_delegate.h"
+
+namespace webkit {
+namespace ppapi {
+
+class MockPlatformImage2D : public PluginDelegate::PlatformImage2D {
+ public:
+  MockPlatformImage2D(int width, int height);
+  virtual ~MockPlatformImage2D();
+
+  // PlatformImage2D implementation.
+  virtual skia::PlatformCanvas* Map() OVERRIDE;
+  virtual intptr_t GetSharedMemoryHandle(uint32* byte_count) const OVERRIDE;
+  virtual TransportDIB* GetTransportDIB() const OVERRIDE;
+
+ private:
+  int width_;
+  int height_;
+};
+
+}  // namespace ppapi
+}  // namespace webkit
+
+#endif  // WEBKIT_PLUGINS_PPAPI_MOCK_PLATFORM_IMAGE_2D_H_

webkit/plugins/ppapi/mock_plugin_delegate.cc

@@ -9,6 +9,7 @@
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/shared_impl/ppapi_preferences.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebGamepads.h"
+#include "webkit/plugins/ppapi/mock_platform_image_2d.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 
 namespace webkit {
@@ -73,7 +74,7 @@ WebKit::WebPlugin* MockPluginDelegate::CreatePluginReplacement(
 MockPluginDelegate::PlatformImage2D* MockPluginDelegate::CreateImage2D(
     int width,
     int height) {
-  return NULL;
+  return new MockPlatformImage2D(width, height);
 }
 
 MockPluginDelegate::PlatformContext3D* MockPluginDelegate::CreateContext3D() {

webkit/plugins/ppapi/ppapi_plugin_instance.cc

@@ -1047,7 +1047,7 @@ bool PluginInstance::GetBitmapForOptimizedPluginPaint(
       0, 0, image_data->width(), image_data->height());
   float scale = GetBoundGraphics2D()->GetScale();
   gfx::Rect plugin_backing_store_rect =
-    gfx::ToEnclosingRect(pixel_plugin_backing_store_rect.Scale(scale));
+    gfx::ToEnclosedRect(pixel_plugin_backing_store_rect.Scale(scale));
 
   gfx::Rect clip_page = PP_ToGfxRect(view_data_.clip_rect);
   gfx::Rect plugin_paint_rect = plugin_backing_store_rect.Intersect(clip_page);

webkit/plugins/ppapi/ppapi_plugin_instance.h

@@ -493,6 +493,8 @@ class WEBKIT_PLUGINS_EXPORT PluginInstance :
   bool ResetAsProxied(scoped_refptr<PluginModule> module);
 
  private:
+  friend class PpapiUnittest;
+
   // Implements PPB_Gamepad_API. This is just to avoid having an excessive
   // number of interfaces implemented by PluginInstance.
   class GamepadImpl : public ::ppapi::thunk::PPB_Gamepad_API {

webkit/plugins/ppapi/ppapi_unittest.cc

@@ -7,10 +7,12 @@
 #include "ppapi/c/pp_var.h"
 #include "ppapi/c/ppp_instance.h"
 #include "ppapi/shared_impl/ppapi_permissions.h"
+#include "webkit/plugins/ppapi/gfx_conversion.h"
 #include "webkit/plugins/ppapi/mock_plugin_delegate.h"
 #include "webkit/plugins/ppapi/plugin_module.h"
 #include "webkit/plugins/ppapi/ppapi_interface_factory.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
+#include "webkit/plugins/ppapi/ppb_graphics_2d_impl.h"
 
 namespace webkit {
 namespace ppapi {
@@ -85,7 +87,6 @@ void PpapiUnittest::SetUp() {
 
   // Initialize the mock instance.
   instance_ = PluginInstance::Create(delegate_.get(), module());
-
 }
 
 void PpapiUnittest::TearDown() {
@@ -110,6 +111,12 @@ void PpapiUnittest::ShutdownModule() {
   module_ = NULL;
 }
 
+void PpapiUnittest::SetViewSize(int width, int height, float scale) const {
+  instance_->view_data_.rect = PP_FromGfxRect(gfx::Rect(0, 0, width, height));
+  instance_->view_data_.clip_rect = instance_->view_data_.rect;
+  instance_->GetBoundGraphics2D()->SetScale(scale);
+}
+
 void PpapiUnittest::PluginModuleDead(PluginModule* /* dead_module */) {
   // Nothing needed (this is necessary to make the module compile).
 }

webkit/plugins/ppapi/ppapi_unittest.h

@@ -38,6 +38,9 @@ class PpapiUnittest : public testing::Test,
   // Deletes the instance and module to simulate module shutdown.
   void ShutdownModule();
 
+  // Sets the view size of the plugin instance.
+  void SetViewSize(int width, int height, float scale) const;
+
  protected:
   virtual MockPluginDelegate* NewPluginDelegate();
 

webkit/plugins/ppapi/ppb_graphics_2d_impl.h

@@ -33,9 +33,9 @@ class PPB_Graphics2D_Impl : public ::ppapi::Resource,
  public:
   virtual ~PPB_Graphics2D_Impl();
 
-  static PP_Resource Create(PP_Instance instance,
-                            const PP_Size& size,
-                            PP_Bool is_always_opaque);
+  WEBKIT_PLUGINS_EXPORT static PP_Resource Create(PP_Instance instance,
+                                                  const PP_Size& size,
+                                                  PP_Bool is_always_opaque);
 
   bool is_always_opaque() const { return is_always_opaque_; }
 

webkit/plugins/ppapi/ppb_graphics_2d_impl_unittest.cc

@@ -6,9 +6,17 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
+#include "ui/gfx/safe_integer_conversions.h"
+#include "webkit/plugins/ppapi/ppapi_unittest.h"
+#include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 #include "webkit/plugins/ppapi/ppb_graphics_2d_impl.h"
 
-TEST(PpapiGraphics2DImplTest, ConvertToLogicalPixels) {
+namespace webkit {
+namespace ppapi {
+
+typedef PpapiUnittest PpapiGraphics2DImplTest;
+
+TEST_F(PpapiGraphics2DImplTest, ConvertToLogicalPixels) {
   static const struct {
     int x1;
     int y1;
@@ -78,3 +86,39 @@ TEST(PpapiGraphics2DImplTest, ConvertToLogicalPixels) {
     EXPECT_TRUE(r1.Contains(orig));
   }
 }
+
+// Test that GetBitmapForOptimizedPluginPaint doesn't return a bitmap rect
+// that's bigger than the actual backing store bitmap.
+TEST_F(PpapiGraphics2DImplTest, GetBitmap2xScale) {
+  PP_Size size;
+  size.width = 3;
+  size.height = 3;
+  PP_Resource resource =
+      PPB_Graphics2D_Impl::Create(instance()->pp_instance(), size, PP_TRUE);
+  EXPECT_TRUE(resource);
+  EXPECT_TRUE(instance()->BindGraphics(instance()->pp_instance(), resource));
+  instance()->set_always_on_top(true);
+  float scale = 2.0;
+  SetViewSize(size.width, size.height, 1.0 / scale);
+
+  gfx::Rect bounds(0, 0, 1, 1);
+  gfx::Rect location;
+  gfx::Rect clip;
+  float bitmap_scale = 0;
+  TransportDIB* dib = NULL;
+  EXPECT_TRUE(instance()->GetBitmapForOptimizedPluginPaint(
+      bounds, &dib, &location, &clip, &bitmap_scale));
+
+  EXPECT_EQ(0, location.x());
+  EXPECT_EQ(0, location.y());
+  EXPECT_EQ(gfx::ToFlooredInt(size.width / scale), location.width());
+  EXPECT_EQ(gfx::ToFlooredInt(size.height / scale), location.height());
+  EXPECT_EQ(0, clip.x());
+  EXPECT_EQ(0, clip.y());
+  EXPECT_EQ(size.width, clip.width());
+  EXPECT_EQ(size.height, clip.height());
+  EXPECT_EQ(scale, bitmap_scale);
+}
+
+}  // namespace ppapi
+}  // namespace webkit

webkit/tools/test_shell/test_shell.gypi

@@ -384,6 +384,8 @@
         '../../mocks/mock_weburlloader.cc',
         '../../mocks/mock_weburlloader.h',
         '../../plugins/ppapi/host_var_tracker_unittest.cc',
+        '../../plugins/ppapi/mock_platform_image_2d.cc',
+        '../../plugins/ppapi/mock_platform_image_2d.h',
         '../../plugins/ppapi/mock_plugin_delegate.cc',
         '../../plugins/ppapi/mock_plugin_delegate.h',
         '../../plugins/ppapi/mock_resource.h',