Changeset 228045 in webkit
- Timestamp:
- Feb 2, 2018 8:53:47 PM (6 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r228044 r228045 1 2018-02-02 Daniel Bates <dabates@apple.com> 2 3 Clean up FrameLoader::receivedFirstData() 4 https://bugs.webkit.org/show_bug.cgi?id=182361 5 6 Reviewed by Andy Estes. 7 8 * loader/FrameLoader.cpp: 9 (WebCore::FrameLoader::receivedFirstData): 10 1 11 2018-02-02 Myles C. Maxfield <mmaxfield@apple.com> 2 12 -
trunk/Source/WebCore/loader/FrameLoader.cpp
r227948 r228045 668 668 dispatchGlobalObjectAvailableInAllWorlds(); 669 669 670 if (m_documentLoader) {671 auto& title = m_documentLoader->title();672 if (!title.string.isNull())673 m_client.dispatchDidReceiveTitle(title);674 }675 676 670 if (!m_documentLoader) 677 671 return; 672 673 auto& documentLoader = *m_documentLoader; 674 auto& title = documentLoader.title(); 675 if (!title.string.isNull()) 676 m_client.dispatchDidReceiveTitle(title); 678 677 679 678 ASSERT(m_frame.document()); 680 679 auto& document = *m_frame.document(); 681 680 682 ASSERT(m_frame.document()); 683 LinkLoader::loadLinksFromHeader(m_documentLoader->response().httpHeaderField(HTTPHeaderName::Link), m_frame.document()->url(), *m_frame.document(), LinkLoader::MediaAttributeCheck::MediaAttributeEmpty); 681 LinkLoader::loadLinksFromHeader(documentLoader.response().httpHeaderField(HTTPHeaderName::Link), document.url(), document, LinkLoader::MediaAttributeCheck::MediaAttributeEmpty); 684 682 685 683 double delay; 686 684 String urlString; 687 if (!parseHTTPRefresh( m_documentLoader->response().httpHeaderField(HTTPHeaderName::Refresh), delay, urlString))685 if (!parseHTTPRefresh(documentLoader.response().httpHeaderField(HTTPHeaderName::Refresh), delay, urlString)) 688 686 return; 689 687 auto completedURL = urlString.isEmpty() ? document.url() : document.completeURL(urlString); … … 692 690 else { 693 691 auto message = "Refused to refresh " + document.url().stringCenterEllipsizedToLength() + " to a javascript: URL"; 694 m_frame.document()->addConsoleMessage(MessageSource::Security, MessageLevel::Error, message);692 document.addConsoleMessage(MessageSource::Security, MessageLevel::Error, message); 695 693 } 696 694 }
Note: See TracChangeset
for help on using the changeset viewer.