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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/layers/texture_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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/layers/texture_layer_impl.h ('k') | cc/layers/tiled_layer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/texture_layer_unittest.cc
diff --git a/cc/layers/texture_layer_unittest.cc b/cc/layers/texture_layer_unittest.cc
index b3c48fbba2d4cc0e89567a8209f8548a347f94b5..8846152f67aaf521187df8a82cd0a322d646e582 100644
--- a/cc/layers/texture_layer_unittest.cc
+++ b/cc/layers/texture_layer_unittest.cc
@@ -68,7 +68,7 @@ class FakeTextureLayerClient : public TextureLayerClient {
virtual bool PrepareTextureMailbox(
TextureMailbox* mailbox,
scoped_ptr<SingleReleaseCallback>* release_callback,
- bool use_shared_memory) OVERRIDE {
+ bool use_shared_memory) override {
if (!mailbox_changed_)
return false;
@@ -721,7 +721,7 @@ class TextureLayerImplWithMailboxThreadedCallback : public LayerTreeTest {
callback.Pass());
}
- virtual void BeginTest() OVERRIDE {
+ virtual void BeginTest() override {
EXPECT_EQ(true, main_thread_.CalledOnValidThread());
gfx::Size bounds(100, 100);
@@ -745,7 +745,7 @@ class TextureLayerImplWithMailboxThreadedCallback : public LayerTreeTest {
PostSetNeedsCommitToMainThread();
}
- virtual void DidCommit() OVERRIDE {
+ virtual void DidCommit() override {
++commit_count_;
switch (commit_count_) {
case 1:
@@ -817,7 +817,7 @@ class TextureLayerImplWithMailboxThreadedCallback : public LayerTreeTest {
}
}
- virtual void AfterTest() OVERRIDE {}
+ virtual void AfterTest() override {}
private:
base::ThreadChecker main_thread_;
@@ -846,7 +846,7 @@ class TextureLayerMailboxIsActivatedDuringCommit : public LayerTreeTest {
callback.Pass());
}
- virtual void BeginTest() OVERRIDE {
+ virtual void BeginTest() override {
gfx::Size bounds(100, 100);
root_ = Layer::Create();
root_->SetBounds(bounds);
@@ -863,11 +863,11 @@ class TextureLayerMailboxIsActivatedDuringCommit : public LayerTreeTest {
PostSetNeedsCommitToMainThread();
}
- virtual void WillActivateTreeOnThread(LayerTreeHostImpl* impl) OVERRIDE {
+ virtual void WillActivateTreeOnThread(LayerTreeHostImpl* impl) override {
++activate_count_;
}
- virtual void DidCommit() OVERRIDE {
+ virtual void DidCommit() override {
switch (layer_tree_host()->source_frame_number()) {
case 1:
// The first mailbox has been activated. Set a new mailbox, and
@@ -886,7 +886,7 @@ class TextureLayerMailboxIsActivatedDuringCommit : public LayerTreeTest {
}
}
- virtual void CommitCompleteOnThread(LayerTreeHostImpl* host_impl) OVERRIDE {
+ virtual void CommitCompleteOnThread(LayerTreeHostImpl* host_impl) override {
switch (host_impl->active_tree()->source_frame_number()) {
case 0: {
// The activate for the 1st mailbox should have happened before now.
@@ -911,7 +911,7 @@ class TextureLayerMailboxIsActivatedDuringCommit : public LayerTreeTest {
}
- virtual void AfterTest() OVERRIDE {}
+ virtual void AfterTest() override {}
int activate_count_;
scoped_refptr<Layer> root_;
@@ -1133,7 +1133,7 @@ class TextureLayerNoExtraCommitForMailboxTest
virtual bool PrepareTextureMailbox(
TextureMailbox* texture_mailbox,
scoped_ptr<SingleReleaseCallback>* release_callback,
- bool use_shared_memory) OVERRIDE {
+ bool use_shared_memory) override {
if (layer_tree_host()->source_frame_number() == 1) {
// Once this has been committed, the mailbox will be released.
*texture_mailbox = TextureMailbox();
@@ -1154,7 +1154,7 @@ class TextureLayerNoExtraCommitForMailboxTest
EndTest();
}
- virtual void SetupTree() OVERRIDE {
+ virtual void SetupTree() override {
scoped_refptr<Layer> root = Layer::Create();
root->SetBounds(gfx::Size(10, 10));
root->SetIsDrawable(true);
@@ -1168,11 +1168,11 @@ class TextureLayerNoExtraCommitForMailboxTest
LayerTreeTest::SetupTree();
}
- virtual void BeginTest() OVERRIDE {
+ virtual void BeginTest() override {
PostSetNeedsCommitToMainThread();
}
- virtual void DidCommitAndDrawFrame() OVERRIDE {
+ virtual void DidCommitAndDrawFrame() override {
switch (layer_tree_host()->source_frame_number()) {
case 1:
EXPECT_FALSE(proxy()->MainFrameWillHappenForTesting());
@@ -1189,7 +1189,7 @@ class TextureLayerNoExtraCommitForMailboxTest
}
virtual void SwapBuffersOnThread(LayerTreeHostImpl* host_impl,
- bool result) OVERRIDE {
+ bool result) override {
ASSERT_TRUE(result);
DelegatedFrameData* delegated_frame_data =
output_surface()->last_sent_frame().delegated_frame_data.get();
@@ -1206,7 +1206,7 @@ class TextureLayerNoExtraCommitForMailboxTest
host_impl->ReclaimResources(&ack);
}
- virtual void AfterTest() OVERRIDE {}
+ virtual void AfterTest() override {}
private:
scoped_refptr<TextureLayer> texture_layer_;
@@ -1233,7 +1233,7 @@ class TextureLayerChangeInvisibleMailboxTest
virtual bool PrepareTextureMailbox(
TextureMailbox* mailbox,
scoped_ptr<SingleReleaseCallback>* release_callback,
- bool use_shared_memory) OVERRIDE {
+ bool use_shared_memory) override {
++prepare_called_;
if (!mailbox_changed_)
return false;
@@ -1252,7 +1252,7 @@ class TextureLayerChangeInvisibleMailboxTest
++mailbox_returned_;
}
- virtual void SetupTree() OVERRIDE {
+ virtual void SetupTree() override {
scoped_refptr<Layer> root = Layer::Create();
root->SetBounds(gfx::Size(10, 10));
root->SetIsDrawable(true);
@@ -1277,11 +1277,11 @@ class TextureLayerChangeInvisibleMailboxTest
LayerTreeTest::SetupTree();
}
- virtual void BeginTest() OVERRIDE {
+ virtual void BeginTest() override {
PostSetNeedsCommitToMainThread();
}
- virtual void DidCommitAndDrawFrame() OVERRIDE {
+ virtual void DidCommitAndDrawFrame() override {
++commit_count_;
switch (commit_count_) {
case 1:
@@ -1326,7 +1326,7 @@ class TextureLayerChangeInvisibleMailboxTest
}
virtual void SwapBuffersOnThread(LayerTreeHostImpl* host_impl,
- bool result) OVERRIDE {
+ bool result) override {
ASSERT_TRUE(result);
DelegatedFrameData* delegated_frame_data =
output_surface()->last_sent_frame().delegated_frame_data.get();
@@ -1343,7 +1343,7 @@ class TextureLayerChangeInvisibleMailboxTest
host_impl->ReclaimResources(&ack);
}
- virtual void AfterTest() OVERRIDE {}
+ virtual void AfterTest() override {}
private:
scoped_refptr<SolidColorLayer> solid_layer_;
@@ -1370,7 +1370,7 @@ class TextureLayerReleaseResourcesBase
virtual bool PrepareTextureMailbox(
TextureMailbox* mailbox,
scoped_ptr<SingleReleaseCallback>* release_callback,
- bool use_shared_memory) OVERRIDE {
+ bool use_shared_memory) override {
*mailbox = TextureMailbox(MailboxFromChar('1'), GL_TEXTURE_2D, 0);
*release_callback = SingleReleaseCallback::Create(
base::Bind(&TextureLayerReleaseResourcesBase::MailboxReleased,
@@ -1382,7 +1382,7 @@ class TextureLayerReleaseResourcesBase
mailbox_released_ = true;
}
- virtual void SetupTree() OVERRIDE {
+ virtual void SetupTree() override {
LayerTreeTest::SetupTree();
scoped_refptr<TextureLayer> texture_layer =
@@ -1393,16 +1393,16 @@ class TextureLayerReleaseResourcesBase
layer_tree_host()->root_layer()->AddChild(texture_layer);
}
- virtual void BeginTest() OVERRIDE {
+ virtual void BeginTest() override {
mailbox_released_ = false;
PostSetNeedsCommitToMainThread();
}
- virtual void DidCommitAndDrawFrame() OVERRIDE {
+ virtual void DidCommitAndDrawFrame() override {
EndTest();
}
- virtual void AfterTest() OVERRIDE {
+ virtual void AfterTest() override {
EXPECT_TRUE(mailbox_released_);
}
@@ -1413,7 +1413,7 @@ class TextureLayerReleaseResourcesBase
class TextureLayerReleaseResourcesAfterCommit
: public TextureLayerReleaseResourcesBase {
public:
- virtual void CommitCompleteOnThread(LayerTreeHostImpl* host_impl) OVERRIDE {
+ virtual void CommitCompleteOnThread(LayerTreeHostImpl* host_impl) override {
LayerTreeImpl* tree = NULL;
if (host_impl->settings().impl_side_painting)
tree = host_impl->pending_tree();
@@ -1428,7 +1428,7 @@ SINGLE_AND_MULTI_THREAD_TEST_F(TextureLayerReleaseResourcesAfterCommit);
class TextureLayerReleaseResourcesAfterActivate
: public TextureLayerReleaseResourcesBase {
public:
- virtual void DidActivateTreeOnThread(LayerTreeHostImpl* host_impl) OVERRIDE {
+ virtual void DidActivateTreeOnThread(LayerTreeHostImpl* host_impl) override {
host_impl->active_tree()->root_layer()->children()[0]->ReleaseResources();
}
};
@@ -1455,7 +1455,7 @@ class TextureLayerWithMailboxMainThreadDeleted : public LayerTreeTest {
callback.Pass());
}
- virtual void SetupTree() OVERRIDE {
+ virtual void SetupTree() override {
gfx::Size bounds(100, 100);
root_ = Layer::Create();
root_->SetBounds(bounds);
@@ -1469,7 +1469,7 @@ class TextureLayerWithMailboxMainThreadDeleted : public LayerTreeTest {
layer_tree_host()->SetViewportSize(bounds);
}
- virtual void BeginTest() OVERRIDE {
+ virtual void BeginTest() override {
EXPECT_EQ(true, main_thread_.CalledOnValidThread());
callback_count_ = 0;
@@ -1481,7 +1481,7 @@ class TextureLayerWithMailboxMainThreadDeleted : public LayerTreeTest {
PostSetNeedsCommitToMainThread();
}
- virtual void DidCommitAndDrawFrame() OVERRIDE {
+ virtual void DidCommitAndDrawFrame() override {
switch (layer_tree_host()->source_frame_number()) {
case 1:
// Delete the TextureLayer on the main thread while the mailbox is in
@@ -1492,7 +1492,7 @@ class TextureLayerWithMailboxMainThreadDeleted : public LayerTreeTest {
}
}
- virtual void AfterTest() OVERRIDE {
+ virtual void AfterTest() override {
EXPECT_EQ(1, callback_count_);
}
@@ -1526,7 +1526,7 @@ class TextureLayerWithMailboxImplThreadDeleted : public LayerTreeTest {
callback.Pass());
}
- virtual void SetupTree() OVERRIDE {
+ virtual void SetupTree() override {
gfx::Size bounds(100, 100);
root_ = Layer::Create();
root_->SetBounds(bounds);
@@ -1540,7 +1540,7 @@ class TextureLayerWithMailboxImplThreadDeleted : public LayerTreeTest {
layer_tree_host()->SetViewportSize(bounds);
}
- virtual void BeginTest() OVERRIDE {
+ virtual void BeginTest() override {
EXPECT_EQ(true, main_thread_.CalledOnValidThread());
callback_count_ = 0;
@@ -1552,7 +1552,7 @@ class TextureLayerWithMailboxImplThreadDeleted : public LayerTreeTest {
PostSetNeedsCommitToMainThread();
}
- virtual void DidCommitAndDrawFrame() OVERRIDE {
+ virtual void DidCommitAndDrawFrame() override {
switch (layer_tree_host()->source_frame_number()) {
case 1:
// Remove the TextureLayer on the main thread while the mailbox is in
@@ -1566,7 +1566,7 @@ class TextureLayerWithMailboxImplThreadDeleted : public LayerTreeTest {
}
}
- virtual void AfterTest() OVERRIDE {
+ virtual void AfterTest() override {
EXPECT_EQ(1, callback_count_);
}
« no previous file with comments | « cc/layers/texture_layer_impl.h ('k') | cc/layers/tiled_layer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698