Don't force-update style and layout in Document::scrollingElement

third_party/WebKit/Source/core/dom/Element.cpp

Index: third_party/WebKit/Source/core/dom/Element.cpp
diff --git a/third_party/WebKit/Source/core/dom/Element.cpp b/third_party/WebKit/Source/core/dom/Element.cpp
index 7a778aa8dfc8f2c070747c7e2903ea11cfa59b25..d538025f61d65ae21cdf8f5032c756ee4a5e6930 100644
--- a/third_party/WebKit/Source/core/dom/Element.cpp
+++ b/third_party/WebKit/Source/core/dom/Element.cpp
@@ -776,7 +776,7 @@ int Element::clientHeight() {
 double Element::scrollLeft() {
   document().updateStyleAndLayoutIgnorePendingStylesheetsForNode(this);
 
-  if (document().scrollingElement() == this) {
+  if (document().scrollingElementNoLayout() == this) {
     if (document().domWindow())
       return document().domWindow()->scrollX();
     return 0;
@@ -791,7 +791,7 @@ double Element::scrollLeft() {
 double Element::scrollTop() {
   document().updateStyleAndLayoutIgnorePendingStylesheetsForNode(this);
 
-  if (document().scrollingElement() == this) {
+  if (document().scrollingElementNoLayout() == this) {
     if (document().domWindow())
       return document().domWindow()->scrollY();
     return 0;
@@ -808,7 +808,7 @@ void Element::setScrollLeft(double newLeft) {
 
   newLeft = ScrollableArea::normalizeNonFiniteScroll(newLeft);
 
-  if (document().scrollingElement() == this) {
+  if (document().scrollingElementNoLayout() == this) {
     if (LocalDOMWindow* window = document().domWindow())
       window->scrollTo(newLeft, window->scrollY());
   } else {
@@ -824,7 +824,7 @@ void Element::setScrollTop(double newTop) {
 
   newTop = ScrollableArea::normalizeNonFiniteScroll(newTop);
 
-  if (document().scrollingElement() == this) {
+  if (document().scrollingElementNoLayout() == this) {
     if (LocalDOMWindow* window = document().domWindow())
       window->scrollTo(window->scrollX(), newTop);
   } else {
@@ -896,7 +896,7 @@ void Element::scrollTo(const ScrollToOptions& scrollToOptions) {
   // the compositing update. See http://crbug.com/420741.
   document().updateStyleAndLayoutIgnorePendingStylesheetsForNode(this);
 
-  if (document().scrollingElement() == this) {
+  if (document().scrollingElementNoLayout() == this) {
     scrollFrameTo(scrollToOptions);
   } else {
     scrollLayoutBoxTo(scrollToOptions);