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

Side by Side Diff: third_party/WebKit/Source/web/PageOverlayTest.cpp

Issue 2547053003: s/ passed(...) / WTF::passed(...) / to avoid future ambiguity w/ base::Passed. (Closed)
Patch Set: Rebasing... Created 4 years 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 "web/PageOverlay.h" 5 #include "web/PageOverlay.h"
6 6
7 #include "core/frame/FrameView.h" 7 #include "core/frame/FrameView.h"
8 #include "platform/graphics/Color.h" 8 #include "platform/graphics/Color.h"
9 #include "platform/graphics/GraphicsContext.h" 9 #include "platform/graphics/GraphicsContext.h"
10 #include "platform/graphics/paint/DrawingRecorder.h" 10 #include "platform/graphics/paint/DrawingRecorder.h"
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 : disableAcceleratedCompositing); 78 : disableAcceleratedCompositing);
79 webViewImpl()->resize(WebSize(viewportWidth, viewportHeight)); 79 webViewImpl()->resize(WebSize(viewportWidth, viewportHeight));
80 webViewImpl()->updateAllLifecyclePhases(); 80 webViewImpl()->updateAllLifecyclePhases();
81 ASSERT_EQ(compositingMode == AcceleratedCompositing, 81 ASSERT_EQ(compositingMode == AcceleratedCompositing,
82 webViewImpl()->isAcceleratedCompositingActive()); 82 webViewImpl()->isAcceleratedCompositingActive());
83 } 83 }
84 84
85 WebViewImpl* webViewImpl() const { return m_helper.webView(); } 85 WebViewImpl* webViewImpl() const { return m_helper.webView(); }
86 86
87 std::unique_ptr<PageOverlay> createSolidYellowOverlay() { 87 std::unique_ptr<PageOverlay> createSolidYellowOverlay() {
88 return PageOverlay::create(webViewImpl()->mainFrameImpl(), 88 return PageOverlay::create(
89 makeUnique<SolidColorOverlay>(SK_ColorYELLOW)); 89 webViewImpl()->mainFrameImpl(),
90 WTF::makeUnique<SolidColorOverlay>(SK_ColorYELLOW));
90 } 91 }
91 92
92 template <typename OverlayType> 93 template <typename OverlayType>
93 void runPageOverlayTestWithAcceleratedCompositing(); 94 void runPageOverlayTestWithAcceleratedCompositing();
94 95
95 private: 96 private:
96 FrameTestHelpers::WebViewHelper m_helper; 97 FrameTestHelpers::WebViewHelper m_helper;
97 }; 98 };
98 99
99 template <bool (*getter)(), void (*setter)(bool)> 100 template <bool (*getter)(), void (*setter)(bool)>
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 initialize(AcceleratedCompositing); 152 initialize(AcceleratedCompositing);
152 std::unique_ptr<PageOverlay> pageOverlay = createSolidYellowOverlay(); 153 std::unique_ptr<PageOverlay> pageOverlay = createSolidYellowOverlay();
153 pageOverlay->update(); 154 pageOverlay->update();
154 webViewImpl()->updateAllLifecyclePhases(); 155 webViewImpl()->updateAllLifecyclePhases();
155 EXPECT_EQ(LayoutRect(0, 0, viewportWidth, viewportHeight), 156 EXPECT_EQ(LayoutRect(0, 0, viewportWidth, viewportHeight),
156 pageOverlay->visualRect()); 157 pageOverlay->visualRect());
157 } 158 }
158 159
159 } // namespace 160 } // namespace
160 } // namespace blink 161 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/PageOverlay.cpp ('k') | third_party/WebKit/Source/web/RemoteFrameClientImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698