Chrome side of merge 41733:41768.

webkit/data/layout_tests/platform/chromium-win/LayoutTests/scrollbars/overflow-scrollbar-combinations-expected.txt

Index: webkit/data/layout_tests/platform/chromium-win/LayoutTests/scrollbars/overflow-scrollbar-combinations-expected.txt
===================================================================
--- webkit/data/layout_tests/platform/chromium-win/LayoutTests/scrollbars/overflow-scrollbar-combinations-expected.txt	(revision 11875)
+++ webkit/data/layout_tests/platform/chromium-win/LayoutTests/scrollbars/overflow-scrollbar-combinations-expected.txt	(working copy)
@@ -29,7 +29,7 @@
       RenderText {#text} at (334,420) size 4x19
         text run at (334,420) width 4: " "
       RenderText {#text} at (0,0) size 0x0
-layer at (28,28) size 125x100 clip at (29,29) size 110x85 scrollHeight 2040
+layer at (28,28) size 125x100 clip at (29,29) size 110x85 scrollHeight 2050
   RenderBlock {DIV} at (20,20) size 125x100 [color=#DCDCDC] [bgcolor=#718D93] [border: (1px solid #D3D3D3)]
     RenderText {#text} at (11,11) size 89x770
       text run at (11,11) width 80: "Lorem ipsum"
@@ -181,7 +181,7 @@
       text run at (11,1999) width 59: "imperdiet"
       text run at (11,2013) width 52: "lacus eu"
       text run at (11,2027) width 38: "tellus."
-layer at (197,28) size 125x100 clip at (198,29) size 110x98 scrollHeight 2040
+layer at (197,28) size 125x100 clip at (198,29) size 110x98 scrollHeight 2050
   RenderBlock {DIV} at (189,20) size 125x100 [color=#DCDCDC] [bgcolor=#718D93] [border: (1px solid #D3D3D3)]
     RenderText {#text} at (11,11) size 89x770
       text run at (11,11) width 80: "Lorem ipsum"
@@ -371,7 +371,7 @@
         text run at (10,388) width 395: "Curabitur arcu pede, adipiscing sed, egestas nec, commodo in,"
         text run at (10,402) width 396: "elit. Nulla facilisi. Proin varius pede et dui lacinia dapibus. Morbi"
         text run at (10,416) width 267: "nec augue. Proin imperdiet lacus eu tellus."
-layer at (535,28) size 125x100 clip at (536,29) size 110x85 scrollHeight 2040
+layer at (535,28) size 125x100 clip at (536,29) size 110x85 scrollHeight 2050
   RenderBlock {DIV} at (527,20) size 125x100 [color=#DCDCDC] [bgcolor=#718D93] [border: (1px solid #D3D3D3)]
     RenderText {#text} at (11,11) size 89x770
       text run at (11,11) width 80: "Lorem ipsum"
@@ -523,7 +523,7 @@
       text run at (11,1999) width 59: "imperdiet"
       text run at (11,2013) width 52: "lacus eu"
       text run at (11,2027) width 38: "tellus."
-layer at (28,168) size 125x100 clip at (29,169) size 110x98 scrollHeight 2040
+layer at (28,168) size 125x100 clip at (29,169) size 110x98 scrollHeight 2050
   RenderBlock {DIV} at (20,160) size 125x100 [color=#DCDCDC] [bgcolor=#718D93] [border: (1px solid #D3D3D3)]
     RenderText {#text} at (11,11) size 89x770
       text run at (11,11) width 80: "Lorem ipsum"
@@ -713,7 +713,7 @@
         text run at (10,388) width 395: "Curabitur arcu pede, adipiscing sed, egestas nec, commodo in,"
         text run at (10,402) width 396: "elit. Nulla facilisi. Proin varius pede et dui lacinia dapibus. Morbi"
         text run at (10,416) width 267: "nec augue. Proin imperdiet lacus eu tellus."
-layer at (366,168) size 125x100 clip at (367,169) size 110x98 scrollHeight 2040
+layer at (366,168) size 125x100 clip at (367,169) size 110x98 scrollHeight 2050
   RenderBlock {DIV} at (358,160) size 125x100 [color=#DCDCDC] [bgcolor=#718D93] [border: (1px solid #D3D3D3)]
     RenderText {#text} at (11,11) size 89x770
       text run at (11,11) width 80: "Lorem ipsum"
@@ -880,7 +880,7 @@
         text run at (10,122) width 398: "volutpat rhoncus, condimentum ut, tortor. Integer est. Quisque"
         text run at (10,136) width 377: "viverra. Praesent sed arcu. Maecenas id lorem a leo lobortis"
         text run at (10,150) width 88: "condimentum."
-layer at (28,308) size 125x100 clip at (29,309) size 110x98 scrollHeight 2040
+layer at (28,308) size 125x100 clip at (29,309) size 110x98 scrollHeight 2050
   RenderBlock {DIV} at (20,300) size 125x100 [color=#DCDCDC] [bgcolor=#718D93] [border: (1px solid #D3D3D3)]
     RenderText {#text} at (11,11) size 89x770
       text run at (11,11) width 80: "Lorem ipsum"