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

Side by Side Diff: third_party/WebKit/Source/platform/graphics/paint/PaintControllerTest.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 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "platform/graphics/paint/PaintController.h" 5 #include "platform/graphics/paint/PaintController.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 #include "platform/RuntimeEnabledFeatures.h" 9 #include "platform/RuntimeEnabledFeatures.h"
10 #include "platform/graphics/GraphicsContext.h" 10 #include "platform/graphics/GraphicsContext.h"
11 #include "platform/graphics/paint/ClipPathDisplayItem.h" 11 #include "platform/graphics/paint/ClipPathDisplayItem.h"
12 #include "platform/graphics/paint/ClipPathRecorder.h" 12 #include "platform/graphics/paint/ClipPathRecorder.h"
13 #include "platform/graphics/paint/ClipRecorder.h" 13 #include "platform/graphics/paint/ClipRecorder.h"
14 #include "platform/graphics/paint/CompositingRecorder.h" 14 #include "platform/graphics/paint/CompositingRecorder.h"
15 #include "platform/graphics/paint/DrawingDisplayItem.h" 15 #include "platform/graphics/paint/DrawingDisplayItem.h"
16 #include "platform/graphics/paint/DrawingRecorder.h" 16 #include "platform/graphics/paint/DrawingRecorder.h"
17 #include "platform/graphics/paint/SubsequenceRecorder.h" 17 #include "platform/graphics/paint/SubsequenceRecorder.h"
18 #include "platform/testing/FakeDisplayItemClient.h" 18 #include "platform/testing/FakeDisplayItemClient.h"
19 #include "platform/testing/PaintPropertyTestHelpers.h" 19 #include "platform/testing/PaintPropertyTestHelpers.h"
20 #include "platform/testing/RuntimeEnabledFeaturesTestHelpers.h" 20 #include "platform/testing/RuntimeEnabledFeaturesTestHelpers.h"
21 #include "testing/gmock/include/gmock/gmock.h" 21 #include "testing/gmock/include/gmock/gmock.h"
22 #include "testing/gtest/include/gtest/gtest.h" 22 #include "testing/gtest/include/gtest/gtest.h"
23 23
24 using blink::testing::CreateOpacityOnlyEffect; 24 using blink::testing::CreateOpacityOnlyEffect;
25 using blink::testing::DefaultPaintChunkProperties; 25 using blink::testing::DefaultPaintChunkProperties;
26 using testing::UnorderedElementsAre; 26 using ::testing::UnorderedElementsAre;
27 27
28 namespace blink { 28 namespace blink {
29 29
30 class PaintControllerTestBase : public ::testing::Test { 30 class PaintControllerTestBase : public ::testing::Test {
31 public: 31 public:
32 PaintControllerTestBase() : paint_controller_(PaintController::Create()) {} 32 PaintControllerTestBase() : paint_controller_(PaintController::Create()) {}
33 33
34 protected: 34 protected:
35 PaintController& GetPaintController() { return *paint_controller_; } 35 PaintController& GetPaintController() { return *paint_controller_; }
36 36
(...skipping 2282 matching lines...) Expand 10 before | Expand all | Expand 10 after
2319 TEST_F(PaintControllerUnderInvalidationTest, InvalidationInSubsequence) { 2319 TEST_F(PaintControllerUnderInvalidationTest, InvalidationInSubsequence) {
2320 // We allow invalidated display item clients as long as they would produce the 2320 // We allow invalidated display item clients as long as they would produce the
2321 // same display items. The cases of changed display items are tested by other 2321 // same display items. The cases of changed display items are tested by other
2322 // test cases. 2322 // test cases.
2323 TestInvalidationInSubsequence(); 2323 TestInvalidationInSubsequence();
2324 } 2324 }
2325 2325
2326 #endif // defined(GTEST_HAS_DEATH_TEST) && !defined(OS_ANDROID) 2326 #endif // defined(GTEST_HAS_DEATH_TEST) && !defined(OS_ANDROID)
2327 2327
2328 } // namespace blink 2328 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698