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

Side by Side Diff: third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridgeTest.cpp

Issue 2967013002: Be explicit about namespace testing to not mix it with blink::testing (Closed)
Patch Set: Dropped mojo parts that need another review. Created 3 years, 5 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 #include "public/platform/WebThread.h" 46 #include "public/platform/WebThread.h"
47 #include "public/platform/WebTraceLocation.h" 47 #include "public/platform/WebTraceLocation.h"
48 #include "skia/ext/texture_handle.h" 48 #include "skia/ext/texture_handle.h"
49 #include "testing/gmock/include/gmock/gmock.h" 49 #include "testing/gmock/include/gmock/gmock.h"
50 #include "testing/gtest/include/gtest/gtest.h" 50 #include "testing/gtest/include/gtest/gtest.h"
51 #include "third_party/skia/include/core/SkSurface.h" 51 #include "third_party/skia/include/core/SkSurface.h"
52 #include "third_party/skia/include/gpu/gl/GrGLTypes.h" 52 #include "third_party/skia/include/gpu/gl/GrGLTypes.h"
53 53
54 #include <memory> 54 #include <memory>
55 55
56 using testing::AnyNumber; 56 using ::testing::AnyNumber;
57 using testing::AtLeast; 57 using ::testing::AtLeast;
58 using testing::InSequence; 58 using ::testing::InSequence;
59 using testing::Return; 59 using ::testing::Return;
60 using testing::Test; 60 using ::testing::Test;
61 using testing::_; 61 using ::testing::_;
62 62
63 namespace blink { 63 namespace blink {
64 64
65 namespace { 65 namespace {
66 66
67 class Canvas2DLayerBridgePtr { 67 class Canvas2DLayerBridgePtr {
68 public: 68 public:
69 Canvas2DLayerBridgePtr() {} 69 Canvas2DLayerBridgePtr() {}
70 Canvas2DLayerBridgePtr(PassRefPtr<Canvas2DLayerBridge> layer_bridge) 70 Canvas2DLayerBridgePtr(PassRefPtr<Canvas2DLayerBridge> layer_bridge)
71 : layer_bridge_(std::move(layer_bridge)) {} 71 : layer_bridge_(std::move(layer_bridge)) {}
(...skipping 1306 matching lines...) Expand 10 before | Expand all | Expand 10 after
1378 EXPECT_FALSE(bridge->HasRecordedDrawCommands()); 1378 EXPECT_FALSE(bridge->HasRecordedDrawCommands());
1379 ::testing::Mock::VerifyAndClearExpectations(&gl); 1379 ::testing::Mock::VerifyAndClearExpectations(&gl);
1380 1380
1381 EXPECT_CALL(gl, Flush()).Times(1); 1381 EXPECT_CALL(gl, Flush()).Times(1);
1382 bridge->FlushGpu(); 1382 bridge->FlushGpu();
1383 EXPECT_FALSE(bridge->HasRecordedDrawCommands()); 1383 EXPECT_FALSE(bridge->HasRecordedDrawCommands());
1384 ::testing::Mock::VerifyAndClearExpectations(&gl); 1384 ::testing::Mock::VerifyAndClearExpectations(&gl);
1385 } 1385 }
1386 1386
1387 } // namespace blink 1387 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698