Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(81)

Side by Side Diff: cc/layers/picture_layer_unittest.cc

Issue 628443002: replace OVERRIDE and FINAL with override and final in cc/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « cc/layers/picture_layer_impl_unittest.cc ('k') | cc/layers/render_surface_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/layers/picture_layer.h" 5 #include "cc/layers/picture_layer.h"
6 6
7 #include "cc/layers/content_layer_client.h" 7 #include "cc/layers/content_layer_client.h"
8 #include "cc/layers/picture_layer_impl.h" 8 #include "cc/layers/picture_layer_impl.h"
9 #include "cc/resources/resource_update_queue.h" 9 #include "cc/resources/resource_update_queue.h"
10 #include "cc/test/fake_layer_tree_host.h" 10 #include "cc/test/fake_layer_tree_host.h"
11 #include "cc/test/fake_picture_layer_impl.h" 11 #include "cc/test/fake_picture_layer_impl.h"
12 #include "cc/test/fake_proxy.h" 12 #include "cc/test/fake_proxy.h"
13 #include "cc/test/impl_side_painting_settings.h" 13 #include "cc/test/impl_side_painting_settings.h"
14 #include "cc/trees/occlusion_tracker.h" 14 #include "cc/trees/occlusion_tracker.h"
15 #include "cc/trees/single_thread_proxy.h" 15 #include "cc/trees/single_thread_proxy.h"
16 #include "testing/gtest/include/gtest/gtest.h" 16 #include "testing/gtest/include/gtest/gtest.h"
17 17
18 namespace cc { 18 namespace cc {
19 namespace { 19 namespace {
20 20
21 class MockContentLayerClient : public ContentLayerClient { 21 class MockContentLayerClient : public ContentLayerClient {
22 public: 22 public:
23 virtual void PaintContents( 23 virtual void PaintContents(
24 SkCanvas* canvas, 24 SkCanvas* canvas,
25 const gfx::Rect& clip, 25 const gfx::Rect& clip,
26 ContentLayerClient::GraphicsContextStatus gc_status) OVERRIDE {} 26 ContentLayerClient::GraphicsContextStatus gc_status) override {}
27 virtual void DidChangeLayerCanUseLCDText() OVERRIDE {} 27 virtual void DidChangeLayerCanUseLCDText() override {}
28 virtual bool FillsBoundsCompletely() const OVERRIDE { 28 virtual bool FillsBoundsCompletely() const override {
29 return false; 29 return false;
30 }; 30 };
31 }; 31 };
32 32
33 TEST(PictureLayerTest, NoTilesIfEmptyBounds) { 33 TEST(PictureLayerTest, NoTilesIfEmptyBounds) {
34 MockContentLayerClient client; 34 MockContentLayerClient client;
35 scoped_refptr<PictureLayer> layer = PictureLayer::Create(&client); 35 scoped_refptr<PictureLayer> layer = PictureLayer::Create(&client);
36 layer->SetBounds(gfx::Size(10, 10)); 36 layer->SetBounds(gfx::Size(10, 10));
37 37
38 FakeLayerTreeHostClient host_client(FakeLayerTreeHostClient::DIRECT_3D); 38 FakeLayerTreeHostClient host_client(FakeLayerTreeHostClient::DIRECT_3D);
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 EXPECT_EQ(Picture::RECORD_NORMALLY, layer->RecordingMode()); 96 EXPECT_EQ(Picture::RECORD_NORMALLY, layer->RecordingMode());
97 97
98 settings.recording_mode = LayerTreeSettings::RecordWithSkRecord; 98 settings.recording_mode = LayerTreeSettings::RecordWithSkRecord;
99 host = FakeLayerTreeHost::Create(&host_client, settings); 99 host = FakeLayerTreeHost::Create(&host_client, settings);
100 host->SetRootLayer(layer); 100 host->SetRootLayer(layer);
101 EXPECT_EQ(Picture::RECORD_WITH_SKRECORD, layer->RecordingMode()); 101 EXPECT_EQ(Picture::RECORD_WITH_SKRECORD, layer->RecordingMode());
102 } 102 }
103 103
104 } // namespace 104 } // namespace
105 } // namespace cc 105 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layers/picture_layer_impl_unittest.cc ('k') | cc/layers/render_surface_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698