third_party/WebKit/Source/web/tests/WebFrameTest.cpp - Issue 2489703002: Revert of Implement overlay scrollbar fade out for non-composited scrollers.

Unified Diff: third_party/WebKit/Source/web/tests/WebFrameTest.cpp

Issue 2489703002: Revert of Implement overlay scrollbar fade out for non-composited scrollers. (Closed)

Patch Set: Created 4 years, 1 month 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 side-by-side diff with in-line comments

« no previous file with comments | « third_party/WebKit/Source/platform/scroll/ScrollbarThemeOverlayMock.h ('k') | third_party/WebKit/public/platform/WebThemeEngine.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/web/tests/WebFrameTest.cpp

diff --git a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp

index 93bf9743d7d92f3673f67755b474852dfb26930e..2c1b85b20f51d313b5aa95ee4414c0f06d68cbc3 100644

--- a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp

+++ b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp

@@ -86,7 +86,6 @@

#include "platform/geometry/FloatRect.h"

#include "platform/network/ResourceError.h"

#include "platform/scroll/ScrollbarTheme.h"

-#include "platform/scroll/ScrollbarThemeOverlayMock.h"

#include "platform/testing/RuntimeEnabledFeaturesTestHelpers.h"

#include "platform/testing/URLTestHelpers.h"

#include "platform/testing/UnitTestHelpers.h"

@@ -10452,89 +10451,6 @@

EXPECT_TRUE(scrollerArea->verticalScrollbar()->enabled());

}

-static void disableCompositing(WebSettings* settings) {

- settings->setAcceleratedCompositingEnabled(false);

- settings->setPreferCompositingToLCDTextEnabled(false);

-// Make sure overlay scrollbars on non-composited scrollers fade out and set

-// the hidden bit as needed.

-TEST_F(WebFrameTest, TestNonCompositedOverlayScrollbarsFade) {

- FrameTestHelpers::WebViewHelper webViewHelper;

- WebViewImpl* webViewImpl = webViewHelper.initialize(

- true, nullptr, nullptr, nullptr, &disableCompositing);

- constexpr double kMockOverlayFadeOutDelayMs = 5.0;

- ScrollbarTheme& theme = ScrollbarTheme::theme();

- // This test relies on mock overlay scrollbars.

- ASSERT_TRUE(theme.isMockTheme());

- ASSERT_TRUE(theme.usesOverlayScrollbars());

- ScrollbarThemeOverlayMock& mockOverlayTheme =

- (ScrollbarThemeOverlayMock&)theme;

- mockOverlayTheme.setOverlayScrollbarFadeOutDelay(kMockOverlayFadeOutDelayMs /

- 1000.0);

- webViewImpl->resizeWithBrowserControls(WebSize(640, 480), 0, false);

- WebURL baseURL = URLTestHelpers::toKURL("http://example.com/");

- FrameTestHelpers::loadHTMLString(webViewImpl->mainFrame(),

- "<!DOCTYPE html>"

- "<style>"

- " #space {"

- " width: 1000px;"

- " height: 1000px;"

- " }"

- " #container {"

- " width: 200px;"

- " height: 200px;"

- " overflow: scroll;"

- " }"

- " div { height:1000px; width: 200px; }"

- "</style>"

- "<div id='container'>"

- " <div id='space'></div>"

- "</div>",

- baseURL);

- webViewImpl->updateAllLifecyclePhases();

- WebLocalFrameImpl* frame = webViewHelper.webView()->mainFrameImpl();

- Document* document =

- toLocalFrame(webViewImpl->page()->mainFrame())->document();

- Element* container = document->getElementById("container");

- ScrollableArea* scrollableArea =

- toLayoutBox(container->layoutObject())->getScrollableArea();

- EXPECT_FALSE(scrollableArea->scrollbarsHidden());

- testing::runDelayedTasks(kMockOverlayFadeOutDelayMs);

- EXPECT_TRUE(scrollableArea->scrollbarsHidden());

- scrollableArea->setScrollOffset(ScrollOffset(10, 10), ProgrammaticScroll,

- ScrollBehaviorInstant);

- EXPECT_FALSE(scrollableArea->scrollbarsHidden());

- testing::runDelayedTasks(kMockOverlayFadeOutDelayMs);

- EXPECT_TRUE(scrollableArea->scrollbarsHidden());

- frame->executeScript(WebScriptSource(

- "document.getElementById('space').style.height = '500px';"));

- frame->view()->updateAllLifecyclePhases();

- EXPECT_FALSE(scrollableArea->scrollbarsHidden());

- testing::runDelayedTasks(kMockOverlayFadeOutDelayMs);

- EXPECT_TRUE(scrollableArea->scrollbarsHidden());

- frame->executeScript(WebScriptSource(

- "document.getElementById('container').style.height = '300px';"));

- frame->view()->updateAllLifecyclePhases();

- EXPECT_FALSE(scrollableArea->scrollbarsHidden());

- testing::runDelayedTasks(kMockOverlayFadeOutDelayMs);

- EXPECT_TRUE(scrollableArea->scrollbarsHidden());

- mockOverlayTheme.setOverlayScrollbarFadeOutDelay(0.0);

TEST_F(WebFrameTest, UniqueNames) {

registerMockedHttpURLLoad("frameset-repeated-name.html");

registerMockedHttpURLLoad("frameset-dest.html");