Move TopDocumentRootScrollerController to a separate object on FrameHost

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

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved.
@@ skipping 455 matching lines @@
             ? m_frame->localDOMWindow()->maybeCustomElements()
             : nullptr;
         if (registry && m_registrationContext)
             registry->entangle(m_registrationContext);
     } else if (m_importsController) {
         m_fetcher = FrameFetchContext::createContextAndFetcher(nullptr, this);
     } else {
         m_fetcher = ResourceFetcher::create(nullptr);
     }
 
-    // TODO(bokan): This will probably blow up if we don't have an m_frame here
-    // since we'll assume a child RootScrollerController. crbug.com/505516.
-    m_rootScrollerController = isInMainFrame()
-        ? TopDocumentRootScrollerController::create(*this)
-        : RootScrollerController::create(*this);
+    m_rootScrollerController = RootScrollerController::create(*this);
 
     // We depend on the url getting immediately set in subframes, but we
     // also depend on the url NOT getting immediately set in opened windows.
     // See fast/dom/early-frame-url.html
     // and fast/dom/location-new-window-no-crash.html, respectively.
     // FIXME: Can/should we unify this behavior?
     if (initializer.shouldSetURL())
         setURL(initializer.url());
 
     initSecurityContext(initializer);
@@ skipping 1640 matching lines @@
 
     // The TextAutosizer can't update layout view info while the Document is detached, so update now in case anything changed.
     if (TextAutosizer* autosizer = textAutosizer())
         autosizer->updatePageInfo();
 
     m_frame->selection().documentAttached(this);
     m_lifecycle.advanceTo(DocumentLifecycle::StyleClean);
 
     if (view())
         view()->didAttachDocument();
-
-    // Needs to be called after view()->didAttachDocument().
-    m_rootScrollerController->didAttachDocument();
 }
 
 void Document::detachLayoutTree(const AttachContext& context)
 {
     TRACE_EVENT0("blink", "Document::detach");
     RELEASE_ASSERT(!m_frame || m_frame->tree().childCount() == 0);
     if (!isActive())
         return;
 
     // Frame navigation can cause a new Document to be attached. Don't allow that, since that will
@@ skipping 3896 matching lines @@
 }
 
 void showLiveDocumentInstances()
 {
     WeakDocumentSet& set = liveDocumentSet();
     fprintf(stderr, "There are %u documents currently alive:\n", set.size());
     for (Document* document : set)
         fprintf(stderr, "- Document %p URL: %s\n", document, document->url().getString().utf8().data());
 }
 #endif