third_party/WebKit/Source/core/dom/Document.cpp - Issue 1913843004: Implementing document.setRootScroller API for main thread scrolling.

Unified Diff: third_party/WebKit/Source/core/dom/Document.cpp

Issue 1913843004: Implementing document.setRootScroller API for main thread scrolling. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@overscrollController

Patch Set: Rebase Created 4 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/core/dom/Document.h ('k') | third_party/WebKit/Source/core/dom/Document.idl » ('j') | third_party/WebKit/Source/core/page/scrolling/ViewportScrollCallback.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/dom/Document.cpp

diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKit/Source/core/dom/Document.cpp

index 6615aa5422721547a32f6615be5aadc2c352b4fa..5e8d29d9caa73e23ff5bf1b939cb4347ac8f8004 100644

--- a/third_party/WebKit/Source/core/dom/Document.cpp

+++ b/third_party/WebKit/Source/core/dom/Document.cpp

@@ -193,8 +193,8 @@

#include "core/page/FrameTree.h"

#include "core/page/Page.h"

#include "core/page/PointerLockController.h"

+#include "core/page/scrolling/RootScroller.h"

#include "core/page/scrolling/ScrollingCoordinator.h"

-#include "core/page/scrolling/ViewportScrollCallback.h"

#include "core/svg/SVGDocumentExtensions.h"

#include "core/svg/SVGTitleElement.h"

#include "core/svg/SVGUseElement.h"

@@ -248,31 +248,6 @@ static const unsigned cMaxWriteRecursionDepth = 21;

// for dual G5s. :)

static const int cLayoutScheduleThreshold = 250;

-namespace {

-void updateViewportApplyScroll(Element* documentElement)

- if (!documentElement

- || !documentElement->isHTMLElement()

- || documentElement->document().ownerElement())

- return;

- if (documentElement->getApplyScroll())

- return;

- ScrollStateCallback* applyScroll =

- new ViewportScrollCallback(documentElement->document());

- // Use disable-native-scroll since the ViewportScrollCallback needs to

- // apply scroll actions before (TopControls) and after (overscroll)

- // scrolling the element so it applies scroll to the element itself.

- documentElement->setApplyScroll(

- applyScroll,

- "disable-native-scroll");

-} // namespace

// DOM Level 2 says (letters added):

// a) Name start characters must have one of the categories Ll, Lu, Lo, Lt, Nl.

@@ -609,21 +584,55 @@ void Document::childrenChanged(const ChildrenChange& change)

{

ContainerNode::childrenChanged(change);

m_documentElement = ElementTraversal::firstWithin(*this);

- // For non-HTML documents the willInsertBody notification won't happen

- // so we resume as soon as we have a document element. Even for XHTML

- // documents there may never be a <body> (since the parser won't always

- // insert one), so we resume here too. That does mean XHTML documents make

- // frames when there's only a <head>, but such documents are pretty rare.

- if (m_documentElement && !isHTMLDocument())

- beginLifecycleUpdatesIfRenderingReady();

+void Document::setRootScroller(Element* newScroller, ExceptionState& exceptionState)

+ DCHECK(newScroller);

- // Installs the viewport scrolling callback (the "applyScroll" in Scroll

- // Customization lingo) on the documentElement. This callback is

- // responsible for viewport related scroll actions like top controls

- // movement and overscroll glow as well as actually scrolling the root

- // viewport.

- updateViewportApplyScroll(m_documentElement);

+ if (ownerElement()) {

+ exceptionState.throwDOMException(

+ WrongDocumentError,

+ "Root scroller cannot be set on a document within a frame.");

+ return;

+ }

+ if (newScroller->document() != this) {

+ exceptionState.throwDOMException(

+ WrongDocumentError,

+ "Element isn't in this document.");

+ return;

+ }

+ FrameHost* host = frameHost();

+ if (!host)

+ return;

+ RootScroller* rootScroller = host->rootScroller();

+ DCHECK(rootScroller);

+ if (!rootScroller->set(*newScroller)) {

+ exceptionState.throwDOMException(

+ InvalidStateError,

+ "Element cannot be set as root scroller. Must be block or iframe.");

+ }

+Element* Document::rootScroller()

+ if (ownerElement())

+ return documentElement();

+ FrameHost* host = frameHost();

+ if (!host)

+ return nullptr;

+ RootScroller* rootScroller = host->rootScroller();

+ DCHECK(rootScroller);

+ updateLayoutIgnorePendingStylesheets();

+ return rootScroller->get();

}

AtomicString Document::convertLocalName(const AtomicString& name)

@@ -1922,6 +1931,11 @@ void Document::layoutUpdated()

if (!m_documentTiming.firstLayout())

m_documentTiming.markFirstLayout();

}

+ if (!ownerElement() && frameHost()) {

+ if (RootScroller* rootScroller = frameHost()->rootScroller())

+ rootScroller->didUpdateTopDocumentLayout();

+ }

}

void Document::setNeedsFocusedElementCheck()