Commit fb1b81a2 authored by Suneel Kota's avatar Suneel Kota Committed by Commit Bot

Remove use of setOverlayScrollbarsEnabled in layout tests

Adding runtimeFlags.overlayScrollbarsEnabled would help to
make more of these branches take the overlay path

Bug: 661783
Change-Id: I1d5523922fe3d6c8f671edd1c54789ef9aae399d
Reviewed-on: https://chromium-review.googlesource.com/792833Reviewed-by: default avatarDavid Bokan <bokan@chromium.org>
Commit-Queue: srirama chandra sekhar <srirama.m@samsung.com>
Cr-Commit-Position: refs/heads/master@{#521289}
parent 0c5b078d
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
</style> </style>
<script> <script>
if (window.internals) { if (window.internals) {
window.internals.settings.setOverlayScrollbarsEnabled(true); window.internals.runtimeFlags.overlayScrollbarsEnabled = true;
window.internals.settings.setPreferCompositingToLCDTextEnabled(false); window.internals.settings.setPreferCompositingToLCDTextEnabled(false);
} }
</script> </script>
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
</style> </style>
<script> <script>
if (window.internals) if (window.internals)
window.internals.settings.setOverlayScrollbarsEnabled(true); window.internals.runtimeFlags.overlayScrollbarsEnabled = true;
</script> </script>
<div id='scroller'> <div id='scroller'>
<div id='fixed'></div> <div id='fixed'></div>
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
</style> </style>
<script> <script>
if (window.internals) { if (window.internals) {
window.internals.settings.setOverlayScrollbarsEnabled(true); window.internals.runtimeFlags.overlayScrollbarsEnabled = true;
window.internals.settings.setPreferCompositingToLCDTextEnabled(true); window.internals.settings.setPreferCompositingToLCDTextEnabled(true);
} }
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
</style> </style>
<script> <script>
if (window.internals) { if (window.internals) {
window.internals.settings.setOverlayScrollbarsEnabled(true); window.internals.runtimeFlags.overlayScrollbarsEnabled = true;
window.internals.settings.setPreferCompositingToLCDTextEnabled(false); window.internals.settings.setPreferCompositingToLCDTextEnabled(false);
} }
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
</style> </style>
<script> <script>
if (window.internals) { if (window.internals) {
window.internals.settings.setOverlayScrollbarsEnabled(true); window.internals.runtimeFlags.overlayScrollbarsEnabled = true;
window.internals.settings.setPreferCompositingToLCDTextEnabled(false); window.internals.settings.setPreferCompositingToLCDTextEnabled(false);
} }
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
</style> </style>
<script> <script>
if (window.internals) { if (window.internals) {
window.internals.settings.setOverlayScrollbarsEnabled(true); window.internals.runtimeFlags.overlayScrollbarsEnabled = true;
window.internals.settings.setPreferCompositingToLCDTextEnabled(true); window.internals.settings.setPreferCompositingToLCDTextEnabled(true);
} }
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
</style> </style>
<script> <script>
if (window.internals) { if (window.internals) {
window.internals.settings.setOverlayScrollbarsEnabled(true); window.internals.runtimeFlags.overlayScrollbarsEnabled = true;
window.internals.settings.setPreferCompositingToLCDTextEnabled(false); window.internals.settings.setPreferCompositingToLCDTextEnabled(false);
} }
</script> </script>
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
</style> </style>
<script> <script>
if (window.internals) { if (window.internals) {
window.internals.settings.setOverlayScrollbarsEnabled(true); window.internals.runtimeFlags.overlayScrollbarsEnabled = true;
window.internals.settings.setPreferCompositingToLCDTextEnabled(true); window.internals.settings.setPreferCompositingToLCDTextEnabled(true);
} }
</script> </script>
......
...@@ -42,7 +42,7 @@ if (window.testRunner) ...@@ -42,7 +42,7 @@ if (window.testRunner)
testRunner.dumpAsText(); testRunner.dumpAsText();
if (window.internals) { if (window.internals) {
window.internals.settings.setOverlayScrollbarsEnabled(true); window.internals.runtimeFlags.overlayScrollbarsEnabled = true;
window.internals.settings.setPreferCompositingToLCDTextEnabled(true); window.internals.settings.setPreferCompositingToLCDTextEnabled(true);
} }
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
</style> </style>
<script> <script>
if (window.internals) { if (window.internals) {
window.internals.settings.setOverlayScrollbarsEnabled(true); window.internals.runtimeFlags.overlayScrollbarsEnabled = true;
window.internals.settings.setPreferCompositingToLCDTextEnabled(false); window.internals.settings.setPreferCompositingToLCDTextEnabled(false);
} }
</script> </script>
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
</style> </style>
<script> <script>
if (window.internals) { if (window.internals) {
window.internals.settings.setOverlayScrollbarsEnabled(true); window.internals.runtimeFlags.overlayScrollbarsEnabled = true;
window.internals.settings.setPreferCompositingToLCDTextEnabled(true); window.internals.settings.setPreferCompositingToLCDTextEnabled(true);
} }
</script> </script>
......
...@@ -50,7 +50,7 @@ contents. ...@@ -50,7 +50,7 @@ contents.
</div> </div>
<script> <script>
if (window.internals) { if (window.internals) {
window.internals.settings.setOverlayScrollbarsEnabled(true); window.internals.runtimeFlags.overlayScrollbarsEnabled = true;
window.internals.settings.setPreferCompositingToLCDTextEnabled(true); window.internals.settings.setPreferCompositingToLCDTextEnabled(true);
} }
......
...@@ -19,7 +19,7 @@ with varying thicknesses. ...@@ -19,7 +19,7 @@ with varying thicknesses.
--> -->
<script> <script>
if (window.internals) { if (window.internals) {
window.internals.settings.setOverlayScrollbarsEnabled(true); window.internals.runtimeFlags.overlayScrollbarsEnabled = true;
window.internals.settings.setPreferCompositingToLCDTextEnabled(true); window.internals.settings.setPreferCompositingToLCDTextEnabled(true);
} }
</script> </script>
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
</style> </style>
<script> <script>
if (window.internals) { if (window.internals) {
window.internals.settings.setOverlayScrollbarsEnabled(true); window.internals.runtimeFlags.overlayScrollbarsEnabled = true;
window.internals.settings.setPreferCompositingToLCDTextEnabled(true); window.internals.settings.setPreferCompositingToLCDTextEnabled(true);
} }
......
...@@ -32,5 +32,5 @@ ...@@ -32,5 +32,5 @@
</div> </div>
<script> <script>
if (window.internals) if (window.internals)
window.internals.settings.setOverlayScrollbarsEnabled(true); window.internals.runtimeFlags.overlayScrollbarsEnabled = true;
</script> </script>
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
// Check that a case with a reparented overflow control and a containing perspective node // Check that a case with a reparented overflow control and a containing perspective node
// paints the same with and without layer squashing. // paints the same with and without layer squashing.
if (window.internals) { if (window.internals) {
window.internals.settings.setOverlayScrollbarsEnabled(true); window.internals.runtimeFlags.overlayScrollbarsEnabled = true;
window.internals.settings.setPreferCompositingToLCDTextEnabled(true); window.internals.settings.setPreferCompositingToLCDTextEnabled(true);
} }
</script> </script>
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
</style> </style>
<script> <script>
if (window.internals) if (window.internals)
internals.settings.setOverlayScrollbarsEnabled(true); internals.runtimeFlags.overlayScrollbarsEnabled = true;
if (window.testRunner) if (window.testRunner)
testRunner.dumpAsText(); testRunner.dumpAsText();
if (window.eventSender) if (window.eventSender)
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
if (window.internals) { if (window.internals) {
internals.settings.setPreferCompositingToLCDTextEnabled(true); internals.settings.setPreferCompositingToLCDTextEnabled(true);
internals.settings.setMockScrollbarsEnabled(true); internals.settings.setMockScrollbarsEnabled(true);
internals.settings.setOverlayScrollbarsEnabled(true); internals.runtimeFlags.overlayScrollbarsEnabled = true;
} }
if (window.testRunner) if (window.testRunner)
......
...@@ -28,7 +28,7 @@ html, body { ...@@ -28,7 +28,7 @@ html, body {
testRunner.dumpAsText(); testRunner.dumpAsText();
if (window.internals) if (window.internals)
window.internals.settings.setOverlayScrollbarsEnabled(true); window.internals.runtimeFlags.overlayScrollbarsEnabled = true;
test(function() { test(function() {
var measure = document.getElementById('measure'); var measure = document.getElementById('measure');
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
testRunner.dumpAsText(); testRunner.dumpAsText();
if (window.internals) if (window.internals)
window.internals.settings.setOverlayScrollbarsEnabled(true); // Note: We force non-overlay scrollbars with CSS. window.internals.runtimeFlags.overlayScrollbarsEnabled = true; // Note: We force non-overlay scrollbars with CSS.
var test = async_test("Test that partial layout works with non-overlay scrollbars."); var test = async_test("Test that partial layout works with non-overlay scrollbars.");
setTimeout(function() { setTimeout(function() {
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
testRunner.dumpAsText(); testRunner.dumpAsText();
if (window.internals) if (window.internals)
window.internals.settings.setOverlayScrollbarsEnabled(true); window.internals.runtimeFlags.overlayScrollbarsEnabled = true;
var test = async_test("Test that partial layout works with overlay scrollbars."); var test = async_test("Test that partial layout works with overlay scrollbars.");
setTimeout(function() { setTimeout(function() {
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
shouldBeDefined(window.internals); shouldBeDefined(window.internals);
var originalOverlayScrollbars = internals.runtimeFlags.overlayScrollbarsEnabled; var originalOverlayScrollbars = internals.runtimeFlags.overlayScrollbarsEnabled;
internals.settings.setOverlayScrollbarsEnabled(true); internals.runtimeFlags.overlayScrollbarsEnabled = true;
function runTests() { function runTests() {
clientWidthBefore = frame.contentDocument.documentElement.clientWidth; clientWidthBefore = frame.contentDocument.documentElement.clientWidth;
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
shouldBe("clientWidthBefore", "100"); shouldBe("clientWidthBefore", "100");
shouldBe("clientWidthAfter", "200"); shouldBe("clientWidthAfter", "200");
internals.settings.setOverlayScrollbarsEnabled(originalOverlayScrollbars); internals.runtimeFlags.overlayScrollbarsEnabled = originalOverlayScrollbars;
finishJSTest(); finishJSTest();
} }
</script> </script>
...@@ -39,15 +39,15 @@ ...@@ -39,15 +39,15 @@
var originalOverlayScrollbars = internals.runtimeFlags.overlayScrollbarsEnabled; var originalOverlayScrollbars = internals.runtimeFlags.overlayScrollbarsEnabled;
internals.settings.setOverlayScrollbarsEnabled(true); internals.runtimeFlags.overlayScrollbarsEnabled = true;
runClientSizeTest("wide", false, false, 1); runClientSizeTest("wide", false, false, 1);
runClientSizeTest("tall", false, false, 1); runClientSizeTest("tall", false, false, 1);
internals.settings.setOverlayScrollbarsEnabled(false); internals.runtimeFlags.overlayScrollbarsEnabled = false;
runClientSizeTest("wide", false, true, 0); runClientSizeTest("wide", false, true, 0);
runClientSizeTest("tall", true, false, 0); runClientSizeTest("tall", true, false, 0);
internals.settings.setOverlayScrollbarsEnabled(originalOverlayScrollbars); internals.runtimeFlags.overlayScrollbarsEnabled = originalOverlayScrollbars;
</script> </script>
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
description("Ensure hit test cache works in correct scenarios of overlay scrollbars."); description("Ensure hit test cache works in correct scenarios of overlay scrollbars.");
if (window.internals) { if (window.internals) {
window.internals.settings.setOverlayScrollbarsEnabled(true); window.internals.runtimeFlags.overlayScrollbarsEnabled = true;
var parentDiv = document.getElementById("parent"); var parentDiv = document.getElementById("parent");
var rect = parentDiv.getBoundingClientRect(); var rect = parentDiv.getBoundingClientRect();
...@@ -30,4 +30,4 @@ if (window.internals) { ...@@ -30,4 +30,4 @@ if (window.internals) {
window.internals.elementFromPoint(document, rect.left + rect.width - 2, rect.top + (rect.height/2), false, false); window.internals.elementFromPoint(document, rect.left + rect.width - 2, rect.top + (rect.height/2), false, false);
shouldBe("window.internals.hitTestCacheHits(document)", "expectedCount"); shouldBe("window.internals.hitTestCacheHits(document)", "expectedCount");
} }
</script> </script>
\ No newline at end of file
...@@ -19,7 +19,7 @@ html, body { ...@@ -19,7 +19,7 @@ html, body {
<script> <script>
if (window.internals) { if (window.internals) {
testRunner.dumpAsTextWithPixelResults(); testRunner.dumpAsTextWithPixelResults();
internals.settings.setOverlayScrollbarsEnabled(true); internals.runtimeFlags.overlayScrollbarsEnabled = true;
internals.settings.setMockScrollbarsEnabled(true); internals.settings.setMockScrollbarsEnabled(true);
} }
</script> </script>
...@@ -47,4 +47,4 @@ should have a scrollbar on the left.</p> ...@@ -47,4 +47,4 @@ should have a scrollbar on the left.</p>
</select> </select>
</div> </div>
</body> </body>
</html> </html>
\ No newline at end of file
...@@ -20,7 +20,7 @@ html, body { ...@@ -20,7 +20,7 @@ html, body {
<script> <script>
if (window.internals) { if (window.internals) {
testRunner.dumpAsTextWithPixelResults(); testRunner.dumpAsTextWithPixelResults();
internals.settings.setOverlayScrollbarsEnabled(true); internals.runtimeFlags.overlayScrollbarsEnabled = true;
internals.settings.setMockScrollbarsEnabled(true); internals.settings.setMockScrollbarsEnabled(true);
} }
</script> </script>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<script> <script>
description('Checks that clicking on scrollbar works when tickmarks are added.'); description('Checks that clicking on scrollbar works when tickmarks are added.');
if (window.internals) { if (window.internals) {
window.internals.settings.setOverlayScrollbarsEnabled(true); window.internals.runtimeFlags.overlayScrollbarsEnabled = true;
} }
onload = function() onload = function()
......
...@@ -39,15 +39,15 @@ ...@@ -39,15 +39,15 @@
var originalOverlayScrollbars = internals.runtimeFlags.overlayScrollbarsEnabled; var originalOverlayScrollbars = internals.runtimeFlags.overlayScrollbarsEnabled;
internals.settings.setOverlayScrollbarsEnabled(true); internals.runtimeFlags.overlayScrollbarsEnabled = true;
runClientSizeTest("wide", false, false, 1); runClientSizeTest("wide", false, false, 1);
runClientSizeTest("tall", false, false, 1); runClientSizeTest("tall", false, false, 1);
internals.settings.setOverlayScrollbarsEnabled(false); internals.runtimeFlags.overlayScrollbarsEnabled = false;
runClientSizeTest("wide", false, true, 0); runClientSizeTest("wide", false, true, 0);
runClientSizeTest("tall", true, false, 0); runClientSizeTest("tall", true, false, 0);
internals.settings.setOverlayScrollbarsEnabled(originalOverlayScrollbars); internals.runtimeFlags.overlayScrollbarsEnabled = originalOverlayScrollbars;
</script> </script>
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<script src="../resources/text-based-repaint.js"></script> <script src="../resources/text-based-repaint.js"></script>
<script> <script>
if (window.internals) { if (window.internals) {
internals.settings.setOverlayScrollbarsEnabled(true); internals.runtimeFlags.overlayScrollbarsEnabled = true;
internals.settings.setMockScrollbarsEnabled(true); internals.settings.setMockScrollbarsEnabled(true);
} }
function repaintTest() { function repaintTest() {
......
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
// RuntimeEnabledFeature after the ScrollbarTheme is initialized. It // RuntimeEnabledFeature after the ScrollbarTheme is initialized. It
// makes the non overlay scrollbars think they're overlay so it works // makes the non overlay scrollbars think they're overlay so it works
// for this test but it should probably be in a unit test. // for this test but it should probably be in a unit test.
internals.settings.setOverlayScrollbarsEnabled(true); internals.runtimeFlags.overlayScrollbarsEnabled = true;
var d = document.getElementById('container'); var d = document.getElementById('container');
var plugin = document.createElement('object'); var plugin = document.createElement('object');
......
<!DOCTYPE html> <!DOCTYPE html>
<script> <script>
if (window.internals) { if (window.internals) {
window.internals.settings.setOverlayScrollbarsEnabled(true); window.internals.runtimeFlags.overlayScrollbarsEnabled = true;
window.internals.settings.setMockScrollbarsEnabled(true); window.internals.settings.setMockScrollbarsEnabled(true);
window.onload = function() { window.onload = function() {
......
<!DOCTYPE html> <!DOCTYPE html>
<script> <script>
if (window.internals) { if (window.internals) {
internals.settings.setOverlayScrollbarsEnabled(true); internals.runtimeFlags.overlayScrollbarsEnabled = true;
internals.settings.setMockScrollbarsEnabled(true); internals.settings.setMockScrollbarsEnabled(true);
} }
</script> </script>
...@@ -15,7 +15,7 @@ if (window.internals) { ...@@ -15,7 +15,7 @@ if (window.internals) {
<script> <script>
window.onload = function() { window.onload = function() {
if (window.internals) { if (window.internals) {
internals.settings.setOverlayScrollbarsEnabled(true); internals.runtimeFlags.overlayScrollbarsEnabled = true;
var div = document.querySelector('#div'); var div = document.querySelector('#div');
var iframe = document.querySelector('#iframe'); var iframe = document.querySelector('#iframe');
......
...@@ -31,7 +31,7 @@ html, body { margin: 0; padding: 0; } ...@@ -31,7 +31,7 @@ html, body { margin: 0; padding: 0; }
<script> <script>
if (window.internals) { if (window.internals) {
internals.settings.setOverlayScrollbarsEnabled(true); internals.runtimeFlags.overlayScrollbarsEnabled = true;
internals.settings.setMockScrollbarsEnabled(true); internals.settings.setMockScrollbarsEnabled(true);
} }
const outer = document.getElementById('outer'); const outer = document.getElementById('outer');
......
...@@ -168,10 +168,6 @@ void InternalSettings::setExperimentalContentSecurityPolicyFeaturesEnabled( ...@@ -168,10 +168,6 @@ void InternalSettings::setExperimentalContentSecurityPolicyFeaturesEnabled(
enabled); enabled);
} }
void InternalSettings::setOverlayScrollbarsEnabled(bool enabled) {
RuntimeEnabledFeatures::SetOverlayScrollbarsEnabled(enabled);
}
void InternalSettings::setViewportEnabled(bool enabled, void InternalSettings::setViewportEnabled(bool enabled,
ExceptionState& exception_state) { ExceptionState& exception_state) {
InternalSettingsGuardForSettings(); InternalSettingsGuardForSettings();
......
...@@ -131,7 +131,6 @@ class InternalSettings final : public InternalSettingsGenerated, ...@@ -131,7 +131,6 @@ class InternalSettings final : public InternalSettingsGenerated,
// cannot be changed after process start. These setters should // cannot be changed after process start. These setters should
// be removed or moved onto internals.runtimeFlags: // be removed or moved onto internals.runtimeFlags:
void setLangAttributeAwareFormControlUIEnabled(bool); void setLangAttributeAwareFormControlUIEnabled(bool);
void setOverlayScrollbarsEnabled(bool);
void setExperimentalContentSecurityPolicyFeaturesEnabled(bool); void setExperimentalContentSecurityPolicyFeaturesEnabled(bool);
void setImageAnimationPolicy(const String&, ExceptionState&); void setImageAnimationPolicy(const String&, ExceptionState&);
void setScrollTopLeftInteropEnabled(bool); void setScrollTopLeftInteropEnabled(bool);
......
...@@ -60,7 +60,6 @@ interface InternalSettings : InternalSettingsGenerated { ...@@ -60,7 +60,6 @@ interface InternalSettings : InternalSettingsGenerated {
// cannot be changed after process start. These setters should // cannot be changed after process start. These setters should
// be removed or moved onto internals.runtimeFlags: // be removed or moved onto internals.runtimeFlags:
void setLangAttributeAwareFormControlUIEnabled(boolean enabled); void setLangAttributeAwareFormControlUIEnabled(boolean enabled);
void setOverlayScrollbarsEnabled(boolean enabled);
void setExperimentalContentSecurityPolicyFeaturesEnabled(boolean enabled); void setExperimentalContentSecurityPolicyFeaturesEnabled(boolean enabled);
void setScrollTopLeftInteropEnabled(boolean enabled); void setScrollTopLeftInteropEnabled(boolean enabled);
}; };
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment