Merge recalcStyleForLayoutIgnoringPendingStylesheets into updateLayoutIgnorePendingStylesheets

Now that we don't have partial layout we can recombine these methods. No
one should be calling the other one except updateLayoutIgnorePendingStylesheets
anyway.

R=pdr@chromium.org,ojan@chromium.org

Review URL: https://codereview.chromium.org/209323003

git-svn-id: svn://svn.chromium.org/blink/trunk@169815 bbb929c8-8fbe-4397-9dbb-9b2b20218538

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

@@ -1887,13 +1887,17 @@ void Document::clearFocusedElementTimerFired(Timer<Document>*)
         setFocusedElement(nullptr);
 }
 
-void Document::recalcStyleForLayoutIgnoringPendingStylesheets()
+// FIXME: This is a bad idea and needs to be removed eventually.
+// Other browsers load stylesheets before they continue parsing the web page.
+// Since we don't, we can run JavaScript code that needs answers before the
+// stylesheets are loaded. Doing a layout ignoring the pending stylesheets
+// lets us get reasonable answers. The long term solution to this problem is
+// to instead suspend JavaScript execution.
+void Document::updateLayoutIgnorePendingStylesheets(Document::RunPostLayoutTasks runPostLayoutTasks)
 {
-    ASSERT(m_styleEngine->ignoringPendingStylesheets());
-
-    if (!m_styleEngine->hasPendingSheets())
-        return;
+    StyleEngine::IgnoringPendingStylesheet ignoring(m_styleEngine.get());
 
+    if (m_styleEngine->hasPendingSheets()) {
         // FIXME: We are willing to attempt to suppress painting with outdated style info only once.
         // Our assumption is that it would be dangerous to try to stop it a second time, after page
         // content has already been loaded and displayed with accurate style information. (Our
@@ -1911,19 +1915,10 @@ void Document::recalcStyleForLayoutIgnoringPendingStylesheets()
             // gets cleaned when style sheets arrive but here we need up-to-date style immediately.
             updateStyle(Force);
         }
-}
+    }
 
-// FIXME: This is a bad idea and needs to be removed eventually.
-// Other browsers load stylesheets before they continue parsing the web page.
-// Since we don't, we can run JavaScript code that needs answers before the
-// stylesheets are loaded. Doing a layout ignoring the pending stylesheets
-// lets us get reasonable answers. The long term solution to this problem is
-// to instead suspend JavaScript execution.
-void Document::updateLayoutIgnorePendingStylesheets(Document::RunPostLayoutTasks runPostLayoutTasks)
-{
-    StyleEngine::IgnoringPendingStylesheet ignoring(m_styleEngine.get());
-    recalcStyleForLayoutIgnoringPendingStylesheets();
     updateLayout();
+
     if (runPostLayoutTasks == RunPostLayoutTasksSynchronously && view())
         view()->flushAnyPendingPostLayoutTasks();
 }

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

@@ -1113,8 +1113,6 @@ private:
 
     void executeScriptsWaitingForResourcesIfNeeded();
 
-    void recalcStyleForLayoutIgnoringPendingStylesheets();
-
     PassRefPtr<NodeList> handleZeroPadding(const HitTestRequest&, HitTestResult&) const;
 
     void loadEventDelayTimerFired(Timer<Document>*);