| Index: third_party/WebKit/Source/web/PageOverlayTest.cpp
|
| diff --git a/third_party/WebKit/Source/web/PageOverlayTest.cpp b/third_party/WebKit/Source/web/PageOverlayTest.cpp
|
| index 21088b3c1660493266c7ea003a7463cd7025ba5d..5bfe194bdbed5fd8a0ab2097ca95ee17a8dfd822 100644
|
| --- a/third_party/WebKit/Source/web/PageOverlayTest.cpp
|
| +++ b/third_party/WebKit/Source/web/PageOverlayTest.cpp
|
| @@ -76,17 +76,17 @@ class PageOverlayTest : public ::testing::Test {
|
| compositing_mode == kAcceleratedCompositing
|
| ? EnableAcceleratedCompositing
|
| : DisableAcceleratedCompositing);
|
| - GetWebViewImpl()->Resize(WebSize(kViewportWidth, kViewportHeight));
|
| - GetWebViewImpl()->UpdateAllLifecyclePhases();
|
| + GetWebView()->Resize(WebSize(kViewportWidth, kViewportHeight));
|
| + GetWebView()->UpdateAllLifecyclePhases();
|
| ASSERT_EQ(compositing_mode == kAcceleratedCompositing,
|
| - GetWebViewImpl()->IsAcceleratedCompositingActive());
|
| + GetWebView()->IsAcceleratedCompositingActive());
|
| }
|
|
|
| - WebViewImpl* GetWebViewImpl() const { return helper_.WebView(); }
|
| + WebViewBase* GetWebView() const { return helper_.WebView(); }
|
|
|
| std::unique_ptr<PageOverlay> CreateSolidYellowOverlay() {
|
| return PageOverlay::Create(
|
| - GetWebViewImpl()->MainFrameImpl(),
|
| + GetWebView()->MainFrameImpl(),
|
| WTF::MakeUnique<SolidColorOverlay>(SK_ColorYELLOW));
|
| }
|
|
|
| @@ -117,12 +117,12 @@ class MockCanvas : public SkCanvas {
|
|
|
| TEST_F(PageOverlayTest, PageOverlay_AcceleratedCompositing) {
|
| Initialize(kAcceleratedCompositing);
|
| - GetWebViewImpl()->LayerTreeView()->SetViewportSize(
|
| + GetWebView()->LayerTreeView()->SetViewportSize(
|
| WebSize(kViewportWidth, kViewportHeight));
|
|
|
| std::unique_ptr<PageOverlay> page_overlay = CreateSolidYellowOverlay();
|
| page_overlay->Update();
|
| - GetWebViewImpl()->UpdateAllLifecyclePhases();
|
| + GetWebView()->UpdateAllLifecyclePhases();
|
|
|
| // Ideally, we would get results from the compositor that showed that this
|
| // page overlay actually winds up getting drawn on top of the rest.
|
| @@ -153,7 +153,7 @@ TEST_F(PageOverlayTest, PageOverlay_VisualRect) {
|
| Initialize(kAcceleratedCompositing);
|
| std::unique_ptr<PageOverlay> page_overlay = CreateSolidYellowOverlay();
|
| page_overlay->Update();
|
| - GetWebViewImpl()->UpdateAllLifecyclePhases();
|
| + GetWebView()->UpdateAllLifecyclePhases();
|
| EXPECT_EQ(LayoutRect(0, 0, kViewportWidth, kViewportHeight),
|
| page_overlay->VisualRect());
|
| }
|
|
|