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

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

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Peter Kelly (pmk@post.com)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2007 David Smith (catfish.man@gmail.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc.
  * All rights reserved.
  *           (C) 2007 Eric Seidel (eric@webkit.org)
  *
@@ skipping 758 matching lines @@
     return adjustLayoutUnitForAbsoluteZoom(
                LayoutUnit(layoutObject->pixelSnappedClientHeight()),
                layoutObject->styleRef())
         .round();
   return 0;
 }
 
 double Element::scrollLeft() {
   document().updateStyleAndLayoutIgnorePendingStylesheetsForNode(this);
 
-  if (document().scrollingElement() == this) {
+  if (document().scrollingElementInternal() == this) {
     if (document().domWindow())
       return document().domWindow()->scrollX();
     return 0;
   }
 
   if (LayoutBox* box = layoutBox())
     return adjustScrollForAbsoluteZoom(box->scrollLeft(), *box);
 
   return 0;
 }
 
 double Element::scrollTop() {
   document().updateStyleAndLayoutIgnorePendingStylesheetsForNode(this);
 
-  if (document().scrollingElement() == this) {
+  if (document().scrollingElementInternal() == this) {
     if (document().domWindow())
       return document().domWindow()->scrollY();
     return 0;
   }
 
   if (LayoutBox* box = layoutBox())
     return adjustScrollForAbsoluteZoom(box->scrollTop(), *box);
 
   return 0;
 }
 
 void Element::setScrollLeft(double newLeft) {
   document().updateStyleAndLayoutIgnorePendingStylesheetsForNode(this);
 
   newLeft = ScrollableArea::normalizeNonFiniteScroll(newLeft);
 
-  if (document().scrollingElement() == this) {
+  if (document().scrollingElementInternal() == this) {
     if (LocalDOMWindow* window = document().domWindow())
       window->scrollTo(newLeft, window->scrollY());
   } else {
     LayoutBox* box = layoutBox();
     if (box)
       box->setScrollLeft(
           LayoutUnit::fromFloatRound(newLeft * box->style()->effectiveZoom()));
   }
 }
 
 void Element::setScrollTop(double newTop) {
   document().updateStyleAndLayoutIgnorePendingStylesheetsForNode(this);
 
   newTop = ScrollableArea::normalizeNonFiniteScroll(newTop);
 
-  if (document().scrollingElement() == this) {
+  if (document().scrollingElementInternal() == this) {
     if (LocalDOMWindow* window = document().domWindow())
       window->scrollTo(window->scrollX(), newTop);
   } else {
     LayoutBox* box = layoutBox();
     if (box)
       box->setScrollTop(
           LayoutUnit::fromFloatRound(newTop * box->style()->effectiveZoom()));
   }
 }
 
@@ skipping 47 matching lines @@
 }
 
 void Element::scrollTo(double x, double y) {
   ScrollToOptions scrollToOptions;
   scrollToOptions.setLeft(x);
   scrollToOptions.setTop(y);
   scrollTo(scrollToOptions);
 }
 
 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);
 
   if (document().scrollingElement() == this) {
     scrollFrameTo(scrollToOptions);
   } else {
     scrollLayoutBoxTo(scrollToOptions);
   }
 }
@@ skipping 3205 matching lines @@
 }
 
 DEFINE_TRACE_WRAPPERS(Element) {
   if (hasRareData()) {
     visitor->traceWrappers(elementRareData());
   }
   ContainerNode::traceWrappers(visitor);
 }
 
 }  // namespace blink