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..0a1489efc4191c81736fc29e3e2eff79f2b934fc 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().scrollingElementInternal() == 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().scrollingElementInternal() == 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().scrollingElementInternal() == 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().scrollingElementInternal() == this) {
     if (LocalDOMWindow* window = document().domWindow())
       window->scrollTo(window->scrollX(), newTop);
   } else {
@@ -892,6 +892,7 @@ void Element::scrollTo(double x, double y) {
 }
 
 void Element::scrollTo(const ScrollToOptions& scrollToOptions) {
+  LOG(ERROR) << "scrollto";

[wkorman, 2017/01/11 03:56:39]

rm

[chrishtr, 2017/01/11 04:09:09]

argh. I thought I had removed that, sorry.

   // FIXME: This should be removed once scroll updates are processed only after
   // the compositing update. See http://crbug.com/420741.
   document().updateStyleAndLayoutIgnorePendingStylesheetsForNode(this);