diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-01-04 14:17:57 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-01-05 10:05:06 +0000 |
| commit | 39d357e3248f80abea0159765ff39554affb40db (patch) | |
| tree | aba0e6bfb76de0244bba0f5fdbd64b830dd6e621 /chromium/cc/layers/nine_patch_layer_unittest.cc | |
| parent | 87778abf5a1f89266f37d1321b92a21851d8244d (diff) | |
BASELINE: Update Chromium to 55.0.2883.105
And updates ninja to 1.7.2
Change-Id: I20d43c737f82764d857ada9a55586901b18b9243
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/cc/layers/nine_patch_layer_unittest.cc')
| -rw-r--r-- | chromium/cc/layers/nine_patch_layer_unittest.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/chromium/cc/layers/nine_patch_layer_unittest.cc b/chromium/cc/layers/nine_patch_layer_unittest.cc index 5cc14e2e76e..c85857011d6 100644 --- a/chromium/cc/layers/nine_patch_layer_unittest.cc +++ b/chromium/cc/layers/nine_patch_layer_unittest.cc @@ -27,9 +27,6 @@ namespace cc { namespace { class NinePatchLayerTest : public testing::Test { - public: - NinePatchLayerTest() : fake_client_(FakeLayerTreeHostClient::DIRECT_3D) {} - protected: void SetUp() override { layer_tree_host_ = @@ -53,7 +50,7 @@ TEST_F(NinePatchLayerTest, SetLayerProperties) { layer_tree_host_->SetRootLayer(test_layer); Mock::VerifyAndClearExpectations(layer_tree_host_.get()); - EXPECT_EQ(test_layer->layer_tree_host(), layer_tree_host_.get()); + EXPECT_EQ(test_layer->GetLayerTreeHostForTesting(), layer_tree_host_.get()); gfx::Rect screen_space_clip_rect; test_layer->SavePaintProperties(); @@ -62,8 +59,9 @@ TEST_F(NinePatchLayerTest, SetLayerProperties) { EXPECT_FALSE(test_layer->DrawsContent()); bool is_opaque = false; - std::unique_ptr<ScopedUIResource> resource = ScopedUIResource::Create( - layer_tree_host_.get(), UIResourceBitmap(gfx::Size(10, 10), is_opaque)); + std::unique_ptr<ScopedUIResource> resource = + ScopedUIResource::Create(layer_tree_host_->GetUIResourceManager(), + UIResourceBitmap(gfx::Size(10, 10), is_opaque)); gfx::Rect aperture(5, 5, 1, 1); bool fill_center = true; test_layer->SetAperture(aperture); |