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

Unified Diff: sky/engine/platform/graphics/gpu/DrawingBufferTest.cpp

Issue 988693005: Chromium roll (https://codereview.chromium.org/976353002) (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: fixed bad android build patch Created 5 years, 9 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 | « sky/engine/platform/graphics/ImageDecodingStoreTest.cpp ('k') | sky/engine/platform/text/LineEnding.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/platform/graphics/gpu/DrawingBufferTest.cpp
diff --git a/sky/engine/platform/graphics/gpu/DrawingBufferTest.cpp b/sky/engine/platform/graphics/gpu/DrawingBufferTest.cpp
index bc9794b90e57703900ede7e32858504a8b22600f..cbc407458a750b01674c82962cbf1a2f68f00eb0 100644
--- a/sky/engine/platform/graphics/gpu/DrawingBufferTest.cpp
+++ b/sky/engine/platform/graphics/gpu/DrawingBufferTest.cpp
@@ -205,7 +205,7 @@ public:
class DrawingBufferTest : public Test {
protected:
- virtual void SetUp()
+ void SetUp() override
{
RefPtr<FakeContextEvictionManager> contextEvictionManager = adoptRef(new FakeContextEvictionManager());
OwnPtr<WebGraphicsContext3DForTests> context = adoptPtr(new WebGraphicsContext3DForTests);
@@ -443,7 +443,7 @@ TEST_F(DrawingBufferTest, verifyInsertAndWaitSyncPointCorrectly)
class DrawingBufferImageChromiumTest : public DrawingBufferTest {
protected:
- virtual void SetUp()
+ void SetUp() override
{
RefPtr<FakeContextEvictionManager> contextEvictionManager = adoptRef(new FakeContextEvictionManager());
OwnPtr<WebGraphicsContext3DForTests> context = adoptPtr(new WebGraphicsContext3DForTests);
@@ -456,7 +456,7 @@ protected:
testing::Mock::VerifyAndClearExpectations(webContext());
}
- virtual void TearDown()
+ void TearDown() override
{
RuntimeEnabledFeatures::setWebGLImageChromiumEnabled(false);
}
« no previous file with comments | « sky/engine/platform/graphics/ImageDecodingStoreTest.cpp ('k') | sky/engine/platform/text/LineEnding.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698