Changeset 228045 in webkit

Timestamp:

Feb 2, 2018 8:53:47 PM (6 years ago)

Author:

dbates@webkit.org

Message:

Clean up FrameLoader::receivedFirstData()
​https://bugs.webkit.org/show_bug.cgi?id=182361

Reviewed by Andy Estes.

• loader/FrameLoader.cpp:

(WebCore::FrameLoader::receivedFirstData):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/FrameLoader.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-02-02  Daniel Bates  <dabates@apple.com>
+
+        Clean up FrameLoader::receivedFirstData()
+        https://bugs.webkit.org/show_bug.cgi?id=182361
+
+        Reviewed by Andy Estes.
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::receivedFirstData):
+
 2018-02-02  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebCore/loader/FrameLoader.cpp

@@ -668 +668 @@
     dispatchGlobalObjectAvailableInAllWorlds();
 
-    if (m_documentLoader) {
-        auto& title = m_documentLoader->title();
-        if (!title.string.isNull())
-            m_client.dispatchDidReceiveTitle(title);
-    }
-
     if (!m_documentLoader)
         return;
+
+    auto& documentLoader = *m_documentLoader;
+    auto& title = documentLoader.title();
+    if (!title.string.isNull())
+        m_client.dispatchDidReceiveTitle(title);
 
     ASSERT(m_frame.document());
     auto& document = *m_frame.document();
 
-    ASSERT(m_frame.document());
-    LinkLoader::loadLinksFromHeader(m_documentLoader->response().httpHeaderField(HTTPHeaderName::Link), m_frame.document()->url(), *m_frame.document(), LinkLoader::MediaAttributeCheck::MediaAttributeEmpty);
+    LinkLoader::loadLinksFromHeader(documentLoader.response().httpHeaderField(HTTPHeaderName::Link), document.url(), document, LinkLoader::MediaAttributeCheck::MediaAttributeEmpty);
 
     double delay;
     String urlString;
-    if (!parseHTTPRefresh(m_documentLoader->response().httpHeaderField(HTTPHeaderName::Refresh), delay, urlString))
+    if (!parseHTTPRefresh(documentLoader.response().httpHeaderField(HTTPHeaderName::Refresh), delay, urlString))
         return;
     auto completedURL = urlString.isEmpty() ? document.url() : document.completeURL(urlString);
@@ -692 +690 @@
     else {
         auto message = "Refused to refresh " + document.url().stringCenterEllipsizedToLength() + " to a javascript: URL";
-        m_frame.document()->addConsoleMessage(MessageSource::Security, MessageLevel::Error, message);
+        document.addConsoleMessage(MessageSource::Security, MessageLevel::Error, message);
     }
 }