Rename 'instant' value of scroll-behavior CSS property to 'auto'

This changes the 'instant' value of scroll-behavior to 'auto',
matching a change made in the CSSOM View spec (and also
matching Firefox's implementation).

Spec: http://dev.w3.org/csswg/cssom-view/#css-properties

BUG=243871

Review URL: https://codereview.chromium.org/766023002

git-svn-id: svn://svn.chromium.org/blink/trunk@186196 bbb929c8-8fbe-4397-9dbb-9b2b20218538

22 files changed, 103 insertions, 103 deletions

diff --git a/third_party/WebKit/LayoutTests/fast/scroll-behavior/listbox-scrollTop.html b/third_party/WebKit/LayoutTests/fast/scroll-behavior/listbox-scrollTop.html
index 00207a2b..46e5483 100644
--- a/third_party/WebKit/LayoutTests/fast/scroll-behavior/listbox-scrollTop.html
+++ b/third_party/WebKit/LayoutTests/fast/scroll-behavior/listbox-scrollTop.html
@@ -24,15 +24,15 @@
     }
 
     var testScrolls = [
-      {js: "instant", css: "instant", index: 2},
+      {js: "instant", css: "auto", index: 2},
       {js: "instant", css: "smooth", index: 3},
-      {js: "auto", css: "instant", index: 4},
-      {js: "", css: "instant", index: 5},
-      {js: "smooth", css: "instant", waitForEnd: true, index: 15},
+      {js: "auto", css: "auto", index: 4},
+      {js: "", css: "auto", index: 5},
+      {js: "smooth", css: "auto", waitForEnd: true, index: 15},
       {js: "smooth", css: "smooth", waitForEnd: true, index: 20},
       {js: "auto", css: "smooth", waitForEnd: true, index: 30},
       {js: "", css: "smooth", waitForEnd: true, index: 35},
-      {js: "smooth", css: "instant", waitForEnd: false, index: 410},
+      {js: "smooth", css: "auto", waitForEnd: false, index: 410},
       {js: "smooth", css: "smooth", waitForEnd: false, index: 20},
       {js: "auto", css: "smooth", waitForEnd: false, index: 400},
       {js: "", css: "smooth", waitForEnd: false, index: 5},
diff --git a/third_party/WebKit/LayoutTests/fast/scroll-behavior/main-frame-scroll.html b/third_party/WebKit/LayoutTests/fast/scroll-behavior/main-frame-scroll.html
index 08cf574..a192f1e 100644
--- a/third_party/WebKit/LayoutTests/fast/scroll-behavior/main-frame-scroll.html
+++ b/third_party/WebKit/LayoutTests/fast/scroll-behavior/main-frame-scroll.html
@@ -28,15 +28,15 @@
     }
 
     const testScrolls = [
-      {js: "instant", css: "instant", x: 1, y: 2},
+      {js: "instant", css: "auto", x: 1, y: 2},
       {js: "instant", css: "smooth", x: 2, y: 3},
-      {js: "auto", css: "instant", x: 3, y: 4},
-      {js: "", css: "instant", x: 4, y: 5},
-      {js: "smooth", css: "instant", waitForEnd: true, x: 10, y: 15},
+      {js: "auto", css: "auto", x: 3, y: 4},
+      {js: "", css: "auto", x: 4, y: 5},
+      {js: "smooth", css: "auto", waitForEnd: true, x: 10, y: 15},
       {js: "smooth", css: "smooth", waitForEnd: true, x: 20, y: 25},
       {js: "auto", css: "smooth", waitForEnd: true, x: 30, y: 35},
       {js: "", css: "smooth", waitForEnd: true, x: 40, y: 45},
-      {js: "smooth", css: "instant", waitForEnd: false, x: 4000, y: 4100},
+      {js: "smooth", css: "auto", waitForEnd: false, x: 4000, y: 4100},
       {js: "smooth", css: "smooth", waitForEnd: false, x: 15, y: 20},
       {js: "auto", css: "smooth", waitForEnd: false, x: 4100, y: 4000},
       {js: "", css: "smooth", waitForEnd: false, x: 10, y: 5},
diff --git a/third_party/WebKit/LayoutTests/fast/scroll-behavior/main-frame-scrollBy.html b/third_party/WebKit/LayoutTests/fast/scroll-behavior/main-frame-scrollBy.html
index 322e27d..04eca88 100644
--- a/third_party/WebKit/LayoutTests/fast/scroll-behavior/main-frame-scrollBy.html
+++ b/third_party/WebKit/LayoutTests/fast/scroll-behavior/main-frame-scrollBy.html
@@ -28,15 +28,15 @@
     }
 
     const testScrolls = [
-      {js: "instant", css: "instant", x: 1, y: 2},
+      {js: "instant", css: "auto", x: 1, y: 2},
       {js: "instant", css: "smooth", x: 2, y: 3},
-      {js: "auto", css: "instant", x: 3, y: 4},
-      {js: "", css: "instant", x: 4, y: 5},
-      {js: "smooth", css: "instant", waitForEnd: true, x: 10, y: 15},
+      {js: "auto", css: "auto", x: 3, y: 4},
+      {js: "", css: "auto", x: 4, y: 5},
+      {js: "smooth", css: "auto", waitForEnd: true, x: 10, y: 15},
       {js: "smooth", css: "smooth", waitForEnd: true, x: 20, y: 25},
       {js: "auto", css: "smooth", waitForEnd: true, x: 30, y: 35},
       {js: "", css: "smooth", waitForEnd: true, x: 40, y: 45},
-      {js: "smooth", css: "instant", waitForEnd: false, x: 4000, y: 4100},
+      {js: "smooth", css: "auto", waitForEnd: false, x: 4000, y: 4100},
       {js: "smooth", css: "smooth", waitForEnd: false, x: -3900, y: -3850},
       {js: "auto", css: "smooth", waitForEnd: false, x: 4050, y: 4000},
       {js: "", css: "smooth", waitForEnd: false, x: -4000, y: -4100},
diff --git a/third_party/WebKit/LayoutTests/fast/scroll-behavior/main-frame-scrollLeft.html b/third_party/WebKit/LayoutTests/fast/scroll-behavior/main-frame-scrollLeft.html
index cf2ef65..175593d 100644
--- a/third_party/WebKit/LayoutTests/fast/scroll-behavior/main-frame-scrollLeft.html
+++ b/third_party/WebKit/LayoutTests/fast/scroll-behavior/main-frame-scrollLeft.html
@@ -28,15 +28,15 @@
     }
 
     const testScrolls = [
-      {js: "instant", css: "instant", x: 1, y: 0},
+      {js: "instant", css: "auto", x: 1, y: 0},
       {js: "instant", css: "smooth", x: 2, y: 0},
-      {js: "auto", css: "instant", x: 3, y: 0},
-      {js: "", css: "instant", x: 4, y: 0},
-      {js: "smooth", css: "instant", waitForEnd: true, x: 10, y: 0},
+      {js: "auto", css: "auto", x: 3, y: 0},
+      {js: "", css: "auto", x: 4, y: 0},
+      {js: "smooth", css: "auto", waitForEnd: true, x: 10, y: 0},
       {js: "smooth", css: "smooth", waitForEnd: true, x: 20, y: 0},
       {js: "auto", css: "smooth", waitForEnd: true, x: 30, y: 0},
       {js: "", css: "smooth", waitForEnd: true, x: 40, y: 0},
-      {js: "smooth", css: "instant", waitForEnd: false, x: 4000, y: 0},
+      {js: "smooth", css: "auto", waitForEnd: false, x: 4000, y: 0},
       {js: "smooth", css: "smooth", waitForEnd: false, x: 15, y: 0},
       {js: "auto", css: "smooth", waitForEnd: false, x: 4100, y: 0},
       {js: "", css: "smooth", waitForEnd: false, x: 10, y: 0},
diff --git a/third_party/WebKit/LayoutTests/fast/scroll-behavior/main-frame-scrollTo.html b/third_party/WebKit/LayoutTests/fast/scroll-behavior/main-frame-scrollTo.html
index f734f59..84cde7b 100644
--- a/third_party/WebKit/LayoutTests/fast/scroll-behavior/main-frame-scrollTo.html
+++ b/third_party/WebKit/LayoutTests/fast/scroll-behavior/main-frame-scrollTo.html
@@ -28,15 +28,15 @@
     }
 
     const testScrolls = [
-      {js: "instant", css: "instant", x: 1, y: 2},
+      {js: "instant", css: "auto", x: 1, y: 2},
       {js: "instant", css: "smooth", x: 2, y: 3},
-      {js: "auto", css: "instant", x: 3, y: 4},
-      {js: "", css: "instant", x: 4, y: 5},
-      {js: "smooth", css: "instant", waitForEnd: true, x: 10, y: 15},
+      {js: "auto", css: "auto", x: 3, y: 4},
+      {js: "", css: "auto", x: 4, y: 5},
+      {js: "smooth", css: "auto", waitForEnd: true, x: 10, y: 15},
       {js: "smooth", css: "smooth", waitForEnd: true, x: 20, y: 25},
       {js: "auto", css: "smooth", waitForEnd: true, x: 30, y: 35},
       {js: "", css: "smooth", waitForEnd: true, x: 40, y: 45},
-      {js: "smooth", css: "instant", waitForEnd: false, x: 4000, y: 4100},
+      {js: "smooth", css: "auto", waitForEnd: false, x: 4000, y: 4100},
       {js: "smooth", css: "smooth", waitForEnd: false, x: 15, y: 20},
       {js: "auto", css: "smooth", waitForEnd: false, x: 4100, y: 4000},
       {js: "", css: "smooth", waitForEnd: false, x: 10, y: 5},
diff --git a/third_party/WebKit/LayoutTests/fast/scroll-behavior/main-frame-scrollTop.html b/third_party/WebKit/LayoutTests/fast/scroll-behavior/main-frame-scrollTop.html
index 3d6249c..c947043 100644
--- a/third_party/WebKit/LayoutTests/fast/scroll-behavior/main-frame-scrollTop.html
+++ b/third_party/WebKit/LayoutTests/fast/scroll-behavior/main-frame-scrollTop.html
@@ -28,15 +28,15 @@
     }
 
     const testScrolls = [
-      {js: "instant", css: "instant", x: 0, y: 2},
+      {js: "instant", css: "auto", x: 0, y: 2},
       {js: "instant", css: "smooth", x: 0, y: 3},
-      {js: "auto", css: "instant", x: 0, y: 4},
-      {js: "", css: "instant", x: 0, y: 5},
-      {js: "smooth", css: "instant", waitForEnd: true, x: 0, y: 15},
+      {js: "auto", css: "auto", x: 0, y: 4},
+      {js: "", css: "auto", x: 0, y: 5},
+      {js: "smooth", css: "auto", waitForEnd: true, x: 0, y: 15},
       {js: "smooth", css: "smooth", waitForEnd: true, x: 0, y: 25},
       {js: "auto", css: "smooth", waitForEnd: true, x: 0, y: 35},
       {js: "", css: "smooth", waitForEnd: true, x: 0, y: 45},
-      {js: "smooth", css: "instant", waitForEnd: false, x: 0, y: 4100},
+      {js: "smooth", css: "auto", waitForEnd: false, x: 0, y: 4100},
       {js: "smooth", css: "smooth", waitForEnd: false, x: 0, y: 20},
       {js: "auto", css: "smooth", waitForEnd: false, x: 0, y: 4000},
       {js: "", css: "smooth", waitForEnd: false, x: 0, y: 5},
diff --git a/third_party/WebKit/LayoutTests/fast/scroll-behavior/overflow-hidden-scrollLeft.html b/third_party/WebKit/LayoutTests/fast/scroll-behavior/overflow-hidden-scrollLeft.html
index e1779a4..731fac6 100644
--- a/third_party/WebKit/LayoutTests/fast/scroll-behavior/overflow-hidden-scrollLeft.html
+++ b/third_party/WebKit/LayoutTests/fast/scroll-behavior/overflow-hidden-scrollLeft.html
@@ -35,15 +35,15 @@
     }
 
     const testScrolls = [
-      {js: "instant", css: "instant", x: 1, y: 0},
+      {js: "instant", css: "auto", x: 1, y: 0},
       {js: "instant", css: "smooth", x: 2, y: 0},
-      {js: "auto", css: "instant", x: 3, y: 0},
-      {js: "", css: "instant", x: 4, y: 0},
-      {js: "smooth", css: "instant", waitForEnd: true, x: 10, y: 0},
+      {js: "auto", css: "auto", x: 3, y: 0},
+      {js: "", css: "auto", x: 4, y: 0},
+      {js: "smooth", css: "auto", waitForEnd: true, x: 10, y: 0},
       {js: "smooth", css: "smooth", waitForEnd: true, x: 20, y: 0},
       {js: "auto", css: "smooth", waitForEnd: true, x: 30, y: 0},
       {js: "", css: "smooth", waitForEnd: true, x: 40, y: 0},
-      {js: "smooth", css: "instant", waitForEnd: false, x: 4000, y: 0},
+      {js: "smooth", css: "auto", waitForEnd: false, x: 4000, y: 0},
       {js: "smooth", css: "smooth", waitForEnd: false, x: 15, y: 0},
       {js: "auto", css: "smooth", waitForEnd: false, x: 4100, y: 0},
       {js: "", css: "smooth", waitForEnd: false, x: 10, y: 0},
diff --git a/third_party/WebKit/LayoutTests/fast/scroll-behavior/overflow-hidden-scrollTop.html b/third_party/WebKit/LayoutTests/fast/scroll-behavior/overflow-hidden-scrollTop.html
index b59f0f6d..5e9b83f 100644
--- a/third_party/WebKit/LayoutTests/fast/scroll-behavior/overflow-hidden-scrollTop.html
+++ b/third_party/WebKit/LayoutTests/fast/scroll-behavior/overflow-hidden-scrollTop.html
@@ -35,15 +35,15 @@
     }
 
     const testScrolls = [
-      {js: "instant", css: "instant", x: 0, y: 2},
+      {js: "instant", css: "auto", x: 0, y: 2},
       {js: "instant", css: "smooth", x: 0, y: 3},
-      {js: "auto", css: "instant", x: 0, y: 4},
-      {js: "", css: "instant", x: 0, y: 5},
-      {js: "smooth", css: "instant", waitForEnd: true, x: 0, y: 15},
+      {js: "auto", css: "auto", x: 0, y: 4},
+      {js: "", css: "auto", x: 0, y: 5},
+      {js: "smooth", css: "auto", waitForEnd: true, x: 0, y: 15},
       {js: "smooth", css: "smooth", waitForEnd: true, x: 0, y: 25},
       {js: "auto", css: "smooth", waitForEnd: true, x: 0, y: 35},
       {js: "", css: "smooth", waitForEnd: true, x: 0, y: 45},
-      {js: "smooth", css: "instant", waitForEnd: false, x: 0, y: 4100},
+      {js: "smooth", css: "auto", waitForEnd: false, x: 0, y: 4100},
       {js: "smooth", css: "smooth", waitForEnd: false, x: 0, y: 20},
       {js: "auto", css: "smooth", waitForEnd: false, x: 0, y: 4000},
       {js: "", css: "smooth", waitForEnd: false, x: 0, y: 5},
diff --git a/third_party/WebKit/LayoutTests/fast/scroll-behavior/overflow-scroll-scrollLeft.html b/third_party/WebKit/LayoutTests/fast/scroll-behavior/overflow-scroll-scrollLeft.html
index 9fbe096..174b917 100644
--- a/third_party/WebKit/LayoutTests/fast/scroll-behavior/overflow-scroll-scrollLeft.html
+++ b/third_party/WebKit/LayoutTests/fast/scroll-behavior/overflow-scroll-scrollLeft.html
@@ -35,15 +35,15 @@
     }
 
     const testScrolls = [
-      {js: "instant", css: "instant", x: 1, y: 0},
+      {js: "instant", css: "auto", x: 1, y: 0},
       {js: "instant", css: "smooth", x: 2, y: 0},
-      {js: "auto", css: "instant", x: 3, y: 0},
-      {js: "", css: "instant", x: 4, y: 0},
-      {js: "smooth", css: "instant", waitForEnd: true, x: 10, y: 0},
+      {js: "auto", css: "auto", x: 3, y: 0},
+      {js: "", css: "auto", x: 4, y: 0},
+      {js: "smooth", css: "auto", waitForEnd: true, x: 10, y: 0},
       {js: "smooth", css: "smooth", waitForEnd: true, x: 20, y: 0},
       {js: "auto", css: "smooth", waitForEnd: true, x: 30, y: 0},
       {js: "", css: "smooth", waitForEnd: true, x: 40, y: 0},
-      {js: "smooth", css: "instant", waitForEnd: false, x: 4000, y: 0},
+      {js: "smooth", css: "auto", waitForEnd: false, x: 4000, y: 0},
       {js: "smooth", css: "smooth", waitForEnd: false, x: 15, y: 0},
       {js: "auto", css: "smooth", waitForEnd: false, x: 4100, y: 0},
       {js: "", css: "smooth", waitForEnd: false, x: 10, y: 0},
diff --git a/third_party/WebKit/LayoutTests/fast/scroll-behavior/overflow-scroll-scrollTop.html b/third_party/WebKit/LayoutTests/fast/scroll-behavior/overflow-scroll-scrollTop.html
index 3057d40..e6cf5c7 100644
--- a/third_party/WebKit/LayoutTests/fast/scroll-behavior/overflow-scroll-scrollTop.html
+++ b/third_party/WebKit/LayoutTests/fast/scroll-behavior/overflow-scroll-scrollTop.html
@@ -35,15 +35,15 @@
     }
 
     const testScrolls = [
-      {js: "instant", css: "instant", x: 0, y: 2},
+      {js: "instant", css: "auto", x: 0, y: 2},
       {js: "instant", css: "smooth", x: 0, y: 3},
-      {js: "auto", css: "instant", x: 0, y: 4},
-      {js: "", css: "instant", x: 0, y: 5},
-      {js: "smooth", css: "instant", waitForEnd: true, x: 0, y: 15},
+      {js: "auto", css: "auto", x: 0, y: 4},
+      {js: "", css: "auto", x: 0, y: 5},
+      {js: "smooth", css: "auto", waitForEnd: true, x: 0, y: 15},
       {js: "smooth", css: "smooth", waitForEnd: true, x: 0, y: 25},
       {js: "auto", css: "smooth", waitForEnd: true, x: 0, y: 35},
       {js: "", css: "smooth", waitForEnd: true, x: 0, y: 45},
-      {js: "smooth", css: "instant", waitForEnd: false, x: 0, y: 4100},
+      {js: "smooth", css: "auto", waitForEnd: false, x: 0, y: 4100},
       {js: "smooth", css: "smooth", waitForEnd: false, x: 0, y: 20},
       {js: "auto", css: "smooth", waitForEnd: false, x: 0, y: 4000},
       {js: "", css: "smooth", waitForEnd: false, x: 0, y: 5},
diff --git a/third_party/WebKit/LayoutTests/fast/scroll-behavior/parse-scroll-behavior-expected.txt b/third_party/WebKit/LayoutTests/fast/scroll-behavior/parse-scroll-behavior-expected.txt
index fdf34e8..41e4fdc 100644
--- a/third_party/WebKit/LayoutTests/fast/scroll-behavior/parse-scroll-behavior-expected.txt
+++ b/third_party/WebKit/LayoutTests/fast/scroll-behavior/parse-scroll-behavior-expected.txt
@@ -4,19 +4,19 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
 
 
 Test getting scroll-behavior set through CSS
-PASS getComputedStyle(scrollBehaviorInstant, '').getPropertyValue('scroll-behavior') is 'instant'
+PASS getComputedStyle(scrollBehaviorAuto, '').getPropertyValue('scroll-behavior') is 'auto'
 PASS getComputedStyle(scrollBehaviorSmooth, '').getPropertyValue('scroll-behavior') is 'smooth'
 
 Test initial value of scroll-behavior
-PASS getComputedStyle(element, '').getPropertyValue('scroll-behavior') is 'instant'
+PASS getComputedStyle(element, '').getPropertyValue('scroll-behavior') is 'auto'
 
 Test getting and setting scroll-behavior through JS
 PASS getComputedStyle(element, '').getPropertyValue('scroll-behavior') is 'smooth'
-PASS getComputedStyle(element, '').getPropertyValue('scroll-behavior') is 'instant'
+PASS getComputedStyle(element, '').getPropertyValue('scroll-behavior') is 'auto'
 
 Test the value 'initial'
 PASS getComputedStyle(element, '').getPropertyValue('scroll-behavior') is 'smooth'
-PASS getComputedStyle(element, '').getPropertyValue('scroll-behavior') is 'instant'
+PASS getComputedStyle(element, '').getPropertyValue('scroll-behavior') is 'auto'
 
 Test the value 'inherit'
 PASS getComputedStyle(parentElement, '').getPropertyValue('scroll-behavior') is 'smooth'
@@ -24,7 +24,7 @@ PASS getComputedStyle(element, '').getPropertyValue('scroll-behavior') is 'smoot
 
 Test that scroll-behavior is not inherited by default
 PASS getComputedStyle(parentElement, '').getPropertyValue('scroll-behavior') is 'smooth'
-PASS getComputedStyle(element, '').getPropertyValue('scroll-behavior') is 'instant'
+PASS getComputedStyle(element, '').getPropertyValue('scroll-behavior') is 'auto'
 PASS successfullyParsed is true
 
 TEST COMPLETE
diff --git a/third_party/WebKit/LayoutTests/fast/scroll-behavior/parse-scroll-behavior.html b/third_party/WebKit/LayoutTests/fast/scroll-behavior/parse-scroll-behavior.html
index 80c905a..1d4df1a 100644
--- a/third_party/WebKit/LayoutTests/fast/scroll-behavior/parse-scroll-behavior.html
+++ b/third_party/WebKit/LayoutTests/fast/scroll-behavior/parse-scroll-behavior.html
@@ -2,8 +2,8 @@
 <html>
 <head>
 <style>
-#scrollBehaviorInstant {
-    scroll-behavior: instant;
+#scrollBehaviorAuto {
+    scroll-behavior: auto;
 }
 
 #scrollBehaviorSmooth {
@@ -13,14 +13,14 @@
 <script src="../../resources/js-test.js"></script>
 </head>
 <body>
-<div id="scrollBehaviorInstant"></div>
+<div id="scrollBehaviorAuto"></div>
 <div id="scrollBehaviorSmooth"></div>
 <script>
 description('Test that setting and getting scroll-behavior works as expected');
 
 debug("Test getting scroll-behavior set through CSS");
-var scrollBehaviorInstant = document.getElementById("scrollBehaviorInstant");
-shouldBe("getComputedStyle(scrollBehaviorInstant, '').getPropertyValue('scroll-behavior')", "'instant'");
+var scrollBehaviorAuto = document.getElementById("scrollBehaviorAuto");
+shouldBe("getComputedStyle(scrollBehaviorAuto, '').getPropertyValue('scroll-behavior')", "'auto'");
 
 var scrollBehaviorSmooth = document.getElementById("scrollBehaviorSmooth");
 shouldBe("getComputedStyle(scrollBehaviorSmooth, '').getPropertyValue('scroll-behavior')", "'smooth'");
@@ -29,7 +29,7 @@ debug("");
 debug("Test initial value of scroll-behavior");
 var element = document.createElement("div");
 document.body.appendChild(element);
-shouldBe("getComputedStyle(element, '').getPropertyValue('scroll-behavior')", "'instant'");
+shouldBe("getComputedStyle(element, '').getPropertyValue('scroll-behavior')", "'auto'");
 
 debug("");
 debug("Test getting and setting scroll-behavior through JS");
@@ -38,15 +38,15 @@ document.body.appendChild(element);
 element.style.scrollBehavior = "smooth";
 shouldBe("getComputedStyle(element, '').getPropertyValue('scroll-behavior')", "'smooth'");
 
-element.style.scrollBehavior = "instant";
-shouldBe("getComputedStyle(element, '').getPropertyValue('scroll-behavior')", "'instant'");
+element.style.scrollBehavior = "auto";
+shouldBe("getComputedStyle(element, '').getPropertyValue('scroll-behavior')", "'auto'");
 
 debug("");
 debug("Test the value 'initial'");
 element.style.scrollBehavior = "smooth";
 shouldBe("getComputedStyle(element, '').getPropertyValue('scroll-behavior')", "'smooth'");
 element.style.scrollBehavior = "initial";
-shouldBe("getComputedStyle(element, '').getPropertyValue('scroll-behavior')", "'instant'");
+shouldBe("getComputedStyle(element, '').getPropertyValue('scroll-behavior')", "'auto'");
 
 debug("");
 debug("Test the value 'inherit'");
@@ -67,7 +67,7 @@ parentElement.style.scrollBehavior = "smooth";
 shouldBe("getComputedStyle(parentElement, '').getPropertyValue('scroll-behavior')", "'smooth'");
 element = document.createElement("div");
 parentElement.appendChild(element);
-shouldBe("getComputedStyle(element, '').getPropertyValue('scroll-behavior')", "'instant'");
+shouldBe("getComputedStyle(element, '').getPropertyValue('scroll-behavior')", "'auto'");
 </script>
 </body>
 </html>
diff --git a/third_party/WebKit/LayoutTests/fast/scroll-behavior/subframe-scroll.html b/third_party/WebKit/LayoutTests/fast/scroll-behavior/subframe-scroll.html
index adb5b62..b66fcb2 100644
--- a/third_party/WebKit/LayoutTests/fast/scroll-behavior/subframe-scroll.html
+++ b/third_party/WebKit/LayoutTests/fast/scroll-behavior/subframe-scroll.html
@@ -28,15 +28,15 @@
     }
 
     const testScrolls = [
-      {js: "instant", css: "instant", x: 1, y: 2},
+      {js: "instant", css: "auto", x: 1, y: 2},
       {js: "instant", css: "smooth", x: 2, y: 3},
-      {js: "auto", css: "instant", x: 3, y: 4},
-      {js: "", css: "instant", x: 4, y: 5},
-      {js: "smooth", css: "instant", waitForEnd: true, x: 10, y: 15},
+      {js: "auto", css: "auto", x: 3, y: 4},
+      {js: "", css: "auto", x: 4, y: 5},
+      {js: "smooth", css: "auto", waitForEnd: true, x: 10, y: 15},
       {js: "smooth", css: "smooth", waitForEnd: true, x: 20, y: 25},
       {js: "auto", css: "smooth", waitForEnd: true, x: 30, y: 35},
       {js: "", css: "smooth", waitForEnd: true, x: 40, y: 45},
-      {js: "smooth", css: "instant", waitForEnd: false, x: 4000, y: 4100},
+      {js: "smooth", css: "auto", waitForEnd: false, x: 4000, y: 4100},
       {js: "smooth", css: "smooth", waitForEnd: false, x: 15, y: 20},
       {js: "auto", css: "smooth", waitForEnd: false, x: 4100, y: 4000},
       {js: "", css: "smooth", waitForEnd: false, x: 10, y: 5},
diff --git a/third_party/WebKit/LayoutTests/fast/scroll-behavior/subframe-scrollBy.html b/third_party/WebKit/LayoutTests/fast/scroll-behavior/subframe-scrollBy.html
index 501447b..e3efd7a 100644
--- a/third_party/WebKit/LayoutTests/fast/scroll-behavior/subframe-scrollBy.html
+++ b/third_party/WebKit/LayoutTests/fast/scroll-behavior/subframe-scrollBy.html
@@ -28,15 +28,15 @@
     }
 
     const testScrolls = [
-      {js: "instant", css: "instant", x: 1, y: 2},
+      {js: "instant", css: "auto", x: 1, y: 2},
       {js: "instant", css: "smooth", x: 2, y: 3},
-      {js: "auto", css: "instant", x: 3, y: 4},
-      {js: "", css: "instant", x: 4, y: 5},
-      {js: "smooth", css: "instant", waitForEnd: true, x: 10, y: 15},
+      {js: "auto", css: "auto", x: 3, y: 4},
+      {js: "", css: "auto", x: 4, y: 5},
+      {js: "smooth", css: "auto", waitForEnd: true, x: 10, y: 15},
       {js: "smooth", css: "smooth", waitForEnd: true, x: 20, y: 25},
       {js: "auto", css: "smooth", waitForEnd: true, x: 30, y: 35},
       {js: "", css: "smooth", waitForEnd: true, x: 40, y: 45},
-      {js: "smooth", css: "instant", waitForEnd: false, x: 4000, y: 4100},
+      {js: "smooth", css: "auto", waitForEnd: false, x: 4000, y: 4100},
       {js: "smooth", css: "smooth", waitForEnd: false, x: -3900, y: -3850},
       {js: "auto", css: "smooth", waitForEnd: false, x: 4050, y: 4000},
       {js: "", css: "smooth", waitForEnd: false, x: -4000, y: -4100},
diff --git a/third_party/WebKit/LayoutTests/fast/scroll-behavior/subframe-scrollLeft.html b/third_party/WebKit/LayoutTests/fast/scroll-behavior/subframe-scrollLeft.html
index 2741e9f..1774a0d 100644
--- a/third_party/WebKit/LayoutTests/fast/scroll-behavior/subframe-scrollLeft.html
+++ b/third_party/WebKit/LayoutTests/fast/scroll-behavior/subframe-scrollLeft.html
@@ -28,15 +28,15 @@
     }
 
     const testScrolls = [
-      {js: "instant", css: "instant", x: 1, y: 0},
+      {js: "instant", css: "auto", x: 1, y: 0},
       {js: "instant", css: "smooth", x: 2, y: 0},
-      {js: "auto", css: "instant", x: 3, y: 0},
-      {js: "", css: "instant", x: 4, y: 0},
-      {js: "smooth", css: "instant", waitForEnd: true, x: 10, y: 0},
+      {js: "auto", css: "auto", x: 3, y: 0},
+      {js: "", css: "auto", x: 4, y: 0},
+      {js: "smooth", css: "auto", waitForEnd: true, x: 10, y: 0},
       {js: "smooth", css: "smooth", waitForEnd: true, x: 20, y: 0},
       {js: "auto", css: "smooth", waitForEnd: true, x: 30, y: 0},
       {js: "", css: "smooth", waitForEnd: true, x: 40, y: 0},
-      {js: "smooth", css: "instant", waitForEnd: false, x: 4000, y: 0},
+      {js: "smooth", css: "auto", waitForEnd: false, x: 4000, y: 0},
       {js: "smooth", css: "smooth", waitForEnd: false, x: 15, y: 0},
       {js: "auto", css: "smooth", waitForEnd: false, x: 4100, y: 0},
       {js: "", css: "smooth", waitForEnd: false, x: 10, y: 0},
diff --git a/third_party/WebKit/LayoutTests/fast/scroll-behavior/subframe-scrollTo.html b/third_party/WebKit/LayoutTests/fast/scroll-behavior/subframe-scrollTo.html
index ac7a99e..b9f3827 100644
--- a/third_party/WebKit/LayoutTests/fast/scroll-behavior/subframe-scrollTo.html
+++ b/third_party/WebKit/LayoutTests/fast/scroll-behavior/subframe-scrollTo.html
@@ -28,15 +28,15 @@
     }
 
     const testScrolls = [
-      {js: "instant", css: "instant", x: 1, y: 2},
+      {js: "instant", css: "auto", x: 1, y: 2},
       {js: "instant", css: "smooth", x: 2, y: 3},
-      {js: "auto", css: "instant", x: 3, y: 4},
-      {js: "", css: "instant", x: 4, y: 5},
-      {js: "smooth", css: "instant", waitForEnd: true, x: 10, y: 15},
+      {js: "auto", css: "auto", x: 3, y: 4},
+      {js: "", css: "auto", x: 4, y: 5},
+      {js: "smooth", css: "auto", waitForEnd: true, x: 10, y: 15},
       {js: "smooth", css: "smooth", waitForEnd: true, x: 20, y: 25},
       {js: "auto", css: "smooth", waitForEnd: true, x: 30, y: 35},
       {js: "", css: "smooth", waitForEnd: true, x: 40, y: 45},
-      {js: "smooth", css: "instant", waitForEnd: false, x: 4000, y: 4100},
+      {js: "smooth", css: "auto", waitForEnd: false, x: 4000, y: 4100},
       {js: "smooth", css: "smooth", waitForEnd: false, x: 15, y: 20},
       {js: "auto", css: "smooth", waitForEnd: false, x: 4100, y: 4000},
       {js: "", css: "smooth", waitForEnd: false, x: 10, y: 5},
diff --git a/third_party/WebKit/LayoutTests/fast/scroll-behavior/subframe-scrollTop.html b/third_party/WebKit/LayoutTests/fast/scroll-behavior/subframe-scrollTop.html
index dc95b08..a146e848 100644
--- a/third_party/WebKit/LayoutTests/fast/scroll-behavior/subframe-scrollTop.html
+++ b/third_party/WebKit/LayoutTests/fast/scroll-behavior/subframe-scrollTop.html
@@ -28,15 +28,15 @@
     }
 
     const testScrolls = [
-      {js: "instant", css: "instant", x: 0, y: 2},
+      {js: "instant", css: "auto", x: 0, y: 2},
       {js: "instant", css: "smooth", x: 0, y: 3},
-      {js: "auto", css: "instant", x: 0, y: 4},
-      {js: "", css: "instant", x: 0, y: 5},
-      {js: "smooth", css: "instant", waitForEnd: true, x: 0, y: 15},
+      {js: "auto", css: "auto", x: 0, y: 4},
+      {js: "", css: "auto", x: 0, y: 5},
+      {js: "smooth", css: "auto", waitForEnd: true, x: 0, y: 15},
       {js: "smooth", css: "smooth", waitForEnd: true, x: 0, y: 25},
       {js: "auto", css: "smooth", waitForEnd: true, x: 0, y: 35},
       {js: "", css: "smooth", waitForEnd: true, x: 0, y: 45},
-      {js: "smooth", css: "instant", waitForEnd: false, x: 0, y: 4100},
+      {js: "smooth", css: "auto", waitForEnd: false, x: 0, y: 4100},
       {js: "smooth", css: "smooth", waitForEnd: false, x: 0, y: 20},
       {js: "auto", css: "smooth", waitForEnd: false, x: 0, y: 4000},
       {js: "", css: "smooth", waitForEnd: false, x: 0, y: 5},
diff --git a/third_party/WebKit/Source/core/css/CSSPrimitiveValueMappings.h b/third_party/WebKit/Source/core/css/CSSPrimitiveValueMappings.h
index b9172ce..84e4fd9 100644
--- a/third_party/WebKit/Source/core/css/CSSPrimitiveValueMappings.h
+++ b/third_party/WebKit/Source/core/css/CSSPrimitiveValueMappings.h
@@ -4754,14 +4754,14 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ScrollBehavior behavior)
 {
     m_primitiveUnitType = CSS_VALUE_ID;
     switch (behavior) {
-    case ScrollBehaviorInstant:
-        m_value.valueID = CSSValueInstant;
+    case ScrollBehaviorAuto:
+        m_value.valueID = CSSValueAuto;
         break;
     case ScrollBehaviorSmooth:
         m_value.valueID = CSSValueSmooth;
         break;
-    case ScrollBehaviorAuto:
-        // Behavior 'auto' is only allowed in ScrollOptions arguments passed to
+    case ScrollBehaviorInstant:
+        // Behavior 'instant' is only allowed in ScrollOptions arguments passed to
         // CSSOM scroll APIs.
         ASSERT_NOT_REACHED();
     }
@@ -4770,15 +4770,15 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ScrollBehavior behavior)
 template<> inline CSSPrimitiveValue::operator ScrollBehavior() const
 {
     switch (getValueID()) {
-    case CSSValueInstant:
-        return ScrollBehaviorInstant;
+    case CSSValueAuto:
+        return ScrollBehaviorAuto;
     case CSSValueSmooth:
         return ScrollBehaviorSmooth;
     default:
         break;
     }
     ASSERT_NOT_REACHED();
-    return ScrollBehaviorInstant;
+    return ScrollBehaviorAuto;
 }
 
 }
diff --git a/third_party/WebKit/Source/core/css/CSSValueKeywords.in b/third_party/WebKit/Source/core/css/CSSValueKeywords.in
index 39524ace..a606378 100644
--- a/third_party/WebKit/Source/core/css/CSSValueKeywords.in
+++ b/third_party/WebKit/Source/core/css/CSSValueKeywords.in
@@ -973,7 +973,7 @@ safe
 legacy
 
 // scroll-behavior
-instant
+// auto
 smooth
 
 // will-change
diff --git a/third_party/WebKit/Source/core/css/parser/CSSParserFastPaths.cpp b/third_party/WebKit/Source/core/css/parser/CSSParserFastPaths.cpp
index a57879a..d25f71a 100644
--- a/third_party/WebKit/Source/core/css/parser/CSSParserFastPaths.cpp
+++ b/third_party/WebKit/Source/core/css/parser/CSSParserFastPaths.cpp
@@ -245,9 +245,9 @@ bool CSSParserFastPaths::isValidKeywordPropertyAndValue(CSSPropertyID propertyId
         return valueID == CSSValueStatic || valueID == CSSValueRelative || valueID == CSSValueAbsolute || valueID == CSSValueFixed;
     case CSSPropertyResize: // none | both | horizontal | vertical | auto
         return valueID == CSSValueNone || valueID == CSSValueBoth || valueID == CSSValueHorizontal || valueID == CSSValueVertical || valueID == CSSValueAuto;
-    case CSSPropertyScrollBehavior: // instant | smooth
+    case CSSPropertyScrollBehavior: // auto | smooth
         ASSERT(RuntimeEnabledFeatures::cssomSmoothScrollEnabled());
-        return valueID == CSSValueInstant || valueID == CSSValueSmooth;
+        return valueID == CSSValueAuto || valueID == CSSValueSmooth;
     case CSSPropertySpeak: // none | normal | spell-out | digits | literal-punctuation | no-punctuation
         return valueID == CSSValueNone || valueID == CSSValueNormal || valueID == CSSValueSpellOut || valueID == CSSValueDigits || valueID == CSSValueLiteralPunctuation || valueID == CSSValueNoPunctuation;
     case CSSPropertyTableLayout: // auto | fixed
diff --git a/third_party/WebKit/Source/core/frame/FrameView.cpp b/third_party/WebKit/Source/core/frame/FrameView.cpp
index 78b4314..475fc33 100644
--- a/third_party/WebKit/Source/core/frame/FrameView.cpp
+++ b/third_party/WebKit/Source/core/frame/FrameView.cpp
@@ -1525,8 +1525,8 @@ void FrameView::setScrollPosition(const DoublePoint& scrollPoint, ScrollBehavior
 
     if (scrollBehavior == ScrollBehaviorAuto) {
         RenderObject* renderer = m_frame->document()->documentElement() ? m_frame->document()->documentElement()->renderer() : 0;
-        if (renderer)
-            scrollBehavior = renderer->style()->scrollBehavior();
+        if (renderer && renderer->style()->scrollBehavior() == ScrollBehaviorSmooth)
+            scrollBehavior = ScrollBehaviorSmooth;
         else
             scrollBehavior = ScrollBehaviorInstant;
     }
diff --git a/third_party/WebKit/Source/core/rendering/style/RenderStyle.h b/third_party/WebKit/Source/core/rendering/style/RenderStyle.h
index 7b7785a..b1e25aa 100644
--- a/third_party/WebKit/Source/core/rendering/style/RenderStyle.h
+++ b/third_party/WebKit/Source/core/rendering/style/RenderStyle.h
@@ -1643,7 +1643,7 @@ public:
     static TouchAction initialTouchAction() { return TouchActionAuto; }
     static ShadowList* initialBoxShadow() { return 0; }
     static ShadowList* initialTextShadow() { return 0; }
-    static ScrollBehavior initialScrollBehavior() { return ScrollBehaviorInstant; }
+    static ScrollBehavior initialScrollBehavior() { return ScrollBehaviorAuto; }
     static ScrollBlocksOn initialScrollBlocksOn() { return ScrollBlocksOnNone; }
 
     // The initial value is 'none' for grid tracks.