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

Side by Side Diff: third_party/WebKit/Source/core/page/PageOverlayTest.cpp

Issue 2970833002: Be explicit about namespace testing to not mix it with blink::testing (Closed)
Patch Set: 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "core/page/PageOverlay.h" 5 #include "core/page/PageOverlay.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include "core/exported/WebViewBase.h" 8 #include "core/exported/WebViewBase.h"
9 #include "core/frame/FrameTestHelpers.h" 9 #include "core/frame/FrameTestHelpers.h"
10 #include "core/frame/LocalFrameView.h" 10 #include "core/frame/LocalFrameView.h"
11 #include "core/frame/WebLocalFrameBase.h" 11 #include "core/frame/WebLocalFrameBase.h"
12 #include "platform/graphics/Color.h" 12 #include "platform/graphics/Color.h"
13 #include "platform/graphics/GraphicsContext.h" 13 #include "platform/graphics/GraphicsContext.h"
14 #include "platform/graphics/paint/DrawingRecorder.h" 14 #include "platform/graphics/paint/DrawingRecorder.h"
15 #include "platform/graphics/paint/PaintController.h" 15 #include "platform/graphics/paint/PaintController.h"
16 #include "public/platform/Platform.h" 16 #include "public/platform/Platform.h"
17 #include "public/platform/WebCanvas.h" 17 #include "public/platform/WebCanvas.h"
18 #include "public/platform/WebThread.h" 18 #include "public/platform/WebThread.h"
19 #include "public/web/WebSettings.h" 19 #include "public/web/WebSettings.h"
20 #include "testing/gmock/include/gmock/gmock.h" 20 #include "testing/gmock/include/gmock/gmock.h"
21 #include "testing/gtest/include/gtest/gtest.h" 21 #include "testing/gtest/include/gtest/gtest.h"
22 #include "third_party/skia/include/core/SkBitmap.h" 22 #include "third_party/skia/include/core/SkBitmap.h"
23 #include "third_party/skia/include/core/SkCanvas.h" 23 #include "third_party/skia/include/core/SkCanvas.h"
24 #include "third_party/skia/include/core/SkColor.h" 24 #include "third_party/skia/include/core/SkColor.h"
25 #include "third_party/skia/include/core/SkPaint.h" 25 #include "third_party/skia/include/core/SkPaint.h"
26 26
27 using testing::_; 27 using ::testing::_;
28 using testing::AtLeast; 28 using ::testing::AtLeast;
29 using testing::Property; 29 using ::testing::Property;
30 30
31 namespace blink { 31 namespace blink {
32 namespace { 32 namespace {
33 33
34 static const int kViewportWidth = 800; 34 static const int kViewportWidth = 800;
35 static const int kViewportHeight = 600; 35 static const int kViewportHeight = 600;
36 36
37 // These unit tests cover both PageOverlay and PageOverlayList. 37 // These unit tests cover both PageOverlay and PageOverlayList.
38 38
39 void EnableAcceleratedCompositing(WebSettings* settings) { 39 void EnableAcceleratedCompositing(WebSettings* settings) {
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 Initialize(kAcceleratedCompositing); 153 Initialize(kAcceleratedCompositing);
154 std::unique_ptr<PageOverlay> page_overlay = CreateSolidYellowOverlay(); 154 std::unique_ptr<PageOverlay> page_overlay = CreateSolidYellowOverlay();
155 page_overlay->Update(); 155 page_overlay->Update();
156 GetWebView()->UpdateAllLifecyclePhases(); 156 GetWebView()->UpdateAllLifecyclePhases();
157 EXPECT_EQ(LayoutRect(0, 0, kViewportWidth, kViewportHeight), 157 EXPECT_EQ(LayoutRect(0, 0, kViewportWidth, kViewportHeight),
158 page_overlay->VisualRect()); 158 page_overlay->VisualRect());
159 } 159 }
160 160
161 } // namespace 161 } // namespace
162 } // namespace blink 162 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698