Diff
Modified: trunk/LayoutTests/ChangeLog (167731 => 167732)
--- trunk/LayoutTests/ChangeLog 2014-04-24 00:08:28 UTC (rev 167731)
+++ trunk/LayoutTests/ChangeLog 2014-04-24 00:32:14 UTC (rev 167732)
@@ -1,3 +1,30 @@
+2014-04-23 Alexey Proskuryakov <a...@apple.com>
+
+ Eliminate internals.setMockScrollbarsEnabled()
+ https://bugs.webkit.org/show_bug.cgi?id=132085
+
+ Reviewed by Tim Horton.
+
+ Remove calls, all of which were resetting it to true (which is the default, and
+ the only value that makes sense).
+
+ * compositing/geometry/fixed-position.html:
+ * compositing/geometry/horizontal-scroll-composited.html:
+ * compositing/geometry/vertical-scroll-composited.html:
+ * compositing/iframes/resources/scrollgrandchild-inner.html:
+ * compositing/overflow/fixed-position-ancestor-clip.html:
+ * compositing/resources/mock_scrollbars.js: Removed.
+ * css3/filters/blur-filter-page-scroll-parents.html:
+ * css3/filters/blur-filter-page-scroll-self.html:
+ * css3/filters/blur-filter-page-scroll.html:
+ * fast/dom/window-scroll-scaling.html:
+ * fast/events/touch/gesture/gesture-scrollbar.html:
+ * fast/sub-pixel/sub-pixel-iframe-copy-on-scroll.html:
+ * fast/sub-pixel/transformed-iframe-copy-on-scroll.html:
+ * media/video-controls-rendering.html:
+ * media/video-zoom.html:
+ * scrollingcoordinator/resources/non-fast-scrollable-region-testing.js:
+
2014-04-23 David Hyatt <hy...@apple.com>
[New Multicolumn] Crasher when clearing out a flow thread in multicolumn layout.
Modified: trunk/LayoutTests/compositing/geometry/fixed-position.html (167731 => 167732)
--- trunk/LayoutTests/compositing/geometry/fixed-position.html 2014-04-24 00:08:28 UTC (rev 167731)
+++ trunk/LayoutTests/compositing/geometry/fixed-position.html 2014-04-24 00:32:14 UTC (rev 167732)
@@ -5,7 +5,6 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Position fixed</title>
- <script src=""
<style type="text/css" media="screen">
body {
height: 1000px;
Modified: trunk/LayoutTests/compositing/geometry/horizontal-scroll-composited.html (167731 => 167732)
--- trunk/LayoutTests/compositing/geometry/horizontal-scroll-composited.html 2014-04-24 00:08:28 UTC (rev 167731)
+++ trunk/LayoutTests/compositing/geometry/horizontal-scroll-composited.html 2014-04-24 00:32:14 UTC (rev 167732)
@@ -5,7 +5,6 @@
if (window.testRunner)
testRunner.waitUntilDone();
</script>
- <script src=""
</head>
<body style="width: 600px">
<div style="-webkit-transform: translatez(0); width: 1000px; height: 800px; border-style: solid; border-color: Red; border-width: 3px; background-image: url(../resources/apple.jpg); background-repeat:repeat"></div>
Modified: trunk/LayoutTests/compositing/geometry/vertical-scroll-composited.html (167731 => 167732)
--- trunk/LayoutTests/compositing/geometry/vertical-scroll-composited.html 2014-04-24 00:08:28 UTC (rev 167731)
+++ trunk/LayoutTests/compositing/geometry/vertical-scroll-composited.html 2014-04-24 00:32:14 UTC (rev 167732)
@@ -5,7 +5,6 @@
if (window.testRunner)
testRunner.waitUntilDone();
</script>
- <script src=""
</head>
<body style="height: 600px">
<div style="-webkit-transform: rotate3d(0,0,1,20deg); width: 800px; height: 1000px; border-style: solid; border-color: Red; border-width: 3px; background-image: url(../resources/apple.jpg); background-repeat:repeat"></div>
Modified: trunk/LayoutTests/compositing/iframes/resources/scrollgrandchild-inner.html (167731 => 167732)
--- trunk/LayoutTests/compositing/iframes/resources/scrollgrandchild-inner.html 2014-04-24 00:08:28 UTC (rev 167731)
+++ trunk/LayoutTests/compositing/iframes/resources/scrollgrandchild-inner.html 2014-04-24 00:32:14 UTC (rev 167732)
@@ -22,8 +22,6 @@
}
</style>
<script>
- if (window.internals)
- window.internals.settings.setMockScrollbarsEnabled(true);
if (window.testRunner) {
testRunner.dumpAsText(true);
testRunner.waitUntilDone();
Modified: trunk/LayoutTests/compositing/overflow/fixed-position-ancestor-clip.html (167731 => 167732)
--- trunk/LayoutTests/compositing/overflow/fixed-position-ancestor-clip.html 2014-04-24 00:08:28 UTC (rev 167731)
+++ trunk/LayoutTests/compositing/overflow/fixed-position-ancestor-clip.html 2014-04-24 00:32:14 UTC (rev 167732)
@@ -34,7 +34,6 @@
window.scrollBy(50, 50);
}, false);
</script>
- <script src=""
</head>
<body>
Deleted: trunk/LayoutTests/compositing/resources/mock_scrollbars.js (167731 => 167732)
--- trunk/LayoutTests/compositing/resources/mock_scrollbars.js 2014-04-24 00:08:28 UTC (rev 167731)
+++ trunk/LayoutTests/compositing/resources/mock_scrollbars.js 2014-04-24 00:32:14 UTC (rev 167732)
@@ -1,3 +0,0 @@
-if (window.internals) {
- window.internals.settings.setMockScrollbarsEnabled(true);
-}
Modified: trunk/LayoutTests/css3/filters/blur-filter-page-scroll-parents.html (167731 => 167732)
--- trunk/LayoutTests/css3/filters/blur-filter-page-scroll-parents.html 2014-04-24 00:08:28 UTC (rev 167731)
+++ trunk/LayoutTests/css3/filters/blur-filter-page-scroll-parents.html 2014-04-24 00:32:14 UTC (rev 167732)
@@ -12,8 +12,6 @@
window.testRunner.overridePreference("WebKitAcceleratedCompositingEnabled", "0");
}
</script>
- <!-- Make sure the mock scrollbars are enabled after the call to overridePreference, otherwise the setting will be overwritten. -->
- <script src=""
<style>
body {
margin: 0px;
Modified: trunk/LayoutTests/css3/filters/blur-filter-page-scroll-self.html (167731 => 167732)
--- trunk/LayoutTests/css3/filters/blur-filter-page-scroll-self.html 2014-04-24 00:08:28 UTC (rev 167731)
+++ trunk/LayoutTests/css3/filters/blur-filter-page-scroll-self.html 2014-04-24 00:32:14 UTC (rev 167732)
@@ -12,8 +12,6 @@
window.testRunner.overridePreference("WebKitAcceleratedCompositingEnabled", "0");
}
</script>
- <!-- Make sure the mock scrollbars are enabled after the call to overridePreference, otherwise the setting will be overwritten. -->
- <script src=""
<style>
body {
margin: 0px;
Modified: trunk/LayoutTests/css3/filters/blur-filter-page-scroll.html (167731 => 167732)
--- trunk/LayoutTests/css3/filters/blur-filter-page-scroll.html 2014-04-24 00:08:28 UTC (rev 167731)
+++ trunk/LayoutTests/css3/filters/blur-filter-page-scroll.html 2014-04-24 00:32:14 UTC (rev 167732)
@@ -12,8 +12,6 @@
window.testRunner.overridePreference("WebKitAcceleratedCompositingEnabled", "0");
}
</script>
- <!-- Make sure the mock scrollbars are enabled after the call to overridePreference, otherwise the setting will be overwritten. -->
- <script src=""
<style>
body {
margin: 0px;
Modified: trunk/LayoutTests/fast/dom/window-scroll-scaling.html (167731 => 167732)
--- trunk/LayoutTests/fast/dom/window-scroll-scaling.html 2014-04-24 00:08:28 UTC (rev 167731)
+++ trunk/LayoutTests/fast/dom/window-scroll-scaling.html 2014-04-24 00:32:14 UTC (rev 167732)
@@ -4,9 +4,6 @@
<script>
description("This test ensures that document content width (height) as reported by scrollWidth (scrollHeight) is invariant to changes in page scale factor.");
- if (window.internals)
- window.internals.settings.setMockScrollbarsEnabled(true);
-
var body = document.body;
// According to CSSOM (http://dev.w3.org/csswg/cssom-view/#dom-element-scrollwidth)
Modified: trunk/LayoutTests/fast/events/touch/gesture/gesture-scrollbar.html (167731 => 167732)
--- trunk/LayoutTests/fast/events/touch/gesture/gesture-scrollbar.html 2014-04-24 00:08:28 UTC (rev 167731)
+++ trunk/LayoutTests/fast/events/touch/gesture/gesture-scrollbar.html 2014-04-24 00:32:14 UTC (rev 167732)
@@ -64,7 +64,6 @@
function runTest()
{
- internals.settings.setMockScrollbarsEnabled(true);
if (window.eventSender) {
description('This tests scroll gesture events on a scroll bar. ' +
'The scrollable div below should be slightly scrolled down ' +
Modified: trunk/LayoutTests/fast/sub-pixel/sub-pixel-iframe-copy-on-scroll.html (167731 => 167732)
--- trunk/LayoutTests/fast/sub-pixel/sub-pixel-iframe-copy-on-scroll.html 2014-04-24 00:08:28 UTC (rev 167731)
+++ trunk/LayoutTests/fast/sub-pixel/sub-pixel-iframe-copy-on-scroll.html 2014-04-24 00:32:14 UTC (rev 167732)
@@ -12,10 +12,8 @@
</style>
<script src="" type="text/_javascript_"></script>
<script>
-if (window.testRunner) {
+if (window.testRunner)
testRunner.waitUntilDone();
- internals.settings.setMockScrollbarsEnabled(true);
-}
function setupIframes() {
setupIframe(document.getElementById('iframe1').contentWindow.document);
Modified: trunk/LayoutTests/fast/sub-pixel/transformed-iframe-copy-on-scroll.html (167731 => 167732)
--- trunk/LayoutTests/fast/sub-pixel/transformed-iframe-copy-on-scroll.html 2014-04-24 00:08:28 UTC (rev 167731)
+++ trunk/LayoutTests/fast/sub-pixel/transformed-iframe-copy-on-scroll.html 2014-04-24 00:32:14 UTC (rev 167732)
@@ -18,10 +18,8 @@
</style>
<script src="" type="text/_javascript_"></script>
<script>
-if (window.testRunner) {
+if (window.testRunner)
testRunner.waitUntilDone();
- internals.settings.setMockScrollbarsEnabled(true);
-}
function setupIframes() {
setupIframe(document.getElementById('iframe1').contentWindow.document);
Modified: trunk/LayoutTests/media/video-controls-rendering.html (167731 => 167732)
--- trunk/LayoutTests/media/video-controls-rendering.html 2014-04-24 00:08:28 UTC (rev 167731)
+++ trunk/LayoutTests/media/video-controls-rendering.html 2014-04-24 00:32:14 UTC (rev 167732)
@@ -12,8 +12,6 @@
<video controls style="position: absolute; width: 320px;"></video>
</div>
<script>
-if (window.internals)
- window.internals.settings.setMockScrollbarsEnabled(true);
init();
setSrcByTagName('video', findMediaFile('video', 'content/test'));
</script>
Modified: trunk/LayoutTests/media/video-zoom.html (167731 => 167732)
--- trunk/LayoutTests/media/video-zoom.html 2014-04-24 00:08:28 UTC (rev 167731)
+++ trunk/LayoutTests/media/video-zoom.html 2014-04-24 00:32:14 UTC (rev 167732)
@@ -3,9 +3,6 @@
<style> video { zoom: 150%; border: 3px solid red; } </style>
<script src=""
<script>
- if (window.internals)
- window.internals.settings.setMockScrollbarsEnabled(true);
-
function init()
{
setSrcByTagName("video", findMediaFile("video", "content/test"));
Modified: trunk/LayoutTests/scrollingcoordinator/resources/non-fast-scrollable-region-testing.js (167731 => 167732)
--- trunk/LayoutTests/scrollingcoordinator/resources/non-fast-scrollable-region-testing.js 2014-04-24 00:08:28 UTC (rev 167731)
+++ trunk/LayoutTests/scrollingcoordinator/resources/non-fast-scrollable-region-testing.js 2014-04-24 00:32:14 UTC (rev 167732)
@@ -1,6 +1,5 @@
function runNonFastScrollableRegionTest(scale) {
var invScale;
- window.internals.settings.setMockScrollbarsEnabled(true);
if (scale != undefined) {
window.internals.setPageScaleFactor(scale, 0, 0);
// FIXME: This is a hack for applyPageScaleFactorInCompositor() == false.
Modified: trunk/Source/WebCore/ChangeLog (167731 => 167732)
--- trunk/Source/WebCore/ChangeLog 2014-04-24 00:08:28 UTC (rev 167731)
+++ trunk/Source/WebCore/ChangeLog 2014-04-24 00:32:14 UTC (rev 167732)
@@ -1,3 +1,18 @@
+2014-04-23 Alexey Proskuryakov <a...@apple.com>
+
+ Eliminate internals.setMockScrollbarsEnabled()
+ https://bugs.webkit.org/show_bug.cgi?id=132085
+
+ Reviewed by Tim Horton.
+
+ This was essentially unused, and also didnt work.
+
+ * testing/InternalSettings.cpp:
+ (WebCore::InternalSettings::Backup::restoreTo):
+ (WebCore::InternalSettings::setMockScrollbarsEnabled): Deleted.
+ * testing/InternalSettings.h:
+ * testing/InternalSettings.idl:
+
2014-04-23 Anders Carlsson <ander...@apple.com>
Don't migrate the WKView.h header from WebCore to WebKit
Modified: trunk/Source/WebCore/testing/InternalSettings.cpp (167731 => 167732)
--- trunk/Source/WebCore/testing/InternalSettings.cpp 2014-04-24 00:08:28 UTC (rev 167731)
+++ trunk/Source/WebCore/testing/InternalSettings.cpp 2014-04-24 00:32:14 UTC (rev 167732)
@@ -135,7 +135,6 @@
#endif
settings.setMediaTypeOverride(m_originalMediaTypeOverride);
settings.setCanvasUsesAcceleratedDrawing(m_originalCanvasUsesAcceleratedDrawing);
- settings.setMockScrollbarsEnabled(m_originalMockScrollbarsEnabled);
RuntimeEnabledFeatures::sharedFeatures().setLangAttributeAwareFormControlUIEnabled(m_langAttributeAwareFormControlUIEnabled);
settings.setImagesEnabled(m_imagesEnabled);
settings.setMinDOMTimerInterval(m_minimumTimerInterval);
@@ -210,12 +209,6 @@
return &page()->settings();
}
-void InternalSettings::setMockScrollbarsEnabled(bool enabled, ExceptionCode& ec)
-{
- InternalSettingsGuardForSettings();
- settings()->setMockScrollbarsEnabled(enabled);
-}
-
void InternalSettings::setTouchEventEmulationEnabled(bool enabled, ExceptionCode& ec)
{
#if ENABLE(TOUCH_EVENTS)
Modified: trunk/Source/WebCore/testing/InternalSettings.h (167731 => 167732)
--- trunk/Source/WebCore/testing/InternalSettings.h 2014-04-24 00:08:28 UTC (rev 167731)
+++ trunk/Source/WebCore/testing/InternalSettings.h 2014-04-24 00:32:14 UTC (rev 167732)
@@ -100,7 +100,6 @@
virtual ~InternalSettings();
void resetToConsistentState();
- void setMockScrollbarsEnabled(bool enabled, ExceptionCode&);
void setUsesOverlayScrollbars(bool enabled, ExceptionCode&);
void setTouchEventEmulationEnabled(bool enabled, ExceptionCode&);
void setStandardFontFamily(const String& family, const String& script, ExceptionCode&);
Modified: trunk/Source/WebCore/testing/InternalSettings.idl (167731 => 167732)
--- trunk/Source/WebCore/testing/InternalSettings.idl 2014-04-24 00:08:28 UTC (rev 167731)
+++ trunk/Source/WebCore/testing/InternalSettings.idl 2014-04-24 00:32:14 UTC (rev 167732)
@@ -27,7 +27,6 @@
NoInterfaceObject,
JSGenerateToJSObject
] interface InternalSettings : InternalSettingsGenerated {
- [RaisesException] void setMockScrollbarsEnabled(boolean enabled);
[RaisesException] void setTouchEventEmulationEnabled(boolean enabled);
[RaisesException] void setStandardFontFamily(DOMString family, DOMString script);
[RaisesException] void setSerifFontFamily(DOMString family, DOMString script);
Modified: trunk/Tools/ChangeLog (167731 => 167732)
--- trunk/Tools/ChangeLog 2014-04-24 00:08:28 UTC (rev 167731)
+++ trunk/Tools/ChangeLog 2014-04-24 00:32:14 UTC (rev 167732)
@@ -1,3 +1,13 @@
+2014-04-23 Alexey Proskuryakov <a...@apple.com>
+
+ Eliminate internals.setMockScrollbarsEnabled()
+ https://bugs.webkit.org/show_bug.cgi?id=132085
+
+ Reviewed by Tim Horton.
+
+ * DumpRenderTree/mac/DumpRenderTree.mm: (resetWebPreferencesToConsistentValues):
+ No need to reset the preference, there is no way it can change.
+
2014-04-23 James Craig <jcr...@apple.com>
Unreviewed. Moving myself from Contributors to Committers list.
Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (167731 => 167732)
--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2014-04-24 00:08:28 UTC (rev 167731)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2014-04-24 00:32:14 UTC (rev 167732)
@@ -881,7 +881,7 @@
[preferences setCSSGridLayoutEnabled:NO];
[preferences setUsePreHTML5ParserQuirks:NO];
[preferences setAsynchronousSpellCheckingEnabled:NO];
- [preferences setMockScrollbarsEnabled:YES];
+ ASSERT([preferences mockScrollbarsEnabled]);
#if ENABLE(WEB_AUDIO)
[preferences setWebAudioEnabled:YES];
