| Index: content/renderer/pepper/pepper_graphics_2d_host_unittest.cc
|
| diff --git a/content/renderer/pepper/pepper_graphics_2d_host_unittest.cc b/content/renderer/pepper/pepper_graphics_2d_host_unittest.cc
|
| index 902d21d60c410c01122fd575240b90e5109bba0f..d16c86314b68dcf2ac13867e51fc6936cef21a69 100644
|
| --- a/content/renderer/pepper/pepper_graphics_2d_host_unittest.cc
|
| +++ b/content/renderer/pepper/pepper_graphics_2d_host_unittest.cc
|
| @@ -44,9 +44,12 @@ class PepperGraphics2DHostTest : public testing::Test {
|
| test_globals_.GetResourceTracker()->DidCreateInstance(instance);
|
| scoped_refptr<PPB_ImageData_Impl> backing_store(
|
| new PPB_ImageData_Impl(instance, PPB_ImageData_Impl::ForTest()));
|
| - host_.reset(PepperGraphics2DHost::Create(
|
| - &renderer_ppapi_host_, instance, 12345, backing_store_size, PP_FALSE,
|
| - backing_store));
|
| + host_.reset(PepperGraphics2DHost::Create(&renderer_ppapi_host_,
|
| + instance,
|
| + 12345,
|
| + backing_store_size,
|
| + PP_FALSE,
|
| + backing_store));
|
| DCHECK(host_.get());
|
| }
|
|
|
| @@ -54,8 +57,8 @@ class PepperGraphics2DHostTest : public testing::Test {
|
| ppapi::HostResource image_data_resource;
|
| image_data_resource.SetHostResource(image_data->pp_instance(),
|
| image_data->pp_resource());
|
| - host_->OnHostMsgPaintImageData(NULL, image_data_resource,
|
| - PP_Point(), false, PP_Rect());
|
| + host_->OnHostMsgPaintImageData(
|
| + NULL, image_data_resource, PP_Point(), false, PP_Rect());
|
| }
|
|
|
| void Flush() {
|
| @@ -69,7 +72,8 @@ class PepperGraphics2DHostTest : public testing::Test {
|
| void PaintToWebCanvas(SkBitmap* bitmap) {
|
| scoped_ptr<WebCanvas> canvas(new WebCanvas(*bitmap));
|
| gfx::Rect plugin_rect(PP_ToGfxRect(renderer_view_data_.rect));
|
| - host_->Paint(canvas.get(), plugin_rect,
|
| + host_->Paint(canvas.get(),
|
| + plugin_rect,
|
| gfx::Rect(0, 0, plugin_rect.width(), plugin_rect.height()));
|
| }
|
|
|
| @@ -109,41 +113,39 @@ TEST_F(PepperGraphics2DHostTest, ConvertToLogicalPixels) {
|
| int dy2;
|
| float scale;
|
| bool result;
|
| - } tests[] = {
|
| - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1.0, true },
|
| - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2.0, true },
|
| - { 0, 0, 4, 4, 0, 0, 2, 2, 0, 0, 0, 0, 0.5, true },
|
| - { 1, 1, 4, 4, 0, 0, 3, 3, 0, 0, 0, 0, 0.5, false },
|
| - { 53, 75, 100, 100, 53, 75, 100, 100, 0, 0, 0, 0, 1.0, true },
|
| - { 53, 75, 100, 100, 106, 150, 200, 200, 0, 0, 0, 0, 2.0, true },
|
| - { 53, 75, 100, 100, 26, 37, 51, 51, 0, 0, 0, 0, 0.5, false },
|
| - { 53, 74, 100, 100, 26, 37, 51, 50, 0, 0, 0, 0, 0.5, false },
|
| - { -1, -1, 100, 100, -1, -1, 51, 51, 0, 0, 0, 0, 0.5, false },
|
| - { -2, -2, 100, 100, -1, -1, 50, 50, 4, -4, 2, -2, 0.5, true },
|
| - { -101, -100, 50, 50, -51, -50, 26, 25, 0, 0, 0, 0, 0.5, false },
|
| - { 10, 10, 20, 20, 5, 5, 10, 10, 0, 0, 0, 0, 0.5, true },
|
| - // Cannot scroll due to partial coverage on sides
|
| - { 11, 10, 20, 20, 5, 5, 11, 10, 0, 0, 0, 0, 0.5, false },
|
| - // Can scroll since backing store is actually smaller/scaling up
|
| - { 11, 20, 100, 100, 22, 40, 200, 200, 7, 3, 14, 6, 2.0, true },
|
| - // Can scroll due to delta and bounds being aligned
|
| - { 10, 10, 20, 20, 5, 5, 10, 10, 6, 4, 3, 2, 0.5, true },
|
| - // Cannot scroll due to dx
|
| - { 10, 10, 20, 20, 5, 5, 10, 10, 5, 4, 2, 2, 0.5, false },
|
| - // Cannot scroll due to dy
|
| - { 10, 10, 20, 20, 5, 5, 10, 10, 6, 3, 3, 1, 0.5, false },
|
| - // Cannot scroll due to top
|
| - { 10, 11, 20, 20, 5, 5, 10, 11, 6, 4, 3, 2, 0.5, false },
|
| - // Cannot scroll due to left
|
| - { 7, 10, 20, 20, 3, 5, 11, 10, 6, 4, 3, 2, 0.5, false },
|
| - // Cannot scroll due to width
|
| - { 10, 10, 21, 20, 5, 5, 11, 10, 6, 4, 3, 2, 0.5, false },
|
| - // Cannot scroll due to height
|
| - { 10, 10, 20, 51, 5, 5, 10, 26, 6, 4, 3, 2, 0.5, false },
|
| - // Check negative scroll deltas
|
| - { 10, 10, 20, 20, 5, 5, 10, 10, -6, -4, -3, -2, 0.5, true },
|
| - { 10, 10, 20, 20, 5, 5, 10, 10, -6, -3, -3, -1, 0.5, false },
|
| - };
|
| + } tests[] = {{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1.0, true},
|
| + {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2.0, true},
|
| + {0, 0, 4, 4, 0, 0, 2, 2, 0, 0, 0, 0, 0.5, true},
|
| + {1, 1, 4, 4, 0, 0, 3, 3, 0, 0, 0, 0, 0.5, false},
|
| + {53, 75, 100, 100, 53, 75, 100, 100, 0, 0, 0, 0, 1.0, true},
|
| + {53, 75, 100, 100, 106, 150, 200, 200, 0, 0, 0, 0, 2.0, true},
|
| + {53, 75, 100, 100, 26, 37, 51, 51, 0, 0, 0, 0, 0.5, false},
|
| + {53, 74, 100, 100, 26, 37, 51, 50, 0, 0, 0, 0, 0.5, false},
|
| + {-1, -1, 100, 100, -1, -1, 51, 51, 0, 0, 0, 0, 0.5, false},
|
| + {-2, -2, 100, 100, -1, -1, 50, 50, 4, -4, 2, -2, 0.5, true},
|
| + {-101, -100, 50, 50, -51, -50, 26, 25, 0, 0, 0, 0, 0.5, false},
|
| + {10, 10, 20, 20, 5, 5, 10, 10, 0, 0, 0, 0, 0.5, true},
|
| + // Cannot scroll due to partial coverage on sides
|
| + {11, 10, 20, 20, 5, 5, 11, 10, 0, 0, 0, 0, 0.5, false},
|
| + // Can scroll since backing store is actually smaller/scaling up
|
| + {11, 20, 100, 100, 22, 40, 200, 200, 7, 3, 14, 6, 2.0, true},
|
| + // Can scroll due to delta and bounds being aligned
|
| + {10, 10, 20, 20, 5, 5, 10, 10, 6, 4, 3, 2, 0.5, true},
|
| + // Cannot scroll due to dx
|
| + {10, 10, 20, 20, 5, 5, 10, 10, 5, 4, 2, 2, 0.5, false},
|
| + // Cannot scroll due to dy
|
| + {10, 10, 20, 20, 5, 5, 10, 10, 6, 3, 3, 1, 0.5, false},
|
| + // Cannot scroll due to top
|
| + {10, 11, 20, 20, 5, 5, 10, 11, 6, 4, 3, 2, 0.5, false},
|
| + // Cannot scroll due to left
|
| + {7, 10, 20, 20, 3, 5, 11, 10, 6, 4, 3, 2, 0.5, false},
|
| + // Cannot scroll due to width
|
| + {10, 10, 21, 20, 5, 5, 11, 10, 6, 4, 3, 2, 0.5, false},
|
| + // Cannot scroll due to height
|
| + {10, 10, 20, 51, 5, 5, 10, 26, 6, 4, 3, 2, 0.5, false},
|
| + // Check negative scroll deltas
|
| + {10, 10, 20, 20, 5, 5, 10, 10, -6, -4, -3, -2, 0.5, true},
|
| + {10, 10, 20, 20, 5, 5, 10, 10, -6, -3, -3, -1, 0.5, false}, };
|
| for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
|
| gfx::Rect r1(tests[i].x1, tests[i].y1, tests[i].w1, tests[i].h1);
|
| gfx::Rect r2(tests[i].x2, tests[i].y2, tests[i].w2, tests[i].h2);
|
|
|