<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[210845] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/210845">210845</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2017-01-17 21:17:17 -0800 (Tue, 17 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove PassRefPtr from "loader" directory of WebCore
https://bugs.webkit.org/show_bug.cgi?id=167055
Reviewed by Alex Christensen.
Source/WebCore:
* dom/Document.cpp:
(WebCore::Document::processHttpEquiv): Pass a reference.
* editing/CompositeEditCommand.cpp:
(WebCore::EditCommandComposition::unapply): Ditto.
(WebCore::EditCommandComposition::reapply): Ditto.
(WebCore::CompositeEditCommand::ensureComposition): Return a reference.
(WebCore::CompositeEditCommand::applyCommandToComposite): Use a reference.
* editing/CompositeEditCommand.h: Updated for above changes.
* editing/Editor.cpp:
(WebCore::Editor::unappliedEditing): Take a reference instead of a PassRefPtr.
(WebCore::Editor::reappliedEditing): Ditto.
* editing/Editor.h: Updated for above changes. Also changed the
FragmentAndResources resources vector to hold Ref instead of RefPtr.
* editing/cocoa/EditorCocoa.mm:
(WebCore::Editor::createFragmentAndAddResources): Updated for change to
FragmentAndResources.
* editing/ios/EditorIOS.mm:
(WebCore::Editor::WebContentReader::readWebArchive): Pass a reference.
* editing/mac/EditorMac.mm:
(WebCore::Editor::WebContentReader::readWebArchive): Pass a reference.
* history/PageCache.cpp:
(WebCore::canCacheFrame): Use a reference.
* html/FileInputType.cpp:
(WebCore::FileInputType::handleDOMActivateEvent): Pass references.
* html/HTMLFormControlElement.cpp:
(WebCore::HTMLFormControlElement::formMethod): Use auto.
* html/HTMLFormElement.cpp:
(WebCore::HTMLFormElement::prepareForSubmission): Updated to use a return
values for textFieldValues intsead of an out argument with getTextFieldValues.
(WebCore::HTMLFormElement::textFieldValues): Renamed from getTextFieldValues
and changed to use a return value instead of an out argument.
(WebCore::HTMLFormElement::submit): Pass a reference.
(WebCore::HTMLFormElement::requestAutocomplete): Pass a Ref&&.
* html/HTMLFormElement.h: Updated for above changes.
* html/HTMLHtmlElement.cpp:
(WebCore::HTMLHtmlElement::insertedByParser): Use a reference.
* html/HTMLLinkElement.cpp:
(WebCore::HTMLLinkElement::process): Pass a reference.
(WebCore::HTMLLinkElement::setCSSStyleSheet): Use auto.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::loadResource): Use a reference.
* inspector/InspectorApplicationCacheAgent.cpp:
(WebCore::InspectorApplicationCacheAgent::updateApplicationCacheStatus): Use a reference,
also update for struct-style member names withou m_ prefix.
(WebCore::InspectorApplicationCacheAgent::getFramesWithManifests): Ditto.
(WebCore::InspectorApplicationCacheAgent::getManifestForFrame): Ditto.
(WebCore::InspectorApplicationCacheAgent::getApplicationCacheForFrame): Ditto.
(WebCore::InspectorApplicationCacheAgent::buildObjectForApplicationCache): Ditto.
(WebCore::InspectorApplicationCacheAgent::buildArrayForApplicationCacheResources): Ditto.
(WebCore::InspectorApplicationCacheAgent::buildObjectForApplicationCacheResource): Ditto.
* inspector/InspectorApplicationCacheAgent.h: Updated for above changes.
* inspector/InspectorInstrumentation.cpp:
(WebCore::InspectorInstrumentation::updateApplicationCacheStatusImpl): Take a reference.
* inspector/InspectorInstrumentation.h: Updated for the above.
* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::DocumentLoader): Move much initialization to class definition.
(WebCore::DocumentLoader::originalRequest): Moved to header to make it inline.
(WebCore::DocumentLoader::originalRequestCopy): Ditto.
(WebCore::DocumentLoader::request): Ditto.
(WebCore::DocumentLoader::url): Ditto.
(WebCore::DocumentLoader::stopLoading): Pass a reference.
(WebCore::DocumentLoader::willSendRequest): Updated to take a raw pointer instead of a
PassRefPtr.
(WebCore::DocumentLoader::commitData): Call shouldUseMainResourceEncoding instead of
special casing WebArchive.
(WebCore::DocumentLoader::maybeCreateArchive): Pass references.
(WebCore::DocumentLoader::setArchive): Take Ref&& instead of PassRefPtr.
(WebCore::DocumentLoader::addAllArchiveResources): Take a reference instead
of a pointer.
(WebCore::DocumentLoader::popArchiveForSubframe): Return RefPtr instead of
PassRefPtr.
(WebCore::DocumentLoader::subresource): Ditto.
(WebCore::DocumentLoader::subresources): Return a Vector<Ref> instead of a
Vector<RefPtr>.
(WebCore::DocumentLoader::substituteResourceDeliveryTimerFired): Use move
instead of swap.
(WebCore::DocumentLoader::scheduleArchiveLoad): Use shouldLoadFromArchiveOnly
instead of a special case for each type of archive.
(WebCore::DocumentLoader::originalURL): Moved to header to make it inline.
(WebCore::DocumentLoader::responseURL): Ditto.
(WebCore::DocumentLoader::documentURL): Call shouldUseMainResourceURL instead of
special casing WebArchive.
(WebCore::DocumentLoader::responseMIMEType): Moved to header to make it inline.
(WebCore::DocumentLoader::currentContentType): Ditto.
(WebCore::DocumentLoader::contentFilter): Ditto.
(WebCore::DocumentLoader::getIconLoadDecisionForIconURL): Pass a reference.
(WebCore::DocumentLoader::getIconDataForIconURL): Ditto.
(WebCore::DocumentLoader::dispatchOnloadEvents): Use a reference.
(WebCore::DocumentLoader::unreachableURL): Moved to header to make it inline.
* loader/DocumentLoader.h: Updated for the above.
* loader/EmptyClients.cpp: Updated for changes to client interfaces.
* loader/EmptyClients.h: Ditto.
* loader/FormState.cpp:
(WebCore::FormState::FormState): Take references instead of PassRefPtr, also
take Vector&& instead of Vector& when we want to take ownership and use move
instead of swap to do that.
(WebCore::FormState::create): Ditto.
* loader/FormState.h: Updated for the above. Also changed return values to be
references instead of pointers and members to be Ref instead of RefPtr.
* loader/FormSubmission.cpp:
(WebCore::FormSubmission::Attributes::parseMethodType): Updated for change
to the Method enumeration.
(WebCore::FormSubmission::Attributes::copyFrom): Deleted.
(WebCore::FormSubmission::FormSubmission): Use Ref&& instead of PassRefPtr.
(WebCore::FormSubmission::create): Use reference instead of pointer and
raw pointer instead of PassRefPtr. Also copy attributes using copy constructor
instead of an explicit copyFrom function.
(WebCore::FormSubmission::requestURL): Updated for change to the Method
enumeration.
(WebCore::FormSubmission::populateFrameLoadRequest): Ditto.
* loader/FormSubmission.h: Updated for the above changes. Made the Attributes
class copyable, since we copy it. Changed some functions to return references
instead of pointers and use Ref instead of RefPtr for data members.
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::submitForm): Updated for changes to FormSubmission
and FormState.
(WebCore::FrameLoader::receivedFirstData): Ditto.
(WebCore::FrameLoader::loadFrameRequest): Ditto.
(WebCore::FrameLoader::loadResourceSynchronously): Ditto.
(WebCore::FrameLoader::continueLoadAfterNavigationPolicy): Ditto.
* loader/FrameLoaderClient.h: Use references, pointers, RefPtr, and Ref
instead of PassRefPtr. Removed unused empty dispatchDidFailToStartPlugin.
* loader/HistoryController.cpp:
(WebCore::HistoryController::pushState): Take RefPtr&& instead of PassRefPtr.
(WebCore::HistoryController::replaceState): Ditto.
* loader/HistoryController.h: Updated for the above.
* loader/ImageLoader.cpp:
(WebCore::ImageLoader::updateFromElement): Pass a reference.
* loader/NavigationScheduler.cpp: Use refernces and Ref&& instead of
pointers and PassRefPtr.
(WebCore::ScheduledNavigation::ScheduledNavigation): Added an overload
that sests m_shouldOpenExternalURLsPolicy.
* loader/NavigationScheduler.h: Updated for the above.
* loader/ResourceLoader.cpp:
(WebCore::ResourceLoader::start): Use and pass references.
(WebCore::ResourceLoader::willSendRequest): Ditto.
(WebCore::ResourceLoader::didReceiveResponse): Ditto.
(WebCore::ResourceLoader::didFail): Ditto.
* loader/SubframeLoader.cpp:
(WebCore::SubframeLoader::createJavaAppletWidget): Return RefPtr instead
of PassRefPtr. Pass references instead of pointers.
(WebCore::SubframeLoader::loadOrRedirectSubframe): Ditto.
(WebCore::SubframeLoader::loadSubframe): Ditto.
(WebCore::SubframeLoader::document): Deleted. This was never really the
correct idiom for getting the appropriate document; hiding the dependency
on m_frame wasn't paing off.
(WebCore::SubframeLoader::loadPlugin): Pass reference instead of pointer.
(WebCore::SubframeLoader::shouldConvertInvalidURLsToBlank): Eliminated
unneeded null checking and complexity due to going through the document
instead of the frame for this check.
* loader/SubframeLoader.h: Updated for the above.
* loader/appcache/ApplicationCache.cpp:
(WebCore::ApplicationCache::ApplicationCache): Moved data member
initialization to the class definition.
(WebCore::ApplicationCache::~ApplicationCache): Pass a reference instead
of a pointer.
(WebCore::ApplicationCache::isComplete): Ditto.
(WebCore::ApplicationCache::setManifestResource): Take Ref&& instead of
PassRefPtr.
(WebCore::ApplicationCache::addResource): Ditto.
(WebCore::ApplicationCache::removeResource): Deleted. Was unused.
* loader/appcache/ApplicationCache.h: Updated for above changes.
* loader/appcache/ApplicationCacheGroup.cpp:
(WebCore::ApplicationCacheGroup::ApplicationCacheGroup): Moved most
member initialization to the class definition.
(WebCore::ApplicationCacheGroup::~ApplicationCacheGroup): Pass a reference.
(WebCore::ApplicationCacheGroup::cacheForMainRequest): Removed
unnecessary preflight for removeFragmentIdentifier, which efficiently
does nothing if there is no identifier. Use early return.
(WebCore::ApplicationCacheGroup::fallbackCacheForMainRequest): More of
the same.
(WebCore::ApplicationCacheGroup::selectCache): Ditto, also take a reference,
and use event names instead of a special enumeration to poast events.
(WebCore::ApplicationCacheGroup::selectCacheWithoutManifestURL): Ditto.
(WebCore::ApplicationCacheGroup::finishedLoadingMainResource): Ditto.
(WebCore::ApplicationCacheGroup::failedLoadingMainResource): Ditto.
(WebCore::ApplicationCacheGroup::disassociateDocumentLoader): Ditto.
(WebCore::ApplicationCacheGroup::cacheDestroyed): Ditto.
(WebCore::ApplicationCacheGroup::stopLoadingInFrame): Ditto.
(WebCore::ApplicationCacheGroup::setNewestCache): Use Ref&& instead of
PassRefPtr.
(WebCore::ApplicationCacheGroup::makeObsolete): More of the same.
(WebCore::ApplicationCacheGroup::update): Ditto.
(WebCore::ApplicationCacheGroup::abort): Ditto.
(WebCore::ApplicationCacheGroup::didReceiveResponse): Ditto.
(WebCore::ApplicationCacheGroup::didFinishLoading): Ditto.
(WebCore::ApplicationCacheGroup::didFail): Ditto.
(WebCore::ApplicationCacheGroup::didFinishLoadingManifest): Ditto.
(WebCore::ApplicationCacheGroup::manifestNotFound): Ditto.
(WebCore::ApplicationCacheGroup::checkIfLoadIsComplete): Ditto.
(WebCore::ApplicationCacheGroup::startLoadingEntry): Ditto.
(WebCore::ApplicationCacheGroup::deliverDelayedMainResources): Use a modern
for loop.
(WebCore::ApplicationCacheGroup::addEntry): Use auto and simplify logic
for adding.
(WebCore::ApplicationCacheGroup::associateDocumentLoaderWithCache): Update since
function result is a reference.
(WebCore::ApplicationCacheGroup::scheduleReachedMaxAppCacheSizeCallback):
Use auto.
(WebCore::ApplicationCacheGroup::postListenerTask): Take event type instead of
taking a special enumeration.
* loader/appcache/ApplicationCacheGroup.h: Updated for the above.
* loader/appcache/ApplicationCacheHost.cpp:
(WebCore::ApplicationCacheHost::ApplicationCacheHost): Move most member
initialization to the class definition.
(WebCore::ApplicationCacheHost::~ApplicationCacheHost): Use reference.
(WebCore::ApplicationCacheHost::selectCacheWithoutManifest): Ditto.
(WebCore::ApplicationCacheHost::selectCacheWithManifest): Ditto.
(WebCore::ApplicationCacheHost::mainResourceDataReceived): Ditto.
(WebCore::ApplicationCacheHost::failedLoadingMainResource): Ditto.
(WebCore::ApplicationCacheHost::finishedLoadingMainResource): Ditto.
(WebCore::ApplicationCacheHost::maybeLoadFallbackForRedirect): Ditto.
(WebCore::ApplicationCacheHost::maybeLoadFallbackForResponse): Ditto.
(WebCore::ApplicationCacheHost::createFileURL): Ditto.
(WebCore::ApplicationCacheHost::maybeLoadSynchronously): Ditto.
(WebCore::ApplicationCacheHost::notifyDOMApplicationCache): Take event
type instead of special enumeration.
(WebCore::ApplicationCacheHost::stopLoadingInFrame): Use reference.
(WebCore::ApplicationCacheHost::stopDeferringEvents): Updated to use
event types instead of special enumeration and also repaired possible
edge case where code in event handler somehow triggers additional events.
(WebCore::ApplicationCacheHost::resourceList): Renamed from fillResourceList
and changed to return a vector instead of populating one.
(WebCore::ApplicationCacheHost::applicationCacheInfo): Tweak coding style a bit.
(WebCore::createApplicationCacheEvent): Factored this helper out of
dispatchDOMEvent so we can use Ref instead of RefPtr.
(WebCore::ApplicationCacheHost::dispatchDOMEvent): Updated to recent event type
rather than receiving an event id and mapping it to a type.
(WebCore::ApplicationCacheHost::setApplicationCache): Take RefPtr&& instead of
PassRefPtr.
(WebCore::ApplicationCacheHost::update): Pass a reference.
(WebCore::ApplicationCacheHost::swapCache): Ditto.
(WebCore::ApplicationCacheHost::abort): Ditto.
* loader/appcache/ApplicationCacheHost.h: Updated for the above.
* loader/appcache/ApplicationCacheStorage.cpp:
(WebCore::ApplicationCacheStorage::loadCacheGroup): Pass a Ref instead of RefPtr.
(WebCore::ApplicationCacheStorage::cacheGroupForURL): Ditto.
(WebCore::ApplicationCacheStorage::fallbackCacheGroupForURL): Ditto.
(WebCore::ApplicationCacheStorage::cacheGroupDestroyed): Take a reference.
(WebCore::ApplicationCacheStorage::cacheGroupMadeObsolete): Ditto.
(WebCore::ApplicationCacheStorage::storeNewestCache): Ditto.
(WebCore::ApplicationCacheStorage::loadCache): Return RefPtr instead of PassRefPtr.
(WebCore::ApplicationCacheStorage::deleteCacheGroup): Pass a reference.
* loader/appcache/ApplicationCacheStorage.h: Updated for the above.
* loader/appcache/DOMApplicationCache.cpp:
(WebCore::DOMApplicationCache::DOMApplicationCache): Take a reference.
(WebCore::DOMApplicationCache::toEventType): Deleted.
* loader/appcache/DOMApplicationCache.h: Updated for the above. Made most
members private.
* loader/archive/Archive.cpp:
(WebCore::Archive::clearAllSubframeArchives): Use a set for the logic that
prevents us from walking the same archive more than once, rather than using
a vector. Left it recursive, though.
* loader/archive/Archive.h: Git rid of the type function, replacing it with
three functions for the four different policies we currently have about the
different archive types. Changed functions to take Ref&& instead of PassRefPtr
and return const Vector<Ref>& instead of const Vector<RefPtr>&, changing the
data members to match.
* loader/archive/ArchiveFactory.cpp:
(WebCore::createArchiveMIMETypesMap): Factored this out of the archiveMIMETypes
function so we don't need a boolean. Also use ASCIILiteral.
(WebCore::archiveMIMETypes): Updated to se the above.
* loader/archive/ArchiveResourceCollection.cpp:
(WebCore::ArchiveResourceCollection::addAllResources): Take a reference.
(WebCore::ArchiveResourceCollection::popSubframeArchive): Return RefPtr instead
of PassRefPtr.
* loader/archive/ArchiveResourceCollection.h: Updated for the above.
* loader/archive/cf/LegacyWebArchive.cpp:
(WebCore::LegacyWebArchive::createPropertyListRepresentation): Use auto and
fewer local variables, more references for argument types and return values.
(WebCore::LegacyWebArchive::createResourceResponseFromPropertyListData): Ditto.
(WebCore::LegacyWebArchive::createResource): Ditto.
(WebCore::LegacyWebArchive::create): Ditto.
(WebCore::LegacyWebArchive::extract): Ditto.
(WebCore::LegacyWebArchive::type): Deleted.
(WebCore::LegacyWebArchive::rawDataRepresentation): More of the same.
(WebCore::LegacyWebArchive::createFromSelection): Ditto.
* loader/archive/cf/LegacyWebArchive.h: Updated for the above. Also marked the
class final and added overrides for the four new policy member functions.
* loader/archive/mhtml/MHTMLArchive.cpp:
(WebCore::MHTMLArchive::create): Pass references.
(WebCore::MHTMLArchive::generateMHTMLData): Return RefPtr instead of
PassRefPtr.
* loader/archive/mhtml/MHTMLArchive.h: Updated for the above. Also marked the
class final and added overrides for the four new policy member functions.
* loader/archive/mhtml/MHTMLParser.cpp:
(WebCore::MHTMLParser::parseArchiveWithHeader): Pass Ref instead of RefPtr
to setMainResource and addSubframeArchive.
(WebCore::MHTMLParser::addResourceToArchive): Ditto.
* loader/cache/CachedCSSStyleSheet.cpp:
(WebCore::CachedCSSStyleSheet::restoreParsedStyleSheet): Return RefPtr instead
of PassRefPtr.
* loader/cache/CachedCSSStyleSheet.h: Updated for the above.
* loader/cache/CachedResourceRequest.cpp:
(WebCore::CachedResourceRequest::setInitiator): Take a reference instead of a
PassRefPtr.
* loader/cache/CachedResourceRequest.h: Updated for the above.
* loader/cocoa/DiskCacheMonitor.h: Removed. This is a duplicate, unused copy
of DiskCacheMonitorCocoa.h.
* loader/cocoa/DiskCacheMonitorCocoa.h: Removed unneeded exporting and virtual
member functions, made more things private, and changed return type to RefPtr
instead of PassRefPtr.
* loader/cocoa/DiskCacheMonitorCocoa.mm:
(WebCore::DiskCacheMonitor::tryGetFileBackedSharedBufferFromCFURLCachedResponse):
Changed return type to RefPtr instead of PassRefPtr.
* loader/icon/IconDatabase.cpp:
(WebCore::IconDatabase::setIconDataForIconURL): Take raw pointer instead of
PassRefPtr.
(WebCore::IconDatabase::getOrCreateIconRecord): Return Ref instead of PassRefPtr.
(WebCore::IconDatabase::getImageDataForIconURLFromSQLDatabase): Return RefPtr
instead of PassRefPtr.
* loader/icon/IconDatabase.h: Updated for the above. Also marked functions final
instead of override.
* loader/icon/IconDatabaseBase.h: Ditto.
* loader/icon/PageURLRecord.cpp:
(WebCore::PageURLRecord::PageURLRecord): Moved initialization to the header.
(WebCore::PageURLRecord::~PageURLRecord): Wrote code here instead of calling
setIconRecord(nullptr).
(WebCore::PageURLRecord::setIconRecord): Take RefPtr&& instead of PassRefPtr.
* loader/icon/PageURLRecord.h: Updatd for the above.
* page/Chrome.cpp:
(WebCore::Chrome::runOpenPanel): Updated to take two references.
* page/Chrome.h: Ditto.
* page/ChromeClient.h: ditto.
* page/DOMWindow.cpp:
(WebCore::DOMWindow::applicationCache): Pass a reference.
(WebCore::DOMWindow::setLocation): Ditto.
(WebCore::DOMWindow::createWindow): Ditto.
(WebCore::DOMWindow::open): Ditto.
* page/EditorClient.h: Changed arguments to references instead of PassRefPtr.
* page/History.cpp:
(WebCore::History::stateObjectAdded): Pass an rvalue reference.
* page/Location.cpp:
(WebCore::Location::reload): Pass reference instead of pointer.
(WebCore::Location::setLocation): Ditto.
* platform/URL.cpp:
(WebCore::URL::setFragmentIdentifier): Take a StringView rather than
a String, which is more flexible for callers. Also eliminated an unneeded
string allocation when the old string had a fragment that is being replaced.
* platform/URL.h: Updated for the above.
* replay/ReplayInputDispatchMethods.cpp:
(WebCore::InitialNavigation::dispatch): Pass reference.
* svg/SVGFEImageElement.cpp:
(WebCore::SVGFEImageElement::requestImageResource): Ditto.
* svg/SVGFontFaceUriElement.cpp:
(WebCore::SVGFontFaceUriElement::loadFont): Ditto.
* svg/SVGUseElement.cpp:
(WebCore::SVGUseElement::updateExternalDocument): Ditto.
Source/WebKit/ios:
* WebCoreSupport/WebChromeClientIOS.h: Updated runOpenPanel to take references.
Made class final and most functions private and final.
* WebCoreSupport/WebChromeClientIOS.mm:
(WebChromeClientIOS::runOpenPanel): Updated to take references.
Source/WebKit/mac:
* WebCoreSupport/WebChromeClient.h: Updated for changes to ChromeClient.
Also made class final and most functions private and final.
* WebCoreSupport/WebChromeClient.mm:
(WebChromeClient::runOpenPanel): Updated to take references.
* WebCoreSupport/WebEditorClient.h: Updated for changes to EditorClient.
* WebCoreSupport/WebEditorClient.mm:
(-[WebUndoStep initWithUndoStep:]): Take reference instead of PassRefPtr.
(+[WebUndoStep stepWithUndoStep:]): Ditto.
(-[WebUndoStep step]): Return reference instead of pointer.
(-[WebEditorUndoTarget undoEditing:]): Updated for the above.
(-[WebEditorUndoTarget redoEditing:]): Ditto.
(WebEditorClient::registerUndoOrRedoStep): Take reference instead of
PassRefPtr.
(WebEditorClient::registerUndoStep): Ditto.
(WebEditorClient::registerRedoStep): Ditto.
* WebCoreSupport/WebFrameLoaderClient.h: Updated for changes to
FrameLoaderClient, marked functions final instead of override.
* WebCoreSupport/WebFrameLoaderClient.mm:
(WebFrameLoaderClient::dispatchDecidePolicyForNewWindowAction): Take
pointer instead of PassRefPtr.
(WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction): Ditto.
(makeFormFieldValuesDictionary): Take a reference.
(WebFrameLoaderClient::dispatchWillSendSubmitEvent): Take Ref&& instead
of PassRefPtr.
(WebFrameLoaderClient::dispatchWillSubmitForm): Take a reference instead
of PassRefPtr.
(WebFrameLoaderClient::actionDictionary): Take a pointer instead of PassRePtr.
(WebFrameLoaderClient::createFrame): Take a reference instead of a pointer.
(WebFrameLoaderClient::createPlugin): Ditto.
(WebFrameLoaderClient::createJavaAppletWidget): Ditto.
(WebFrameLoaderClient::createNetworkingContext): Ditto.
(WebFrameLoaderClient::didCreateQuickLookHandle): Pass a reference.
* WebCoreSupport/WebFrameNetworkingContext.h: Use Ref instead of PassRefPtr.
* WebCoreSupport/WebFrameNetworkingContext.mm: Tweak style a bit.
* WebCoreSupport/WebOpenPanelResultListener.h: Take a reference instead of
PassRefPtr. Use RefPtr for class field.
* WebCoreSupport/WebOpenPanelResultListener.mm:
(-[WebOpenPanelResultListener dealloc]): Deleted. Compiler will now do it
correctly without us declaring anything explicitly.
(-[WebOpenPanelResultListener cancel]): Get rid of hand-written deref code,
and let RefPtr do the work.
(-[WebOpenPanelResultListener chooseFilename:]): Ditto.
(-[WebOpenPanelResultListener chooseFilenames:]): Ditto.
(-[WebOpenPanelResultListener chooseFilenames:displayString:iconImage:]):
Rewrote to use a modern Objective-C for loop, reserveInitialCapacity,
and uncheckedAppend.
* WebView/WebArchive.mm:
(-[WebArchive initWithMainResource:subresources:subframeArchives:]):
Updated for changes to LegacyWebArchive.
(-[WebArchive mainResource]): Ditto.
(-[WebArchive subresources]): Ditto.
(-[WebArchive subframeArchives]): Ditto.
* WebView/WebDataSource.mm:
(-[WebDataSource _addSubframeArchives:]): Use a modern Objective-C for loop
instead of NSEnumerator.
(-[WebDataSource _fileWrapperForURL:]): Use auto.
(-[WebDataSource _documentFragmentWithArchive:]): Pass a reference.
(-[WebDataSource mainResource]): Ditto.
(-[WebDataSource subresources]): Ditto.
(-[WebDataSource subresourceForURL:]): Ditto.
(-[WebDataSource addSubresource:]): Ditto.
* WebView/WebResource.mm:
(-[WebResourcePrivate initWithCoreResource:]): Take Ref&& instead of PassRefPtr.
(-[WebResourcePrivate dealloc]): Remove explicit deref since RefPtr will now take
care of it
(-[WebResource initWithCoder:]): Pass a reference.
(-[WebResource encodeWithCoder:]): Updated since coreResource is now RefPtr.
(-[WebResource _initWithCoreResource:]): Take Ref&& instead of PassRefPtr.
(-[WebResource _coreResource]): Return reference rather than pointer.
(-[WebResource _initWithData:URL:MIMEType:textEncodingName:frameName:response:copyData:]):
Added code to handle the null case and pass a reference rather than a pointer.
* WebView/WebResourceInternal.h: Updated for the above.
Source/WebKit/win:
* Plugins/PluginView.cpp:
(WebCore::PluginView::mediaCanStart): Fix call to dispatchDidFailToStartPlugin
by calling it directly on WebFrameLoaderClient. If my theory is correct, the old
call has been broken and doing nothing since <a href="http://trac.webkit.org/projects/webkit/changeset/177941">r177941</a>, two years ago, which made
the argument types different between FrameLoaderClient and WebFrameLoaderClient,
leaving WebFrameLoaderClient::dispatchDidFailToStartPlugin as dead code.
* WebCoreSupport/WebChromeClient.cpp:
(WebChromeClient::runOpenPanel): Updated for change to ChromeClient.
* WebCoreSupport/WebChromeClient.h: Ditto.
* WebCoreSupport/WebEditorClient.cpp:
(WebEditorUndoCommand::WebEditorUndoCommand): Take a reference instead of
a PassRefPtr. Also use Ref instead of RefPtr.
(WebEditorClient::shouldChangeTypingStyle): Deleted. Empty function that was
never called.
(WebEditorClient::webViewDidChangeTypingStyle): Ditto.
(WebEditorClient::webViewDidChangeSelection): Ditto.
(WebEditorClient::registerUndoStep): Take reference instead of PassRefPtr.
(WebEditorClient::registerRedoStep): Ditto.
* WebCoreSupport/WebEditorClient.h: Updated for the above. Also marked the
class and member functions final and made them all private, which will
help us catch if there are any that don't correctly match WebCore.
* WebCoreSupport/WebFrameLoaderClient.cpp:
(WebFrameLoaderClient::dispatchDecidePolicyForNewWindowAction): Updated
for change to ChromeClient.
(WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction): Ditto.
(WebFrameLoaderClient::dispatchWillSendSubmitEvent): Ditto.
(WebFrameLoaderClient::dispatchWillSubmitForm): Ditto.
(WebFrameLoaderClient::createFrame): Ditto. Also merged two functions into
one because one was private and only called by the other.
(WebFrameLoaderClient::createPlugin): Ditto.
(WebFrameLoaderClient::createJavaAppletWidget): Ditto.
(WebFrameLoaderClient::createNetworkingContext): Ditto.
* WebCoreSupport/WebFrameLoaderClient.h: Ditto.
* WebCoreSupport/WebFrameNetworkingContext.h:
(WebFrameNetworkingContext::create): Return a Ref instead of a PassRefPtr.
Source/WebKit2:
* Shared/APIWebArchive.h: Use RefPtr&& instead of PassRefPtr.
* Shared/APIWebArchive.mm:
(API::WebArchive::create): Ditto.
(API::WebArchive::WebArchive): Ditto.
(API::WebArchive::subresources): Ditto.
(API::WebArchive::subframeArchives): Ditto.
* Shared/TextCheckerState.h: Initialize data members so classes
using this won't have to explicitly initalize them.
* UIProcess/WebIconDatabase.cpp:
(WebKit::WebIconDatabase::setIconDataForIconURL): Pass a raw
pointer to WebCore.
* UIProcess/WebPageProxy.h: Removed forward declaration of
StringPairVector, not needed here.
* WebProcess/IconDatabase/WebIconDatabaseProxy.cpp:
(WebKit::WebIconDatabaseProxy::WebIconDatabaseProxy): Take a reference.
(WebKit::WebIconDatabaseProxy::retainIconForPageURL): Updated for reference.
(WebKit::WebIconDatabaseProxy::releaseIconForPageURL): Ditto.
(WebKit::WebIconDatabaseProxy::synchronousIconForPageURL): Ditto.
(WebKit::WebIconDatabaseProxy::loadDecisionForIconURL): Ditto.
(WebKit::WebIconDatabaseProxy::receivedIconLoadDecision): Ditto.
(WebKit::WebIconDatabaseProxy::iconDataForIconURL): Ditto.
(WebKit::WebIconDatabaseProxy::setIconURLForPageURL): Ditto.
(WebKit::WebIconDatabaseProxy::setIconDataForIconURL): Ditto.
* WebProcess/IconDatabase/WebIconDatabaseProxy.h: Updated for the above.
Marked the class final, made most functions private and final.
* WebProcess/InjectedBundle/InjectedBundleNavigationAction.cpp:
(WebKit::InjectedBundleNavigationAction::InjectedBundleNavigationAction):
Removed assertion that a pointer is non-null since that pointer is now a
reference. Left use of PassRefPtr here for now.z
* WebProcess/Network/WebLoaderStrategy.cpp:
(WebKit::WebLoaderStrategy::scheduleLoad): Updated since application cache
host is now a reference rather thna a pointer.
* WebProcess/Network/WebResourceLoader.cpp:
(WebKit::WebResourceLoader::willSendRequest): Ditto.
(WebKit::WebResourceLoader::didReceiveResponse): Ditto.
(WebKit::WebResourceLoader::didFailResourceLoad): Ditto.
* WebProcess/Plugins/PluginView.cpp:
(WebKit::buildHTTPHeaders): Got rid of unneeded use of String::format.
(WebKit::PluginView::create): Take a reference instead of PassRefPtr.
(WebKit::PluginView::PluginView): Ditto. Also moved much of the data
member initialization to the class definition.
(WebKit::PluginView::recreateAndInitialize): Take Ref&& instead of PassRefPtr.
(WebKit::PluginView::manualLoadDidReceiveResponse): Updated for change to
ManualStreamState enumeration.
(WebKit::PluginView::manualLoadDidReceiveData): Ditto.
(WebKit::PluginView::manualLoadDidFinishLoading Ditto.):
(WebKit::PluginView::manualLoadDidFail): Ditto.
(WebKit::PluginView::liveResourceData): Return RefPtr insead of PassRefPtr.
(WebKit::PluginView::redeliverManualStream): Updated for ManualStreamState.
* WebProcess/Plugins/PluginView.h: Updated for the above. Also changed
ManualStreamState into an enum class.
* WebProcess/WebCoreSupport/WebChromeClient.cpp: Changed m_page to a reference.
(WebKit::WebChromeClient::runOpenPanel): Take both arguments as references.
* WebProcess/WebCoreSupport/WebChromeClient.h: Updated for the above.
* WebProcess/WebCoreSupport/WebEditorClient.cpp:
(WebKit::WebEditorClient::registerUndoStep): Take reference instead of PassRefPtr.
(WebKit::WebEditorClient::registerRedoStep): Ditto.
* WebProcess/WebCoreSupport/WebEditorClient.h: Updated for the above
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::dispatchDecidePolicyForNewWindowAction):
Updated for change to FrameLoaderClient.
(WebKit::WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction): Ditto.
(WebKit::WebFrameLoaderClient::dispatchWillSendSubmitEvent): Ditto.
(WebKit::WebFrameLoaderClient::dispatchWillSubmitForm): Ditto.
(WebKit::WebFrameLoaderClient::createFrame): Ditto.
(WebKit::WebFrameLoaderClient::createPlugin): Ditto.
(WebKit::WebFrameLoaderClient::recreatePlugin): Ditto.
(WebKit::WebFrameLoaderClient::createJavaAppletWidget): Ditto.
(WebKit::WebFrameLoaderClient::createNetworkingContext): Ditto.
(WebKit::WebFrameLoaderClient::didRequestAutocomplete): Ditto.
* WebProcess/WebCoreSupport/WebFrameLoaderClient.h: Updated for the above.
* WebProcess/WebCoreSupport/ios/WebChromeClientIOS.mm:
(WebKit::WebChromeClient::didReceiveMobileDocType): Updated since m_page is a
reference now.
(WebKit::WebChromeClient::observedContentChange): Ditto.
(WebKit::WebChromeClient::notifyRevealedSelectionByScrollingFrame): Ditto.
(WebKit::WebChromeClient::didLayout): Ditto.
(WebKit::WebChromeClient::didStartOverflowScroll): Ditto.
(WebKit::WebChromeClient::didEndOverflowScroll): Ditto.
(WebKit::WebChromeClient::hasStablePageScaleFactor): Ditto.
(WebKit::WebChromeClient::showPlaybackTargetPicker): Ditto.
(WebKit::WebChromeClient::eventThrottlingDelay): Ditto.
(WebKit::WebChromeClient::deviceOrientation): Ditto.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::WebPage): Pass reference.
(WebKit::WebPage::createPlugin): Return RefPtr instead of PassRefPtr.
(WebKit::WebPage::fromCorePage): Updated for change to WebChromeClient.
(WebKit::WebPage::setHeaderPageBanner): Take pointer instead of PassRefPtr.
(WebKit::WebPage::setFooterPageBanner): Ditto.
(WebKit::WebPage::setActiveOpenPanelResultListener): Take Ref&& instead of
PassRefPtr.
(WebKit::WebPage::currentSelectionAsRange): Return RefPtr instead of PassRefPtr.
(WebKit::WebPage::rangeFromEditingRange): Ditto.
* WebProcess/WebPage/WebPage.h: Updated for the above.
* WebProcess/WebPage/efl/WebPageEfl.cpp:
(WebKit::WebPage::cachedResponseDataForURL): Return RefPtr instead of PassRefPtr.
* WebProcess/WebPage/gtk/WebPageGtk.cpp:
(WebKit::WebPage::cachedResponseDataForURL): Ditto.
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::cachedResponseDataForURL): Ditto.
* WebProcess/WebPage/mac/WebPageMac.mm:
(WebKit::WebPage::cachedResponseDataForURL): Ditto.
(WebKit::WebPage::setTopOverhangImage): Take raw pointer instead of PassRefPtr.
(WebKit::WebPage::setBottomOverhangImage): Ditto.
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::WebProcess): Pass a reference. Move most initialization to
the class definition.
* WebProcess/WebProcess.h: Updaed for the above.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingCompositeEditCommandcpp">trunk/Source/WebCore/editing/CompositeEditCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingCompositeEditCommandh">trunk/Source/WebCore/editing/CompositeEditCommand.h</a></li>
<li><a href="#trunkSourceWebCoreeditingEditorcpp">trunk/Source/WebCore/editing/Editor.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingEditorh">trunk/Source/WebCore/editing/Editor.h</a></li>
<li><a href="#trunkSourceWebCoreeditingcocoaEditorCocoamm">trunk/Source/WebCore/editing/cocoa/EditorCocoa.mm</a></li>
<li><a href="#trunkSourceWebCoreeditingiosEditorIOSmm">trunk/Source/WebCore/editing/ios/EditorIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreeditingmacEditorMacmm">trunk/Source/WebCore/editing/mac/EditorMac.mm</a></li>
<li><a href="#trunkSourceWebCorehistoryPageCachecpp">trunk/Source/WebCore/history/PageCache.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlFileInputTypecpp">trunk/Source/WebCore/html/FileInputType.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLFormControlElementcpp">trunk/Source/WebCore/html/HTMLFormControlElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLFormElementcpp">trunk/Source/WebCore/html/HTMLFormElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLFormElementh">trunk/Source/WebCore/html/HTMLFormElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLHtmlElementcpp">trunk/Source/WebCore/html/HTMLHtmlElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLLinkElementcpp">trunk/Source/WebCore/html/HTMLLinkElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorApplicationCacheAgentcpp">trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorApplicationCacheAgenth">trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorInstrumentationcpp">trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorInstrumentationh">trunk/Source/WebCore/inspector/InspectorInstrumentation.h</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentLoadercpp">trunk/Source/WebCore/loader/DocumentLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentLoaderh">trunk/Source/WebCore/loader/DocumentLoader.h</a></li>
<li><a href="#trunkSourceWebCoreloaderEmptyClientscpp">trunk/Source/WebCore/loader/EmptyClients.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderEmptyClientsh">trunk/Source/WebCore/loader/EmptyClients.h</a></li>
<li><a href="#trunkSourceWebCoreloaderFormStatecpp">trunk/Source/WebCore/loader/FormState.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderFormStateh">trunk/Source/WebCore/loader/FormState.h</a></li>
<li><a href="#trunkSourceWebCoreloaderFormSubmissioncpp">trunk/Source/WebCore/loader/FormSubmission.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderFormSubmissionh">trunk/Source/WebCore/loader/FormSubmission.h</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoadercpp">trunk/Source/WebCore/loader/FrameLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoaderClienth">trunk/Source/WebCore/loader/FrameLoaderClient.h</a></li>
<li><a href="#trunkSourceWebCoreloaderHistoryControllercpp">trunk/Source/WebCore/loader/HistoryController.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderHistoryControllerh">trunk/Source/WebCore/loader/HistoryController.h</a></li>
<li><a href="#trunkSourceWebCoreloaderImageLoadercpp">trunk/Source/WebCore/loader/ImageLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderNavigationSchedulercpp">trunk/Source/WebCore/loader/NavigationScheduler.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderNavigationSchedulerh">trunk/Source/WebCore/loader/NavigationScheduler.h</a></li>
<li><a href="#trunkSourceWebCoreloaderResourceLoadercpp">trunk/Source/WebCore/loader/ResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderSubframeLoadercpp">trunk/Source/WebCore/loader/SubframeLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderSubframeLoaderh">trunk/Source/WebCore/loader/SubframeLoader.h</a></li>
<li><a href="#trunkSourceWebCoreloaderSubresourceLoadercpp">trunk/Source/WebCore/loader/SubresourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderappcacheApplicationCachecpp">trunk/Source/WebCore/loader/appcache/ApplicationCache.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderappcacheApplicationCacheh">trunk/Source/WebCore/loader/appcache/ApplicationCache.h</a></li>
<li><a href="#trunkSourceWebCoreloaderappcacheApplicationCacheGroupcpp">trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderappcacheApplicationCacheGrouph">trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.h</a></li>
<li><a href="#trunkSourceWebCoreloaderappcacheApplicationCacheHostcpp">trunk/Source/WebCore/loader/appcache/ApplicationCacheHost.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderappcacheApplicationCacheHosth">trunk/Source/WebCore/loader/appcache/ApplicationCacheHost.h</a></li>
<li><a href="#trunkSourceWebCoreloaderappcacheApplicationCacheStoragecpp">trunk/Source/WebCore/loader/appcache/ApplicationCacheStorage.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderappcacheApplicationCacheStorageh">trunk/Source/WebCore/loader/appcache/ApplicationCacheStorage.h</a></li>
<li><a href="#trunkSourceWebCoreloaderappcacheDOMApplicationCachecpp">trunk/Source/WebCore/loader/appcache/DOMApplicationCache.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderappcacheDOMApplicationCacheh">trunk/Source/WebCore/loader/appcache/DOMApplicationCache.h</a></li>
<li><a href="#trunkSourceWebCoreloaderappcacheManifestParsercpp">trunk/Source/WebCore/loader/appcache/ManifestParser.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderappcacheManifestParserh">trunk/Source/WebCore/loader/appcache/ManifestParser.h</a></li>
<li><a href="#trunkSourceWebCoreloaderarchiveArchivecpp">trunk/Source/WebCore/loader/archive/Archive.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderarchiveArchiveh">trunk/Source/WebCore/loader/archive/Archive.h</a></li>
<li><a href="#trunkSourceWebCoreloaderarchiveArchiveFactorycpp">trunk/Source/WebCore/loader/archive/ArchiveFactory.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderarchiveArchiveResourceCollectioncpp">trunk/Source/WebCore/loader/archive/ArchiveResourceCollection.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderarchiveArchiveResourceCollectionh">trunk/Source/WebCore/loader/archive/ArchiveResourceCollection.h</a></li>
<li><a href="#trunkSourceWebCoreloaderarchivecfLegacyWebArchivecpp">trunk/Source/WebCore/loader/archive/cf/LegacyWebArchive.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderarchivecfLegacyWebArchiveh">trunk/Source/WebCore/loader/archive/cf/LegacyWebArchive.h</a></li>
<li><a href="#trunkSourceWebCoreloaderarchivemhtmlMHTMLArchivecpp">trunk/Source/WebCore/loader/archive/mhtml/MHTMLArchive.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderarchivemhtmlMHTMLArchiveh">trunk/Source/WebCore/loader/archive/mhtml/MHTMLArchive.h</a></li>
<li><a href="#trunkSourceWebCoreloaderarchivemhtmlMHTMLParsercpp">trunk/Source/WebCore/loader/archive/mhtml/MHTMLParser.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedCSSStyleSheetcpp">trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedCSSStyleSheeth">trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.h</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourceRequestcpp">trunk/Source/WebCore/loader/cache/CachedResourceRequest.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourceRequesth">trunk/Source/WebCore/loader/cache/CachedResourceRequest.h</a></li>
<li><a href="#trunkSourceWebCoreloadercocoaDiskCacheMonitorCocoah">trunk/Source/WebCore/loader/cocoa/DiskCacheMonitorCocoa.h</a></li>
<li><a href="#trunkSourceWebCoreloadercocoaDiskCacheMonitorCocoamm">trunk/Source/WebCore/loader/cocoa/DiskCacheMonitorCocoa.mm</a></li>
<li><a href="#trunkSourceWebCoreloadericonIconDatabasecpp">trunk/Source/WebCore/loader/icon/IconDatabase.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadericonIconDatabaseh">trunk/Source/WebCore/loader/icon/IconDatabase.h</a></li>
<li><a href="#trunkSourceWebCoreloadericonIconDatabaseBaseh">trunk/Source/WebCore/loader/icon/IconDatabaseBase.h</a></li>
<li><a href="#trunkSourceWebCoreloadericonPageURLRecordcpp">trunk/Source/WebCore/loader/icon/PageURLRecord.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadericonPageURLRecordh">trunk/Source/WebCore/loader/icon/PageURLRecord.h</a></li>
<li><a href="#trunkSourceWebCorepageChromecpp">trunk/Source/WebCore/page/Chrome.cpp</a></li>
<li><a href="#trunkSourceWebCorepageChromeh">trunk/Source/WebCore/page/Chrome.h</a></li>
<li><a href="#trunkSourceWebCorepageChromeClienth">trunk/Source/WebCore/page/ChromeClient.h</a></li>
<li><a href="#trunkSourceWebCorepageDOMWindowcpp">trunk/Source/WebCore/page/DOMWindow.cpp</a></li>
<li><a href="#trunkSourceWebCorepageEditorClienth">trunk/Source/WebCore/page/EditorClient.h</a></li>
<li><a href="#trunkSourceWebCorepageHistorycpp">trunk/Source/WebCore/page/History.cpp</a></li>
<li><a href="#trunkSourceWebCorepageLocationcpp">trunk/Source/WebCore/page/Location.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformURLcpp">trunk/Source/WebCore/platform/URL.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformURLh">trunk/Source/WebCore/platform/URL.h</a></li>
<li><a href="#trunkSourceWebCorereplayReplayInputDispatchMethodscpp">trunk/Source/WebCore/replay/ReplayInputDispatchMethods.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGFEImageElementcpp">trunk/Source/WebCore/svg/SVGFEImageElement.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGFontFaceUriElementcpp">trunk/Source/WebCore/svg/SVGFontFaceUriElement.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGUseElementcpp">trunk/Source/WebCore/svg/SVGUseElement.cpp</a></li>
<li><a href="#trunkSourceWebKitiosChangeLog">trunk/Source/WebKit/ios/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitiosWebCoreSupportWebChromeClientIOSh">trunk/Source/WebKit/ios/WebCoreSupport/WebChromeClientIOS.h</a></li>
<li><a href="#trunkSourceWebKitiosWebCoreSupportWebChromeClientIOSmm">trunk/Source/WebKit/ios/WebCoreSupport/WebChromeClientIOS.mm</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebChromeClienth">trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebChromeClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebEditorClienth">trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.h</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebEditorClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClienth">trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebFrameNetworkingContexth">trunk/Source/WebKit/mac/WebCoreSupport/WebFrameNetworkingContext.h</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebFrameNetworkingContextmm">trunk/Source/WebKit/mac/WebCoreSupport/WebFrameNetworkingContext.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebOpenPanelResultListenerh">trunk/Source/WebKit/mac/WebCoreSupport/WebOpenPanelResultListener.h</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebOpenPanelResultListenermm">trunk/Source/WebKit/mac/WebCoreSupport/WebOpenPanelResultListener.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebArchivemm">trunk/Source/WebKit/mac/WebView/WebArchive.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebDataSourcemm">trunk/Source/WebKit/mac/WebView/WebDataSource.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebResourcemm">trunk/Source/WebKit/mac/WebView/WebResource.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebResourceInternalh">trunk/Source/WebKit/mac/WebView/WebResourceInternal.h</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinPluginsPluginViewcpp">trunk/Source/WebKit/win/Plugins/PluginView.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebChromeClientcpp">trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebChromeClienth">trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.h</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebEditorClientcpp">trunk/Source/WebKit/win/WebCoreSupport/WebEditorClient.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebEditorClienth">trunk/Source/WebKit/win/WebCoreSupport/WebEditorClient.h</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebFrameLoaderClientcpp">trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebFrameLoaderClienth">trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebFrameNetworkingContexth">trunk/Source/WebKit/win/WebCoreSupport/WebFrameNetworkingContext.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIWebArchiveh">trunk/Source/WebKit2/Shared/APIWebArchive.h</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIWebArchivemm">trunk/Source/WebKit2/Shared/APIWebArchive.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedTextCheckerStateh">trunk/Source/WebKit2/Shared/TextCheckerState.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebIconDatabasecpp">trunk/Source/WebKit2/UIProcess/WebIconDatabase.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessIconDatabaseWebIconDatabaseProxycpp">trunk/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessIconDatabaseWebIconDatabaseProxyh">trunk/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleInjectedBundleNavigationActioncpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleNavigationAction.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkWebLoaderStrategycpp">trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkWebResourceLoadercpp">trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginViewcpp">trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginViewh">trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClienth">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebEditorClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebEditorClienth">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClienth">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportiosWebChromeClientIOSmm">trunk/Source/WebKit2/WebProcess/WebCoreSupport/ios/WebChromeClientIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageeflWebPageEflcpp">trunk/Source/WebKit2/WebProcess/WebPage/efl/WebPageEfl.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagegtkWebPageGtkcpp">trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebPageGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm">trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacWebPageMacmm">trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcesscpp">trunk/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcessh">trunk/Source/WebKit2/WebProcess/WebProcess.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreloadercocoaDiskCacheMonitorh">trunk/Source/WebCore/loader/cocoa/DiskCacheMonitor.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/ChangeLog 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -1,3 +1,407 @@
</span><ins>+2017-01-15 Darin Adler <darin@apple.com>
+
+ Remove PassRefPtr from "loader" directory of WebCore
+ https://bugs.webkit.org/show_bug.cgi?id=167055
+
+ Reviewed by Alex Christensen.
+
+ * dom/Document.cpp:
+ (WebCore::Document::processHttpEquiv): Pass a reference.
+ * editing/CompositeEditCommand.cpp:
+ (WebCore::EditCommandComposition::unapply): Ditto.
+ (WebCore::EditCommandComposition::reapply): Ditto.
+ (WebCore::CompositeEditCommand::ensureComposition): Return a reference.
+ (WebCore::CompositeEditCommand::applyCommandToComposite): Use a reference.
+ * editing/CompositeEditCommand.h: Updated for above changes.
+
+ * editing/Editor.cpp:
+ (WebCore::Editor::unappliedEditing): Take a reference instead of a PassRefPtr.
+ (WebCore::Editor::reappliedEditing): Ditto.
+ * editing/Editor.h: Updated for above changes. Also changed the
+ FragmentAndResources resources vector to hold Ref instead of RefPtr.
+
+ * editing/cocoa/EditorCocoa.mm:
+ (WebCore::Editor::createFragmentAndAddResources): Updated for change to
+ FragmentAndResources.
+
+ * editing/ios/EditorIOS.mm:
+ (WebCore::Editor::WebContentReader::readWebArchive): Pass a reference.
+
+ * editing/mac/EditorMac.mm:
+ (WebCore::Editor::WebContentReader::readWebArchive): Pass a reference.
+
+ * history/PageCache.cpp:
+ (WebCore::canCacheFrame): Use a reference.
+
+ * html/FileInputType.cpp:
+ (WebCore::FileInputType::handleDOMActivateEvent): Pass references.
+
+ * html/HTMLFormControlElement.cpp:
+ (WebCore::HTMLFormControlElement::formMethod): Use auto.
+
+ * html/HTMLFormElement.cpp:
+ (WebCore::HTMLFormElement::prepareForSubmission): Updated to use a return
+ values for textFieldValues intsead of an out argument with getTextFieldValues.
+ (WebCore::HTMLFormElement::textFieldValues): Renamed from getTextFieldValues
+ and changed to use a return value instead of an out argument.
+ (WebCore::HTMLFormElement::submit): Pass a reference.
+ (WebCore::HTMLFormElement::requestAutocomplete): Pass a Ref&&.
+ * html/HTMLFormElement.h: Updated for above changes.
+
+ * html/HTMLHtmlElement.cpp:
+ (WebCore::HTMLHtmlElement::insertedByParser): Use a reference.
+
+ * html/HTMLLinkElement.cpp:
+ (WebCore::HTMLLinkElement::process): Pass a reference.
+ (WebCore::HTMLLinkElement::setCSSStyleSheet): Use auto.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::loadResource): Use a reference.
+
+ * inspector/InspectorApplicationCacheAgent.cpp:
+ (WebCore::InspectorApplicationCacheAgent::updateApplicationCacheStatus): Use a reference,
+ also update for struct-style member names withou m_ prefix.
+ (WebCore::InspectorApplicationCacheAgent::getFramesWithManifests): Ditto.
+ (WebCore::InspectorApplicationCacheAgent::getManifestForFrame): Ditto.
+ (WebCore::InspectorApplicationCacheAgent::getApplicationCacheForFrame): Ditto.
+ (WebCore::InspectorApplicationCacheAgent::buildObjectForApplicationCache): Ditto.
+ (WebCore::InspectorApplicationCacheAgent::buildArrayForApplicationCacheResources): Ditto.
+ (WebCore::InspectorApplicationCacheAgent::buildObjectForApplicationCacheResource): Ditto.
+ * inspector/InspectorApplicationCacheAgent.h: Updated for above changes.
+
+ * inspector/InspectorInstrumentation.cpp:
+ (WebCore::InspectorInstrumentation::updateApplicationCacheStatusImpl): Take a reference.
+ * inspector/InspectorInstrumentation.h: Updated for the above.
+
+ * loader/DocumentLoader.cpp:
+ (WebCore::DocumentLoader::DocumentLoader): Move much initialization to class definition.
+ (WebCore::DocumentLoader::originalRequest): Moved to header to make it inline.
+ (WebCore::DocumentLoader::originalRequestCopy): Ditto.
+ (WebCore::DocumentLoader::request): Ditto.
+ (WebCore::DocumentLoader::url): Ditto.
+ (WebCore::DocumentLoader::stopLoading): Pass a reference.
+ (WebCore::DocumentLoader::willSendRequest): Updated to take a raw pointer instead of a
+ PassRefPtr.
+ (WebCore::DocumentLoader::commitData): Call shouldUseMainResourceEncoding instead of
+ special casing WebArchive.
+ (WebCore::DocumentLoader::maybeCreateArchive): Pass references.
+ (WebCore::DocumentLoader::setArchive): Take Ref&& instead of PassRefPtr.
+ (WebCore::DocumentLoader::addAllArchiveResources): Take a reference instead
+ of a pointer.
+ (WebCore::DocumentLoader::popArchiveForSubframe): Return RefPtr instead of
+ PassRefPtr.
+ (WebCore::DocumentLoader::subresource): Ditto.
+ (WebCore::DocumentLoader::subresources): Return a Vector<Ref> instead of a
+ Vector<RefPtr>.
+ (WebCore::DocumentLoader::substituteResourceDeliveryTimerFired): Use move
+ instead of swap.
+ (WebCore::DocumentLoader::scheduleArchiveLoad): Use shouldLoadFromArchiveOnly
+ instead of a special case for each type of archive.
+ (WebCore::DocumentLoader::originalURL): Moved to header to make it inline.
+ (WebCore::DocumentLoader::responseURL): Ditto.
+ (WebCore::DocumentLoader::documentURL): Call shouldUseMainResourceURL instead of
+ special casing WebArchive.
+ (WebCore::DocumentLoader::responseMIMEType): Moved to header to make it inline.
+ (WebCore::DocumentLoader::currentContentType): Ditto.
+ (WebCore::DocumentLoader::contentFilter): Ditto.
+ (WebCore::DocumentLoader::getIconLoadDecisionForIconURL): Pass a reference.
+ (WebCore::DocumentLoader::getIconDataForIconURL): Ditto.
+ (WebCore::DocumentLoader::dispatchOnloadEvents): Use a reference.
+ (WebCore::DocumentLoader::unreachableURL): Moved to header to make it inline.
+ * loader/DocumentLoader.h: Updated for the above.
+
+ * loader/EmptyClients.cpp: Updated for changes to client interfaces.
+ * loader/EmptyClients.h: Ditto.
+
+ * loader/FormState.cpp:
+ (WebCore::FormState::FormState): Take references instead of PassRefPtr, also
+ take Vector&& instead of Vector& when we want to take ownership and use move
+ instead of swap to do that.
+ (WebCore::FormState::create): Ditto.
+ * loader/FormState.h: Updated for the above. Also changed return values to be
+ references instead of pointers and members to be Ref instead of RefPtr.
+
+ * loader/FormSubmission.cpp:
+ (WebCore::FormSubmission::Attributes::parseMethodType): Updated for change
+ to the Method enumeration.
+ (WebCore::FormSubmission::Attributes::copyFrom): Deleted.
+ (WebCore::FormSubmission::FormSubmission): Use Ref&& instead of PassRefPtr.
+ (WebCore::FormSubmission::create): Use reference instead of pointer and
+ raw pointer instead of PassRefPtr. Also copy attributes using copy constructor
+ instead of an explicit copyFrom function.
+ (WebCore::FormSubmission::requestURL): Updated for change to the Method
+ enumeration.
+ (WebCore::FormSubmission::populateFrameLoadRequest): Ditto.
+ * loader/FormSubmission.h: Updated for the above changes. Made the Attributes
+ class copyable, since we copy it. Changed some functions to return references
+ instead of pointers and use Ref instead of RefPtr for data members.
+
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::submitForm): Updated for changes to FormSubmission
+ and FormState.
+ (WebCore::FrameLoader::receivedFirstData): Ditto.
+ (WebCore::FrameLoader::loadFrameRequest): Ditto.
+ (WebCore::FrameLoader::loadResourceSynchronously): Ditto.
+ (WebCore::FrameLoader::continueLoadAfterNavigationPolicy): Ditto.
+
+ * loader/FrameLoaderClient.h: Use references, pointers, RefPtr, and Ref
+ instead of PassRefPtr. Removed unused empty dispatchDidFailToStartPlugin.
+
+ * loader/HistoryController.cpp:
+ (WebCore::HistoryController::pushState): Take RefPtr&& instead of PassRefPtr.
+ (WebCore::HistoryController::replaceState): Ditto.
+ * loader/HistoryController.h: Updated for the above.
+
+ * loader/ImageLoader.cpp:
+ (WebCore::ImageLoader::updateFromElement): Pass a reference.
+
+ * loader/NavigationScheduler.cpp: Use refernces and Ref&& instead of
+ pointers and PassRefPtr.
+ (WebCore::ScheduledNavigation::ScheduledNavigation): Added an overload
+ that sests m_shouldOpenExternalURLsPolicy.
+ * loader/NavigationScheduler.h: Updated for the above.
+
+ * loader/ResourceLoader.cpp:
+ (WebCore::ResourceLoader::start): Use and pass references.
+ (WebCore::ResourceLoader::willSendRequest): Ditto.
+ (WebCore::ResourceLoader::didReceiveResponse): Ditto.
+ (WebCore::ResourceLoader::didFail): Ditto.
+
+ * loader/SubframeLoader.cpp:
+ (WebCore::SubframeLoader::createJavaAppletWidget): Return RefPtr instead
+ of PassRefPtr. Pass references instead of pointers.
+ (WebCore::SubframeLoader::loadOrRedirectSubframe): Ditto.
+ (WebCore::SubframeLoader::loadSubframe): Ditto.
+ (WebCore::SubframeLoader::document): Deleted. This was never really the
+ correct idiom for getting the appropriate document; hiding the dependency
+ on m_frame wasn't paing off.
+ (WebCore::SubframeLoader::loadPlugin): Pass reference instead of pointer.
+ (WebCore::SubframeLoader::shouldConvertInvalidURLsToBlank): Eliminated
+ unneeded null checking and complexity due to going through the document
+ instead of the frame for this check.
+ * loader/SubframeLoader.h: Updated for the above.
+
+ * loader/appcache/ApplicationCache.cpp:
+ (WebCore::ApplicationCache::ApplicationCache): Moved data member
+ initialization to the class definition.
+ (WebCore::ApplicationCache::~ApplicationCache): Pass a reference instead
+ of a pointer.
+ (WebCore::ApplicationCache::isComplete): Ditto.
+ (WebCore::ApplicationCache::setManifestResource): Take Ref&& instead of
+ PassRefPtr.
+ (WebCore::ApplicationCache::addResource): Ditto.
+ (WebCore::ApplicationCache::removeResource): Deleted. Was unused.
+ * loader/appcache/ApplicationCache.h: Updated for above changes.
+
+ * loader/appcache/ApplicationCacheGroup.cpp:
+ (WebCore::ApplicationCacheGroup::ApplicationCacheGroup): Moved most
+ member initialization to the class definition.
+ (WebCore::ApplicationCacheGroup::~ApplicationCacheGroup): Pass a reference.
+ (WebCore::ApplicationCacheGroup::cacheForMainRequest): Removed
+ unnecessary preflight for removeFragmentIdentifier, which efficiently
+ does nothing if there is no identifier. Use early return.
+ (WebCore::ApplicationCacheGroup::fallbackCacheForMainRequest): More of
+ the same.
+ (WebCore::ApplicationCacheGroup::selectCache): Ditto, also take a reference,
+ and use event names instead of a special enumeration to poast events.
+ (WebCore::ApplicationCacheGroup::selectCacheWithoutManifestURL): Ditto.
+ (WebCore::ApplicationCacheGroup::finishedLoadingMainResource): Ditto.
+ (WebCore::ApplicationCacheGroup::failedLoadingMainResource): Ditto.
+ (WebCore::ApplicationCacheGroup::disassociateDocumentLoader): Ditto.
+ (WebCore::ApplicationCacheGroup::cacheDestroyed): Ditto.
+ (WebCore::ApplicationCacheGroup::stopLoadingInFrame): Ditto.
+ (WebCore::ApplicationCacheGroup::setNewestCache): Use Ref&& instead of
+ PassRefPtr.
+ (WebCore::ApplicationCacheGroup::makeObsolete): More of the same.
+ (WebCore::ApplicationCacheGroup::update): Ditto.
+ (WebCore::ApplicationCacheGroup::abort): Ditto.
+ (WebCore::ApplicationCacheGroup::didReceiveResponse): Ditto.
+ (WebCore::ApplicationCacheGroup::didFinishLoading): Ditto.
+ (WebCore::ApplicationCacheGroup::didFail): Ditto.
+ (WebCore::ApplicationCacheGroup::didFinishLoadingManifest): Ditto.
+ (WebCore::ApplicationCacheGroup::manifestNotFound): Ditto.
+ (WebCore::ApplicationCacheGroup::checkIfLoadIsComplete): Ditto.
+ (WebCore::ApplicationCacheGroup::startLoadingEntry): Ditto.
+ (WebCore::ApplicationCacheGroup::deliverDelayedMainResources): Use a modern
+ for loop.
+ (WebCore::ApplicationCacheGroup::addEntry): Use auto and simplify logic
+ for adding.
+ (WebCore::ApplicationCacheGroup::associateDocumentLoaderWithCache): Update since
+ function result is a reference.
+ (WebCore::ApplicationCacheGroup::scheduleReachedMaxAppCacheSizeCallback):
+ Use auto.
+ (WebCore::ApplicationCacheGroup::postListenerTask): Take event type instead of
+ taking a special enumeration.
+ * loader/appcache/ApplicationCacheGroup.h: Updated for the above.
+
+ * loader/appcache/ApplicationCacheHost.cpp:
+ (WebCore::ApplicationCacheHost::ApplicationCacheHost): Move most member
+ initialization to the class definition.
+ (WebCore::ApplicationCacheHost::~ApplicationCacheHost): Use reference.
+ (WebCore::ApplicationCacheHost::selectCacheWithoutManifest): Ditto.
+ (WebCore::ApplicationCacheHost::selectCacheWithManifest): Ditto.
+ (WebCore::ApplicationCacheHost::mainResourceDataReceived): Ditto.
+ (WebCore::ApplicationCacheHost::failedLoadingMainResource): Ditto.
+ (WebCore::ApplicationCacheHost::finishedLoadingMainResource): Ditto.
+ (WebCore::ApplicationCacheHost::maybeLoadFallbackForRedirect): Ditto.
+ (WebCore::ApplicationCacheHost::maybeLoadFallbackForResponse): Ditto.
+ (WebCore::ApplicationCacheHost::createFileURL): Ditto.
+ (WebCore::ApplicationCacheHost::maybeLoadSynchronously): Ditto.
+ (WebCore::ApplicationCacheHost::notifyDOMApplicationCache): Take event
+ type instead of special enumeration.
+ (WebCore::ApplicationCacheHost::stopLoadingInFrame): Use reference.
+ (WebCore::ApplicationCacheHost::stopDeferringEvents): Updated to use
+ event types instead of special enumeration and also repaired possible
+ edge case where code in event handler somehow triggers additional events.
+ (WebCore::ApplicationCacheHost::resourceList): Renamed from fillResourceList
+ and changed to return a vector instead of populating one.
+ (WebCore::ApplicationCacheHost::applicationCacheInfo): Tweak coding style a bit.
+ (WebCore::createApplicationCacheEvent): Factored this helper out of
+ dispatchDOMEvent so we can use Ref instead of RefPtr.
+ (WebCore::ApplicationCacheHost::dispatchDOMEvent): Updated to recent event type
+ rather than receiving an event id and mapping it to a type.
+ (WebCore::ApplicationCacheHost::setApplicationCache): Take RefPtr&& instead of
+ PassRefPtr.
+ (WebCore::ApplicationCacheHost::update): Pass a reference.
+ (WebCore::ApplicationCacheHost::swapCache): Ditto.
+ (WebCore::ApplicationCacheHost::abort): Ditto.
+ * loader/appcache/ApplicationCacheHost.h: Updated for the above.
+
+ * loader/appcache/ApplicationCacheStorage.cpp:
+ (WebCore::ApplicationCacheStorage::loadCacheGroup): Pass a Ref instead of RefPtr.
+ (WebCore::ApplicationCacheStorage::cacheGroupForURL): Ditto.
+ (WebCore::ApplicationCacheStorage::fallbackCacheGroupForURL): Ditto.
+ (WebCore::ApplicationCacheStorage::cacheGroupDestroyed): Take a reference.
+ (WebCore::ApplicationCacheStorage::cacheGroupMadeObsolete): Ditto.
+ (WebCore::ApplicationCacheStorage::storeNewestCache): Ditto.
+ (WebCore::ApplicationCacheStorage::loadCache): Return RefPtr instead of PassRefPtr.
+ (WebCore::ApplicationCacheStorage::deleteCacheGroup): Pass a reference.
+ * loader/appcache/ApplicationCacheStorage.h: Updated for the above.
+
+ * loader/appcache/DOMApplicationCache.cpp:
+ (WebCore::DOMApplicationCache::DOMApplicationCache): Take a reference.
+ (WebCore::DOMApplicationCache::toEventType): Deleted.
+ * loader/appcache/DOMApplicationCache.h: Updated for the above. Made most
+ members private.
+
+ * loader/archive/Archive.cpp:
+ (WebCore::Archive::clearAllSubframeArchives): Use a set for the logic that
+ prevents us from walking the same archive more than once, rather than using
+ a vector. Left it recursive, though.
+ * loader/archive/Archive.h: Git rid of the type function, replacing it with
+ three functions for the four different policies we currently have about the
+ different archive types. Changed functions to take Ref&& instead of PassRefPtr
+ and return const Vector<Ref>& instead of const Vector<RefPtr>&, changing the
+ data members to match.
+
+ * loader/archive/ArchiveFactory.cpp:
+ (WebCore::createArchiveMIMETypesMap): Factored this out of the archiveMIMETypes
+ function so we don't need a boolean. Also use ASCIILiteral.
+ (WebCore::archiveMIMETypes): Updated to se the above.
+
+ * loader/archive/ArchiveResourceCollection.cpp:
+ (WebCore::ArchiveResourceCollection::addAllResources): Take a reference.
+ (WebCore::ArchiveResourceCollection::popSubframeArchive): Return RefPtr instead
+ of PassRefPtr.
+ * loader/archive/ArchiveResourceCollection.h: Updated for the above.
+
+ * loader/archive/cf/LegacyWebArchive.cpp:
+ (WebCore::LegacyWebArchive::createPropertyListRepresentation): Use auto and
+ fewer local variables, more references for argument types and return values.
+ (WebCore::LegacyWebArchive::createResourceResponseFromPropertyListData): Ditto.
+ (WebCore::LegacyWebArchive::createResource): Ditto.
+ (WebCore::LegacyWebArchive::create): Ditto.
+ (WebCore::LegacyWebArchive::extract): Ditto.
+ (WebCore::LegacyWebArchive::type): Deleted.
+ (WebCore::LegacyWebArchive::rawDataRepresentation): More of the same.
+ (WebCore::LegacyWebArchive::createFromSelection): Ditto.
+ * loader/archive/cf/LegacyWebArchive.h: Updated for the above. Also marked the
+ class final and added overrides for the four new policy member functions.
+
+ * loader/archive/mhtml/MHTMLArchive.cpp:
+ (WebCore::MHTMLArchive::create): Pass references.
+ (WebCore::MHTMLArchive::generateMHTMLData): Return RefPtr instead of
+ PassRefPtr.
+ * loader/archive/mhtml/MHTMLArchive.h: Updated for the above. Also marked the
+ class final and added overrides for the four new policy member functions.
+
+ * loader/archive/mhtml/MHTMLParser.cpp:
+ (WebCore::MHTMLParser::parseArchiveWithHeader): Pass Ref instead of RefPtr
+ to setMainResource and addSubframeArchive.
+ (WebCore::MHTMLParser::addResourceToArchive): Ditto.
+
+ * loader/cache/CachedCSSStyleSheet.cpp:
+ (WebCore::CachedCSSStyleSheet::restoreParsedStyleSheet): Return RefPtr instead
+ of PassRefPtr.
+ * loader/cache/CachedCSSStyleSheet.h: Updated for the above.
+
+ * loader/cache/CachedResourceRequest.cpp:
+ (WebCore::CachedResourceRequest::setInitiator): Take a reference instead of a
+ PassRefPtr.
+ * loader/cache/CachedResourceRequest.h: Updated for the above.
+
+ * loader/cocoa/DiskCacheMonitor.h: Removed. This is a duplicate, unused copy
+ of DiskCacheMonitorCocoa.h.
+
+ * loader/cocoa/DiskCacheMonitorCocoa.h: Removed unneeded exporting and virtual
+ member functions, made more things private, and changed return type to RefPtr
+ instead of PassRefPtr.
+ * loader/cocoa/DiskCacheMonitorCocoa.mm:
+ (WebCore::DiskCacheMonitor::tryGetFileBackedSharedBufferFromCFURLCachedResponse):
+ Changed return type to RefPtr instead of PassRefPtr.
+
+ * loader/icon/IconDatabase.cpp:
+ (WebCore::IconDatabase::setIconDataForIconURL): Take raw pointer instead of
+ PassRefPtr.
+ (WebCore::IconDatabase::getOrCreateIconRecord): Return Ref instead of PassRefPtr.
+ (WebCore::IconDatabase::getImageDataForIconURLFromSQLDatabase): Return RefPtr
+ instead of PassRefPtr.
+ * loader/icon/IconDatabase.h: Updated for the above. Also marked functions final
+ instead of override.
+ * loader/icon/IconDatabaseBase.h: Ditto.
+
+ * loader/icon/PageURLRecord.cpp:
+ (WebCore::PageURLRecord::PageURLRecord): Moved initialization to the header.
+ (WebCore::PageURLRecord::~PageURLRecord): Wrote code here instead of calling
+ setIconRecord(nullptr).
+ (WebCore::PageURLRecord::setIconRecord): Take RefPtr&& instead of PassRefPtr.
+ * loader/icon/PageURLRecord.h: Updatd for the above.
+
+ * page/Chrome.cpp:
+ (WebCore::Chrome::runOpenPanel): Updated to take two references.
+ * page/Chrome.h: Ditto.
+ * page/ChromeClient.h: ditto.
+
+ * page/DOMWindow.cpp:
+ (WebCore::DOMWindow::applicationCache): Pass a reference.
+ (WebCore::DOMWindow::setLocation): Ditto.
+ (WebCore::DOMWindow::createWindow): Ditto.
+ (WebCore::DOMWindow::open): Ditto.
+
+ * page/EditorClient.h: Changed arguments to references instead of PassRefPtr.
+
+ * page/History.cpp:
+ (WebCore::History::stateObjectAdded): Pass an rvalue reference.
+
+ * page/Location.cpp:
+ (WebCore::Location::reload): Pass reference instead of pointer.
+ (WebCore::Location::setLocation): Ditto.
+
+ * platform/URL.cpp:
+ (WebCore::URL::setFragmentIdentifier): Take a StringView rather than
+ a String, which is more flexible for callers. Also eliminated an unneeded
+ string allocation when the old string had a fragment that is being replaced.
+ * platform/URL.h: Updated for the above.
+
+ * replay/ReplayInputDispatchMethods.cpp:
+ (WebCore::InitialNavigation::dispatch): Pass reference.
+ * svg/SVGFEImageElement.cpp:
+ (WebCore::SVGFEImageElement::requestImageResource): Ditto.
+ * svg/SVGFontFaceUriElement.cpp:
+ (WebCore::SVGFontFaceUriElement::loadFont): Ditto.
+ * svg/SVGUseElement.cpp:
+ (WebCore::SVGUseElement::updateExternalDocument): Ditto.
+
</ins><span class="cx"> 2017-01-16 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Make opaque root scanning truly constraint-based
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/dom/Document.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -3136,7 +3136,7 @@
</span><span class="cx"> else
</span><span class="cx"> completedURL = completeURL(urlString);
</span><span class="cx"> if (!protocolIsJavaScript(completedURL))
</span><del>- frame->navigationScheduler().scheduleRedirect(this, delay, completedURL);
</del><ins>+ frame->navigationScheduler().scheduleRedirect(*this, delay, completedURL);
</ins><span class="cx"> else {
</span><span class="cx"> String message = "Refused to refresh " + m_url.stringCenterEllipsizedToLength() + " to a javascript: URL";
</span><span class="cx"> addConsoleMessage(MessageSource::Security, MessageLevel::Error, message);
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingCompositeEditCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/CompositeEditCommand.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/CompositeEditCommand.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/editing/CompositeEditCommand.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -239,7 +239,7 @@
</span><span class="cx"> for (size_t i = size; i; --i)
</span><span class="cx"> m_commands[i - 1]->doUnapply();
</span><span class="cx">
</span><del>- frame->editor().unappliedEditing(this);
</del><ins>+ frame->editor().unappliedEditing(*this);
</ins><span class="cx">
</span><span class="cx"> if (AXObjectCache::accessibilityEnabled())
</span><span class="cx"> m_replacedText.postTextStateChangeNotificationForUnapply(m_document->existingAXObjectCache());
</span><span class="lines">@@ -265,7 +265,7 @@
</span><span class="cx"> for (auto& command : m_commands)
</span><span class="cx"> command->doReapply();
</span><span class="cx">
</span><del>- frame->editor().reappliedEditing(this);
</del><ins>+ frame->editor().reappliedEditing(*this);
</ins><span class="cx">
</span><span class="cx"> if (AXObjectCache::accessibilityEnabled())
</span><span class="cx"> m_replacedText.postTextStateChangeNotificationForReapply(m_document->existingAXObjectCache());
</span><span class="lines">@@ -416,14 +416,14 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-EditCommandComposition* CompositeEditCommand::ensureComposition()
</del><ins>+EditCommandComposition& CompositeEditCommand::ensureComposition()
</ins><span class="cx"> {
</span><del>- CompositeEditCommand* command = this;
- while (command && command->parent())
- command = command->parent();
</del><ins>+ auto* command = this;
+ while (auto* parent = command->parent())
+ command = parent;
</ins><span class="cx"> if (!command->m_composition)
</span><span class="cx"> command->m_composition = EditCommandComposition::create(document(), startingSelection(), endingSelection(), editingAction());
</span><del>- return command->m_composition.get();
</del><ins>+ return *command->m_composition;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool CompositeEditCommand::isCreateLinkCommand() const
</span><span class="lines">@@ -465,7 +465,7 @@
</span><span class="cx"> command->doApply();
</span><span class="cx"> if (command->isSimpleEditCommand()) {
</span><span class="cx"> command->setParent(nullptr);
</span><del>- ensureComposition()->append(toSimpleEditCommand(command.get()));
</del><ins>+ ensureComposition().append(toSimpleEditCommand(command.get()));
</ins><span class="cx"> }
</span><span class="cx"> m_commands.append(WTFMove(command));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingCompositeEditCommandh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/CompositeEditCommand.h (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/CompositeEditCommand.h 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/editing/CompositeEditCommand.h 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx"> void apply();
</span><span class="cx"> bool isFirstCommand(EditCommand* command) { return !m_commands.isEmpty() && m_commands.first() == command; }
</span><span class="cx"> EditCommandComposition* composition() const;
</span><del>- EditCommandComposition* ensureComposition();
</del><ins>+ EditCommandComposition& ensureComposition();
</ins><span class="cx">
</span><span class="cx"> virtual bool isCreateLinkCommand() const;
</span><span class="cx"> virtual bool isTypingCommand() const;
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/Editor.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/Editor.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/editing/Editor.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -996,23 +996,23 @@
</span><span class="cx"> return dispatchBeforeInputEvents(composition.startingRootEditableElement(), composition.endingRootEditableElement(), "historyUndo");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Editor::unappliedEditing(PassRefPtr<EditCommandComposition> cmd)
</del><ins>+void Editor::unappliedEditing(EditCommandComposition& composition)
</ins><span class="cx"> {
</span><span class="cx"> document().updateLayout();
</span><span class="cx">
</span><del>- notifyTextFromControls(cmd->startingRootEditableElement(), cmd->endingRootEditableElement());
</del><ins>+ notifyTextFromControls(composition.startingRootEditableElement(), composition.endingRootEditableElement());
</ins><span class="cx">
</span><del>- VisibleSelection newSelection(cmd->startingSelection());
</del><ins>+ VisibleSelection newSelection(composition.startingSelection());
</ins><span class="cx"> changeSelectionAfterCommand(newSelection, FrameSelection::defaultSetSelectionOptions());
</span><del>- dispatchInputEvents(cmd->startingRootEditableElement(), cmd->endingRootEditableElement(), "historyUndo");
</del><ins>+ dispatchInputEvents(composition.startingRootEditableElement(), composition.endingRootEditableElement(), "historyUndo");
</ins><span class="cx">
</span><span class="cx"> updateEditorUINowIfScheduled();
</span><span class="cx">
</span><del>- m_alternativeTextController->respondToUnappliedEditing(cmd.get());
</del><ins>+ m_alternativeTextController->respondToUnappliedEditing(&composition);
</ins><span class="cx">
</span><span class="cx"> m_lastEditCommand = nullptr;
</span><del>- if (client())
- client()->registerRedoStep(cmd);
</del><ins>+ if (auto* client = this->client())
+ client->registerRedoStep(composition);
</ins><span class="cx"> respondToChangedContents(newSelection);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1021,21 +1021,21 @@
</span><span class="cx"> return dispatchBeforeInputEvents(composition.startingRootEditableElement(), composition.endingRootEditableElement(), "historyRedo");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Editor::reappliedEditing(PassRefPtr<EditCommandComposition> cmd)
</del><ins>+void Editor::reappliedEditing(EditCommandComposition& composition)
</ins><span class="cx"> {
</span><span class="cx"> document().updateLayout();
</span><span class="cx">
</span><del>- notifyTextFromControls(cmd->startingRootEditableElement(), cmd->endingRootEditableElement());
</del><ins>+ notifyTextFromControls(composition.startingRootEditableElement(), composition.endingRootEditableElement());
</ins><span class="cx">
</span><del>- VisibleSelection newSelection(cmd->endingSelection());
</del><ins>+ VisibleSelection newSelection(composition.endingSelection());
</ins><span class="cx"> changeSelectionAfterCommand(newSelection, FrameSelection::defaultSetSelectionOptions());
</span><del>- dispatchInputEvents(cmd->startingRootEditableElement(), cmd->endingRootEditableElement(), "historyRedo");
</del><ins>+ dispatchInputEvents(composition.startingRootEditableElement(), composition.endingRootEditableElement(), "historyRedo");
</ins><span class="cx">
</span><span class="cx"> updateEditorUINowIfScheduled();
</span><span class="cx">
</span><span class="cx"> m_lastEditCommand = nullptr;
</span><del>- if (client())
- client()->registerUndoStep(cmd);
</del><ins>+ if (auto* client = this->client())
+ client->registerUndoStep(composition);
</ins><span class="cx"> respondToChangedContents(newSelection);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/Editor.h (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/Editor.h 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/editing/Editor.h 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -99,10 +99,12 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><ins>+
</ins><span class="cx"> struct FragmentAndResources {
</span><span class="cx"> RefPtr<DocumentFragment> fragment;
</span><del>- Vector<RefPtr<ArchiveResource>> resources;
</del><ins>+ Vector<Ref<ArchiveResource>> resources;
</ins><span class="cx"> };
</span><ins>+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> class Editor {
</span><span class="lines">@@ -206,8 +208,8 @@
</span><span class="cx"> bool willReapplyEditing(const EditCommandComposition&) const;
</span><span class="cx">
</span><span class="cx"> void appliedEditing(PassRefPtr<CompositeEditCommand>);
</span><del>- void unappliedEditing(PassRefPtr<EditCommandComposition>);
- void reappliedEditing(PassRefPtr<EditCommandComposition>);
</del><ins>+ void unappliedEditing(EditCommandComposition&);
+ void reappliedEditing(EditCommandComposition&);
</ins><span class="cx"> void unappliedSpellCorrection(const VisibleSelection& selectionOfCorrected, const String& corrected, const String& correction);
</span><span class="cx">
</span><span class="cx"> // This is off by default, since most editors want this behavior (originally matched IE but not Firefox).
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingcocoaEditorCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/cocoa/EditorCocoa.mm (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/cocoa/EditorCocoa.mm 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/editing/cocoa/EditorCocoa.mm 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -285,11 +285,9 @@
</span><span class="cx">
</span><span class="cx"> auto fragmentAndResources = createFragment(string);
</span><span class="cx">
</span><del>- if (DocumentLoader* loader = m_frame.loader().documentLoader()) {
- for (auto& resource : fragmentAndResources.resources) {
- if (resource)
- loader->addArchiveResource(resource.releaseNonNull());
- }
</del><ins>+ if (auto* loader = m_frame.loader().documentLoader()) {
+ for (auto& resource : fragmentAndResources.resources)
+ loader->addArchiveResource(WTFMove(resource));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (wasImagesEnabled)
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingiosEditorIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/ios/EditorIOS.mm (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/ios/EditorIOS.mm 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/editing/ios/EditorIOS.mm 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -262,27 +262,25 @@
</span><span class="cx"> if (!buffer)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- RefPtr<LegacyWebArchive> archive = LegacyWebArchive::create(URL(), *buffer);
</del><ins>+ auto archive = LegacyWebArchive::create(URL(), *buffer);
</ins><span class="cx"> if (!archive)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- RefPtr<ArchiveResource> mainResource = archive->mainResource();
</del><ins>+ auto* mainResource = archive->mainResource();
</ins><span class="cx"> if (!mainResource)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- const String& type = mainResource->mimeType();
</del><ins>+ auto& type = mainResource->mimeType();
+ if (!frame.loader().client().canShowMIMETypeAsHTML(type))
+ return false;
</ins><span class="cx">
</span><del>- if (frame.loader().client().canShowMIMETypeAsHTML(type)) {
- // FIXME: The code in createFragmentAndAddResources calls setDefersLoading(true). Don't we need that here?
- if (DocumentLoader* loader = frame.loader().documentLoader())
- loader->addAllArchiveResources(archive.get());
</del><ins>+ // FIXME: The code in createFragmentAndAddResources calls setDefersLoading(true). Don't we need that here?
+ if (auto* loader = frame.loader().documentLoader())
+ loader->addAllArchiveResources(*archive);
</ins><span class="cx">
</span><del>- String markupString = String::fromUTF8(mainResource->data().data(), mainResource->data().size());
- addFragment(createFragmentFromMarkup(*frame.document(), markupString, mainResource->url(), DisallowScriptingAndPluginContent));
- return true;
- }
-
- return false;
</del><ins>+ auto markupString = String::fromUTF8(mainResource->data().data(), mainResource->data().size());
+ addFragment(createFragmentFromMarkup(*frame.document(), markupString, mainResource->url(), DisallowScriptingAndPluginContent));
+ return true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool Editor::WebContentReader::readFilenames(const Vector<String>&)
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingmacEditorMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/mac/EditorMac.mm (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/mac/EditorMac.mm 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/editing/mac/EditorMac.mm 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -328,7 +328,7 @@
</span><span class="cx"> if (!buffer)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- RefPtr<LegacyWebArchive> archive = LegacyWebArchive::create(URL(), *buffer);
</del><ins>+ auto archive = LegacyWebArchive::create(URL(), *buffer);
</ins><span class="cx"> if (!archive)
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -341,7 +341,7 @@
</span><span class="cx"> if (frame.loader().client().canShowMIMETypeAsHTML(type)) {
</span><span class="cx"> // FIXME: The code in createFragmentAndAddResources calls setDefersLoading(true). Don't we need that here?
</span><span class="cx"> if (DocumentLoader* loader = frame.loader().documentLoader())
</span><del>- loader->addAllArchiveResources(archive.get());
</del><ins>+ loader->addAllArchiveResources(*archive);
</ins><span class="cx">
</span><span class="cx"> String markupString = String::fromUTF8(mainResource->data().data(), mainResource->data().size());
</span><span class="cx"> fragment = createFragmentFromMarkup(*frame.document(), markupString, mainResource->url(), DisallowScriptingAndPluginContent);
</span></span></pre></div>
<a id="trunkSourceWebCorehistoryPageCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/history/PageCache.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/history/PageCache.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/history/PageCache.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -162,7 +162,7 @@
</span><span class="cx"> }
</span><span class="cx"> // FIXME: We should investigating caching frames that have an associated
</span><span class="cx"> // application cache. <rdar://problem/5917899> tracks that work.
</span><del>- if (!documentLoader->applicationCacheHost()->canCacheInPageCache()) {
</del><ins>+ if (!documentLoader->applicationCacheHost().canCacheInPageCache()) {
</ins><span class="cx"> PCLOG(" -The DocumentLoader uses an application cache");
</span><span class="cx"> logPageCacheFailureDiagnosticMessage(diagnosticLoggingClient, DiagnosticLoggingKeys::applicationCacheKey());
</span><span class="cx"> isCacheable = false;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlFileInputTypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/FileInputType.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/FileInputType.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/html/FileInputType.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -191,7 +191,7 @@
</span><span class="cx"> if (!ScriptController::processingUserGesture())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (Chrome* chrome = this->chrome()) {
</del><ins>+ if (auto* chrome = this->chrome()) {
</ins><span class="cx"> FileChooserSettings settings;
</span><span class="cx"> HTMLInputElement& input = element();
</span><span class="cx"> settings.allowsMultipleFiles = input.hasAttributeWithoutSynchronization(multipleAttr);
</span><span class="lines">@@ -201,9 +201,8 @@
</span><span class="cx"> #if ENABLE(MEDIA_CAPTURE)
</span><span class="cx"> settings.mediaCaptureType = input.mediaCaptureType();
</span><span class="cx"> #endif
</span><del>-
</del><span class="cx"> applyFileChooserSettings(settings);
</span><del>- chrome->runOpenPanel(input.document().frame(), m_fileChooser);
</del><ins>+ chrome->runOpenPanel(*input.document().frame(), *m_fileChooser);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> event.setDefaultHandled();
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFormControlElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFormControlElement.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFormControlElement.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/html/HTMLFormControlElement.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx">
</span><span class="cx"> String HTMLFormControlElement::formMethod() const
</span><span class="cx"> {
</span><del>- const AtomicString& formMethodAttr = attributeWithoutSynchronization(formmethodAttr);
</del><ins>+ auto& formMethodAttr = attributeWithoutSynchronization(formmethodAttr);
</ins><span class="cx"> if (formMethodAttr.isNull())
</span><span class="cx"> return emptyString();
</span><span class="cx"> return FormSubmission::Attributes::methodString(FormSubmission::Attributes::parseMethodType(formMethodAttr));
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFormElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFormElement.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFormElement.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/html/HTMLFormElement.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -289,12 +289,11 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- StringPairVector controlNamesAndValues;
- getTextFieldValues(controlNamesAndValues);
- auto formState = FormState::create(this, controlNamesAndValues, &document(), NotSubmittedByJavaScript);
</del><ins>+ auto formState = FormState::create(*this, textFieldValues(), document(), NotSubmittedByJavaScript);
</ins><span class="cx"> frame->loader().client().dispatchWillSendSubmitEvent(WTFMove(formState));
</span><span class="cx">
</span><span class="cx"> Ref<HTMLFormElement> protectedThis(*this);
</span><ins>+
</ins><span class="cx"> // Event handling can result in m_shouldSubmit becoming true, regardless of dispatchEvent() return value.
</span><span class="cx"> if (dispatchEvent(Event::create(eventNames().submitEvent, true, true)))
</span><span class="cx"> m_shouldSubmit = true;
</span><span class="lines">@@ -315,20 +314,20 @@
</span><span class="cx"> submit(0, false, ScriptController::processingUserGesture(), SubmittedByJavaScript);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLFormElement::getTextFieldValues(StringPairVector& fieldNamesAndValues) const
</del><ins>+StringPairVector HTMLFormElement::textFieldValues() const
</ins><span class="cx"> {
</span><del>- ASSERT_ARG(fieldNamesAndValues, fieldNamesAndValues.isEmpty());
-
- fieldNamesAndValues.reserveCapacity(m_associatedElements.size());
</del><ins>+ StringPairVector result;
+ result.reserveInitialCapacity(m_associatedElements.size());
</ins><span class="cx"> for (auto& associatedElement : m_associatedElements) {
</span><del>- HTMLElement& element = associatedElement->asHTMLElement();
</del><ins>+ auto& element = associatedElement->asHTMLElement();
</ins><span class="cx"> if (!is<HTMLInputElement>(element))
</span><span class="cx"> continue;
</span><del>- HTMLInputElement& input = downcast<HTMLInputElement>(element);
</del><ins>+ auto& input = downcast<HTMLInputElement>(element);
</ins><span class="cx"> if (!input.isTextField())
</span><span class="cx"> continue;
</span><del>- fieldNamesAndValues.append(std::make_pair(input.name().string(), input.value()));
</del><ins>+ result.uncheckedAppend({ input.name().string(), input.value() });
</ins><span class="cx"> }
</span><ins>+ return result;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLFormElement::submit(Event* event, bool activateSubmitButton, bool processingUserGesture, FormSubmissionTrigger formSubmissionTrigger)
</span><span class="lines">@@ -364,10 +363,11 @@
</span><span class="cx"> if (needButtonActivation && firstSuccessfulSubmitButton)
</span><span class="cx"> firstSuccessfulSubmitButton->setActivatedSubmit(true);
</span><span class="cx">
</span><del>- LockHistory lockHistory = processingUserGesture ? LockHistory::No : LockHistory::Yes;
- Ref<HTMLFormElement> protectedThis(*this); // Form submission can execute arbitary JavaScript.
- frame->loader().submitForm(FormSubmission::create(this, m_attributes, event, lockHistory, formSubmissionTrigger));
</del><ins>+ auto protectedThis = makeRef(*this); // Form submission can execute arbitary JavaScript.
</ins><span class="cx">
</span><ins>+ auto shouldLockHistory = processingUserGesture ? LockHistory::No : LockHistory::Yes;
+ frame->loader().submitForm(FormSubmission::create(*this, m_attributes, event, shouldLockHistory, formSubmissionTrigger));
+
</ins><span class="cx"> if (needButtonActivation && firstSuccessfulSubmitButton)
</span><span class="cx"> firstSuccessfulSubmitButton->setActivatedSubmit(false);
</span><span class="cx">
</span><span class="lines">@@ -439,8 +439,8 @@
</span><span class="cx"> StringPairVector controlNamesAndValues;
</span><span class="cx"> getTextFieldValues(controlNamesAndValues);
</span><span class="cx">
</span><del>- RefPtr<FormState> formState = FormState::create(this, controlNamesAndValues, &document(), SubmittedByJavaScript);
- frame->loader().client().didRequestAutocomplete(formState.release());
</del><ins>+ auto formState = FormState::create(this, controlNamesAndValues, &document(), SubmittedByJavaScript);
+ frame->loader().client().didRequestAutocomplete(WTFMove(formState));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLFormElement::finishRequestAutocomplete(AutocompleteResult result)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFormElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFormElement.h (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFormElement.h 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/html/HTMLFormElement.h 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx"> const Vector<FormAssociatedElement*>& associatedElements() const { return m_associatedElements; }
</span><span class="cx"> const Vector<HTMLImageElement*>& imageElements() const { return m_imageElements; }
</span><span class="cx">
</span><del>- void getTextFieldValues(StringPairVector& fieldNamesAndValues) const;
</del><ins>+ StringPairVector textFieldValues() const;
</ins><span class="cx">
</span><span class="cx"> static HTMLFormElement* findClosestFormAncestor(const Element&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLHtmlElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLHtmlElement.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLHtmlElement.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/html/HTMLHtmlElement.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -66,15 +66,15 @@
</span><span class="cx"> if (!document().frame())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- DocumentLoader* documentLoader = document().frame()->loader().documentLoader();
</del><ins>+ auto* documentLoader = document().frame()->loader().documentLoader();
</ins><span class="cx"> if (!documentLoader)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- const AtomicString& manifest = attributeWithoutSynchronization(manifestAttr);
</del><ins>+ auto& manifest = attributeWithoutSynchronization(manifestAttr);
</ins><span class="cx"> if (manifest.isEmpty())
</span><del>- documentLoader->applicationCacheHost()->selectCacheWithoutManifest();
</del><ins>+ documentLoader->applicationCacheHost().selectCacheWithoutManifest();
</ins><span class="cx"> else
</span><del>- documentLoader->applicationCacheHost()->selectCacheWithManifest(document().completeURL(manifest));
</del><ins>+ documentLoader->applicationCacheHost().selectCacheWithManifest(document().completeURL(manifest));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLLinkElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLLinkElement.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLLinkElement.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/html/HTMLLinkElement.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -267,7 +267,7 @@
</span><span class="cx"> if (!isActive)
</span><span class="cx"> priority = ResourceLoadPriority::VeryLow;
</span><span class="cx"> CachedResourceRequest request(url, CachedResourceLoader::defaultCachedResourceOptions(), priority, WTFMove(charset));
</span><del>- request.setInitiator(this);
</del><ins>+ request.setInitiator(*this);
</ins><span class="cx">
</span><span class="cx"> if (document().contentSecurityPolicy()->allowStyleWithNonce(attributeWithoutSynchronization(HTMLNames::nonceAttr))) {
</span><span class="cx"> ResourceLoaderOptions options = CachedResourceLoader::defaultCachedResourceOptions();
</span><span class="lines">@@ -367,7 +367,7 @@
</span><span class="cx"> CSSParserContext parserContext(document(), baseURL, charset);
</span><span class="cx"> auto cachePolicy = frame->loader().subresourceCachePolicy();
</span><span class="cx">
</span><del>- if (RefPtr<StyleSheetContents> restoredSheet = const_cast<CachedCSSStyleSheet*>(cachedStyleSheet)->restoreParsedStyleSheet(parserContext, cachePolicy)) {
</del><ins>+ if (auto restoredSheet = const_cast<CachedCSSStyleSheet*>(cachedStyleSheet)->restoreParsedStyleSheet(parserContext, cachePolicy)) {
</ins><span class="cx"> ASSERT(restoredSheet->isCacheable());
</span><span class="cx"> ASSERT(!restoredSheet->isLoading());
</span><span class="cx"> initializeStyleSheet(restoredSheet.releaseNonNull(), *cachedStyleSheet);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -1428,11 +1428,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CONTENT_EXTENSIONS)
</span><del>- DocumentLoader* documentLoader = frame->loader().documentLoader();
-
- if (documentLoader) {
- auto blockedStatus = page->userContentProvider().processContentExtensionRulesForLoad(url, ResourceType::Media, *documentLoader);
- if (blockedStatus.blockedLoad) {
</del><ins>+ if (auto* documentLoader = frame->loader().documentLoader()) {
+ if (page->userContentProvider().processContentExtensionRulesForLoad(url, ResourceType::Media, *documentLoader).blockedLoad) {
</ins><span class="cx"> mediaLoadingFailed(MediaPlayer::FormatError);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -1442,11 +1439,9 @@
</span><span class="cx"> // The resource fetch algorithm
</span><span class="cx"> m_networkState = NETWORK_LOADING;
</span><span class="cx">
</span><del>- // If the url should be loaded from the application cache, pass the url of the cached file
- // to the media engine.
- ApplicationCacheHost* cacheHost = frame->loader().documentLoader()->applicationCacheHost();
</del><ins>+ // If the URL should be loaded from the application cache, pass the URL of the cached file to the media engine.
</ins><span class="cx"> ApplicationCacheResource* resource = nullptr;
</span><del>- if (cacheHost && cacheHost->shouldLoadResourceFromApplicationCache(ResourceRequest(url), resource)) {
</del><ins>+ if (frame->loader().documentLoader()->applicationCacheHost().shouldLoadResourceFromApplicationCache(ResourceRequest(url), resource)) {
</ins><span class="cx"> // Resources that are not present in the manifest will always fail to load (at least, after the
</span><span class="cx"> // cache has been primed the first time), making the testing of offline applications simpler.
</span><span class="cx"> if (!resource || resource->path().isEmpty()) {
</span><span class="lines">@@ -1460,7 +1455,7 @@
</span><span class="cx">
</span><span class="cx"> m_firstTimePlaying = true;
</span><span class="cx">
</span><del>- // Set m_currentSrc *before* changing to the cache url, the fact that we are loading from the app
</del><ins>+ // Set m_currentSrc *before* changing to the cache URL, the fact that we are loading from the app
</ins><span class="cx"> // cache is an internal detail not exposed through the media element API.
</span><span class="cx"> m_currentSrc = url;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorApplicationCacheAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -68,16 +68,17 @@
</span><span class="cx">
</span><span class="cx"> void InspectorApplicationCacheAgent::updateApplicationCacheStatus(Frame* frame)
</span><span class="cx"> {
</span><del>- DocumentLoader* documentLoader = frame->loader().documentLoader();
</del><ins>+ if (!frame)
+ return;
+ auto* documentLoader = frame->loader().documentLoader();
</ins><span class="cx"> if (!documentLoader)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- ApplicationCacheHost* host = documentLoader->applicationCacheHost();
- ApplicationCacheHost::Status status = host->status();
- ApplicationCacheHost::CacheInfo info = host->applicationCacheInfo();
</del><ins>+ auto& host = documentLoader->applicationCacheHost();
+ int status = host.status();
+ auto manifestURL = host.applicationCacheInfo().manifest.string();
</ins><span class="cx">
</span><del>- String manifestURL = info.m_manifest.string();
- m_frontendDispatcher->applicationCacheStatusUpdated(m_pageAgent->frameId(frame), manifestURL, static_cast<int>(status));
</del><ins>+ m_frontendDispatcher->applicationCacheStatusUpdated(m_pageAgent->frameId(frame), manifestURL, status);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorApplicationCacheAgent::networkStateChanged()
</span><span class="lines">@@ -91,20 +92,18 @@
</span><span class="cx"> result = Inspector::Protocol::Array<Inspector::Protocol::ApplicationCache::FrameWithManifest>::create();
</span><span class="cx">
</span><span class="cx"> for (Frame* frame = &m_pageAgent->mainFrame(); frame; frame = frame->tree().traverseNext()) {
</span><del>- DocumentLoader* documentLoader = frame->loader().documentLoader();
</del><ins>+ auto* documentLoader = frame->loader().documentLoader();
</ins><span class="cx"> if (!documentLoader)
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- ApplicationCacheHost* host = documentLoader->applicationCacheHost();
- ApplicationCacheHost::CacheInfo info = host->applicationCacheInfo();
- String manifestURL = info.m_manifest.string();
</del><ins>+ auto& host = documentLoader->applicationCacheHost();
+ String manifestURL = host.applicationCacheInfo().manifest.string();
</ins><span class="cx"> if (!manifestURL.isEmpty()) {
</span><del>- Ref<Inspector::Protocol::ApplicationCache::FrameWithManifest> value = Inspector::Protocol::ApplicationCache::FrameWithManifest::create()
</del><ins>+ result->addItem(Inspector::Protocol::ApplicationCache::FrameWithManifest::create()
</ins><span class="cx"> .setFrameId(m_pageAgent->frameId(frame))
</span><span class="cx"> .setManifestURL(manifestURL)
</span><del>- .setStatus(static_cast<int>(host->status()))
- .release();
- result->addItem(WTFMove(value));
</del><ins>+ .setStatus(static_cast<int>(host.status()))
+ .release());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -124,44 +123,36 @@
</span><span class="cx"> if (!documentLoader)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- ApplicationCacheHost::CacheInfo info = documentLoader->applicationCacheHost()->applicationCacheInfo();
- *manifestURL = info.m_manifest.string();
</del><ins>+ *manifestURL = documentLoader->applicationCacheHost().applicationCacheInfo().manifest.string();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorApplicationCacheAgent::getApplicationCacheForFrame(ErrorString& errorString, const String& frameId, RefPtr<Inspector::Protocol::ApplicationCache::ApplicationCache>& applicationCache)
</span><span class="cx"> {
</span><del>- DocumentLoader* documentLoader = assertFrameWithDocumentLoader(errorString, frameId);
</del><ins>+ auto* documentLoader = assertFrameWithDocumentLoader(errorString, frameId);
</ins><span class="cx"> if (!documentLoader)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- ApplicationCacheHost* host = documentLoader->applicationCacheHost();
- ApplicationCacheHost::CacheInfo info = host->applicationCacheInfo();
-
- ApplicationCacheHost::ResourceInfoList resources;
- host->fillResourceList(&resources);
-
- applicationCache = buildObjectForApplicationCache(resources, info);
</del><ins>+ auto& host = documentLoader->applicationCacheHost();
+ applicationCache = buildObjectForApplicationCache(host.resourceList(), host.applicationCacheInfo());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<Inspector::Protocol::ApplicationCache::ApplicationCache> InspectorApplicationCacheAgent::buildObjectForApplicationCache(const ApplicationCacheHost::ResourceInfoList& applicationCacheResources, const ApplicationCacheHost::CacheInfo& applicationCacheInfo)
</del><ins>+Ref<Inspector::Protocol::ApplicationCache::ApplicationCache> InspectorApplicationCacheAgent::buildObjectForApplicationCache(const Vector<ApplicationCacheHost::ResourceInfo>& applicationCacheResources, const ApplicationCacheHost::CacheInfo& applicationCacheInfo)
</ins><span class="cx"> {
</span><span class="cx"> return Inspector::Protocol::ApplicationCache::ApplicationCache::create()
</span><del>- .setManifestURL(applicationCacheInfo.m_manifest.string())
- .setSize(applicationCacheInfo.m_size)
- .setCreationTime(applicationCacheInfo.m_creationTime)
- .setUpdateTime(applicationCacheInfo.m_updateTime)
</del><ins>+ .setManifestURL(applicationCacheInfo.manifest.string())
+ .setSize(applicationCacheInfo.size)
+ .setCreationTime(applicationCacheInfo.creationTime)
+ .setUpdateTime(applicationCacheInfo.updateTime)
</ins><span class="cx"> .setResources(buildArrayForApplicationCacheResources(applicationCacheResources))
</span><span class="cx"> .release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<Inspector::Protocol::Array<Inspector::Protocol::ApplicationCache::ApplicationCacheResource>> InspectorApplicationCacheAgent::buildArrayForApplicationCacheResources(const ApplicationCacheHost::ResourceInfoList& applicationCacheResources)
</del><ins>+Ref<Inspector::Protocol::Array<Inspector::Protocol::ApplicationCache::ApplicationCacheResource>> InspectorApplicationCacheAgent::buildArrayForApplicationCacheResources(const Vector<ApplicationCacheHost::ResourceInfo>& applicationCacheResources)
</ins><span class="cx"> {
</span><del>- auto resources = Inspector::Protocol::Array<Inspector::Protocol::ApplicationCache::ApplicationCacheResource>::create();
-
- for (const auto& resourceInfo : applicationCacheResources)
- resources->addItem(buildObjectForApplicationCacheResource(resourceInfo));
-
- return resources;
</del><ins>+ auto result = Inspector::Protocol::Array<Inspector::Protocol::ApplicationCache::ApplicationCacheResource>::create();
+ for (auto& info : applicationCacheResources)
+ result->addItem(buildObjectForApplicationCacheResource(info));
+ return result;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Ref<Inspector::Protocol::ApplicationCache::ApplicationCacheResource> InspectorApplicationCacheAgent::buildObjectForApplicationCacheResource(const ApplicationCacheHost::ResourceInfo& resourceInfo)
</span><span class="lines">@@ -168,24 +159,24 @@
</span><span class="cx"> {
</span><span class="cx"> StringBuilder types;
</span><span class="cx">
</span><del>- if (resourceInfo.m_isMaster)
</del><ins>+ if (resourceInfo.isMaster)
</ins><span class="cx"> types.appendLiteral("Master ");
</span><span class="cx">
</span><del>- if (resourceInfo.m_isManifest)
</del><ins>+ if (resourceInfo.isManifest)
</ins><span class="cx"> types.appendLiteral("Manifest ");
</span><span class="cx">
</span><del>- if (resourceInfo.m_isFallback)
</del><ins>+ if (resourceInfo.isFallback)
</ins><span class="cx"> types.appendLiteral("Fallback ");
</span><span class="cx">
</span><del>- if (resourceInfo.m_isForeign)
</del><ins>+ if (resourceInfo.isForeign)
</ins><span class="cx"> types.appendLiteral("Foreign ");
</span><span class="cx">
</span><del>- if (resourceInfo.m_isExplicit)
</del><ins>+ if (resourceInfo.isExplicit)
</ins><span class="cx"> types.appendLiteral("Explicit ");
</span><span class="cx">
</span><span class="cx"> return Inspector::Protocol::ApplicationCache::ApplicationCacheResource::create()
</span><del>- .setUrl(resourceInfo.m_resource.string())
- .setSize(static_cast<int>(resourceInfo.m_size))
</del><ins>+ .setUrl(resourceInfo.resource.string())
+ .setSize(static_cast<int>(resourceInfo.size))
</ins><span class="cx"> .setType(types.toString())
</span><span class="cx"> .release();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorApplicationCacheAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.h (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.h 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.h 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -62,8 +62,8 @@
</span><span class="cx"> void getApplicationCacheForFrame(ErrorString&, const String& frameId, RefPtr<Inspector::Protocol::ApplicationCache::ApplicationCache>&) override;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- Ref<Inspector::Protocol::ApplicationCache::ApplicationCache> buildObjectForApplicationCache(const ApplicationCacheHost::ResourceInfoList&, const ApplicationCacheHost::CacheInfo&);
- Ref<Inspector::Protocol::Array<Inspector::Protocol::ApplicationCache::ApplicationCacheResource>> buildArrayForApplicationCacheResources(const ApplicationCacheHost::ResourceInfoList&);
</del><ins>+ Ref<Inspector::Protocol::ApplicationCache::ApplicationCache> buildObjectForApplicationCache(const Vector<ApplicationCacheHost::ResourceInfo>&, const ApplicationCacheHost::CacheInfo&);
+ Ref<Inspector::Protocol::Array<Inspector::Protocol::ApplicationCache::ApplicationCacheResource>> buildArrayForApplicationCacheResources(const Vector<ApplicationCacheHost::ResourceInfo>&);
</ins><span class="cx"> Ref<Inspector::Protocol::ApplicationCache::ApplicationCacheResource> buildObjectForApplicationCacheResource(const ApplicationCacheHost::ResourceInfo&);
</span><span class="cx">
</span><span class="cx"> DocumentLoader* assertFrameWithDocumentLoader(ErrorString&, const String& frameId);
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorInstrumentationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2011 Google Inc. All rights reserved.
</span><del>-* Copyright (C) 2014, 2015 Apple Inc. All rights reserved.
</del><ins>+* Copyright (C) 2014-2017 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions are
</span><span class="lines">@@ -1073,10 +1073,10 @@
</span><span class="cx"> applicationCacheAgent->networkStateChanged();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorInstrumentation::updateApplicationCacheStatusImpl(InstrumentingAgents& instrumentingAgents, Frame* frame)
</del><ins>+void InspectorInstrumentation::updateApplicationCacheStatusImpl(InstrumentingAgents& instrumentingAgents, Frame& frame)
</ins><span class="cx"> {
</span><del>- if (InspectorApplicationCacheAgent* applicationCacheAgent = instrumentingAgents.inspectorApplicationCacheAgent())
- applicationCacheAgent->updateApplicationCacheStatus(frame);
</del><ins>+ if (auto* applicationCacheAgent = instrumentingAgents.inspectorApplicationCacheAgent())
+ applicationCacheAgent->updateApplicationCacheStatus(&frame);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool InspectorInstrumentation::consoleAgentEnabled(ScriptExecutionContext* scriptExecutionContext)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorInstrumentationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.h (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -407,7 +407,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> static void networkStateChangedImpl(InstrumentingAgents&);
</span><del>- static void updateApplicationCacheStatusImpl(InstrumentingAgents&, Frame*);
</del><ins>+ static void updateApplicationCacheStatusImpl(InstrumentingAgents&, Frame&);
</ins><span class="cx">
</span><span class="cx"> static void layerTreeDidChangeImpl(InstrumentingAgents&);
</span><span class="cx"> static void renderLayerDestroyedImpl(InstrumentingAgents&, const RenderLayer&);
</span><span class="lines">@@ -1181,8 +1181,8 @@
</span><span class="cx"> inline void InspectorInstrumentation::updateApplicationCacheStatus(Frame* frame)
</span><span class="cx"> {
</span><span class="cx"> FAST_RETURN_IF_NO_FRONTENDS(void());
</span><del>- if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForFrame(frame))
- updateApplicationCacheStatusImpl(*instrumentingAgents, frame);
</del><ins>+ if (auto* instrumentingAgents = instrumentingAgentsForFrame(frame))
+ updateApplicationCacheStatusImpl(*instrumentingAgents, *frame);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void InspectorInstrumentation::addMessageToConsole(Page& page, std::unique_ptr<Inspector::ConsoleMessage> message)
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentLoader.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -129,30 +129,16 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-DocumentLoader::DocumentLoader(const ResourceRequest& req, const SubstituteData& substituteData)
- : m_deferMainResourceDataLoad(true)
- , m_frame(nullptr)
- , m_cachedResourceLoader(CachedResourceLoader::create(this))
</del><ins>+DocumentLoader::DocumentLoader(const ResourceRequest& request, const SubstituteData& substituteData)
+ : m_cachedResourceLoader(CachedResourceLoader::create(this))
</ins><span class="cx"> , m_writer(m_frame)
</span><del>- , m_originalRequest(req)
</del><ins>+ , m_originalRequest(request)
</ins><span class="cx"> , m_substituteData(substituteData)
</span><del>- , m_originalRequestCopy(req)
- , m_request(req)
</del><ins>+ , m_originalRequestCopy(request)
+ , m_request(request)
</ins><span class="cx"> , m_originalSubstituteDataWasValid(substituteData.isValid())
</span><del>- , m_committed(false)
- , m_isStopping(false)
- , m_gotFirstByte(false)
- , m_isClientRedirect(false)
- , m_isLoadingMultipartContent(false)
- , m_wasOnloadDispatched(false)
- , m_stopRecordingResponses(false)
</del><span class="cx"> , m_substituteResourceDeliveryTimer(*this, &DocumentLoader::substituteResourceDeliveryTimerFired)
</span><del>- , m_didCreateGlobalHistoryEntry(false)
- , m_loadingMainResource(false)
- , m_timeOfLastDataReceived(0.0)
- , m_identifierForLoadWithoutResourceLoader(0)
</del><span class="cx"> , m_dataLoadTimer(*this, &DocumentLoader::handleSubstituteDataLoadNow)
</span><del>- , m_subresourceLoadersArePageCacheAcceptable(false)
</del><span class="cx"> , m_applicationCacheHost(std::make_unique<ApplicationCacheHost>(*this))
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -166,7 +152,9 @@
</span><span class="cx">
</span><span class="cx"> SubresourceLoader* DocumentLoader::mainResourceLoader() const
</span><span class="cx"> {
</span><del>- return m_mainResource ? m_mainResource->loader() : 0;
</del><ins>+ if (!m_mainResource)
+ return nullptr;
+ return m_mainResource->loader();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> DocumentLoader::~DocumentLoader()
</span><span class="lines">@@ -179,7 +167,7 @@
</span><span class="cx"> if (m_iconDataCallback)
</span><span class="cx"> m_iconDataCallback->invalidate();
</span><span class="cx"> m_cachedResourceLoader->clearDocumentLoader();
</span><del>-
</del><ins>+
</ins><span class="cx"> clearMainResource();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -199,31 +187,6 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const ResourceRequest& DocumentLoader::originalRequest() const
-{
- return m_originalRequest;
-}
-
-const ResourceRequest& DocumentLoader::originalRequestCopy() const
-{
- return m_originalRequestCopy;
-}
-
-const ResourceRequest& DocumentLoader::request() const
-{
- return m_request;
-}
-
-ResourceRequest& DocumentLoader::request()
-{
- return m_request;
-}
-
-const URL& DocumentLoader::url() const
-{
- return request().url();
-}
-
</del><span class="cx"> void DocumentLoader::replaceRequestURLForSameDocumentNavigation(const URL& url)
</span><span class="cx"> {
</span><span class="cx"> m_originalRequestCopy.setURL(url);
</span><span class="lines">@@ -319,7 +282,7 @@
</span><span class="cx"> cancelAll(m_multipartSubresourceLoaders);
</span><span class="cx">
</span><span class="cx"> // Appcache uses ResourceHandle directly, DocumentLoader doesn't count these loads.
</span><del>- m_applicationCacheHost->stopLoadingInFrame(m_frame);
</del><ins>+ m_applicationCacheHost->stopLoadingInFrame(*m_frame);
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_ARCHIVE) || ENABLE(MHTML)
</span><span class="cx"> clearArchiveResources();
</span><span class="lines">@@ -602,7 +565,7 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(!m_waitingForNavigationPolicy);
</span><span class="cx"> m_waitingForNavigationPolicy = true;
</span><del>- frameLoader()->policyChecker().checkNavigationPolicy(newRequest, didReceiveRedirectResponse, [this](const ResourceRequest& request, PassRefPtr<FormState>, bool shouldContinue) {
</del><ins>+ frameLoader()->policyChecker().checkNavigationPolicy(newRequest, didReceiveRedirectResponse, [this] (const ResourceRequest& request, FormState*, bool shouldContinue) {
</ins><span class="cx"> continueAfterNavigationPolicy(request, shouldContinue);
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -900,12 +863,8 @@
</span><span class="cx"> if (frameLoader()->stateMachine().creatingInitialEmptyDocument())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>-#if ENABLE(MHTML)
- // The origin is the MHTML file, we need to set the base URL to the document encoded in the MHTML so
- // relative URLs are resolved properly.
- if (m_archive && m_archive->type() == Archive::MHTML)
</del><ins>+ if (m_archive && m_archive->shouldOverrideBaseURL())
</ins><span class="cx"> m_frame->document()->setBaseURLOverride(m_archive->mainResource()->url());
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> // Call receivedFirstData() exactly once per load. We should only reach this point multiple times
</span><span class="cx"> // for multipart loads, and FrameLoader::isReplacing() will be true after the first time.
</span><span class="lines">@@ -921,10 +880,8 @@
</span><span class="cx"> if (overrideEncoding().isNull()) {
</span><span class="cx"> userChosen = false;
</span><span class="cx"> encoding = response().textEncodingName();
</span><del>-#if ENABLE(WEB_ARCHIVE)
- if (m_archive && m_archive->type() == Archive::WebArchive)
</del><ins>+ if (m_archive && m_archive->shouldUseMainResourceEncoding())
</ins><span class="cx"> encoding = m_archive->mainResource()->textEncoding();
</span><del>-#endif
</del><span class="cx"> } else {
</span><span class="cx"> userChosen = true;
</span><span class="cx"> encoding = overrideEncoding();
</span><span class="lines">@@ -1083,15 +1040,16 @@
</span><span class="cx"> if (frameLoader()->state() != FrameStateComplete) {
</span><span class="cx"> if (m_frame->settings().needsIsLoadingInAPISenseQuirk() && !m_subresourceLoaders.isEmpty())
</span><span class="cx"> return true;
</span><del>-
- Document* doc = m_frame->document();
- if ((isLoadingMainResource() || !m_frame->document()->loadEventFinished()) && isLoading())
</del><ins>+
+ ASSERT(m_frame->document());
+ auto& document = *m_frame->document();
+ if ((isLoadingMainResource() || !document.loadEventFinished()) && isLoading())
</ins><span class="cx"> return true;
</span><span class="cx"> if (m_cachedResourceLoader->requestCount())
</span><span class="cx"> return true;
</span><del>- if (doc->processingLoadEvent())
</del><ins>+ if (document.processingLoadEvent())
</ins><span class="cx"> return true;
</span><del>- if (doc->hasActiveParser())
</del><ins>+ if (document.hasActiveParser())
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> return frameLoader()->subframeIsLoading();
</span><span class="lines">@@ -1102,40 +1060,35 @@
</span><span class="cx"> #if !ENABLE(WEB_ARCHIVE) && !ENABLE(MHTML)
</span><span class="cx"> return false;
</span><span class="cx"> #else
</span><del>-
</del><span class="cx"> // Give the archive machinery a crack at this document. If the MIME type is not an archive type, it will return 0.
</span><span class="cx"> m_archive = ArchiveFactory::create(m_response.url(), mainResourceData().get(), m_response.mimeType());
</span><span class="cx"> if (!m_archive)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- addAllArchiveResources(m_archive.get());
- ArchiveResource* mainResource = m_archive->mainResource();
- m_parsedArchiveData = &mainResource->data();
- m_writer.setMIMEType(mainResource->mimeType());
-
</del><ins>+ addAllArchiveResources(*m_archive);
+ ASSERT(m_archive->mainResource());
+ auto& mainResource = *m_archive->mainResource();
+ m_parsedArchiveData = &mainResource.data();
+ m_writer.setMIMEType(mainResource.mimeType());
+
</ins><span class="cx"> ASSERT(m_frame->document());
</span><del>- commitData(mainResource->data().data(), mainResource->data().size());
</del><ins>+ commitData(mainResource.data().data(), mainResource.data().size());
</ins><span class="cx"> return true;
</span><del>-#endif // !ENABLE(WEB_ARCHIVE) && !ENABLE(MHTML)
</del><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_ARCHIVE) || ENABLE(MHTML)
</span><span class="cx">
</span><del>-void DocumentLoader::setArchive(PassRefPtr<Archive> archive)
</del><ins>+void DocumentLoader::setArchive(Ref<Archive>&& archive)
</ins><span class="cx"> {
</span><del>- m_archive = archive;
- addAllArchiveResources(m_archive.get());
</del><ins>+ m_archive = WTFMove(archive);
+ addAllArchiveResources(*m_archive);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void DocumentLoader::addAllArchiveResources(Archive* archive)
</del><ins>+void DocumentLoader::addAllArchiveResources(Archive& archive)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_archiveResourceCollection)
</span><span class="cx"> m_archiveResourceCollection = std::make_unique<ArchiveResourceCollection>();
</span><del>-
- ASSERT(archive);
- if (!archive)
- return;
-
</del><span class="cx"> m_archiveResourceCollection->addAllResources(archive);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1145,13 +1098,12 @@
</span><span class="cx"> {
</span><span class="cx"> if (!m_archiveResourceCollection)
</span><span class="cx"> m_archiveResourceCollection = std::make_unique<ArchiveResourceCollection>();
</span><del>-
</del><span class="cx"> m_archiveResourceCollection->addResource(WTFMove(resource));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Archive> DocumentLoader::popArchiveForSubframe(const String& frameName, const URL& url)
</del><ins>+RefPtr<Archive> DocumentLoader::popArchiveForSubframe(const String& frameName, const URL& url)
</ins><span class="cx"> {
</span><del>- return m_archiveResourceCollection ? m_archiveResourceCollection->popSubframeArchive(frameName, url) : PassRefPtr<Archive>(nullptr);
</del><ins>+ return m_archiveResourceCollection ? m_archiveResourceCollection->popSubframeArchive(frameName, url) : nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DocumentLoader::clearArchiveResources()
</span><span class="lines">@@ -1171,7 +1123,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (!m_archiveResourceCollection)
</span><span class="cx"> return nullptr;
</span><del>- ArchiveResource* resource = m_archiveResourceCollection->archiveResourceForURL(url);
</del><ins>+ auto* resource = m_archiveResourceCollection->archiveResourceForURL(url);
</ins><span class="cx"> if (!resource || resource->shouldIgnoreWhenUnarchiving())
</span><span class="cx"> return nullptr;
</span><span class="cx"> return resource;
</span><span class="lines">@@ -1182,17 +1134,16 @@
</span><span class="cx"> RefPtr<SharedBuffer> data = mainResourceData();
</span><span class="cx"> if (!data)
</span><span class="cx"> data = SharedBuffer::create();
</span><del>-
</del><span class="cx"> auto& response = this->response();
</span><span class="cx"> return ArchiveResource::create(WTFMove(data), response.url(), response.mimeType(), response.textEncodingName(), frame()->tree().uniqueName());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<ArchiveResource> DocumentLoader::subresource(const URL& url) const
</del><ins>+RefPtr<ArchiveResource> DocumentLoader::subresource(const URL& url) const
</ins><span class="cx"> {
</span><span class="cx"> if (!isCommitted())
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- CachedResource* resource = m_cachedResourceLoader->cachedResource(url);
</del><ins>+ auto* resource = m_cachedResourceLoader->cachedResource(url);
</ins><span class="cx"> if (!resource || !resource->isLoaded())
</span><span class="cx"> return archiveResourceForURL(url);
</span><span class="cx">
</span><span class="lines">@@ -1206,18 +1157,16 @@
</span><span class="cx"> return ArchiveResource::create(data, url, resource->response());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Vector<RefPtr<ArchiveResource>> DocumentLoader::subresources() const
</del><ins>+Vector<Ref<ArchiveResource>> DocumentLoader::subresources() const
</ins><span class="cx"> {
</span><span class="cx"> if (!isCommitted())
</span><span class="cx"> return { };
</span><span class="cx">
</span><del>- Vector<RefPtr<ArchiveResource>> subresources;
-
- for (auto& cachedResourceHandle : m_cachedResourceLoader->allCachedResources().values()) {
- if (RefPtr<ArchiveResource> subresource = this->subresource(URL(ParsedURLString, cachedResourceHandle->url())))
- subresources.append(WTFMove(subresource));
</del><ins>+ Vector<Ref<ArchiveResource>> subresources;
+ for (auto& handle : m_cachedResourceLoader->allCachedResources().values()) {
+ if (auto subresource = this->subresource({ ParsedURLString, handle->url() }))
+ subresources.append(subresource.releaseNonNull());
</ins><span class="cx"> }
</span><del>-
</del><span class="cx"> return subresources;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1225,9 +1174,11 @@
</span><span class="cx"> {
</span><span class="cx"> if (m_pendingSubstituteResources.isEmpty())
</span><span class="cx"> return;
</span><del>- ASSERT(m_frame && m_frame->page());
</del><ins>+ ASSERT(m_frame);
+ ASSERT(m_frame->page());
</ins><span class="cx"> if (m_frame->page()->defersLoading())
</span><span class="cx"> return;
</span><ins>+
</ins><span class="cx"> if (!m_substituteResourceDeliveryTimer.isActive())
</span><span class="cx"> m_substituteResourceDeliveryTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="lines">@@ -1236,18 +1187,15 @@
</span><span class="cx"> {
</span><span class="cx"> if (m_pendingSubstituteResources.isEmpty())
</span><span class="cx"> return;
</span><del>- ASSERT(m_frame && m_frame->page());
</del><ins>+ ASSERT(m_frame);
+ ASSERT(m_frame->page());
</ins><span class="cx"> if (m_frame->page()->defersLoading())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- SubstituteResourceMap copy;
- copy.swap(m_pendingSubstituteResources);
-
- for (auto& entry : copy) {
- auto& loader = entry.key;
- SubstituteResource* resource = entry.value.get();
-
- if (resource)
</del><ins>+ auto pendingSubstituteResources = WTFMove(m_pendingSubstituteResources);
+ for (auto& pendingSubstituteResource : pendingSubstituteResources) {
+ auto& loader = pendingSubstituteResource.key;
+ if (auto& resource = pendingSubstituteResource.value)
</ins><span class="cx"> resource->deliver(*loader);
</span><span class="cx"> else {
</span><span class="cx"> // A null resource means that we should fail the load.
</span><span class="lines">@@ -1258,10 +1206,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #ifndef NDEBUG
</span><ins>+
</ins><span class="cx"> bool DocumentLoader::isSubstituteLoadPending(ResourceLoader* loader) const
</span><span class="cx"> {
</span><span class="cx"> return m_pendingSubstituteResources.contains(loader);
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void DocumentLoader::cancelPendingSubstituteLoad(ResourceLoader* loader)
</span><span class="lines">@@ -1274,9 +1224,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_ARCHIVE) || ENABLE(MHTML)
</span><ins>+
</ins><span class="cx"> bool DocumentLoader::scheduleArchiveLoad(ResourceLoader& loader, const ResourceRequest& request)
</span><span class="cx"> {
</span><del>- if (ArchiveResource* resource = archiveResourceForURL(request.url())) {
</del><ins>+ if (auto* resource = archiveResourceForURL(request.url())) {
</ins><span class="cx"> scheduleSubstituteResourceLoad(loader, *resource);
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -1284,22 +1235,20 @@
</span><span class="cx"> if (!m_archive)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- switch (m_archive->type()) {
</del><span class="cx"> #if ENABLE(WEB_ARCHIVE)
</span><del>- case Archive::WebArchive:
- // WebArchiveDebugMode means we fail loads instead of trying to fetch them from the network if they're not in the archive.
- return m_frame->settings().webArchiveDebugModeEnabled() && ArchiveFactory::isArchiveMimeType(responseMIMEType());
</del><ins>+ // The idea of WebArchiveDebugMode is that we should fail instead of trying to fetch from the network.
+ // Returning true ensures the caller will not try to fetch from the network.
+ if (m_frame->settings().webArchiveDebugModeEnabled() && responseMIMEType() == "application/x-webarchive")
+ return true;
</ins><span class="cx"> #endif
</span><del>-#if ENABLE(MHTML)
- case Archive::MHTML:
- return true; // Always fail the load for resources not included in the MHTML.
-#endif
- default:
- return false;
- }
</del><ins>+
+ // If we want to load from the archive only, then we should always return true so that the caller
+ // does not try to fetch form the network.
+ return m_archive->shouldLoadFromArchiveOnly();
</ins><span class="cx"> }
</span><del>-#endif // ENABLE(WEB_ARCHIVE)
</del><span class="cx">
</span><ins>+#endif
+
</ins><span class="cx"> void DocumentLoader::scheduleSubstituteResourceLoad(ResourceLoader& loader, SubstituteResource& resource)
</span><span class="cx"> {
</span><span class="cx"> m_pendingSubstituteResources.set(&loader, &resource);
</span><span class="lines">@@ -1306,10 +1255,10 @@
</span><span class="cx"> deliverSubstituteResourcesAfterDelay();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DocumentLoader::addResponse(const ResourceResponse& r)
</del><ins>+void DocumentLoader::addResponse(const ResourceResponse& response)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_stopRecordingResponses)
</span><del>- m_responses.append(r);
</del><ins>+ m_responses.append(response);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DocumentLoader::stopRecordingResponses()
</span><span class="lines">@@ -1344,21 +1293,11 @@
</span><span class="cx"> return m_substituteData.isValid() || m_response.httpStatusCode() >= 400;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const URL& DocumentLoader::originalURL() const
-{
- return m_originalRequestCopy.url();
-}
-
-const URL& DocumentLoader::responseURL() const
-{
- return m_response.url();
-}
-
</del><span class="cx"> URL DocumentLoader::documentURL() const
</span><span class="cx"> {
</span><span class="cx"> URL url = substituteData().response().url();
</span><span class="cx"> #if ENABLE(WEB_ARCHIVE)
</span><del>- if (url.isEmpty() && m_archive && m_archive->type() == Archive::WebArchive)
</del><ins>+ if (url.isEmpty() && m_archive && m_archive->shouldUseMainResourceURL())
</ins><span class="cx"> url = m_archive->mainResource()->url();
</span><span class="cx"> #endif
</span><span class="cx"> if (url.isEmpty())
</span><span class="lines">@@ -1368,29 +1307,16 @@
</span><span class="cx"> return url;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const String& DocumentLoader::responseMIMEType() const
-{
- return m_response.mimeType();
-}
</del><ins>+#if PLATFORM(IOS)
</ins><span class="cx">
</span><del>-const String& DocumentLoader::currentContentType() const
-{
- return m_writer.mimeType();
-}
-
-#if PLATFORM(IOS)
</del><span class="cx"> // FIXME: This method seems to violate the encapsulation of this class.
</span><span class="cx"> void DocumentLoader::setResponseMIMEType(const String& responseMimeType)
</span><span class="cx"> {
</span><span class="cx"> m_response.setMimeType(responseMimeType);
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>-const URL& DocumentLoader::unreachableURL() const
-{
- return m_substituteData.failingURL();
-}
-
</del><span class="cx"> void DocumentLoader::setDefersLoading(bool defers)
</span><span class="cx"> {
</span><span class="cx"> // Multiple frames may be loading the same main resource simultaneously. If deferral state changes,
</span><span class="lines">@@ -1682,7 +1608,7 @@
</span><span class="cx"> if (m_iconLoadDecisionCallback)
</span><span class="cx"> m_iconLoadDecisionCallback->invalidate();
</span><span class="cx"> m_iconLoadDecisionCallback = IconLoadDecisionCallback::create(this, iconLoadDecisionCallback);
</span><del>- iconDatabase().loadDecisionForIconURL(urlString, m_iconLoadDecisionCallback);
</del><ins>+ iconDatabase().loadDecisionForIconURL(urlString, *m_iconLoadDecisionCallback);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DocumentLoader::continueIconLoadWithDecision(IconLoadDecision decision)
</span><span class="lines">@@ -1703,7 +1629,7 @@
</span><span class="cx"> if (m_iconDataCallback)
</span><span class="cx"> m_iconDataCallback->invalidate();
</span><span class="cx"> m_iconDataCallback = IconDataCallback::create(this, iconDataCallback);
</span><del>- iconDatabase().iconDataForIconURL(urlString, m_iconDataCallback);
</del><ins>+ iconDatabase().iconDataForIconURL(urlString, *m_iconDataCallback);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DocumentLoader::startIconLoading()
</span><span class="lines">@@ -1749,7 +1675,7 @@
</span><span class="cx"> void DocumentLoader::dispatchOnloadEvents()
</span><span class="cx"> {
</span><span class="cx"> m_wasOnloadDispatched = true;
</span><del>- applicationCacheHost()->stopDeferringEvents();
</del><ins>+ m_applicationCacheHost->stopDeferringEvents();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DocumentLoader::setTriggeringAction(const NavigationAction& action)
</span><span class="lines">@@ -1789,23 +1715,18 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(CONTENT_FILTERING)
-ContentFilter* DocumentLoader::contentFilter() const
-{
- return m_contentFilter.get();
-}
-#endif
-
</del><span class="cx"> bool DocumentLoader::isAlwaysOnLoggingAllowed() const
</span><span class="cx"> {
</span><del>- return m_frame ? m_frame->isAlwaysOnLoggingAllowed() : true;
</del><ins>+ return !m_frame || m_frame->isAlwaysOnLoggingAllowed();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if USE(QUICK_LOOK)
</span><ins>+
</ins><span class="cx"> void DocumentLoader::setQuickLookHandle(std::unique_ptr<QuickLookHandle> quickLookHandle)
</span><span class="cx"> {
</span><span class="cx"> m_quickLookHandle = WTFMove(quickLookHandle);
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentLoader.h (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentLoader.h 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/loader/DocumentLoader.h 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2006-2016 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2006-2017 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2011 Google Inc. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -76,8 +76,7 @@
</span><span class="cx"> class SubresourceLoader;
</span><span class="cx"> class SubstituteResource;
</span><span class="cx">
</span><del>-typedef HashMap<unsigned long, RefPtr<ResourceLoader>> ResourceLoaderMap;
-typedef Vector<ResourceResponse> ResponseVector;
</del><ins>+using ResourceLoaderMap = HashMap<unsigned long, RefPtr<ResourceLoader>>;
</ins><span class="cx">
</span><span class="cx"> class DocumentLoader : public RefCounted<DocumentLoader>, private CachedRawResourceClient {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="lines">@@ -150,14 +149,15 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_ARCHIVE) || ENABLE(MHTML)
</span><del>- void setArchive(PassRefPtr<Archive>);
- WEBCORE_EXPORT void addAllArchiveResources(Archive*);
</del><ins>+ void setArchive(Ref<Archive>&&);
+ WEBCORE_EXPORT void addAllArchiveResources(Archive&);
</ins><span class="cx"> WEBCORE_EXPORT void addArchiveResource(Ref<ArchiveResource>&&);
</span><del>- PassRefPtr<Archive> popArchiveForSubframe(const String& frameName, const URL&);
</del><ins>+ RefPtr<Archive> popArchiveForSubframe(const String& frameName, const URL&);
</ins><span class="cx"> WEBCORE_EXPORT SharedBuffer* parsedArchiveData() const;
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT bool scheduleArchiveLoad(ResourceLoader&, const ResourceRequest&);
</span><span class="cx"> #endif
</span><ins>+
</ins><span class="cx"> void scheduleSubstituteResourceLoad(ResourceLoader&, SubstituteResource&);
</span><span class="cx">
</span><span class="cx"> // Return the ArchiveResource for the URL only when loading an Archive
</span><span class="lines">@@ -166,10 +166,11 @@
</span><span class="cx"> WEBCORE_EXPORT RefPtr<ArchiveResource> mainResource() const;
</span><span class="cx">
</span><span class="cx"> // Return an ArchiveResource for the URL, either creating from live data or
</span><del>- // pulling from the ArchiveResourceCollection
- WEBCORE_EXPORT PassRefPtr<ArchiveResource> subresource(const URL&) const;
- WEBCORE_EXPORT Vector<RefPtr<ArchiveResource>> subresources() const;
</del><ins>+ // pulling from the ArchiveResourceCollection.
+ WEBCORE_EXPORT RefPtr<ArchiveResource> subresource(const URL&) const;
</ins><span class="cx">
</span><ins>+ WEBCORE_EXPORT Vector<Ref<ArchiveResource>> subresources() const;
+
</ins><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> bool isSubstituteLoadPending(ResourceLoader*) const;
</span><span class="cx"> #endif
</span><span class="lines">@@ -176,7 +177,7 @@
</span><span class="cx"> void cancelPendingSubstituteLoad(ResourceLoader*);
</span><span class="cx">
</span><span class="cx"> void addResponse(const ResourceResponse&);
</span><del>- const ResponseVector& responses() const { return m_responses; }
</del><ins>+ const Vector<ResourceResponse>& responses() const { return m_responses; }
</ins><span class="cx">
</span><span class="cx"> const NavigationAction& triggeringAction() const { return m_triggeringAction; }
</span><span class="cx"> void setTriggeringAction(const NavigationAction&);
</span><span class="lines">@@ -240,17 +241,7 @@
</span><span class="cx">
</span><span class="cx"> void setDeferMainResourceDataLoad(bool defer) { m_deferMainResourceDataLoad = defer; }
</span><span class="cx">
</span><del>- void didTellClientAboutLoad(const String& url)
- {
-#if !PLATFORM(COCOA)
- // Don't include data urls here, as if a lot of data is loaded
- // that way, we hold on to the (large) url string for too long.
- if (protocolIs(url, "data"))
- return;
-#endif
- if (!url.isEmpty())
- m_resourcesClientKnowsAbout.add(url);
- }
</del><ins>+ void didTellClientAboutLoad(const String& url);
</ins><span class="cx"> bool haveToldClientAboutLoad(const String& url) { return m_resourcesClientKnowsAbout.contains(url); }
</span><span class="cx"> void recordMemoryCacheLoadForFutureClientNotification(const ResourceRequest&);
</span><span class="cx"> void takeMemoryCacheLoadsForClientNotification(Vector<ResourceRequest>& loads);
</span><span class="lines">@@ -258,11 +249,11 @@
</span><span class="cx"> LoadTiming& timing() { return m_loadTiming; }
</span><span class="cx"> void resetTiming() { m_loadTiming = LoadTiming(); }
</span><span class="cx">
</span><del>- // The WebKit layer calls this function when it's ready for the data to
- // actually be added to the document.
</del><ins>+ // The WebKit layer calls this function when it's ready for the data to actually be added to the document.
</ins><span class="cx"> WEBCORE_EXPORT void commitData(const char* bytes, size_t length);
</span><span class="cx">
</span><del>- ApplicationCacheHost* applicationCacheHost() const { return m_applicationCacheHost.get(); }
</del><ins>+ ApplicationCacheHost& applicationCacheHost() const;
+ ApplicationCacheHost* applicationCacheHostUnlessBeingDestroyed() const;
</ins><span class="cx">
</span><span class="cx"> void checkLoadComplete();
</span><span class="cx">
</span><span class="lines">@@ -297,7 +288,7 @@
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT virtual void attachToFrame();
</span><span class="cx">
</span><del>- bool m_deferMainResourceDataLoad;
</del><ins>+ bool m_deferMainResourceDataLoad { true };
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> Document* document() const;
</span><span class="lines">@@ -358,7 +349,7 @@
</span><span class="cx"> void cancelPolicyCheckIfNeeded();
</span><span class="cx"> void becomeMainResourceClient();
</span><span class="cx">
</span><del>- Frame* m_frame;
</del><ins>+ Frame* m_frame { nullptr };
</ins><span class="cx"> Ref<CachedResourceLoader> m_cachedResourceLoader;
</span><span class="cx">
</span><span class="cx"> CachedResourceHandle<CachedRawResource> m_mainResource;
</span><span class="lines">@@ -390,15 +381,15 @@
</span><span class="cx"> ResourceError m_mainDocumentError;
</span><span class="cx">
</span><span class="cx"> bool m_originalSubstituteDataWasValid;
</span><del>- bool m_committed;
- bool m_isStopping;
- bool m_gotFirstByte;
- bool m_isClientRedirect;
- bool m_isLoadingMultipartContent;
</del><ins>+ bool m_committed { false };
+ bool m_isStopping { false };
+ bool m_gotFirstByte { false };
+ bool m_isClientRedirect { false };
+ bool m_isLoadingMultipartContent { false };
</ins><span class="cx">
</span><span class="cx"> // FIXME: Document::m_processingLoadEvent and DocumentLoader::m_wasOnloadDispatched are roughly the same
</span><span class="cx"> // and should be merged.
</span><del>- bool m_wasOnloadDispatched;
</del><ins>+ bool m_wasOnloadDispatched { false };
</ins><span class="cx">
</span><span class="cx"> StringWithDirection m_pageTitle;
</span><span class="cx">
</span><span class="lines">@@ -415,8 +406,8 @@
</span><span class="cx"> // We retain all the received responses so we can play back the
</span><span class="cx"> // WebResourceLoadDelegate messages if the item is loaded from the
</span><span class="cx"> // page cache.
</span><del>- ResponseVector m_responses;
- bool m_stopRecordingResponses;
</del><ins>+ Vector<ResourceResponse> m_responses;
+ bool m_stopRecordingResponses { false };
</ins><span class="cx">
</span><span class="cx"> typedef HashMap<RefPtr<ResourceLoader>, RefPtr<SubstituteResource>> SubstituteResourceMap;
</span><span class="cx"> SubstituteResourceMap m_pendingSubstituteResources;
</span><span class="lines">@@ -432,13 +423,13 @@
</span><span class="cx"> Vector<ResourceRequest> m_resourcesLoadedFromMemoryCacheForClientNotification;
</span><span class="cx">
</span><span class="cx"> String m_clientRedirectSourceForHistory;
</span><del>- bool m_didCreateGlobalHistoryEntry;
</del><ins>+ bool m_didCreateGlobalHistoryEntry { false };
</ins><span class="cx">
</span><del>- bool m_loadingMainResource;
</del><ins>+ bool m_loadingMainResource { false };
</ins><span class="cx"> LoadTiming m_loadTiming;
</span><span class="cx">
</span><del>- double m_timeOfLastDataReceived;
- unsigned long m_identifierForLoadWithoutResourceLoader;
</del><ins>+ double m_timeOfLastDataReceived { 0 };
+ unsigned long m_identifierForLoadWithoutResourceLoader { 0 };
</ins><span class="cx">
</span><span class="cx"> DocumentLoaderTimer m_dataLoadTimer;
</span><span class="cx"> bool m_waitingForContentPolicy { false };
</span><span class="lines">@@ -452,7 +443,7 @@
</span><span class="cx"> HashMap<uint64_t, LinkIcon> m_iconsPendingLoadDecision;
</span><span class="cx"> HashMap<std::unique_ptr<IconLoader>, uint64_t> m_iconLoaders;
</span><span class="cx">
</span><del>- bool m_subresourceLoadersArePageCacheAcceptable;
</del><ins>+ bool m_subresourceLoadersArePageCacheAcceptable { false };
</ins><span class="cx"> ShouldOpenExternalURLsPolicy m_shouldOpenExternalURLsPolicy { ShouldOpenExternalURLsPolicy::ShouldNotAllow };
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<ApplicationCacheHost> m_applicationCacheHost;
</span><span class="lines">@@ -487,4 +478,87 @@
</span><span class="cx"> m_resourcesLoadedFromMemoryCacheForClientNotification.clear();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline const ResourceRequest& DocumentLoader::originalRequest() const
+{
+ return m_originalRequest;
</ins><span class="cx"> }
</span><ins>+
+inline const ResourceRequest& DocumentLoader::originalRequestCopy() const
+{
+ return m_originalRequestCopy;
+}
+
+inline const ResourceRequest& DocumentLoader::request() const
+{
+ return m_request;
+}
+
+inline ResourceRequest& DocumentLoader::request()
+{
+ return m_request;
+}
+
+inline const URL& DocumentLoader::url() const
+{
+ return m_request.url();
+}
+
+inline const URL& DocumentLoader::originalURL() const
+{
+ return m_originalRequestCopy.url();
+}
+
+inline const URL& DocumentLoader::responseURL() const
+{
+ return m_response.url();
+}
+
+inline const String& DocumentLoader::responseMIMEType() const
+{
+ return m_response.mimeType();
+}
+
+inline const String& DocumentLoader::currentContentType() const
+{
+ return m_writer.mimeType();
+}
+
+inline const URL& DocumentLoader::unreachableURL() const
+{
+ return m_substituteData.failingURL();
+}
+
+inline ApplicationCacheHost& DocumentLoader::applicationCacheHost() const
+{
+ // For a short time while the document loader is being destroyed, m_applicationCacheHost is null.
+ // It's not acceptable to call this function during that time.
+ ASSERT(m_applicationCacheHost);
+ return *m_applicationCacheHost;
+}
+
+inline ApplicationCacheHost* DocumentLoader::applicationCacheHostUnlessBeingDestroyed() const
+{
+ return m_applicationCacheHost.get();
+}
+
+#if ENABLE(CONTENT_FILTERING)
+
+inline ContentFilter* DocumentLoader::contentFilter() const
+{
+ return m_contentFilter.get();
+}
+
+#endif
+
+inline void DocumentLoader::didTellClientAboutLoad(const String& url)
+{
+#if !PLATFORM(COCOA)
+ // Don't include data URLs here, as if a lot of data is loaded that way, we hold on to the (large) URL string for too long.
+ if (protocolIs(url, "data"))
+ return;
+#endif
+ if (!url.isEmpty())
+ m_resourcesClientKnowsAbout.add(url);
+}
+
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoreloaderEmptyClientscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/EmptyClients.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/EmptyClients.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/loader/EmptyClients.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -46,6 +46,7 @@
</span><span class="cx"> #include "HTMLFormElement.h"
</span><span class="cx"> #include "InProcessIDBServer.h"
</span><span class="cx"> #include "InspectorClient.h"
</span><ins>+#include "NetworkStorageSession.h"
</ins><span class="cx"> #include "Page.h"
</span><span class="cx"> #include "PageConfiguration.h"
</span><span class="cx"> #include "PaymentCoordinatorClient.h"
</span><span class="lines">@@ -171,8 +172,8 @@
</span><span class="cx"> void requestCandidatesForSelection(const VisibleSelection&) final { }
</span><span class="cx"> void handleAcceptedCandidateWithSoftSpaces(TextCheckingResult) final { }
</span><span class="cx">
</span><del>- void registerUndoStep(PassRefPtr<UndoStep>) final;
- void registerRedoStep(PassRefPtr<UndoStep>) final;
</del><ins>+ void registerUndoStep(UndoStep&) final;
+ void registerRedoStep(UndoStep&) final;
</ins><span class="cx"> void clearUndoRedoOperations() final { }
</span><span class="cx">
</span><span class="cx"> bool canCopyCut(Frame*, bool defaultValue) const final { return defaultValue; }
</span><span class="lines">@@ -331,14 +332,14 @@
</span><span class="cx"> void dispatchShow() final { }
</span><span class="cx">
</span><span class="cx"> void dispatchDecidePolicyForResponse(const ResourceResponse&, const ResourceRequest&, FramePolicyFunction) final { }
</span><del>- void dispatchDecidePolicyForNewWindowAction(const NavigationAction&, const ResourceRequest&, PassRefPtr<FormState>, const String&, FramePolicyFunction) final;
- void dispatchDecidePolicyForNavigationAction(const NavigationAction&, const ResourceRequest&, PassRefPtr<FormState>, FramePolicyFunction) final;
</del><ins>+ void dispatchDecidePolicyForNewWindowAction(const NavigationAction&, const ResourceRequest&, FormState*, const String&, FramePolicyFunction) final;
+ void dispatchDecidePolicyForNavigationAction(const NavigationAction&, const ResourceRequest&, FormState*, FramePolicyFunction) final;
</ins><span class="cx"> void cancelPolicyCheck() final { }
</span><span class="cx">
</span><span class="cx"> void dispatchUnableToImplementPolicy(const ResourceError&) final { }
</span><span class="cx">
</span><del>- void dispatchWillSendSubmitEvent(PassRefPtr<FormState>) final;
- void dispatchWillSubmitForm(PassRefPtr<FormState>, FramePolicyFunction) final;
</del><ins>+ void dispatchWillSendSubmitEvent(Ref<FormState>&&) final;
+ void dispatchWillSubmitForm(FormState&, FramePolicyFunction) final;
</ins><span class="cx">
</span><span class="cx"> void revertToProvisionalState(DocumentLoader*) final { }
</span><span class="cx"> void setMainDocumentError(DocumentLoader*, const ResourceError&) final { }
</span><span class="lines">@@ -410,10 +411,10 @@
</span><span class="cx"> void didDisplayInsecureContent() final { }
</span><span class="cx"> void didRunInsecureContent(SecurityOrigin*, const URL&) final { }
</span><span class="cx"> void didDetectXSS(const URL&, bool) final { }
</span><del>- RefPtr<Frame> createFrame(const URL&, const String&, HTMLFrameOwnerElement*, const String&, bool, int, int) final;
- RefPtr<Widget> createPlugin(const IntSize&, HTMLPlugInElement*, const URL&, const Vector<String>&, const Vector<String>&, const String&, bool) final;
</del><ins>+ RefPtr<Frame> createFrame(const URL&, const String&, HTMLFrameOwnerElement&, const String&, bool, int, int) final;
+ RefPtr<Widget> createPlugin(const IntSize&, HTMLPlugInElement&, const URL&, const Vector<String>&, const Vector<String>&, const String&, bool) final;
</ins><span class="cx"> void recreatePlugin(Widget*) final;
</span><del>- PassRefPtr<Widget> createJavaAppletWidget(const IntSize&, HTMLAppletElement*, const URL&, const Vector<String>&, const Vector<String>&) final;
</del><ins>+ RefPtr<Widget> createJavaAppletWidget(const IntSize&, HTMLAppletElement&, const URL&, const Vector<String>&, const Vector<String>&) final;
</ins><span class="cx">
</span><span class="cx"> ObjectContentType objectContentType(const URL&, const String&) final { return ObjectContentType::None; }
</span><span class="cx"> String overrideMediaType() const final { return { }; }
</span><span class="lines">@@ -432,10 +433,10 @@
</span><span class="cx"> bool shouldCacheResponse(DocumentLoader*, unsigned long, const ResourceResponse&, const unsigned char*, unsigned long long) final { return true; }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- PassRefPtr<FrameNetworkingContext> createNetworkingContext() final;
</del><ins>+ Ref<FrameNetworkingContext> createNetworkingContext() final;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(REQUEST_AUTOCOMPLETE)
</span><del>- void didRequestAutocomplete(PassRefPtr<FormState>) final { }
</del><ins>+ void didRequestAutocomplete(Ref<FormState>&&) final { }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> bool isEmptyFrameLoaderClient() final { return true; }
</span><span class="lines">@@ -442,6 +443,27 @@
</span><span class="cx"> void prefetchDNS(const String&) final { }
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+class EmptyFrameNetworkingContext final : public FrameNetworkingContext {
+public:
+ static Ref<EmptyFrameNetworkingContext> create() { return adoptRef(*new EmptyFrameNetworkingContext); }
+
+private:
+ EmptyFrameNetworkingContext();
+
+ bool shouldClearReferrerOnHTTPSToHTTPRedirect() const { return true; }
+ NetworkStorageSession& storageSession() const final { return NetworkStorageSession::defaultStorageSession(); }
+
+#if PLATFORM(COCOA)
+ bool localFileContentSniffingEnabled() const { return false; }
+ SchedulePairHashSet* scheduledRunLoopPairs() const { return nullptr; }
+ RetainPtr<CFDataRef> sourceApplicationAuditData() const { return nullptr; };
+#endif
+
+#if PLATFORM(COCOA) || PLATFORM(WIN)
+ ResourceError blockedError(const ResourceRequest&) const final { return { }; }
+#endif
+};
+
</ins><span class="cx"> class EmptyInspectorClient final : public InspectorClient {
</span><span class="cx"> void inspectedPageDestroyed() final { }
</span><span class="cx"> Inspector::FrontendChannel* openLocalFrontend(InspectorController*) final { return nullptr; }
</span><span class="lines">@@ -569,23 +591,23 @@
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-void EmptyChromeClient::runOpenPanel(Frame*, PassRefPtr<FileChooser>)
</del><ins>+void EmptyChromeClient::runOpenPanel(Frame&, FileChooser&)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void EmptyFrameLoaderClient::dispatchDecidePolicyForNewWindowAction(const NavigationAction&, const ResourceRequest&, PassRefPtr<FormState>, const String&, FramePolicyFunction)
</del><ins>+void EmptyFrameLoaderClient::dispatchDecidePolicyForNewWindowAction(const NavigationAction&, const ResourceRequest&, FormState*, const String&, FramePolicyFunction)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void EmptyFrameLoaderClient::dispatchDecidePolicyForNavigationAction(const NavigationAction&, const ResourceRequest&, PassRefPtr<FormState>, FramePolicyFunction)
</del><ins>+void EmptyFrameLoaderClient::dispatchDecidePolicyForNavigationAction(const NavigationAction&, const ResourceRequest&, FormState*, FramePolicyFunction)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void EmptyFrameLoaderClient::dispatchWillSendSubmitEvent(PassRefPtr<FormState>)
</del><ins>+void EmptyFrameLoaderClient::dispatchWillSendSubmitEvent(Ref<FormState>&&)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void EmptyFrameLoaderClient::dispatchWillSubmitForm(PassRefPtr<FormState>, FramePolicyFunction)
</del><ins>+void EmptyFrameLoaderClient::dispatchWillSubmitForm(FormState&, FramePolicyFunction)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -594,12 +616,12 @@
</span><span class="cx"> return DocumentLoader::create(request, substituteData);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<Frame> EmptyFrameLoaderClient::createFrame(const URL&, const String&, HTMLFrameOwnerElement*, const String&, bool, int, int)
</del><ins>+RefPtr<Frame> EmptyFrameLoaderClient::createFrame(const URL&, const String&, HTMLFrameOwnerElement&, const String&, bool, int, int)
</ins><span class="cx"> {
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<Widget> EmptyFrameLoaderClient::createPlugin(const IntSize&, HTMLPlugInElement*, const URL&, const Vector<String>&, const Vector<String>&, const String&, bool)
</del><ins>+RefPtr<Widget> EmptyFrameLoaderClient::createPlugin(const IntSize&, HTMLPlugInElement&, const URL&, const Vector<String>&, const Vector<String>&, const String&, bool)
</ins><span class="cx"> {
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="lines">@@ -608,25 +630,30 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Widget> EmptyFrameLoaderClient::createJavaAppletWidget(const IntSize&, HTMLAppletElement*, const URL&, const Vector<String>&, const Vector<String>&)
</del><ins>+RefPtr<Widget> EmptyFrameLoaderClient::createJavaAppletWidget(const IntSize&, HTMLAppletElement&, const URL&, const Vector<String>&, const Vector<String>&)
</ins><span class="cx"> {
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<FrameNetworkingContext> EmptyFrameLoaderClient::createNetworkingContext()
</del><ins>+inline EmptyFrameNetworkingContext::EmptyFrameNetworkingContext()
+ : FrameNetworkingContext { nullptr }
</ins><span class="cx"> {
</span><del>- return PassRefPtr<FrameNetworkingContext>();
</del><span class="cx"> }
</span><span class="cx">
</span><ins>+Ref<FrameNetworkingContext> EmptyFrameLoaderClient::createNetworkingContext()
+{
+ return EmptyFrameNetworkingContext::create();
+}
+
</ins><span class="cx"> void EmptyEditorClient::EmptyTextCheckerClient::requestCheckingOfString(TextCheckingRequest&, const VisibleSelection&)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void EmptyEditorClient::registerUndoStep(PassRefPtr<UndoStep>)
</del><ins>+void EmptyEditorClient::registerUndoStep(UndoStep&)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void EmptyEditorClient::registerRedoStep(PassRefPtr<UndoStep>)
</del><ins>+void EmptyEditorClient::registerRedoStep(UndoStep&)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderEmptyClientsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/EmptyClients.h (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/EmptyClients.h 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/loader/EmptyClients.h 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -138,7 +138,7 @@
</span><span class="cx"> std::unique_ptr<ColorChooser> createColorChooser(ColorChooserClient*, const Color&) final;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- void runOpenPanel(Frame*, PassRefPtr<FileChooser>) final;
</del><ins>+ void runOpenPanel(Frame&, FileChooser&) final;
</ins><span class="cx"> void loadIconForFiles(const Vector<String>&, FileIconLoader&) final { }
</span><span class="cx">
</span><span class="cx"> void elementDidFocus(const Node*) final { }
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFormStatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FormState.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FormState.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/loader/FormState.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2006, 2009 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2006-2017 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -34,17 +34,17 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-inline FormState::FormState(PassRefPtr<HTMLFormElement> form, StringPairVector& textFieldValuesToAdopt, PassRefPtr<Document> sourceDocument, FormSubmissionTrigger formSubmissionTrigger)
</del><ins>+inline FormState::FormState(HTMLFormElement& form, StringPairVector&& textFieldValues, Document& sourceDocument, FormSubmissionTrigger formSubmissionTrigger)
</ins><span class="cx"> : m_form(form)
</span><ins>+ , m_textFieldValues(WTFMove(textFieldValues))
</ins><span class="cx"> , m_sourceDocument(sourceDocument)
</span><span class="cx"> , m_formSubmissionTrigger(formSubmissionTrigger)
</span><span class="cx"> {
</span><del>- m_textFieldValues.swap(textFieldValuesToAdopt);
</del><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<FormState> FormState::create(PassRefPtr<HTMLFormElement> form, StringPairVector& textFieldValuesToAdopt, PassRefPtr<Document> sourceDocument, FormSubmissionTrigger formSubmissionTrigger)
</del><ins>+Ref<FormState> FormState::create(HTMLFormElement& form, StringPairVector&& textFieldValues, Document& sourceDocument, FormSubmissionTrigger formSubmissionTrigger)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new FormState(form, textFieldValuesToAdopt, sourceDocument, formSubmissionTrigger));
</del><ins>+ return adoptRef(*new FormState(form, WTFMove(textFieldValues), sourceDocument, formSubmissionTrigger));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFormStateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FormState.h (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FormState.h 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/loader/FormState.h 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2006, 2009 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2006-2017 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -28,37 +28,33 @@
</span><span class="cx">
</span><span class="cx"> #pragma once
</span><span class="cx">
</span><del>-#include <wtf/RefCounted.h>
</del><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>- class Document;
- class HTMLFormElement;
</del><ins>+class Document;
+class HTMLFormElement;
</ins><span class="cx">
</span><del>- enum FormSubmissionTrigger {
- SubmittedByJavaScript,
- NotSubmittedByJavaScript
- };
-
- typedef Vector<std::pair<String, String>> StringPairVector;
</del><ins>+enum FormSubmissionTrigger { SubmittedByJavaScript, NotSubmittedByJavaScript };
</ins><span class="cx">
</span><del>- class FormState : public RefCounted<FormState> {
- public:
- static Ref<FormState> create(PassRefPtr<HTMLFormElement>, StringPairVector& textFieldValuesToAdopt, PassRefPtr<Document>, FormSubmissionTrigger);
</del><ins>+using StringPairVector = Vector<std::pair<String, String>>;
</ins><span class="cx">
</span><del>- HTMLFormElement* form() const { return m_form.get(); }
- const StringPairVector& textFieldValues() const { return m_textFieldValues; }
- Document* sourceDocument() const { return m_sourceDocument.get(); }
- FormSubmissionTrigger formSubmissionTrigger() const { return m_formSubmissionTrigger; }
</del><ins>+class FormState : public RefCounted<FormState> {
+public:
+ static Ref<FormState> create(HTMLFormElement&, StringPairVector&& textFieldValues, Document&, FormSubmissionTrigger);
</ins><span class="cx">
</span><del>- private:
- FormState(PassRefPtr<HTMLFormElement>, StringPairVector& textFieldValuesToAdopt, PassRefPtr<Document>, FormSubmissionTrigger);
</del><ins>+ HTMLFormElement& form() const { return m_form; }
+ const StringPairVector& textFieldValues() const { return m_textFieldValues; }
+ Document& sourceDocument() const { return m_sourceDocument; }
+ FormSubmissionTrigger formSubmissionTrigger() const { return m_formSubmissionTrigger; }
</ins><span class="cx">
</span><del>- RefPtr<HTMLFormElement> m_form;
- StringPairVector m_textFieldValues;
- RefPtr<Document> m_sourceDocument;
- FormSubmissionTrigger m_formSubmissionTrigger;
- };
</del><ins>+private:
+ FormState(HTMLFormElement&, StringPairVector&& textFieldValues, Document&, FormSubmissionTrigger);
</ins><span class="cx">
</span><ins>+ Ref<HTMLFormElement> m_form;
+ StringPairVector m_textFieldValues;
+ Ref<Document> m_sourceDocument;
+ FormSubmissionTrigger m_formSubmissionTrigger;
+};
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFormSubmissioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FormSubmission.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FormSubmission.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/loader/FormSubmission.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx">
</span><span class="cx"> FormSubmission::Method FormSubmission::Attributes::parseMethodType(const String& type)
</span><span class="cx"> {
</span><del>- return equalLettersIgnoringASCIICase(type, "post") ? FormSubmission::PostMethod : FormSubmission::GetMethod;
</del><ins>+ return equalLettersIgnoringASCIICase(type, "post") ? FormSubmission::Method::Post : FormSubmission::Method::Get;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void FormSubmission::Attributes::updateMethodType(const String& type)
</span><span class="lines">@@ -114,24 +114,13 @@
</span><span class="cx"> m_method = parseMethodType(type);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FormSubmission::Attributes::copyFrom(const Attributes& other)
-{
- m_method = other.m_method;
- m_isMultiPartForm = other.m_isMultiPartForm;
-
- m_action = other.m_action;
- m_target = other.m_target;
- m_encodingType = other.m_encodingType;
- m_acceptCharset = other.m_acceptCharset;
-}
-
-inline FormSubmission::FormSubmission(Method method, const URL& action, const String& target, const String& contentType, PassRefPtr<FormState> state, PassRefPtr<FormData> data, const String& boundary, LockHistory lockHistory, PassRefPtr<Event> event)
</del><ins>+inline FormSubmission::FormSubmission(Method method, const URL& action, const String& target, const String& contentType, Ref<FormState>&& state, Ref<FormData>&& data, const String& boundary, LockHistory lockHistory, Event* event)
</ins><span class="cx"> : m_method(method)
</span><span class="cx"> , m_action(action)
</span><span class="cx"> , m_target(target)
</span><span class="cx"> , m_contentType(contentType)
</span><del>- , m_formState(state)
- , m_formData(data)
</del><ins>+ , m_formState(WTFMove(state))
+ , m_formData(WTFMove(data))
</ins><span class="cx"> , m_boundary(boundary)
</span><span class="cx"> , m_lockHistory(lockHistory)
</span><span class="cx"> , m_event(event)
</span><span class="lines">@@ -155,10 +144,8 @@
</span><span class="cx"> return document.textEncoding();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<FormSubmission> FormSubmission::create(HTMLFormElement* form, const Attributes& attributes, PassRefPtr<Event> event, LockHistory lockHistory, FormSubmissionTrigger trigger)
</del><ins>+Ref<FormSubmission> FormSubmission::create(HTMLFormElement& form, const Attributes& attributes, Event* event, LockHistory lockHistory, FormSubmissionTrigger trigger)
</ins><span class="cx"> {
</span><del>- ASSERT(form);
-
</del><span class="cx"> HTMLFormControlElement* submitButton = nullptr;
</span><span class="cx"> if (event && event->target()) {
</span><span class="cx"> for (Node* node = event->target()->toNode(); node; node = node->parentNode()) {
</span><span class="lines">@@ -169,8 +156,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- FormSubmission::Attributes copiedAttributes;
- copiedAttributes.copyFrom(attributes);
</del><ins>+ auto copiedAttributes = attributes;
</ins><span class="cx"> if (submitButton) {
</span><span class="cx"> AtomicString attributeValue;
</span><span class="cx"> if (!(attributeValue = submitButton->attributeWithoutSynchronization(formactionAttr)).isNull())
</span><span class="lines">@@ -183,15 +169,15 @@
</span><span class="cx"> copiedAttributes.setTarget(attributeValue);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Document& document = form->document();
- URL actionURL = document.completeURL(copiedAttributes.action().isEmpty() ? document.url().string() : copiedAttributes.action());
</del><ins>+ auto& document = form.document();
+ auto actionURL = document.completeURL(copiedAttributes.action().isEmpty() ? document.url().string() : copiedAttributes.action());
</ins><span class="cx"> bool isMailtoForm = actionURL.protocolIs("mailto");
</span><span class="cx"> bool isMultiPartForm = false;
</span><del>- String encodingType = copiedAttributes.encodingType();
</del><ins>+ auto encodingType = copiedAttributes.encodingType();
</ins><span class="cx">
</span><span class="cx"> document.contentSecurityPolicy()->upgradeInsecureRequestIfNeeded(actionURL, ContentSecurityPolicy::InsecureRequestType::FormSubmission);
</span><span class="cx">
</span><del>- if (copiedAttributes.method() == PostMethod) {
</del><ins>+ if (copiedAttributes.method() == Method::Post) {
</ins><span class="cx"> isMultiPartForm = copiedAttributes.isMultiPartForm();
</span><span class="cx"> if (isMultiPartForm && isMailtoForm) {
</span><span class="cx"> encodingType = "application/x-www-form-urlencoded";
</span><span class="lines">@@ -199,19 +185,19 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- TextEncoding dataEncoding = isMailtoForm ? UTF8Encoding() : encodingFromAcceptCharset(copiedAttributes.acceptCharset(), document);
- RefPtr<DOMFormData> domFormData = DOMFormData::create(dataEncoding.encodingForFormSubmission());
- Vector<std::pair<String, String>> formValues;
</del><ins>+ auto dataEncoding = isMailtoForm ? UTF8Encoding() : encodingFromAcceptCharset(copiedAttributes.acceptCharset(), document);
+ auto domFormData = DOMFormData::create(dataEncoding.encodingForFormSubmission());
+ StringPairVector formValues;
</ins><span class="cx">
</span><span class="cx"> bool containsPasswordData = false;
</span><del>- for (auto& control : form->associatedElements()) {
- HTMLElement& element = control->asHTMLElement();
</del><ins>+ for (auto& control : form.associatedElements()) {
+ auto& element = control->asHTMLElement();
</ins><span class="cx"> if (!element.isDisabledFormControl())
</span><del>- control->appendFormData(*domFormData, isMultiPartForm);
</del><ins>+ control->appendFormData(domFormData, isMultiPartForm);
</ins><span class="cx"> if (is<HTMLInputElement>(element)) {
</span><del>- HTMLInputElement& input = downcast<HTMLInputElement>(element);
</del><ins>+ auto& input = downcast<HTMLInputElement>(element);
</ins><span class="cx"> if (input.isTextField()) {
</span><del>- formValues.append(std::pair<String, String>(input.name().string(), input.value()));
</del><ins>+ formValues.append({ input.name().string(), input.value() });
</ins><span class="cx"> input.addSearchResult();
</span><span class="cx"> }
</span><span class="cx"> if (input.isPasswordField() && !input.value().isEmpty())
</span><span class="lines">@@ -223,11 +209,11 @@
</span><span class="cx"> String boundary;
</span><span class="cx">
</span><span class="cx"> if (isMultiPartForm) {
</span><del>- formData = FormData::createMultiPart(*(static_cast<FormDataList*>(domFormData.get())), domFormData->encoding(), &document);
</del><ins>+ formData = FormData::createMultiPart(domFormData, domFormData->encoding(), &document);
</ins><span class="cx"> boundary = formData->boundary().data();
</span><span class="cx"> } else {
</span><del>- formData = FormData::create(*(static_cast<FormDataList*>(domFormData.get())), domFormData->encoding(), attributes.method() == GetMethod ? FormData::FormURLEncoded : FormData::parseEncodingType(encodingType));
- if (copiedAttributes.method() == PostMethod && isMailtoForm) {
</del><ins>+ formData = FormData::create(domFormData, domFormData->encoding(), attributes.method() == Method::Get ? FormData::FormURLEncoded : FormData::parseEncodingType(encodingType));
+ if (copiedAttributes.method() == Method::Post && isMailtoForm) {
</ins><span class="cx"> // Convert the form data into a string that we put into the URL.
</span><span class="cx"> appendMailtoPostFormDataToURL(actionURL, *formData, encodingType);
</span><span class="cx"> formData = FormData::create();
</span><span class="lines">@@ -236,14 +222,17 @@
</span><span class="cx">
</span><span class="cx"> formData->setIdentifier(generateFormDataIdentifier());
</span><span class="cx"> formData->setContainsPasswordData(containsPasswordData);
</span><ins>+
</ins><span class="cx"> String targetOrBaseTarget = copiedAttributes.target().isEmpty() ? document.baseTarget() : copiedAttributes.target();
</span><del>- auto formState = FormState::create(form, formValues, &document, trigger);
- return adoptRef(*new FormSubmission(copiedAttributes.method(), actionURL, targetOrBaseTarget, encodingType, WTFMove(formState), WTFMove(formData), boundary, lockHistory, event));
</del><ins>+
+ auto formState = FormState::create(form, WTFMove(formValues), document, trigger);
+
+ return adoptRef(*new FormSubmission(copiedAttributes.method(), actionURL, targetOrBaseTarget, encodingType, WTFMove(formState), formData.releaseNonNull(), boundary, lockHistory, event));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> URL FormSubmission::requestURL() const
</span><span class="cx"> {
</span><del>- if (m_method == FormSubmission::PostMethod)
</del><ins>+ if (m_method == Method::Post)
</ins><span class="cx"> return m_action;
</span><span class="cx">
</span><span class="cx"> URL requestURL(m_action);
</span><span class="lines">@@ -259,7 +248,7 @@
</span><span class="cx"> if (!m_referrer.isEmpty())
</span><span class="cx"> frameRequest.resourceRequest().setHTTPReferrer(m_referrer);
</span><span class="cx">
</span><del>- if (m_method == FormSubmission::PostMethod) {
</del><ins>+ if (m_method == Method::Post) {
</ins><span class="cx"> frameRequest.resourceRequest().setHTTPMethod("POST");
</span><span class="cx"> frameRequest.resourceRequest().setHTTPBody(m_formData.copyRef());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFormSubmissionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FormSubmission.h (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FormSubmission.h 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/loader/FormSubmission.h 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -36,31 +36,21 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class Document;
</del><span class="cx"> class Event;
</span><span class="cx"> class FormData;
</span><ins>+
</ins><span class="cx"> struct FrameLoadRequest;
</span><del>-class HTMLFormElement;
-class TextEncoding;
</del><span class="cx">
</span><span class="cx"> class FormSubmission : public RefCounted<FormSubmission> {
</span><span class="cx"> public:
</span><del>- enum Method { GetMethod, PostMethod };
</del><ins>+ enum class Method { Get, Post };
</ins><span class="cx">
</span><span class="cx"> class Attributes {
</span><del>- WTF_MAKE_NONCOPYABLE(Attributes);
</del><span class="cx"> public:
</span><del>- Attributes()
- : m_method(GetMethod)
- , m_isMultiPartForm(false)
- , m_encodingType("application/x-www-form-urlencoded")
- {
- }
-
</del><span class="cx"> Method method() const { return m_method; }
</span><span class="cx"> static Method parseMethodType(const String&);
</span><span class="cx"> void updateMethodType(const String&);
</span><del>- static String methodString(Method method) { return method == PostMethod ? "post" : "get"; }
</del><ins>+ static ASCIILiteral methodString(Method method) { return ASCIILiteral { method == Method::Post ? "post" : "get" }; }
</ins><span class="cx">
</span><span class="cx"> const String& action() const { return m_action; }
</span><span class="cx"> void parseAction(const String&);
</span><span class="lines">@@ -76,42 +66,38 @@
</span><span class="cx"> const String& acceptCharset() const { return m_acceptCharset; }
</span><span class="cx"> void setAcceptCharset(const String& value) { m_acceptCharset = value; }
</span><span class="cx">
</span><del>- void copyFrom(const Attributes&);
-
</del><span class="cx"> private:
</span><del>- Method m_method;
- bool m_isMultiPartForm;
-
</del><ins>+ Method m_method { Method::Get };
+ bool m_isMultiPartForm { false };
</ins><span class="cx"> String m_action;
</span><span class="cx"> String m_target;
</span><del>- String m_encodingType;
</del><ins>+ String m_encodingType { ASCIILiteral { "application/x-www-form-urlencoded" } };
</ins><span class="cx"> String m_acceptCharset;
</span><span class="cx"> };
</span><span class="cx">
</span><del>- static Ref<FormSubmission> create(HTMLFormElement*, const Attributes&, PassRefPtr<Event> event, LockHistory, FormSubmissionTrigger);
</del><ins>+ static Ref<FormSubmission> create(HTMLFormElement&, const Attributes&, Event*, LockHistory, FormSubmissionTrigger);
</ins><span class="cx">
</span><span class="cx"> void populateFrameLoadRequest(FrameLoadRequest&);
</span><del>-
</del><span class="cx"> URL requestURL() const;
</span><span class="cx">
</span><span class="cx"> Method method() const { return m_method; }
</span><span class="cx"> const URL& action() const { return m_action; }
</span><span class="cx"> const String& target() const { return m_target; }
</span><del>- void clearTarget() { m_target = String(); }
</del><span class="cx"> const String& contentType() const { return m_contentType; }
</span><del>- FormState* state() const { return m_formState.get(); }
- FormData* data() const { return m_formData.get(); }
</del><ins>+ FormState& state() const { return m_formState; }
+ FormData& data() const { return m_formData; }
</ins><span class="cx"> const String boundary() const { return m_boundary; }
</span><span class="cx"> LockHistory lockHistory() const { return m_lockHistory; }
</span><span class="cx"> Event* event() const { return m_event.get(); }
</span><ins>+ const String& referrer() const { return m_referrer; }
+ const String& origin() const { return m_origin; }
</ins><span class="cx">
</span><del>- const String& referrer() const { return m_referrer; }
</del><ins>+ void clearTarget() { m_target = { }; }
</ins><span class="cx"> void setReferrer(const String& referrer) { m_referrer = referrer; }
</span><del>- const String& origin() const { return m_origin; }
</del><span class="cx"> void setOrigin(const String& origin) { m_origin = origin; }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- FormSubmission(Method, const URL& action, const String& target, const String& contentType, PassRefPtr<FormState>, PassRefPtr<FormData>, const String& boundary, LockHistory, PassRefPtr<Event>);
</del><ins>+ FormSubmission(Method, const URL& action, const String& target, const String& contentType, Ref<FormState>&&, Ref<FormData>&&, const String& boundary, LockHistory, Event*);
</ins><span class="cx">
</span><span class="cx"> // FIXME: Hold an instance of Attributes instead of individual members.
</span><span class="cx"> Method m_method;
</span><span class="lines">@@ -118,8 +104,8 @@
</span><span class="cx"> URL m_action;
</span><span class="cx"> String m_target;
</span><span class="cx"> String m_contentType;
</span><del>- RefPtr<FormState> m_formState;
- RefPtr<FormData> m_formData;
</del><ins>+ Ref<FormState> m_formState;
+ Ref<FormData> m_formData;
</ins><span class="cx"> String m_boundary;
</span><span class="cx"> LockHistory m_lockHistory;
</span><span class="cx"> RefPtr<Event> m_event;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -364,17 +364,15 @@
</span><span class="cx">
</span><span class="cx"> void FrameLoader::submitForm(Ref<FormSubmission>&& submission)
</span><span class="cx"> {
</span><del>- ASSERT(submission->method() == FormSubmission::PostMethod || submission->method() == FormSubmission::GetMethod);
</del><ins>+ ASSERT(submission->method() == FormSubmission::Method::Post || submission->method() == FormSubmission::Method::Get);
</ins><span class="cx">
</span><span class="cx"> // FIXME: Find a good spot for these.
</span><del>- ASSERT(submission->data());
- ASSERT(submission->state());
- ASSERT(!submission->state()->sourceDocument()->frame() || submission->state()->sourceDocument()->frame() == &m_frame);
</del><ins>+ ASSERT(!submission->state().sourceDocument().frame() || submission->state().sourceDocument().frame() == &m_frame);
</ins><span class="cx">
</span><span class="cx"> if (!m_frame.page())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (submission->state()->sourceDocument()->pageCacheState() != Document::NotInPageCache)
</del><ins>+ if (submission->state().sourceDocument().pageCacheState() != Document::NotInPageCache)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (submission->action().isEmpty())
</span><span class="lines">@@ -396,12 +394,12 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Frame* targetFrame = findFrameForNavigation(submission->target(), submission->state()->sourceDocument());
</del><ins>+ Frame* targetFrame = findFrameForNavigation(submission->target(), &submission->state().sourceDocument());
</ins><span class="cx"> if (!targetFrame) {
</span><span class="cx"> if (!DOMWindow::allowPopUp(&m_frame) && !ScriptController::processingUserGesture())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- // FIXME: targetFrame can be 0 for two distinct reasons:
</del><ins>+ // FIXME: targetFrame can be null for two distinct reasons:
</ins><span class="cx"> // 1. The frame was not found by name, so we should try opening a new window.
</span><span class="cx"> // 2. The frame was found, but navigating it was not allowed, e.g. by HTML5 sandbox or by origin checks.
</span><span class="cx"> // Continuing form submission makes no sense in the latter case.
</span><span class="lines">@@ -432,7 +430,7 @@
</span><span class="cx"> m_submittedFormURL = submission->requestURL();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- submission->data()->generateFiles(m_frame.document());
</del><ins>+ submission->data().generateFiles(m_frame.document());
</ins><span class="cx"> submission->setReferrer(outgoingReferrer());
</span><span class="cx"> submission->setOrigin(outgoingOrigin());
</span><span class="cx">
</span><span class="lines">@@ -658,20 +656,18 @@
</span><span class="cx"> if (!m_documentLoader)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ ASSERT(m_frame.document());
+ auto& document = *m_frame.document();
+
</ins><span class="cx"> double delay;
</span><span class="cx"> String urlString;
</span><span class="cx"> if (!parseHTTPRefresh(m_documentLoader->response().httpHeaderField(HTTPHeaderName::Refresh), delay, urlString))
</span><span class="cx"> return;
</span><del>- URL completedURL;
- if (urlString.isEmpty())
- completedURL = m_frame.document()->url();
- else
- completedURL = m_frame.document()->completeURL(urlString);
-
</del><ins>+ auto completedURL = urlString.isEmpty() ? document.url() : document.completeURL(urlString);
</ins><span class="cx"> if (!protocolIsJavaScript(completedURL))
</span><del>- m_frame.navigationScheduler().scheduleRedirect(m_frame.document(), delay, completedURL);
</del><ins>+ m_frame.navigationScheduler().scheduleRedirect(document, delay, completedURL);
</ins><span class="cx"> else {
</span><del>- String message = "Refused to refresh " + m_frame.document()->url().stringCenterEllipsizedToLength() + " to a javascript: URL";
</del><ins>+ auto message = "Refused to refresh " + document.url().stringCenterEllipsizedToLength() + " to a javascript: URL";
</ins><span class="cx"> m_frame.document()->addConsoleMessage(MessageSource::Security, MessageLevel::Error, message);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1137,7 +1133,7 @@
</span><span class="cx"> || event->target()->toNode()->document().pageCacheState() == Document::NotInPageCache);
</span><span class="cx">
</span><span class="cx"> // Protect frame from getting blown away inside dispatchBeforeLoadEvent in loadWithDocumentLoader.
</span><del>- Ref<Frame> protect(m_frame);
</del><ins>+ auto protectFrame = makeRef(m_frame);
</ins><span class="cx">
</span><span class="cx"> URL url = request.resourceRequest().url();
</span><span class="cx">
</span><span class="lines">@@ -1170,7 +1166,7 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: It's possible this targetFrame will not be the same frame that was targeted by the actual
</span><span class="cx"> // load if frame names have changed.
</span><del>- Frame* sourceFrame = formState ? formState->sourceDocument()->frame() : &m_frame;
</del><ins>+ Frame* sourceFrame = formState ? formState->sourceDocument().frame() : &m_frame;
</ins><span class="cx"> if (!sourceFrame)
</span><span class="cx"> sourceFrame = &m_frame;
</span><span class="cx"> Frame* targetFrame = sourceFrame->loader().findFrameForNavigation(request.frameName());
</span><span class="lines">@@ -1254,7 +1250,7 @@
</span><span class="cx"> oldDocumentLoader->setLastCheckedRequest(ResourceRequest());
</span><span class="cx"> policyChecker().stopCheck();
</span><span class="cx"> policyChecker().setLoadType(newLoadType);
</span><del>- policyChecker().checkNavigationPolicy(request, false /* didReceiveRedirectResponse */, oldDocumentLoader.get(), formState, [this](const ResourceRequest& request, FormState*, bool shouldContinue) {
</del><ins>+ policyChecker().checkNavigationPolicy(request, false /* didReceiveRedirectResponse */, oldDocumentLoader.get(), formState, [this] (const ResourceRequest& request, FormState*, bool shouldContinue) {
</ins><span class="cx"> continueFragmentScrollAfterNavigationPolicy(request, shouldContinue);
</span><span class="cx"> });
</span><span class="cx"> return;
</span><span class="lines">@@ -1450,7 +1446,7 @@
</span><span class="cx"> oldDocumentLoader->setTriggeringAction(action);
</span><span class="cx"> oldDocumentLoader->setLastCheckedRequest(ResourceRequest());
</span><span class="cx"> policyChecker().stopCheck();
</span><del>- policyChecker().checkNavigationPolicy(loader->request(), false /* didReceiveRedirectResponse */, oldDocumentLoader.get(), formState, [this](const ResourceRequest& request, FormState*, bool shouldContinue) {
</del><ins>+ policyChecker().checkNavigationPolicy(loader->request(), false /* didReceiveRedirectResponse */, oldDocumentLoader.get(), formState, [this] (const ResourceRequest& request, FormState*, bool shouldContinue) {
</ins><span class="cx"> continueFragmentScrollAfterNavigationPolicy(request, shouldContinue);
</span><span class="cx"> });
</span><span class="cx"> return;
</span><span class="lines">@@ -1477,7 +1473,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- policyChecker().checkNavigationPolicy(loader->request(), false /* didReceiveRedirectResponse */, loader, formState, [this, allowNavigationToInvalidURL](const ResourceRequest& request, FormState* formState, bool shouldContinue) {
</del><ins>+ policyChecker().checkNavigationPolicy(loader->request(), false /* didReceiveRedirectResponse */, loader, formState, [this, allowNavigationToInvalidURL] (const ResourceRequest& request, FormState* formState, bool shouldContinue) {
</ins><span class="cx"> continueLoadAfterNavigationPolicy(request, formState, shouldContinue, allowNavigationToInvalidURL);
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -2709,7 +2705,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- policyChecker().checkNewWindowPolicy(action, workingResourceRequest, WTFMove(formState), frameName, [this, allowNavigationToInvalidURL, openerPolicy](const ResourceRequest& request, FormState* formState, const String& frameName, const NavigationAction& action, bool shouldContinue) {
</del><ins>+ policyChecker().checkNewWindowPolicy(action, workingResourceRequest, WTFMove(formState), frameName, [this, allowNavigationToInvalidURL, openerPolicy] (const ResourceRequest& request, FormState* formState, const String& frameName, const NavigationAction& action, bool shouldContinue) {
</ins><span class="cx"> continueLoadAfterNewWindowPolicy(request, formState, frameName, action, shouldContinue, allowNavigationToInvalidURL, openerPolicy);
</span><span class="cx"> });
</span><span class="cx"> return;
</span><span class="lines">@@ -2767,11 +2763,11 @@
</span><span class="cx"> if (error.isNull()) {
</span><span class="cx"> ASSERT(!newRequest.isNull());
</span><span class="cx">
</span><del>- if (!documentLoader()->applicationCacheHost()->maybeLoadSynchronously(newRequest, error, response, data)) {
</del><ins>+ if (!documentLoader()->applicationCacheHost().maybeLoadSynchronously(newRequest, error, response, data)) {
</ins><span class="cx"> Vector<char> buffer;
</span><span class="cx"> platformStrategies()->loaderStrategy()->loadResourceSynchronously(networkingContext(), identifier, newRequest, storedCredentials, clientCredentialPolicy, error, response, buffer);
</span><span class="cx"> data = SharedBuffer::adoptVector(buffer);
</span><del>- documentLoader()->applicationCacheHost()->maybeLoadFallbackSynchronously(newRequest, error, response, data);
</del><ins>+ documentLoader()->applicationCacheHost().maybeLoadFallbackSynchronously(newRequest, error, response, data);
</ins><span class="cx"> ResourceLoadObserver::sharedObserver().logSubresourceLoading(&m_frame, newRequest, response);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -3106,7 +3102,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_client.dispatchWillSubmitForm(formState, [this](PolicyAction action) {
</del><ins>+ m_client.dispatchWillSubmitForm(*formState, [this] (PolicyAction action) {
</ins><span class="cx"> policyChecker().continueLoadAfterWillSubmitForm(action);
</span><span class="cx"> });
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoaderClient.h (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoaderClient.h 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/loader/FrameLoaderClient.h 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2006-2016 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2006-2017 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2012 Google Inc. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -177,14 +177,14 @@
</span><span class="cx"> virtual void dispatchShow() = 0;
</span><span class="cx">
</span><span class="cx"> virtual void dispatchDecidePolicyForResponse(const ResourceResponse&, const ResourceRequest&, FramePolicyFunction) = 0;
</span><del>- virtual void dispatchDecidePolicyForNewWindowAction(const NavigationAction&, const ResourceRequest&, PassRefPtr<FormState>, const String& frameName, FramePolicyFunction) = 0;
- virtual void dispatchDecidePolicyForNavigationAction(const NavigationAction&, const ResourceRequest&, PassRefPtr<FormState>, FramePolicyFunction) = 0;
</del><ins>+ virtual void dispatchDecidePolicyForNewWindowAction(const NavigationAction&, const ResourceRequest&, FormState*, const String& frameName, FramePolicyFunction) = 0;
+ virtual void dispatchDecidePolicyForNavigationAction(const NavigationAction&, const ResourceRequest&, FormState*, FramePolicyFunction) = 0;
</ins><span class="cx"> virtual void cancelPolicyCheck() = 0;
</span><span class="cx">
</span><span class="cx"> virtual void dispatchUnableToImplementPolicy(const ResourceError&) = 0;
</span><span class="cx">
</span><del>- virtual void dispatchWillSendSubmitEvent(PassRefPtr<FormState>) = 0;
- virtual void dispatchWillSubmitForm(PassRefPtr<FormState>, FramePolicyFunction) = 0;
</del><ins>+ virtual void dispatchWillSendSubmitEvent(Ref<FormState>&&) = 0;
+ virtual void dispatchWillSubmitForm(FormState&, FramePolicyFunction) = 0;
</ins><span class="cx">
</span><span class="cx"> virtual void revertToProvisionalState(DocumentLoader*) = 0;
</span><span class="cx"> virtual void setMainDocumentError(DocumentLoader*, const ResourceError&) = 0;
</span><span class="lines">@@ -272,15 +272,13 @@
</span><span class="cx"> virtual bool canCachePage() const = 0;
</span><span class="cx"> virtual void convertMainResourceLoadToDownload(DocumentLoader*, SessionID, const ResourceRequest&, const ResourceResponse&) = 0;
</span><span class="cx">
</span><del>- virtual RefPtr<Frame> createFrame(const URL&, const String& name, HTMLFrameOwnerElement*, const String& referrer, bool allowsScrolling, int marginWidth, int marginHeight) = 0;
- virtual RefPtr<Widget> createPlugin(const IntSize&, HTMLPlugInElement*, const URL&, const Vector<String>&, const Vector<String>&, const String&, bool loadManually) = 0;
</del><ins>+ virtual RefPtr<Frame> createFrame(const URL&, const String& name, HTMLFrameOwnerElement&, const String& referrer, bool allowsScrolling, int marginWidth, int marginHeight) = 0;
+ virtual RefPtr<Widget> createPlugin(const IntSize&, HTMLPlugInElement&, const URL&, const Vector<String>&, const Vector<String>&, const String&, bool loadManually) = 0;
</ins><span class="cx"> virtual void recreatePlugin(Widget*) = 0;
</span><span class="cx"> virtual void redirectDataToPlugin(Widget* pluginWidget) = 0;
</span><span class="cx">
</span><del>- virtual PassRefPtr<Widget> createJavaAppletWidget(const IntSize&, HTMLAppletElement*, const URL& baseURL, const Vector<String>& paramNames, const Vector<String>& paramValues) = 0;
</del><ins>+ virtual RefPtr<Widget> createJavaAppletWidget(const IntSize&, HTMLAppletElement&, const URL& baseURL, const Vector<String>& paramNames, const Vector<String>& paramValues) = 0;
</ins><span class="cx">
</span><del>- virtual void dispatchDidFailToStartPlugin(const PluginViewBase*) const { }
-
</del><span class="cx"> virtual ObjectContentType objectContentType(const URL&, const String& mimeType) = 0;
</span><span class="cx"> virtual String overrideMediaType() const = 0;
</span><span class="cx">
</span><span class="lines">@@ -294,6 +292,7 @@
</span><span class="cx"> virtual NSCachedURLResponse* willCacheResponse(DocumentLoader*, unsigned long identifier, NSCachedURLResponse*) const = 0;
</span><span class="cx"> virtual NSDictionary *dataDetectionContext() { return nullptr; }
</span><span class="cx"> #endif
</span><ins>+
</ins><span class="cx"> #if PLATFORM(WIN) && USE(CFURLCONNECTION)
</span><span class="cx"> // FIXME: Windows should use willCacheResponse - <https://bugs.webkit.org/show_bug.cgi?id=57257>.
</span><span class="cx"> virtual bool shouldCacheResponse(DocumentLoader*, unsigned long identifier, const ResourceResponse&, const unsigned char* data, unsigned long long length) = 0;
</span><span class="lines">@@ -309,10 +308,10 @@
</span><span class="cx"> // Clients that generally disallow universal access can make exceptions for particular URLs.
</span><span class="cx"> virtual bool shouldForceUniversalAccessFromLocalURL(const URL&) { return false; }
</span><span class="cx">
</span><del>- virtual PassRefPtr<FrameNetworkingContext> createNetworkingContext() = 0;
</del><ins>+ virtual Ref<FrameNetworkingContext> createNetworkingContext() = 0;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(REQUEST_AUTOCOMPLETE)
</span><del>- virtual void didRequestAutocomplete(PassRefPtr<FormState>) = 0;
</del><ins>+ virtual void didRequestAutocomplete(Ref<FormState>&&) = 0;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> virtual bool shouldPaintBrokenImage(const URL&) const { return true; }
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderHistoryControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/HistoryController.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/HistoryController.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/loader/HistoryController.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -845,7 +845,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HistoryController::pushState(PassRefPtr<SerializedScriptValue> stateObject, const String& title, const String& urlString)
</del><ins>+void HistoryController::pushState(RefPtr<SerializedScriptValue>&& stateObject, const String& title, const String& urlString)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_currentItem)
</span><span class="cx"> return;
</span><span class="lines">@@ -859,7 +859,7 @@
</span><span class="cx"> // Override data in the current item (created by createItemTree) to reflect
</span><span class="cx"> // the pushState() arguments.
</span><span class="cx"> m_currentItem->setTitle(title);
</span><del>- m_currentItem->setStateObject(stateObject);
</del><ins>+ m_currentItem->setStateObject(WTFMove(stateObject));
</ins><span class="cx"> m_currentItem->setURLString(urlString);
</span><span class="cx">
</span><span class="cx"> LOG(History, "HistoryController %p pushState: Adding top item %p, setting url of current item %p to %s", this, topItem.ptr(), m_currentItem.get(), urlString.ascii().data());
</span><span class="lines">@@ -873,7 +873,7 @@
</span><span class="cx"> m_frame.loader().client().updateGlobalHistory();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HistoryController::replaceState(PassRefPtr<SerializedScriptValue> stateObject, const String& title, const String& urlString)
</del><ins>+void HistoryController::replaceState(RefPtr<SerializedScriptValue>&& stateObject, const String& title, const String& urlString)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_currentItem)
</span><span class="cx"> return;
</span><span class="lines">@@ -883,7 +883,7 @@
</span><span class="cx"> if (!urlString.isEmpty())
</span><span class="cx"> m_currentItem->setURLString(urlString);
</span><span class="cx"> m_currentItem->setTitle(title);
</span><del>- m_currentItem->setStateObject(stateObject);
</del><ins>+ m_currentItem->setStateObject(WTFMove(stateObject));
</ins><span class="cx"> m_currentItem->setFormData(nullptr);
</span><span class="cx"> m_currentItem->setFormContentType(String());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderHistoryControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/HistoryController.h (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/HistoryController.h 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/loader/HistoryController.h 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -84,8 +84,8 @@
</span><span class="cx"> HistoryItem* provisionalItem() const { return m_provisionalItem.get(); }
</span><span class="cx"> void setProvisionalItem(HistoryItem*);
</span><span class="cx">
</span><del>- void pushState(PassRefPtr<SerializedScriptValue>, const String& title, const String& url);
- void replaceState(PassRefPtr<SerializedScriptValue>, const String& title, const String& url);
</del><ins>+ void pushState(RefPtr<SerializedScriptValue>&&, const String& title, const String& url);
+ void replaceState(RefPtr<SerializedScriptValue>&&, const String& title, const String& url);
</ins><span class="cx">
</span><span class="cx"> void setDefersLoading(bool);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderImageLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ImageLoader.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ImageLoader.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/loader/ImageLoader.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -177,7 +177,7 @@
</span><span class="cx"> options.sameOriginDataURLFlag = SameOriginDataURLFlag::Set;
</span><span class="cx">
</span><span class="cx"> CachedResourceRequest request(ResourceRequest(document.completeURL(sourceURI(attr))), options);
</span><del>- request.setInitiator(&element());
</del><ins>+ request.setInitiator(element());
</ins><span class="cx">
</span><span class="cx"> request.setAsPotentiallyCrossOrigin(element().attributeWithoutSynchronization(HTMLNames::crossoriginAttr), document);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderNavigationSchedulercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/NavigationScheduler.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/NavigationScheduler.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/loader/NavigationScheduler.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -68,6 +68,16 @@
</span><span class="cx"> , m_userGestureToForward(UserGestureIndicator::currentUserGesture())
</span><span class="cx"> {
</span><span class="cx"> }
</span><ins>+ ScheduledNavigation(double delay, LockHistory lockHistory, LockBackForwardList lockBackForwardList, bool wasDuringLoad, bool isLocationChange, ShouldOpenExternalURLsPolicy externalURLPolicy)
+ : m_delay(delay)
+ , m_lockHistory(lockHistory)
+ , m_lockBackForwardList(lockBackForwardList)
+ , m_wasDuringLoad(wasDuringLoad)
+ , m_isLocationChange(isLocationChange)
+ , m_userGestureToForward(UserGestureIndicator::currentUserGesture())
+ , m_shouldOpenExternalURLsPolicy(externalURLPolicy)
+ {
+ }
</ins><span class="cx"> virtual ~ScheduledNavigation() { }
</span><span class="cx">
</span><span class="cx"> virtual void fire(Frame&) = 0;
</span><span class="lines">@@ -81,13 +91,12 @@
</span><span class="cx"> LockBackForwardList lockBackForwardList() const { return m_lockBackForwardList; }
</span><span class="cx"> bool wasDuringLoad() const { return m_wasDuringLoad; }
</span><span class="cx"> bool isLocationChange() const { return m_isLocationChange; }
</span><del>- RefPtr<UserGestureToken> userGestureToForward() const { return m_userGestureToForward; }
</del><ins>+ UserGestureToken* userGestureToForward() const { return m_userGestureToForward.get(); }
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> void clearUserGesture() { m_userGestureToForward = nullptr; }
</span><ins>+ ShouldOpenExternalURLsPolicy shouldOpenExternalURLs() const { return m_shouldOpenExternalURLsPolicy; }
</ins><span class="cx">
</span><del>- ShouldOpenExternalURLsPolicy m_shouldOpenExternalURLsPolicy { ShouldOpenExternalURLsPolicy::ShouldNotAllow };
-
</del><span class="cx"> private:
</span><span class="cx"> double m_delay;
</span><span class="cx"> LockHistory m_lockHistory;
</span><span class="lines">@@ -95,19 +104,17 @@
</span><span class="cx"> bool m_wasDuringLoad;
</span><span class="cx"> bool m_isLocationChange;
</span><span class="cx"> RefPtr<UserGestureToken> m_userGestureToForward;
</span><ins>+ ShouldOpenExternalURLsPolicy m_shouldOpenExternalURLsPolicy { ShouldOpenExternalURLsPolicy::ShouldNotAllow };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class ScheduledURLNavigation : public ScheduledNavigation {
</span><span class="cx"> protected:
</span><del>- ScheduledURLNavigation(Document* initiatingDocument, double delay, SecurityOrigin* securityOrigin, const URL& url, const String& referrer, LockHistory lockHistory, LockBackForwardList lockBackForwardList, bool duringLoad, bool isLocationChange)
- : ScheduledNavigation(delay, lockHistory, lockBackForwardList, duringLoad, isLocationChange)
</del><ins>+ ScheduledURLNavigation(Document& initiatingDocument, double delay, SecurityOrigin* securityOrigin, const URL& url, const String& referrer, LockHistory lockHistory, LockBackForwardList lockBackForwardList, bool duringLoad, bool isLocationChange)
+ : ScheduledNavigation(delay, lockHistory, lockBackForwardList, duringLoad, isLocationChange, initiatingDocument.shouldOpenExternalURLsPolicyToPropagate())
</ins><span class="cx"> , m_securityOrigin(securityOrigin)
</span><span class="cx"> , m_url(url)
</span><span class="cx"> , m_referrer(referrer)
</span><del>- , m_haveToldClient(false)
</del><span class="cx"> {
</span><del>- if (initiatingDocument)
- m_shouldOpenExternalURLsPolicy = initiatingDocument->shouldOpenExternalURLsPolicyToPropagate();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void fire(Frame& frame) override
</span><span class="lines">@@ -115,7 +122,7 @@
</span><span class="cx"> UserGestureIndicator gestureIndicator(userGestureToForward());
</span><span class="cx">
</span><span class="cx"> ResourceRequest resourceRequest(m_url, m_referrer, UseProtocolCachePolicy);
</span><del>- FrameLoadRequest frameRequest(m_securityOrigin.get(), resourceRequest, "_self", lockHistory(), lockBackForwardList(), MaybeSendReferrer, AllowNavigationToInvalidURL::Yes, NewFrameOpenerPolicy::Allow, m_shouldOpenExternalURLsPolicy);
</del><ins>+ FrameLoadRequest frameRequest(m_securityOrigin.get(), resourceRequest, "_self", lockHistory(), lockBackForwardList(), MaybeSendReferrer, AllowNavigationToInvalidURL::Yes, NewFrameOpenerPolicy::Allow, shouldOpenExternalURLs());
</ins><span class="cx">
</span><span class="cx"> frame.loader().changeLocation(frameRequest);
</span><span class="cx"> }
</span><span class="lines">@@ -152,12 +159,12 @@
</span><span class="cx"> RefPtr<SecurityOrigin> m_securityOrigin;
</span><span class="cx"> URL m_url;
</span><span class="cx"> String m_referrer;
</span><del>- bool m_haveToldClient;
</del><ins>+ bool m_haveToldClient { false };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class ScheduledRedirect : public ScheduledURLNavigation {
</span><span class="cx"> public:
</span><del>- ScheduledRedirect(Document* initiatingDocument, double delay, SecurityOrigin* securityOrigin, const URL& url, LockHistory lockHistory, LockBackForwardList lockBackForwardList)
</del><ins>+ ScheduledRedirect(Document& initiatingDocument, double delay, SecurityOrigin* securityOrigin, const URL& url, LockHistory lockHistory, LockBackForwardList lockBackForwardList)
</ins><span class="cx"> : ScheduledURLNavigation(initiatingDocument, delay, securityOrigin, url, String(), lockHistory, lockBackForwardList, false, false)
</span><span class="cx"> {
</span><span class="cx"> clearUserGesture();
</span><span class="lines">@@ -173,7 +180,7 @@
</span><span class="cx"> UserGestureIndicator gestureIndicator(userGestureToForward());
</span><span class="cx"> bool refresh = equalIgnoringFragmentIdentifier(frame.document()->url(), url());
</span><span class="cx"> ResourceRequest resourceRequest(url(), referrer(), refresh ? ReloadIgnoringCacheData : UseProtocolCachePolicy);
</span><del>- FrameLoadRequest frameRequest(securityOrigin(), resourceRequest, "_self", lockHistory(), lockBackForwardList(), MaybeSendReferrer, AllowNavigationToInvalidURL::No, NewFrameOpenerPolicy::Allow, m_shouldOpenExternalURLsPolicy);
</del><ins>+ FrameLoadRequest frameRequest(securityOrigin(), resourceRequest, "_self", lockHistory(), lockBackForwardList(), MaybeSendReferrer, AllowNavigationToInvalidURL::No, NewFrameOpenerPolicy::Allow, shouldOpenExternalURLs());
</ins><span class="cx">
</span><span class="cx"> frame.loader().changeLocation(frameRequest);
</span><span class="cx"> }
</span><span class="lines">@@ -181,7 +188,7 @@
</span><span class="cx">
</span><span class="cx"> class ScheduledLocationChange : public ScheduledURLNavigation {
</span><span class="cx"> public:
</span><del>- ScheduledLocationChange(Document* initiatingDocument, SecurityOrigin* securityOrigin, const URL& url, const String& referrer, LockHistory lockHistory, LockBackForwardList lockBackForwardList, bool duringLoad)
</del><ins>+ ScheduledLocationChange(Document& initiatingDocument, SecurityOrigin* securityOrigin, const URL& url, const String& referrer, LockHistory lockHistory, LockBackForwardList lockBackForwardList, bool duringLoad)
</ins><span class="cx"> : ScheduledURLNavigation(initiatingDocument, 0.0, securityOrigin, url, referrer, lockHistory, lockBackForwardList, duringLoad, true) { }
</span><span class="cx">
</span><span class="cx"> void fire(Frame& frame) override
</span><span class="lines">@@ -189,7 +196,7 @@
</span><span class="cx"> UserGestureIndicator gestureIndicator(userGestureToForward());
</span><span class="cx">
</span><span class="cx"> ResourceRequest resourceRequest(url(), referrer(), UseProtocolCachePolicy);
</span><del>- FrameLoadRequest frameRequest(securityOrigin(), resourceRequest, "_self", lockHistory(), lockBackForwardList(), MaybeSendReferrer, AllowNavigationToInvalidURL::No, NewFrameOpenerPolicy::Allow, m_shouldOpenExternalURLsPolicy);
</del><ins>+ FrameLoadRequest frameRequest(securityOrigin(), resourceRequest, "_self", lockHistory(), lockBackForwardList(), MaybeSendReferrer, AllowNavigationToInvalidURL::No, NewFrameOpenerPolicy::Allow, shouldOpenExternalURLs());
</ins><span class="cx"> frame.loader().changeLocation(frameRequest);
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="lines">@@ -196,7 +203,7 @@
</span><span class="cx">
</span><span class="cx"> class ScheduledRefresh : public ScheduledURLNavigation {
</span><span class="cx"> public:
</span><del>- ScheduledRefresh(Document* initiatingDocument, SecurityOrigin* securityOrigin, const URL& url, const String& referrer)
</del><ins>+ ScheduledRefresh(Document& initiatingDocument, SecurityOrigin* securityOrigin, const URL& url, const String& referrer)
</ins><span class="cx"> : ScheduledURLNavigation(initiatingDocument, 0.0, securityOrigin, url, referrer, LockHistory::Yes, LockBackForwardList::Yes, false, true)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -206,7 +213,7 @@
</span><span class="cx"> UserGestureIndicator gestureIndicator(userGestureToForward());
</span><span class="cx">
</span><span class="cx"> ResourceRequest resourceRequest(url(), referrer(), ReloadIgnoringCacheData);
</span><del>- FrameLoadRequest frameRequest(securityOrigin(), resourceRequest, "_self", lockHistory(), lockBackForwardList(), MaybeSendReferrer, AllowNavigationToInvalidURL::Yes, NewFrameOpenerPolicy::Allow, m_shouldOpenExternalURLsPolicy);
</del><ins>+ FrameLoadRequest frameRequest(securityOrigin(), resourceRequest, "_self", lockHistory(), lockBackForwardList(), MaybeSendReferrer, AllowNavigationToInvalidURL::Yes, NewFrameOpenerPolicy::Allow, shouldOpenExternalURLs());
</ins><span class="cx"> frame.loader().changeLocation(frameRequest);
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="lines">@@ -226,7 +233,7 @@
</span><span class="cx"> if (!m_historySteps) {
</span><span class="cx"> // Special case for go(0) from a frame -> reload only the frame
</span><span class="cx"> // To follow Firefox and IE's behavior, history reload can only navigate the self frame.
</span><del>- frame.loader().urlSelected(frame.document()->url(), "_self", 0, lockHistory(), lockBackForwardList(), MaybeSendReferrer, m_shouldOpenExternalURLsPolicy);
</del><ins>+ frame.loader().urlSelected(frame.document()->url(), "_self", 0, lockHistory(), lockBackForwardList(), MaybeSendReferrer, shouldOpenExternalURLs());
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -241,15 +248,10 @@
</span><span class="cx">
</span><span class="cx"> class ScheduledFormSubmission : public ScheduledNavigation {
</span><span class="cx"> public:
</span><del>- ScheduledFormSubmission(PassRefPtr<FormSubmission> submission, LockBackForwardList lockBackForwardList, bool duringLoad)
- : ScheduledNavigation(0, submission->lockHistory(), lockBackForwardList, duringLoad, true)
- , m_submission(submission)
- , m_haveToldClient(false)
</del><ins>+ ScheduledFormSubmission(Ref<FormSubmission>&& submission, LockBackForwardList lockBackForwardList, bool duringLoad)
+ : ScheduledNavigation(0, submission->lockHistory(), lockBackForwardList, duringLoad, true, submission->state().sourceDocument().shouldOpenExternalURLsPolicyToPropagate())
+ , m_submission(WTFMove(submission))
</ins><span class="cx"> {
</span><del>- ASSERT(m_submission->state());
-
- if (Document* document = m_submission->state()->sourceDocument())
- m_shouldOpenExternalURLsPolicy = document->shouldOpenExternalURLsPolicyToPropagate();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void fire(Frame& frame) override
</span><span class="lines">@@ -260,14 +262,14 @@
</span><span class="cx"> // Now that the timer has fired, we need to repeat the security check which normally is done when
</span><span class="cx"> // selecting a target, in case conditions have changed. Other code paths avoid this by targeting
</span><span class="cx"> // without leaving a time window. If we fail the check just silently drop the form submission.
</span><del>- Document* requestingDocument = m_submission->state()->sourceDocument();
- if (!requestingDocument->canNavigate(&frame))
</del><ins>+ auto& requestingDocument = m_submission->state().sourceDocument();
+ if (!requestingDocument.canNavigate(&frame))
</ins><span class="cx"> return;
</span><del>- FrameLoadRequest frameRequest(requestingDocument->securityOrigin(), lockHistory(), lockBackForwardList(), MaybeSendReferrer, AllowNavigationToInvalidURL::Yes, NewFrameOpenerPolicy::Allow, m_shouldOpenExternalURLsPolicy);
</del><ins>+ FrameLoadRequest frameRequest(requestingDocument.securityOrigin(), lockHistory(), lockBackForwardList(), MaybeSendReferrer, AllowNavigationToInvalidURL::Yes, NewFrameOpenerPolicy::Allow, shouldOpenExternalURLs());
</ins><span class="cx"> m_submission->populateFrameLoadRequest(frameRequest);
</span><del>- frame.loader().loadFrameRequest(frameRequest, m_submission->event(), m_submission->state());
</del><ins>+ frame.loader().loadFrameRequest(frameRequest, m_submission->event(), &m_submission->state());
</ins><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> void didStartTimer(Frame& frame, Timer& timer) override
</span><span class="cx"> {
</span><span class="cx"> if (m_haveToldClient)
</span><span class="lines">@@ -293,8 +295,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- RefPtr<FormSubmission> m_submission;
- bool m_haveToldClient;
</del><ins>+ Ref<FormSubmission> m_submission;
+ bool m_haveToldClient { false };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class ScheduledPageBlock final : public ScheduledNavigation {
</span><span class="lines">@@ -313,7 +315,7 @@
</span><span class="cx"> SubstituteData replacementData(SharedBuffer::create(), m_originDocument.url(), replacementResponse, SubstituteData::SessionHistoryVisibility::Hidden);
</span><span class="cx">
</span><span class="cx"> ResourceRequest resourceRequest(m_originDocument.url(), emptyString(), ReloadIgnoringCacheData);
</span><del>- FrameLoadRequest frameRequest(m_originDocument.securityOrigin(), resourceRequest, lockHistory(), lockBackForwardList(), MaybeSendReferrer, AllowNavigationToInvalidURL::Yes, NewFrameOpenerPolicy::Allow, m_shouldOpenExternalURLsPolicy);
</del><ins>+ FrameLoadRequest frameRequest(m_originDocument.securityOrigin(), resourceRequest, lockHistory(), lockBackForwardList(), MaybeSendReferrer, AllowNavigationToInvalidURL::Yes, NewFrameOpenerPolicy::Allow, shouldOpenExternalURLs());
</ins><span class="cx"> frameRequest.setSubstituteData(replacementData);
</span><span class="cx"> frame.loader().load(frameRequest);
</span><span class="cx"> }
</span><span class="lines">@@ -364,7 +366,7 @@
</span><span class="cx"> return NavigationDisablerForBeforeUnload::isNavigationAllowed();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NavigationScheduler::scheduleRedirect(Document* initiatingDocument, double delay, const URL& url)
</del><ins>+void NavigationScheduler::scheduleRedirect(Document& initiatingDocument, double delay, const URL& url)
</ins><span class="cx"> {
</span><span class="cx"> if (!shouldScheduleNavigation(url))
</span><span class="cx"> return;
</span><span class="lines">@@ -375,7 +377,7 @@
</span><span class="cx">
</span><span class="cx"> // We want a new back/forward list item if the refresh timeout is > 1 second.
</span><span class="cx"> if (!m_redirect || delay <= m_redirect->delay()) {
</span><del>- LockBackForwardList lockBackForwardList = delay <= 1 ? LockBackForwardList::Yes : LockBackForwardList::No;
</del><ins>+ auto lockBackForwardList = delay <= 1 ? LockBackForwardList::Yes : LockBackForwardList::No;
</ins><span class="cx"> schedule(std::make_unique<ScheduledRedirect>(initiatingDocument, delay, m_frame.document()->securityOrigin(), url, LockHistory::Yes, lockBackForwardList));
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -398,7 +400,7 @@
</span><span class="cx"> return LockBackForwardList::No;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NavigationScheduler::scheduleLocationChange(Document* initiatingDocument, SecurityOrigin* securityOrigin, const URL& url, const String& referrer, LockHistory lockHistory, LockBackForwardList lockBackForwardList)
</del><ins>+void NavigationScheduler::scheduleLocationChange(Document& initiatingDocument, SecurityOrigin* securityOrigin, const URL& url, const String& referrer, LockHistory lockHistory, LockBackForwardList lockBackForwardList)
</ins><span class="cx"> {
</span><span class="cx"> if (!shouldScheduleNavigation(url))
</span><span class="cx"> return;
</span><span class="lines">@@ -412,10 +414,7 @@
</span><span class="cx"> // fragment part, we don't need to schedule the location change.
</span><span class="cx"> if (url.hasFragmentIdentifier() && equalIgnoringFragmentIdentifier(m_frame.document()->url(), url)) {
</span><span class="cx"> ResourceRequest resourceRequest(m_frame.document()->completeURL(url), referrer, UseProtocolCachePolicy);
</span><del>- ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicy = ShouldOpenExternalURLsPolicy::ShouldNotAllow;
- if (initiatingDocument)
- shouldOpenExternalURLsPolicy = initiatingDocument->shouldOpenExternalURLsPolicyToPropagate();
- FrameLoadRequest frameRequest(securityOrigin, resourceRequest, "_self", lockHistory, lockBackForwardList, MaybeSendReferrer, AllowNavigationToInvalidURL::No, NewFrameOpenerPolicy::Allow, ReplaceDocumentIfJavaScriptURL, shouldOpenExternalURLsPolicy);
</del><ins>+ FrameLoadRequest frameRequest(securityOrigin, resourceRequest, "_self", lockHistory, lockBackForwardList, MaybeSendReferrer, AllowNavigationToInvalidURL::No, NewFrameOpenerPolicy::Allow, ReplaceDocumentIfJavaScriptURL, initiatingDocument.shouldOpenExternalURLsPolicyToPropagate());
</ins><span class="cx"> loader.changeLocation(frameRequest);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -427,7 +426,7 @@
</span><span class="cx"> schedule(std::make_unique<ScheduledLocationChange>(initiatingDocument, securityOrigin, url, referrer, lockHistory, lockBackForwardList, duringLoad));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NavigationScheduler::scheduleFormSubmission(PassRefPtr<FormSubmission> submission)
</del><ins>+void NavigationScheduler::scheduleFormSubmission(Ref<FormSubmission>&& submission)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_frame.page());
</span><span class="cx">
</span><span class="lines">@@ -443,14 +442,14 @@
</span><span class="cx"> // See https://bugs.webkit.org/show_bug.cgi?id=32383 for the original motivation for this.
</span><span class="cx"> LockBackForwardList lockBackForwardList = mustLockBackForwardList(m_frame);
</span><span class="cx"> if (lockBackForwardList == LockBackForwardList::No
</span><del>- && (submission->state()->formSubmissionTrigger() == SubmittedByJavaScript && m_frame.tree().parent() && !UserGestureIndicator::processingUserGesture())) {
</del><ins>+ && (submission->state().formSubmissionTrigger() == SubmittedByJavaScript && m_frame.tree().parent() && !UserGestureIndicator::processingUserGesture())) {
</ins><span class="cx"> lockBackForwardList = LockBackForwardList::Yes;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- schedule(std::make_unique<ScheduledFormSubmission>(submission, lockBackForwardList, duringLoad));
</del><ins>+ schedule(std::make_unique<ScheduledFormSubmission>(WTFMove(submission), lockBackForwardList, duringLoad));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void NavigationScheduler::scheduleRefresh(Document* initiatingDocument)
</del><ins>+void NavigationScheduler::scheduleRefresh(Document& initiatingDocument)
</ins><span class="cx"> {
</span><span class="cx"> if (!shouldScheduleNavigation())
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderNavigationSchedulerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/NavigationScheduler.h (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/NavigationScheduler.h 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/loader/NavigationScheduler.h 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2006-2016 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2006-2017 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
</span><span class="cx"> * Copyright (C) 2009 Adam Barth. All rights reserved.
</span><span class="cx"> *
</span><span class="lines">@@ -68,10 +68,10 @@
</span><span class="cx"> bool redirectScheduledDuringLoad();
</span><span class="cx"> bool locationChangePending();
</span><span class="cx">
</span><del>- void scheduleRedirect(Document* initiatingDocument, double delay, const URL&);
- void scheduleLocationChange(Document* initiatingDocument, SecurityOrigin*, const URL&, const String& referrer, LockHistory = LockHistory::Yes, LockBackForwardList = LockBackForwardList::Yes);
- void scheduleFormSubmission(PassRefPtr<FormSubmission>);
- void scheduleRefresh(Document* initiatingDocument);
</del><ins>+ void scheduleRedirect(Document& initiatingDocument, double delay, const URL&);
+ void scheduleLocationChange(Document& initiatingDocument, SecurityOrigin*, const URL&, const String& referrer, LockHistory = LockHistory::Yes, LockBackForwardList = LockBackForwardList::Yes);
+ void scheduleFormSubmission(Ref<FormSubmission>&&);
+ void scheduleRefresh(Document& initiatingDocument);
</ins><span class="cx"> void scheduleHistoryNavigation(int steps);
</span><span class="cx"> void schedulePageBlock(Document& originDocument);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceLoader.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceLoader.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/loader/ResourceLoader.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -191,7 +191,7 @@
</span><span class="cx"> return;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- if (m_documentLoader->applicationCacheHost()->maybeLoadResource(*this, m_request, m_request.url()))
</del><ins>+ if (m_documentLoader->applicationCacheHost().maybeLoadResource(*this, m_request, m_request.url()))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (m_defersLoading) {
</span><span class="lines">@@ -607,7 +607,7 @@
</span><span class="cx">
</span><span class="cx"> ResourceRequest ResourceLoader::willSendRequest(ResourceHandle*, ResourceRequest&& request, ResourceResponse&& redirectResponse)
</span><span class="cx"> {
</span><del>- if (documentLoader()->applicationCacheHost()->maybeLoadFallbackForRedirect(this, request, redirectResponse))
</del><ins>+ if (documentLoader()->applicationCacheHost().maybeLoadFallbackForRedirect(this, request, redirectResponse))
</ins><span class="cx"> return WTFMove(request);
</span><span class="cx"> willSendRequestInternal(request, redirectResponse);
</span><span class="cx"> return WTFMove(request);
</span><span class="lines">@@ -620,7 +620,7 @@
</span><span class="cx">
</span><span class="cx"> void ResourceLoader::didReceiveResponse(ResourceHandle*, ResourceResponse&& response)
</span><span class="cx"> {
</span><del>- if (documentLoader()->applicationCacheHost()->maybeLoadFallbackForResponse(this, response))
</del><ins>+ if (documentLoader()->applicationCacheHost().maybeLoadFallbackForResponse(this, response))
</ins><span class="cx"> return;
</span><span class="cx"> didReceiveResponse(response);
</span><span class="cx"> }
</span><span class="lines">@@ -642,7 +642,7 @@
</span><span class="cx">
</span><span class="cx"> void ResourceLoader::didFail(ResourceHandle*, const ResourceError& error)
</span><span class="cx"> {
</span><del>- if (documentLoader()->applicationCacheHost()->maybeLoadFallbackForError(this, error))
</del><ins>+ if (documentLoader()->applicationCacheHost().maybeLoadFallbackForError(this, error))
</ins><span class="cx"> return;
</span><span class="cx"> didFail(error);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderSubframeLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/SubframeLoader.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/SubframeLoader.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/loader/SubframeLoader.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2006-2016 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2006-2017 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
</span><span class="cx"> * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
</span><span class="cx"> * Copyright (C) 2008 Alp Toker <alp@atoker.com>
</span><span class="lines">@@ -107,23 +107,25 @@
</span><span class="cx">
</span><span class="cx"> bool SubframeLoader::pluginIsLoadable(const URL& url, const String& mimeType)
</span><span class="cx"> {
</span><ins>+ auto* document = m_frame.document();
+
</ins><span class="cx"> if (MIMETypeRegistry::isJavaAppletMIMEType(mimeType)) {
</span><span class="cx"> if (!m_frame.settings().isJavaEnabled())
</span><span class="cx"> return false;
</span><del>- if (document() && document()->securityOrigin()->isLocal() && !m_frame.settings().isJavaEnabledForLocalFiles())
</del><ins>+ if (document && document->securityOrigin()->isLocal() && !m_frame.settings().isJavaEnabledForLocalFiles())
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (document()) {
- if (document()->isSandboxed(SandboxPlugins))
</del><ins>+ if (document) {
+ if (document->isSandboxed(SandboxPlugins))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- if (!document()->securityOrigin()->canDisplay(url)) {
</del><ins>+ if (!document->securityOrigin()->canDisplay(url)) {
</ins><span class="cx"> FrameLoader::reportLocalLoadFailed(&m_frame, url.string());
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!m_frame.loader().mixedContentChecker().canRunInsecureContent(document()->securityOrigin(), url))
</del><ins>+ if (!m_frame.loader().mixedContentChecker().canRunInsecureContent(document->securityOrigin(), url))
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -204,11 +206,13 @@
</span><span class="cx"> if (url.isEmpty() && mimeType.isEmpty())
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ auto& document = ownerElement.document();
+
</ins><span class="cx"> URL completedURL;
</span><span class="cx"> if (!url.isEmpty())
</span><span class="cx"> completedURL = completeURL(url);
</span><span class="cx">
</span><del>- document()->contentSecurityPolicy()->upgradeInsecureRequestIfNeeded(completedURL, ContentSecurityPolicy::InsecureRequestType::Load);
</del><ins>+ document.contentSecurityPolicy()->upgradeInsecureRequestIfNeeded(completedURL, ContentSecurityPolicy::InsecureRequestType::Load);
</ins><span class="cx">
</span><span class="cx"> bool hasFallbackContent = is<HTMLObjectElement>(ownerElement) && downcast<HTMLObjectElement>(ownerElement).hasFallbackContent();
</span><span class="cx">
</span><span class="lines">@@ -215,7 +219,7 @@
</span><span class="cx"> bool useFallback;
</span><span class="cx"> if (shouldUsePlugin(completedURL, mimeType, hasFallbackContent, useFallback)) {
</span><span class="cx"> bool success = requestPlugin(ownerElement, completedURL, mimeType, paramNames, paramValues, useFallback);
</span><del>- logPluginRequest(document()->page(), mimeType, completedURL, success);
</del><ins>+ logPluginRequest(document.page(), mimeType, completedURL, success);
</ins><span class="cx"> return success;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -225,7 +229,7 @@
</span><span class="cx"> return loadOrRedirectSubframe(ownerElement, completedURL, frameName, LockHistory::Yes, LockBackForwardList::Yes);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Widget> SubframeLoader::createJavaAppletWidget(const IntSize& size, HTMLAppletElement& element, const Vector<String>& paramNames, const Vector<String>& paramValues)
</del><ins>+RefPtr<Widget> SubframeLoader::createJavaAppletWidget(const IntSize& size, HTMLAppletElement& element, const Vector<String>& paramNames, const Vector<String>& paramValues)
</ins><span class="cx"> {
</span><span class="cx"> String baseURLString;
</span><span class="cx"> String codeBaseURLString;
</span><span class="lines">@@ -254,14 +258,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (baseURLString.isEmpty())
</span><del>- baseURLString = m_frame.document()->baseURL().string();
</del><ins>+ baseURLString = element.document().baseURL().string();
</ins><span class="cx"> URL baseURL = completeURL(baseURLString);
</span><span class="cx">
</span><span class="cx"> RefPtr<Widget> widget;
</span><span class="cx"> if (allowPlugins())
</span><del>- widget = m_frame.loader().client().createJavaAppletWidget(size, &element, baseURL, paramNames, paramValues);
</del><ins>+ widget = m_frame.loader().client().createJavaAppletWidget(size, element, baseURL, paramNames, paramValues);
</ins><span class="cx">
</span><del>- logPluginRequest(document()->page(), element.serviceType(), String(), widget);
</del><ins>+ logPluginRequest(m_frame.page(), element.serviceType(), String(), widget);
</ins><span class="cx">
</span><span class="cx"> if (!widget) {
</span><span class="cx"> RenderEmbeddedObject* renderer = element.renderEmbeddedObject();
</span><span class="lines">@@ -275,16 +279,18 @@
</span><span class="cx"> return widget;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Frame* SubframeLoader::loadOrRedirectSubframe(HTMLFrameOwnerElement& ownerElement, const URL& requestUrl, const AtomicString& frameName, LockHistory lockHistory, LockBackForwardList lockBackForwardList)
</del><ins>+Frame* SubframeLoader::loadOrRedirectSubframe(HTMLFrameOwnerElement& ownerElement, const URL& requestURL, const AtomicString& frameName, LockHistory lockHistory, LockBackForwardList lockBackForwardList)
</ins><span class="cx"> {
</span><del>- URL url = requestUrl;
- ownerElement.document().contentSecurityPolicy()->upgradeInsecureRequestIfNeeded(url, ContentSecurityPolicy::InsecureRequestType::Load);
</del><ins>+ auto& initiatingDocument = ownerElement.document();
</ins><span class="cx">
</span><del>- Frame* frame = ownerElement.contentFrame();
</del><ins>+ URL upgradedRequestURL = requestURL;
+ initiatingDocument.contentSecurityPolicy()->upgradeInsecureRequestIfNeeded(upgradedRequestURL, ContentSecurityPolicy::InsecureRequestType::Load);
+
+ auto* frame = ownerElement.contentFrame();
</ins><span class="cx"> if (frame)
</span><del>- frame->navigationScheduler().scheduleLocationChange(m_frame.document(), m_frame.document()->securityOrigin(), url, m_frame.loader().outgoingReferrer(), lockHistory, lockBackForwardList);
</del><ins>+ frame->navigationScheduler().scheduleLocationChange(initiatingDocument, initiatingDocument.securityOrigin(), upgradedRequestURL, m_frame.loader().outgoingReferrer(), lockHistory, lockBackForwardList);
</ins><span class="cx"> else
</span><del>- frame = loadSubframe(ownerElement, url, frameName, m_frame.loader().outgoingReferrer());
</del><ins>+ frame = loadSubframe(ownerElement, upgradedRequestURL, frameName, m_frame.loader().outgoingReferrer());
</ins><span class="cx">
</span><span class="cx"> if (!frame)
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -301,13 +307,15 @@
</span><span class="cx"> int marginWidth = -1;
</span><span class="cx"> int marginHeight = -1;
</span><span class="cx"> if (is<HTMLFrameElementBase>(ownerElement)) {
</span><del>- HTMLFrameElementBase& frameElementBase = downcast<HTMLFrameElementBase>(ownerElement);
</del><ins>+ auto& frameElementBase = downcast<HTMLFrameElementBase>(ownerElement);
</ins><span class="cx"> allowsScrolling = frameElementBase.scrollingMode() != ScrollbarAlwaysOff;
</span><span class="cx"> marginWidth = frameElementBase.marginWidth();
</span><span class="cx"> marginHeight = frameElementBase.marginHeight();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!ownerElement.document().securityOrigin()->canDisplay(url)) {
</del><ins>+ auto document = makeRef(ownerElement.document());
+
+ if (!document->securityOrigin()->canDisplay(url)) {
</ins><span class="cx"> FrameLoader::reportLocalLoadFailed(&m_frame, url.string());
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="lines">@@ -315,20 +323,20 @@
</span><span class="cx"> if (!SubframeLoadingDisabler::canLoadFrame(ownerElement))
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- String referrerToUse = SecurityPolicy::generateReferrerHeader(ownerElement.document().referrerPolicy(), url, referrer);
</del><ins>+ String referrerToUse = SecurityPolicy::generateReferrerHeader(document->referrerPolicy(), url, referrer);
</ins><span class="cx">
</span><span class="cx"> // Prevent initial empty document load from triggering load events.
</span><del>- m_frame.document()->incrementLoadEventDelayCount();
</del><ins>+ document->incrementLoadEventDelayCount();
</ins><span class="cx">
</span><del>- RefPtr<Frame> frame = m_frame.loader().client().createFrame(url, name, &ownerElement, referrerToUse, allowsScrolling, marginWidth, marginHeight);
</del><ins>+ auto frame = m_frame.loader().client().createFrame(url, name, ownerElement, referrerToUse, allowsScrolling, marginWidth, marginHeight);
</ins><span class="cx">
</span><del>- m_frame.document()->decrementLoadEventDelayCount();
</del><ins>+ document->decrementLoadEventDelayCount();
</ins><span class="cx">
</span><span class="cx"> if (!frame) {
</span><span class="cx"> m_frame.loader().checkCallImplicitClose();
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // All new frames will have m_isComplete set to true at this point due to synchronously loading
</span><span class="cx"> // an empty document in FrameLoader::init(). But many frames will now be starting an
</span><span class="cx"> // asynchronous load of url, so we set m_isComplete to false and then check if the load is
</span><span class="lines">@@ -338,12 +346,12 @@
</span><span class="cx"> frame->loader().started();
</span><span class="cx">
</span><span class="cx"> auto* renderer = ownerElement.renderer();
</span><del>- FrameView* view = frame->view();
</del><ins>+ auto* view = frame->view();
</ins><span class="cx"> if (is<RenderWidget>(renderer) && view)
</span><span class="cx"> downcast<RenderWidget>(*renderer).setWidget(view);
</span><del>-
</del><ins>+
</ins><span class="cx"> m_frame.loader().checkCallImplicitClose();
</span><del>-
</del><ins>+
</ins><span class="cx"> // Some loads are performed synchronously (e.g., about:blank and loads
</span><span class="cx"> // cancelled by returning a null ResourceRequest from requestFromDelegate).
</span><span class="cx"> // In these cases, the synchronous load would have finished
</span><span class="lines">@@ -379,17 +387,14 @@
</span><span class="cx"> return objectType == ObjectContentType::None || objectType == ObjectContentType::PlugIn;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Document* SubframeLoader::document() const
-{
- return m_frame.document();
-}
-
</del><span class="cx"> bool SubframeLoader::loadPlugin(HTMLPlugInImageElement& pluginElement, const URL& url, const String& mimeType, const Vector<String>& paramNames, const Vector<String>& paramValues, bool useFallback)
</span><span class="cx"> {
</span><span class="cx"> if (useFallback)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- RenderEmbeddedObject* renderer = pluginElement.renderEmbeddedObject();
</del><ins>+ auto& document = pluginElement.document();
+ auto* renderer = pluginElement.renderEmbeddedObject();
+
</ins><span class="cx"> // FIXME: This code should not depend on renderer!
</span><span class="cx"> if (!renderer)
</span><span class="cx"> return false;
</span><span class="lines">@@ -397,17 +402,19 @@
</span><span class="cx"> pluginElement.subframeLoaderWillCreatePlugIn(url);
</span><span class="cx">
</span><span class="cx"> IntSize contentSize = roundedIntSize(LayoutSize(renderer->contentWidth(), renderer->contentHeight()));
</span><del>- bool loadManually = is<PluginDocument>(*document()) && !m_containsPlugins && downcast<PluginDocument>(*document()).shouldLoadPluginManually();
</del><ins>+ bool loadManually = is<PluginDocument>(document) && !m_containsPlugins && downcast<PluginDocument>(document).shouldLoadPluginManually();
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> // On iOS, we only tell the plugin to be in full page mode if the containing plugin document is the top level document.
</span><del>- if (document()->ownerElement())
</del><ins>+ if (document.ownerElement())
</ins><span class="cx"> loadManually = false;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- WeakPtr<RenderWidget> weakRenderer = renderer->createWeakPtr();
- // createPlugin *may* cause this renderer to disappear from underneath.
- RefPtr<Widget> widget = m_frame.loader().client().createPlugin(contentSize, &pluginElement, url, paramNames, paramValues, mimeType, loadManually);
</del><ins>+ auto weakRenderer = renderer->createWeakPtr();
+
+ auto widget = m_frame.loader().client().createPlugin(contentSize, pluginElement, url, paramNames, paramValues, mimeType, loadManually);
+
+ // The call to createPlugin *may* cause this renderer to disappear from underneath.
</ins><span class="cx"> if (!weakRenderer)
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -431,9 +438,7 @@
</span><span class="cx">
</span><span class="cx"> bool SubframeLoader::shouldConvertInvalidURLsToBlank() const
</span><span class="cx"> {
</span><del>- if (Settings* settings = document() ? document()->settings() : nullptr)
- return settings->shouldConvertInvalidURLsToBlank();
- return true;
</del><ins>+ return m_frame.settings().shouldConvertInvalidURLsToBlank();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderSubframeLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/SubframeLoader.h (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/SubframeLoader.h 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/loader/SubframeLoader.h 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> bool requestObject(HTMLPlugInImageElement&, const String& url, const AtomicString& frameName,
</span><span class="cx"> const String& serviceType, const Vector<String>& paramNames, const Vector<String>& paramValues);
</span><span class="cx">
</span><del>- PassRefPtr<Widget> createJavaAppletWidget(const IntSize&, HTMLAppletElement&, const Vector<String>& paramNames, const Vector<String>& paramValues);
</del><ins>+ RefPtr<Widget> createJavaAppletWidget(const IntSize&, HTMLAppletElement&, const Vector<String>& paramNames, const Vector<String>& paramValues);
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT bool allowPlugins();
</span><span class="cx">
</span><span class="lines">@@ -78,14 +78,12 @@
</span><span class="cx"> bool shouldUsePlugin(const URL&, const String& mimeType, bool hasFallback, bool& useFallback);
</span><span class="cx"> bool pluginIsLoadable(const URL&, const String& mimeType);
</span><span class="cx">
</span><del>- Document* document() const;
</del><ins>+ URL completeURL(const String&) const;
</ins><span class="cx">
</span><span class="cx"> bool shouldConvertInvalidURLsToBlank() const;
</span><span class="cx">
</span><span class="cx"> bool m_containsPlugins;
</span><span class="cx"> Frame& m_frame;
</span><del>-
- URL completeURL(const String&) const;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderSubresourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/SubresourceLoader.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/SubresourceLoader.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/loader/SubresourceLoader.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -256,6 +256,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if USE(QUICK_LOOK)
</span><ins>+
</ins><span class="cx"> bool SubresourceLoader::shouldCreateQuickLookHandleForResponse(const ResourceResponse& response) const
</span><span class="cx"> {
</span><span class="cx"> if (m_resource->type() != CachedResource::MainResource)
</span><span class="lines">@@ -266,6 +267,7 @@
</span><span class="cx">
</span><span class="cx"> return QuickLookHandle::shouldCreateForMIMEType(response.mimeType());
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void SubresourceLoader::didReceiveResponse(const ResourceResponse& response)
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderappcacheApplicationCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/appcache/ApplicationCache.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/appcache/ApplicationCache.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/loader/appcache/ApplicationCache.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -42,10 +42,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ApplicationCache::ApplicationCache()
</span><del>- : m_group(nullptr)
- , m_manifest(nullptr)
- , m_estimatedSizeInStorage(0)
- , m_storageID(0)
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -52,7 +48,7 @@
</span><span class="cx"> ApplicationCache::~ApplicationCache()
</span><span class="cx"> {
</span><span class="cx"> if (m_group)
</span><del>- m_group->cacheDestroyed(this);
</del><ins>+ m_group->cacheDestroyed(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ApplicationCache::setGroup(ApplicationCacheGroup* group)
</span><span class="lines">@@ -63,57 +59,39 @@
</span><span class="cx">
</span><span class="cx"> bool ApplicationCache::isComplete()
</span><span class="cx"> {
</span><del>- return m_group && m_group->cacheIsComplete(this);
</del><ins>+ return m_group && m_group->cacheIsComplete(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void ApplicationCache::setManifestResource(PassRefPtr<ApplicationCacheResource> manifest)
</del><ins>+void ApplicationCache::setManifestResource(Ref<ApplicationCacheResource>&& manifest)
</ins><span class="cx"> {
</span><del>- ASSERT(manifest);
</del><span class="cx"> ASSERT(!m_manifest);
</span><span class="cx"> ASSERT(manifest->type() & ApplicationCacheResource::Manifest);
</span><del>-
- m_manifest = manifest.get();
-
- addResource(manifest);
</del><ins>+
+ m_manifest = manifest.ptr();
+
+ addResource(WTFMove(manifest));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void ApplicationCache::addResource(PassRefPtr<ApplicationCacheResource> resource)
</del><ins>+void ApplicationCache::addResource(Ref<ApplicationCacheResource>&& resource)
</ins><span class="cx"> {
</span><del>- ASSERT(resource);
-
- const String& url = resource->url();
-
</del><ins>+ auto& url = resource->url();
+
+ ASSERT(!URL(ParsedURLString, url).hasFragmentIdentifier());
</ins><span class="cx"> ASSERT(!m_resources.contains(url));
</span><del>-
</del><ins>+
</ins><span class="cx"> if (m_storageID) {
</span><span class="cx"> ASSERT(!resource->storageID());
</span><span class="cx"> ASSERT(resource->type() & ApplicationCacheResource::Master);
</span><del>-
</del><ins>+
</ins><span class="cx"> // Add the resource to the storage.
</span><del>- m_group->storage().store(resource.get(), this);
</del><ins>+ m_group->storage().store(resource.ptr(), this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_estimatedSizeInStorage += resource->estimatedSizeInStorage();
</span><span class="cx">
</span><del>- m_resources.set(url, resource);
</del><ins>+ m_resources.set(url, WTFMove(resource));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-unsigned ApplicationCache::removeResource(const String& url)
-{
- HashMap<String, RefPtr<ApplicationCacheResource>>::iterator it = m_resources.find(url);
- if (it == m_resources.end())
- return 0;
-
- // The resource exists, get its type so we can return it.
- unsigned type = it->value->type();
-
- m_estimatedSizeInStorage -= it->value->estimatedSizeInStorage();
-
- m_resources.remove(it);
-
- return type;
-}
-
</del><span class="cx"> ApplicationCacheResource* ApplicationCache::resourceForURL(const String& url)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!URL(ParsedURLString, url).hasFragmentIdentifier());
</span><span class="lines">@@ -132,9 +110,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> URL url(request.url());
</span><del>- if (url.hasFragmentIdentifier())
- url.removeFragmentIdentifier();
-
</del><ins>+ url.removeFragmentIdentifier();
</ins><span class="cx"> return resourceForURL(url);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderappcacheApplicationCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/appcache/ApplicationCache.h (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/appcache/ApplicationCache.h 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/loader/appcache/ApplicationCache.h 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2008 Apple Inc. All Rights Reserved.
</del><ins>+ * Copyright (C) 2008-2017 Apple Inc. All Rights Reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -26,32 +26,28 @@
</span><span class="cx"> #pragma once
</span><span class="cx">
</span><span class="cx"> #include <wtf/HashMap.h>
</span><del>-#include <wtf/PassRefPtr.h>
-#include <wtf/RefCounted.h>
</del><span class="cx"> #include <wtf/text/StringHash.h>
</span><del>-#include <wtf/text/WTFString.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class ApplicationCacheGroup;
</span><span class="cx"> class ApplicationCacheResource;
</span><ins>+class ResourceRequest;
</ins><span class="cx"> class URL;
</span><del>-class ResourceRequest;
</del><span class="cx">
</span><del>-typedef Vector<std::pair<URL, URL>> FallbackURLVector;
</del><ins>+using FallbackURLVector = Vector<std::pair<URL, URL>>;
</ins><span class="cx">
</span><span class="cx"> class ApplicationCache : public RefCounted<ApplicationCache> {
</span><span class="cx"> public:
</span><span class="cx"> static Ref<ApplicationCache> create() { return adoptRef(*new ApplicationCache); }
</span><del>-
</del><ins>+
</ins><span class="cx"> ~ApplicationCache();
</span><span class="cx">
</span><del>- void addResource(PassRefPtr<ApplicationCacheResource> resource);
- unsigned removeResource(const String& url);
-
- void setManifestResource(PassRefPtr<ApplicationCacheResource> manifest);
</del><ins>+ void addResource(Ref<ApplicationCacheResource>&&);
+
+ void setManifestResource(Ref<ApplicationCacheResource>&&);
</ins><span class="cx"> ApplicationCacheResource* manifestResource() const { return m_manifest; }
</span><del>-
</del><ins>+
</ins><span class="cx"> void setGroup(ApplicationCacheGroup*);
</span><span class="cx"> ApplicationCacheGroup* group() const { return m_group; }
</span><span class="cx">
</span><span class="lines">@@ -69,18 +65,18 @@
</span><span class="cx"> void setFallbackURLs(const FallbackURLVector&);
</span><span class="cx"> const FallbackURLVector& fallbackURLs() const { return m_fallbackURLs; }
</span><span class="cx"> bool urlMatchesFallbackNamespace(const URL&, URL* fallbackURL = nullptr);
</span><del>-
</del><ins>+
</ins><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> void dump();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- typedef HashMap<String, RefPtr<ApplicationCacheResource>> ResourceMap;
</del><ins>+ using ResourceMap = HashMap<String, RefPtr<ApplicationCacheResource>>;
</ins><span class="cx"> const ResourceMap& resources() const { return m_resources; }
</span><del>-
</del><ins>+
</ins><span class="cx"> void setStorageID(unsigned storageID) { m_storageID = storageID; }
</span><span class="cx"> unsigned storageID() const { return m_storageID; }
</span><span class="cx"> void clearStorageID();
</span><del>-
</del><ins>+
</ins><span class="cx"> static bool requestIsHTTPOrHTTPSGet(const ResourceRequest&);
</span><span class="cx">
</span><span class="cx"> int64_t estimatedSizeInStorage() const { return m_estimatedSizeInStorage; }
</span><span class="lines">@@ -87,21 +83,20 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> ApplicationCache();
</span><del>-
- ApplicationCacheGroup* m_group;
</del><ins>+
+ ApplicationCacheGroup* m_group { nullptr };
</ins><span class="cx"> ResourceMap m_resources;
</span><del>- ApplicationCacheResource* m_manifest;
</del><ins>+ ApplicationCacheResource* m_manifest { nullptr };
</ins><span class="cx">
</span><del>- bool m_allowAllNetworkRequests;
</del><ins>+ bool m_allowAllNetworkRequests { false };
</ins><span class="cx"> Vector<URL> m_onlineWhitelist;
</span><span class="cx"> FallbackURLVector m_fallbackURLs;
</span><span class="cx">
</span><span class="cx"> // The total size of the resources belonging to this Application Cache instance.
</span><del>- // This is an estimation of the size this Application Cache occupies in the
- // database file.
- int64_t m_estimatedSizeInStorage;
</del><ins>+ // This is an estimation of the size this Application Cache occupies in the database file.
+ int64_t m_estimatedSizeInStorage { 0 };
</ins><span class="cx">
</span><del>- unsigned m_storageID;
</del><ins>+ unsigned m_storageID { 0 };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderappcacheApplicationCacheGroupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2008, 2009, 2010 Apple Inc. All Rights Reserved.
</del><ins>+ * Copyright (C) 2008-2017 Apple Inc. All Rights Reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> #include "ChromeClient.h"
</span><span class="cx"> #include "DOMApplicationCache.h"
</span><span class="cx"> #include "DocumentLoader.h"
</span><ins>+#include "EventNames.h"
</ins><span class="cx"> #include "Frame.h"
</span><span class="cx"> #include "FrameLoader.h"
</span><span class="cx"> #include "FrameLoaderClient.h"
</span><span class="lines">@@ -54,17 +55,7 @@
</span><span class="cx"> : m_storage(WTFMove(storage))
</span><span class="cx"> , m_manifestURL(manifestURL)
</span><span class="cx"> , m_origin(SecurityOrigin::create(manifestURL))
</span><del>- , m_updateStatus(Idle)
- , m_downloadingPendingMasterResourceLoadersCount(0)
- , m_progressTotal(0)
- , m_progressDone(0)
- , m_frame(nullptr)
- , m_storageID(0)
- , m_isObsolete(false)
- , m_completionType(None)
- , m_calledReachedMaxAppCacheSize(false)
</del><span class="cx"> , m_availableSpaceInQuota(ApplicationCacheStorage::unknownQuota())
</span><del>- , m_originQuotaExceededPreviously(false)
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -72,10 +63,10 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_newestCache);
</span><span class="cx"> ASSERT(m_caches.isEmpty());
</span><del>-
</del><ins>+
</ins><span class="cx"> stopLoading();
</span><span class="cx">
</span><del>- m_storage->cacheGroupDestroyed(this);
</del><ins>+ m_storage->cacheGroupDestroyed(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ApplicationCache* ApplicationCacheGroup::cacheForMainRequest(const ResourceRequest& request, DocumentLoader* documentLoader)
</span><span class="lines">@@ -84,21 +75,20 @@
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> URL url(request.url());
</span><del>- if (url.hasFragmentIdentifier())
- url.removeFragmentIdentifier();
</del><ins>+ url.removeFragmentIdentifier();
</ins><span class="cx">
</span><span class="cx"> auto* page = documentLoader->frame() ? documentLoader->frame()->page() : nullptr;
</span><span class="cx"> if (!page || page->usesEphemeralSession())
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- if (ApplicationCacheGroup* group = page->applicationCacheStorage().cacheGroupForURL(url)) {
- ASSERT(group->newestCache());
- ASSERT(!group->isObsolete());
-
- return group->newestCache();
- }
-
- return nullptr;
</del><ins>+ auto* group = page->applicationCacheStorage().cacheGroupForURL(url);
+ if (!group)
+ return nullptr;
+
+ ASSERT(group->newestCache());
+ ASSERT(!group->isObsolete());
+
+ return group->newestCache();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ApplicationCache* ApplicationCacheGroup::fallbackCacheForMainRequest(const ResourceRequest& request, DocumentLoader* documentLoader)
</span><span class="lines">@@ -106,81 +96,87 @@
</span><span class="cx"> if (!ApplicationCache::requestIsHTTPOrHTTPSGet(request))
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- URL url(request.url());
- if (url.hasFragmentIdentifier())
- url.removeFragmentIdentifier();
</del><ins>+ auto* frame = documentLoader->frame();
+ if (!frame)
+ return nullptr;
</ins><span class="cx">
</span><del>- auto* page = documentLoader->frame() ? documentLoader->frame()->page() : nullptr;
</del><ins>+ auto* page = frame->page();
</ins><span class="cx"> if (!page)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- if (ApplicationCacheGroup* group = page->applicationCacheStorage().fallbackCacheGroupForURL(url)) {
- ASSERT(group->newestCache());
- ASSERT(!group->isObsolete());
</del><ins>+ URL url(request.url());
+ url.removeFragmentIdentifier();
</ins><span class="cx">
</span><del>- return group->newestCache();
- }
-
- return nullptr;
</del><ins>+ auto* group = page->applicationCacheStorage().fallbackCacheGroupForURL(url);
+ if (!group)
+ return nullptr;
+
+ ASSERT(group->newestCache());
+ ASSERT(!group->isObsolete());
+
+ return group->newestCache();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void ApplicationCacheGroup::selectCache(Frame* frame, const URL& passedManifestURL)
</del><ins>+void ApplicationCacheGroup::selectCache(Frame& frame, const URL& passedManifestURL)
</ins><span class="cx"> {
</span><del>- ASSERT(frame && frame->page());
-
- if (!frame->settings().offlineWebApplicationCacheEnabled())
</del><ins>+ ASSERT(frame.document());
+ ASSERT(frame.page());
+ ASSERT(frame.loader().documentLoader());
+
+ if (!frame.settings().offlineWebApplicationCacheEnabled())
</ins><span class="cx"> return;
</span><del>-
- DocumentLoader* documentLoader = frame->loader().documentLoader();
- ASSERT(!documentLoader->applicationCacheHost()->applicationCache());
</del><span class="cx">
</span><ins>+ auto& documentLoader = *frame.loader().documentLoader();
+ ASSERT(!documentLoader.applicationCacheHost().applicationCache());
+
</ins><span class="cx"> if (passedManifestURL.isNull()) {
</span><del>- selectCacheWithoutManifestURL(frame);
</del><ins>+ selectCacheWithoutManifestURL(frame);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Don't access anything on disk if private browsing is enabled.
</span><del>- if (frame->page()->usesEphemeralSession() || !frame->document()->securityOrigin()->canAccessApplicationCache(frame->tree().top().document()->securityOrigin())) {
- postListenerTask(ApplicationCacheHost::CHECKING_EVENT, documentLoader);
- postListenerTask(ApplicationCacheHost::ERROR_EVENT, documentLoader);
</del><ins>+ if (frame.page()->usesEphemeralSession() || !frame.document()->securityOrigin()->canAccessApplicationCache(frame.tree().top().document()->securityOrigin())) {
+ postListenerTask(eventNames().checkingEvent, documentLoader);
+ postListenerTask(eventNames().errorEvent, documentLoader);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> URL manifestURL(passedManifestURL);
</span><del>- if (manifestURL.hasFragmentIdentifier())
- manifestURL.removeFragmentIdentifier();
</del><ins>+ manifestURL.removeFragmentIdentifier();
</ins><span class="cx">
</span><del>- ApplicationCache* mainResourceCache = documentLoader->applicationCacheHost()->mainResourceApplicationCache();
</del><ins>+ auto* mainResourceCache = documentLoader.applicationCacheHost().mainResourceApplicationCache();
</ins><span class="cx">
</span><span class="cx"> if (mainResourceCache) {
</span><ins>+ ASSERT(mainResourceCache->group());
</ins><span class="cx"> if (manifestURL == mainResourceCache->group()->m_manifestURL) {
</span><span class="cx"> // The cache may have gotten obsoleted after we've loaded from it, but before we parsed the document and saw cache manifest.
</span><span class="cx"> if (mainResourceCache->group()->isObsolete())
</span><span class="cx"> return;
</span><del>- mainResourceCache->group()->associateDocumentLoaderWithCache(documentLoader, mainResourceCache);
</del><ins>+ mainResourceCache->group()->associateDocumentLoaderWithCache(&documentLoader, mainResourceCache);
</ins><span class="cx"> mainResourceCache->group()->update(frame, ApplicationCacheUpdateWithBrowsingContext);
</span><span class="cx"> } else {
</span><span class="cx"> // The main resource was loaded from cache, so the cache must have an entry for it. Mark it as foreign.
</span><del>- URL resourceURL(documentLoader->responseURL());
- if (resourceURL.hasFragmentIdentifier())
- resourceURL.removeFragmentIdentifier();
- ApplicationCacheResource* resource = mainResourceCache->resourceForURL(resourceURL);
- bool inStorage = resource->storageID();
- resource->addType(ApplicationCacheResource::Foreign);
</del><ins>+ URL resourceURL { documentLoader.responseURL() };
+ resourceURL.removeFragmentIdentifier();
+
+ ASSERT(mainResourceCache->resourceForURL(resourceURL));
+ auto& resource = *mainResourceCache->resourceForURL(resourceURL);
+
+ bool inStorage = resource.storageID();
+ resource.addType(ApplicationCacheResource::Foreign);
</ins><span class="cx"> if (inStorage)
</span><del>- frame->page()->applicationCacheStorage().storeUpdatedType(resource, mainResourceCache);
</del><ins>+ frame.page()->applicationCacheStorage().storeUpdatedType(&resource, mainResourceCache);
</ins><span class="cx">
</span><span class="cx"> // Restart the current navigation from the top of the navigation algorithm, undoing any changes that were made
</span><span class="cx"> // as part of the initial load.
</span><span class="cx"> // The navigation will not result in the same resource being loaded, because "foreign" entries are never picked during navigation.
</span><del>- frame->navigationScheduler().scheduleLocationChange(frame->document(), frame->document()->securityOrigin(), documentLoader->url(), frame->loader().referrer());
</del><ins>+ frame.navigationScheduler().scheduleLocationChange(*frame.document(), frame.document()->securityOrigin(), documentLoader.url(), frame.loader().referrer());
</ins><span class="cx"> }
</span><del>-
</del><span class="cx"> return;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // The resource was loaded from the network, check if it is a HTTP/HTTPS GET.
</span><del>- const ResourceRequest& request = frame->loader().activeDocumentLoader()->request();
</del><ins>+ auto& request = frame.loader().activeDocumentLoader()->request();
</ins><span class="cx">
</span><span class="cx"> if (!ApplicationCache::requestIsHTTPOrHTTPSGet(request))
</span><span class="cx"> return;
</span><span class="lines">@@ -189,46 +185,48 @@
</span><span class="cx"> if (!protocolHostAndPortAreEqual(manifestURL, request.url()))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- ApplicationCacheGroup* group = frame->page()->applicationCacheStorage().findOrCreateCacheGroup(manifestURL);
</del><ins>+ auto& group = *frame.page()->applicationCacheStorage().findOrCreateCacheGroup(manifestURL);
</ins><span class="cx">
</span><del>- documentLoader->applicationCacheHost()->setCandidateApplicationCacheGroup(group);
- group->m_pendingMasterResourceLoaders.add(documentLoader);
- group->m_downloadingPendingMasterResourceLoadersCount++;
</del><ins>+ documentLoader.applicationCacheHost().setCandidateApplicationCacheGroup(&group);
+ group.m_pendingMasterResourceLoaders.add(&documentLoader);
+ group.m_downloadingPendingMasterResourceLoadersCount++;
</ins><span class="cx">
</span><del>- ASSERT(!group->m_cacheBeingUpdated || group->m_updateStatus != Idle);
- group->update(frame, ApplicationCacheUpdateWithBrowsingContext);
</del><ins>+ ASSERT(!group.m_cacheBeingUpdated || group.m_updateStatus != Idle);
+ group.update(frame, ApplicationCacheUpdateWithBrowsingContext);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void ApplicationCacheGroup::selectCacheWithoutManifestURL(Frame* frame)
</del><ins>+void ApplicationCacheGroup::selectCacheWithoutManifestURL(Frame& frame)
</ins><span class="cx"> {
</span><del>- if (!frame->settings().offlineWebApplicationCacheEnabled())
</del><ins>+ if (!frame.settings().offlineWebApplicationCacheEnabled())
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- DocumentLoader* documentLoader = frame->loader().documentLoader();
- ASSERT(!documentLoader->applicationCacheHost()->applicationCache());
</del><ins>+ ASSERT(frame.document());
+ ASSERT(frame.page());
+ ASSERT(frame.loader().documentLoader());
+ auto& documentLoader = *frame.loader().documentLoader();
+ ASSERT(!documentLoader.applicationCacheHost().applicationCache());
</ins><span class="cx">
</span><span class="cx"> // Don't access anything on disk if private browsing is enabled.
</span><del>- if (frame->page()->usesEphemeralSession() || !frame->document()->securityOrigin()->canAccessApplicationCache(frame->tree().top().document()->securityOrigin())) {
- postListenerTask(ApplicationCacheHost::CHECKING_EVENT, documentLoader);
- postListenerTask(ApplicationCacheHost::ERROR_EVENT, documentLoader);
</del><ins>+ if (frame.page()->usesEphemeralSession() || !frame.document()->securityOrigin()->canAccessApplicationCache(frame.tree().top().document()->securityOrigin())) {
+ postListenerTask(eventNames().checkingEvent, documentLoader);
+ postListenerTask(eventNames().errorEvent, documentLoader);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ApplicationCache* mainResourceCache = documentLoader->applicationCacheHost()->mainResourceApplicationCache();
-
- if (mainResourceCache) {
- mainResourceCache->group()->associateDocumentLoaderWithCache(documentLoader, mainResourceCache);
- mainResourceCache->group()->update(frame, ApplicationCacheUpdateWithBrowsingContext);
</del><ins>+ if (auto* mainResourceCache = documentLoader.applicationCacheHost().mainResourceApplicationCache()) {
+ ASSERT(mainResourceCache->group());
+ auto& group = *mainResourceCache->group();
+ group.associateDocumentLoaderWithCache(&documentLoader, mainResourceCache);
+ group.update(frame, ApplicationCacheUpdateWithBrowsingContext);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ApplicationCacheGroup::finishedLoadingMainResource(DocumentLoader* loader)
</del><ins>+void ApplicationCacheGroup::finishedLoadingMainResource(DocumentLoader& loader)
</ins><span class="cx"> {
</span><del>- ASSERT(m_pendingMasterResourceLoaders.contains(loader));
</del><ins>+ ASSERT(m_pendingMasterResourceLoaders.contains(&loader));
</ins><span class="cx"> ASSERT(m_completionType == None || m_pendingEntries.isEmpty());
</span><del>- URL url = loader->url();
- if (url.hasFragmentIdentifier())
- url.removeFragmentIdentifier();
</del><ins>+ URL url = loader.url();
+ url.removeFragmentIdentifier();
</ins><span class="cx">
</span><span class="cx"> switch (m_completionType) {
</span><span class="cx"> case None:
</span><span class="lines">@@ -236,34 +234,32 @@
</span><span class="cx"> return;
</span><span class="cx"> case NoUpdate:
</span><span class="cx"> ASSERT(!m_cacheBeingUpdated);
</span><del>- associateDocumentLoaderWithCache(loader, m_newestCache.get());
-
- if (ApplicationCacheResource* resource = m_newestCache->resourceForURL(url)) {
</del><ins>+ associateDocumentLoaderWithCache(&loader, m_newestCache.get());
+ if (auto* resource = m_newestCache->resourceForURL(url)) {
</ins><span class="cx"> if (!(resource->type() & ApplicationCacheResource::Master)) {
</span><span class="cx"> resource->addType(ApplicationCacheResource::Master);
</span><span class="cx"> ASSERT(!resource->storageID());
</span><span class="cx"> }
</span><span class="cx"> } else
</span><del>- m_newestCache->addResource(ApplicationCacheResource::create(url, loader->response(), ApplicationCacheResource::Master, loader->mainResourceData()));
</del><ins>+ m_newestCache->addResource(ApplicationCacheResource::create(url, loader.response(), ApplicationCacheResource::Master, loader.mainResourceData()));
</ins><span class="cx"> break;
</span><span class="cx"> case Failure:
</span><span class="cx"> // Cache update has been a failure, so there is no reason to keep the document associated with the incomplete cache
</span><span class="cx"> // (its main resource was not cached yet, so it is likely that the application changed significantly server-side).
</span><span class="cx"> ASSERT(!m_cacheBeingUpdated); // Already cleared out by stopLoading().
</span><del>- loader->applicationCacheHost()->setApplicationCache(nullptr); // Will unset candidate, too.
- m_associatedDocumentLoaders.remove(loader);
- postListenerTask(ApplicationCacheHost::ERROR_EVENT, loader);
</del><ins>+ loader.applicationCacheHost().setApplicationCache(nullptr); // Will unset candidate, too.
+ m_associatedDocumentLoaders.remove(&loader);
+ postListenerTask(eventNames().errorEvent, loader);
</ins><span class="cx"> break;
</span><span class="cx"> case Completed:
</span><del>- ASSERT(m_associatedDocumentLoaders.contains(loader));
-
- if (ApplicationCacheResource* resource = m_cacheBeingUpdated->resourceForURL(url)) {
</del><ins>+ ASSERT(m_associatedDocumentLoaders.contains(&loader));
+ if (auto* resource = m_cacheBeingUpdated->resourceForURL(url)) {
</ins><span class="cx"> if (!(resource->type() & ApplicationCacheResource::Master)) {
</span><span class="cx"> resource->addType(ApplicationCacheResource::Master);
</span><span class="cx"> ASSERT(!resource->storageID());
</span><span class="cx"> }
</span><span class="cx"> } else
</span><del>- m_cacheBeingUpdated->addResource(ApplicationCacheResource::create(url, loader->response(), ApplicationCacheResource::Master, loader->mainResourceData()));
</del><ins>+ m_cacheBeingUpdated->addResource(ApplicationCacheResource::create(url, loader.response(), ApplicationCacheResource::Master, loader.mainResourceData()));
</ins><span class="cx"> // The "cached" event will be posted to all associated documents once update is complete.
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -273,9 +269,9 @@
</span><span class="cx"> checkIfLoadIsComplete();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ApplicationCacheGroup::failedLoadingMainResource(DocumentLoader* loader)
</del><ins>+void ApplicationCacheGroup::failedLoadingMainResource(DocumentLoader& loader)
</ins><span class="cx"> {
</span><del>- ASSERT(m_pendingMasterResourceLoaders.contains(loader));
</del><ins>+ ASSERT(m_pendingMasterResourceLoaders.contains(&loader));
</ins><span class="cx"> ASSERT(m_completionType == None || m_pendingEntries.isEmpty());
</span><span class="cx">
</span><span class="cx"> switch (m_completionType) {
</span><span class="lines">@@ -284,32 +280,27 @@
</span><span class="cx"> return;
</span><span class="cx"> case NoUpdate:
</span><span class="cx"> ASSERT(!m_cacheBeingUpdated);
</span><del>-
</del><span class="cx"> // The manifest didn't change, and we have a relevant cache - but the main resource download failed mid-way, so it cannot be stored to the cache,
</span><span class="cx"> // and the loader does not get associated to it. If there are other main resources being downloaded for this cache group, they may still succeed.
</span><del>- postListenerTask(ApplicationCacheHost::ERROR_EVENT, loader);
-
</del><ins>+ postListenerTask(eventNames().errorEvent, loader);
</ins><span class="cx"> break;
</span><span class="cx"> case Failure:
</span><span class="cx"> // Cache update failed, too.
</span><span class="cx"> ASSERT(!m_cacheBeingUpdated); // Already cleared out by stopLoading().
</span><del>- ASSERT(!loader->applicationCacheHost()->applicationCache() || loader->applicationCacheHost()->applicationCache()->group() == this);
-
- loader->applicationCacheHost()->setApplicationCache(nullptr); // Will unset candidate, too.
- m_associatedDocumentLoaders.remove(loader);
- postListenerTask(ApplicationCacheHost::ERROR_EVENT, loader);
</del><ins>+ ASSERT(!loader.applicationCacheHost().applicationCache() || loader.applicationCacheHost().applicationCache()->group() == this);
+ loader.applicationCacheHost().setApplicationCache(nullptr); // Will unset candidate, too.
+ m_associatedDocumentLoaders.remove(&loader);
+ postListenerTask(eventNames().errorEvent, loader);
</ins><span class="cx"> break;
</span><span class="cx"> case Completed:
</span><span class="cx"> // The cache manifest didn't list this main resource, and all cache entries were already updated successfully - but the main resource failed to load,
</span><span class="cx"> // so it cannot be stored to the cache. If there are other main resources being downloaded for this cache group, they may still succeed.
</span><del>- ASSERT(m_associatedDocumentLoaders.contains(loader));
- ASSERT(loader->applicationCacheHost()->applicationCache() == m_cacheBeingUpdated);
- ASSERT(!loader->applicationCacheHost()->candidateApplicationCacheGroup());
- m_associatedDocumentLoaders.remove(loader);
- loader->applicationCacheHost()->setApplicationCache(nullptr);
-
- postListenerTask(ApplicationCacheHost::ERROR_EVENT, loader);
-
</del><ins>+ ASSERT(m_associatedDocumentLoaders.contains(&loader));
+ ASSERT(loader.applicationCacheHost().applicationCache() == m_cacheBeingUpdated);
+ ASSERT(!loader.applicationCacheHost().candidateApplicationCacheGroup());
+ m_associatedDocumentLoaders.remove(&loader);
+ loader.applicationCacheHost().setApplicationCache(nullptr);
+ postListenerTask(eventNames().errorEvent, loader);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -346,12 +337,12 @@
</span><span class="cx"> m_pendingEntries.clear();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ApplicationCacheGroup::disassociateDocumentLoader(DocumentLoader* loader)
</del><ins>+void ApplicationCacheGroup::disassociateDocumentLoader(DocumentLoader& loader)
</ins><span class="cx"> {
</span><del>- m_associatedDocumentLoaders.remove(loader);
- m_pendingMasterResourceLoaders.remove(loader);
</del><ins>+ m_associatedDocumentLoaders.remove(&loader);
+ m_pendingMasterResourceLoaders.remove(&loader);
</ins><span class="cx">
</span><del>- if (auto* host = loader->applicationCacheHost())
</del><ins>+ if (auto* host = loader.applicationCacheHostUnlessBeingDestroyed())
</ins><span class="cx"> host->setApplicationCache(nullptr); // Will set candidate group to null, too.
</span><span class="cx">
</span><span class="cx"> if (!m_associatedDocumentLoaders.isEmpty() || !m_pendingMasterResourceLoaders.isEmpty())
</span><span class="lines">@@ -372,9 +363,9 @@
</span><span class="cx"> m_newestCache = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ApplicationCacheGroup::cacheDestroyed(ApplicationCache* cache)
</del><ins>+void ApplicationCacheGroup::cacheDestroyed(ApplicationCache& cache)
</ins><span class="cx"> {
</span><del>- if (m_caches.remove(cache) && m_caches.isEmpty()) {
</del><ins>+ if (m_caches.remove(&cache) && m_caches.isEmpty()) {
</ins><span class="cx"> ASSERT(m_associatedDocumentLoaders.isEmpty());
</span><span class="cx"> ASSERT(m_pendingMasterResourceLoaders.isEmpty());
</span><span class="cx"> delete this;
</span><span class="lines">@@ -381,17 +372,17 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ApplicationCacheGroup::stopLoadingInFrame(Frame* frame)
</del><ins>+void ApplicationCacheGroup::stopLoadingInFrame(Frame& frame)
</ins><span class="cx"> {
</span><del>- if (frame != m_frame)
</del><ins>+ if (&frame != m_frame)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> cacheUpdateFailed();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ApplicationCacheGroup::setNewestCache(PassRefPtr<ApplicationCache> newestCache)
</del><ins>+void ApplicationCacheGroup::setNewestCache(Ref<ApplicationCache>&& newestCache)
</ins><span class="cx"> {
</span><del>- m_newestCache = newestCache;
</del><ins>+ m_newestCache = WTFMove(newestCache);
</ins><span class="cx">
</span><span class="cx"> m_caches.add(m_newestCache.get());
</span><span class="cx"> m_newestCache->setGroup(this);
</span><span class="lines">@@ -403,40 +394,43 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_isObsolete = true;
</span><del>- m_storage->cacheGroupMadeObsolete(this);
</del><ins>+ m_storage->cacheGroupMadeObsolete(*this);
</ins><span class="cx"> ASSERT(!m_storageID);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ApplicationCacheGroup::update(Frame* frame, ApplicationCacheUpdateOption updateOption)
</del><ins>+void ApplicationCacheGroup::update(Frame& frame, ApplicationCacheUpdateOption updateOption)
</ins><span class="cx"> {
</span><ins>+ ASSERT(frame.loader().documentLoader());
+ auto& documentLoader = *frame.loader().documentLoader();
+
</ins><span class="cx"> if (m_updateStatus == Checking || m_updateStatus == Downloading) {
</span><span class="cx"> if (updateOption == ApplicationCacheUpdateWithBrowsingContext) {
</span><del>- postListenerTask(ApplicationCacheHost::CHECKING_EVENT, frame->loader().documentLoader());
</del><ins>+ postListenerTask(eventNames().checkingEvent, documentLoader);
</ins><span class="cx"> if (m_updateStatus == Downloading)
</span><del>- postListenerTask(ApplicationCacheHost::DOWNLOADING_EVENT, frame->loader().documentLoader());
</del><ins>+ postListenerTask(eventNames().downloadingEvent, documentLoader);
</ins><span class="cx"> }
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Don't access anything on disk if private browsing is enabled.
</span><del>- if (frame->page()->usesEphemeralSession() || !frame->document()->securityOrigin()->canAccessApplicationCache(frame->tree().top().document()->securityOrigin())) {
</del><ins>+ if (frame.page()->usesEphemeralSession() || !frame.document()->securityOrigin()->canAccessApplicationCache(frame.tree().top().document()->securityOrigin())) {
</ins><span class="cx"> ASSERT(m_pendingMasterResourceLoaders.isEmpty());
</span><span class="cx"> ASSERT(m_pendingEntries.isEmpty());
</span><span class="cx"> ASSERT(!m_cacheBeingUpdated);
</span><del>- postListenerTask(ApplicationCacheHost::CHECKING_EVENT, frame->loader().documentLoader());
- postListenerTask(ApplicationCacheHost::ERROR_EVENT, frame->loader().documentLoader());
</del><ins>+ postListenerTask(eventNames().checkingEvent, documentLoader);
+ postListenerTask(eventNames().errorEvent, documentLoader);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ASSERT(!m_frame);
</span><del>- m_frame = frame;
</del><ins>+ m_frame = &frame;
</ins><span class="cx">
</span><span class="cx"> setUpdateStatus(Checking);
</span><span class="cx">
</span><del>- postListenerTask(ApplicationCacheHost::CHECKING_EVENT, m_associatedDocumentLoaders);
</del><ins>+ postListenerTask(eventNames().checkingEvent, m_associatedDocumentLoaders);
</ins><span class="cx"> if (!m_newestCache) {
</span><span class="cx"> ASSERT(updateOption == ApplicationCacheUpdateWithBrowsingContext);
</span><del>- postListenerTask(ApplicationCacheHost::CHECKING_EVENT, frame->loader().documentLoader());
</del><ins>+ postListenerTask(eventNames().checkingEvent, documentLoader);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ASSERT(!m_manifestHandle);
</span><span class="lines">@@ -449,7 +443,7 @@
</span><span class="cx"> m_manifestHandle = createResourceHandle(m_manifestURL, m_newestCache ? m_newestCache->manifestResource() : 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ApplicationCacheGroup::abort(Frame* frame)
</del><ins>+void ApplicationCacheGroup::abort(Frame& frame)
</ins><span class="cx"> {
</span><span class="cx"> if (m_updateStatus == Idle)
</span><span class="cx"> return;
</span><span class="lines">@@ -458,7 +452,7 @@
</span><span class="cx"> if (m_completionType != None)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- frame->document()->addConsoleMessage(MessageSource::AppCache, MessageLevel::Debug, ASCIILiteral("Application Cache download process was aborted."));
</del><ins>+ frame.document()->addConsoleMessage(MessageSource::AppCache, MessageLevel::Debug, ASCIILiteral("Application Cache download process was aborted."));
</ins><span class="cx"> cacheUpdateFailed();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -502,8 +496,7 @@
</span><span class="cx"> ASSERT(handle == m_currentHandle);
</span><span class="cx">
</span><span class="cx"> URL url(handle->firstRequest().url());
</span><del>- if (url.hasFragmentIdentifier())
- url.removeFragmentIdentifier();
</del><ins>+ url.removeFragmentIdentifier();
</ins><span class="cx">
</span><span class="cx"> ASSERT(!m_currentResource);
</span><span class="cx"> ASSERT(m_pendingEntries.contains(url));
</span><span class="lines">@@ -593,7 +586,7 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(m_cacheBeingUpdated);
</span><span class="cx">
</span><del>- m_cacheBeingUpdated->addResource(WTFMove(m_currentResource));
</del><ins>+ m_cacheBeingUpdated->addResource(m_currentResource.releaseNonNull());
</ins><span class="cx"> m_currentHandle = nullptr;
</span><span class="cx">
</span><span class="cx"> // While downloading check to see if we have exceeded the available quota.
</span><span class="lines">@@ -626,8 +619,7 @@
</span><span class="cx">
</span><span class="cx"> unsigned type = m_currentResource ? m_currentResource->type() : m_pendingEntries.get(handle->firstRequest().url());
</span><span class="cx"> URL url(handle->firstRequest().url());
</span><del>- if (url.hasFragmentIdentifier())
- url.removeFragmentIdentifier();
</del><ins>+ url.removeFragmentIdentifier();
</ins><span class="cx">
</span><span class="cx"> ASSERT(!m_currentResource || !m_pendingEntries.contains(url));
</span><span class="cx"> m_currentResource = nullptr;
</span><span class="lines">@@ -734,7 +726,7 @@
</span><span class="cx"> // We have the manifest, now download the resources.
</span><span class="cx"> setUpdateStatus(Downloading);
</span><span class="cx">
</span><del>- postListenerTask(ApplicationCacheHost::DOWNLOADING_EVENT, m_associatedDocumentLoaders);
</del><ins>+ postListenerTask(eventNames().downloadingEvent, m_associatedDocumentLoaders);
</ins><span class="cx">
</span><span class="cx"> ASSERT(m_pendingEntries.isEmpty());
</span><span class="cx">
</span><span class="lines">@@ -802,8 +794,8 @@
</span><span class="cx"> {
</span><span class="cx"> makeObsolete();
</span><span class="cx">
</span><del>- postListenerTask(ApplicationCacheHost::OBSOLETE_EVENT, m_associatedDocumentLoaders);
- postListenerTask(ApplicationCacheHost::ERROR_EVENT, m_pendingMasterResourceLoaders);
</del><ins>+ postListenerTask(eventNames().obsoleteEvent, m_associatedDocumentLoaders);
+ postListenerTask(eventNames().errorEvent, m_pendingMasterResourceLoaders);
</ins><span class="cx">
</span><span class="cx"> stopLoading();
</span><span class="cx">
</span><span class="lines">@@ -813,9 +805,9 @@
</span><span class="cx"> while (!m_pendingMasterResourceLoaders.isEmpty()) {
</span><span class="cx"> HashSet<DocumentLoader*>::iterator it = m_pendingMasterResourceLoaders.begin();
</span><span class="cx">
</span><del>- ASSERT((*it)->applicationCacheHost()->candidateApplicationCacheGroup() == this);
- ASSERT(!(*it)->applicationCacheHost()->applicationCache());
- (*it)->applicationCacheHost()->setCandidateApplicationCacheGroup(nullptr);
</del><ins>+ ASSERT((*it)->applicationCacheHost().candidateApplicationCacheGroup() == this);
+ ASSERT(!(*it)->applicationCacheHost().applicationCache());
+ (*it)->applicationCacheHost().setCandidateApplicationCacheGroup(nullptr);
</ins><span class="cx"> m_pendingMasterResourceLoaders.remove(it);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -822,7 +814,7 @@
</span><span class="cx"> m_downloadingPendingMasterResourceLoadersCount = 0;
</span><span class="cx"> setUpdateStatus(Idle);
</span><span class="cx"> m_frame = nullptr;
</span><del>-
</del><ins>+
</ins><span class="cx"> if (m_caches.isEmpty()) {
</span><span class="cx"> ASSERT(m_associatedDocumentLoaders.isEmpty());
</span><span class="cx"> ASSERT(!m_cacheBeingUpdated);
</span><span class="lines">@@ -849,13 +841,13 @@
</span><span class="cx">
</span><span class="cx"> // The storage could have been manually emptied by the user.
</span><span class="cx"> if (!m_storageID)
</span><del>- m_storage->storeNewestCache(this);
</del><ins>+ m_storage->storeNewestCache(*this);
</ins><span class="cx">
</span><del>- postListenerTask(ApplicationCacheHost::NOUPDATE_EVENT, m_associatedDocumentLoaders);
</del><ins>+ postListenerTask(eventNames().noupdateEvent, m_associatedDocumentLoaders);
</ins><span class="cx"> break;
</span><span class="cx"> case Failure:
</span><span class="cx"> ASSERT(!m_cacheBeingUpdated);
</span><del>- postListenerTask(ApplicationCacheHost::ERROR_EVENT, m_associatedDocumentLoaders);
</del><ins>+ postListenerTask(eventNames().errorEvent, m_associatedDocumentLoaders);
</ins><span class="cx"> if (m_caches.isEmpty()) {
</span><span class="cx"> ASSERT(m_associatedDocumentLoaders.isEmpty());
</span><span class="cx"> delete this;
</span><span class="lines">@@ -867,7 +859,7 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(m_cacheBeingUpdated);
</span><span class="cx"> if (m_manifestResource)
</span><del>- m_cacheBeingUpdated->setManifestResource(WTFMove(m_manifestResource));
</del><ins>+ m_cacheBeingUpdated->setManifestResource(m_manifestResource.releaseNonNull());
</ins><span class="cx"> else {
</span><span class="cx"> // We can get here as a result of retrying the Complete step, following
</span><span class="cx"> // a failure of the cache storage to save the newest cache due to hitting
</span><span class="lines">@@ -887,8 +879,8 @@
</span><span class="cx"> didReachOriginQuota(totalSpaceNeeded);
</span><span class="cx">
</span><span class="cx"> ApplicationCacheStorage::FailureReason failureReason;
</span><del>- setNewestCache(WTFMove(m_cacheBeingUpdated));
- if (m_storage->storeNewestCache(this, oldNewestCache.get(), failureReason)) {
</del><ins>+ setNewestCache(m_cacheBeingUpdated.releaseNonNull());
+ if (m_storage->storeNewestCache(*this, oldNewestCache.get(), failureReason)) {
</ins><span class="cx"> // New cache stored, now remove the old cache.
</span><span class="cx"> if (oldNewestCache)
</span><span class="cx"> m_storage->remove(oldNewestCache.get());
</span><span class="lines">@@ -895,10 +887,10 @@
</span><span class="cx">
</span><span class="cx"> // Fire the final progress event.
</span><span class="cx"> ASSERT(m_progressDone == m_progressTotal);
</span><del>- postListenerTask(ApplicationCacheHost::PROGRESS_EVENT, m_progressTotal, m_progressDone, m_associatedDocumentLoaders);
</del><ins>+ postListenerTask(eventNames().progressEvent, m_progressTotal, m_progressDone, m_associatedDocumentLoaders);
</ins><span class="cx">
</span><span class="cx"> // Fire the success event.
</span><del>- postListenerTask(isUpgradeAttempt ? ApplicationCacheHost::UPDATEREADY_EVENT : ApplicationCacheHost::CACHED_EVENT, m_associatedDocumentLoaders);
</del><ins>+ postListenerTask(isUpgradeAttempt ? eventNames().updatereadyEvent : eventNames().cachedEvent, m_associatedDocumentLoaders);
</ins><span class="cx"> // It is clear that the origin quota was not reached, so clear the flag if it was set.
</span><span class="cx"> m_originQuotaExceededPreviously = false;
</span><span class="cx"> } else {
</span><span class="lines">@@ -919,10 +911,8 @@
</span><span class="cx">
</span><span class="cx"> // Save a reference to the new cache.
</span><span class="cx"> m_cacheBeingUpdated = WTFMove(m_newestCache);
</span><del>- if (oldNewestCache) {
- // Reinstate the oldNewestCache.
- setNewestCache(WTFMove(oldNewestCache));
- }
</del><ins>+ if (oldNewestCache)
+ setNewestCache(oldNewestCache.releaseNonNull());
</ins><span class="cx"> scheduleReachedMaxAppCacheSizeCallback();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -930,7 +920,7 @@
</span><span class="cx"> // Run the "cache failure steps"
</span><span class="cx"> // Fire the error events to all pending master entries, as well any other cache hosts
</span><span class="cx"> // currently associated with a cache in this group.
</span><del>- postListenerTask(ApplicationCacheHost::ERROR_EVENT, m_associatedDocumentLoaders);
</del><ins>+ postListenerTask(eventNames().errorEvent, m_associatedDocumentLoaders);
</ins><span class="cx"> // Disassociate the pending master entries from the failed new cache. Note that
</span><span class="cx"> // all other loaders in the m_associatedDocumentLoaders are still associated with
</span><span class="cx"> // some other cache in this group. They are not associated with the failed new cache.
</span><span class="lines">@@ -939,12 +929,12 @@
</span><span class="cx"> Vector<DocumentLoader*> loaders;
</span><span class="cx"> copyToVector(m_pendingMasterResourceLoaders, loaders);
</span><span class="cx"> for (auto& loader : loaders)
</span><del>- disassociateDocumentLoader(loader); // This can delete this group.
</del><ins>+ disassociateDocumentLoader(*loader); // This can delete this group.
</ins><span class="cx">
</span><span class="cx"> // Reinstate the oldNewestCache, if there was one.
</span><span class="cx"> if (oldNewestCache) {
</span><span class="cx"> // This will discard the failed new cache.
</span><del>- setNewestCache(WTFMove(oldNewestCache));
</del><ins>+ setNewestCache(oldNewestCache.releaseNonNull());
</ins><span class="cx"> } else {
</span><span class="cx"> // We must have been deleted by the last call to disassociateDocumentLoader().
</span><span class="cx"> return;
</span><span class="lines">@@ -973,14 +963,13 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- EntryMap::const_iterator it = m_pendingEntries.begin();
</del><ins>+ auto firstPendingEntryURL = m_pendingEntries.begin()->key;
</ins><span class="cx">
</span><del>- postListenerTask(ApplicationCacheHost::PROGRESS_EVENT, m_progressTotal, m_progressDone, m_associatedDocumentLoaders);
</del><ins>+ postListenerTask(eventNames().progressEvent, m_progressTotal, m_progressDone, m_associatedDocumentLoaders);
</ins><span class="cx"> m_progressDone++;
</span><span class="cx">
</span><span class="cx"> ASSERT(!m_currentHandle);
</span><del>-
- m_currentHandle = createResourceHandle(URL(ParsedURLString, it->key), m_newestCache ? m_newestCache->resourceForURL(it->key) : 0);
</del><ins>+ m_currentHandle = createResourceHandle(URL(ParsedURLString, firstPendingEntryURL), m_newestCache ? m_newestCache->resourceForURL(firstPendingEntryURL) : 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ApplicationCacheGroup::deliverDelayedMainResources()
</span><span class="lines">@@ -988,19 +977,15 @@
</span><span class="cx"> // Need to copy loaders, because the cache group may be destroyed at the end of iteration.
</span><span class="cx"> Vector<DocumentLoader*> loaders;
</span><span class="cx"> copyToVector(m_pendingMasterResourceLoaders, loaders);
</span><del>- size_t count = loaders.size();
- for (size_t i = 0; i != count; ++i) {
- DocumentLoader* loader = loaders[i];
</del><ins>+ for (auto* loader : loaders) {
</ins><span class="cx"> if (loader->isLoadingMainResource())
</span><span class="cx"> continue;
</span><del>-
- const ResourceError& error = loader->mainDocumentError();
- if (error.isNull())
- finishedLoadingMainResource(loader);
</del><ins>+ if (loader->mainDocumentError().isNull())
+ finishedLoadingMainResource(*loader);
</ins><span class="cx"> else
</span><del>- failedLoadingMainResource(loader);
</del><ins>+ failedLoadingMainResource(*loader);
</ins><span class="cx"> }
</span><del>- if (!count)
</del><ins>+ if (loaders.isEmpty())
</ins><span class="cx"> checkIfLoadIsComplete();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1008,13 +993,12 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_cacheBeingUpdated);
</span><span class="cx"> ASSERT(!URL(ParsedURLString, url).hasFragmentIdentifier());
</span><del>-
</del><ins>+
</ins><span class="cx"> // Don't add the URL if we already have an master resource in the cache
</span><span class="cx"> // (i.e., the main resource finished loading before the manifest).
</span><del>- if (ApplicationCacheResource* resource = m_cacheBeingUpdated->resourceForURL(url)) {
</del><ins>+ if (auto* resource = m_cacheBeingUpdated->resourceForURL(url)) {
</ins><span class="cx"> ASSERT(resource->type() & ApplicationCacheResource::Master);
</span><span class="cx"> ASSERT(!m_frame->loader().documentLoader()->isLoadingMainResource());
</span><del>-
</del><span class="cx"> resource->addType(type);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -1025,11 +1009,8 @@
</span><span class="cx"> m_manifestResource->addType(type);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>-
- EntryMap::AddResult result = m_pendingEntries.add(url, type);
-
- if (!result.isNewEntry)
- result.iterator->value |= type;
</del><ins>+
+ m_pendingEntries.add(url, type).iterator->value |= type;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ApplicationCacheGroup::associateDocumentLoaderWithCache(DocumentLoader* loader, ApplicationCache* cache)
</span><span class="lines">@@ -1040,63 +1021,63 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(!m_isObsolete);
</span><span class="cx">
</span><del>- loader->applicationCacheHost()->setApplicationCache(cache);
</del><ins>+ loader->applicationCacheHost().setApplicationCache(cache);
</ins><span class="cx">
</span><span class="cx"> ASSERT(!m_associatedDocumentLoaders.contains(loader));
</span><span class="cx"> m_associatedDocumentLoaders.add(loader);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-class ChromeClientCallbackTimer: public TimerBase {
</del><ins>+class ChromeClientCallbackTimer final : public TimerBase {
</ins><span class="cx"> public:
</span><del>- ChromeClientCallbackTimer(ApplicationCacheGroup* cacheGroup)
- : m_cacheGroup(cacheGroup)
</del><ins>+ ChromeClientCallbackTimer(ApplicationCacheGroup& group)
+ : m_group(group)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- void fired() override
</del><ins>+ void fired() final
</ins><span class="cx"> {
</span><del>- m_cacheGroup->didReachMaxAppCacheSize();
</del><ins>+ m_group.didReachMaxAppCacheSize();
</ins><span class="cx"> delete this;
</span><span class="cx"> }
</span><del>- // Note that there is no need to use a RefPtr here. The ApplicationCacheGroup instance is guaranteed
- // to be alive when the timer fires since invoking the ChromeClient callback is part of its normal
</del><ins>+
+ // Note that there is no need to use a Ref here. The ApplicationCacheGroup instance is guaranteed
+ // to be alive when the timer fires since invoking the callback is part of its normal
</ins><span class="cx"> // update machinery and nothing can yet cause it to get deleted.
</span><del>- ApplicationCacheGroup* m_cacheGroup;
</del><ins>+ ApplicationCacheGroup& m_group;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> void ApplicationCacheGroup::scheduleReachedMaxAppCacheSizeCallback()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><del>- ChromeClientCallbackTimer* timer = new ChromeClientCallbackTimer(this);
</del><ins>+ auto* timer = new ChromeClientCallbackTimer(*this);
</ins><span class="cx"> timer->startOneShot(0);
</span><span class="cx"> // The timer will delete itself once it fires.
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ApplicationCacheGroup::postListenerTask(ApplicationCacheHost::EventID eventID, int progressTotal, int progressDone, const HashSet<DocumentLoader*>& loaderSet)
</del><ins>+void ApplicationCacheGroup::postListenerTask(const AtomicString& eventType, int progressTotal, int progressDone, const HashSet<DocumentLoader*>& loaderSet)
</ins><span class="cx"> {
</span><span class="cx"> for (auto& loader : loaderSet)
</span><del>- postListenerTask(eventID, progressTotal, progressDone, loader);
</del><ins>+ postListenerTask(eventType, progressTotal, progressDone, *loader);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void ApplicationCacheGroup::postListenerTask(ApplicationCacheHost::EventID eventID, int progressTotal, int progressDone, DocumentLoader* loader)
</del><ins>+void ApplicationCacheGroup::postListenerTask(const AtomicString& eventType, int progressTotal, int progressDone, DocumentLoader& loader)
</ins><span class="cx"> {
</span><del>- Frame* frame = loader->frame();
</del><ins>+ auto* frame = loader.frame();
</ins><span class="cx"> if (!frame)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- ASSERT(frame->loader().documentLoader() == loader);
</del><ins>+ ASSERT(frame->loader().documentLoader() == &loader);
</ins><span class="cx">
</span><del>- RefPtr<DocumentLoader> loaderProtector(loader);
- frame->document()->postTask([loaderProtector, eventID, progressTotal, progressDone] (ScriptExecutionContext& context) {
</del><ins>+ RefPtr<DocumentLoader> protectedLoader(&loader);
+ frame->document()->postTask([protectedLoader, &eventType, progressTotal, progressDone] (ScriptExecutionContext& context) {
</ins><span class="cx"> ASSERT_UNUSED(context, context.isDocument());
</span><del>- Frame* frame = loaderProtector->frame();
</del><ins>+ auto* frame = protectedLoader->frame();
</ins><span class="cx"> if (!frame)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- ASSERT(frame->loader().documentLoader() == loaderProtector);
-
- loaderProtector->applicationCacheHost()->notifyDOMApplicationCache(eventID, progressTotal, progressDone);
</del><ins>+ ASSERT(frame->loader().documentLoader() == protectedLoader);
+ protectedLoader->applicationCacheHost().notifyDOMApplicationCache(eventType, progressTotal, progressDone);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1108,8 +1089,7 @@
</span><span class="cx"> void ApplicationCacheGroup::clearStorageID()
</span><span class="cx"> {
</span><span class="cx"> m_storageID = 0;
</span><del>-
- for (const auto& cache : m_caches)
</del><ins>+ for (auto& cache : m_caches)
</ins><span class="cx"> cache->clearStorageID();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderappcacheApplicationCacheGrouph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.h (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.h 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.h 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2008, 2009, 2010 Apple Inc. All Rights Reserved.
</del><ins>+ * Copyright (C) 2008-2017 Apple Inc. All Rights Reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -49,8 +49,9 @@
</span><span class="cx"> ApplicationCacheUpdateWithoutBrowsingContext
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class ApplicationCacheGroup : ResourceHandleClient {
- WTF_MAKE_NONCOPYABLE(ApplicationCacheGroup); WTF_MAKE_FAST_ALLOCATED;
</del><ins>+class ApplicationCacheGroup final : private ResourceHandleClient {
+ WTF_MAKE_NONCOPYABLE(ApplicationCacheGroup);
+ WTF_MAKE_FAST_ALLOCATED;
</ins><span class="cx"> public:
</span><span class="cx"> explicit ApplicationCacheGroup(Ref<ApplicationCacheStorage>&&, const URL& manifestURL);
</span><span class="cx"> virtual ~ApplicationCacheGroup();
</span><span class="lines">@@ -60,8 +61,8 @@
</span><span class="cx"> static ApplicationCache* cacheForMainRequest(const ResourceRequest&, DocumentLoader*);
</span><span class="cx"> static ApplicationCache* fallbackCacheForMainRequest(const ResourceRequest&, DocumentLoader*);
</span><span class="cx">
</span><del>- static void selectCache(Frame*, const URL& manifestURL);
- static void selectCacheWithoutManifestURL(Frame*);
</del><ins>+ static void selectCache(Frame&, const URL& manifestURL);
+ static void selectCacheWithoutManifestURL(Frame&);
</ins><span class="cx">
</span><span class="cx"> ApplicationCacheStorage& storage() { return m_storage; }
</span><span class="cx"> const URL& manifestURL() const { return m_manifestURL; }
</span><span class="lines">@@ -73,31 +74,31 @@
</span><span class="cx"> unsigned storageID() const { return m_storageID; }
</span><span class="cx"> void clearStorageID();
</span><span class="cx">
</span><del>- void update(Frame*, ApplicationCacheUpdateOption); // FIXME: Frame should not be needed when updating without browsing context.
- void cacheDestroyed(ApplicationCache*);
</del><ins>+ void update(Frame&, ApplicationCacheUpdateOption); // FIXME: Frame should not be needed when updating without browsing context.
+ void cacheDestroyed(ApplicationCache&);
</ins><span class="cx">
</span><del>- void abort(Frame*);
</del><ins>+ void abort(Frame&);
</ins><span class="cx">
</span><del>- bool cacheIsComplete(ApplicationCache* cache) { return m_caches.contains(cache); }
</del><ins>+ bool cacheIsComplete(ApplicationCache& cache) { return m_caches.contains(&cache); }
</ins><span class="cx">
</span><del>- void stopLoadingInFrame(Frame*);
</del><ins>+ void stopLoadingInFrame(Frame&);
</ins><span class="cx">
</span><span class="cx"> ApplicationCache* newestCache() const { return m_newestCache.get(); }
</span><del>- void setNewestCache(PassRefPtr<ApplicationCache>);
</del><ins>+ void setNewestCache(Ref<ApplicationCache>&&);
</ins><span class="cx">
</span><span class="cx"> void makeObsolete();
</span><span class="cx"> bool isObsolete() const { return m_isObsolete; }
</span><span class="cx">
</span><del>- void finishedLoadingMainResource(DocumentLoader*);
- void failedLoadingMainResource(DocumentLoader*);
</del><ins>+ void finishedLoadingMainResource(DocumentLoader&);
+ void failedLoadingMainResource(DocumentLoader&);
</ins><span class="cx">
</span><del>- void disassociateDocumentLoader(DocumentLoader*);
</del><ins>+ void disassociateDocumentLoader(DocumentLoader&);
</ins><span class="cx">
</span><span class="cx"> private:
</span><del>- static void postListenerTask(ApplicationCacheHost::EventID id, const HashSet<DocumentLoader*>& set) { postListenerTask(id, 0, 0, set); }
- static void postListenerTask(ApplicationCacheHost::EventID id, DocumentLoader* loader) { postListenerTask(id, 0, 0, loader); }
- static void postListenerTask(ApplicationCacheHost::EventID, int progressTotal, int progressDone, const HashSet<DocumentLoader*>&);
- static void postListenerTask(ApplicationCacheHost::EventID, int progressTotal, int progressDone, DocumentLoader*);
</del><ins>+ static void postListenerTask(const AtomicString& eventType, const HashSet<DocumentLoader*>& set) { postListenerTask(eventType, 0, 0, set); }
+ static void postListenerTask(const AtomicString& eventType, DocumentLoader& loader) { postListenerTask(eventType, 0, 0, loader); }
+ static void postListenerTask(const AtomicString& eventType, int progressTotal, int progressDone, const HashSet<DocumentLoader*>&);
+ static void postListenerTask(const AtomicString& eventType, int progressTotal, int progressDone, DocumentLoader&);
</ins><span class="cx">
</span><span class="cx"> void scheduleReachedMaxAppCacheSizeCallback();
</span><span class="cx">
</span><span class="lines">@@ -135,7 +136,7 @@
</span><span class="cx">
</span><span class="cx"> URL m_manifestURL;
</span><span class="cx"> RefPtr<SecurityOrigin> m_origin;
</span><del>- UpdateStatus m_updateStatus;
</del><ins>+ UpdateStatus m_updateStatus { Idle };
</ins><span class="cx">
</span><span class="cx"> // This is the newest complete cache in the group.
</span><span class="cx"> RefPtr<ApplicationCache> m_newestCache;
</span><span class="lines">@@ -150,26 +151,25 @@
</span><span class="cx"> // List of pending master entries, used during the update process to ensure that new master entries are cached.
</span><span class="cx"> HashSet<DocumentLoader*> m_pendingMasterResourceLoaders;
</span><span class="cx"> // How many of the above pending master entries have not yet finished downloading.
</span><del>- int m_downloadingPendingMasterResourceLoadersCount;
</del><ins>+ int m_downloadingPendingMasterResourceLoadersCount { 0 };
</ins><span class="cx">
</span><span class="cx"> // These are all the document loaders that are associated with a cache in this group.
</span><span class="cx"> HashSet<DocumentLoader*> m_associatedDocumentLoaders;
</span><span class="cx">
</span><span class="cx"> // The URLs and types of pending cache entries.
</span><del>- typedef HashMap<String, unsigned> EntryMap;
- EntryMap m_pendingEntries;
</del><ins>+ HashMap<String, unsigned> m_pendingEntries;
</ins><span class="cx">
</span><span class="cx"> // The total number of items to be processed to update the cache group and the number that have been done.
</span><del>- int m_progressTotal;
- int m_progressDone;
</del><ins>+ int m_progressTotal { 0 };
+ int m_progressDone { 0 };
</ins><span class="cx">
</span><span class="cx"> // Frame used for fetching resources when updating.
</span><span class="cx"> // FIXME: An update started by a particular frame should not stop if it is destroyed, but there are other frames associated with the same cache group.
</span><del>- Frame* m_frame;
</del><ins>+ Frame* m_frame { nullptr };
</ins><span class="cx">
</span><span class="cx"> // An obsolete cache group is never stored, but the opposite is not true - storing may fail for multiple reasons, such as exceeding disk quota.
</span><del>- unsigned m_storageID;
- bool m_isObsolete;
</del><ins>+ unsigned m_storageID { 0 };
+ bool m_isObsolete { false };
</ins><span class="cx">
</span><span class="cx"> // During update, this is used to handle asynchronously arriving results.
</span><span class="cx"> enum CompletionType {
</span><span class="lines">@@ -178,12 +178,12 @@
</span><span class="cx"> Failure,
</span><span class="cx"> Completed
</span><span class="cx"> };
</span><del>- CompletionType m_completionType;
</del><ins>+ CompletionType m_completionType { None };
</ins><span class="cx">
</span><span class="cx"> // This flag is set immediately after the ChromeClient::reachedMaxAppCacheSize() callback is invoked as a result of the storage layer failing to save a cache
</span><span class="cx"> // due to reaching the maximum size of the application cache database file. This flag is used by ApplicationCacheGroup::checkIfLoadIsComplete() to decide
</span><span class="cx"> // the course of action in case of this failure (i.e. call the ChromeClient callback or run the failure steps).
</span><del>- bool m_calledReachedMaxAppCacheSize;
</del><ins>+ bool m_calledReachedMaxAppCacheSize { false };
</ins><span class="cx">
</span><span class="cx"> RefPtr<ResourceHandle> m_currentHandle;
</span><span class="cx"> RefPtr<ApplicationCacheResource> m_currentResource;
</span><span class="lines">@@ -193,7 +193,7 @@
</span><span class="cx"> RefPtr<ResourceHandle> m_manifestHandle;
</span><span class="cx">
</span><span class="cx"> int64_t m_availableSpaceInQuota;
</span><del>- bool m_originQuotaExceededPreviously;
</del><ins>+ bool m_originQuotaExceededPreviously { false };
</ins><span class="cx">
</span><span class="cx"> friend class ChromeClientCallbackTimer;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderappcacheApplicationCacheHostcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/appcache/ApplicationCacheHost.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/appcache/ApplicationCacheHost.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/loader/appcache/ApplicationCacheHost.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include "ContentSecurityPolicy.h"
</span><span class="cx"> #include "DocumentLoader.h"
</span><span class="cx"> #include "DOMApplicationCache.h"
</span><ins>+#include "EventNames.h"
</ins><span class="cx"> #include "FileSystem.h"
</span><span class="cx"> #include "Frame.h"
</span><span class="cx"> #include "FrameLoader.h"
</span><span class="lines">@@ -48,10 +49,7 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> ApplicationCacheHost::ApplicationCacheHost(DocumentLoader& documentLoader)
</span><del>- : m_domApplicationCache(nullptr)
- , m_documentLoader(documentLoader)
- , m_defersEvents(true)
- , m_candidateApplicationCacheGroup(nullptr)
</del><ins>+ : m_documentLoader(documentLoader)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -58,21 +56,22 @@
</span><span class="cx"> ApplicationCacheHost::~ApplicationCacheHost()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_applicationCache || !m_candidateApplicationCacheGroup || m_applicationCache->group() == m_candidateApplicationCacheGroup);
</span><del>-
</del><span class="cx"> if (m_applicationCache)
</span><del>- m_applicationCache->group()->disassociateDocumentLoader(&m_documentLoader);
</del><ins>+ m_applicationCache->group()->disassociateDocumentLoader(m_documentLoader);
</ins><span class="cx"> else if (m_candidateApplicationCacheGroup)
</span><del>- m_candidateApplicationCacheGroup->disassociateDocumentLoader(&m_documentLoader);
</del><ins>+ m_candidateApplicationCacheGroup->disassociateDocumentLoader(m_documentLoader);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ApplicationCacheHost::selectCacheWithoutManifest()
</span><span class="cx"> {
</span><del>- ApplicationCacheGroup::selectCacheWithoutManifestURL(m_documentLoader.frame());
</del><ins>+ ASSERT(m_documentLoader.frame());
+ ApplicationCacheGroup::selectCacheWithoutManifestURL(*m_documentLoader.frame());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ApplicationCacheHost::selectCacheWithManifest(const URL& manifestURL)
</span><span class="cx"> {
</span><del>- ApplicationCacheGroup::selectCache(m_documentLoader.frame(), manifestURL);
</del><ins>+ ASSERT(m_documentLoader.frame());
+ ApplicationCacheGroup::selectCache(*m_documentLoader.frame(), manifestURL);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ApplicationCacheHost::maybeLoadMainResource(ResourceRequest& request, SubstituteData& substituteData)
</span><span class="lines">@@ -140,12 +139,11 @@
</span><span class="cx">
</span><span class="cx"> void ApplicationCacheHost::mainResourceDataReceived(const char*, int, long long, bool)
</span><span class="cx"> {
</span><del>- // This method is here to facilitate alternate implemetations of this interface by the host browser.
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ApplicationCacheHost::failedLoadingMainResource()
</span><span class="cx"> {
</span><del>- ApplicationCacheGroup* group = m_candidateApplicationCacheGroup;
</del><ins>+ auto* group = m_candidateApplicationCacheGroup;
</ins><span class="cx"> if (!group && m_applicationCache) {
</span><span class="cx"> if (mainResourceApplicationCache()) {
</span><span class="cx"> // Even when the main resource is being loaded from an application cache, loading can fail if aborted.
</span><span class="lines">@@ -155,17 +153,17 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (group)
</span><del>- group->failedLoadingMainResource(&m_documentLoader);
</del><ins>+ group->failedLoadingMainResource(m_documentLoader);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ApplicationCacheHost::finishedLoadingMainResource()
</span><span class="cx"> {
</span><del>- ApplicationCacheGroup* group = candidateApplicationCacheGroup();
</del><ins>+ auto* group = candidateApplicationCacheGroup();
</ins><span class="cx"> if (!group && applicationCache() && !mainResourceApplicationCache())
</span><span class="cx"> group = applicationCache()->group();
</span><span class="cx">
</span><span class="cx"> if (group)
</span><del>- group->finishedLoadingMainResource(&m_documentLoader);
</del><ins>+ group->finishedLoadingMainResource(m_documentLoader);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool ApplicationCacheHost::maybeLoadResource(ResourceLoader& loader, const ResourceRequest& request, const URL& originalURL)
</span><span class="lines">@@ -186,17 +184,19 @@
</span><span class="cx">
</span><span class="cx"> bool ApplicationCacheHost::maybeLoadFallbackForRedirect(ResourceLoader* resourceLoader, ResourceRequest& request, const ResourceResponse& redirectResponse)
</span><span class="cx"> {
</span><del>- if (!redirectResponse.isNull() && !protocolHostAndPortAreEqual(request.url(), redirectResponse.url()))
</del><ins>+ if (!redirectResponse.isNull() && !protocolHostAndPortAreEqual(request.url(), redirectResponse.url())) {
</ins><span class="cx"> if (scheduleLoadFallbackResourceFromApplicationCache(resourceLoader))
</span><span class="cx"> return true;
</span><ins>+ }
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool ApplicationCacheHost::maybeLoadFallbackForResponse(ResourceLoader* resourceLoader, const ResourceResponse& response)
</span><span class="cx"> {
</span><del>- if (response.httpStatusCode() / 100 == 4 || response.httpStatusCode() / 100 == 5)
</del><ins>+ if (response.httpStatusCode() / 100 == 4 || response.httpStatusCode() / 100 == 5) {
</ins><span class="cx"> if (scheduleLoadFallbackResourceFromApplicationCache(resourceLoader))
</span><span class="cx"> return true;
</span><ins>+ }
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -220,11 +220,9 @@
</span><span class="cx"> // app cache media files are always created with encodeForFileName(createCanonicalUUIDString()).
</span><span class="cx">
</span><span class="cx"> #if USE(CF) && PLATFORM(WIN)
</span><del>- RetainPtr<CFURLRef> cfURL = adoptCF(CFURLCreateWithFileSystemPath(0, path.createCFString().get(), kCFURLWindowsPathStyle, false));
- URL url(cfURL.get());
</del><ins>+ URL url(adoptCF(CFURLCreateWithFileSystemPath(0, path.createCFString().get(), kCFURLWindowsPathStyle, false)).get());
</ins><span class="cx"> #else
</span><span class="cx"> URL url;
</span><del>-
</del><span class="cx"> url.setProtocol(ASCIILiteral("file"));
</span><span class="cx"> url.setPath(path);
</span><span class="cx"> #endif
</span><span class="lines">@@ -246,7 +244,7 @@
</span><span class="cx"> if (!shouldLoadResourceFromApplicationCache(request, resource))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- RefPtr<SharedBuffer> responseData = resource ? bufferFromResource(*resource) : nullptr;
</del><ins>+ auto responseData = resource ? bufferFromResource(*resource) : nullptr;
</ins><span class="cx"> if (!responseData) {
</span><span class="cx"> error = m_documentLoader.frameLoader()->client().cannotShowURLError(request);
</span><span class="cx"> return true;
</span><span class="lines">@@ -286,20 +284,21 @@
</span><span class="cx"> m_domApplicationCache = domApplicationCache;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ApplicationCacheHost::notifyDOMApplicationCache(EventID id, int total, int done)
</del><ins>+void ApplicationCacheHost::notifyDOMApplicationCache(const AtomicString& eventType, int total, int done)
</ins><span class="cx"> {
</span><del>- if (id != PROGRESS_EVENT)
</del><ins>+ if (eventType != eventNames().progressEvent)
</ins><span class="cx"> InspectorInstrumentation::updateApplicationCacheStatus(m_documentLoader.frame());
</span><span class="cx">
</span><span class="cx"> if (m_defersEvents) {
</span><span class="cx"> // Event dispatching is deferred until document.onload has fired.
</span><del>- m_deferredEvents.append(DeferredEvent(id, total, done));
</del><ins>+ m_deferredEvents.append({ eventType, total, done });
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><del>- dispatchDOMEvent(id, total, done);
</del><ins>+
+ dispatchDOMEvent(eventType, total, done);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void ApplicationCacheHost::stopLoadingInFrame(Frame* frame)
</del><ins>+void ApplicationCacheHost::stopLoadingInFrame(Frame& frame)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!m_applicationCache || !m_candidateApplicationCacheGroup || m_applicationCache->group() == m_candidateApplicationCacheGroup);
</span><span class="cx">
</span><span class="lines">@@ -312,22 +311,34 @@
</span><span class="cx"> void ApplicationCacheHost::stopDeferringEvents()
</span><span class="cx"> {
</span><span class="cx"> Ref<DocumentLoader> protect(m_documentLoader);
</span><del>- for (auto& event : m_deferredEvents)
- dispatchDOMEvent(event.eventID, event.progressTotal, event.progressDone);
</del><ins>+
+ // Note, do not cache the size in a local variable.
+ // This code needs to properly handle the case where more events are added to
+ // m_deferredEvents while iterating it. This is why we don't use a modern for loop.
+ for (size_t i = 0; i < m_deferredEvents.size(); ++i) {
+ auto& event = m_deferredEvents[i];
+ dispatchDOMEvent(event.eventType, event.progressTotal, event.progressDone);
+ }
+
</ins><span class="cx"> m_deferredEvents.clear();
</span><span class="cx"> m_defersEvents = false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ApplicationCacheHost::fillResourceList(ResourceInfoList* resources)
</del><ins>+Vector<ApplicationCacheHost::ResourceInfo> ApplicationCacheHost::resourceList()
</ins><span class="cx"> {
</span><del>- ApplicationCache* cache = applicationCache();
</del><ins>+ Vector<ResourceInfo> result;
+
+ auto* cache = applicationCache();
</ins><span class="cx"> if (!cache || !cache->isComplete())
</span><del>- return;
</del><ins>+ return result;
</ins><span class="cx">
</span><del>- for (const auto& urlAndResource : cache->resources()) {
- ApplicationCacheResource* resource = urlAndResource.value.get();
</del><ins>+ result.reserveInitialCapacity(cache->resources().size());
</ins><span class="cx">
</span><del>- unsigned type = resource->type();
</del><ins>+ for (auto& urlAndResource : cache->resources()) {
+ ASSERT(urlAndResource.value);
+ auto& resource = *urlAndResource.value;
+
+ unsigned type = resource.type();
</ins><span class="cx"> bool isMaster = type & ApplicationCacheResource::Master;
</span><span class="cx"> bool isManifest = type & ApplicationCacheResource::Manifest;
</span><span class="cx"> bool isExplicit = type & ApplicationCacheResource::Explicit;
</span><span class="lines">@@ -334,33 +345,36 @@
</span><span class="cx"> bool isForeign = type & ApplicationCacheResource::Foreign;
</span><span class="cx"> bool isFallback = type & ApplicationCacheResource::Fallback;
</span><span class="cx">
</span><del>- resources->append(ResourceInfo(resource->url(), isMaster, isManifest, isFallback, isForeign, isExplicit, resource->estimatedSizeInStorage()));
</del><ins>+ result.uncheckedAppend({ resource.url(), isMaster, isManifest, isFallback, isForeign, isExplicit, resource.estimatedSizeInStorage() });
</ins><span class="cx"> }
</span><ins>+
+ return result;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ApplicationCacheHost::CacheInfo ApplicationCacheHost::applicationCacheInfo()
</span><span class="cx"> {
</span><del>- ApplicationCache* cache = applicationCache();
</del><ins>+ auto* cache = applicationCache();
</ins><span class="cx"> if (!cache || !cache->isComplete())
</span><del>- return CacheInfo(URL(), 0, 0, 0);
</del><ins>+ return { { }, 0, 0, 0 };
</ins><span class="cx">
</span><span class="cx"> // FIXME: Add "Creation Time" and "Update Time" to Application Caches.
</span><del>- return CacheInfo(cache->manifestResource()->url(), 0, 0, cache->estimatedSizeInStorage());
</del><ins>+ return { cache->manifestResource()->url(), 0, 0, cache->estimatedSizeInStorage() };
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void ApplicationCacheHost::dispatchDOMEvent(EventID id, int total, int done)
</del><ins>+static Ref<Event> createApplicationCacheEvent(const AtomicString& eventType, int total, int done)
</ins><span class="cx"> {
</span><del>- if (m_domApplicationCache) {
- const AtomicString& eventType = DOMApplicationCache::toEventType(id);
- RefPtr<Event> event;
- if (id == PROGRESS_EVENT)
- event = ProgressEvent::create(eventType, true, done, total);
- else
- event = Event::create(eventType, false, false);
- m_domApplicationCache->dispatchEvent(*event);
- }
</del><ins>+ if (eventType == eventNames().progressEvent)
+ return ProgressEvent::create(eventType, true, done, total);
+ return Event::create(eventType, false, false);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void ApplicationCacheHost::dispatchDOMEvent(const AtomicString& eventType, int total, int done)
+{
+ if (!m_domApplicationCache)
+ return;
+ m_domApplicationCache->dispatchEvent(createApplicationCacheEvent(eventType, total, done));
+}
+
</ins><span class="cx"> void ApplicationCacheHost::setCandidateApplicationCacheGroup(ApplicationCacheGroup* group)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_applicationCache);
</span><span class="lines">@@ -367,25 +381,24 @@
</span><span class="cx"> m_candidateApplicationCacheGroup = group;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ApplicationCacheHost::setApplicationCache(PassRefPtr<ApplicationCache> applicationCache)
</del><ins>+void ApplicationCacheHost::setApplicationCache(RefPtr<ApplicationCache>&& applicationCache)
</ins><span class="cx"> {
</span><span class="cx"> if (m_candidateApplicationCacheGroup) {
</span><span class="cx"> ASSERT(!m_applicationCache);
</span><span class="cx"> m_candidateApplicationCacheGroup = nullptr;
</span><span class="cx"> }
</span><del>-
- m_applicationCache = applicationCache;
</del><ins>+ m_applicationCache = WTFMove(applicationCache);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool ApplicationCacheHost::shouldLoadResourceFromApplicationCache(const ResourceRequest& originalRequest, ApplicationCacheResource*& resource)
</span><span class="cx"> {
</span><del>- ApplicationCache* cache = applicationCache();
</del><ins>+ auto* cache = applicationCache();
</ins><span class="cx"> if (!cache || !cache->isComplete())
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> ResourceRequest request(originalRequest);
</span><del>- if (Frame* loaderFrame = m_documentLoader.frame()) {
- if (Document* document = loaderFrame->document())
</del><ins>+ if (auto* loaderFrame = m_documentLoader.frame()) {
+ if (auto* document = loaderFrame->document())
</ins><span class="cx"> document->contentSecurityPolicy()->upgradeInsecureRequestIfNeeded(request, ContentSecurityPolicy::InsecureRequestType::Load);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -430,7 +443,6 @@
</span><span class="cx">
</span><span class="cx"> resource = cache->resourceForURL(fallbackURL);
</span><span class="cx"> ASSERT(resource);
</span><del>-
</del><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -444,30 +456,27 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> loader->willSwitchToSubstituteResource();
</span><del>-
</del><span class="cx"> m_documentLoader.scheduleSubstituteResourceLoad(*loader, *resource);
</span><del>-
</del><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ApplicationCacheHost::Status ApplicationCacheHost::status() const
</span><span class="cx"> {
</span><del>- ApplicationCache* cache = applicationCache();
</del><ins>+ auto* cache = applicationCache();
</ins><span class="cx"> if (!cache)
</span><span class="cx"> return UNCACHED;
</span><span class="cx">
</span><span class="cx"> switch (cache->group()->updateStatus()) {
</span><del>- case ApplicationCacheGroup::Checking:
- return CHECKING;
- case ApplicationCacheGroup::Downloading:
- return DOWNLOADING;
- case ApplicationCacheGroup::Idle: {
- if (cache->group()->isObsolete())
- return OBSOLETE;
- if (cache != cache->group()->newestCache())
- return UPDATEREADY;
- return IDLE;
- }
</del><ins>+ case ApplicationCacheGroup::Checking:
+ return CHECKING;
+ case ApplicationCacheGroup::Downloading:
+ return DOWNLOADING;
+ case ApplicationCacheGroup::Idle:
+ if (cache->group()->isObsolete())
+ return OBSOLETE;
+ if (cache != cache->group()->newestCache())
+ return UPDATEREADY;
+ return IDLE;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="lines">@@ -476,27 +485,30 @@
</span><span class="cx">
</span><span class="cx"> bool ApplicationCacheHost::update()
</span><span class="cx"> {
</span><del>- ApplicationCache* cache = applicationCache();
</del><ins>+ auto* cache = applicationCache();
</ins><span class="cx"> if (!cache)
</span><span class="cx"> return false;
</span><del>- cache->group()->update(m_documentLoader.frame(), ApplicationCacheUpdateWithoutBrowsingContext);
</del><ins>+ auto* frame = m_documentLoader.frame();
+ if (!frame)
+ return false;
+ cache->group()->update(*frame, ApplicationCacheUpdateWithoutBrowsingContext);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool ApplicationCacheHost::swapCache()
</span><span class="cx"> {
</span><del>- ApplicationCache* cache = applicationCache();
</del><ins>+ auto* cache = applicationCache();
</ins><span class="cx"> if (!cache)
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // If the group of application caches to which cache belongs has the lifecycle status obsolete, unassociate document from cache.
</span><span class="cx"> if (cache->group()->isObsolete()) {
</span><del>- cache->group()->disassociateDocumentLoader(&m_documentLoader);
</del><ins>+ cache->group()->disassociateDocumentLoader(m_documentLoader);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // If there is no newer cache, raise an INVALID_STATE_ERR exception.
</span><del>- ApplicationCache* newestCache = cache->group()->newestCache();
</del><ins>+ auto* newestCache = cache->group()->newestCache();
</ins><span class="cx"> if (cache == newestCache)
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -508,14 +520,13 @@
</span><span class="cx">
</span><span class="cx"> void ApplicationCacheHost::abort()
</span><span class="cx"> {
</span><del>- ApplicationCacheGroup* cacheGroup = candidateApplicationCacheGroup();
- if (cacheGroup)
- cacheGroup->abort(m_documentLoader.frame());
- else {
- ApplicationCache* cache = applicationCache();
- if (cache)
- cache->group()->abort(m_documentLoader.frame());
- }
</del><ins>+ auto* frame = m_documentLoader.frame();
+ if (!frame)
+ return;
+ if (auto* cacheGroup = candidateApplicationCacheGroup())
+ cacheGroup->abort(*frame);
+ else if (auto* cache = applicationCache())
+ cache->group()->abort(*frame);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool ApplicationCacheHost::isApplicationCacheEnabled()
</span><span class="lines">@@ -525,15 +536,12 @@
</span><span class="cx">
</span><span class="cx"> bool ApplicationCacheHost::isApplicationCacheBlockedForRequest(const ResourceRequest& request)
</span><span class="cx"> {
</span><del>- Frame* frame = m_documentLoader.frame();
</del><ins>+ auto* frame = m_documentLoader.frame();
</ins><span class="cx"> if (!frame)
</span><span class="cx"> return false;
</span><del>-
</del><span class="cx"> if (frame->isMainFrame())
</span><span class="cx"> return false;
</span><del>-
- Ref<SecurityOrigin> origin(SecurityOrigin::create(request.url()));
- return !origin.get().canAccessApplicationCache(frame->document()->topOrigin());
</del><ins>+ return !SecurityOrigin::create(request.url())->canAccessApplicationCache(frame->document()->topOrigin());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderappcacheApplicationCacheHosth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/appcache/ApplicationCacheHost.h (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/appcache/ApplicationCacheHost.h 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/loader/appcache/ApplicationCacheHost.h 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -1,6 +1,7 @@
</span><span class="cx"> /*
</span><del>- * Copyright (c) 2009, Google Inc. All rights reserved.
- *
</del><ins>+ * Copyright (c) 2009, Google Inc. All rights reserved.
+ * Copyright (c) 2017 Apple Inc. All rights reserved.
+ *
</ins><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions are
</span><span class="cx"> * met:
</span><span class="lines">@@ -30,165 +31,136 @@
</span><span class="cx">
</span><span class="cx"> #pragma once
</span><span class="cx">
</span><del>-#include "PlatformExportMacros.h"
</del><span class="cx"> #include "URL.h"
</span><span class="cx"> #include <wtf/Deque.h>
</span><del>-#include <wtf/PassRefPtr.h>
-#include <wtf/RefPtr.h>
</del><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><del>- class DOMApplicationCache;
- class DocumentLoader;
- class Frame;
- class ResourceError;
- class ResourceLoader;
- class ResourceRequest;
- class ResourceResponse;
- class SharedBuffer;
- class SubstituteData;
- class ApplicationCache;
- class ApplicationCacheGroup;
- class ApplicationCacheResource;
- class ApplicationCacheStorage;
</del><span class="cx">
</span><del>- class ApplicationCacheHost {
- WTF_MAKE_NONCOPYABLE(ApplicationCacheHost); WTF_MAKE_FAST_ALLOCATED;
- public:
- // The Status numeric values are specified in the HTML5 spec.
- enum Status {
- UNCACHED = 0,
- IDLE = 1,
- CHECKING = 2,
- DOWNLOADING = 3,
- UPDATEREADY = 4,
- OBSOLETE = 5
- };
</del><ins>+class ApplicationCache;
+class ApplicationCacheGroup;
+class ApplicationCacheResource;
+class ApplicationCacheStorage;
+class DOMApplicationCache;
+class DocumentLoader;
+class Frame;
+class ResourceError;
+class ResourceLoader;
+class ResourceRequest;
+class ResourceResponse;
+class SharedBuffer;
+class SubstituteData;
</ins><span class="cx">
</span><del>- enum EventID {
- CHECKING_EVENT = 0,
- ERROR_EVENT,
- NOUPDATE_EVENT,
- DOWNLOADING_EVENT,
- PROGRESS_EVENT,
- UPDATEREADY_EVENT,
- CACHED_EVENT,
- OBSOLETE_EVENT // Must remain the last value, this is used to size arrays.
- };
</del><ins>+class ApplicationCacheHost {
+ WTF_MAKE_NONCOPYABLE(ApplicationCacheHost); WTF_MAKE_FAST_ALLOCATED;
+public:
+ // The Status numeric values are specified in the HTML5 spec.
+ enum Status {
+ UNCACHED = 0,
+ IDLE = 1,
+ CHECKING = 2,
+ DOWNLOADING = 3,
+ UPDATEREADY = 4,
+ OBSOLETE = 5
+ };
</ins><span class="cx">
</span><del>- struct CacheInfo {
- CacheInfo(const URL& manifest, double creationTime, double updateTime, long long size)
- : m_manifest(manifest)
- , m_creationTime(creationTime)
- , m_updateTime(updateTime)
- , m_size(size) { }
- URL m_manifest;
- double m_creationTime;
- double m_updateTime;
- long long m_size;
- };
</del><ins>+ struct CacheInfo {
+ URL manifest;
+ double creationTime;
+ double updateTime;
+ long long size;
+ };
</ins><span class="cx">
</span><del>- struct ResourceInfo {
- ResourceInfo(const URL& resource, bool isMaster, bool isManifest, bool isFallback, bool isForeign, bool isExplicit, long long size)
- : m_resource(resource)
- , m_isMaster(isMaster)
- , m_isManifest(isManifest)
- , m_isFallback(isFallback)
- , m_isForeign(isForeign)
- , m_isExplicit(isExplicit)
- , m_size(size) { }
- URL m_resource;
- bool m_isMaster;
- bool m_isManifest;
- bool m_isFallback;
- bool m_isForeign;
- bool m_isExplicit;
- long long m_size;
- };
</del><ins>+ struct ResourceInfo {
+ URL resource;
+ bool isMaster;
+ bool isManifest;
+ bool isFallback;
+ bool isForeign;
+ bool isExplicit;
+ long long size;
+ };
</ins><span class="cx">
</span><del>- typedef Vector<ResourceInfo> ResourceInfoList;
</del><ins>+ explicit ApplicationCacheHost(DocumentLoader&);
+ ~ApplicationCacheHost();
</ins><span class="cx">
</span><del>- explicit ApplicationCacheHost(DocumentLoader&);
- ~ApplicationCacheHost();
</del><ins>+ static URL createFileURL(const String&);
</ins><span class="cx">
</span><del>- static URL createFileURL(const String&);
</del><ins>+ void selectCacheWithoutManifest();
+ void selectCacheWithManifest(const URL& manifestURL);
</ins><span class="cx">
</span><del>- void selectCacheWithoutManifest();
- void selectCacheWithManifest(const URL& manifestURL);
</del><ins>+ void maybeLoadMainResource(ResourceRequest&, SubstituteData&);
+ void maybeLoadMainResourceForRedirect(ResourceRequest&, SubstituteData&);
+ bool maybeLoadFallbackForMainResponse(const ResourceRequest&, const ResourceResponse&);
+ void mainResourceDataReceived(const char* data, int length, long long encodedDataLength, bool allAtOnce);
+ void finishedLoadingMainResource();
+ void failedLoadingMainResource();
</ins><span class="cx">
</span><del>- void maybeLoadMainResource(ResourceRequest&, SubstituteData&);
- void maybeLoadMainResourceForRedirect(ResourceRequest&, SubstituteData&);
- bool maybeLoadFallbackForMainResponse(const ResourceRequest&, const ResourceResponse&);
- void mainResourceDataReceived(const char* data, int length, long long encodedDataLength, bool allAtOnce);
- void finishedLoadingMainResource();
- void failedLoadingMainResource();
</del><ins>+ WEBCORE_EXPORT bool maybeLoadResource(ResourceLoader&, const ResourceRequest&, const URL& originalURL);
+ WEBCORE_EXPORT bool maybeLoadFallbackForRedirect(ResourceLoader*, ResourceRequest&, const ResourceResponse&);
+ WEBCORE_EXPORT bool maybeLoadFallbackForResponse(ResourceLoader*, const ResourceResponse&);
+ WEBCORE_EXPORT bool maybeLoadFallbackForError(ResourceLoader*, const ResourceError&);
</ins><span class="cx">
</span><del>- WEBCORE_EXPORT bool maybeLoadResource(ResourceLoader&, const ResourceRequest&, const URL& originalURL);
- WEBCORE_EXPORT bool maybeLoadFallbackForRedirect(ResourceLoader*, ResourceRequest&, const ResourceResponse&);
- WEBCORE_EXPORT bool maybeLoadFallbackForResponse(ResourceLoader*, const ResourceResponse&);
- WEBCORE_EXPORT bool maybeLoadFallbackForError(ResourceLoader*, const ResourceError&);
</del><ins>+ bool maybeLoadSynchronously(ResourceRequest&, ResourceError&, ResourceResponse&, RefPtr<SharedBuffer>&);
+ void maybeLoadFallbackSynchronously(const ResourceRequest&, ResourceError&, ResourceResponse&, RefPtr<SharedBuffer>&);
</ins><span class="cx">
</span><del>- bool maybeLoadSynchronously(ResourceRequest&, ResourceError&, ResourceResponse&, RefPtr<SharedBuffer>&);
- void maybeLoadFallbackSynchronously(const ResourceRequest&, ResourceError&, ResourceResponse&, RefPtr<SharedBuffer>&);
</del><ins>+ bool canCacheInPageCache();
</ins><span class="cx">
</span><del>- bool canCacheInPageCache();
</del><ins>+ Status status() const;
+ bool update();
+ bool swapCache();
+ void abort();
</ins><span class="cx">
</span><del>- Status status() const;
- bool update();
- bool swapCache();
- void abort();
</del><ins>+ void setDOMApplicationCache(DOMApplicationCache*);
+ void notifyDOMApplicationCache(const AtomicString& eventType, int progressTotal, int progressDone);
</ins><span class="cx">
</span><del>- void setDOMApplicationCache(DOMApplicationCache*);
- void notifyDOMApplicationCache(EventID, int progressTotal, int progressDone);
</del><ins>+ void stopLoadingInFrame(Frame&);
</ins><span class="cx">
</span><del>- void stopLoadingInFrame(Frame*);
</del><ins>+ void stopDeferringEvents(); // Also raises the events that have been queued up.
</ins><span class="cx">
</span><del>- void stopDeferringEvents(); // Also raises the events that have been queued up.
</del><ins>+ Vector<ResourceInfo> resourceList();
+ CacheInfo applicationCacheInfo();
</ins><span class="cx">
</span><del>- void fillResourceList(ResourceInfoList*);
- CacheInfo applicationCacheInfo();
</del><ins>+ bool shouldLoadResourceFromApplicationCache(const ResourceRequest&, ApplicationCacheResource*&);
+ bool getApplicationCacheFallbackResource(const ResourceRequest&, ApplicationCacheResource*&, ApplicationCache* = nullptr);
</ins><span class="cx">
</span><del>- bool shouldLoadResourceFromApplicationCache(const ResourceRequest&, ApplicationCacheResource*&);
- bool getApplicationCacheFallbackResource(const ResourceRequest&, ApplicationCacheResource*&, ApplicationCache* = nullptr);
</del><ins>+private:
+ friend class ApplicationCacheGroup;
</ins><span class="cx">
</span><del>- private:
- bool isApplicationCacheEnabled();
- bool isApplicationCacheBlockedForRequest(const ResourceRequest&);
</del><ins>+ struct DeferredEvent {
+ AtomicString eventType;
+ int progressTotal;
+ int progressDone;
+ };
</ins><span class="cx">
</span><del>- struct DeferredEvent {
- EventID eventID;
- int progressTotal;
- int progressDone;
- DeferredEvent(EventID id, int total, int done) : eventID(id), progressTotal(total), progressDone(done) { }
- };
</del><ins>+ bool isApplicationCacheEnabled();
+ bool isApplicationCacheBlockedForRequest(const ResourceRequest&);
</ins><span class="cx">
</span><del>- DOMApplicationCache* m_domApplicationCache;
- DocumentLoader& m_documentLoader;
- bool m_defersEvents; // Events are deferred until after document onload.
- Vector<DeferredEvent> m_deferredEvents;
</del><ins>+ void dispatchDOMEvent(const AtomicString& eventType, int progressTotal, int progressDone);
</ins><span class="cx">
</span><del>- void dispatchDOMEvent(EventID, int progressTotal, int progressDone);
</del><ins>+ bool scheduleLoadFallbackResourceFromApplicationCache(ResourceLoader*, ApplicationCache* = nullptr);
+ void setCandidateApplicationCacheGroup(ApplicationCacheGroup*);
+ ApplicationCacheGroup* candidateApplicationCacheGroup() const { return m_candidateApplicationCacheGroup; }
+ void setApplicationCache(RefPtr<ApplicationCache>&&);
+ ApplicationCache* applicationCache() const { return m_applicationCache.get(); }
+ ApplicationCache* mainResourceApplicationCache() const { return m_mainResourceApplicationCache.get(); }
+ bool maybeLoadFallbackForMainError(const ResourceRequest&, const ResourceError&);
</ins><span class="cx">
</span><del>- friend class ApplicationCacheGroup;
- friend class ApplicationCacheStorage;
</del><ins>+ DOMApplicationCache* m_domApplicationCache { nullptr };
+ DocumentLoader& m_documentLoader;
</ins><span class="cx">
</span><del>- bool scheduleLoadFallbackResourceFromApplicationCache(ResourceLoader*, ApplicationCache* = nullptr);
- void setCandidateApplicationCacheGroup(ApplicationCacheGroup* group);
- ApplicationCacheGroup* candidateApplicationCacheGroup() const { return m_candidateApplicationCacheGroup; }
- void setApplicationCache(PassRefPtr<ApplicationCache> applicationCache);
- ApplicationCache* applicationCache() const { return m_applicationCache.get(); }
- ApplicationCache* mainResourceApplicationCache() const { return m_mainResourceApplicationCache.get(); }
- bool maybeLoadFallbackForMainError(const ResourceRequest&, const ResourceError&);
</del><ins>+ bool m_defersEvents { true }; // Events are deferred until after document onload.
+ Vector<DeferredEvent> m_deferredEvents;
</ins><span class="cx">
</span><del>- // The application cache that the document loader is associated with (if any).
- RefPtr<ApplicationCache> m_applicationCache;
</del><ins>+ // The application cache that the document loader is associated with (if any).
+ RefPtr<ApplicationCache> m_applicationCache;
</ins><span class="cx">
</span><del>- // Before an application cache has finished loading, this will be the candidate application
- // group that the document loader is associated with.
- ApplicationCacheGroup* m_candidateApplicationCacheGroup;
</del><ins>+ // Before an application cache has finished loading, this will be the candidate application
+ // group that the document loader is associated with.
+ ApplicationCacheGroup* m_candidateApplicationCacheGroup { nullptr };
</ins><span class="cx">
</span><del>- // This is the application cache the main resource was loaded from (if any).
- RefPtr<ApplicationCache> m_mainResourceApplicationCache;
- };
</del><ins>+ // This is the application cache the main resource was loaded from (if any).
+ RefPtr<ApplicationCache> m_mainResourceApplicationCache;
+};
</ins><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderappcacheApplicationCacheStoragecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/appcache/ApplicationCacheStorage.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/appcache/ApplicationCacheStorage.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/loader/appcache/ApplicationCacheStorage.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -126,12 +126,10 @@
</span><span class="cx"> if (!cache)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- ApplicationCacheGroup* group = new ApplicationCacheGroup(*this, manifestURL);
-
- group->setStorageID(static_cast<unsigned>(statement.getColumnInt64(0)));
- group->setNewestCache(WTFMove(cache));
-
- return group;
</del><ins>+ auto& group = *new ApplicationCacheGroup(*this, manifestURL);
+ group.setStorageID(static_cast<unsigned>(statement.getColumnInt64(0)));
+ group.setNewestCache(cache.releaseNonNull());
+ return &group;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ApplicationCacheGroup* ApplicationCacheStorage::findOrCreateCacheGroup(const URL& manifestURL)
</span><span class="lines">@@ -138,8 +136,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!manifestURL.hasFragmentIdentifier());
</span><span class="cx">
</span><del>- CacheGroupMap::AddResult result = m_cachesInMemory.add(manifestURL, nullptr);
-
</del><ins>+ auto result = m_cachesInMemory.add(manifestURL, nullptr);
</ins><span class="cx"> if (!result.isNewEntry) {
</span><span class="cx"> ASSERT(result.iterator->value);
</span><span class="cx"> return result.iterator->value;
</span><span class="lines">@@ -146,7 +143,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Look up the group in the database
</span><del>- ApplicationCacheGroup* group = loadCacheGroup(manifestURL);
</del><ins>+ auto* group = loadCacheGroup(manifestURL);
</ins><span class="cx">
</span><span class="cx"> // If the group was not found we need to create it
</span><span class="cx"> if (!group) {
</span><span class="lines">@@ -153,9 +150,8 @@
</span><span class="cx"> group = new ApplicationCacheGroup(*this, manifestURL);
</span><span class="cx"> m_cacheHostSet.add(urlHostHash(manifestURL));
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> result.iterator->value = group;
</span><del>-
</del><span class="cx"> return group;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -244,20 +240,18 @@
</span><span class="cx"> if (!cache)
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- ApplicationCacheResource* resource = cache->resourceForURL(url);
</del><ins>+ auto* resource = cache->resourceForURL(url);
</ins><span class="cx"> if (!resource)
</span><span class="cx"> continue;
</span><span class="cx"> if (resource->type() & ApplicationCacheResource::Foreign)
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- ApplicationCacheGroup* group = new ApplicationCacheGroup(*this, manifestURL);
-
- group->setStorageID(static_cast<unsigned>(statement.getColumnInt64(0)));
- group->setNewestCache(WTFMove(cache));
-
- m_cachesInMemory.set(group->manifestURL(), group);
-
- return group;
</del><ins>+ auto& group = *new ApplicationCacheGroup(*this, manifestURL);
+ group.setStorageID(static_cast<unsigned>(statement.getColumnInt64(0)));
+ group.setNewestCache(cache.releaseNonNull());
+ m_cachesInMemory.set(group.manifestURL(), &group);
+
+ return &group;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (result != SQLITE_DONE)
</span><span class="lines">@@ -320,14 +314,13 @@
</span><span class="cx"> if (cache->resourceForURL(fallbackURL)->type() & ApplicationCacheResource::Foreign)
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- ApplicationCacheGroup* group = new ApplicationCacheGroup(*this, manifestURL);
-
- group->setStorageID(static_cast<unsigned>(statement.getColumnInt64(0)));
- group->setNewestCache(WTFMove(cache));
-
- m_cachesInMemory.set(group->manifestURL(), group);
-
- return group;
</del><ins>+ auto& group = *new ApplicationCacheGroup(*this, manifestURL);
+ group.setStorageID(static_cast<unsigned>(statement.getColumnInt64(0)));
+ group.setNewestCache(cache.releaseNonNull());
+
+ m_cachesInMemory.set(group.manifestURL(), &group);
+
+ return &group;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (result != SQLITE_DONE)
</span><span class="lines">@@ -336,33 +329,33 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ApplicationCacheStorage::cacheGroupDestroyed(ApplicationCacheGroup* group)
</del><ins>+void ApplicationCacheStorage::cacheGroupDestroyed(ApplicationCacheGroup& group)
</ins><span class="cx"> {
</span><del>- if (group->isObsolete()) {
- ASSERT(!group->storageID());
- ASSERT(m_cachesInMemory.get(group->manifestURL()) != group);
</del><ins>+ if (group.isObsolete()) {
+ ASSERT(!group.storageID());
+ ASSERT(m_cachesInMemory.get(group.manifestURL()) != &group);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ASSERT(m_cachesInMemory.get(group->manifestURL()) == group);
</del><ins>+ ASSERT(m_cachesInMemory.get(group.manifestURL()) == &group);
</ins><span class="cx">
</span><del>- m_cachesInMemory.remove(group->manifestURL());
</del><ins>+ m_cachesInMemory.remove(group.manifestURL());
</ins><span class="cx">
</span><span class="cx"> // If the cache group is half-created, we don't want it in the saved set (as it is not stored in database).
</span><del>- if (!group->storageID())
- m_cacheHostSet.remove(urlHostHash(group->manifestURL()));
</del><ins>+ if (!group.storageID())
+ m_cacheHostSet.remove(urlHostHash(group.manifestURL()));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void ApplicationCacheStorage::cacheGroupMadeObsolete(ApplicationCacheGroup* group)
</del><ins>+void ApplicationCacheStorage::cacheGroupMadeObsolete(ApplicationCacheGroup& group)
</ins><span class="cx"> {
</span><del>- ASSERT(m_cachesInMemory.get(group->manifestURL()) == group);
- ASSERT(m_cacheHostSet.contains(urlHostHash(group->manifestURL())));
</del><ins>+ ASSERT(m_cachesInMemory.get(group.manifestURL()) == &group);
+ ASSERT(m_cacheHostSet.contains(urlHostHash(group.manifestURL())));
</ins><span class="cx">
</span><del>- if (ApplicationCache* newestCache = group->newestCache())
</del><ins>+ if (auto* newestCache = group.newestCache())
</ins><span class="cx"> remove(newestCache);
</span><span class="cx">
</span><del>- m_cachesInMemory.remove(group->manifestURL());
- m_cacheHostSet.remove(urlHostHash(group->manifestURL()));
</del><ins>+ m_cachesInMemory.remove(group.manifestURL());
+ m_cacheHostSet.remove(urlHostHash(group.manifestURL()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const String& ApplicationCacheStorage::cacheDirectory() const
</span><span class="lines">@@ -996,7 +989,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool ApplicationCacheStorage::storeNewestCache(ApplicationCacheGroup* group, ApplicationCache* oldCache, FailureReason& failureReason)
</del><ins>+bool ApplicationCacheStorage::storeNewestCache(ApplicationCacheGroup& group, ApplicationCache* oldCache, FailureReason& failureReason)
</ins><span class="cx"> {
</span><span class="cx"> openDatabase(true);
</span><span class="cx">
</span><span class="lines">@@ -1012,15 +1005,15 @@
</span><span class="cx">
</span><span class="cx"> // Check if this would reach the per-origin quota.
</span><span class="cx"> int64_t totalSpaceNeededIgnored;
</span><del>- if (!checkOriginQuota(group, oldCache, group->newestCache(), totalSpaceNeededIgnored)) {
</del><ins>+ if (!checkOriginQuota(&group, oldCache, group.newestCache(), totalSpaceNeededIgnored)) {
</ins><span class="cx"> failureReason = OriginQuotaReached;
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> GroupStorageIDJournal groupStorageIDJournal;
</span><del>- if (!group->storageID()) {
</del><ins>+ if (!group.storageID()) {
</ins><span class="cx"> // Store the group
</span><del>- if (!store(group, &groupStorageIDJournal)) {
</del><ins>+ if (!store(&group, &groupStorageIDJournal)) {
</ins><span class="cx"> checkForMaxSizeReached();
</span><span class="cx"> failureReason = isMaximumSizeReached() ? TotalQuotaReached : DiskOrOperationFailure;
</span><span class="cx"> return false;
</span><span class="lines">@@ -1027,9 +1020,9 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ASSERT(group->newestCache());
- ASSERT(!group->isObsolete());
- ASSERT(!group->newestCache()->storageID());
</del><ins>+ ASSERT(group.newestCache());
+ ASSERT(!group.isObsolete());
+ ASSERT(!group.newestCache()->storageID());
</ins><span class="cx">
</span><span class="cx"> // Log the storageID changes to the in-memory resource objects. The journal
</span><span class="cx"> // object will roll them back automatically in case a database operation
</span><span class="lines">@@ -1037,7 +1030,7 @@
</span><span class="cx"> ResourceStorageIDJournal resourceStorageIDJournal;
</span><span class="cx">
</span><span class="cx"> // Store the newest cache
</span><del>- if (!store(group->newestCache(), &resourceStorageIDJournal)) {
</del><ins>+ if (!store(group.newestCache(), &resourceStorageIDJournal)) {
</ins><span class="cx"> checkForMaxSizeReached();
</span><span class="cx"> failureReason = isMaximumSizeReached() ? TotalQuotaReached : DiskOrOperationFailure;
</span><span class="cx"> return false;
</span><span class="lines">@@ -1051,8 +1044,8 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- statement.bindInt64(1, group->newestCache()->storageID());
- statement.bindInt64(2, group->storageID());
</del><ins>+ statement.bindInt64(1, group.newestCache()->storageID());
+ statement.bindInt64(2, group.storageID());
</ins><span class="cx">
</span><span class="cx"> if (!executeStatement(statement)) {
</span><span class="cx"> failureReason = DiskOrOperationFailure;
</span><span class="lines">@@ -1065,22 +1058,24 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool ApplicationCacheStorage::storeNewestCache(ApplicationCacheGroup* group)
</del><ins>+bool ApplicationCacheStorage::storeNewestCache(ApplicationCacheGroup& group)
</ins><span class="cx"> {
</span><span class="cx"> // Ignore the reason for failing, just attempt the store.
</span><span class="cx"> FailureReason ignoredFailureReason;
</span><del>- return storeNewestCache(group, 0, ignoredFailureReason);
</del><ins>+ return storeNewestCache(group, nullptr, ignoredFailureReason);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-template <typename CharacterType>
-static inline void parseHeader(const CharacterType* header, size_t headerLength, ResourceResponse& response)
</del><ins>+template<typename CharacterType>
+static inline void parseHeader(const CharacterType* header, unsigned headerLength, ResourceResponse& response)
</ins><span class="cx"> {
</span><del>- size_t pos = find(header, headerLength, ':');
- ASSERT(pos != notFound);
-
- String headerName = AtomicString(header, pos);
- String headerValue = String(header + pos + 1, headerLength - pos - 1);
-
</del><ins>+ ASSERT(find(header, headerLength, ':') != notFound);
+ unsigned colonPosition = find(header, headerLength, ':');
+
+ // Save memory by putting the header names into atomic strings so each is stored only once,
+ // even though the setHTTPHeaderField function does not require an atomic string.
+ AtomicString headerName { header, colonPosition };
+ String headerValue { header + colonPosition + 1, headerLength - colonPosition - 1 };
+
</ins><span class="cx"> response.setHTTPHeaderField(headerName, headerValue);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1107,7 +1102,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<ApplicationCache> ApplicationCacheStorage::loadCache(unsigned storageID)
</del><ins>+RefPtr<ApplicationCache> ApplicationCacheStorage::loadCache(unsigned storageID)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(SQLiteDatabaseTracker::hasTransactionInProgress());
</span><span class="cx"> SQLiteStatement cacheStatement(m_database,
</span><span class="lines">@@ -1408,10 +1403,11 @@
</span><span class="cx"> SQLiteTransactionInProgressAutoCounter transactionCounter;
</span><span class="cx">
</span><span class="cx"> SQLiteTransaction deleteTransaction(m_database);
</span><ins>+
</ins><span class="cx"> // Check to see if the group is in memory.
</span><del>- ApplicationCacheGroup* group = m_cachesInMemory.get(manifestURL);
</del><ins>+ auto* group = m_cachesInMemory.get(manifestURL);
</ins><span class="cx"> if (group)
</span><del>- cacheGroupMadeObsolete(group);
</del><ins>+ cacheGroupMadeObsolete(*group);
</ins><span class="cx"> else {
</span><span class="cx"> // The cache group is not in memory, so remove it from the disk.
</span><span class="cx"> openDatabase(false);
</span><span class="lines">@@ -1424,9 +1420,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> deleteTransaction.commit();
</span><del>-
</del><ins>+
</ins><span class="cx"> checkForDeletedResources();
</span><del>-
</del><ins>+
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderappcacheApplicationCacheStorageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/appcache/ApplicationCacheStorage.h (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/appcache/ApplicationCacheStorage.h 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/loader/appcache/ApplicationCacheStorage.h 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2008, 2010, 2011 Apple Inc. All Rights Reserved.
</del><ins>+ * Copyright (C) 2008-2017 Apple Inc. All Rights Reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> class URL;
</span><span class="cx"> class SecurityOrigin;
</span><span class="cx"> class SharedBuffer;
</span><del>-template <class T> class StorageIDJournal;
</del><ins>+template<typename> class StorageIDJournal;
</ins><span class="cx">
</span><span class="cx"> class ApplicationCacheStorage : public RefCounted<ApplicationCacheStorage> {
</span><span class="cx"> public:
</span><span class="lines">@@ -73,19 +73,19 @@
</span><span class="cx">
</span><span class="cx"> ApplicationCacheGroup* findOrCreateCacheGroup(const URL& manifestURL);
</span><span class="cx"> ApplicationCacheGroup* findInMemoryCacheGroup(const URL& manifestURL) const;
</span><del>- void cacheGroupDestroyed(ApplicationCacheGroup*);
- void cacheGroupMadeObsolete(ApplicationCacheGroup*);
-
- bool storeNewestCache(ApplicationCacheGroup*, ApplicationCache* oldCache, FailureReason& failureReason);
- bool storeNewestCache(ApplicationCacheGroup*); // Updates the cache group, but doesn't remove old cache.
</del><ins>+ void cacheGroupDestroyed(ApplicationCacheGroup&);
+ void cacheGroupMadeObsolete(ApplicationCacheGroup&);
+
+ bool storeNewestCache(ApplicationCacheGroup&, ApplicationCache* oldCache, FailureReason&);
+ bool storeNewestCache(ApplicationCacheGroup&); // Updates the cache group, but doesn't remove old cache.
</ins><span class="cx"> bool store(ApplicationCacheResource*, ApplicationCache*);
</span><span class="cx"> bool storeUpdatedType(ApplicationCacheResource*, ApplicationCache*);
</span><span class="cx">
</span><span class="cx"> // Removes the group if the cache to be removed is the newest one (so, storeNewestCache() needs to be called beforehand when updating).
</span><span class="cx"> void remove(ApplicationCache*);
</span><del>-
</del><ins>+
</ins><span class="cx"> WEBCORE_EXPORT void empty();
</span><del>-
</del><ins>+
</ins><span class="cx"> bool getManifestURLs(Vector<URL>* urls);
</span><span class="cx"> bool cacheGroupSize(const String& manifestURL, int64_t* size);
</span><span class="cx"> bool deleteCacheGroup(const String& manifestURL);
</span><span class="lines">@@ -105,14 +105,15 @@
</span><span class="cx">
</span><span class="cx"> static int64_t unknownQuota() { return -1; }
</span><span class="cx"> static int64_t noQuota() { return std::numeric_limits<int64_t>::max(); }
</span><ins>+
</ins><span class="cx"> private:
</span><span class="cx"> ApplicationCacheStorage(const String& cacheDirectory, const String& flatFileSubdirectoryName);
</span><span class="cx">
</span><del>- PassRefPtr<ApplicationCache> loadCache(unsigned storageID);
</del><ins>+ RefPtr<ApplicationCache> loadCache(unsigned storageID);
</ins><span class="cx"> ApplicationCacheGroup* loadCacheGroup(const URL& manifestURL);
</span><span class="cx">
</span><del>- typedef StorageIDJournal<ApplicationCacheResource> ResourceStorageIDJournal;
- typedef StorageIDJournal<ApplicationCacheGroup> GroupStorageIDJournal;
</del><ins>+ using ResourceStorageIDJournal = StorageIDJournal<ApplicationCacheResource>;
+ using GroupStorageIDJournal = StorageIDJournal<ApplicationCacheGroup>;
</ins><span class="cx">
</span><span class="cx"> bool store(ApplicationCacheGroup*, GroupStorageIDJournal*);
</span><span class="cx"> bool store(ApplicationCache*, ResourceStorageIDJournal*);
</span><span class="lines">@@ -152,8 +153,7 @@
</span><span class="cx"> // we keep a hash set of the hosts of the manifest URLs of all non-obsolete cache groups.
</span><span class="cx"> HashCountedSet<unsigned, AlreadyHashed> m_cacheHostSet;
</span><span class="cx">
</span><del>- typedef HashMap<String, ApplicationCacheGroup*> CacheGroupMap;
- CacheGroupMap m_cachesInMemory; // Excludes obsolete cache groups.
</del><ins>+ HashMap<String, ApplicationCacheGroup*> m_cachesInMemory; // Excludes obsolete cache groups.
</ins><span class="cx">
</span><span class="cx"> friend class WTF::NeverDestroyed<ApplicationCacheStorage>;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderappcacheDOMApplicationCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/appcache/DOMApplicationCache.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/appcache/DOMApplicationCache.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/loader/appcache/DOMApplicationCache.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2008, 2009 Apple Inc. All Rights Reserved.
</del><ins>+ * Copyright (C) 2008-2017 Apple Inc. All Rights Reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -29,27 +29,22 @@
</span><span class="cx"> #include "ApplicationCacheHost.h"
</span><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "DocumentLoader.h"
</span><del>-#include "Event.h"
-#include "EventListener.h"
-#include "EventNames.h"
</del><span class="cx"> #include "ExceptionCode.h"
</span><span class="cx"> #include "Frame.h"
</span><del>-#include "FrameLoader.h"
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-DOMApplicationCache::DOMApplicationCache(Frame* frame)
- : DOMWindowProperty(frame)
</del><ins>+DOMApplicationCache::DOMApplicationCache(Frame& frame)
+ : DOMWindowProperty(&frame)
</ins><span class="cx"> {
</span><del>- ApplicationCacheHost* cacheHost = applicationCacheHost();
- if (cacheHost)
- cacheHost->setDOMApplicationCache(this);
</del><ins>+ if (auto* host = applicationCacheHost())
+ host->setDOMApplicationCache(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DOMApplicationCache::disconnectFrameForDocumentSuspension()
</span><span class="cx"> {
</span><del>- if (ApplicationCacheHost* cacheHost = applicationCacheHost())
- cacheHost->setDOMApplicationCache(nullptr);
</del><ins>+ if (auto* host = applicationCacheHost())
+ host->setDOMApplicationCache(nullptr);
</ins><span class="cx"> DOMWindowProperty::disconnectFrameForDocumentSuspension();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -56,36 +51,39 @@
</span><span class="cx"> void DOMApplicationCache::reconnectFrameFromDocumentSuspension(Frame* frame)
</span><span class="cx"> {
</span><span class="cx"> DOMWindowProperty::reconnectFrameFromDocumentSuspension(frame);
</span><del>- if (ApplicationCacheHost* cacheHost = applicationCacheHost())
- cacheHost->setDOMApplicationCache(this);
</del><ins>+ if (auto* host = applicationCacheHost())
+ host->setDOMApplicationCache(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DOMApplicationCache::willDestroyGlobalObjectInFrame()
</span><span class="cx"> {
</span><del>- if (ApplicationCacheHost* cacheHost = applicationCacheHost())
- cacheHost->setDOMApplicationCache(nullptr);
</del><ins>+ if (auto* host = applicationCacheHost())
+ host->setDOMApplicationCache(nullptr);
</ins><span class="cx"> DOMWindowProperty::willDestroyGlobalObjectInFrame();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ApplicationCacheHost* DOMApplicationCache::applicationCacheHost() const
</span><span class="cx"> {
</span><del>- if (!m_frame || !m_frame->loader().documentLoader())
</del><ins>+ if (!m_frame)
</ins><span class="cx"> return nullptr;
</span><del>- return m_frame->loader().documentLoader()->applicationCacheHost();
</del><ins>+ auto* documentLoader = m_frame->loader().documentLoader();
+ if (!documentLoader)
+ return nullptr;
+ return &documentLoader->applicationCacheHost();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned short DOMApplicationCache::status() const
</span><span class="cx"> {
</span><del>- ApplicationCacheHost* cacheHost = applicationCacheHost();
- if (!cacheHost)
</del><ins>+ auto* host = applicationCacheHost();
+ if (!host)
</ins><span class="cx"> return ApplicationCacheHost::UNCACHED;
</span><del>- return cacheHost->status();
</del><ins>+ return host->status();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ExceptionOr<void> DOMApplicationCache::update()
</span><span class="cx"> {
</span><del>- auto* cacheHost = applicationCacheHost();
- if (!cacheHost || !cacheHost->update())
</del><ins>+ auto* host = applicationCacheHost();
+ if (!host || !host->update())
</ins><span class="cx"> return Exception { INVALID_STATE_ERR };
</span><span class="cx"> return { };
</span><span class="cx"> }
</span><span class="lines">@@ -92,8 +90,8 @@
</span><span class="cx">
</span><span class="cx"> ExceptionOr<void> DOMApplicationCache::swapCache()
</span><span class="cx"> {
</span><del>- auto* cacheHost = applicationCacheHost();
- if (!cacheHost || !cacheHost->swapCache())
</del><ins>+ auto* host = applicationCacheHost();
+ if (!host || !host->swapCache())
</ins><span class="cx"> return Exception { INVALID_STATE_ERR };
</span><span class="cx"> return { };
</span><span class="cx"> }
</span><span class="lines">@@ -100,40 +98,15 @@
</span><span class="cx">
</span><span class="cx"> void DOMApplicationCache::abort()
</span><span class="cx"> {
</span><del>- ApplicationCacheHost* cacheHost = applicationCacheHost();
- if (cacheHost)
- cacheHost->abort();
</del><ins>+ if (auto* host = applicationCacheHost())
+ host->abort();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ScriptExecutionContext* DOMApplicationCache::scriptExecutionContext() const
</span><span class="cx"> {
</span><del>- if (m_frame)
- return m_frame->document();
- return nullptr;
</del><ins>+ if (!m_frame)
+ return nullptr;
+ return m_frame->document();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-const AtomicString& DOMApplicationCache::toEventType(ApplicationCacheHost::EventID id)
-{
- switch (id) {
- case ApplicationCacheHost::CHECKING_EVENT:
- return eventNames().checkingEvent;
- case ApplicationCacheHost::ERROR_EVENT:
- return eventNames().errorEvent;
- case ApplicationCacheHost::NOUPDATE_EVENT:
- return eventNames().noupdateEvent;
- case ApplicationCacheHost::DOWNLOADING_EVENT:
- return eventNames().downloadingEvent;
- case ApplicationCacheHost::PROGRESS_EVENT:
- return eventNames().progressEvent;
- case ApplicationCacheHost::UPDATEREADY_EVENT:
- return eventNames().updatereadyEvent;
- case ApplicationCacheHost::CACHED_EVENT:
- return eventNames().cachedEvent;
- case ApplicationCacheHost::OBSOLETE_EVENT:
- return eventNames().obsoleteEvent;
- }
- ASSERT_NOT_REACHED();
- return eventNames().errorEvent;
-}
-
</del><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderappcacheDOMApplicationCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/appcache/DOMApplicationCache.h (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/appcache/DOMApplicationCache.h 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/loader/appcache/DOMApplicationCache.h 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2008, 2009 Apple Inc. All Rights Reserved.
</del><ins>+ * Copyright (C) 2008-2017 Apple Inc. All Rights Reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -25,46 +25,39 @@
</span><span class="cx">
</span><span class="cx"> #pragma once
</span><span class="cx">
</span><del>-#include "ApplicationCacheHost.h"
</del><span class="cx"> #include "DOMWindowProperty.h"
</span><span class="cx"> #include "EventTarget.h"
</span><del>-#include "ExceptionOr.h"
-#include "ScriptWrappable.h"
-#include <wtf/HashMap.h>
-#include <wtf/text/AtomicStringHash.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+class ApplicationCacheHost;
</ins><span class="cx"> class Frame;
</span><del>-class URL;
</del><span class="cx">
</span><span class="cx"> class DOMApplicationCache final : public RefCounted<DOMApplicationCache>, public EventTargetWithInlineData, public DOMWindowProperty {
</span><span class="cx"> public:
</span><del>- static Ref<DOMApplicationCache> create(Frame* frame) { return adoptRef(*new DOMApplicationCache(frame)); }
</del><ins>+ static Ref<DOMApplicationCache> create(Frame& frame) { return adoptRef(*new DOMApplicationCache(frame)); }
</ins><span class="cx"> virtual ~DOMApplicationCache() { ASSERT(!m_frame); }
</span><span class="cx">
</span><del>- void disconnectFrameForDocumentSuspension() override;
- void reconnectFrameFromDocumentSuspension(Frame*) override;
- void willDestroyGlobalObjectInFrame() override;
-
</del><span class="cx"> unsigned short status() const;
</span><span class="cx"> ExceptionOr<void> update();
</span><span class="cx"> ExceptionOr<void> swapCache();
</span><span class="cx"> void abort();
</span><span class="cx">
</span><del>- using RefCounted<DOMApplicationCache>::ref;
- using RefCounted<DOMApplicationCache>::deref;
</del><ins>+ using RefCounted::ref;
+ using RefCounted::deref;
</ins><span class="cx">
</span><del>- EventTargetInterface eventTargetInterface() const override { return DOMApplicationCacheEventTargetInterfaceType; }
- ScriptExecutionContext* scriptExecutionContext() const override;
</del><ins>+private:
+ explicit DOMApplicationCache(Frame&);
</ins><span class="cx">
</span><del>- static const AtomicString& toEventType(ApplicationCacheHost::EventID id);
</del><ins>+ void refEventTarget() final { ref(); }
+ void derefEventTarget() final { deref(); }
</ins><span class="cx">
</span><del>-private:
- explicit DOMApplicationCache(Frame*);
</del><ins>+ EventTargetInterface eventTargetInterface() const final { return DOMApplicationCacheEventTargetInterfaceType; }
+ ScriptExecutionContext* scriptExecutionContext() const final;
</ins><span class="cx">
</span><del>- void refEventTarget() override { ref(); }
- void derefEventTarget() override { deref(); }
</del><ins>+ void disconnectFrameForDocumentSuspension() final;
+ void reconnectFrameFromDocumentSuspension(Frame*) final;
+ void willDestroyGlobalObjectInFrame() final;
</ins><span class="cx">
</span><span class="cx"> ApplicationCacheHost* applicationCacheHost() const;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderappcacheManifestParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/appcache/ManifestParser.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/appcache/ManifestParser.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/loader/appcache/ManifestParser.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -119,8 +119,7 @@
</span><span class="cx"> if (!url.isValid())
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- if (url.hasFragmentIdentifier())
- url.removeFragmentIdentifier();
</del><ins>+ url.removeFragmentIdentifier();
</ins><span class="cx">
</span><span class="cx"> if (!equalIgnoringASCIICase(url.protocol(), manifestURL.protocol()))
</span><span class="cx"> continue;
</span><span class="lines">@@ -150,8 +149,7 @@
</span><span class="cx"> URL namespaceURL(manifestURL, line.substring(0, p - upconvertedLineCharacters));
</span><span class="cx"> if (!namespaceURL.isValid())
</span><span class="cx"> continue;
</span><del>- if (namespaceURL.hasFragmentIdentifier())
- namespaceURL.removeFragmentIdentifier();
</del><ins>+ namespaceURL.removeFragmentIdentifier();
</ins><span class="cx">
</span><span class="cx"> if (!protocolHostAndPortAreEqual(manifestURL, namespaceURL))
</span><span class="cx"> continue;
</span><span class="lines">@@ -168,8 +166,7 @@
</span><span class="cx"> URL fallbackURL(manifestURL, String(fallbackStart, p - fallbackStart));
</span><span class="cx"> if (!fallbackURL.isValid())
</span><span class="cx"> continue;
</span><del>- if (fallbackURL.hasFragmentIdentifier())
- fallbackURL.removeFragmentIdentifier();
</del><ins>+ fallbackURL.removeFragmentIdentifier();
</ins><span class="cx">
</span><span class="cx"> if (!protocolHostAndPortAreEqual(manifestURL, fallbackURL))
</span><span class="cx"> continue;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderappcacheManifestParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/appcache/ManifestParser.h (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/appcache/ManifestParser.h 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/loader/appcache/ManifestParser.h 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -30,15 +30,15 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>- class URL;
</del><ins>+class URL;
</ins><span class="cx">
</span><del>- struct Manifest {
- Vector<URL> onlineWhitelistedURLs;
- HashSet<String> explicitURLs;
- FallbackURLVector fallbackURLs;
- bool allowAllNetworkRequests; // Wildcard found in NETWORK section.
- };
</del><ins>+struct Manifest {
+ Vector<URL> onlineWhitelistedURLs;
+ HashSet<String> explicitURLs;
+ FallbackURLVector fallbackURLs;
+ bool allowAllNetworkRequests; // Wildcard found in NETWORK section.
+};
</ins><span class="cx">
</span><del>- bool parseManifest(const URL& manifestURL, const char* data, int length, Manifest&);
</del><ins>+bool parseManifest(const URL& manifestURL, const char* data, int length, Manifest&);
</ins><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderarchiveArchivecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/archive/Archive.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/archive/Archive.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/loader/archive/Archive.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2008 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2008-2017 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -37,17 +37,17 @@
</span><span class="cx">
</span><span class="cx"> void Archive::clearAllSubframeArchives()
</span><span class="cx"> {
</span><del>- Vector<RefPtr<Archive>> clearedArchives;
- clearAllSubframeArchivesImpl(&clearedArchives);
</del><ins>+ HashSet<Archive*> clearedArchives;
+ clearedArchives.add(this);
+ clearAllSubframeArchives(clearedArchives);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void Archive::clearAllSubframeArchivesImpl(Vector<RefPtr<Archive>>* clearedArchives)
</del><ins>+void Archive::clearAllSubframeArchives(HashSet<Archive*>& clearedArchives)
</ins><span class="cx"> {
</span><ins>+ ASSERT(clearedArchives.contains(this));
</ins><span class="cx"> for (auto& archive : m_subframeArchives) {
</span><del>- if (!clearedArchives->contains(archive)) {
- clearedArchives->append(archive);
- archive->clearAllSubframeArchivesImpl(clearedArchives);
- }
</del><ins>+ if (clearedArchives.add(archive.ptr()))
+ archive->clearAllSubframeArchives(clearedArchives);
</ins><span class="cx"> }
</span><span class="cx"> m_subframeArchives.clear();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderarchiveArchiveh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/archive/Archive.h (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/archive/Archive.h 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/loader/archive/Archive.h 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2008 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2008-2017 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -29,41 +29,38 @@
</span><span class="cx"> #pragma once
</span><span class="cx">
</span><span class="cx"> #include "ArchiveResource.h"
</span><ins>+#include <wtf/HashSet.h>
</ins><span class="cx">
</span><del>-#include <wtf/PassRefPtr.h>
-#include <wtf/RefCounted.h>
-#include <wtf/RefPtr.h>
-#include <wtf/Vector.h>
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class Archive : public RefCounted<Archive> {
</span><span class="cx"> public:
</span><del>- enum Type {
- WebArchive,
- MHTML
- };
</del><span class="cx"> virtual ~Archive();
</span><del>- virtual Type type() const = 0;
</del><ins>+
+ virtual bool shouldLoadFromArchiveOnly() const = 0;
+ virtual bool shouldOverrideBaseURL() const = 0;
+ virtual bool shouldUseMainResourceEncoding() const = 0;
+ virtual bool shouldUseMainResourceURL() const = 0;
+
</ins><span class="cx"> ArchiveResource* mainResource() { return m_mainResource.get(); }
</span><del>- const Vector<RefPtr<ArchiveResource>>& subresources() const { return m_subresources; }
- const Vector<RefPtr<Archive>>& subframeArchives() const { return m_subframeArchives; }
</del><ins>+ const Vector<Ref<ArchiveResource>>& subresources() const { return m_subresources; }
+ const Vector<Ref<Archive>>& subframeArchives() const { return m_subframeArchives; }
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> // These methods are meant for subclasses for different archive types to add resources in to the archive,
</span><span class="cx"> // and should not be exposed as archives should be immutable to clients
</span><del>- void setMainResource(PassRefPtr<ArchiveResource> mainResource) { m_mainResource = mainResource; }
- void addSubresource(PassRefPtr<ArchiveResource> subResource) { m_subresources.append(subResource); }
- void addSubframeArchive(PassRefPtr<Archive> subframeArchive) { m_subframeArchives.append(subframeArchive); }
</del><ins>+ void setMainResource(Ref<ArchiveResource>&& mainResource) { m_mainResource = WTFMove(mainResource); }
+ void addSubresource(Ref<ArchiveResource>&& resource) { m_subresources.append(WTFMove(resource)); }
+ void addSubframeArchive(Ref<Archive>&& subframeArchive) { m_subframeArchives.append(WTFMove(subframeArchive)); }
</ins><span class="cx">
</span><span class="cx"> void clearAllSubframeArchives();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- void clearAllSubframeArchivesImpl(Vector<RefPtr<Archive>>* clearedArchives);
</del><ins>+ void clearAllSubframeArchives(HashSet<Archive*>&);
</ins><span class="cx">
</span><span class="cx"> RefPtr<ArchiveResource> m_mainResource;
</span><del>- Vector<RefPtr<ArchiveResource>> m_subresources;
- Vector<RefPtr<Archive>> m_subframeArchives;
</del><ins>+ Vector<Ref<ArchiveResource>> m_subresources;
+ Vector<Ref<Archive>> m_subframeArchives;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderarchiveArchiveFactorycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/archive/ArchiveFactory.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/archive/ArchiveFactory.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/loader/archive/ArchiveFactory.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -49,33 +49,35 @@
</span><span class="cx"> typedef RefPtr<Archive> RawDataCreationFunction(const URL&, SharedBuffer&);
</span><span class="cx"> typedef HashMap<String, RawDataCreationFunction*, ASCIICaseInsensitiveHash> ArchiveMIMETypesMap;
</span><span class="cx">
</span><del>-// The create functions in the archive classes return PassRefPtr to concrete subclasses
</del><ins>+// The create functions in the archive classes return RefPtr to concrete subclasses
</ins><span class="cx"> // of Archive. This adaptor makes the functions have a uniform return type.
</span><del>-template <typename ArchiveClass> static RefPtr<Archive> archiveFactoryCreate(const URL& url, SharedBuffer& buffer)
</del><ins>+template<typename ArchiveClass> static RefPtr<Archive> archiveFactoryCreate(const URL& url, SharedBuffer& buffer)
</ins><span class="cx"> {
</span><span class="cx"> return ArchiveClass::create(url, buffer);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static ArchiveMIMETypesMap& archiveMIMETypes()
</del><ins>+static ArchiveMIMETypesMap createArchiveMIMETypesMap()
</ins><span class="cx"> {
</span><del>- static NeverDestroyed<ArchiveMIMETypesMap> mimeTypes;
- static bool initialized = false;
</del><ins>+ ArchiveMIMETypesMap map;
</ins><span class="cx">
</span><del>- if (initialized)
- return mimeTypes;
-
</del><span class="cx"> #if ENABLE(WEB_ARCHIVE) && USE(CF)
</span><del>- mimeTypes.get().set("application/x-webarchive", archiveFactoryCreate<LegacyWebArchive>);
</del><ins>+ map.add(ASCIILiteral { "application/x-webarchive" }, archiveFactoryCreate<LegacyWebArchive>);
</ins><span class="cx"> #endif
</span><ins>+
</ins><span class="cx"> #if ENABLE(MHTML)
</span><del>- mimeTypes.get().set("multipart/related", archiveFactoryCreate<MHTMLArchive>);
- mimeTypes.get().set("application/x-mimearchive", archiveFactoryCreate<MHTMLArchive>);
</del><ins>+ map.add(ASCIILiteral { "multipart/related" }, archiveFactoryCreate<MHTMLArchive>);
+ map.add(ASCIILiteral { "application/x-mimearchive" }, archiveFactoryCreate<MHTMLArchive>);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- initialized = true;
- return mimeTypes;
</del><ins>+ return map;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+static ArchiveMIMETypesMap& archiveMIMETypes()
+{
+ static NeverDestroyed<ArchiveMIMETypesMap> map = createArchiveMIMETypesMap();
+ return map;
+}
+
</ins><span class="cx"> bool ArchiveFactory::isArchiveMimeType(const String& mimeType)
</span><span class="cx"> {
</span><span class="cx"> return !mimeType.isEmpty() && archiveMIMETypes().contains(mimeType);
</span><span class="lines">@@ -83,10 +85,14 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<Archive> ArchiveFactory::create(const URL& url, SharedBuffer* data, const String& mimeType)
</span><span class="cx"> {
</span><del>- RawDataCreationFunction* function = mimeType.isEmpty() ? 0 : archiveMIMETypes().get(mimeType);
</del><span class="cx"> if (!data)
</span><span class="cx"> return nullptr;
</span><del>- return function ? function(url, *data) : RefPtr<Archive>(nullptr);
</del><ins>+ if (mimeType.isEmpty())
+ return nullptr;
+ auto* function = archiveMIMETypes().get(mimeType);
+ if (!function)
+ return nullptr;
+ return function(url, *data);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ArchiveFactory::registerKnownArchiveMIMETypes()
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderarchiveArchiveResourceCollectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/archive/ArchiveResourceCollection.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/archive/ArchiveResourceCollection.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/loader/archive/ArchiveResourceCollection.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2008 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2008-2017 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -29,31 +29,23 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "ArchiveResourceCollection.h"
</span><span class="cx">
</span><ins>+#include "Archive.h"
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-ArchiveResourceCollection::ArchiveResourceCollection()
</del><ins>+void ArchiveResourceCollection::addAllResources(Archive& archive)
</ins><span class="cx"> {
</span><del>-}
</del><ins>+ for (auto& subresource : archive.subresources())
+ m_subresources.set(subresource->url(), subresource.ptr());
</ins><span class="cx">
</span><del>-void ArchiveResourceCollection::addAllResources(Archive* archive)
-{
- ASSERT(archive);
- if (!archive)
- return;
-
- for (auto& subresource : archive->subresources())
- m_subresources.set(subresource->url(), subresource.get());
-
- for (auto& subframeArchive : archive->subframeArchives()) {
</del><ins>+ for (auto& subframeArchive : archive.subframeArchives()) {
</ins><span class="cx"> ASSERT(subframeArchive->mainResource());
</span><del>-
- const String& frameName = subframeArchive->mainResource()->frameName();
- if (!frameName.isNull())
- m_subframes.set(frameName, subframeArchive.get());
- else {
- // In the MHTML case, frames don't have a name so we use the URL instead.
- m_subframes.set(subframeArchive->mainResource()->url().string(), subframeArchive.get());
</del><ins>+ auto frameName = subframeArchive->mainResource()->frameName();
+ if (frameName.isNull()) {
+ // In the MHTML case, frames don't have a name, so we use the URL instead.
+ frameName = subframeArchive->mainResource()->url().string();
</ins><span class="cx"> }
</span><ins>+ m_subframes.set(frameName, subframeArchive.ptr());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -61,25 +53,19 @@
</span><span class="cx"> // Can we change the design in a manner that will let us deprecate that API without reducing functionality of those apps?
</span><span class="cx"> void ArchiveResourceCollection::addResource(Ref<ArchiveResource>&& resource)
</span><span class="cx"> {
</span><del>- const URL& url = resource->url();
</del><ins>+ auto& url = resource->url();
</ins><span class="cx"> m_subresources.set(url, WTFMove(resource));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ArchiveResource* ArchiveResourceCollection::archiveResourceForURL(const URL& url)
</span><span class="cx"> {
</span><del>- ArchiveResource* resource = m_subresources.get(url);
- if (!resource)
- return nullptr;
-
- return resource;
</del><ins>+ return m_subresources.get(url);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Archive> ArchiveResourceCollection::popSubframeArchive(const String& frameName, const URL& url)
</del><ins>+RefPtr<Archive> ArchiveResourceCollection::popSubframeArchive(const String& frameName, const URL& url)
</ins><span class="cx"> {
</span><del>- auto archive = m_subframes.take(frameName);
- if (archive)
- return WTFMove(archive);
-
</del><ins>+ if (auto archive = m_subframes.take(frameName))
+ return archive;
</ins><span class="cx"> return m_subframes.take(url.string());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderarchiveArchiveResourceCollectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/archive/ArchiveResourceCollection.h (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/archive/ArchiveResourceCollection.h 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/loader/archive/ArchiveResourceCollection.h 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2008 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2008-2017 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -28,24 +28,29 @@
</span><span class="cx">
</span><span class="cx"> #pragma once
</span><span class="cx">
</span><del>-#include "Archive.h"
-#include "ArchiveResource.h"
-#include "URL.h"
</del><ins>+#include <wtf/Forward.h>
</ins><span class="cx"> #include <wtf/HashMap.h>
</span><del>-#include <wtf/text/WTFString.h>
</del><ins>+#include <wtf/Noncopyable.h>
+#include <wtf/text/StringHash.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+class Archive;
+class ArchiveResource;
+class URL;
+
</ins><span class="cx"> class ArchiveResourceCollection {
</span><del>- WTF_MAKE_NONCOPYABLE(ArchiveResourceCollection); WTF_MAKE_FAST_ALLOCATED;
</del><ins>+ WTF_MAKE_NONCOPYABLE(ArchiveResourceCollection);
+ WTF_MAKE_FAST_ALLOCATED;
+
</ins><span class="cx"> public:
</span><del>- ArchiveResourceCollection();
</del><ins>+ ArchiveResourceCollection() = default;
</ins><span class="cx">
</span><span class="cx"> void addResource(Ref<ArchiveResource>&&);
</span><del>- void addAllResources(Archive*);
</del><ins>+ void addAllResources(Archive&);
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT ArchiveResource* archiveResourceForURL(const URL&);
</span><del>- PassRefPtr<Archive> popSubframeArchive(const String& frameName, const URL&);
</del><ins>+ RefPtr<Archive> popSubframeArchive(const String& frameName, const URL&);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> HashMap<String, RefPtr<ArchiveResource>> m_subresources;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderarchivecfLegacyWebArchivecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/archive/cf/LegacyWebArchive.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/archive/cf/LegacyWebArchive.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/loader/archive/cf/LegacyWebArchive.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -80,18 +80,16 @@
</span><span class="cx"> CFDictionarySetValue(propertyList.get(), LegacyWebArchiveResourceMIMETypeKey, 0);
</span><span class="cx"> return propertyList;
</span><span class="cx"> }
</span><del>-
- RetainPtr<CFMutableDictionaryRef> propertyList = adoptCF(CFDictionaryCreateMutable(0, 6, 0, &kCFTypeDictionaryValueCallBacks));
-
</del><ins>+
+ auto propertyList = adoptCF(CFDictionaryCreateMutable(0, 6, 0, &kCFTypeDictionaryValueCallBacks));
+
</ins><span class="cx"> // Resource data can be empty, but must be represented by an empty CFDataRef
</span><del>- SharedBuffer& data = resource->data();
- RetainPtr<CFDataRef> cfData;
- cfData = data.createCFData();
</del><ins>+ auto& data = resource->data();
</ins><span class="cx">
</span><del>- CFDictionarySetValue(propertyList.get(), LegacyWebArchiveResourceDataKey, cfData.get());
-
</del><ins>+ CFDictionarySetValue(propertyList.get(), LegacyWebArchiveResourceDataKey, data.createCFData().get());
+
</ins><span class="cx"> // Resource URL cannot be null
</span><del>- if (RetainPtr<CFStringRef> cfURL = resource->url().string().createCFString())
</del><ins>+ if (auto cfURL = resource->url().string().createCFString())
</ins><span class="cx"> CFDictionarySetValue(propertyList.get(), LegacyWebArchiveResourceURLKey, cfURL.get());
</span><span class="cx"> else {
</span><span class="cx"> LOG(Archives, "LegacyWebArchive - NULL resource URL is invalid - returning null property list");
</span><span class="lines">@@ -99,23 +97,22 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FrameName should be left out if empty for subresources, but always included for main resources
</span><del>- const String& frameName(resource->frameName());
</del><ins>+ auto& frameName = resource->frameName();
</ins><span class="cx"> if (!frameName.isEmpty() || isMainResource)
</span><span class="cx"> CFDictionarySetValue(propertyList.get(), LegacyWebArchiveResourceFrameNameKey, frameName.createCFString().get());
</span><del>-
</del><ins>+
</ins><span class="cx"> // Set MIMEType, TextEncodingName, and ResourceResponse only if they actually exist
</span><del>- const String& mimeType(resource->mimeType());
</del><ins>+ auto& mimeType = resource->mimeType();
</ins><span class="cx"> if (!mimeType.isEmpty())
</span><span class="cx"> CFDictionarySetValue(propertyList.get(), LegacyWebArchiveResourceMIMETypeKey, mimeType.createCFString().get());
</span><del>-
- const String& textEncoding(resource->textEncoding());
</del><ins>+
+ auto& textEncoding = resource->textEncoding();
</ins><span class="cx"> if (!textEncoding.isEmpty())
</span><span class="cx"> CFDictionarySetValue(propertyList.get(), LegacyWebArchiveResourceTextEncodingNameKey, textEncoding.createCFString().get());
</span><span class="cx">
</span><span class="cx"> // Don't include the resource response for the main resource
</span><span class="cx"> if (!isMainResource) {
</span><del>- RetainPtr<CFDataRef> resourceResponseData = createPropertyListRepresentation(resource->response());
- if (resourceResponseData)
</del><ins>+ if (auto resourceResponseData = createPropertyListRepresentation(resource->response()))
</ins><span class="cx"> CFDictionarySetValue(propertyList.get(), LegacyWebArchiveResourceResponseKey, resourceResponseData.get());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -122,19 +119,19 @@
</span><span class="cx"> return propertyList;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RetainPtr<CFDictionaryRef> LegacyWebArchive::createPropertyListRepresentation(Archive* archive)
</del><ins>+RetainPtr<CFDictionaryRef> LegacyWebArchive::createPropertyListRepresentation(Archive& archive)
</ins><span class="cx"> {
</span><del>- RetainPtr<CFMutableDictionaryRef> propertyList = adoptCF(CFDictionaryCreateMutable(0, 3, 0, &kCFTypeDictionaryValueCallBacks));
-
- RetainPtr<CFDictionaryRef> mainResourceDict = createPropertyListRepresentation(archive->mainResource(), MainResource);
</del><ins>+ auto propertyList = adoptCF(CFDictionaryCreateMutable(0, 3, 0, &kCFTypeDictionaryValueCallBacks));
+
+ auto mainResourceDict = createPropertyListRepresentation(archive.mainResource(), MainResource);
</ins><span class="cx"> ASSERT(mainResourceDict);
</span><span class="cx"> if (!mainResourceDict)
</span><span class="cx"> return nullptr;
</span><span class="cx"> CFDictionarySetValue(propertyList.get(), LegacyWebArchiveMainResourceKey, mainResourceDict.get());
</span><span class="cx">
</span><del>- RetainPtr<CFMutableArrayRef> subresourcesArray = adoptCF(CFArrayCreateMutable(0, archive->subresources().size(), &kCFTypeArrayCallBacks));
- for (auto& resource : archive->subresources()) {
- if (RetainPtr<CFDictionaryRef> subresource = createPropertyListRepresentation(resource.get(), Subresource))
</del><ins>+ auto subresourcesArray = adoptCF(CFArrayCreateMutable(0, archive.subresources().size(), &kCFTypeArrayCallBacks));
+ for (auto& resource : archive.subresources()) {
+ if (auto subresource = createPropertyListRepresentation(resource.ptr(), Subresource))
</ins><span class="cx"> CFArrayAppendValue(subresourcesArray.get(), subresource.get());
</span><span class="cx"> else
</span><span class="cx"> LOG(Archives, "LegacyWebArchive - Failed to create property list for subresource");
</span><span class="lines">@@ -142,9 +139,9 @@
</span><span class="cx"> if (CFArrayGetCount(subresourcesArray.get()))
</span><span class="cx"> CFDictionarySetValue(propertyList.get(), LegacyWebArchiveSubresourcesKey, subresourcesArray.get());
</span><span class="cx">
</span><del>- RetainPtr<CFMutableArrayRef> subframesArray = adoptCF(CFArrayCreateMutable(0, archive->subframeArchives().size(), &kCFTypeArrayCallBacks));
- for (auto& subframe : archive->subframeArchives()) {
- if (RetainPtr<CFDictionaryRef> subframeArchive = createPropertyListRepresentation(subframe.get()))
</del><ins>+ auto subframesArray = adoptCF(CFArrayCreateMutable(0, archive.subframeArchives().size(), &kCFTypeArrayCallBacks));
+ for (auto& subframe : archive.subframeArchives()) {
+ if (auto subframeArchive = createPropertyListRepresentation(subframe.get()))
</ins><span class="cx"> CFArrayAppendValue(subframesArray.get(), subframeArchive.get());
</span><span class="cx"> else
</span><span class="cx"> LOG(Archives, "LegacyWebArchive - Failed to create property list for subframe archive");
</span><span class="lines">@@ -160,13 +157,13 @@
</span><span class="cx"> ASSERT(data);
</span><span class="cx"> if (!data)
</span><span class="cx"> return ResourceResponse();
</span><del>-
</del><ins>+
</ins><span class="cx"> // If the ResourceResponseVersion (passed in as responseDataType) exists at all, this is a "new" web archive that we
</span><span class="cx"> // can parse well in a cross platform manner If it doesn't exist, we will assume this is an "old" web archive with,
</span><span class="cx"> // NSURLResponse objects in it and parse the ResourceResponse as such.
</span><span class="cx"> if (!responseDataType)
</span><span class="cx"> return createResourceResponseFromMacArchivedData(data);
</span><del>-
</del><ins>+
</ins><span class="cx"> // FIXME: Parse the "new" format that the above comment references here. This format doesn't exist yet.
</span><span class="cx"> return ResourceResponse();
</span><span class="cx"> }
</span><span class="lines">@@ -176,32 +173,32 @@
</span><span class="cx"> ASSERT(dictionary);
</span><span class="cx"> if (!dictionary)
</span><span class="cx"> return nullptr;
</span><del>-
- CFDataRef resourceData = static_cast<CFDataRef>(CFDictionaryGetValue(dictionary, LegacyWebArchiveResourceDataKey));
</del><ins>+
+ auto resourceData = static_cast<CFDataRef>(CFDictionaryGetValue(dictionary, LegacyWebArchiveResourceDataKey));
</ins><span class="cx"> if (resourceData && CFGetTypeID(resourceData) != CFDataGetTypeID()) {
</span><span class="cx"> LOG(Archives, "LegacyWebArchive - Resource data is not of type CFData, cannot create invalid resource");
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><del>-
- CFStringRef frameName = static_cast<CFStringRef>(CFDictionaryGetValue(dictionary, LegacyWebArchiveResourceFrameNameKey));
</del><ins>+
+ auto frameName = static_cast<CFStringRef>(CFDictionaryGetValue(dictionary, LegacyWebArchiveResourceFrameNameKey));
</ins><span class="cx"> if (frameName && CFGetTypeID(frameName) != CFStringGetTypeID()) {
</span><span class="cx"> LOG(Archives, "LegacyWebArchive - Frame name is not of type CFString, cannot create invalid resource");
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><del>-
- CFStringRef mimeType = static_cast<CFStringRef>(CFDictionaryGetValue(dictionary, LegacyWebArchiveResourceMIMETypeKey));
</del><ins>+
+ auto mimeType = static_cast<CFStringRef>(CFDictionaryGetValue(dictionary, LegacyWebArchiveResourceMIMETypeKey));
</ins><span class="cx"> if (mimeType && CFGetTypeID(mimeType) != CFStringGetTypeID()) {
</span><span class="cx"> LOG(Archives, "LegacyWebArchive - MIME type is not of type CFString, cannot create invalid resource");
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><del>-
- CFStringRef url = static_cast<CFStringRef>(CFDictionaryGetValue(dictionary, LegacyWebArchiveResourceURLKey));
</del><ins>+
+ auto url = static_cast<CFStringRef>(CFDictionaryGetValue(dictionary, LegacyWebArchiveResourceURLKey));
</ins><span class="cx"> if (url && CFGetTypeID(url) != CFStringGetTypeID()) {
</span><span class="cx"> LOG(Archives, "LegacyWebArchive - URL is not of type CFString, cannot create invalid resource");
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><del>-
- CFStringRef textEncoding = static_cast<CFStringRef>(CFDictionaryGetValue(dictionary, LegacyWebArchiveResourceTextEncodingNameKey));
</del><ins>+
+ auto textEncoding = static_cast<CFStringRef>(CFDictionaryGetValue(dictionary, LegacyWebArchiveResourceTextEncodingNameKey));
</ins><span class="cx"> if (textEncoding && CFGetTypeID(textEncoding) != CFStringGetTypeID()) {
</span><span class="cx"> LOG(Archives, "LegacyWebArchive - Text encoding is not of type CFString, cannot create invalid resource");
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -208,15 +205,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ResourceResponse response;
</span><del>-
- CFDataRef resourceResponseData = static_cast<CFDataRef>(CFDictionaryGetValue(dictionary, LegacyWebArchiveResourceResponseKey));
- if (resourceResponseData) {
</del><ins>+
+ if (auto resourceResponseData = static_cast<CFDataRef>(CFDictionaryGetValue(dictionary, LegacyWebArchiveResourceResponseKey))) {
</ins><span class="cx"> if (CFGetTypeID(resourceResponseData) != CFDataGetTypeID()) {
</span><span class="cx"> LOG(Archives, "LegacyWebArchive - Resource response data is not of type CFData, cannot create invalid resource");
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- CFStringRef resourceResponseVersion = static_cast<CFStringRef>(CFDictionaryGetValue(dictionary, LegacyWebArchiveResourceResponseVersionKey));
</del><ins>+ auto resourceResponseVersion = static_cast<CFStringRef>(CFDictionaryGetValue(dictionary, LegacyWebArchiveResourceResponseVersionKey));
</ins><span class="cx"> if (resourceResponseVersion && CFGetTypeID(resourceResponseVersion) != CFStringGetTypeID()) {
</span><span class="cx"> LOG(Archives, "LegacyWebArchive - Resource response version is not of type CFString, cannot create invalid resource");
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -224,7 +220,7 @@
</span><span class="cx">
</span><span class="cx"> response = createResourceResponseFromPropertyListData(resourceResponseData, resourceResponseVersion);
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> return ArchiveResource::create(SharedBuffer::wrapCFData(resourceData), URL(URL(), url), mimeType, textEncoding, frameName, response);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -233,14 +229,12 @@
</span><span class="cx"> return adoptRef(*new LegacyWebArchive);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<LegacyWebArchive> LegacyWebArchive::create(RefPtr<ArchiveResource>&& mainResource, Vector<RefPtr<ArchiveResource>>&& subresources, Vector<RefPtr<LegacyWebArchive>>&& subframeArchives)
</del><ins>+Ref<LegacyWebArchive> LegacyWebArchive::create(Ref<ArchiveResource>&& mainResource, Vector<Ref<ArchiveResource>>&& subresources, Vector<Ref<LegacyWebArchive>>&& subframeArchives)
</ins><span class="cx"> {
</span><del>- if (!mainResource)
- return nullptr;
</del><ins>+ auto archive = create();
</ins><span class="cx">
</span><del>- auto archive = create();
</del><span class="cx"> archive->setMainResource(WTFMove(mainResource));
</span><del>-
</del><ins>+
</ins><span class="cx"> for (auto& subresource : subresources)
</span><span class="cx"> archive->addSubresource(WTFMove(subresource));
</span><span class="cx">
</span><span class="lines">@@ -247,7 +241,7 @@
</span><span class="cx"> for (auto& subframeArchive : subframeArchives)
</span><span class="cx"> archive->addSubframeArchive(WTFMove(subframeArchive));
</span><span class="cx">
</span><del>- return WTFMove(archive);
</del><ins>+ return archive;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<LegacyWebArchive> LegacyWebArchive::create(SharedBuffer& data)
</span><span class="lines">@@ -307,28 +301,30 @@
</span><span class="cx"> LOG(Archives, "LegacyWebArchive - Main resource is not the expected CFDictionary, aborting invalid WebArchive");
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><del>-
- setMainResource(createResource(mainResourceDict));
- if (!mainResource()) {
</del><ins>+
+ auto mainResource = createResource(mainResourceDict);
+ if (!mainResource) {
</ins><span class="cx"> LOG(Archives, "LegacyWebArchive - Failed to parse main resource from CFDictionary or main resource does not exist, aborting invalid WebArchive");
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><del>-
- if (mainResource()->mimeType().isNull()) {
</del><ins>+
+ if (mainResource->mimeType().isNull()) {
</ins><span class="cx"> LOG(Archives, "LegacyWebArchive - Main resource MIME type is required, but was null.");
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><del>-
- CFArrayRef subresourceArray = static_cast<CFArrayRef>(CFDictionaryGetValue(dictionary, LegacyWebArchiveSubresourcesKey));
</del><ins>+
+ setMainResource(mainResource.releaseNonNull());
+
+ auto subresourceArray = static_cast<CFArrayRef>(CFDictionaryGetValue(dictionary, LegacyWebArchiveSubresourcesKey));
</ins><span class="cx"> if (subresourceArray && CFGetTypeID(subresourceArray) != CFArrayGetTypeID()) {
</span><span class="cx"> LOG(Archives, "LegacyWebArchive - Subresources is not the expected Array, aborting invalid WebArchive");
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if (subresourceArray) {
</span><del>- CFIndex count = CFArrayGetCount(subresourceArray);
</del><ins>+ auto count = CFArrayGetCount(subresourceArray);
</ins><span class="cx"> for (CFIndex i = 0; i < count; ++i) {
</span><del>- CFDictionaryRef subresourceDict = static_cast<CFDictionaryRef>(CFArrayGetValueAtIndex(subresourceArray, i));
</del><ins>+ auto subresourceDict = static_cast<CFDictionaryRef>(CFArrayGetValueAtIndex(subresourceArray, i));
</ins><span class="cx"> if (CFGetTypeID(subresourceDict) != CFDictionaryGetTypeID()) {
</span><span class="cx"> LOG(Archives, "LegacyWebArchive - Subresource is not expected CFDictionary, aborting invalid WebArchive");
</span><span class="cx"> return false;
</span><span class="lines">@@ -335,20 +331,20 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (auto subresource = createResource(subresourceDict))
</span><del>- addSubresource(WTFMove(subresource));
</del><ins>+ addSubresource(subresource.releaseNonNull());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><del>-
- CFArrayRef subframeArray = static_cast<CFArrayRef>(CFDictionaryGetValue(dictionary, LegacyWebArchiveSubframeArchivesKey));
</del><ins>+
+ auto subframeArray = static_cast<CFArrayRef>(CFDictionaryGetValue(dictionary, LegacyWebArchiveSubframeArchivesKey));
</ins><span class="cx"> if (subframeArray && CFGetTypeID(subframeArray) != CFArrayGetTypeID()) {
</span><span class="cx"> LOG(Archives, "LegacyWebArchive - Subframe archives is not the expected Array, aborting invalid WebArchive");
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if (subframeArray) {
</span><del>- CFIndex count = CFArrayGetCount(subframeArray);
</del><ins>+ auto count = CFArrayGetCount(subframeArray);
</ins><span class="cx"> for (CFIndex i = 0; i < count; ++i) {
</span><del>- CFDictionaryRef subframeDict = static_cast<CFDictionaryRef>(CFArrayGetValueAtIndex(subframeArray, i));
</del><ins>+ auto subframeDict = static_cast<CFDictionaryRef>(CFArrayGetValueAtIndex(subframeArray, i));
</ins><span class="cx"> if (CFGetTypeID(subframeDict) != CFDictionaryGetTypeID()) {
</span><span class="cx"> LOG(Archives, "LegacyWebArchive - Subframe array is not expected CFDictionary, aborting invalid WebArchive");
</span><span class="cx"> return false;
</span><span class="lines">@@ -365,14 +361,9 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Archive::Type LegacyWebArchive::type() const
-{
- return Archive::WebArchive;
-}
-
</del><span class="cx"> RetainPtr<CFDataRef> LegacyWebArchive::rawDataRepresentation()
</span><span class="cx"> {
</span><del>- RetainPtr<CFDictionaryRef> propertyList = createPropertyListRepresentation(this);
</del><ins>+ auto propertyList = createPropertyListRepresentation(*this);
</ins><span class="cx"> ASSERT(propertyList);
</span><span class="cx"> if (!propertyList) {
</span><span class="cx"> LOG(Archives, "LegacyWebArchive - Failed to create property list for archive, returning no data");
</span><span class="lines">@@ -379,12 +370,12 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RetainPtr<CFWriteStreamRef> stream = adoptCF(CFWriteStreamCreateWithAllocatedBuffers(0, 0));
</del><ins>+ auto stream = adoptCF(CFWriteStreamCreateWithAllocatedBuffers(0, 0));
</ins><span class="cx">
</span><span class="cx"> CFWriteStreamOpen(stream.get());
</span><span class="cx"> CFPropertyListWrite(propertyList.get(), stream.get(), kCFPropertyListBinaryFormat_v1_0, 0, 0);
</span><span class="cx">
</span><del>- RetainPtr<CFDataRef> plistData = adoptCF(static_cast<CFDataRef>(CFWriteStreamCopyProperty(stream.get(), kCFStreamPropertyDataWritten)));
</del><ins>+ auto plistData = adoptCF(static_cast<CFDataRef>(CFWriteStreamCopyProperty(stream.get(), kCFStreamPropertyDataWritten)));
</ins><span class="cx"> ASSERT(plistData);
</span><span class="cx">
</span><span class="cx"> CFWriteStreamClose(stream.get());
</span><span class="lines">@@ -432,7 +423,7 @@
</span><span class="cx">
</span><span class="cx"> Vector<Node*> nodeList;
</span><span class="cx"> String markupString = createMarkup(node, IncludeNode, &nodeList, DoNotResolveURLs, tagNamesToFilter.get());
</span><del>- Node::NodeType nodeType = node.nodeType();
</del><ins>+ auto nodeType = node.nodeType();
</ins><span class="cx"> if (nodeType != Node::DOCUMENT_NODE && nodeType != Node::DOCUMENT_TYPE_NODE)
</span><span class="cx"> markupString = documentTypeString(node.document()) + markupString;
</span><span class="cx">
</span><span class="lines">@@ -441,20 +432,21 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<LegacyWebArchive> LegacyWebArchive::create(Frame& frame)
</span><span class="cx"> {
</span><del>- DocumentLoader* documentLoader = frame.loader().documentLoader();
-
</del><ins>+ auto* documentLoader = frame.loader().documentLoader();
</ins><span class="cx"> if (!documentLoader)
</span><span class="cx"> return nullptr;
</span><del>-
- Vector<RefPtr<LegacyWebArchive>> subframeArchives;
-
</del><ins>+
+ auto mainResource = documentLoader->mainResource();
+ if (!mainResource)
+ return nullptr;
+
+ Vector<Ref<LegacyWebArchive>> subframeArchives;
</ins><span class="cx"> for (unsigned i = 0; i < frame.tree().childCount(); ++i) {
</span><del>- if (RefPtr<LegacyWebArchive> childFrameArchive = create(*frame.tree().child(i)))
- subframeArchives.append(WTFMove(childFrameArchive));
</del><ins>+ if (auto childFrameArchive = create(*frame.tree().child(i)))
+ subframeArchives.append(childFrameArchive.releaseNonNull());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- auto subresources = documentLoader->subresources();
- return create(documentLoader->mainResource(), WTFMove(subresources), WTFMove(subframeArchives));
</del><ins>+ return create(mainResource.releaseNonNull(), documentLoader->subresources(), WTFMove(subframeArchives));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<LegacyWebArchive> LegacyWebArchive::create(Range* range)
</span><span class="lines">@@ -462,22 +454,20 @@
</span><span class="cx"> if (!range)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- Document& document = range->startContainer().document();
-
- Frame* frame = document.frame();
</del><ins>+ auto& document = range->startContainer().document();
+ auto* frame = document.frame();
</ins><span class="cx"> if (!frame)
</span><span class="cx"> return nullptr;
</span><del>-
- // FIXME: This is always "for interchange". Is that right? See the previous method.
</del><ins>+
+ // FIXME: This is always "for interchange". Is that right?
</ins><span class="cx"> Vector<Node*> nodeList;
</span><span class="cx"> String markupString = documentTypeString(document) + createMarkup(*range, &nodeList, AnnotateForInterchange);
</span><del>-
</del><span class="cx"> return create(markupString, *frame, nodeList, nullptr);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<LegacyWebArchive> LegacyWebArchive::create(const String& markupString, Frame& frame, const Vector<Node*>& nodes, std::function<bool (Frame&)> frameFilter)
</span><span class="cx"> {
</span><del>- const ResourceResponse& response = frame.loader().documentLoader()->response();
</del><ins>+ auto& response = frame.loader().documentLoader()->response();
</ins><span class="cx"> URL responseURL = response.url();
</span><span class="cx">
</span><span class="cx"> // it's possible to have a response without a URL here
</span><span class="lines">@@ -485,25 +475,23 @@
</span><span class="cx"> if (responseURL.isNull())
</span><span class="cx"> responseURL = URL(ParsedURLString, emptyString());
</span><span class="cx">
</span><del>- RefPtr<ArchiveResource> mainResource = ArchiveResource::create(utf8Buffer(markupString), responseURL, response.mimeType(), "UTF-8", frame.tree().uniqueName());
</del><ins>+ auto mainResource = ArchiveResource::create(utf8Buffer(markupString), responseURL, response.mimeType(), "UTF-8", frame.tree().uniqueName());
</ins><span class="cx"> if (!mainResource)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- Vector<RefPtr<LegacyWebArchive>> subframeArchives;
- Vector<RefPtr<ArchiveResource>> subresources;
</del><ins>+ Vector<Ref<LegacyWebArchive>> subframeArchives;
+ Vector<Ref<ArchiveResource>> subresources;
</ins><span class="cx"> HashSet<URL> uniqueSubresources;
</span><span class="cx">
</span><del>- size_t nodesSize = nodes.size();
- for (size_t i = 0; i < nodesSize; ++i) {
- Node& node = *nodes[i];
</del><ins>+ for (auto& nodePtr : nodes) {
+ Node& node = *nodePtr;
</ins><span class="cx"> Frame* childFrame;
</span><span class="cx"> if ((is<HTMLFrameElementBase>(node) || is<HTMLObjectElement>(node))
</span><span class="cx"> && (childFrame = downcast<HTMLFrameOwnerElement>(node).contentFrame())) {
</span><span class="cx"> if (frameFilter && !frameFilter(*childFrame))
</span><span class="cx"> continue;
</span><del>-
- if (RefPtr<LegacyWebArchive> subframeArchive = create(*childFrame->document(), frameFilter))
- subframeArchives.append(WTFMove(subframeArchive));
</del><ins>+ if (auto subframeArchive = create(*childFrame->document(), frameFilter))
+ subframeArchives.append(subframeArchive.releaseNonNull());
</ins><span class="cx"> else
</span><span class="cx"> LOG_ERROR("Unabled to archive subframe %s", childFrame->tree().uniqueName().string().utf8().data());
</span><span class="cx">
</span><span class="lines">@@ -510,17 +498,18 @@
</span><span class="cx"> } else {
</span><span class="cx"> ListHashSet<URL> subresourceURLs;
</span><span class="cx"> node.getSubresourceURLs(subresourceURLs);
</span><del>-
- DocumentLoader* documentLoader = frame.loader().documentLoader();
</del><span class="cx">
</span><del>- for (const auto& subresourceURL : subresourceURLs) {
</del><ins>+ ASSERT(frame.loader().documentLoader());
+ auto& documentLoader = *frame.loader().documentLoader();
+
+ for (auto& subresourceURL : subresourceURLs) {
</ins><span class="cx"> if (uniqueSubresources.contains(subresourceURL))
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> uniqueSubresources.add(subresourceURL);
</span><span class="cx">
</span><del>- if (RefPtr<ArchiveResource> resource = documentLoader->subresource(subresourceURL)) {
- subresources.append(WTFMove(resource));
</del><ins>+ if (auto resource = documentLoader.subresource(subresourceURL)) {
+ subresources.append(resource.releaseNonNull());
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -528,10 +517,9 @@
</span><span class="cx"> #if ENABLE(CACHE_PARTITIONING)
</span><span class="cx"> request.setDomainForCachePartition(frame.document()->topOrigin()->domainForCachePartition());
</span><span class="cx"> #endif
</span><del>- CachedResource* cachedResource = MemoryCache::singleton().resourceForRequest(request, frame.page()->sessionID());
- if (cachedResource) {
- if (RefPtr<ArchiveResource> resource = ArchiveResource::create(cachedResource->resourceBuffer(), subresourceURL, cachedResource->response())) {
- subresources.append(WTFMove(resource));
</del><ins>+ if (auto* cachedResource = MemoryCache::singleton().resourceForRequest(request, frame.page()->sessionID())) {
+ if (auto resource = ArchiveResource::create(cachedResource->resourceBuffer(), subresourceURL, cachedResource->response())) {
+ subresources.append(resource.releaseNonNull());
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -543,17 +531,17 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Add favicon if one exists for this page, if we are archiving the entire page.
</span><del>- if (nodesSize && nodes[0]->isDocumentNode() && iconDatabase().isEnabled()) {
- const String& iconURL = iconDatabase().synchronousIconURLForPageURL(responseURL);
</del><ins>+ if (!nodes.isEmpty() && nodes[0]->isDocumentNode() && iconDatabase().isEnabled()) {
+ auto iconURL = iconDatabase().synchronousIconURLForPageURL(responseURL);
</ins><span class="cx"> if (!iconURL.isEmpty() && iconDatabase().synchronousIconDataKnownForIconURL(iconURL)) {
</span><del>- if (Image* iconImage = iconDatabase().synchronousIconForPageURL(responseURL, IntSize(16, 16))) {
</del><ins>+ if (auto* iconImage = iconDatabase().synchronousIconForPageURL(responseURL, IntSize(16, 16))) {
</ins><span class="cx"> if (auto resource = ArchiveResource::create(iconImage->data(), URL(ParsedURLString, iconURL), "image/x-icon", "", ""))
</span><del>- subresources.append(WTFMove(resource));
</del><ins>+ subresources.append(resource.releaseNonNull());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return create(WTFMove(mainResource), WTFMove(subresources), WTFMove(subframeArchives));
</del><ins>+ return create(mainResource.releaseNonNull(), WTFMove(subresources), WTFMove(subframeArchives));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<LegacyWebArchive> LegacyWebArchive::createFromSelection(Frame* frame)
</span><span class="lines">@@ -561,7 +549,7 @@
</span><span class="cx"> if (!frame)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- Document* document = frame->document();
</del><ins>+ auto* document = frame->document();
</ins><span class="cx"> if (!document)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="lines">@@ -569,12 +557,10 @@
</span><span class="cx"> builder.append(documentTypeString(*document));
</span><span class="cx">
</span><span class="cx"> Vector<Node*> nodeList;
</span><del>- RefPtr<Range> selectionRange = frame->selection().toNormalizedRange();
- if (selectionRange)
</del><ins>+ if (auto selectionRange = frame->selection().toNormalizedRange())
</ins><span class="cx"> builder.append(createMarkup(*selectionRange, &nodeList, AnnotateForInterchange));
</span><span class="cx">
</span><del>- String markupString = builder.toString();
- RefPtr<LegacyWebArchive> archive = create(markupString, *frame, nodeList, nullptr);
</del><ins>+ auto archive = create(builder.toString(), *frame, nodeList, nullptr);
</ins><span class="cx">
</span><span class="cx"> if (!document->isFrameSet())
</span><span class="cx"> return archive;
</span><span class="lines">@@ -584,7 +570,11 @@
</span><span class="cx"> String iframeMarkup = "<iframe frameborder=\"no\" marginwidth=\"0\" marginheight=\"0\" width=\"98%%\" height=\"98%%\" src=\"" + frame->loader().documentLoader()->response().url().string() + "\"></iframe>";
</span><span class="cx"> auto iframeResource = ArchiveResource::create(utf8Buffer(iframeMarkup), blankURL(), "text/html", "UTF-8", String());
</span><span class="cx">
</span><del>- return create(WTFMove(iframeResource), Vector<RefPtr<ArchiveResource>>(), Vector<RefPtr<LegacyWebArchive>> { archive });
</del><ins>+ Vector<Ref<LegacyWebArchive>> subframeArchives;
+ subframeArchives.reserveInitialCapacity(1);
+ subframeArchives.uncheckedAppend(archive.releaseNonNull());
+
+ return create(iframeResource.releaseNonNull(), { }, WTFMove(subframeArchives));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderarchivecfLegacyWebArchiveh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/archive/cf/LegacyWebArchive.h (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/archive/cf/LegacyWebArchive.h 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/loader/archive/cf/LegacyWebArchive.h 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -37,24 +37,27 @@
</span><span class="cx"> class Node;
</span><span class="cx"> class Range;
</span><span class="cx">
</span><del>-class LegacyWebArchive : public Archive {
</del><ins>+class LegacyWebArchive final : public Archive {
</ins><span class="cx"> public:
</span><span class="cx"> WEBCORE_EXPORT static Ref<LegacyWebArchive> create();
</span><span class="cx"> WEBCORE_EXPORT static RefPtr<LegacyWebArchive> create(SharedBuffer&);
</span><span class="cx"> WEBCORE_EXPORT static RefPtr<LegacyWebArchive> create(const URL&, SharedBuffer&);
</span><del>- WEBCORE_EXPORT static RefPtr<LegacyWebArchive> create(RefPtr<ArchiveResource>&& mainResource, Vector<RefPtr<ArchiveResource>>&& subresources, Vector<RefPtr<LegacyWebArchive>>&& subframeArchives);
</del><ins>+ WEBCORE_EXPORT static Ref<LegacyWebArchive> create(Ref<ArchiveResource>&& mainResource, Vector<Ref<ArchiveResource>>&& subresources, Vector<Ref<LegacyWebArchive>>&& subframeArchives);
</ins><span class="cx"> WEBCORE_EXPORT static RefPtr<LegacyWebArchive> create(Node&, std::function<bool(Frame&)> frameFilter = nullptr);
</span><span class="cx"> WEBCORE_EXPORT static RefPtr<LegacyWebArchive> create(Frame&);
</span><span class="cx"> WEBCORE_EXPORT static RefPtr<LegacyWebArchive> createFromSelection(Frame*);
</span><span class="cx"> WEBCORE_EXPORT static RefPtr<LegacyWebArchive> create(Range*);
</span><span class="cx">
</span><del>- Type type() const override;
-
</del><span class="cx"> WEBCORE_EXPORT RetainPtr<CFDataRef> rawDataRepresentation();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- LegacyWebArchive() { }
</del><ins>+ LegacyWebArchive() = default;
</ins><span class="cx">
</span><ins>+ bool shouldLoadFromArchiveOnly() const final { return false; }
+ bool shouldOverrideBaseURL() const final { return false; }
+ bool shouldUseMainResourceEncoding() const final { return true; }
+ bool shouldUseMainResourceURL() const final { return true; }
+
</ins><span class="cx"> enum MainResourceStatus { Subresource, MainResource };
</span><span class="cx">
</span><span class="cx"> static RefPtr<LegacyWebArchive> create(const String& markupString, Frame&, const Vector<Node*>& nodes, std::function<bool (Frame&)> frameFilter);
</span><span class="lines">@@ -62,7 +65,7 @@
</span><span class="cx"> static ResourceResponse createResourceResponseFromMacArchivedData(CFDataRef);
</span><span class="cx"> static ResourceResponse createResourceResponseFromPropertyListData(CFDataRef, CFStringRef responseDataType);
</span><span class="cx"> static RetainPtr<CFDataRef> createPropertyListRepresentation(const ResourceResponse&);
</span><del>- static RetainPtr<CFDictionaryRef> createPropertyListRepresentation(Archive*);
</del><ins>+ static RetainPtr<CFDictionaryRef> createPropertyListRepresentation(Archive&);
</ins><span class="cx"> static RetainPtr<CFDictionaryRef> createPropertyListRepresentation(ArchiveResource*, MainResourceStatus);
</span><span class="cx">
</span><span class="cx"> bool extract(CFDictionaryRef);
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderarchivemhtmlMHTMLArchivecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/archive/mhtml/MHTMLArchive.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/archive/mhtml/MHTMLArchive.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/loader/archive/mhtml/MHTMLArchive.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -122,15 +122,15 @@
</span><span class="cx"> RefPtr<MHTMLArchive> archive = parser.frameAt(i);
</span><span class="cx"> for (size_t j = 1; j < parser.frameCount(); ++j) {
</span><span class="cx"> if (i != j)
</span><del>- archive->addSubframeArchive(parser.frameAt(j));
</del><ins>+ archive->addSubframeArchive(*parser.frameAt(j));
</ins><span class="cx"> }
</span><span class="cx"> for (size_t j = 0; j < parser.subResourceCount(); ++j)
</span><del>- archive->addSubresource(parser.subResourceAt(j));
</del><ins>+ archive->addSubresource(*parser.subResourceAt(j));
</ins><span class="cx"> }
</span><span class="cx"> return mainArchive;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<SharedBuffer> MHTMLArchive::generateMHTMLData(Page* page)
</del><ins>+RefPtr<SharedBuffer> MHTMLArchive::generateMHTMLData(Page* page)
</ins><span class="cx"> {
</span><span class="cx"> Vector<PageSerializer::Resource> resources;
</span><span class="cx"> PageSerializer pageSerializer(&resources);
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderarchivemhtmlMHTMLArchiveh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/archive/mhtml/MHTMLArchive.h (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/archive/mhtml/MHTMLArchive.h 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/loader/archive/mhtml/MHTMLArchive.h 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -40,22 +40,24 @@
</span><span class="cx"> class Page;
</span><span class="cx"> class SharedBuffer;
</span><span class="cx">
</span><del>-class MHTMLArchive : public Archive {
</del><ins>+class MHTMLArchive final : public Archive {
</ins><span class="cx"> public:
</span><del>- Type type() const override { return MHTML; }
-
</del><span class="cx"> static Ref<MHTMLArchive> create();
</span><span class="cx"> static RefPtr<MHTMLArchive> create(const URL&, SharedBuffer&);
</span><span class="cx">
</span><del>- static PassRefPtr<SharedBuffer> generateMHTMLData(Page*);
</del><ins>+ static RefPtr<SharedBuffer> generateMHTMLData(Page*);
</ins><span class="cx">
</span><span class="cx"> virtual ~MHTMLArchive();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- static PassRefPtr<SharedBuffer> generateMHTMLData(Page*, bool useBinaryEncoding);
</del><ins>+ friend class MHTMLParser;
</ins><span class="cx">
</span><del>- friend class MHTMLParser;
</del><span class="cx"> MHTMLArchive();
</span><ins>+
+ bool shouldLoadFromArchiveOnly() const final { return true; }
+ bool shouldOverrideBaseURL() const final { return true; }
+ bool shouldUseMainResourceEncoding() const final { return false; }
+ bool shouldUseMainResourceURL() const final { return false; }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderarchivemhtmlMHTMLParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/archive/mhtml/MHTMLParser.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/archive/mhtml/MHTMLParser.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/loader/archive/mhtml/MHTMLParser.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> RefPtr<ArchiveResource> resource = parseNextPart(*header, String(), String(), endOfArchiveReached);
</span><span class="cx"> if (!resource)
</span><span class="cx"> return nullptr;
</span><del>- archive->setMainResource(resource);
</del><ins>+ archive->setMainResource(resource.releaseNonNull());
</ins><span class="cx"> return archive;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx"> // The top-frame is the first frame found, regardless of the nesting level.
</span><span class="cx"> if (subframeArchive->mainResource())
</span><span class="cx"> addResourceToArchive(subframeArchive->mainResource(), archive.get());
</span><del>- archive->addSubframeArchive(subframeArchive);
</del><ins>+ archive->addSubframeArchive(subframeArchive.releaseNonNull());
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -126,13 +126,13 @@
</span><span class="cx">
</span><span class="cx"> // The first document suitable resource is the main frame.
</span><span class="cx"> if (!archive->mainResource()) {
</span><del>- archive->setMainResource(resource);
</del><ins>+ archive->setMainResource(*resource);
</ins><span class="cx"> m_frames.append(archive);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<MHTMLArchive> subframe = MHTMLArchive::create();
</span><del>- subframe->setMainResource(resource);
</del><ins>+ subframe->setMainResource(*resource);
</ins><span class="cx"> m_frames.append(subframe);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedCSSStyleSheetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx"> Copyright (C) 2001 Dirk Mueller (mueller@kde.org)
</span><span class="cx"> Copyright (C) 2002 Waldo Bastian (bastian@kde.org)
</span><span class="cx"> Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
</span><del>- Copyright (C) 2004, 2005, 2006 Apple Inc.
</del><ins>+ Copyright (C) 2004-2017 Apple Inc. All rights reserved.
</ins><span class="cx">
</span><span class="cx"> This library is free software; you can redistribute it and/or
</span><span class="cx"> modify it under the terms of the GNU Library General Public
</span><span class="lines">@@ -19,9 +19,6 @@
</span><span class="cx"> along with this library; see the file COPYING.LIB. If not, write to
</span><span class="cx"> the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
</span><span class="cx"> Boston, MA 02110-1301, USA.
</span><del>-
- This class provides all functionality needed for loading images, style sheets and html
- pages from the web. It has a memory cache for these objects.
</del><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><span class="lines">@@ -156,7 +153,7 @@
</span><span class="cx"> setDecodedSize(0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<StyleSheetContents> CachedCSSStyleSheet::restoreParsedStyleSheet(const CSSParserContext& context, CachePolicy cachePolicy)
</del><ins>+RefPtr<StyleSheetContents> CachedCSSStyleSheet::restoreParsedStyleSheet(const CSSParserContext& context, CachePolicy cachePolicy)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_parsedStyleSheetCache)
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -180,7 +177,7 @@
</span><span class="cx">
</span><span class="cx"> void CachedCSSStyleSheet::saveParsedStyleSheet(Ref<StyleSheetContents>&& sheet)
</span><span class="cx"> {
</span><del>- ASSERT(sheet.get().isCacheable());
</del><ins>+ ASSERT(sheet->isCacheable());
</ins><span class="cx">
</span><span class="cx"> if (m_parsedStyleSheetCache)
</span><span class="cx"> m_parsedStyleSheetCache->removedFromMemoryCache();
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedCSSStyleSheeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.h (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.h 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.h 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
</span><span class="cx"> Copyright (C) 2001 Dirk Mueller <mueller@kde.org>
</span><span class="cx"> Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
</span><del>- Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
</del><ins>+ Copyright (C) 2004-2017 Apple Inc. All rights reserved.
</ins><span class="cx">
</span><span class="cx"> This library is free software; you can redistribute it and/or
</span><span class="cx"> modify it under the terms of the GNU Library General Public
</span><span class="lines">@@ -18,9 +18,6 @@
</span><span class="cx"> along with this library; see the file COPYING.LIB. If not, write to
</span><span class="cx"> the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
</span><span class="cx"> Boston, MA 02110-1301, USA.
</span><del>-
- This class provides all functionality needed for loading images, style sheets and html
- pages from the web. It has a memory cache for these objects.
</del><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #pragma once
</span><span class="lines">@@ -29,45 +26,45 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>- class CachedResourceClient;
- class StyleSheetContents;
- class TextResourceDecoder;
- struct CSSParserContext;
</del><ins>+class StyleSheetContents;
+class TextResourceDecoder;
</ins><span class="cx">
</span><del>- class CachedCSSStyleSheet final : public CachedResource {
- public:
- CachedCSSStyleSheet(CachedResourceRequest&&, SessionID);
- virtual ~CachedCSSStyleSheet();
</del><ins>+struct CSSParserContext;
</ins><span class="cx">
</span><del>- enum class MIMETypeCheck { Strict, Lax };
- const String sheetText(MIMETypeCheck = MIMETypeCheck::Strict, bool* hasValidMIMEType = nullptr) const;
</del><ins>+class CachedCSSStyleSheet final : public CachedResource {
+public:
+ CachedCSSStyleSheet(CachedResourceRequest&&, SessionID);
+ virtual ~CachedCSSStyleSheet();
</ins><span class="cx">
</span><del>- PassRefPtr<StyleSheetContents> restoreParsedStyleSheet(const CSSParserContext&, CachePolicy);
- void saveParsedStyleSheet(Ref<StyleSheetContents>&&);
</del><ins>+ enum class MIMETypeCheck { Strict, Lax };
+ const String sheetText(MIMETypeCheck = MIMETypeCheck::Strict, bool* hasValidMIMEType = nullptr) const;
</ins><span class="cx">
</span><del>- private:
- bool canUseSheet(MIMETypeCheck, bool* hasValidMIMEType) const;
- bool mayTryReplaceEncodedData() const final { return true; }
</del><ins>+ RefPtr<StyleSheetContents> restoreParsedStyleSheet(const CSSParserContext&, CachePolicy);
+ void saveParsedStyleSheet(Ref<StyleSheetContents>&&);
</ins><span class="cx">
</span><del>- void didAddClient(CachedResourceClient&) final;
</del><ins>+private:
+ bool canUseSheet(MIMETypeCheck, bool* hasValidMIMEType) const;
+ bool mayTryReplaceEncodedData() const final { return true; }
</ins><span class="cx">
</span><del>- void setEncoding(const String&) final;
- String encoding() const final;
- const TextResourceDecoder* textResourceDecoder() const final { return m_decoder.get(); }
- void finishLoading(SharedBuffer*) final;
- void destroyDecodedData() final;
</del><ins>+ void didAddClient(CachedResourceClient&) final;
</ins><span class="cx">
</span><del>- void setBodyDataFrom(const CachedResource&) final;
</del><ins>+ void setEncoding(const String&) final;
+ String encoding() const final;
+ const TextResourceDecoder* textResourceDecoder() const final { return m_decoder.get(); }
+ void finishLoading(SharedBuffer*) final;
+ void destroyDecodedData() final;
</ins><span class="cx">
</span><del>- protected:
- void checkNotify() final;
</del><ins>+ void setBodyDataFrom(const CachedResource&) final;
</ins><span class="cx">
</span><del>- RefPtr<TextResourceDecoder> m_decoder;
- String m_decodedSheetText;
</del><ins>+protected:
+ void checkNotify() final;
</ins><span class="cx">
</span><del>- RefPtr<StyleSheetContents> m_parsedStyleSheetCache;
- };
</del><ins>+ RefPtr<TextResourceDecoder> m_decoder;
+ String m_decodedSheetText;
</ins><span class="cx">
</span><ins>+ RefPtr<StyleSheetContents> m_parsedStyleSheetCache;
+};
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> SPECIALIZE_TYPE_TRAITS_CACHED_RESOURCE(CachedCSSStyleSheet, CachedResource::CSSStyleSheet)
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResourceRequest.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResourceRequest.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/loader/cache/CachedResourceRequest.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -59,15 +59,17 @@
</span><span class="cx"> return fragmentIdentifier;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CachedResourceRequest::setInitiator(PassRefPtr<Element> element)
</del><ins>+void CachedResourceRequest::setInitiator(Element& element)
</ins><span class="cx"> {
</span><del>- ASSERT(!m_initiatorElement && m_initiatorName.isEmpty());
- m_initiatorElement = element;
</del><ins>+ ASSERT(!m_initiatorElement);
+ ASSERT(m_initiatorName.isEmpty());
+ m_initiatorElement = &element;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CachedResourceRequest::setInitiator(const AtomicString& name)
</span><span class="cx"> {
</span><del>- ASSERT(!m_initiatorElement && m_initiatorName.isEmpty());
</del><ins>+ ASSERT(!m_initiatorElement);
+ ASSERT(m_initiatorName.isEmpty());
</ins><span class="cx"> m_initiatorName = name;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -209,10 +211,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CONTENT_EXTENSIONS)
</span><ins>+
</ins><span class="cx"> void CachedResourceRequest::applyBlockedStatus(const ContentExtensions::BlockedStatus& blockedStatus)
</span><span class="cx"> {
</span><span class="cx"> ContentExtensions::applyBlockedStatusToRequest(blockedStatus, m_resourceRequest);
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void CachedResourceRequest::updateReferrerOriginAndUserAgentHeaders(FrameLoader& frameLoader, ReferrerPolicy defaultPolicy)
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceRequesth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResourceRequest.h (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResourceRequest.h 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/loader/cache/CachedResourceRequest.h 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> const ResourceLoaderOptions& options() const { return m_options; }
</span><span class="cx"> void setOptions(const ResourceLoaderOptions& options) { m_options = options; }
</span><span class="cx"> const std::optional<ResourceLoadPriority>& priority() const { return m_priority; }
</span><del>- void setInitiator(PassRefPtr<Element>);
</del><ins>+ void setInitiator(Element&);
</ins><span class="cx"> void setInitiator(const AtomicString& name);
</span><span class="cx"> const AtomicString& initiatorName() const;
</span><span class="cx"> bool allowsCaching() const { return m_options.cachingPolicy == CachingPolicy::AllowCaching; }
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercocoaDiskCacheMonitorh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/loader/cocoa/DiskCacheMonitor.h (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cocoa/DiskCacheMonitor.h 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/loader/cocoa/DiskCacheMonitor.h 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -1,62 +0,0 @@
</span><del>-/*
- * Copyright (C) 2014 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#pragma once
-
-#include "ResourceRequest.h"
-#include "SessionID.h"
-#include <wtf/PassRefPtr.h>
-
-typedef const struct _CFCachedURLResponse* CFCachedURLResponseRef;
-
-namespace WebCore {
-
-class SharedBuffer;
-
-class DiskCacheMonitor {
-public:
- static void monitorFileBackingStoreCreation(const ResourceRequest&, SessionID, CFCachedURLResponseRef);
- static PassRefPtr<SharedBuffer> tryGetFileBackedSharedBufferFromCFURLCachedResponse(CFCachedURLResponseRef);
- virtual ~DiskCacheMonitor() { }
-
-protected:
- DiskCacheMonitor(const ResourceRequest&, SessionID, CFCachedURLResponseRef);
-
- virtual void resourceBecameFileBacked(PassRefPtr<SharedBuffer>);
-
- const ResourceRequest& resourceRequest() const { return m_resourceRequest; }
- SessionID sessionID() const { return m_sessionID; }
-
-private:
- ResourceRequest m_resourceRequest;
- SessionID m_sessionID;
-};
-
-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 80000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 1090)
-void DiskCacheMonitor::monitorFileBackingStoreCreation(const ResourceRequest&, SessionID, CFCachedURLResponseRef) { }
-PassRefPtr<SharedBuffer> DiskCacheMonitor::tryGetFileBackedSharedBufferFromCFURLCachedResponse(CFCachedURLResponseRef) { return nullptr; }
-#endif
-
-} // namespace WebKit
</del></span></pre></div>
<a id="trunkSourceWebCoreloadercocoaDiskCacheMonitorCocoah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cocoa/DiskCacheMonitorCocoa.h (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cocoa/DiskCacheMonitorCocoa.h 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/loader/cocoa/DiskCacheMonitorCocoa.h 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2014-2017 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx">
</span><span class="cx"> #include "ResourceRequest.h"
</span><span class="cx"> #include "SessionID.h"
</span><del>-#include <wtf/PassRefPtr.h>
</del><span class="cx">
</span><span class="cx"> typedef const struct _CFCachedURLResponse* CFCachedURLResponseRef;
</span><span class="cx">
</span><span class="lines">@@ -35,21 +34,19 @@
</span><span class="cx">
</span><span class="cx"> class SharedBuffer;
</span><span class="cx">
</span><del>-class WEBCORE_EXPORT DiskCacheMonitor {
</del><ins>+class DiskCacheMonitor {
</ins><span class="cx"> public:
</span><span class="cx"> static void monitorFileBackingStoreCreation(const ResourceRequest&, SessionID, CFCachedURLResponseRef);
</span><del>- static PassRefPtr<SharedBuffer> tryGetFileBackedSharedBufferFromCFURLCachedResponse(CFCachedURLResponseRef);
- virtual ~DiskCacheMonitor() { }
</del><ins>+ static RefPtr<SharedBuffer> tryGetFileBackedSharedBufferFromCFURLCachedResponse(CFCachedURLResponseRef);
</ins><span class="cx">
</span><del>-protected:
- WEBCORE_EXPORT DiskCacheMonitor(const ResourceRequest&, SessionID, CFCachedURLResponseRef);
</del><ins>+private:
+ DiskCacheMonitor(const ResourceRequest&, SessionID, CFCachedURLResponseRef);
</ins><span class="cx">
</span><del>- virtual void resourceBecameFileBacked(SharedBuffer&);
</del><ins>+ void resourceBecameFileBacked(SharedBuffer&);
</ins><span class="cx">
</span><span class="cx"> const ResourceRequest& resourceRequest() const { return m_resourceRequest; }
</span><span class="cx"> SessionID sessionID() const { return m_sessionID; }
</span><span class="cx">
</span><del>-private:
</del><span class="cx"> ResourceRequest m_resourceRequest;
</span><span class="cx"> SessionID m_sessionID;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercocoaDiskCacheMonitorCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cocoa/DiskCacheMonitorCocoa.mm (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cocoa/DiskCacheMonitorCocoa.mm 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/loader/cocoa/DiskCacheMonitorCocoa.mm 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -29,11 +29,8 @@
</span><span class="cx"> #import "CFNetworkSPI.h"
</span><span class="cx"> #import "CachedResource.h"
</span><span class="cx"> #import "MemoryCache.h"
</span><del>-#import "ResourceRequest.h"
-#import "SessionID.h"
</del><span class="cx"> #import "SharedBuffer.h"
</span><span class="cx"> #import <wtf/MainThread.h>
</span><del>-#import <wtf/PassRefPtr.h>
</del><span class="cx"> #import <wtf/RefPtr.h>
</span><span class="cx">
</span><span class="cx"> #if USE(WEB_THREAD)
</span><span class="lines">@@ -45,9 +42,9 @@
</span><span class="cx"> // The maximum number of seconds we'll try to wait for a resource to be disk cached before we forget the request.
</span><span class="cx"> static const double diskCacheMonitorTimeout = 20;
</span><span class="cx">
</span><del>-PassRefPtr<SharedBuffer> DiskCacheMonitor::tryGetFileBackedSharedBufferFromCFURLCachedResponse(CFCachedURLResponseRef cachedResponse)
</del><ins>+RefPtr<SharedBuffer> DiskCacheMonitor::tryGetFileBackedSharedBufferFromCFURLCachedResponse(CFCachedURLResponseRef cachedResponse)
</ins><span class="cx"> {
</span><del>- CFDataRef data = _CFCachedURLResponseGetMemMappedData(cachedResponse);
</del><ins>+ auto data = _CFCachedURLResponseGetMemMappedData(cachedResponse);
</ins><span class="cx"> if (!data)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="lines">@@ -87,8 +84,7 @@
</span><span class="cx"> dispatch_after(dispatch_time(DISPATCH_TIME_NOW, NSEC_PER_SEC * diskCacheMonitorTimeout), dispatch_get_main_queue(), cancelMonitorBlockToRun);
</span><span class="cx">
</span><span class="cx"> // Set up the disk caching callback to create the ShareableResource and send it to the WebProcess.
</span><del>- CFCachedURLResponseCallBackBlock block = ^(CFCachedURLResponseRef cachedResponse)
- {
</del><ins>+ auto block = ^(CFCachedURLResponseRef cachedResponse) {
</ins><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> // If the monitor isn't there then it timed out before this resource was cached to disk.
</span><span class="cx"> if (!rawMonitor)
</span><span class="lines">@@ -97,7 +93,7 @@
</span><span class="cx"> auto monitor = std::unique_ptr<DiskCacheMonitor>(rawMonitor); // Balanced by "new DiskCacheMonitor" in monitorFileBackingStoreCreation.
</span><span class="cx"> rawMonitor = nullptr;
</span><span class="cx">
</span><del>- RefPtr<SharedBuffer> fileBackedBuffer = DiskCacheMonitor::tryGetFileBackedSharedBufferFromCFURLCachedResponse(cachedResponse);
</del><ins>+ auto fileBackedBuffer = DiskCacheMonitor::tryGetFileBackedSharedBufferFromCFURLCachedResponse(cachedResponse);
</ins><span class="cx"> if (!fileBackedBuffer)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -105,8 +101,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> #if USE(WEB_THREAD)
</span><del>- CFCachedURLResponseCallBackBlock blockToRun = ^(CFCachedURLResponseRef response)
- {
</del><ins>+ auto blockToRun = ^(CFCachedURLResponseRef response) {
</ins><span class="cx"> CFRetain(response);
</span><span class="cx"> WebThreadRun(^{
</span><span class="cx"> block(response);
</span><span class="lines">@@ -114,7 +109,7 @@
</span><span class="cx"> });
</span><span class="cx"> };
</span><span class="cx"> #else
</span><del>- CFCachedURLResponseCallBackBlock blockToRun = block;
</del><ins>+ auto blockToRun = block;
</ins><span class="cx"> #endif
</span><span class="cx"> _CFCachedURLResponseSetBecameFileBackedCallBackBlock(cachedResponse, blockToRun, dispatch_get_main_queue());
</span><span class="cx"> }
</span><span class="lines">@@ -121,7 +116,7 @@
</span><span class="cx">
</span><span class="cx"> void DiskCacheMonitor::resourceBecameFileBacked(SharedBuffer& fileBackedBuffer)
</span><span class="cx"> {
</span><del>- CachedResource* resource = MemoryCache::singleton().resourceForRequest(m_resourceRequest, m_sessionID);
</del><ins>+ auto* resource = MemoryCache::singleton().resourceForRequest(m_resourceRequest, m_sessionID);
</ins><span class="cx"> if (!resource)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloadericonIconDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/icon/IconDatabase.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/icon/IconDatabase.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/loader/icon/IconDatabase.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -533,7 +533,7 @@
</span><span class="cx"> delete pageRecord;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void IconDatabase::setIconDataForIconURL(PassRefPtr<SharedBuffer> dataOriginal, const String& iconURLOriginal)
</del><ins>+void IconDatabase::setIconDataForIconURL(SharedBuffer* dataOriginal, const String& iconURLOriginal)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT_NOT_SYNC_THREAD();
</span><span class="cx">
</span><span class="lines">@@ -542,7 +542,7 @@
</span><span class="cx"> if (!isOpen() || iconURLOriginal.isEmpty())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- RefPtr<SharedBuffer> data = dataOriginal ? dataOriginal->copy() : PassRefPtr<SharedBuffer>(nullptr);
</del><ins>+ auto data = dataOriginal ? RefPtr<SharedBuffer> { dataOriginal->copy() } : nullptr;
</ins><span class="cx"> String iconURL = iconURLOriginal.isolatedCopy();
</span><span class="cx">
</span><span class="cx"> Vector<String> pageURLs;
</span><span class="lines">@@ -885,18 +885,17 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Unlike getOrCreatePageURLRecord(), getOrCreateIconRecord() does not mark the icon as "interested in import"
</span><del>-PassRefPtr<IconRecord> IconDatabase::getOrCreateIconRecord(const String& iconURL)
</del><ins>+Ref<IconRecord> IconDatabase::getOrCreateIconRecord(const String& iconURL)
</ins><span class="cx"> {
</span><span class="cx"> // Clients of getOrCreateIconRecord() are required to acquire the m_urlAndIconLock before calling this method
</span><span class="cx"> ASSERT(!m_urlAndIconLock.tryLock());
</span><span class="cx">
</span><del>- if (IconRecord* icon = m_iconURLToRecordMap.get(iconURL))
- return icon;
</del><ins>+ if (auto* icon = m_iconURLToRecordMap.get(iconURL))
+ return *icon;
</ins><span class="cx">
</span><span class="cx"> auto newIcon = IconRecord::create(iconURL);
</span><span class="cx"> m_iconURLToRecordMap.set(iconURL, newIcon.ptr());
</span><del>-
- return WTFMove(newIcon);
</del><ins>+ return newIcon;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // This method retrieves the existing PageURLRecord, or creates a new one and marks it as "interested in the import" for later notification
</span><span class="lines">@@ -1917,7 +1916,7 @@
</span><span class="cx"> return iconID;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<SharedBuffer> IconDatabase::getImageDataForIconURLFromSQLDatabase(const String& iconURL)
</del><ins>+RefPtr<SharedBuffer> IconDatabase::getImageDataForIconURLFromSQLDatabase(const String& iconURL)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT_ICON_SYNC_THREAD();
</span><span class="cx">
</span><span class="lines">@@ -1936,7 +1935,7 @@
</span><span class="cx">
</span><span class="cx"> m_getImageDataForIconURLStatement->reset();
</span><span class="cx">
</span><del>- return WTFMove(imageData);
</del><ins>+ return imageData;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void IconDatabase::removeIconFromSQLDatabase(const String& iconURL)
</span></span></pre></div>
<a id="trunkSourceWebCoreloadericonIconDatabaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/icon/IconDatabase.h (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/icon/IconDatabase.h 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/loader/icon/IconDatabase.h 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -45,6 +45,7 @@
</span><span class="cx"> // Dummy version of IconDatabase that does nothing.
</span><span class="cx"> class IconDatabase final : public IconDatabaseBase {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><ins>+
</ins><span class="cx"> public:
</span><span class="cx"> static void delayDatabaseCleanup() { }
</span><span class="cx"> static void allowDatabaseCleanup() { }
</span><span class="lines">@@ -70,32 +71,32 @@
</span><span class="cx"> WEBCORE_EXPORT IconDatabase();
</span><span class="cx"> ~IconDatabase();
</span><span class="cx">
</span><del>- WEBCORE_EXPORT void setClient(IconDatabaseClient*) override;
</del><ins>+ WEBCORE_EXPORT void setClient(IconDatabaseClient*) final;
</ins><span class="cx">
</span><del>- WEBCORE_EXPORT bool open(const String& directory, const String& filename) override;
- WEBCORE_EXPORT void close() override;
</del><ins>+ WEBCORE_EXPORT bool open(const String& directory, const String& filename) final;
+ WEBCORE_EXPORT void close() final;
</ins><span class="cx">
</span><del>- WEBCORE_EXPORT void removeAllIcons() override;
</del><ins>+ WEBCORE_EXPORT void removeAllIcons() final;
</ins><span class="cx">
</span><span class="cx"> void readIconForPageURLFromDisk(const String&);
</span><span class="cx">
</span><del>- WEBCORE_EXPORT Image* defaultIcon(const IntSize&) override;
</del><ins>+ WEBCORE_EXPORT Image* defaultIcon(const IntSize&) final;
</ins><span class="cx">
</span><del>- WEBCORE_EXPORT void retainIconForPageURL(const String&) override;
- WEBCORE_EXPORT void releaseIconForPageURL(const String&) override;
- WEBCORE_EXPORT void setIconDataForIconURL(PassRefPtr<SharedBuffer> data, const String&) override;
- WEBCORE_EXPORT void setIconURLForPageURL(const String& iconURL, const String& pageURL) override;
</del><ins>+ WEBCORE_EXPORT void retainIconForPageURL(const String&) final;
+ WEBCORE_EXPORT void releaseIconForPageURL(const String&) final;
+ WEBCORE_EXPORT void setIconDataForIconURL(SharedBuffer* data, const String& iconURL) final;
+ WEBCORE_EXPORT void setIconURLForPageURL(const String& iconURL, const String& pageURL) final;
</ins><span class="cx">
</span><del>- WEBCORE_EXPORT Image* synchronousIconForPageURL(const String&, const IntSize&) override;
- NativeImagePtr synchronousNativeIconForPageURL(const String& pageURLOriginal, const IntSize&) override;
- WEBCORE_EXPORT String synchronousIconURLForPageURL(const String&) override;
- bool synchronousIconDataKnownForIconURL(const String&) override;
- WEBCORE_EXPORT IconLoadDecision synchronousLoadDecisionForIconURL(const String&, DocumentLoader*) override;
</del><ins>+ WEBCORE_EXPORT Image* synchronousIconForPageURL(const String&, const IntSize&) final;
+ NativeImagePtr synchronousNativeIconForPageURL(const String& pageURLOriginal, const IntSize&) final;
+ WEBCORE_EXPORT String synchronousIconURLForPageURL(const String&) final;
+ bool synchronousIconDataKnownForIconURL(const String&) final;
+ WEBCORE_EXPORT IconLoadDecision synchronousLoadDecisionForIconURL(const String&, DocumentLoader*) final;
</ins><span class="cx">
</span><del>- WEBCORE_EXPORT void setEnabled(bool) override;
- WEBCORE_EXPORT bool isEnabled() const override;
</del><ins>+ WEBCORE_EXPORT void setEnabled(bool);
+ WEBCORE_EXPORT bool isEnabled() const final;
</ins><span class="cx">
</span><del>- WEBCORE_EXPORT void setPrivateBrowsingEnabled(bool flag) override;
</del><ins>+ WEBCORE_EXPORT void setPrivateBrowsingEnabled(bool flag) final;
</ins><span class="cx"> bool isPrivateBrowsingEnabled() const;
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT static void delayDatabaseCleanup();
</span><span class="lines">@@ -103,10 +104,10 @@
</span><span class="cx"> WEBCORE_EXPORT static void checkIntegrityBeforeOpening();
</span><span class="cx">
</span><span class="cx"> // Support for WebCoreStatistics in WebKit
</span><del>- WEBCORE_EXPORT size_t pageURLMappingCount() override;
- WEBCORE_EXPORT size_t retainedPageURLCount() override;
- WEBCORE_EXPORT size_t iconRecordCount() override;
- WEBCORE_EXPORT size_t iconRecordCountWithData() override;
</del><ins>+ WEBCORE_EXPORT size_t pageURLMappingCount() final;
+ WEBCORE_EXPORT size_t retainedPageURLCount() final;
+ WEBCORE_EXPORT size_t iconRecordCount() final;
+ WEBCORE_EXPORT size_t iconRecordCountWithData() final;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> friend IconDatabaseBase& iconDatabase();
</span><span class="lines">@@ -130,12 +131,12 @@
</span><span class="cx">
</span><span class="cx"> // *** Any Thread ***
</span><span class="cx"> public:
</span><del>- WEBCORE_EXPORT bool isOpen() const override;
- WEBCORE_EXPORT String databasePath() const override;
</del><ins>+ WEBCORE_EXPORT bool isOpen() const final;
+ WEBCORE_EXPORT String databasePath() const final;
</ins><span class="cx"> WEBCORE_EXPORT static String defaultDatabaseFilename();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- PassRefPtr<IconRecord> getOrCreateIconRecord(const String& iconURL);
</del><ins>+ Ref<IconRecord> getOrCreateIconRecord(const String& iconURL);
</ins><span class="cx"> PageURLRecord* getOrCreatePageURLRecord(const String& pageURL);
</span><span class="cx">
</span><span class="cx"> bool m_isEnabled;
</span><span class="lines">@@ -178,7 +179,7 @@
</span><span class="cx">
</span><span class="cx"> // *** Sync Thread Only ***
</span><span class="cx"> public:
</span><del>- WEBCORE_EXPORT bool shouldStopThreadActivity() const override;
</del><ins>+ WEBCORE_EXPORT bool shouldStopThreadActivity() const final;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> static void iconDatabaseSyncThreadStart(void *);
</span><span class="lines">@@ -213,7 +214,7 @@
</span><span class="cx"> void removePageURLFromSQLDatabase(const String& pageURL);
</span><span class="cx"> int64_t getIconIDForIconURLFromSQLDatabase(const String& iconURL);
</span><span class="cx"> int64_t addIconURLToSQLDatabase(const String&);
</span><del>- PassRefPtr<SharedBuffer> getImageDataForIconURLFromSQLDatabase(const String& iconURL);
</del><ins>+ RefPtr<SharedBuffer> getImageDataForIconURLFromSQLDatabase(const String& iconURL);
</ins><span class="cx"> void removeIconFromSQLDatabase(const String& iconURL);
</span><span class="cx"> void writeIconSnapshotToSQLDatabase(const IconSnapshot&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloadericonIconDatabaseBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/icon/IconDatabaseBase.h (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/icon/IconDatabaseBase.h 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/loader/icon/IconDatabaseBase.h 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx"> #include "NativeImage.h"
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><del>-#include <wtf/PassRefPtr.h>
</del><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -39,11 +38,7 @@
</span><span class="cx"> class IntSize;
</span><span class="cx"> class SharedBuffer;
</span><span class="cx">
</span><del>-enum IconLoadDecision {
- IconLoadYes,
- IconLoadNo,
- IconLoadUnknown
-};
</del><ins>+enum IconLoadDecision { IconLoadYes, IconLoadNo, IconLoadUnknown };
</ins><span class="cx">
</span><span class="cx"> class CallbackBase : public RefCounted<CallbackBase> {
</span><span class="cx"> public:
</span><span class="lines">@@ -134,7 +129,7 @@
</span><span class="cx"> m_callback(result, context());
</span><span class="cx"> m_callback = nullptr;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> void invalidate()
</span><span class="cx"> {
</span><span class="cx"> m_callback = nullptr;
</span><span class="lines">@@ -151,26 +146,22 @@
</span><span class="cx"> CallbackFunction m_callback;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-typedef EnumCallback<IconLoadDecision> IconLoadDecisionCallback;
-typedef ObjectCallback<SharedBuffer*> IconDataCallback;
</del><ins>+using IconLoadDecisionCallback = EnumCallback<IconLoadDecision>;
+using IconDataCallback = ObjectCallback<SharedBuffer*>;
</ins><span class="cx">
</span><span class="cx"> class WEBCORE_EXPORT IconDatabaseBase {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(IconDatabaseBase);
</span><span class="cx">
</span><del>-protected:
- IconDatabaseBase() { }
-
</del><span class="cx"> public:
</span><span class="cx"> virtual ~IconDatabaseBase() { }
</span><span class="cx">
</span><del>- // Used internally by WebCore
</del><span class="cx"> virtual bool isEnabled() const { return false; }
</span><del>-
</del><ins>+
</ins><span class="cx"> virtual void retainIconForPageURL(const String&) { }
</span><span class="cx"> virtual void releaseIconForPageURL(const String&) { }
</span><span class="cx">
</span><del>- virtual void setIconURLForPageURL(const String&, const String&) { }
- virtual void setIconDataForIconURL(PassRefPtr<SharedBuffer>, const String&) { }
</del><ins>+ virtual void setIconURLForPageURL(const String& /*iconURL*/, const String& /*pageURL*/) { }
+ virtual void setIconDataForIconURL(SharedBuffer*, const String& /*iconURL*/) { }
</ins><span class="cx">
</span><span class="cx"> // Synchronous calls used internally by WebCore.
</span><span class="cx"> // Usage should be replaced by asynchronous calls.
</span><span class="lines">@@ -182,12 +173,12 @@
</span><span class="cx">
</span><span class="cx"> // Asynchronous calls we should use to replace the above when supported.
</span><span class="cx"> virtual bool supportsAsynchronousMode() { return false; }
</span><del>- virtual void loadDecisionForIconURL(const String&, PassRefPtr<IconLoadDecisionCallback>) { }
- virtual void iconDataForIconURL(const String&, PassRefPtr<IconDataCallback>) { }
-
</del><ins>+ virtual void loadDecisionForIconURL(const String&, IconLoadDecisionCallback&) { }
+ virtual void iconDataForIconURL(const String&, IconDataCallback&) { }
</ins><span class="cx">
</span><span class="cx"> // Used within one or more WebKit ports.
</span><span class="cx"> // We should try to remove these dependencies from the IconDatabaseBase class.
</span><ins>+
</ins><span class="cx"> virtual void setEnabled(bool) { }
</span><span class="cx">
</span><span class="cx"> virtual Image* defaultIcon(const IntSize&) { return nullptr; }
</span><span class="lines">@@ -205,10 +196,12 @@
</span><span class="cx">
</span><span class="cx"> virtual void setPrivateBrowsingEnabled(bool) { }
</span><span class="cx"> virtual void setClient(IconDatabaseClient*) { }
</span><del>-
</del><ins>+
</ins><span class="cx"> virtual bool isOpen() const { return false; }
</span><span class="cx"> virtual String databasePath() const;
</span><span class="cx">
</span><ins>+protected:
+ IconDatabaseBase() = default;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // Functions to get/set the global icon database.
</span></span></pre></div>
<a id="trunkSourceWebCoreloadericonPageURLRecordcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/icon/PageURLRecord.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/icon/PageURLRecord.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/loader/icon/PageURLRecord.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -35,22 +35,22 @@
</span><span class="cx">
</span><span class="cx"> PageURLRecord::PageURLRecord(const String& pageURL)
</span><span class="cx"> : m_pageURL(pageURL)
</span><del>- , m_retainCount(0)
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PageURLRecord::~PageURLRecord()
</span><span class="cx"> {
</span><del>- setIconRecord(nullptr);
</del><ins>+ if (m_iconRecord)
+ m_iconRecord->m_retainingPageURLs.remove(m_pageURL);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void PageURLRecord::setIconRecord(PassRefPtr<IconRecord> icon)
</del><ins>+void PageURLRecord::setIconRecord(RefPtr<IconRecord>&& icon)
</ins><span class="cx"> {
</span><span class="cx"> if (m_iconRecord)
</span><span class="cx"> m_iconRecord->m_retainingPageURLs.remove(m_pageURL);
</span><del>-
- m_iconRecord = icon;
-
</del><ins>+
+ m_iconRecord = WTFMove(icon);
+
</ins><span class="cx"> if (m_iconRecord)
</span><span class="cx"> m_iconRecord->m_retainingPageURLs.add(m_pageURL);
</span><span class="cx"> }
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx">
</span><span class="cx"> PageURLSnapshot PageURLRecord::snapshot(bool forDeletion) const
</span><span class="cx"> {
</span><del>- return PageURLSnapshot(m_pageURL, (m_iconRecord && !forDeletion) ? m_iconRecord->iconURL() : String());
</del><ins>+ return { m_pageURL, (m_iconRecord && !forDeletion) ? m_iconRecord->iconURL() : String() };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreloadericonPageURLRecordh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/icon/PageURLRecord.h (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/icon/PageURLRecord.h 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/loader/icon/PageURLRecord.h 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx">
</span><span class="cx"> inline String url() const { return m_pageURL; }
</span><span class="cx">
</span><del>- void setIconRecord(PassRefPtr<IconRecord>);
</del><ins>+ void setIconRecord(RefPtr<IconRecord>&&);
</ins><span class="cx"> IconRecord* iconRecord() { return m_iconRecord.get(); }
</span><span class="cx">
</span><span class="cx"> PageURLSnapshot snapshot(bool forDeletion = false) const;
</span><span class="lines">@@ -82,12 +82,12 @@
</span><span class="cx"> return m_retainCount > 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- inline int retainCount() const { return m_retainCount; }
</del><ins>+ int retainCount() const { return m_retainCount; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> String m_pageURL;
</span><span class="cx"> RefPtr<IconRecord> m_iconRecord;
</span><del>- int m_retainCount;
</del><ins>+ int m_retainCount { 0 };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorepageChromecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Chrome.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Chrome.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/page/Chrome.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -431,7 +431,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-void Chrome::runOpenPanel(Frame* frame, PassRefPtr<FileChooser> fileChooser)
</del><ins>+void Chrome::runOpenPanel(Frame& frame, FileChooser& fileChooser)
</ins><span class="cx"> {
</span><span class="cx"> notifyPopupOpeningObservers();
</span><span class="cx"> m_client.runOpenPanel(frame, fileChooser);
</span></span></pre></div>
<a id="trunkSourceWebCorepageChromeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Chrome.h (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Chrome.h 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/page/Chrome.h 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -154,7 +154,7 @@
</span><span class="cx"> std::unique_ptr<ColorChooser> createColorChooser(ColorChooserClient*, const Color& initialColor);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- void runOpenPanel(Frame*, PassRefPtr<FileChooser>);
</del><ins>+ void runOpenPanel(Frame&, FileChooser&);
</ins><span class="cx"> void loadIconForFiles(const Vector<String>&, FileIconLoader&);
</span><span class="cx">
</span><span class="cx"> void dispatchViewportPropertiesDidChange(const ViewportArguments&) const;
</span></span></pre></div>
<a id="trunkSourceWebCorepageChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ChromeClient.h (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ChromeClient.h 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/page/ChromeClient.h 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -273,7 +273,7 @@
</span><span class="cx"> virtual std::unique_ptr<ColorChooser> createColorChooser(ColorChooserClient*, const Color&) = 0;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- virtual void runOpenPanel(Frame*, PassRefPtr<FileChooser>) = 0;
</del><ins>+ virtual void runOpenPanel(Frame&, FileChooser&) = 0;
</ins><span class="cx"> // Asynchronous request to load an icon for specified filenames.
</span><span class="cx"> virtual void loadIconForFiles(const Vector<String>&, FileIconLoader&) = 0;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageDOMWindowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DOMWindow.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DOMWindow.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/page/DOMWindow.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -769,7 +769,7 @@
</span><span class="cx"> if (!isCurrentlyDisplayedInFrame())
</span><span class="cx"> return nullptr;
</span><span class="cx"> if (!m_applicationCache)
</span><del>- m_applicationCache = DOMApplicationCache::create(m_frame);
</del><ins>+ m_applicationCache = DOMApplicationCache::create(*m_frame);
</ins><span class="cx"> return m_applicationCache.get();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2079,7 +2079,7 @@
</span><span class="cx"> // We want a new history item if we are processing a user gesture.
</span><span class="cx"> LockHistory lockHistory = (locking != LockHistoryBasedOnGestureState || !ScriptController::processingUserGesture()) ? LockHistory::Yes : LockHistory::No;
</span><span class="cx"> LockBackForwardList lockBackForwardList = (locking != LockHistoryBasedOnGestureState) ? LockBackForwardList::Yes : LockBackForwardList::No;
</span><del>- m_frame->navigationScheduler().scheduleLocationChange(activeDocument, activeDocument->securityOrigin(),
</del><ins>+ m_frame->navigationScheduler().scheduleLocationChange(*activeDocument, activeDocument->securityOrigin(),
</ins><span class="cx"> // FIXME: What if activeDocument()->frame() is 0?
</span><span class="cx"> completedURL, activeDocument->frame()->loader().outgoingReferrer(),
</span><span class="cx"> lockHistory, lockBackForwardList);
</span><span class="lines">@@ -2205,7 +2205,7 @@
</span><span class="cx"> newFrame->loader().changeLocation(frameRequest);
</span><span class="cx"> } else if (!urlString.isEmpty()) {
</span><span class="cx"> LockHistory lockHistory = ScriptController::processingUserGesture() ? LockHistory::No : LockHistory::Yes;
</span><del>- newFrame->navigationScheduler().scheduleLocationChange(activeWindow.document(), activeWindow.document()->securityOrigin(), completedURL, referrer, lockHistory, LockBackForwardList::No);
</del><ins>+ newFrame->navigationScheduler().scheduleLocationChange(*activeWindow.document(), activeWindow.document()->securityOrigin(), completedURL, referrer, lockHistory, LockBackForwardList::No);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Navigating the new frame could result in it being detached from its page by a navigation policy delegate.
</span><span class="lines">@@ -2215,28 +2215,26 @@
</span><span class="cx"> return newFrame;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<DOMWindow> DOMWindow::open(const String& urlString, const AtomicString& frameName, const String& windowFeaturesString,
- DOMWindow& activeWindow, DOMWindow& firstWindow)
</del><ins>+RefPtr<DOMWindow> DOMWindow::open(const String& urlString, const AtomicString& frameName, const String& windowFeaturesString, DOMWindow& activeWindow, DOMWindow& firstWindow)
</ins><span class="cx"> {
</span><span class="cx"> if (!isCurrentlyDisplayedInFrame())
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- Document* activeDocument = activeWindow.document();
</del><ins>+ auto* activeDocument = activeWindow.document();
</ins><span class="cx"> if (!activeDocument)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- Frame* firstFrame = firstWindow.frame();
</del><ins>+ auto* firstFrame = firstWindow.frame();
</ins><span class="cx"> if (!firstFrame)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CONTENT_EXTENSIONS)
</span><span class="cx"> if (firstFrame->document()
</span><del>- && firstFrame->mainFrame().page()
</del><ins>+ && firstFrame->page()
</ins><span class="cx"> && firstFrame->mainFrame().document()
</span><span class="cx"> && firstFrame->mainFrame().document()->loader()) {
</span><del>- ResourceLoadInfo resourceLoadInfo = { firstFrame->document()->completeURL(urlString), firstFrame->mainFrame().document()->url(), ResourceType::Popup };
- Vector<ContentExtensions::Action> actions = firstFrame->mainFrame().page()->userContentProvider().actionsForResourceLoad(resourceLoadInfo, *firstFrame->mainFrame().document()->loader());
- for (const ContentExtensions::Action& action : actions) {
</del><ins>+ ResourceLoadInfo resourceLoadInfo { firstFrame->document()->completeURL(urlString), firstFrame->mainFrame().document()->url(), ResourceType::Popup };
+ for (auto& action : firstFrame->page()->userContentProvider().actionsForResourceLoad(resourceLoadInfo, *firstFrame->mainFrame().document()->loader())) {
</ins><span class="cx"> if (action.type() == ContentExtensions::ActionType::BlockLoad)
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="lines">@@ -2276,7 +2274,7 @@
</span><span class="cx"> // For whatever reason, Firefox uses the first window rather than the active window to
</span><span class="cx"> // determine the outgoing referrer. We replicate that behavior here.
</span><span class="cx"> LockHistory lockHistory = ScriptController::processingUserGesture() ? LockHistory::No : LockHistory::Yes;
</span><del>- targetFrame->navigationScheduler().scheduleLocationChange(activeDocument, activeDocument->securityOrigin(), completedURL, firstFrame->loader().outgoingReferrer(),
</del><ins>+ targetFrame->navigationScheduler().scheduleLocationChange(*activeDocument, activeDocument->securityOrigin(), completedURL, firstFrame->loader().outgoingReferrer(),
</ins><span class="cx"> lockHistory, LockBackForwardList::No);
</span><span class="cx"> return targetFrame->document()->domWindow();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepageEditorClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EditorClient.h (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EditorClient.h 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/page/EditorClient.h 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -104,8 +104,8 @@
</span><span class="cx"> virtual void discardedComposition(Frame*) = 0;
</span><span class="cx"> virtual void canceledComposition() = 0;
</span><span class="cx">
</span><del>- virtual void registerUndoStep(PassRefPtr<UndoStep>) = 0;
- virtual void registerRedoStep(PassRefPtr<UndoStep>) = 0;
</del><ins>+ virtual void registerUndoStep(UndoStep&) = 0;
+ virtual void registerRedoStep(UndoStep&) = 0;
</ins><span class="cx"> virtual void clearUndoRedoOperations() = 0;
</span><span class="cx">
</span><span class="cx"> virtual bool canCopyCut(Frame*, bool defaultValue) const = 0;
</span></span></pre></div>
<a id="trunkSourceWebCorepageHistorycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/History.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/History.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/page/History.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -207,10 +207,10 @@
</span><span class="cx"> m_frame->document()->updateURLForPushOrReplaceState(fullURL);
</span><span class="cx">
</span><span class="cx"> if (stateObjectType == StateObjectType::Push) {
</span><del>- m_frame->loader().history().pushState(data, title, fullURL.string());
</del><ins>+ m_frame->loader().history().pushState(WTFMove(data), title, fullURL.string());
</ins><span class="cx"> m_frame->loader().client().dispatchDidPushStateWithinPage();
</span><span class="cx"> } else if (stateObjectType == StateObjectType::Replace) {
</span><del>- m_frame->loader().history().replaceState(data, title, fullURL.string());
</del><ins>+ m_frame->loader().history().replaceState(WTFMove(data), title, fullURL.string());
</ins><span class="cx"> m_frame->loader().client().dispatchDidReplaceStateWithinPage();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageLocationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Location.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Location.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/page/Location.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -221,9 +221,10 @@
</span><span class="cx"> {
</span><span class="cx"> if (!m_frame)
</span><span class="cx"> return;
</span><del>- URL url = m_frame->document()->url();
- String oldFragmentIdentifier = url.fragmentIdentifier();
- String newFragmentIdentifier = hash;
</del><ins>+ ASSERT(m_frame->document());
+ auto url = m_frame->document()->url();
+ auto oldFragmentIdentifier = url.fragmentIdentifier();
+ auto newFragmentIdentifier = hash;
</ins><span class="cx"> if (hash[0] == '#')
</span><span class="cx"> newFragmentIdentifier = hash.substring(1);
</span><span class="cx"> url.setFragmentIdentifier(newFragmentIdentifier);
</span><span class="lines">@@ -246,7 +247,9 @@
</span><span class="cx"> {
</span><span class="cx"> if (!m_frame)
</span><span class="cx"> return;
</span><del>- // Note: We call DOMWindow::setLocation directly here because replace() always operates on the current frame.
</del><ins>+ ASSERT(m_frame->document());
+ ASSERT(m_frame->document()->domWindow());
+ // We call DOMWindow::setLocation directly here because replace() always operates on the current frame.
</ins><span class="cx"> m_frame->document()->domWindow()->setLocation(activeWindow, firstWindow, url, LockHistoryAndBackForwardList);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -254,26 +257,38 @@
</span><span class="cx"> {
</span><span class="cx"> if (!m_frame)
</span><span class="cx"> return;
</span><ins>+
+ ASSERT(activeWindow.document());
+ ASSERT(m_frame->document());
+ ASSERT(m_frame->document()->domWindow());
+
+ auto& activeDocument = *activeWindow.document();
+ auto& targetDocument = *m_frame->document();
+
</ins><span class="cx"> // FIXME: It's not clear this cross-origin security check is valuable.
</span><span class="cx"> // We allow one page to change the location of another. Why block attempts to reload?
</span><span class="cx"> // Other location operations simply block use of JavaScript URLs cross origin.
</span><del>- DOMWindow* targetWindow = m_frame->document()->domWindow();
- if (!activeWindow.document()->securityOrigin()->canAccess(m_frame->document()->securityOrigin())) {
- targetWindow->printErrorMessage(targetWindow->crossDomainAccessErrorMessage(activeWindow));
</del><ins>+ if (!activeDocument.securityOrigin()->canAccess(targetDocument.securityOrigin())) {
+ auto& targetWindow = *targetDocument.domWindow();
+ targetWindow.printErrorMessage(targetWindow.crossDomainAccessErrorMessage(activeWindow));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><del>- if (protocolIsJavaScript(m_frame->document()->url()))
</del><ins>+
+ if (protocolIsJavaScript(targetDocument.url()))
</ins><span class="cx"> return;
</span><del>- m_frame->navigationScheduler().scheduleRefresh(activeWindow.document());
</del><ins>+
+ m_frame->navigationScheduler().scheduleRefresh(activeDocument);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Location::setLocation(DOMWindow& activeWindow, DOMWindow& firstWindow, const String& url)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_frame);
</span><del>- Frame* frame = m_frame->loader().findFrameForNavigation(String(), activeWindow.document());
- if (!frame)
</del><ins>+ auto* targetFrame = m_frame->loader().findFrameForNavigation({ }, activeWindow.document());
+ if (!targetFrame)
</ins><span class="cx"> return;
</span><del>- frame->document()->domWindow()->setLocation(activeWindow, firstWindow, url);
</del><ins>+ ASSERT(targetFrame->document());
+ ASSERT(targetFrame->document()->domWindow());
+ targetFrame->document()->domWindow()->setLocation(activeWindow, firstWindow, url);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformURLcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/URL.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/URL.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/platform/URL.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -1126,17 +1126,17 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void URL::setFragmentIdentifier(const String& s)
</del><ins>+void URL::setFragmentIdentifier(StringView identifier)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_isValid)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- // FIXME: Non-ASCII characters must be encoded and escaped to match parse() expectations.
- if (URLParser::enabled()) {
- URLParser parser(makeString(m_string.left(m_queryEnd), "#", s));
- *this = parser.result();
- } else
- parse(m_string.left(m_queryEnd) + "#" + s);
</del><ins>+ // FIXME: Optimize the case where the identifier already happens to be equal to what was passed?
+ // FIXME: Is it correct to do this without encoding and escaping non-ASCII characters?
+ if (URLParser::enabled())
+ *this = URLParser { makeString(StringView { m_string }.substring(0, m_queryEnd), '#', identifier) }.result();
+ else
+ parse(m_string.left(m_queryEnd) + "#" + identifier);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void URL::removeFragmentIdentifier()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformURLh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/URL.h (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/URL.h 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/platform/URL.h 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -158,7 +158,7 @@
</span><span class="cx"> // URL (with nothing after it). To clear the query, pass a null string.
</span><span class="cx"> void setQuery(const String&);
</span><span class="cx">
</span><del>- void setFragmentIdentifier(const String&);
</del><ins>+ void setFragmentIdentifier(StringView);
</ins><span class="cx"> void removeFragmentIdentifier();
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT friend bool equalIgnoringFragmentIdentifier(const URL&, const URL&);
</span></span></pre></div>
<a id="trunkSourceWebCorereplayReplayInputDispatchMethodscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/replay/ReplayInputDispatchMethods.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/replay/ReplayInputDispatchMethods.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/replay/ReplayInputDispatchMethods.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -50,8 +50,9 @@
</span><span class="cx"> // Navigation inputs.
</span><span class="cx"> void InitialNavigation::dispatch(ReplayController& controller)
</span><span class="cx"> {
</span><del>- Frame& frame = controller.page().mainFrame();
- frame.navigationScheduler().scheduleLocationChange(frame.document(), m_securityOrigin.get(), m_url, m_referrer);
</del><ins>+ auto& frame = controller.page().mainFrame();
+ ASSERT(frame.document());
+ frame.navigationScheduler().scheduleLocationChange(*frame.document(), m_securityOrigin.get(), m_url, m_referrer);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HandleKeyPress::dispatch(ReplayController& controller)
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGFEImageElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGFEImageElement.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGFEImageElement.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/svg/SVGFEImageElement.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> options.contentSecurityPolicyImposition = isInUserAgentShadowTree() ? ContentSecurityPolicyImposition::SkipPolicyCheck : ContentSecurityPolicyImposition::DoPolicyCheck;
</span><span class="cx">
</span><span class="cx"> CachedResourceRequest request(ResourceRequest(document().completeURL(href())), options);
</span><del>- request.setInitiator(this);
</del><ins>+ request.setInitiator(*this);
</ins><span class="cx"> m_cachedImage = document().cachedResourceLoader().requestImage(WTFMove(request));
</span><span class="cx">
</span><span class="cx"> if (m_cachedImage)
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGFontFaceUriElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGFontFaceUriElement.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGFontFaceUriElement.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/svg/SVGFontFaceUriElement.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx">
</span><span class="cx"> CachedResourceLoader& cachedResourceLoader = document().cachedResourceLoader();
</span><span class="cx"> CachedResourceRequest request(ResourceRequest(document().completeURL(href)), options);
</span><del>- request.setInitiator(this);
</del><ins>+ request.setInitiator(*this);
</ins><span class="cx"> m_cachedFont = cachedResourceLoader.requestFont(WTFMove(request), isSVGFontTarget(*this));
</span><span class="cx"> if (m_cachedFont) {
</span><span class="cx"> m_cachedFont->addClient(*this);
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGUseElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGUseElement.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGUseElement.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebCore/svg/SVGUseElement.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -572,7 +572,7 @@
</span><span class="cx"> options.contentSecurityPolicyImposition = isInUserAgentShadowTree() ? ContentSecurityPolicyImposition::SkipPolicyCheck : ContentSecurityPolicyImposition::DoPolicyCheck;
</span><span class="cx"> options.mode = FetchOptions::Mode::SameOrigin;
</span><span class="cx"> CachedResourceRequest request { ResourceRequest { externalDocumentURL }, options };
</span><del>- request.setInitiator(this);
</del><ins>+ request.setInitiator(*this);
</ins><span class="cx"> m_externalDocument = document().cachedResourceLoader().requestSVGDocument(WTFMove(request));
</span><span class="cx"> if (m_externalDocument)
</span><span class="cx"> m_externalDocument->addClient(*this);
</span></span></pre></div>
<a id="trunkSourceWebKitiosChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/ChangeLog (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/ChangeLog 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebKit/ios/ChangeLog 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2017-01-15 Darin Adler <darin@apple.com>
+
+ Remove PassRefPtr from "loader" directory of WebCore
+ https://bugs.webkit.org/show_bug.cgi?id=167055
+
+ Reviewed by Alex Christensen.
+
+ * WebCoreSupport/WebChromeClientIOS.h: Updated runOpenPanel to take references.
+ Made class final and most functions private and final.
+ * WebCoreSupport/WebChromeClientIOS.mm:
+ (WebChromeClientIOS::runOpenPanel): Updated to take references.
+
</ins><span class="cx"> 2016-12-30 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove PassRefPtr use from the "dom" directory, related cleanup
</span></span></pre></div>
<a id="trunkSourceWebKitiosWebCoreSupportWebChromeClientIOSh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/WebCoreSupport/WebChromeClientIOS.h (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/WebCoreSupport/WebChromeClientIOS.h 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebKit/ios/WebCoreSupport/WebChromeClientIOS.h 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2008, 2009 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2008-2017 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -24,73 +24,77 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><ins>+
</ins><span class="cx"> #import "WebChromeClient.h"
</span><span class="cx">
</span><del>-class WebChromeClientIOS : public WebChromeClient {
</del><ins>+class WebChromeClientIOS final : public WebChromeClient {
</ins><span class="cx"> public:
</span><del>- WebChromeClientIOS(WebView *webView)
</del><ins>+ WebChromeClientIOS(WebView* webView)
</ins><span class="cx"> : WebChromeClient(webView)
</span><del>- , m_formNotificationSuppressions(0) { }
-
- void setWindowRect(const WebCore::FloatRect&) override;
- WebCore::FloatRect windowRect() override;
- void setStatusbarText(const WTF::String&) override { }
</del><ins>+ {
+ }
</ins><span class="cx">
</span><del>- void focus() override;
- void takeFocus(WebCore::FocusDirection) override { }
</del><ins>+private:
+ void setWindowRect(const WebCore::FloatRect&) final;
+ WebCore::FloatRect windowRect() final;
+ void setStatusbarText(const WTF::String&) final { }
</ins><span class="cx">
</span><del>- void runJavaScriptAlert(WebCore::Frame*, const WTF::String&) override;
- bool runJavaScriptConfirm(WebCore::Frame*, const WTF::String&) override;
- bool runJavaScriptPrompt(WebCore::Frame*, const WTF::String& message, const WTF::String& defaultValue, WTF::String& result) override;
</del><ins>+ void focus() final;
+ void takeFocus(WebCore::FocusDirection) final { }
</ins><span class="cx">
</span><del>- void runOpenPanel(WebCore::Frame*, PassRefPtr<WebCore::FileChooser>) override;
</del><ins>+ void runJavaScriptAlert(WebCore::Frame*, const WTF::String&) final;
+ bool runJavaScriptConfirm(WebCore::Frame*, const WTF::String&) final;
+ bool runJavaScriptPrompt(WebCore::Frame*, const WTF::String& message, const WTF::String& defaultValue, WTF::String& result) final;
</ins><span class="cx">
</span><ins>+ void runOpenPanel(WebCore::Frame&, WebCore::FileChooser&) final;
+
</ins><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><del>- void didPreventDefaultForEvent() override;
</del><ins>+ void didPreventDefaultForEvent() final;
</ins><span class="cx"> #endif
</span><del>- void didReceiveMobileDocType(bool) override;
- void setNeedsScrollNotifications(WebCore::Frame*, bool) override;
- void observedContentChange(WebCore::Frame*) override;
- void clearContentChangeObservers(WebCore::Frame*) override;
- WebCore::FloatSize screenSize() const override;
- WebCore::FloatSize availableScreenSize() const override;
- void dispatchViewportPropertiesDidChange(const WebCore::ViewportArguments&) const override;
- void notifyRevealedSelectionByScrollingFrame(WebCore::Frame*) override;
- bool isStopping() override;
- void didLayout(LayoutType) override;
- void didStartOverflowScroll() override;
- void didEndOverflowScroll() override;
</del><span class="cx">
</span><del>- void suppressFormNotifications() override;
- void restoreFormNotifications() override;
</del><ins>+ void didReceiveMobileDocType(bool) final;
+ void setNeedsScrollNotifications(WebCore::Frame*, bool) final;
+ void observedContentChange(WebCore::Frame*) final;
+ void clearContentChangeObservers(WebCore::Frame*) final;
+ WebCore::FloatSize screenSize() const final;
+ WebCore::FloatSize availableScreenSize() const final;
+ void dispatchViewportPropertiesDidChange(const WebCore::ViewportArguments&) const final;
+ void notifyRevealedSelectionByScrollingFrame(WebCore::Frame*) final;
+ bool isStopping() final;
+ void didLayout(LayoutType) final;
+ void didStartOverflowScroll() final;
+ void didEndOverflowScroll() final;
+
+ void suppressFormNotifications() final;
+ void restoreFormNotifications() final;
</ins><span class="cx">
</span><del>- void elementDidFocus(const WebCore::Node*) override;
- void elementDidBlur(const WebCore::Node*) override;
</del><ins>+ void elementDidFocus(const WebCore::Node*) final;
+ void elementDidBlur(const WebCore::Node*) final;
</ins><span class="cx">
</span><del>- void attachRootGraphicsLayer(WebCore::Frame*, WebCore::GraphicsLayer*) override;
</del><ins>+ void attachRootGraphicsLayer(WebCore::Frame*, WebCore::GraphicsLayer*) final;
</ins><span class="cx">
</span><del>- void didFlushCompositingLayers() override;
</del><ins>+ void didFlushCompositingLayers() final;
</ins><span class="cx">
</span><del>- void updateViewportConstrainedLayers(HashMap<PlatformLayer*, std::unique_ptr<WebCore::ViewportConstraints>>&, HashMap<PlatformLayer*, PlatformLayer*>&) override;
</del><ins>+ void updateViewportConstrainedLayers(HashMap<PlatformLayer*, std::unique_ptr<WebCore::ViewportConstraints>>&, HashMap<PlatformLayer*, PlatformLayer*>&) final;
</ins><span class="cx">
</span><del>- bool fetchCustomFixedPositionLayoutRect(WebCore::IntRect&) override;
- void addOrUpdateScrollingLayer(WebCore::Node*, PlatformLayer*, PlatformLayer*, const WebCore::IntSize&, bool allowHorizontalScrollbar, bool allowVerticalScrollbar) override;
- void removeScrollingLayer(WebCore::Node*, PlatformLayer*, PlatformLayer*) override;
</del><ins>+ bool fetchCustomFixedPositionLayoutRect(WebCore::IntRect&) final;
+ void addOrUpdateScrollingLayer(WebCore::Node*, PlatformLayer*, PlatformLayer*, const WebCore::IntSize&, bool allowHorizontalScrollbar, bool allowVerticalScrollbar) final;
+ void removeScrollingLayer(WebCore::Node*, PlatformLayer*, PlatformLayer*) final;
</ins><span class="cx">
</span><del>- bool selectItemWritingDirectionIsNatural() override;
- bool selectItemAlignmentFollowsMenuWritingDirection() override;
- RefPtr<WebCore::PopupMenu> createPopupMenu(WebCore::PopupMenuClient*) const override;
- RefPtr<WebCore::SearchPopupMenu> createSearchPopupMenu(WebCore::PopupMenuClient*) const override;
</del><ins>+ bool selectItemWritingDirectionIsNatural() final;
+ bool selectItemAlignmentFollowsMenuWritingDirection() final;
+ RefPtr<WebCore::PopupMenu> createPopupMenu(WebCore::PopupMenuClient*) const final;
+ RefPtr<WebCore::SearchPopupMenu> createSearchPopupMenu(WebCore::PopupMenuClient*) const final;
</ins><span class="cx">
</span><del>- void webAppOrientationsUpdated() override;
- void focusedElementChanged(WebCore::Element*) override;
- void showPlaybackTargetPicker(bool hasVideo) override;
</del><ins>+ void webAppOrientationsUpdated() final;
+ void focusedElementChanged(WebCore::Element*) final;
+ void showPlaybackTargetPicker(bool hasVideo) final;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(ORIENTATION_EVENTS)
</span><del>- int deviceOrientation() const override;
</del><ins>+ int deviceOrientation() const final;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>-private:
- int m_formNotificationSuppressions;
</del><ins>+ int m_formNotificationSuppressions { 0 };
</ins><span class="cx"> };
</span><ins>+
</ins><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKitiosWebCoreSupportWebChromeClientIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/WebCoreSupport/WebChromeClientIOS.mm (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/WebCoreSupport/WebChromeClientIOS.mm 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebKit/ios/WebCoreSupport/WebChromeClientIOS.mm 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2008, 2009 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2008-2017 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -23,9 +23,10 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
</del><span class="cx"> #import "WebChromeClientIOS.h"
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+
</ins><span class="cx"> #import "DOMNodeInternal.h"
</span><span class="cx"> #import "PopupMenuIOS.h"
</span><span class="cx"> #import "SearchPopupMenuIOS.h"
</span><span class="lines">@@ -43,9 +44,6 @@
</span><span class="cx"> #import "WebView.h"
</span><span class="cx"> #import "WebViewInternal.h"
</span><span class="cx"> #import "WebViewPrivate.h"
</span><del>-
-#import <wtf/HashMap.h>
-#import <wtf/RefPtr.h>
</del><span class="cx"> #import <WebCore/FileChooser.h>
</span><span class="cx"> #import <WebCore/FloatRect.h>
</span><span class="cx"> #import <WebCore/Frame.h>
</span><span class="lines">@@ -61,6 +59,8 @@
</span><span class="cx"> #import <WebCore/ScrollingConstraints.h>
</span><span class="cx"> #import <WebCore/WAKWindow.h>
</span><span class="cx"> #import <WebCore/WebCoreThreadMessage.h>
</span><ins>+#import <wtf/HashMap.h>
+#import <wtf/RefPtr.h>
</ins><span class="cx">
</span><span class="cx"> NSString * const WebOpenPanelConfigurationAllowMultipleFilesKey = @"WebOpenPanelConfigurationAllowMultipleFilesKey";
</span><span class="cx"> NSString * const WebOpenPanelConfigurationMediaCaptureTypeKey = @"WebOpenPanelConfigurationMediaCaptureTypeKey";
</span><span class="lines">@@ -69,9 +69,10 @@
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_CAPTURE)
</span><del>-static WebMediaCaptureType webMediaCaptureType(MediaCaptureType mediaCaptureType)
</del><ins>+
+static WebMediaCaptureType webMediaCaptureType(MediaCaptureType type)
</ins><span class="cx"> {
</span><del>- switch (mediaCaptureType) {
</del><ins>+ switch (type) {
</ins><span class="cx"> case MediaCaptureTypeNone:
</span><span class="cx"> return WebMediaCaptureTypeNone;
</span><span class="cx"> case MediaCaptureTypeUser:
</span><span class="lines">@@ -83,6 +84,7 @@
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return WebMediaCaptureTypeNone;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void WebChromeClientIOS::setWindowRect(const WebCore::FloatRect& r)
</span><span class="lines">@@ -124,18 +126,15 @@
</span><span class="cx"> return !result.isNull();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebChromeClientIOS::runOpenPanel(Frame*, PassRefPtr<FileChooser> chooser)
</del><ins>+void WebChromeClientIOS::runOpenPanel(Frame&, FileChooser& chooser)
</ins><span class="cx"> {
</span><del>- const FileChooserSettings& settings = chooser->settings();
</del><ins>+ auto& settings = chooser.settings();
</ins><span class="cx"> BOOL allowMultipleFiles = settings.allowsMultipleFiles;
</span><del>- Vector<String> acceptMIMETypes = settings.acceptMIMETypes;
</del><span class="cx"> WebOpenPanelResultListener *listener = [[WebOpenPanelResultListener alloc] initWithChooser:chooser];
</span><span class="cx">
</span><del>- // Convert the accept attribute string into a list of MIME types.
- size_t numMIMETypes = acceptMIMETypes.size();
- NSMutableArray *mimeTypes = [NSMutableArray arrayWithCapacity:numMIMETypes];
- for (size_t i = 0; i < numMIMETypes; ++i)
- [mimeTypes addObject:acceptMIMETypes[i]];
</del><ins>+ NSMutableArray *mimeTypes = [NSMutableArray arrayWithCapacity:settings.acceptMIMETypes.size()];
+ for (auto& type : settings.acceptMIMETypes)
+ [mimeTypes addObject:type];
</ins><span class="cx">
</span><span class="cx"> WebMediaCaptureType captureType = WebMediaCaptureTypeNone;
</span><span class="cx"> #if ENABLE(MEDIA_CAPTURE)
</span><span class="lines">@@ -158,10 +157,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(IOS_TOUCH_EVENTS)
</span><ins>+
</ins><span class="cx"> void WebChromeClientIOS::didPreventDefaultForEvent()
</span><span class="cx"> {
</span><span class="cx"> [[webView() _UIKitDelegateForwarder] webViewDidPreventDefaultForEvent:webView()];
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void WebChromeClientIOS::didReceiveMobileDocType(bool isMobileDoctype)
</span><span class="lines">@@ -355,10 +356,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(ORIENTATION_EVENTS)
</span><ins>+
</ins><span class="cx"> int WebChromeClientIOS::deviceOrientation() const
</span><span class="cx"> {
</span><span class="cx"> return [[webView() _UIKitDelegateForwarder] deviceOrientation];
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #endif // PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebKit/mac/ChangeLog 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -1,3 +1,90 @@
</span><ins>+2017-01-15 Darin Adler <darin@apple.com>
+
+ Remove PassRefPtr from "loader" directory of WebCore
+ https://bugs.webkit.org/show_bug.cgi?id=167055
+
+ Reviewed by Alex Christensen.
+
+ * WebCoreSupport/WebChromeClient.h: Updated for changes to ChromeClient.
+ Also made class final and most functions private and final.
+ * WebCoreSupport/WebChromeClient.mm:
+ (WebChromeClient::runOpenPanel): Updated to take references.
+
+ * WebCoreSupport/WebEditorClient.h: Updated for changes to EditorClient.
+ * WebCoreSupport/WebEditorClient.mm:
+ (-[WebUndoStep initWithUndoStep:]): Take reference instead of PassRefPtr.
+ (+[WebUndoStep stepWithUndoStep:]): Ditto.
+ (-[WebUndoStep step]): Return reference instead of pointer.
+ (-[WebEditorUndoTarget undoEditing:]): Updated for the above.
+ (-[WebEditorUndoTarget redoEditing:]): Ditto.
+ (WebEditorClient::registerUndoOrRedoStep): Take reference instead of
+ PassRefPtr.
+ (WebEditorClient::registerUndoStep): Ditto.
+ (WebEditorClient::registerRedoStep): Ditto.
+
+ * WebCoreSupport/WebFrameLoaderClient.h: Updated for changes to
+ FrameLoaderClient, marked functions final instead of override.
+ * WebCoreSupport/WebFrameLoaderClient.mm:
+ (WebFrameLoaderClient::dispatchDecidePolicyForNewWindowAction): Take
+ pointer instead of PassRefPtr.
+ (WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction): Ditto.
+ (makeFormFieldValuesDictionary): Take a reference.
+ (WebFrameLoaderClient::dispatchWillSendSubmitEvent): Take Ref&& instead
+ of PassRefPtr.
+ (WebFrameLoaderClient::dispatchWillSubmitForm): Take a reference instead
+ of PassRefPtr.
+ (WebFrameLoaderClient::actionDictionary): Take a pointer instead of PassRePtr.
+ (WebFrameLoaderClient::createFrame): Take a reference instead of a pointer.
+ (WebFrameLoaderClient::createPlugin): Ditto.
+ (WebFrameLoaderClient::createJavaAppletWidget): Ditto.
+ (WebFrameLoaderClient::createNetworkingContext): Ditto.
+ (WebFrameLoaderClient::didCreateQuickLookHandle): Pass a reference.
+
+ * WebCoreSupport/WebFrameNetworkingContext.h: Use Ref instead of PassRefPtr.
+ * WebCoreSupport/WebFrameNetworkingContext.mm: Tweak style a bit.
+
+ * WebCoreSupport/WebOpenPanelResultListener.h: Take a reference instead of
+ PassRefPtr. Use RefPtr for class field.
+ * WebCoreSupport/WebOpenPanelResultListener.mm:
+ (-[WebOpenPanelResultListener dealloc]): Deleted. Compiler will now do it
+ correctly without us declaring anything explicitly.
+ (-[WebOpenPanelResultListener cancel]): Get rid of hand-written deref code,
+ and let RefPtr do the work.
+ (-[WebOpenPanelResultListener chooseFilename:]): Ditto.
+ (-[WebOpenPanelResultListener chooseFilenames:]): Ditto.
+ (-[WebOpenPanelResultListener chooseFilenames:displayString:iconImage:]):
+ Rewrote to use a modern Objective-C for loop, reserveInitialCapacity,
+ and uncheckedAppend.
+
+ * WebView/WebArchive.mm:
+ (-[WebArchive initWithMainResource:subresources:subframeArchives:]):
+ Updated for changes to LegacyWebArchive.
+ (-[WebArchive mainResource]): Ditto.
+ (-[WebArchive subresources]): Ditto.
+ (-[WebArchive subframeArchives]): Ditto.
+
+ * WebView/WebDataSource.mm:
+ (-[WebDataSource _addSubframeArchives:]): Use a modern Objective-C for loop
+ instead of NSEnumerator.
+ (-[WebDataSource _fileWrapperForURL:]): Use auto.
+ (-[WebDataSource _documentFragmentWithArchive:]): Pass a reference.
+ (-[WebDataSource mainResource]): Ditto.
+ (-[WebDataSource subresources]): Ditto.
+ (-[WebDataSource subresourceForURL:]): Ditto.
+ (-[WebDataSource addSubresource:]): Ditto.
+
+ * WebView/WebResource.mm:
+ (-[WebResourcePrivate initWithCoreResource:]): Take Ref&& instead of PassRefPtr.
+ (-[WebResourcePrivate dealloc]): Remove explicit deref since RefPtr will now take
+ care of it
+ (-[WebResource initWithCoder:]): Pass a reference.
+ (-[WebResource encodeWithCoder:]): Updated since coreResource is now RefPtr.
+ (-[WebResource _initWithCoreResource:]): Take Ref&& instead of PassRefPtr.
+ (-[WebResource _coreResource]): Return reference rather than pointer.
+ (-[WebResource _initWithData:URL:MIMEType:textEncodingName:frameName:response:copyData:]):
+ Added code to handle the null case and pass a reference rather than a pointer.
+ * WebView/WebResourceInternal.h: Updated for the above.
+
</ins><span class="cx"> 2017-01-17 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r210834
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -33,130 +33,138 @@
</span><span class="cx">
</span><span class="cx"> @class WebView;
</span><span class="cx">
</span><ins>+// FIXME: This class is used as a concrete class on Mac, but on iOS this is an abstract
+// base class of the concrete class, WebChromeClientIOS. Because of that, this class and
+// many of its functions are not marked final. That is messy way to organize things.
</ins><span class="cx"> class WebChromeClient : public WebCore::ChromeClient {
</span><span class="cx"> public:
</span><span class="cx"> WebChromeClient(WebView*);
</span><del>-
- void chromeDestroyed() override;
-
</del><ins>+
+ WebView* webView() const { return m_webView; }
+
+private:
+ void chromeDestroyed() final;
+
</ins><span class="cx"> void setWindowRect(const WebCore::FloatRect&) override;
</span><span class="cx"> WebCore::FloatRect windowRect() override;
</span><span class="cx">
</span><del>- WebCore::FloatRect pageRect() override;
</del><ins>+ WebCore::FloatRect pageRect() final;
</ins><span class="cx">
</span><span class="cx"> void focus() override;
</span><del>- void unfocus() override;
-
- bool canTakeFocus(WebCore::FocusDirection) override;
</del><ins>+ void unfocus() final;
+
+ bool canTakeFocus(WebCore::FocusDirection) final;
</ins><span class="cx"> void takeFocus(WebCore::FocusDirection) override;
</span><span class="cx">
</span><span class="cx"> void focusedElementChanged(WebCore::Element*) override;
</span><del>- void focusedFrameChanged(WebCore::Frame*) override;
</del><ins>+ void focusedFrameChanged(WebCore::Frame*) final;
</ins><span class="cx">
</span><del>- WebCore::Page* createWindow(WebCore::Frame*, const WebCore::FrameLoadRequest&, const WebCore::WindowFeatures&, const WebCore::NavigationAction&) override;
- void show() override;
</del><ins>+ WebCore::Page* createWindow(WebCore::Frame*, const WebCore::FrameLoadRequest&, const WebCore::WindowFeatures&, const WebCore::NavigationAction&) final;
+ void show() final;
</ins><span class="cx">
</span><del>- bool canRunModal() override;
- void runModal() override;
</del><ins>+ bool canRunModal() final;
+ void runModal() final;
</ins><span class="cx">
</span><del>- void setToolbarsVisible(bool) override;
- bool toolbarsVisible() override;
-
- void setStatusbarVisible(bool) override;
- bool statusbarVisible() override;
-
- void setScrollbarsVisible(bool) override;
- bool scrollbarsVisible() override;
-
- void setMenubarVisible(bool) override;
- bool menubarVisible() override;
-
- void setResizable(bool) override;
-
- void addMessageToConsole(JSC::MessageSource, JSC::MessageLevel, const WTF::String& message, unsigned lineNumber, unsigned columnNumber, const WTF::String& sourceURL) override;
</del><ins>+ void setToolbarsVisible(bool) final;
+ bool toolbarsVisible() final;
</ins><span class="cx">
</span><del>- bool canRunBeforeUnloadConfirmPanel() override;
- bool runBeforeUnloadConfirmPanel(const WTF::String& message, WebCore::Frame*) override;
</del><ins>+ void setStatusbarVisible(bool) final;
+ bool statusbarVisible() final;
</ins><span class="cx">
</span><del>- void closeWindowSoon() override;
</del><ins>+ void setScrollbarsVisible(bool) final;
+ bool scrollbarsVisible() final;
</ins><span class="cx">
</span><ins>+ void setMenubarVisible(bool) final;
+ bool menubarVisible() final;
+
+ void setResizable(bool) final;
+
+ void addMessageToConsole(JSC::MessageSource, JSC::MessageLevel, const WTF::String& message, unsigned lineNumber, unsigned columnNumber, const WTF::String& sourceURL) final;
+
+ bool canRunBeforeUnloadConfirmPanel() final;
+ bool runBeforeUnloadConfirmPanel(const WTF::String& message, WebCore::Frame*) final;
+
+ void closeWindowSoon() final;
+
</ins><span class="cx"> void runJavaScriptAlert(WebCore::Frame*, const WTF::String&) override;
</span><span class="cx"> bool runJavaScriptConfirm(WebCore::Frame*, const WTF::String&) override;
</span><span class="cx"> bool runJavaScriptPrompt(WebCore::Frame*, const WTF::String& message, const WTF::String& defaultValue, WTF::String& result) override;
</span><span class="cx">
</span><del>- bool supportsImmediateInvalidation() override;
- void invalidateRootView(const WebCore::IntRect&) override;
- void invalidateContentsAndRootView(const WebCore::IntRect&) override;
- void invalidateContentsForSlowScroll(const WebCore::IntRect&) override;
- void scroll(const WebCore::IntSize& scrollDelta, const WebCore::IntRect& rectToScroll, const WebCore::IntRect& clipRect) override;
</del><ins>+ bool supportsImmediateInvalidation() final;
+ void invalidateRootView(const WebCore::IntRect&) final;
+ void invalidateContentsAndRootView(const WebCore::IntRect&) final;
+ void invalidateContentsForSlowScroll(const WebCore::IntRect&) final;
+ void scroll(const WebCore::IntSize& scrollDelta, const WebCore::IntRect& rectToScroll, const WebCore::IntRect& clipRect) final;
</ins><span class="cx">
</span><del>- WebCore::IntPoint screenToRootView(const WebCore::IntPoint&) const override;
- WebCore::IntRect rootViewToScreen(const WebCore::IntRect&) const override;
</del><ins>+ WebCore::IntPoint screenToRootView(const WebCore::IntPoint&) const final;
+ WebCore::IntRect rootViewToScreen(const WebCore::IntRect&) const final;
+
</ins><span class="cx"> #if PLATFORM(IOS)
</span><del>- WebCore::IntPoint accessibilityScreenToRootView(const WebCore::IntPoint&) const override;
- WebCore::IntRect rootViewToAccessibilityScreen(const WebCore::IntRect&) const override;
</del><ins>+ WebCore::IntPoint accessibilityScreenToRootView(const WebCore::IntPoint&) const final;
+ WebCore::IntRect rootViewToAccessibilityScreen(const WebCore::IntRect&) const final;
</ins><span class="cx"> #endif
</span><del>- PlatformPageClient platformPageClient() const override;
- void contentsSizeChanged(WebCore::Frame*, const WebCore::IntSize&) const override;
- void scrollRectIntoView(const WebCore::IntRect&) const override;
-
</del><ins>+
+ PlatformPageClient platformPageClient() const final;
+ void contentsSizeChanged(WebCore::Frame*, const WebCore::IntSize&) const final;
+ void scrollRectIntoView(const WebCore::IntRect&) const final;
+
</ins><span class="cx"> void setStatusbarText(const WTF::String&) override;
</span><span class="cx">
</span><del>- void scrollbarsModeDidChange() const override { }
- bool shouldUnavailablePluginMessageBeButton(WebCore::RenderEmbeddedObject::PluginUnavailabilityReason) const override;
- void unavailablePluginButtonClicked(WebCore::Element*, WebCore::RenderEmbeddedObject::PluginUnavailabilityReason) const override;
- void mouseDidMoveOverElement(const WebCore::HitTestResult&, unsigned modifierFlags) override;
</del><ins>+ void scrollbarsModeDidChange() const final { }
+ bool shouldUnavailablePluginMessageBeButton(WebCore::RenderEmbeddedObject::PluginUnavailabilityReason) const final;
+ void unavailablePluginButtonClicked(WebCore::Element*, WebCore::RenderEmbeddedObject::PluginUnavailabilityReason) const final;
+ void mouseDidMoveOverElement(const WebCore::HitTestResult&, unsigned modifierFlags) final;
</ins><span class="cx">
</span><del>- void setToolTip(const WTF::String&, WebCore::TextDirection) override;
</del><ins>+ void setToolTip(const WTF::String&, WebCore::TextDirection) final;
</ins><span class="cx">
</span><del>- void print(WebCore::Frame*) override;
- void exceededDatabaseQuota(WebCore::Frame*, const WTF::String& databaseName, WebCore::DatabaseDetails) override;
- void reachedMaxAppCacheSize(int64_t spaceNeeded) override;
- void reachedApplicationCacheOriginQuota(WebCore::SecurityOrigin*, int64_t totalSpaceNeeded) override;
</del><ins>+ void print(WebCore::Frame*) final;
+ void exceededDatabaseQuota(WebCore::Frame*, const WTF::String& databaseName, WebCore::DatabaseDetails) final;
+ void reachedMaxAppCacheSize(int64_t spaceNeeded) final;
+ void reachedApplicationCacheOriginQuota(WebCore::SecurityOrigin*, int64_t totalSpaceNeeded) final;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(DASHBOARD_SUPPORT)
</span><del>- void annotatedRegionsChanged() override;
</del><ins>+ void annotatedRegionsChanged() final;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- void runOpenPanel(WebCore::Frame*, PassRefPtr<WebCore::FileChooser>) override;
- void loadIconForFiles(const Vector<WTF::String>&, WebCore::FileIconLoader&) override;
</del><ins>+ void runOpenPanel(WebCore::Frame&, WebCore::FileChooser&) override;
+ void loadIconForFiles(const Vector<WTF::String>&, WebCore::FileIconLoader&) final;
</ins><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><del>- void setCursor(const WebCore::Cursor&) override;
- void setCursorHiddenUntilMouseMoves(bool) override;
</del><ins>+ void setCursor(const WebCore::Cursor&) final;
+ void setCursorHiddenUntilMouseMoves(bool) final;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INPUT_TYPE_COLOR)
</span><del>- std::unique_ptr<WebCore::ColorChooser> createColorChooser(WebCore::ColorChooserClient*, const WebCore::Color&) override;
</del><ins>+ std::unique_ptr<WebCore::ColorChooser> createColorChooser(WebCore::ColorChooserClient*, const WebCore::Color&) final;
</ins><span class="cx"> #endif
</span><del>-
</del><ins>+
</ins><span class="cx"> #if ENABLE(POINTER_LOCK)
</span><del>- bool requestPointerLock() override;
- void requestPointerUnlock() override;
</del><ins>+ bool requestPointerLock() final;
+ void requestPointerUnlock() final;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- WebCore::KeyboardUIMode keyboardUIMode() override;
</del><ins>+ WebCore::KeyboardUIMode keyboardUIMode() final;
</ins><span class="cx">
</span><del>- NSResponder *firstResponder() override;
- void makeFirstResponder(NSResponder *) override;
</del><ins>+ NSResponder *firstResponder() final;
+ void makeFirstResponder(NSResponder *) final;
</ins><span class="cx">
</span><del>- void enableSuddenTermination() override;
- void disableSuddenTermination() override;
-
- bool shouldReplaceWithGeneratedFileForUpload(const WTF::String& path, WTF::String &generatedFilename) override;
- WTF::String generateReplacementFile(const WTF::String& path) override;
</del><ins>+ void enableSuddenTermination() final;
+ void disableSuddenTermination() final;
</ins><span class="cx">
</span><ins>+ bool shouldReplaceWithGeneratedFileForUpload(const WTF::String& path, WTF::String &generatedFilename) final;
+ WTF::String generateReplacementFile(const WTF::String& path) final;
+
</ins><span class="cx"> void elementDidFocus(const WebCore::Node*) override;
</span><span class="cx"> void elementDidBlur(const WebCore::Node*) override;
</span><span class="cx">
</span><del>- bool shouldPaintEntireContents() const override;
</del><ins>+ bool shouldPaintEntireContents() const final;
</ins><span class="cx">
</span><span class="cx"> void attachRootGraphicsLayer(WebCore::Frame*, WebCore::GraphicsLayer*) override;
</span><del>- void attachViewOverlayGraphicsLayer(WebCore::Frame*, WebCore::GraphicsLayer*) override;
- void setNeedsOneShotDrawingSynchronization() override;
- void scheduleCompositingLayerFlush() override;
</del><ins>+ void attachViewOverlayGraphicsLayer(WebCore::Frame*, WebCore::GraphicsLayer*) final;
+ void setNeedsOneShotDrawingSynchronization() final;
+ void scheduleCompositingLayerFlush() final;
</ins><span class="cx">
</span><del>- CompositingTriggerFlags allowedCompositingTriggers() const override
</del><ins>+ CompositingTriggerFlags allowedCompositingTriggers() const final
</ins><span class="cx"> {
</span><span class="cx"> return static_cast<CompositingTriggerFlags>(
</span><span class="cx"> ThreeDTransformTrigger |
</span><span class="lines">@@ -169,52 +177,49 @@
</span><span class="cx"> AnimationTrigger);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(VIDEO) && PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
+ void setUpPlaybackControlsManager(WebCore::HTMLMediaElement&) final;
+ void clearPlaybackControlsManager() final;
+#endif
+
</ins><span class="cx"> #if ENABLE(VIDEO)
</span><del>-#if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
- void setUpPlaybackControlsManager(WebCore::HTMLMediaElement&) override;
- void clearPlaybackControlsManager() override;
</del><ins>+ bool supportsVideoFullscreen(WebCore::HTMLMediaElementEnums::VideoFullscreenMode) final;
+ void enterVideoFullscreenForVideoElement(WebCore::HTMLVideoElement&, WebCore::HTMLMediaElementEnums::VideoFullscreenMode) final;
+ void exitVideoFullscreenForVideoElement(WebCore::HTMLVideoElement&) final;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- bool supportsVideoFullscreen(WebCore::HTMLMediaElementEnums::VideoFullscreenMode) override;
- void enterVideoFullscreenForVideoElement(WebCore::HTMLVideoElement&, WebCore::HTMLMediaElementEnums::VideoFullscreenMode) override;
- void exitVideoFullscreenForVideoElement(WebCore::HTMLVideoElement&) override;
-#endif
-
</del><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span><del>- bool supportsFullScreenForElement(const WebCore::Element*, bool withKeyboard) override;
- void enterFullScreenForElement(WebCore::Element*) override;
- void exitFullScreenForElement(WebCore::Element*) override;
</del><ins>+ bool supportsFullScreenForElement(const WebCore::Element*, bool withKeyboard) final;
+ void enterFullScreenForElement(WebCore::Element*) final;
+ void exitFullScreenForElement(WebCore::Element*) final;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> bool selectItemWritingDirectionIsNatural() override;
</span><span class="cx"> bool selectItemAlignmentFollowsMenuWritingDirection() override;
</span><del>- bool hasOpenedPopup() const override;
</del><ins>+ bool hasOpenedPopup() const final;
</ins><span class="cx"> RefPtr<WebCore::PopupMenu> createPopupMenu(WebCore::PopupMenuClient*) const override;
</span><span class="cx"> RefPtr<WebCore::SearchPopupMenu> createSearchPopupMenu(WebCore::PopupMenuClient*) const override;
</span><span class="cx">
</span><del>- void wheelEventHandlersChanged(bool) override { }
</del><ins>+ void wheelEventHandlersChanged(bool) final { }
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(SUBTLE_CRYPTO)
</span><del>- bool wrapCryptoKey(const Vector<uint8_t>&, Vector<uint8_t>&) const override;
- bool unwrapCryptoKey(const Vector<uint8_t>&, Vector<uint8_t>&) const override;
</del><ins>+ bool wrapCryptoKey(const Vector<uint8_t>&, Vector<uint8_t>&) const final;
+ bool unwrapCryptoKey(const Vector<uint8_t>&, Vector<uint8_t>&) const final;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SERVICE_CONTROLS)
</span><del>- void handleSelectionServiceClick(WebCore::FrameSelection&, const Vector<String>& telephoneNumbers, const WebCore::IntPoint&) override;
- bool hasRelevantSelectionServices(bool isTextOnly) const override;
</del><ins>+ void handleSelectionServiceClick(WebCore::FrameSelection&, const Vector<String>& telephoneNumbers, const WebCore::IntPoint&) final;
+ bool hasRelevantSelectionServices(bool isTextOnly) const final;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- WebView* webView() const { return m_webView; }
-
</del><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS)
</span><del>- void addPlaybackTargetPickerClient(uint64_t /*contextId*/) override;
- void removePlaybackTargetPickerClient(uint64_t /*contextId*/) override;
- void showPlaybackTargetPicker(uint64_t /*contextId*/, const WebCore::IntPoint&, bool /* hasVideo */) override;
- void playbackTargetPickerClientStateDidChange(uint64_t /*contextId*/, WebCore::MediaProducer::MediaStateFlags) override;
- void setMockMediaPlaybackTargetPickerEnabled(bool) override;
- void setMockMediaPlaybackTargetPickerState(const String&, WebCore::MediaPlaybackTargetContext::State) override;
</del><ins>+ void addPlaybackTargetPickerClient(uint64_t /*contextId*/) final;
+ void removePlaybackTargetPickerClient(uint64_t /*contextId*/) final;
+ void showPlaybackTargetPicker(uint64_t /*contextId*/, const WebCore::IntPoint&, bool /* hasVideo */) final;
+ void playbackTargetPickerClientStateDidChange(uint64_t /*contextId*/, WebCore::MediaProducer::MediaStateFlags) final;
+ void setMockMediaPlaybackTargetPickerEnabled(bool) final;
+ void setMockMediaPlaybackTargetPickerState(const String&, WebCore::MediaPlaybackTargetContext::State) final;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>-private:
</del><span class="cx"> WebView *m_webView;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebChromeClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -741,10 +741,10 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-void WebChromeClient::runOpenPanel(Frame*, PassRefPtr<FileChooser> chooser)
</del><ins>+void WebChromeClient::runOpenPanel(Frame&, FileChooser& chooser)
</ins><span class="cx"> {
</span><span class="cx"> BEGIN_BLOCK_OBJC_EXCEPTIONS;
</span><del>- BOOL allowMultipleFiles = chooser->settings().allowsMultipleFiles;
</del><ins>+ BOOL allowMultipleFiles = chooser.settings().allowsMultipleFiles;
</ins><span class="cx"> WebOpenPanelResultListener *listener = [[WebOpenPanelResultListener alloc] initWithChooser:chooser];
</span><span class="cx"> id delegate = [m_webView UIDelegate];
</span><span class="cx"> if ([delegate respondsToSelector:@selector(webView:runOpenPanelForFileButtonWithResultListener:allowMultipleFiles:)])
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebEditorClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.h (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.h 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.h 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -115,8 +115,8 @@
</span><span class="cx"> void discardedComposition(WebCore::Frame*) final;
</span><span class="cx"> void canceledComposition() final;
</span><span class="cx">
</span><del>- void registerUndoStep(PassRefPtr<WebCore::UndoStep>) final;
- void registerRedoStep(PassRefPtr<WebCore::UndoStep>) final;
</del><ins>+ void registerUndoStep(WebCore::UndoStep&) final;
+ void registerRedoStep(WebCore::UndoStep&) final;
</ins><span class="cx"> void clearUndoRedoOperations() final;
</span><span class="cx">
</span><span class="cx"> bool canCopyCut(WebCore::Frame*, bool defaultValue) const final;
</span><span class="lines">@@ -174,7 +174,7 @@
</span><span class="cx"> void handleAcceptedCandidateWithSoftSpaces(WebCore::TextCheckingResult) final;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- void registerUndoOrRedoStep(PassRefPtr<WebCore::UndoStep>, bool isRedo);
</del><ins>+ void registerUndoOrRedoStep(WebCore::UndoStep&, bool isRedo);
</ins><span class="cx">
</span><span class="cx"> WebView *m_webView;
</span><span class="cx"> RetainPtr<WebEditorUndoTarget> m_undoTarget;
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebEditorClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -119,8 +119,8 @@
</span><span class="cx"> RefPtr<UndoStep> m_step;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-+ (WebUndoStep *)stepWithUndoStep:(PassRefPtr<UndoStep>)step;
-- (UndoStep *)step;
</del><ins>++ (WebUndoStep *)stepWithUndoStep:(UndoStep&)step;
+- (UndoStep&)step;
</ins><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="lines">@@ -135,13 +135,12 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (id)initWithUndoStep:(PassRefPtr<UndoStep>)step
</del><ins>+- (id)initWithUndoStep:(UndoStep&)step
</ins><span class="cx"> {
</span><del>- ASSERT(step);
</del><span class="cx"> self = [super init];
</span><span class="cx"> if (!self)
</span><span class="cx"> return nil;
</span><del>- m_step = step;
</del><ins>+ m_step = &step;
</ins><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -153,14 +152,14 @@
</span><span class="cx"> [super dealloc];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-+ (WebUndoStep *)stepWithUndoStep:(PassRefPtr<UndoStep>)step
</del><ins>++ (WebUndoStep *)stepWithUndoStep:(UndoStep&)step
</ins><span class="cx"> {
</span><span class="cx"> return [[[WebUndoStep alloc] initWithUndoStep:step] autorelease];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (UndoStep *)step
</del><ins>+- (UndoStep&)step
</ins><span class="cx"> {
</span><del>- return m_step.get();
</del><ins>+ return *m_step;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="lines">@@ -177,13 +176,13 @@
</span><span class="cx"> - (void)undoEditing:(id)arg
</span><span class="cx"> {
</span><span class="cx"> ASSERT([arg isKindOfClass:[WebUndoStep class]]);
</span><del>- [arg step]->unapply();
</del><ins>+ [arg step].unapply();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)redoEditing:(id)arg
</span><span class="cx"> {
</span><span class="cx"> ASSERT([arg isKindOfClass:[WebUndoStep class]]);
</span><del>- [arg step]->reapply();
</del><ins>+ [arg step].reapply();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="lines">@@ -642,10 +641,8 @@
</span><span class="cx"> return nil;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebEditorClient::registerUndoOrRedoStep(PassRefPtr<UndoStep> step, bool isRedo)
</del><ins>+void WebEditorClient::registerUndoOrRedoStep(UndoStep& step, bool isRedo)
</ins><span class="cx"> {
</span><del>- ASSERT(step);
-
</del><span class="cx"> NSUndoManager *undoManager = [m_webView undoManager];
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="lines">@@ -656,7 +653,7 @@
</span><span class="cx"> return;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- NSString *actionName = undoNameForEditAction(step->editingAction());
</del><ins>+ NSString *actionName = undoNameForEditAction(step.editingAction());
</ins><span class="cx"> WebUndoStep *webEntry = [WebUndoStep stepWithUndoStep:step];
</span><span class="cx"> [undoManager registerUndoWithTarget:m_undoTarget.get() selector:(isRedo ? @selector(redoEditing:) : @selector(undoEditing:)) object:webEntry];
</span><span class="cx"> if (actionName)
</span><span class="lines">@@ -684,12 +681,12 @@
</span><span class="cx"> [m_webView updateTouchBar];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebEditorClient::registerUndoStep(PassRefPtr<UndoStep> cmd)
</del><ins>+void WebEditorClient::registerUndoStep(UndoStep& cmd)
</ins><span class="cx"> {
</span><span class="cx"> registerUndoOrRedoStep(cmd, false);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebEditorClient::registerRedoStep(PassRefPtr<UndoStep> cmd)
</del><ins>+void WebEditorClient::registerRedoStep(UndoStep& cmd)
</ins><span class="cx"> {
</span><span class="cx"> registerUndoOrRedoStep(cmd, true);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2006-2016 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2006-2017 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -58,202 +58,202 @@
</span><span class="cx"> WebFrame* webFrame() const { return m_webFrame.get(); }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- void frameLoaderDestroyed() override;
- bool hasWebView() const override; // mainly for assertions
</del><ins>+ void frameLoaderDestroyed() final;
+ bool hasWebView() const final; // mainly for assertions
</ins><span class="cx">
</span><del>- void makeRepresentation(WebCore::DocumentLoader*) override;
- bool hasHTMLView() const override;
</del><ins>+ void makeRepresentation(WebCore::DocumentLoader*) final;
+ bool hasHTMLView() const final;
</ins><span class="cx"> #if PLATFORM(IOS)
</span><del>- bool forceLayoutOnRestoreFromPageCache() override;
</del><ins>+ bool forceLayoutOnRestoreFromPageCache() final;
</ins><span class="cx"> #endif
</span><del>- void forceLayoutForNonHTML() override;
</del><ins>+ void forceLayoutForNonHTML() final;
</ins><span class="cx">
</span><del>- void setCopiesOnScroll() override;
</del><ins>+ void setCopiesOnScroll() final;
</ins><span class="cx">
</span><del>- void detachedFromParent2() override;
- void detachedFromParent3() override;
</del><ins>+ void detachedFromParent2() final;
+ void detachedFromParent3() final;
</ins><span class="cx">
</span><del>- void convertMainResourceLoadToDownload(WebCore::DocumentLoader*, WebCore::SessionID, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&) override;
</del><ins>+ void convertMainResourceLoadToDownload(WebCore::DocumentLoader*, WebCore::SessionID, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&) final;
</ins><span class="cx">
</span><del>- void assignIdentifierToInitialRequest(unsigned long identifier, WebCore::DocumentLoader*, const WebCore::ResourceRequest&) override;
</del><ins>+ void assignIdentifierToInitialRequest(unsigned long identifier, WebCore::DocumentLoader*, const WebCore::ResourceRequest&) final;
</ins><span class="cx">
</span><del>- void dispatchWillSendRequest(WebCore::DocumentLoader*, unsigned long identifier, WebCore::ResourceRequest&, const WebCore::ResourceResponse& redirectResponse) override;
- bool shouldUseCredentialStorage(WebCore::DocumentLoader*, unsigned long identifier) override;
- void dispatchDidReceiveAuthenticationChallenge(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::AuthenticationChallenge&) override;
</del><ins>+ void dispatchWillSendRequest(WebCore::DocumentLoader*, unsigned long identifier, WebCore::ResourceRequest&, const WebCore::ResourceResponse& redirectResponse) final;
+ bool shouldUseCredentialStorage(WebCore::DocumentLoader*, unsigned long identifier) final;
+ void dispatchDidReceiveAuthenticationChallenge(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::AuthenticationChallenge&) final;
</ins><span class="cx"> #if USE(PROTECTION_SPACE_AUTH_CALLBACK)
</span><del>- bool canAuthenticateAgainstProtectionSpace(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::ProtectionSpace&) override;
</del><ins>+ bool canAuthenticateAgainstProtectionSpace(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::ProtectionSpace&) final;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- RetainPtr<CFDictionaryRef> connectionProperties(WebCore::DocumentLoader*, unsigned long identifier) override;
</del><ins>+ RetainPtr<CFDictionaryRef> connectionProperties(WebCore::DocumentLoader*, unsigned long identifier) final;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- void dispatchDidReceiveResponse(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::ResourceResponse&) override;
- void dispatchDidReceiveContentLength(WebCore::DocumentLoader*, unsigned long identifier, int dataLength) override;
- void dispatchDidFinishLoading(WebCore::DocumentLoader*, unsigned long identifier) override;
</del><ins>+ void dispatchDidReceiveResponse(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::ResourceResponse&) final;
+ void dispatchDidReceiveContentLength(WebCore::DocumentLoader*, unsigned long identifier, int dataLength) final;
+ void dispatchDidFinishLoading(WebCore::DocumentLoader*, unsigned long identifier) final;
</ins><span class="cx"> #if ENABLE(DATA_DETECTION)
</span><del>- void dispatchDidFinishDataDetection(NSArray *detectionResults) override;
</del><ins>+ void dispatchDidFinishDataDetection(NSArray *detectionResults) final;
</ins><span class="cx"> #endif
</span><del>- void dispatchDidFailLoading(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::ResourceError&) override;
</del><ins>+ void dispatchDidFailLoading(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::ResourceError&) final;
</ins><span class="cx">
</span><del>- NSCachedURLResponse* willCacheResponse(WebCore::DocumentLoader*, unsigned long identifier, NSCachedURLResponse*) const override;
</del><ins>+ NSCachedURLResponse* willCacheResponse(WebCore::DocumentLoader*, unsigned long identifier, NSCachedURLResponse*) const final;
</ins><span class="cx">
</span><del>- void dispatchDidDispatchOnloadEvents() override;
- void dispatchDidReceiveServerRedirectForProvisionalLoad() override;
- void dispatchDidCancelClientRedirect() override;
- void dispatchWillPerformClientRedirect(const WebCore::URL&, double interval, double fireDate) override;
- void dispatchDidChangeLocationWithinPage() override;
- void dispatchDidPushStateWithinPage() override;
- void dispatchDidReplaceStateWithinPage() override;
- void dispatchDidPopStateWithinPage() override;
</del><ins>+ void dispatchDidDispatchOnloadEvents() final;
+ void dispatchDidReceiveServerRedirectForProvisionalLoad() final;
+ void dispatchDidCancelClientRedirect() final;
+ void dispatchWillPerformClientRedirect(const WebCore::URL&, double interval, double fireDate) final;
+ void dispatchDidChangeLocationWithinPage() final;
+ void dispatchDidPushStateWithinPage() final;
+ void dispatchDidReplaceStateWithinPage() final;
+ void dispatchDidPopStateWithinPage() final;
</ins><span class="cx">
</span><del>- void dispatchWillClose() override;
- void dispatchDidReceiveIcon() override;
- void dispatchDidStartProvisionalLoad() override;
- void dispatchDidReceiveTitle(const WebCore::StringWithDirection&) override;
- void dispatchDidCommitLoad(std::optional<WebCore::HasInsecureContent>) override;
- void dispatchDidFailProvisionalLoad(const WebCore::ResourceError&) override;
- void dispatchDidFailLoad(const WebCore::ResourceError&) override;
- void dispatchDidFinishDocumentLoad() override;
- void dispatchDidFinishLoad() override;
- void dispatchDidReachLayoutMilestone(WebCore::LayoutMilestones) override;
</del><ins>+ void dispatchWillClose() final;
+ void dispatchDidReceiveIcon() final;
+ void dispatchDidStartProvisionalLoad() final;
+ void dispatchDidReceiveTitle(const WebCore::StringWithDirection&) final;
+ void dispatchDidCommitLoad(std::optional<WebCore::HasInsecureContent>) final;
+ void dispatchDidFailProvisionalLoad(const WebCore::ResourceError&) final;
+ void dispatchDidFailLoad(const WebCore::ResourceError&) final;
+ void dispatchDidFinishDocumentLoad() final;
+ void dispatchDidFinishLoad() final;
+ void dispatchDidReachLayoutMilestone(WebCore::LayoutMilestones) final;
</ins><span class="cx">
</span><del>- WebCore::Frame* dispatchCreatePage(const WebCore::NavigationAction&) override;
- void dispatchShow() override;
</del><ins>+ WebCore::Frame* dispatchCreatePage(const WebCore::NavigationAction&) final;
+ void dispatchShow() final;
</ins><span class="cx">
</span><del>- void dispatchDecidePolicyForResponse(const WebCore::ResourceResponse&, const WebCore::ResourceRequest&, WebCore::FramePolicyFunction) override;
- void dispatchDecidePolicyForNewWindowAction(const WebCore::NavigationAction&, const WebCore::ResourceRequest&, PassRefPtr<WebCore::FormState>, const WTF::String& frameName, WebCore::FramePolicyFunction) override;
- void dispatchDecidePolicyForNavigationAction(const WebCore::NavigationAction&, const WebCore::ResourceRequest&, PassRefPtr<WebCore::FormState>, WebCore::FramePolicyFunction) override;
- void cancelPolicyCheck() override;
</del><ins>+ void dispatchDecidePolicyForResponse(const WebCore::ResourceResponse&, const WebCore::ResourceRequest&, WebCore::FramePolicyFunction) final;
+ void dispatchDecidePolicyForNewWindowAction(const WebCore::NavigationAction&, const WebCore::ResourceRequest&, WebCore::FormState*, const WTF::String& frameName, WebCore::FramePolicyFunction) final;
+ void dispatchDecidePolicyForNavigationAction(const WebCore::NavigationAction&, const WebCore::ResourceRequest&, WebCore::FormState*, WebCore::FramePolicyFunction) final;
+ void cancelPolicyCheck() final;
</ins><span class="cx">
</span><del>- void dispatchUnableToImplementPolicy(const WebCore::ResourceError&) override;
</del><ins>+ void dispatchUnableToImplementPolicy(const WebCore::ResourceError&) final;
</ins><span class="cx">
</span><del>- void dispatchWillSendSubmitEvent(PassRefPtr<WebCore::FormState>) override;
- void dispatchWillSubmitForm(PassRefPtr<WebCore::FormState>, WebCore::FramePolicyFunction) override;
</del><ins>+ void dispatchWillSendSubmitEvent(Ref<WebCore::FormState>&&) final;
+ void dispatchWillSubmitForm(WebCore::FormState&, WebCore::FramePolicyFunction) final;
</ins><span class="cx">
</span><del>- void revertToProvisionalState(WebCore::DocumentLoader*) override;
- void setMainDocumentError(WebCore::DocumentLoader*, const WebCore::ResourceError&) override;
- bool dispatchDidLoadResourceFromMemoryCache(WebCore::DocumentLoader*, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&, int length) override;
</del><ins>+ void revertToProvisionalState(WebCore::DocumentLoader*) final;
+ void setMainDocumentError(WebCore::DocumentLoader*, const WebCore::ResourceError&) final;
+ bool dispatchDidLoadResourceFromMemoryCache(WebCore::DocumentLoader*, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&, int length) final;
</ins><span class="cx">
</span><del>- void setMainFrameDocumentReady(bool) override;
</del><ins>+ void setMainFrameDocumentReady(bool) final;
</ins><span class="cx">
</span><del>- void startDownload(const WebCore::ResourceRequest&, const String& suggestedName = String()) override;
</del><ins>+ void startDownload(const WebCore::ResourceRequest&, const String& suggestedName = String()) final;
</ins><span class="cx">
</span><del>- void willChangeTitle(WebCore::DocumentLoader*) override;
- void didChangeTitle(WebCore::DocumentLoader*) override;
</del><ins>+ void willChangeTitle(WebCore::DocumentLoader*) final;
+ void didChangeTitle(WebCore::DocumentLoader*) final;
</ins><span class="cx">
</span><del>- void willReplaceMultipartContent() override { }
- void didReplaceMultipartContent() override;
</del><ins>+ void willReplaceMultipartContent() final { }
+ void didReplaceMultipartContent() final;
</ins><span class="cx">
</span><del>- void committedLoad(WebCore::DocumentLoader*, const char*, int) override;
- void finishedLoading(WebCore::DocumentLoader*) override;
- void updateGlobalHistory() override;
- void updateGlobalHistoryRedirectLinks() override;
</del><ins>+ void committedLoad(WebCore::DocumentLoader*, const char*, int) final;
+ void finishedLoading(WebCore::DocumentLoader*) final;
+ void updateGlobalHistory() final;
+ void updateGlobalHistoryRedirectLinks() final;
</ins><span class="cx">
</span><del>- bool shouldGoToHistoryItem(WebCore::HistoryItem*) const override;
- void updateGlobalHistoryItemForPage() override;
</del><ins>+ bool shouldGoToHistoryItem(WebCore::HistoryItem*) const final;
+ void updateGlobalHistoryItemForPage() final;
</ins><span class="cx">
</span><del>- void didDisplayInsecureContent() override;
- void didRunInsecureContent(WebCore::SecurityOrigin*, const WebCore::URL&) override;
- void didDetectXSS(const WebCore::URL&, bool didBlockEntirePage) override;
</del><ins>+ void didDisplayInsecureContent() final;
+ void didRunInsecureContent(WebCore::SecurityOrigin*, const WebCore::URL&) final;
+ void didDetectXSS(const WebCore::URL&, bool didBlockEntirePage) final;
</ins><span class="cx">
</span><del>- WebCore::ResourceError cancelledError(const WebCore::ResourceRequest&) override;
- WebCore::ResourceError blockedError(const WebCore::ResourceRequest&) override;
- WebCore::ResourceError blockedByContentBlockerError(const WebCore::ResourceRequest&) override;
- WebCore::ResourceError cannotShowURLError(const WebCore::ResourceRequest&) override;
- WebCore::ResourceError interruptedForPolicyChangeError(const WebCore::ResourceRequest&) override;
</del><ins>+ WebCore::ResourceError cancelledError(const WebCore::ResourceRequest&) final;
+ WebCore::ResourceError blockedError(const WebCore::ResourceRequest&) final;
+ WebCore::ResourceError blockedByContentBlockerError(const WebCore::ResourceRequest&) final;
+ WebCore::ResourceError cannotShowURLError(const WebCore::ResourceRequest&) final;
+ WebCore::ResourceError interruptedForPolicyChangeError(const WebCore::ResourceRequest&) final;
</ins><span class="cx"> #if ENABLE(CONTENT_FILTERING)
</span><del>- WebCore::ResourceError blockedByContentFilterError(const WebCore::ResourceRequest&) override;
</del><ins>+ WebCore::ResourceError blockedByContentFilterError(const WebCore::ResourceRequest&) final;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- WebCore::ResourceError cannotShowMIMETypeError(const WebCore::ResourceResponse&) override;
- WebCore::ResourceError fileDoesNotExistError(const WebCore::ResourceResponse&) override;
- WebCore::ResourceError pluginWillHandleLoadError(const WebCore::ResourceResponse&) override;
</del><ins>+ WebCore::ResourceError cannotShowMIMETypeError(const WebCore::ResourceResponse&) final;
+ WebCore::ResourceError fileDoesNotExistError(const WebCore::ResourceResponse&) final;
+ WebCore::ResourceError pluginWillHandleLoadError(const WebCore::ResourceResponse&) final;
</ins><span class="cx">
</span><del>- bool shouldFallBack(const WebCore::ResourceError&) override;
</del><ins>+ bool shouldFallBack(const WebCore::ResourceError&) final;
</ins><span class="cx">
</span><del>- WTF::String userAgent(const WebCore::URL&) override;
</del><ins>+ WTF::String userAgent(const WebCore::URL&) final;
</ins><span class="cx">
</span><del>- void savePlatformDataToCachedFrame(WebCore::CachedFrame*) override;
- void transitionToCommittedFromCachedFrame(WebCore::CachedFrame*) override;
</del><ins>+ void savePlatformDataToCachedFrame(WebCore::CachedFrame*) final;
+ void transitionToCommittedFromCachedFrame(WebCore::CachedFrame*) final;
</ins><span class="cx"> #if PLATFORM(IOS)
</span><del>- void didRestoreFrameHierarchyForCachedFrame() override;
</del><ins>+ void didRestoreFrameHierarchyForCachedFrame() final;
</ins><span class="cx"> #endif
</span><del>- void transitionToCommittedForNewPage() override;
</del><ins>+ void transitionToCommittedForNewPage() final;
</ins><span class="cx">
</span><del>- void didSaveToPageCache() override;
- void didRestoreFromPageCache() override;
</del><ins>+ void didSaveToPageCache() final;
+ void didRestoreFromPageCache() final;
</ins><span class="cx">
</span><del>- void dispatchDidBecomeFrameset(bool) override;
</del><ins>+ void dispatchDidBecomeFrameset(bool) final;
</ins><span class="cx">
</span><del>- bool canHandleRequest(const WebCore::ResourceRequest&) const override;
- bool canShowMIMEType(const WTF::String& MIMEType) const override;
- bool canShowMIMETypeAsHTML(const WTF::String& MIMEType) const override;
- bool representationExistsForURLScheme(const WTF::String& URLScheme) const override;
- WTF::String generatedMIMETypeForURLScheme(const WTF::String& URLScheme) const override;
</del><ins>+ bool canHandleRequest(const WebCore::ResourceRequest&) const final;
+ bool canShowMIMEType(const WTF::String& MIMEType) const final;
+ bool canShowMIMETypeAsHTML(const WTF::String& MIMEType) const final;
+ bool representationExistsForURLScheme(const WTF::String& URLScheme) const final;
+ WTF::String generatedMIMETypeForURLScheme(const WTF::String& URLScheme) const final;
</ins><span class="cx">
</span><del>- void frameLoadCompleted() override;
- void saveViewStateToItem(WebCore::HistoryItem&) override;
- void restoreViewState() override;
- void provisionalLoadStarted() override;
- void didFinishLoad() override;
- void prepareForDataSourceReplacement() override;
- Ref<WebCore::DocumentLoader> createDocumentLoader(const WebCore::ResourceRequest&, const WebCore::SubstituteData&) override;
- void updateCachedDocumentLoader(WebCore::DocumentLoader&) override { }
</del><ins>+ void frameLoadCompleted() final;
+ void saveViewStateToItem(WebCore::HistoryItem&) final;
+ void restoreViewState() final;
+ void provisionalLoadStarted() final;
+ void didFinishLoad() final;
+ void prepareForDataSourceReplacement() final;
+ Ref<WebCore::DocumentLoader> createDocumentLoader(const WebCore::ResourceRequest&, const WebCore::SubstituteData&) final;
+ void updateCachedDocumentLoader(WebCore::DocumentLoader&) final { }
</ins><span class="cx">
</span><del>- void setTitle(const WebCore::StringWithDirection&, const WebCore::URL&) override;
</del><ins>+ void setTitle(const WebCore::StringWithDirection&, const WebCore::URL&) final;
</ins><span class="cx">
</span><del>- RefPtr<WebCore::Frame> createFrame(const WebCore::URL&, const WTF::String& name, WebCore::HTMLFrameOwnerElement*,
- const WTF::String& referrer, bool allowsScrolling, int marginWidth, int marginHeight) override;
- RefPtr<WebCore::Widget> createPlugin(const WebCore::IntSize&, WebCore::HTMLPlugInElement*, const WebCore::URL&, const Vector<WTF::String>&,
- const Vector<WTF::String>&, const WTF::String&, bool) override;
- void recreatePlugin(WebCore::Widget*) override;
- void redirectDataToPlugin(WebCore::Widget* pluginWidget) override;
</del><ins>+ RefPtr<WebCore::Frame> createFrame(const WebCore::URL&, const WTF::String& name, WebCore::HTMLFrameOwnerElement&,
+ const WTF::String& referrer, bool allowsScrolling, int marginWidth, int marginHeight) final;
+ RefPtr<WebCore::Widget> createPlugin(const WebCore::IntSize&, WebCore::HTMLPlugInElement&, const WebCore::URL&,
+ const Vector<WTF::String>&, const Vector<WTF::String>&, const WTF::String&, bool) final;
+ void recreatePlugin(WebCore::Widget*) final;
+ void redirectDataToPlugin(WebCore::Widget* pluginWidget) final;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(WEBGL)
</span><del>- WebCore::WebGLLoadPolicy webGLPolicyForURL(const String&) const override;
- WebCore::WebGLLoadPolicy resolveWebGLPolicyForURL(const String&) const override;
-#endif // ENABLE(WEBGL)
</del><ins>+ WebCore::WebGLLoadPolicy webGLPolicyForURL(const String&) const final;
+ WebCore::WebGLLoadPolicy resolveWebGLPolicyForURL(const String&) const final;
+#endif
</ins><span class="cx">
</span><del>- PassRefPtr<WebCore::Widget> createJavaAppletWidget(const WebCore::IntSize&, WebCore::HTMLAppletElement*, const WebCore::URL& baseURL,
- const Vector<WTF::String>& paramNames, const Vector<WTF::String>& paramValues) override;
</del><ins>+ RefPtr<WebCore::Widget> createJavaAppletWidget(const WebCore::IntSize&, WebCore::HTMLAppletElement&, const WebCore::URL& baseURL,
+ const Vector<WTF::String>& paramNames, const Vector<WTF::String>& paramValues) final;
</ins><span class="cx">
</span><del>- WebCore::ObjectContentType objectContentType(const WebCore::URL&, const WTF::String& mimeType) override;
- WTF::String overrideMediaType() const override;
</del><ins>+ WebCore::ObjectContentType objectContentType(const WebCore::URL&, const WTF::String& mimeType) final;
+ WTF::String overrideMediaType() const final;
</ins><span class="cx">
</span><del>- void dispatchDidClearWindowObjectInWorld(WebCore::DOMWrapperWorld&) override;
</del><ins>+ void dispatchDidClearWindowObjectInWorld(WebCore::DOMWrapperWorld&) final;
</ins><span class="cx">
</span><del>- void registerForIconNotification(bool listen) override;
</del><ins>+ void registerForIconNotification(bool listen) final;
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- bool shouldLoadMediaElementURL(const WebCore::URL&) const override;
</del><ins>+ bool shouldLoadMediaElementURL(const WebCore::URL&) const final;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- RemoteAXObjectRef accessibilityRemoteObject() override { return 0; }
</del><ins>+ RemoteAXObjectRef accessibilityRemoteObject() final { return 0; }
</ins><span class="cx">
</span><span class="cx"> RetainPtr<WebFramePolicyListener> setUpPolicyListener(WebCore::FramePolicyFunction, NSURL *appLinkURL = nil);
</span><span class="cx">
</span><del>- NSDictionary *actionDictionary(const WebCore::NavigationAction&, PassRefPtr<WebCore::FormState>) const;
</del><ins>+ NSDictionary *actionDictionary(const WebCore::NavigationAction&, WebCore::FormState*) const;
</ins><span class="cx">
</span><del>- bool canCachePage() const override;
</del><ins>+ bool canCachePage() const final;
</ins><span class="cx">
</span><del>- PassRefPtr<WebCore::FrameNetworkingContext> createNetworkingContext() override;
</del><ins>+ Ref<WebCore::FrameNetworkingContext> createNetworkingContext() final;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(REQUEST_AUTOCOMPLETE)
</span><del>- void didRequestAutocomplete(PassRefPtr<WebCore::FormState>) override { }
</del><ins>+ void didRequestAutocomplete(Ref<WebCore::FormState>&&) final { }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- bool shouldPaintBrokenImage(const WebCore::URL&) const override;
</del><ins>+ bool shouldPaintBrokenImage(const WebCore::URL&) const final;
</ins><span class="cx">
</span><span class="cx"> #if USE(QUICK_LOOK)
</span><del>- void didCreateQuickLookHandle(WebCore::QuickLookHandle&) override;
</del><ins>+ void didCreateQuickLookHandle(WebCore::QuickLookHandle&) final;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CONTENT_FILTERING)
</span><del>- void contentFilterDidBlockLoad(WebCore::ContentFilterUnblockHandler) override;
</del><ins>+ void contentFilterDidBlockLoad(WebCore::ContentFilterUnblockHandler) final;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- void prefetchDNS(const String&) override;
</del><ins>+ void prefetchDNS(const String&) final;
</ins><span class="cx">
</span><span class="cx"> RetainPtr<WebFrame> m_webFrame;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2006-2016 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2006-2017 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx"> #import <runtime/InitializeThreading.h>
</span><span class="cx"> #import <wtf/BlockObjCExceptions.h>
</span><span class="cx"> #import <wtf/MainThread.h>
</span><del>-#import <wtf/PassRefPtr.h>
</del><ins>+#import <wtf/Ref.h>
</ins><span class="cx"> #import <wtf/RunLoop.h>
</span><span class="cx"> #import <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="lines">@@ -885,7 +885,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebFrameLoaderClient::dispatchDecidePolicyForNewWindowAction(const NavigationAction& action, const ResourceRequest& request, PassRefPtr<FormState> formState, const String& frameName, FramePolicyFunction function)
</del><ins>+void WebFrameLoaderClient::dispatchDecidePolicyForNewWindowAction(const NavigationAction& action, const ResourceRequest& request, FormState* formState, const String& frameName, FramePolicyFunction function)
</ins><span class="cx"> {
</span><span class="cx"> WebView *webView = getWebView(m_webFrame.get());
</span><span class="cx"> BOOL tryAppLink = shouldTryAppLink(webView, action, nullptr);
</span><span class="lines">@@ -897,7 +897,7 @@
</span><span class="cx"> decisionListener:setUpPolicyListener(WTFMove(function), tryAppLink ? (NSURL *)request.url() : nil).get()];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction(const NavigationAction& action, const ResourceRequest& request, PassRefPtr<FormState> formState, FramePolicyFunction function)
</del><ins>+void WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction(const NavigationAction& action, const ResourceRequest& request, FormState* formState, FramePolicyFunction function)
</ins><span class="cx"> {
</span><span class="cx"> WebView *webView = getWebView(m_webFrame.get());
</span><span class="cx"> BOOL tryAppLink = shouldTryAppLink(webView, action, core(m_webFrame.get()));
</span><span class="lines">@@ -921,29 +921,28 @@
</span><span class="cx"> [[webView _policyDelegateForwarder] webView:webView unableToImplementPolicyWithError:error frame:m_webFrame.get()];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static NSDictionary *makeFormFieldValuesDictionary(FormState* formState)
</del><ins>+static NSDictionary *makeFormFieldValuesDictionary(FormState& formState)
</ins><span class="cx"> {
</span><del>- const StringPairVector& textFieldValues = formState->textFieldValues();
</del><ins>+ auto& textFieldValues = formState.textFieldValues();
</ins><span class="cx"> size_t size = textFieldValues.size();
</span><span class="cx"> NSMutableDictionary *dictionary = [[NSMutableDictionary alloc] initWithCapacity:size];
</span><del>- for (size_t i = 0; i < size; ++i)
- [dictionary setObject:textFieldValues[i].second forKey:textFieldValues[i].first];
-
</del><ins>+ for (auto& value : textFieldValues)
+ [dictionary setObject:value.second forKey:value.first];
</ins><span class="cx"> return [dictionary autorelease];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebFrameLoaderClient::dispatchWillSendSubmitEvent(PassRefPtr<WebCore::FormState> formState)
</del><ins>+void WebFrameLoaderClient::dispatchWillSendSubmitEvent(Ref<WebCore::FormState>&& formState)
</ins><span class="cx"> {
</span><span class="cx"> id <WebFormDelegate> formDelegate = [getWebView(m_webFrame.get()) _formDelegate];
</span><span class="cx"> if (!formDelegate)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- DOMHTMLFormElement *formElement = kit(formState->form());
</del><ins>+ DOMHTMLFormElement *formElement = kit(&formState->form());
</ins><span class="cx"> NSDictionary *values = makeFormFieldValuesDictionary(formState.get());
</span><span class="cx"> CallFormDelegate(getWebView(m_webFrame.get()), @selector(willSendSubmitEventToForm:inFrame:withValues:), formElement, m_webFrame.get(), values);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebFrameLoaderClient::dispatchWillSubmitForm(PassRefPtr<FormState> formState, FramePolicyFunction function)
</del><ins>+void WebFrameLoaderClient::dispatchWillSubmitForm(FormState& formState, FramePolicyFunction function)
</ins><span class="cx"> {
</span><span class="cx"> id <WebFormDelegate> formDelegate = [getWebView(m_webFrame.get()) _formDelegate];
</span><span class="cx"> if (!formDelegate) {
</span><span class="lines">@@ -951,8 +950,8 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- NSDictionary *values = makeFormFieldValuesDictionary(formState.get());
- CallFormDelegate(getWebView(m_webFrame.get()), @selector(frame:sourceFrame:willSubmitForm:withValues:submissionListener:), m_webFrame.get(), kit(formState->sourceDocument()->frame()), kit(formState->form()), values, setUpPolicyListener(WTFMove(function)).get());
</del><ins>+ NSDictionary *values = makeFormFieldValuesDictionary(formState);
+ CallFormDelegate(getWebView(m_webFrame.get()), @selector(frame:sourceFrame:willSubmitForm:withValues:submissionListener:), m_webFrame.get(), kit(formState.sourceDocument().frame()), kit(&formState.form()), values, setUpPolicyListener(WTFMove(function)).get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebFrameLoaderClient::revertToProvisionalState(DocumentLoader* loader)
</span><span class="lines">@@ -1553,7 +1552,7 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-NSDictionary *WebFrameLoaderClient::actionDictionary(const NavigationAction& action, PassRefPtr<FormState> formState) const
</del><ins>+NSDictionary *WebFrameLoaderClient::actionDictionary(const NavigationAction& action, FormState* formState) const
</ins><span class="cx"> {
</span><span class="cx"> unsigned modifierFlags = 0;
</span><span class="cx"> const Event* event = action.event();
</span><span class="lines">@@ -1594,10 +1593,8 @@
</span><span class="cx"> [result setObject:[NSNumber numberWithInt:WebCore::NoButton] forKey:WebActionButtonKey];
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (formState) {
- ASSERT(formState->form());
- [result setObject:kit(formState->form()) forKey:WebActionFormKey];
- }
</del><ins>+ if (formState)
+ [result setObject:kit(&formState->form()) forKey:WebActionFormKey];
</ins><span class="cx">
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="lines">@@ -1623,7 +1620,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<Frame> WebFrameLoaderClient::createFrame(const URL& url, const String& name, HTMLFrameOwnerElement* ownerElement,
</del><ins>+RefPtr<Frame> WebFrameLoaderClient::createFrame(const URL& url, const String& name, HTMLFrameOwnerElement& ownerElement,
</ins><span class="cx"> const String& referrer, bool allowsScrolling, int marginWidth, int marginHeight)
</span><span class="cx"> {
</span><span class="cx"> BEGIN_BLOCK_OBJC_EXCEPTIONS;
</span><span class="lines">@@ -1632,7 +1629,7 @@
</span><span class="cx">
</span><span class="cx"> WebFrameView *childView = [[WebFrameView alloc] init];
</span><span class="cx">
</span><del>- RefPtr<Frame> result = [WebFrame _createSubframeWithOwnerElement:ownerElement frameName:name frameView:childView];
</del><ins>+ RefPtr<Frame> result = [WebFrame _createSubframeWithOwnerElement:&ownerElement frameName:name frameView:childView];
</ins><span class="cx"> [childView release];
</span><span class="cx">
</span><span class="cx"> WebFrame *newFrame = kit(result.get());
</span><span class="lines">@@ -1910,7 +1907,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<Widget> WebFrameLoaderClient::createPlugin(const IntSize& size, HTMLPlugInElement* element, const URL& url,
</del><ins>+RefPtr<Widget> WebFrameLoaderClient::createPlugin(const IntSize& size, HTMLPlugInElement& element, const URL& url,
</ins><span class="cx"> const Vector<String>& paramNames, const Vector<String>& paramValues, const String& mimeType, bool loadManually)
</span><span class="cx"> {
</span><span class="cx"> BEGIN_BLOCK_OBJC_EXCEPTIONS;
</span><span class="lines">@@ -1949,7 +1946,7 @@
</span><span class="cx"> attributes, WebPlugInAttributesKey,
</span><span class="cx"> [NSNumber numberWithInt:loadManually ? WebPlugInModeFull : WebPlugInModeEmbed], WebPlugInModeKey,
</span><span class="cx"> [NSNumber numberWithBool:!loadManually], WebPlugInShouldLoadMainResourceKey,
</span><del>- kit(element), WebPlugInContainingElementKey,
</del><ins>+ kit(&element), WebPlugInContainingElementKey,
</ins><span class="cx"> // FIXME: We should be passing base URL, see <https://bugs.webkit.org/show_bug.cgi?id=35215>.
</span><span class="cx"> pluginURL, WebPlugInBaseURLKey, // pluginURL might be nil, so add it last
</span><span class="cx"> nil];
</span><span class="lines">@@ -1995,11 +1992,11 @@
</span><span class="cx"> if (pluginPackage) {
</span><span class="cx"> if (shouldBlockPlugin(pluginPackage)) {
</span><span class="cx"> errorCode = WebKitErrorBlockedPlugInVersion;
</span><del>- if (is<RenderEmbeddedObject>(element->renderer()))
- downcast<RenderEmbeddedObject>(*element->renderer()).setPluginUnavailabilityReason(RenderEmbeddedObject::InsecurePluginVersion);
</del><ins>+ if (is<RenderEmbeddedObject>(element.renderer()))
+ downcast<RenderEmbeddedObject>(*element.renderer()).setPluginUnavailabilityReason(RenderEmbeddedObject::InsecurePluginVersion);
</ins><span class="cx"> } else {
</span><span class="cx"> if ([pluginPackage isKindOfClass:[WebPluginPackage class]])
</span><del>- view = pluginView(m_webFrame.get(), (WebPluginPackage *)pluginPackage, attributeKeys, kit(paramValues), baseURL, kit(element), loadManually);
</del><ins>+ view = pluginView(m_webFrame.get(), (WebPluginPackage *)pluginPackage, attributeKeys, kit(paramValues), baseURL, kit(&element), loadManually);
</ins><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> else if ([pluginPackage isKindOfClass:[WebNetscapePluginPackage class]]) {
</span><span class="cx"> WebBaseNetscapePluginView *pluginView = [[[NETSCAPE_PLUGIN_VIEW alloc]
</span><span class="lines">@@ -2011,7 +2008,7 @@
</span><span class="cx"> attributeKeys:attributeKeys
</span><span class="cx"> attributeValues:kit(paramValues)
</span><span class="cx"> loadManually:loadManually
</span><del>- element:element] autorelease];
</del><ins>+ element:&element] autorelease];
</ins><span class="cx">
</span><span class="cx"> return adoptRef(new NetscapePluginWidget(pluginView));
</span><span class="cx"> }
</span><span class="lines">@@ -2082,7 +2079,7 @@
</span><span class="cx"> END_BLOCK_OBJC_EXCEPTIONS;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Widget> WebFrameLoaderClient::createJavaAppletWidget(const IntSize& size, HTMLAppletElement* element, const URL& baseURL,
</del><ins>+RefPtr<Widget> WebFrameLoaderClient::createJavaAppletWidget(const IntSize& size, HTMLAppletElement& element, const URL& baseURL,
</ins><span class="cx"> const Vector<String>& paramNames, const Vector<String>& paramValues)
</span><span class="cx"> {
</span><span class="cx"> BEGIN_BLOCK_OBJC_EXCEPTIONS;
</span><span class="lines">@@ -2100,8 +2097,8 @@
</span><span class="cx"> if (pluginPackage) {
</span><span class="cx"> if (shouldBlockPlugin(pluginPackage)) {
</span><span class="cx"> errorCode = WebKitErrorBlockedPlugInVersion;
</span><del>- if (is<RenderEmbeddedObject>(element->renderer()))
- downcast<RenderEmbeddedObject>(*element->renderer()).setPluginUnavailabilityReason(RenderEmbeddedObject::InsecurePluginVersion);
</del><ins>+ if (is<RenderEmbeddedObject>(element.renderer()))
+ downcast<RenderEmbeddedObject>(*element.renderer()).setPluginUnavailabilityReason(RenderEmbeddedObject::InsecurePluginVersion);
</ins><span class="cx"> } else {
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> if ([pluginPackage isKindOfClass:[WebNetscapePluginPackage class]]) {
</span><span class="lines">@@ -2113,7 +2110,7 @@
</span><span class="cx"> attributeKeys:kit(paramNames)
</span><span class="cx"> attributeValues:kit(paramValues)
</span><span class="cx"> loadManually:NO
</span><del>- element:element] autorelease];
</del><ins>+ element:&element] autorelease];
</ins><span class="cx"> if (view)
</span><span class="cx"> return adoptRef(new NetscapePluginWidget(static_cast<WebBaseNetscapePluginView *>(view)));
</span><span class="cx"> }
</span><span class="lines">@@ -2210,7 +2207,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<FrameNetworkingContext> WebFrameLoaderClient::createNetworkingContext()
</del><ins>+Ref<FrameNetworkingContext> WebFrameLoaderClient::createNetworkingContext()
</ins><span class="cx"> {
</span><span class="cx"> return WebFrameNetworkingContext::create(core(m_webFrame.get()));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebFrameNetworkingContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameNetworkingContext.h (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameNetworkingContext.h 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameNetworkingContext.h 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -23,16 +23,15 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef WebFrameNetworkingContext_h
-#define WebFrameNetworkingContext_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include <WebCore/FrameNetworkingContext.h>
</span><span class="cx">
</span><span class="cx"> class WebFrameNetworkingContext : public WebCore::FrameNetworkingContext {
</span><span class="cx"> public:
</span><del>- static PassRefPtr<WebFrameNetworkingContext> create(WebCore::Frame* frame)
</del><ins>+ static Ref<WebFrameNetworkingContext> create(WebCore::Frame* frame)
</ins><span class="cx"> {
</span><del>- return adoptRef(new WebFrameNetworkingContext(frame));
</del><ins>+ return adoptRef(*new WebFrameNetworkingContext(frame));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static WebCore::NetworkStorageSession& ensurePrivateBrowsingSession();
</span><span class="lines">@@ -51,7 +50,4 @@
</span><span class="cx"> String sourceApplicationIdentifier() const override;
</span><span class="cx"> WebCore::ResourceError blockedError(const WebCore::ResourceRequest&) const override;
</span><span class="cx"> WebCore::NetworkStorageSession& storageSession() const override;
</span><del>-
</del><span class="cx"> };
</span><del>-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebFrameNetworkingContextmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameNetworkingContext.mm (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameNetworkingContext.mm 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameNetworkingContext.mm 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -47,9 +47,7 @@
</span><span class="cx"> NetworkStorageSession& WebFrameNetworkingContext::ensurePrivateBrowsingSession()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><del>-
</del><span class="cx"> NetworkStorageSession::ensurePrivateBrowsingSession(SessionID::legacyPrivateSessionID(), [[NSBundle mainBundle] bundleIdentifier]);
</span><del>-
</del><span class="cx"> return *NetworkStorageSession::storageSession(SessionID::legacyPrivateSessionID());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -56,7 +54,6 @@
</span><span class="cx"> void WebFrameNetworkingContext::destroyPrivateBrowsingSession()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><del>-
</del><span class="cx"> NetworkStorageSession::destroySession(SessionID::legacyPrivateSessionID());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -68,7 +65,7 @@
</span><span class="cx"> SchedulePairHashSet* WebFrameNetworkingContext::scheduledRunLoopPairs() const
</span><span class="cx"> {
</span><span class="cx"> if (!frame() || !frame()->page())
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> return frame()->page()->scheduledRunLoopPairs();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -75,12 +72,12 @@
</span><span class="cx"> RetainPtr<CFDataRef> WebFrameNetworkingContext::sourceApplicationAuditData() const
</span><span class="cx"> {
</span><span class="cx"> if (!frame() || !frame()->page())
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> WebView *webview = kit(frame()->page());
</span><del>-
</del><span class="cx"> if (!webview)
</span><del>- return 0;
</del><ins>+ return nullptr;
+
</ins><span class="cx"> return reinterpret_cast<CFDataRef>(webview._sourceApplicationAuditData);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -98,7 +95,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> if (frame() && frame()->page()->sessionID().isEphemeral()) {
</span><del>- if (NetworkStorageSession* session = NetworkStorageSession::storageSession(SessionID::legacyPrivateSessionID()))
</del><ins>+ if (auto* session = NetworkStorageSession::storageSession(SessionID::legacyPrivateSessionID()))
</ins><span class="cx"> return *session;
</span><span class="cx"> // Some requests may still be coming shortly before WebCore updates the session ID and after WebKit destroys the private browsing session.
</span><span class="cx"> LOG_ERROR("Invalid session ID. Please file a bug unless you just disabled private browsing, in which case it's an expected race.");
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebOpenPanelResultListenerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebOpenPanelResultListener.h (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebOpenPanelResultListener.h 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebOpenPanelResultListener.h 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2008 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2008-2017 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #import "WebUIDelegate.h"
</span><del>-#import <wtf/Forward.h>
</del><ins>+#import <wtf/RefPtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> class FileChooser;
</span><span class="lines">@@ -32,9 +32,9 @@
</span><span class="cx">
</span><span class="cx"> @interface WebOpenPanelResultListener : NSObject <WebOpenPanelResultListener>
</span><span class="cx"> {
</span><del>- WebCore::FileChooser* _chooser;
</del><ins>+ RefPtr<WebCore::FileChooser> _chooser;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (id)initWithChooser:(PassRefPtr<WebCore::FileChooser>)chooser;
</del><ins>+- (id)initWithChooser:(WebCore::FileChooser&)chooser;
</ins><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebOpenPanelResultListenermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebOpenPanelResultListener.mm (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebOpenPanelResultListener.mm 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebOpenPanelResultListener.mm 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -36,30 +36,18 @@
</span><span class="cx">
</span><span class="cx"> @implementation WebOpenPanelResultListener
</span><span class="cx">
</span><del>-- (id)initWithChooser:(PassRefPtr<FileChooser>)chooser
</del><ins>+- (id)initWithChooser:(FileChooser&)chooser
</ins><span class="cx"> {
</span><span class="cx"> self = [super init];
</span><span class="cx"> if (!self)
</span><span class="cx"> return nil;
</span><del>- _chooser = chooser.leakRef();
</del><ins>+ _chooser = &chooser;
</ins><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#ifndef NDEBUG
-- (void)dealloc
-{
- ASSERT(!_chooser);
- [super dealloc];
-}
-#endif
-
</del><span class="cx"> - (void)cancel
</span><span class="cx"> {
</span><del>- ASSERT(_chooser);
- if (!_chooser)
- return;
- _chooser->deref();
- _chooser = 0;
</del><ins>+ _chooser = nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)chooseFilename:(NSString *)filename
</span><span class="lines">@@ -68,8 +56,7 @@
</span><span class="cx"> if (!_chooser)
</span><span class="cx"> return;
</span><span class="cx"> _chooser->chooseFile(filename);
</span><del>- _chooser->deref();
- _chooser = 0;
</del><ins>+ _chooser = nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)chooseFilenames:(NSArray *)filenames
</span><span class="lines">@@ -82,11 +69,11 @@
</span><span class="cx"> for (NSUInteger i = 0; i < count; i++)
</span><span class="cx"> names[i] = [filenames objectAtIndex:i];
</span><span class="cx"> _chooser->chooseFiles(names);
</span><del>- _chooser->deref();
- _chooser = 0;
</del><ins>+ _chooser = nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><ins>+
</ins><span class="cx"> - (void)chooseFilename:(NSString *)filename displayString:(NSString *)displayString iconImage:(CGImageRef)imageRef
</span><span class="cx"> {
</span><span class="cx"> [self chooseFilenames:[NSArray arrayWithObject:filename] displayString:displayString iconImage:imageRef];
</span><span class="lines">@@ -98,18 +85,14 @@
</span><span class="cx"> if (!_chooser)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- RefPtr<Icon> icon = Icon::createIconForImage(imageRef);
-
- NSUInteger count = [filenames count];
- Vector<String> names(count);
- for (NSUInteger i = 0; i < count; ++i)
- names[i] = [filenames objectAtIndex:i];
- _chooser->chooseMediaFiles(names, displayString, icon.get());
-
- // FIXME: we shouldn't be manually deref()'ing here.
- _chooser->deref();
</del><ins>+ Vector<String> names;
+ names.reserveInitialCapacity([filenames count]);
+ for (NSString *filename in filenames)
+ names.uncheckedAppend(filename);
+ _chooser->chooseMediaFiles(names, displayString, Icon::createIconForImage(imageRef).get());
</ins><span class="cx"> _chooser = nullptr;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebArchivemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebArchive.mm (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebArchive.mm 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebKit/mac/WebView/WebArchive.mm 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -174,25 +174,16 @@
</span><span class="cx"> [self release];
</span><span class="cx"> return nil;
</span><span class="cx"> }
</span><del>-
- RefPtr<ArchiveResource> coreMainResource = mainResource ? [mainResource _coreResource] : nullptr;
</del><span class="cx">
</span><del>- Vector<RefPtr<ArchiveResource>> coreResources;
</del><ins>+ Vector<Ref<ArchiveResource>> coreResources;
</ins><span class="cx"> for (WebResource *subresource in subresources)
</span><span class="cx"> coreResources.append([subresource _coreResource]);
</span><span class="cx">
</span><del>- Vector<RefPtr<LegacyWebArchive>> coreArchives;
</del><ins>+ Vector<Ref<LegacyWebArchive>> coreArchives;
</ins><span class="cx"> for (WebArchive *subframeArchive in subframeArchives)
</span><del>- coreArchives.append([subframeArchive->_private coreArchive]);
</del><ins>+ coreArchives.append(*[subframeArchive->_private coreArchive]);
</ins><span class="cx">
</span><del>- auto coreArchive = LegacyWebArchive::create(WTFMove(coreMainResource), WTFMove(coreResources), WTFMove(coreArchives));
- if (!coreArchive) {
- [self release];
- return nil;
- }
-
- [_private setCoreArchive:WTFMove(coreArchive)];
-
</del><ins>+ [_private setCoreArchive:LegacyWebArchive::create([mainResource _coreResource], WTFMove(coreResources), WTFMove(coreArchives))];
</ins><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -275,9 +266,10 @@
</span><span class="cx"> // Currently from WebKit API perspective, WebArchives are entirely immutable once created
</span><span class="cx"> // If they ever become mutable, we'll need to rethink this.
</span><span class="cx"> if (!_private->cachedMainResource) {
</span><del>- LegacyWebArchive* coreArchive = [_private coreArchive];
- if (coreArchive)
- _private->cachedMainResource = [[WebResource alloc] _initWithCoreResource:coreArchive->mainResource()];
</del><ins>+ if (auto* coreArchive = [_private coreArchive]) {
+ if (auto* mainResource = coreArchive->mainResource())
+ _private->cachedMainResource = [[WebResource alloc] _initWithCoreResource:*mainResource];
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return [[_private->cachedMainResource retain] autorelease];
</span><span class="lines">@@ -294,12 +286,11 @@
</span><span class="cx"> if (!coreArchive)
</span><span class="cx"> _private->cachedSubresources = [[NSArray alloc] init];
</span><span class="cx"> else {
</span><del>- const Vector<RefPtr<ArchiveResource>>& subresources(coreArchive->subresources());
</del><ins>+ auto& subresources = coreArchive->subresources();
</ins><span class="cx"> NSMutableArray *mutableArray = [[NSMutableArray alloc] initWithCapacity:subresources.size()];
</span><span class="cx"> _private->cachedSubresources = mutableArray;
</span><del>- for (unsigned i = 0; i < subresources.size(); ++i) {
- WebResource *resource = [[WebResource alloc] _initWithCoreResource:subresources[i].get()];
- if (resource) {
</del><ins>+ for (auto& subresource : subresources) {
+ if (WebResource *resource = [[WebResource alloc] _initWithCoreResource:subresource.get()]) {
</ins><span class="cx"> [mutableArray addObject:resource];
</span><span class="cx"> [resource release];
</span><span class="cx"> }
</span><span class="lines">@@ -318,15 +309,15 @@
</span><span class="cx"> // Currently from WebKit API perspective, WebArchives are entirely immutable once created
</span><span class="cx"> // If they ever become mutable, we'll need to rethink this.
</span><span class="cx"> if (!_private->cachedSubframeArchives) {
</span><del>- LegacyWebArchive* coreArchive = [_private coreArchive];
</del><ins>+ auto* coreArchive = [_private coreArchive];
</ins><span class="cx"> if (!coreArchive)
</span><span class="cx"> _private->cachedSubframeArchives = [[NSArray alloc] init];
</span><span class="cx"> else {
</span><del>- const Vector<RefPtr<Archive>>& subframeArchives(coreArchive->subframeArchives());
- NSMutableArray *mutableArray = [[NSMutableArray alloc] initWithCapacity:subframeArchives.size()];
</del><ins>+ auto& subframeArchives = coreArchive->subframeArchives();
+ auto mutableArray = [[NSMutableArray alloc] initWithCapacity:subframeArchives.size()];
</ins><span class="cx"> _private->cachedSubframeArchives = mutableArray;
</span><span class="cx"> for (unsigned i = 0; i < subframeArchives.size(); ++i) {
</span><del>- WebArchive *archive = [[WebArchive alloc] _initWithCoreLegacyWebArchive:(LegacyWebArchive *)subframeArchives[i].get()];
</del><ins>+ WebArchive *archive = [[WebArchive alloc] _initWithCoreLegacyWebArchive:(LegacyWebArchive *)subframeArchives[i].ptr()];
</ins><span class="cx"> [mutableArray addObject:archive];
</span><span class="cx"> [archive release];
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebDataSourcemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebDataSource.mm (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebDataSource.mm 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebKit/mac/WebView/WebDataSource.mm 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -166,25 +166,22 @@
</span><span class="cx">
</span><span class="cx"> - (void)_addSubframeArchives:(NSArray *)subframeArchives
</span><span class="cx"> {
</span><del>- // FIXME: This SPI is poor, poor design. Can we come up with another solution for those who need it?
- NSEnumerator *enumerator = [subframeArchives objectEnumerator];
- WebArchive *archive;
- while ((archive = [enumerator nextObject]) != nil)
- toPrivate(_private)->loader->addAllArchiveResources([archive _coreLegacyWebArchive]);
</del><ins>+ // FIXME: This SPI is poor, poor design. Can we come up with another solution for those who need it?
+ for (WebArchive *archive in subframeArchives)
+ toPrivate(_private)->loader->addAllArchiveResources(*[archive _coreLegacyWebArchive]);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><ins>+
</ins><span class="cx"> - (NSFileWrapper *)_fileWrapperForURL:(NSURL *)URL
</span><span class="cx"> {
</span><span class="cx"> if ([URL isFileURL])
</span><span class="cx"> return [[[NSFileWrapper alloc] initWithURL:[URL URLByResolvingSymlinksInPath] options:0 error:nullptr] autorelease];
</span><span class="cx">
</span><del>- WebResource *resource = [self subresourceForURL:URL];
- if (resource)
</del><ins>+ if (auto resource = [self subresourceForURL:URL])
</ins><span class="cx"> return [resource _fileWrapperRepresentation];
</span><del>-
- NSCachedURLResponse *cachedResponse = [[self _webView] _cachedResponseForURL:URL];
- if (cachedResponse) {
</del><ins>+
+ if (auto cachedResponse = [[self _webView] _cachedResponseForURL:URL]) {
</ins><span class="cx"> NSFileWrapper *wrapper = [[[NSFileWrapper alloc] initRegularFileWithContents:[cachedResponse data]] autorelease];
</span><span class="cx"> [wrapper setPreferredFilename:[[cachedResponse response] suggestedFilename]];
</span><span class="cx"> return wrapper;
</span><span class="lines">@@ -192,6 +189,7 @@
</span><span class="cx">
</span><span class="cx"> return nil;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> - (NSString *)_responseMIMEType
</span><span class="lines">@@ -305,9 +303,10 @@
</span><span class="cx"> NSString *MIMEType = [mainResource MIMEType];
</span><span class="cx"> if ([WebView canShowMIMETypeAsHTML:MIMEType]) {
</span><span class="cx"> NSString *markupString = [[NSString alloc] initWithData:[mainResource data] encoding:NSUTF8StringEncoding];
</span><ins>+
</ins><span class="cx"> // FIXME: seems poor form to do this as a side effect of getting a document fragment
</span><span class="cx"> if (toPrivate(_private)->loader)
</span><del>- toPrivate(_private)->loader->addAllArchiveResources([archive _coreLegacyWebArchive]);
</del><ins>+ toPrivate(_private)->loader->addAllArchiveResources(*[archive _coreLegacyWebArchive]);
</ins><span class="cx">
</span><span class="cx"> DOMDocumentFragment *fragment = [[self webFrame] _documentFragmentWithMarkupString:markupString baseURLString:[[mainResource URL] _web_originalDataAsString]];
</span><span class="cx"> [markupString release];
</span><span class="lines">@@ -324,7 +323,7 @@
</span><span class="cx"> {
</span><span class="cx"> DOMElement *imageElement = [self _imageElementWithImageResource:resource];
</span><span class="cx"> if (!imageElement)
</span><del>- return 0;
</del><ins>+ return nil;
</ins><span class="cx"> DOMDocumentFragment *fragment = [[[self webFrame] DOMDocument] createDocumentFragment];
</span><span class="cx"> [fragment appendChild:imageElement];
</span><span class="cx"> return fragment;
</span><span class="lines">@@ -519,32 +518,31 @@
</span><span class="cx"> - (WebResource *)mainResource
</span><span class="cx"> {
</span><span class="cx"> auto coreResource = toPrivate(_private)->loader->mainResource();
</span><del>- return [[[WebResource alloc] _initWithCoreResource:WTFMove(coreResource)] autorelease];
</del><ins>+ if (!coreResource)
+ return nil;
+ return [[[WebResource alloc] _initWithCoreResource:coreResource.releaseNonNull()] autorelease];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSArray *)subresources
</span><span class="cx"> {
</span><span class="cx"> auto coreSubresources = toPrivate(_private)->loader->subresources();
</span><del>-
</del><span class="cx"> auto subresources = adoptNS([[NSMutableArray alloc] initWithCapacity:coreSubresources.size()]);
</span><del>- for (const auto& coreSubresource : coreSubresources) {
- if (auto resource = adoptNS([[WebResource alloc] _initWithCoreResource:coreSubresource]))
</del><ins>+ for (auto& coreSubresource : coreSubresources) {
+ if (auto resource = adoptNS([[WebResource alloc] _initWithCoreResource:coreSubresource.copyRef()]))
</ins><span class="cx"> [subresources addObject:resource.get()];
</span><span class="cx"> }
</span><del>-
</del><span class="cx"> return subresources.autorelease();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (WebResource *)subresourceForURL:(NSURL *)URL
</span><span class="cx"> {
</span><del>- RefPtr<ArchiveResource> subresource = toPrivate(_private)->loader->subresource(URL);
-
- return subresource ? [[[WebResource alloc] _initWithCoreResource:subresource.get()] autorelease] : nil;
</del><ins>+ auto subresource = toPrivate(_private)->loader->subresource(URL);
+ return subresource ? [[[WebResource alloc] _initWithCoreResource:subresource.releaseNonNull()] autorelease] : nil;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)addSubresource:(WebResource *)subresource
</span><span class="cx"> {
</span><del>- toPrivate(_private)->loader->addArchiveResource(*[subresource _coreResource]);
</del><ins>+ toPrivate(_private)->loader->addArchiveResource([subresource _coreResource]);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebResourcemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebResource.mm (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebResource.mm 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebKit/mac/WebView/WebResource.mm 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2005-2017 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -57,9 +57,9 @@
</span><span class="cx">
</span><span class="cx"> @interface WebResourcePrivate : NSObject {
</span><span class="cx"> @public
</span><del>- ArchiveResource* coreResource;
</del><ins>+ RefPtr<ArchiveResource> coreResource;
</ins><span class="cx"> }
</span><del>-- (instancetype)initWithCoreResource:(PassRefPtr<ArchiveResource>)coreResource;
</del><ins>+- (instancetype)initWithCoreResource:(Ref<ArchiveResource>&&)coreResource;
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @implementation WebResourcePrivate
</span><span class="lines">@@ -78,13 +78,12 @@
</span><span class="cx"> return [super init];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (instancetype)initWithCoreResource:(PassRefPtr<ArchiveResource>)passedResource
</del><ins>+- (instancetype)initWithCoreResource:(Ref<ArchiveResource>&&)passedResource
</ins><span class="cx"> {
</span><span class="cx"> self = [super init];
</span><span class="cx"> if (!self)
</span><span class="cx"> return nil;
</span><del>- // Acquire the PassRefPtr<>'s ref as our own manual ref
- coreResource = passedResource.leakRef();
</del><ins>+ coreResource = WTFMove(passedResource);
</ins><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -92,9 +91,6 @@
</span><span class="cx"> {
</span><span class="cx"> if (WebCoreObjCScheduleDeallocateOnMainThread([WebResourcePrivate class], self))
</span><span class="cx"> return;
</span><del>-
- if (coreResource)
- coreResource->deref();
</del><span class="cx"> [super dealloc];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -153,14 +149,19 @@
</span><span class="cx"> return nil;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- _private = [[WebResourcePrivate alloc] initWithCoreResource:ArchiveResource::create(SharedBuffer::wrapNSData(data), url, mimeType, textEncoding, frameName, response)];
</del><ins>+ auto coreResource = ArchiveResource::create(SharedBuffer::wrapNSData(data), url, mimeType, textEncoding, frameName, response);
+ if (!coreResource) {
+ [self release];
+ return nil;
+ }
</ins><span class="cx">
</span><ins>+ _private = [[WebResourcePrivate alloc] initWithCoreResource:coreResource.releaseNonNull()];
</ins><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)encodeWithCoder:(NSCoder *)encoder
</span><span class="cx"> {
</span><del>- ArchiveResource *resource = _private->coreResource;
</del><ins>+ auto* resource = _private->coreResource.get();
</ins><span class="cx">
</span><span class="cx"> NSData *data = nil;
</span><span class="cx"> NSURL *url = nil;
</span><span class="lines">@@ -209,8 +210,7 @@
</span><span class="cx">
</span><span class="cx"> if (!_private->coreResource)
</span><span class="cx"> return nil;
</span><del>- NSURL *url = _private->coreResource->url();
- return url;
</del><ins>+ return _private->coreResource->url();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSString *)MIMEType
</span><span class="lines">@@ -252,22 +252,19 @@
</span><span class="cx">
</span><span class="cx"> @implementation WebResource (WebResourceInternal)
</span><span class="cx">
</span><del>-- (id)_initWithCoreResource:(PassRefPtr<ArchiveResource>)coreResource
</del><ins>+- (id)_initWithCoreResource:(Ref<ArchiveResource>&&)coreResource
</ins><span class="cx"> {
</span><span class="cx"> self = [super init];
</span><span class="cx"> if (!self)
</span><span class="cx"> return nil;
</span><del>-
- ASSERT(coreResource);
-
- _private = [[WebResourcePrivate alloc] initWithCoreResource:coreResource];
-
</del><ins>+
+ _private = [[WebResourcePrivate alloc] initWithCoreResource:WTFMove(coreResource)];
</ins><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (WebCore::ArchiveResource *)_coreResource
</del><ins>+- (WebCore::ArchiveResource&)_coreResource
</ins><span class="cx"> {
</span><del>- return _private->coreResource;
</del><ins>+ return *_private->coreResource;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="lines">@@ -304,8 +301,13 @@
</span><span class="cx"> return nil;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- _private = [[WebResourcePrivate alloc] initWithCoreResource:ArchiveResource::create(SharedBuffer::wrapNSData(copyData ? [[data copy] autorelease] : data), URL, MIMEType, textEncodingName, frameName, response)];
</del><ins>+ auto coreResource = ArchiveResource::create(SharedBuffer::wrapNSData(copyData ? [[data copy] autorelease] : data), URL, MIMEType, textEncodingName, frameName, response);
+ if (!coreResource) {
+ [self release];
+ return nil;
+ }
</ins><span class="cx">
</span><ins>+ _private = [[WebResourcePrivate alloc] initWithCoreResource:coreResource.releaseNonNull()];
</ins><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebResourceInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebResourceInternal.h (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebResourceInternal.h 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebKit/mac/WebView/WebResourceInternal.h 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2008 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2008-2017 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #import "WebResourcePrivate.h"
</span><del>-#import <wtf/PassRefPtr.h>
</del><ins>+#import <wtf/Ref.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> class ArchiveResource;
</span><span class="lines">@@ -34,6 +34,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @interface WebResource (WebResourceInternal)
</span><del>-- (id)_initWithCoreResource:(PassRefPtr<WebCore::ArchiveResource>)coreResource;
-- (WebCore::ArchiveResource*)_coreResource;
</del><ins>+- (id)_initWithCoreResource:(Ref<WebCore::ArchiveResource>&&)coreResource;
+- (WebCore::ArchiveResource&)_coreResource;
</ins><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebKit/win/ChangeLog 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -1,3 +1,50 @@
</span><ins>+2017-01-15 Darin Adler <darin@apple.com>
+
+ Remove PassRefPtr from "loader" directory of WebCore
+ https://bugs.webkit.org/show_bug.cgi?id=167055
+
+ Reviewed by Alex Christensen.
+
+ * Plugins/PluginView.cpp:
+ (WebCore::PluginView::mediaCanStart): Fix call to dispatchDidFailToStartPlugin
+ by calling it directly on WebFrameLoaderClient. If my theory is correct, the old
+ call has been broken and doing nothing since r177941, two years ago, which made
+ the argument types different between FrameLoaderClient and WebFrameLoaderClient,
+ leaving WebFrameLoaderClient::dispatchDidFailToStartPlugin as dead code.
+
+ * WebCoreSupport/WebChromeClient.cpp:
+ (WebChromeClient::runOpenPanel): Updated for change to ChromeClient.
+ * WebCoreSupport/WebChromeClient.h: Ditto.
+
+ * WebCoreSupport/WebEditorClient.cpp:
+ (WebEditorUndoCommand::WebEditorUndoCommand): Take a reference instead of
+ a PassRefPtr. Also use Ref instead of RefPtr.
+ (WebEditorClient::shouldChangeTypingStyle): Deleted. Empty function that was
+ never called.
+ (WebEditorClient::webViewDidChangeTypingStyle): Ditto.
+ (WebEditorClient::webViewDidChangeSelection): Ditto.
+ (WebEditorClient::registerUndoStep): Take reference instead of PassRefPtr.
+ (WebEditorClient::registerRedoStep): Ditto.
+ * WebCoreSupport/WebEditorClient.h: Updated for the above. Also marked the
+ class and member functions final and made them all private, which will
+ help us catch if there are any that don't correctly match WebCore.
+
+ * WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebFrameLoaderClient::dispatchDecidePolicyForNewWindowAction): Updated
+ for change to ChromeClient.
+ (WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction): Ditto.
+ (WebFrameLoaderClient::dispatchWillSendSubmitEvent): Ditto.
+ (WebFrameLoaderClient::dispatchWillSubmitForm): Ditto.
+ (WebFrameLoaderClient::createFrame): Ditto. Also merged two functions into
+ one because one was private and only called by the other.
+ (WebFrameLoaderClient::createPlugin): Ditto.
+ (WebFrameLoaderClient::createJavaAppletWidget): Ditto.
+ (WebFrameLoaderClient::createNetworkingContext): Ditto.
+ * WebCoreSupport/WebFrameLoaderClient.h: Ditto.
+
+ * WebCoreSupport/WebFrameNetworkingContext.h:
+ (WebFrameNetworkingContext::create): Return a Ref instead of a PassRefPtr.
+
</ins><span class="cx"> 2017-01-12 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove unnecessary includes of Page.h
</span></span></pre></div>
<a id="trunkSourceWebKitwinPluginsPluginViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/Plugins/PluginView.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/Plugins/PluginView.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebKit/win/Plugins/PluginView.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2006-2017 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2008 Collabora Ltd. All rights reserved.
</span><span class="cx"> * Copyright (C) 2010 Girish Ramakrishnan <girish@forwardbias.in>
</span><span class="cx"> *
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "PluginDatabase.h"
</span><span class="cx"> #include "PluginDebug.h"
</span><span class="cx"> #include "PluginPackage.h"
</span><ins>+#include "WebFrameLoaderClient.h"
</ins><span class="cx"> #include <WebCore/BridgeJSC.h>
</span><span class="cx"> #include <WebCore/Chrome.h>
</span><span class="cx"> #include <WebCore/CommonVM.h>
</span><span class="lines">@@ -275,7 +276,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_isStarted);
</span><span class="cx"> if (!start())
</span><del>- parentFrame()->loader().client().dispatchDidFailToStartPlugin(this);
</del><ins>+ static_cast<WebFrameLoaderClient&>(parentFrame()->loader().client()).dispatchDidFailToStartPlugin(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PluginView::~PluginView()
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebChromeClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -618,15 +618,13 @@
</span><span class="cx"> notImplemented();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebChromeClient::runOpenPanel(Frame*, PassRefPtr<FileChooser> prpFileChooser)
</del><ins>+void WebChromeClient::runOpenPanel(Frame&, FileChooser& fileChooser)
</ins><span class="cx"> {
</span><del>- RefPtr<FileChooser> fileChooser = prpFileChooser;
-
</del><span class="cx"> HWND viewWindow;
</span><span class="cx"> if (FAILED(m_webView->viewWindow(&viewWindow)))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- bool multiFile = fileChooser->settings().allowsMultipleFiles;
</del><ins>+ bool multiFile = fileChooser.settings().allowsMultipleFiles;
</ins><span class="cx"> Vector<WCHAR> fileBuf(multiFile ? maxFilePathsListSize : MAX_PATH);
</span><span class="cx">
</span><span class="cx"> OPENFILENAME ofn;
</span><span class="lines">@@ -675,7 +673,7 @@
</span><span class="cx"> } else
</span><span class="cx"> fileList.append(file);
</span><span class="cx"> ASSERT(fileList.size());
</span><del>- fileChooser->chooseFiles(fileList);
</del><ins>+ fileChooser.chooseFiles(fileList);
</ins><span class="cx"> }
</span><span class="cx"> // FIXME: Show some sort of error if too many files are selected and the buffer is too small. For now, this will fail silently.
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.h (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.h 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.h 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx"> virtual void reachedMaxAppCacheSize(int64_t spaceNeeded);
</span><span class="cx"> virtual void reachedApplicationCacheOriginQuota(WebCore::SecurityOrigin*, int64_t totalSpaceNeeded);
</span><span class="cx">
</span><del>- virtual void runOpenPanel(WebCore::Frame*, PassRefPtr<WebCore::FileChooser>);
</del><ins>+ virtual void runOpenPanel(WebCore::Frame&, WebCore::FileChooser&);
</ins><span class="cx"> virtual void loadIconForFiles(const Vector<WTF::String>&, WebCore::FileIconLoader&);
</span><span class="cx">
</span><span class="cx"> virtual void setCursor(const WebCore::Cursor&);
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebEditorClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebEditorClient.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebEditorClient.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebEditorClient.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2006-2007, 2011, 2014-2015 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2006-2017 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -374,22 +374,6 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool WebEditorClient::shouldChangeTypingStyle(StyleProperties*, StyleProperties*)
-{
- notImplemented();
- return false;
-}
-
-void WebEditorClient::webViewDidChangeTypingStyle(WebNotification* /*notification*/)
-{
- notImplemented();
-}
-
-void WebEditorClient::webViewDidChangeSelection(WebNotification* /*notification*/)
-{
- notImplemented();
-}
-
</del><span class="cx"> bool WebEditorClient::smartInsertDeleteEnabled(void)
</span><span class="cx"> {
</span><span class="cx"> Page* page = m_webView->page();
</span><span class="lines">@@ -521,7 +505,7 @@
</span><span class="cx"> class WebEditorUndoCommand : public IWebUndoCommand
</span><span class="cx"> {
</span><span class="cx"> public:
</span><del>- WebEditorUndoCommand(PassRefPtr<UndoStep>, bool isUndo);
</del><ins>+ WebEditorUndoCommand(UndoStep&, bool isUndo);
</ins><span class="cx"> void execute();
</span><span class="cx">
</span><span class="cx"> // IUnknown
</span><span class="lines">@@ -531,11 +515,11 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> ULONG m_refCount;
</span><del>- RefPtr<UndoStep> m_step;
</del><ins>+ Ref<UndoStep> m_step;
</ins><span class="cx"> bool m_isUndo;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebEditorUndoCommand::WebEditorUndoCommand(PassRefPtr<UndoStep> step, bool isUndo)
</del><ins>+WebEditorUndoCommand::WebEditorUndoCommand(UndoStep& step, bool isUndo)
</ins><span class="cx"> : m_step(step)
</span><span class="cx"> , m_isUndo(isUndo)
</span><span class="cx"> , m_refCount(1)
</span><span class="lines">@@ -640,11 +624,11 @@
</span><span class="cx"> return String();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebEditorClient::registerUndoStep(PassRefPtr<UndoStep> step)
</del><ins>+void WebEditorClient::registerUndoStep(UndoStep& step)
</ins><span class="cx"> {
</span><span class="cx"> IWebUIDelegate* uiDelegate = 0;
</span><span class="cx"> if (SUCCEEDED(m_webView->uiDelegate(&uiDelegate))) {
</span><del>- String actionName = undoNameForEditAction(step->editingAction());
</del><ins>+ String actionName = undoNameForEditAction(step.editingAction());
</ins><span class="cx"> WebEditorUndoCommand* undoCommand = new WebEditorUndoCommand(step, true);
</span><span class="cx"> if (!undoCommand)
</span><span class="cx"> return;
</span><span class="lines">@@ -656,7 +640,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebEditorClient::registerRedoStep(PassRefPtr<UndoStep> step)
</del><ins>+void WebEditorClient::registerRedoStep(UndoStep& step)
</ins><span class="cx"> {
</span><span class="cx"> IWebUIDelegate* uiDelegate = 0;
</span><span class="cx"> if (SUCCEEDED(m_webView->uiDelegate(&uiDelegate))) {
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebEditorClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebEditorClient.h (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebEditorClient.h 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebEditorClient.h 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2006-2007 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2006-2017 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -33,91 +33,87 @@
</span><span class="cx"> class WebNotification;
</span><span class="cx"> class WebEditorUndoTarget;
</span><span class="cx">
</span><del>-class WebEditorClient : public WebCore::EditorClient, public WebCore::TextCheckerClient {
</del><ins>+class WebEditorClient final : public WebCore::EditorClient, public WebCore::TextCheckerClient {
</ins><span class="cx"> public:
</span><span class="cx"> WebEditorClient(WebView*);
</span><span class="cx"> ~WebEditorClient();
</span><span class="cx">
</span><del>- virtual bool isContinuousSpellCheckingEnabled();
- virtual void toggleGrammarChecking();
- virtual bool isGrammarCheckingEnabled();
- virtual void toggleContinuousSpellChecking();
- virtual int spellCheckerDocumentTag();
</del><ins>+private:
+ bool isContinuousSpellCheckingEnabled() final;
+ void toggleGrammarChecking() final;
+ bool isGrammarCheckingEnabled() final;
+ void toggleContinuousSpellChecking() final;
+ int spellCheckerDocumentTag() final;
</ins><span class="cx">
</span><del>- virtual bool shouldBeginEditing(WebCore::Range*);
- virtual bool shouldEndEditing(WebCore::Range*);
- virtual bool shouldInsertText(const WTF::String&, WebCore::Range*, WebCore::EditorInsertAction);
</del><ins>+ bool shouldBeginEditing(WebCore::Range*) final;
+ bool shouldEndEditing(WebCore::Range*) final;
+ bool shouldInsertText(const WTF::String&, WebCore::Range*, WebCore::EditorInsertAction) final;
</ins><span class="cx">
</span><del>- virtual void didBeginEditing();
- virtual void didEndEditing();
- virtual void willWriteSelectionToPasteboard(WebCore::Range*);
- virtual void didWriteSelectionToPasteboard();
- virtual void getClientPasteboardDataForRange(WebCore::Range*, Vector<String>& pasteboardTypes, Vector<RefPtr<WebCore::SharedBuffer> >& pasteboardData);
</del><ins>+ void didBeginEditing() final;
+ void didEndEditing() final;
+ void willWriteSelectionToPasteboard(WebCore::Range*) final;
+ void didWriteSelectionToPasteboard() final;
+ void getClientPasteboardDataForRange(WebCore::Range*, Vector<String>& pasteboardTypes, Vector<RefPtr<WebCore::SharedBuffer>>& pasteboardData) final;
</ins><span class="cx">
</span><del>- virtual void respondToChangedContents();
- virtual void respondToChangedSelection(WebCore::Frame*);
</del><ins>+ void respondToChangedContents() final;
+ void respondToChangedSelection(WebCore::Frame*) final;
</ins><span class="cx"> void didChangeSelectionAndUpdateLayout() final { }
</span><span class="cx"> void updateEditorStateAfterLayoutIfEditabilityChanged() final { }
</span><span class="cx"> void canceledComposition() final;
</span><span class="cx"> void discardedComposition(WebCore::Frame*) final;
</span><span class="cx">
</span><del>- bool shouldDeleteRange(WebCore::Range*);
</del><ins>+ bool shouldDeleteRange(WebCore::Range*) final;
</ins><span class="cx">
</span><del>- bool shouldInsertNode(WebCore::Node*, WebCore::Range* replacingRange, WebCore::EditorInsertAction);
- bool shouldApplyStyle(WebCore::StyleProperties*, WebCore::Range*);
- void didApplyStyle();
- bool shouldMoveRangeAfterDelete(WebCore::Range*, WebCore::Range*);
- bool shouldChangeTypingStyle(WebCore::StyleProperties* currentStyle, WebCore::StyleProperties* toProposedStyle);
</del><ins>+ bool shouldInsertNode(WebCore::Node*, WebCore::Range* replacingRange, WebCore::EditorInsertAction) final;
+ bool shouldApplyStyle(WebCore::StyleProperties*, WebCore::Range*) final;
+ void didApplyStyle() final;
+ bool shouldMoveRangeAfterDelete(WebCore::Range*, WebCore::Range*) final;
</ins><span class="cx">
</span><del>- void webViewDidChangeTypingStyle(WebNotification*);
- void webViewDidChangeSelection(WebNotification*);
</del><ins>+ bool smartInsertDeleteEnabled() final;
+ bool isSelectTrailingWhitespaceEnabled() final;
</ins><span class="cx">
</span><del>- bool smartInsertDeleteEnabled();
- bool isSelectTrailingWhitespaceEnabled();
-
- void registerUndoStep(PassRefPtr<WebCore::UndoStep>);
- void registerRedoStep(PassRefPtr<WebCore::UndoStep>);
</del><ins>+ void registerUndoStep(WebCore::UndoStep&) final;
+ void registerRedoStep(WebCore::UndoStep&) final;
</ins><span class="cx"> void clearUndoRedoOperations();
</span><span class="cx">
</span><del>- bool canCopyCut(WebCore::Frame*, bool defaultValue) const;
- bool canPaste(WebCore::Frame*, bool defaultValue) const;
- bool canUndo() const;
- bool canRedo() const;
</del><ins>+ bool canCopyCut(WebCore::Frame*, bool defaultValue) const final;
+ bool canPaste(WebCore::Frame*, bool defaultValue) const final;
+ bool canUndo() const final;
+ bool canRedo() const final;
</ins><span class="cx">
</span><del>- void undo();
- void redo();
</del><ins>+ void undo() final;
+ void redo() final;
</ins><span class="cx">
</span><del>- bool shouldChangeSelectedRange(WebCore::Range* fromRange, WebCore::Range* toRange, WebCore::EAffinity, bool stillSelecting) override;
- void textFieldDidBeginEditing(WebCore::Element*) override;
- void textFieldDidEndEditing(WebCore::Element*) override;
- void textDidChangeInTextField(WebCore::Element*) override;
- bool doTextFieldCommandFromEvent(WebCore::Element*, WebCore::KeyboardEvent*) override;
- void textWillBeDeletedInTextField(WebCore::Element* input) override;
- void textDidChangeInTextArea(WebCore::Element*) override;
- void overflowScrollPositionChanged() override { }
</del><ins>+ bool shouldChangeSelectedRange(WebCore::Range* fromRange, WebCore::Range* toRange, WebCore::EAffinity, bool stillSelecting) final;
+ void textFieldDidBeginEditing(WebCore::Element*) final;
+ void textFieldDidEndEditing(WebCore::Element*) final;
+ void textDidChangeInTextField(WebCore::Element*) final;
+ bool doTextFieldCommandFromEvent(WebCore::Element*, WebCore::KeyboardEvent*) final;
+ void textWillBeDeletedInTextField(WebCore::Element* input) final;
+ void textDidChangeInTextArea(WebCore::Element*) final;
+ void overflowScrollPositionChanged() final { }
</ins><span class="cx">
</span><del>- void handleKeyboardEvent(WebCore::KeyboardEvent*);
- void handleInputMethodKeydown(WebCore::KeyboardEvent*);
</del><ins>+ void handleKeyboardEvent(WebCore::KeyboardEvent*) final;
+ void handleInputMethodKeydown(WebCore::KeyboardEvent*) final;
</ins><span class="cx">
</span><del>- bool shouldEraseMarkersAfterChangeSelection(WebCore::TextCheckingType) const override;
- void ignoreWordInSpellDocument(const WTF::String&) override;
- void learnWord(const WTF::String&) override;
- void checkSpellingOfString(StringView, int* misspellingLocation, int* misspellingLength) override;
- WTF::String getAutoCorrectSuggestionForMisspelledWord(const WTF::String&) override;
- void checkGrammarOfString(StringView, Vector<WebCore::GrammarDetail>&, int* badGrammarLocation, int* badGrammarLength) override;
- void updateSpellingUIWithGrammarString(const WTF::String&, const WebCore::GrammarDetail&) override;
- void updateSpellingUIWithMisspelledWord(const WTF::String&) override;
- void showSpellingUI(bool show) override;
- bool spellingUIIsShowing() override;
- void getGuessesForWord(const WTF::String& word, const WTF::String& context, const WebCore::VisibleSelection& currentSelection, WTF::Vector<WTF::String>& guesses) override;
</del><ins>+ bool shouldEraseMarkersAfterChangeSelection(WebCore::TextCheckingType) const final;
+ void ignoreWordInSpellDocument(const WTF::String&) final;
+ void learnWord(const WTF::String&) final;
+ void checkSpellingOfString(StringView, int* misspellingLocation, int* misspellingLength) final;
+ WTF::String getAutoCorrectSuggestionForMisspelledWord(const WTF::String&) final;
+ void checkGrammarOfString(StringView, Vector<WebCore::GrammarDetail>&, int* badGrammarLocation, int* badGrammarLength) final;
+ void updateSpellingUIWithGrammarString(const WTF::String&, const WebCore::GrammarDetail&) final;
+ void updateSpellingUIWithMisspelledWord(const WTF::String&) final;
+ void showSpellingUI(bool show) final;
+ bool spellingUIIsShowing() final;
+ void getGuessesForWord(const WTF::String& word, const WTF::String& context, const WebCore::VisibleSelection& currentSelection, WTF::Vector<WTF::String>& guesses) final;
</ins><span class="cx">
</span><del>- void willSetInputMethodState() override;
- void setInputMethodState(bool) override;
- void requestCheckingOfString(WebCore::TextCheckingRequest&, const WebCore::VisibleSelection&) override { }
</del><ins>+ void willSetInputMethodState() final;
+ void setInputMethodState(bool) final;
+ void requestCheckingOfString(WebCore::TextCheckingRequest&, const WebCore::VisibleSelection&) final { }
</ins><span class="cx">
</span><del>- WebCore::TextCheckerClient* textChecker() override { return this; }
</del><ins>+ WebCore::TextCheckerClient* textChecker() final { return this; }
</ins><span class="cx">
</span><del>-private:
</del><span class="cx"> WebView* m_webView;
</span><span class="cx"> WebEditorUndoTarget* m_undoTarget;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebFrameLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2006-2016 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2006-2017 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -533,7 +533,7 @@
</span><span class="cx"> function(PolicyUse);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebFrameLoaderClient::dispatchDecidePolicyForNewWindowAction(const NavigationAction& action, const ResourceRequest& request, PassRefPtr<FormState> formState, const String& frameName, FramePolicyFunction function)
</del><ins>+void WebFrameLoaderClient::dispatchDecidePolicyForNewWindowAction(const NavigationAction& action, const ResourceRequest& request, FormState* formState, const String& frameName, FramePolicyFunction function)
</ins><span class="cx"> {
</span><span class="cx"> WebView* webView = m_webFrame->webView();
</span><span class="cx"> Frame* coreFrame = core(m_webFrame);
</span><span class="lines">@@ -544,7 +544,7 @@
</span><span class="cx"> policyDelegate = DefaultPolicyDelegate::sharedInstance();
</span><span class="cx">
</span><span class="cx"> COMPtr<IWebURLRequest> urlRequest(AdoptCOM, WebMutableURLRequest::createInstance(request));
</span><del>- COMPtr<WebActionPropertyBag> actionInformation(AdoptCOM, WebActionPropertyBag::createInstance(action, formState ? formState->form() : 0, coreFrame));
</del><ins>+ COMPtr<WebActionPropertyBag> actionInformation(AdoptCOM, WebActionPropertyBag::createInstance(action, formState ? &formState->form() : nullptr, coreFrame));
</ins><span class="cx">
</span><span class="cx"> if (SUCCEEDED(policyDelegate->decidePolicyForNewWindowAction(webView, actionInformation.get(), urlRequest.get(), BString(frameName), setUpPolicyListener(function).get())))
</span><span class="cx"> return;
</span><span class="lines">@@ -552,7 +552,7 @@
</span><span class="cx"> function(PolicyUse);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction(const NavigationAction& action, const ResourceRequest& request, PassRefPtr<FormState> formState, FramePolicyFunction function)
</del><ins>+void WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction(const NavigationAction& action, const ResourceRequest& request, FormState* formState, FramePolicyFunction function)
</ins><span class="cx"> {
</span><span class="cx"> WebView* webView = m_webFrame->webView();
</span><span class="cx"> Frame* coreFrame = core(m_webFrame);
</span><span class="lines">@@ -563,7 +563,7 @@
</span><span class="cx"> policyDelegate = DefaultPolicyDelegate::sharedInstance();
</span><span class="cx">
</span><span class="cx"> COMPtr<IWebURLRequest> urlRequest(AdoptCOM, WebMutableURLRequest::createInstance(request));
</span><del>- COMPtr<WebActionPropertyBag> actionInformation(AdoptCOM, WebActionPropertyBag::createInstance(action, formState ? formState->form() : 0, coreFrame));
</del><ins>+ COMPtr<WebActionPropertyBag> actionInformation(AdoptCOM, WebActionPropertyBag::createInstance(action, formState ? &formState->form() : nullptr, coreFrame));
</ins><span class="cx">
</span><span class="cx"> if (SUCCEEDED(policyDelegate->decidePolicyForNavigationAction(webView, actionInformation.get(), urlRequest.get(), m_webFrame, setUpPolicyListener(function).get())))
</span><span class="cx"> return;
</span><span class="lines">@@ -582,11 +582,11 @@
</span><span class="cx"> policyDelegate->unableToImplementPolicyWithError(webView, webError.get(), m_webFrame);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebFrameLoaderClient::dispatchWillSendSubmitEvent(PassRefPtr<WebCore::FormState>)
</del><ins>+void WebFrameLoaderClient::dispatchWillSendSubmitEvent(Ref<WebCore::FormState>&&)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebFrameLoaderClient::dispatchWillSubmitForm(PassRefPtr<FormState> formState, FramePolicyFunction function)
</del><ins>+void WebFrameLoaderClient::dispatchWillSubmitForm(FormState& formState, FramePolicyFunction function)
</ins><span class="cx"> {
</span><span class="cx"> WebView* webView = m_webFrame->webView();
</span><span class="cx"> Frame* coreFrame = core(m_webFrame);
</span><span class="lines">@@ -599,10 +599,10 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- COMPtr<IDOMElement> formElement(AdoptCOM, DOMElement::createInstance(formState->form()));
</del><ins>+ COMPtr<IDOMElement> formElement(AdoptCOM, DOMElement::createInstance(&formState.form()));
</ins><span class="cx">
</span><span class="cx"> HashMap<String, String> formValuesMap;
</span><del>- const StringPairVector& textFieldValues = formState->textFieldValues();
</del><ins>+ const StringPairVector& textFieldValues = formState.textFieldValues();
</ins><span class="cx"> size_t size = textFieldValues.size();
</span><span class="cx"> for (size_t i = 0; i < size; ++i)
</span><span class="cx"> formValuesMap.add(textFieldValues[i].first, textFieldValues[i].second);
</span><span class="lines">@@ -609,7 +609,7 @@
</span><span class="cx">
</span><span class="cx"> COMPtr<IPropertyBag> formValuesPropertyBag(AdoptCOM, COMPropertyBag<String>::createInstance(formValuesMap));
</span><span class="cx">
</span><del>- COMPtr<WebFrame> sourceFrame(kit(formState->sourceDocument()->frame()));
</del><ins>+ COMPtr<WebFrame> sourceFrame(kit(formState.sourceDocument().frame()));
</ins><span class="cx"> if (SUCCEEDED(formDelegate->willSubmitForm(m_webFrame, sourceFrame.get(), formElement.get(), formValuesPropertyBag.get(), setUpPolicyListener(function).get())))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -1012,29 +1012,21 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<Frame> WebFrameLoaderClient::createFrame(const URL& url, const String& name, HTMLFrameOwnerElement* ownerElement,
- const String& referrer, bool /*allowsScrolling*/, int /*marginWidth*/, int /*marginHeight*/)
</del><ins>+RefPtr<Frame> WebFrameLoaderClient::createFrame(const URL& url, const String& name, HTMLFrameOwnerElement& ownerElement,
+ const String& referrer, bool /*allowsScrolling*/, int /*marginWidth*/, int /*marginHeight*/)
</ins><span class="cx"> {
</span><del>- RefPtr<Frame> result = createFrame(url, name, ownerElement, referrer);
- if (!result)
- return nullptr;
- return result;
-}
-
-RefPtr<Frame> WebFrameLoaderClient::createFrame(const URL& URL, const String& name, HTMLFrameOwnerElement* ownerElement, const String& referrer)
-{
</del><span class="cx"> Frame* coreFrame = core(m_webFrame);
</span><span class="cx"> ASSERT(coreFrame);
</span><span class="cx">
</span><span class="cx"> COMPtr<WebFrame> webFrame(AdoptCOM, WebFrame::createInstance());
</span><span class="cx">
</span><del>- RefPtr<Frame> childFrame = webFrame->createSubframeWithOwnerElement(m_webFrame->webView(), coreFrame->page(), ownerElement);
</del><ins>+ RefPtr<Frame> childFrame = webFrame->createSubframeWithOwnerElement(m_webFrame->webView(), coreFrame->page(), &ownerElement);
</ins><span class="cx">
</span><span class="cx"> childFrame->tree().setName(name);
</span><span class="cx"> coreFrame->tree().appendChild(childFrame);
</span><span class="cx"> childFrame->init();
</span><span class="cx">
</span><del>- coreFrame->loader().loadURLIntoChildFrame(URL, referrer, childFrame.get());
</del><ins>+ coreFrame->loader().loadURLIntoChildFrame(url, referrer, childFrame.get());
</ins><span class="cx">
</span><span class="cx"> // The frame's onload handler may have removed it from the document.
</span><span class="cx"> if (!childFrame->tree().parent())
</span><span class="lines">@@ -1130,7 +1122,7 @@
</span><span class="cx"> resourceLoadDelegate->plugInFailedWithError(webView, error.get(), getWebDataSource(frame->loader().documentLoader()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<Widget> WebFrameLoaderClient::createPlugin(const IntSize& pluginSize, HTMLPlugInElement* element, const URL& url, const Vector<String>& paramNames, const Vector<String>& paramValues, const String& mimeType, bool loadManually)
</del><ins>+RefPtr<Widget> WebFrameLoaderClient::createPlugin(const IntSize& pluginSize, HTMLPlugInElement& element, const URL& url, const Vector<String>& paramNames, const Vector<String>& paramValues, const String& mimeType, bool loadManually)
</ins><span class="cx"> {
</span><span class="cx"> WebView* webView = m_webFrame->webView();
</span><span class="cx">
</span><span class="lines">@@ -1144,7 +1136,7 @@
</span><span class="cx"> for (unsigned i = 0; i < paramNames.size(); i++)
</span><span class="cx"> viewArguments.set(paramNames[i], paramValues[i]);
</span><span class="cx"> COMPtr<IPropertyBag> viewArgumentsBag(AdoptCOM, COMPropertyBag<String>::adopt(viewArguments));
</span><del>- COMPtr<IDOMElement> containingElement(AdoptCOM, DOMElement::createInstance(element));
</del><ins>+ COMPtr<IDOMElement> containingElement(AdoptCOM, DOMElement::createInstance(&element));
</ins><span class="cx">
</span><span class="cx"> HashMap<String, COMVariant> arguments;
</span><span class="cx">
</span><span class="lines">@@ -1162,13 +1154,13 @@
</span><span class="cx"> HRESULT hr = webView->viewWindow(&parentWindow);
</span><span class="cx"> ASSERT(SUCCEEDED(hr));
</span><span class="cx">
</span><del>- return EmbeddedWidget::create(view.get(), element, parentWindow, pluginSize);
</del><ins>+ return EmbeddedWidget::create(view.get(), &element, parentWindow, pluginSize);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Frame* frame = core(m_webFrame);
</span><del>- RefPtr<PluginView> pluginView = PluginView::create(frame, pluginSize, element, url, paramNames, paramValues, mimeType, loadManually);
</del><ins>+ RefPtr<PluginView> pluginView = PluginView::create(frame, pluginSize, &element, url, paramNames, paramValues, mimeType, loadManually);
</ins><span class="cx">
</span><span class="cx"> if (pluginView->status() == PluginStatusLoadedSuccessfully)
</span><span class="cx"> return pluginView;
</span><span class="lines">@@ -1187,18 +1179,18 @@
</span><span class="cx"> m_manualLoader = static_cast<EmbeddedWidget*>(pluginWidget);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Widget> WebFrameLoaderClient::createJavaAppletWidget(const IntSize& pluginSize, HTMLAppletElement* element, const URL& /*baseURL*/, const Vector<String>& paramNames, const Vector<String>& paramValues)
</del><ins>+RefPtr<Widget> WebFrameLoaderClient::createJavaAppletWidget(const IntSize& pluginSize, HTMLAppletElement& element, const URL& /*baseURL*/, const Vector<String>& paramNames, const Vector<String>& paramValues)
</ins><span class="cx"> {
</span><del>- RefPtr<PluginView> pluginView = PluginView::create(core(m_webFrame), pluginSize, element, URL(), paramNames, paramValues, "application/x-java-applet", false);
</del><ins>+ RefPtr<PluginView> pluginView = PluginView::create(core(m_webFrame), pluginSize, &element, URL(), paramNames, paramValues, "application/x-java-applet", false);
</ins><span class="cx">
</span><span class="cx"> // Check if the plugin can be loaded successfully
</span><span class="cx"> if (pluginView->plugin() && pluginView->plugin()->load())
</span><del>- return pluginView;
</del><ins>+ return WTFMove(pluginView);
</ins><span class="cx">
</span><span class="cx"> WebView* webView = m_webFrame->webView();
</span><span class="cx"> COMPtr<IWebResourceLoadDelegate> resourceLoadDelegate;
</span><span class="cx"> if (FAILED(webView->resourceLoadDelegate(&resourceLoadDelegate)))
</span><del>- return pluginView;
</del><ins>+ return WTFMove(pluginView);
</ins><span class="cx">
</span><span class="cx"> COMPtr<CFDictionaryPropertyBag> userInfoBag = CFDictionaryPropertyBag::createInstance();
</span><span class="cx">
</span><span class="lines">@@ -1210,7 +1202,7 @@
</span><span class="cx">
</span><span class="cx"> resourceLoadDelegate->plugInFailedWithError(webView, error.get(), getWebDataSource(coreFrame->loader().documentLoader()));
</span><span class="cx">
</span><del>- return pluginView;
</del><ins>+ return WTFMove(pluginView);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebHistory* WebFrameLoaderClient::webHistory() const
</span><span class="lines">@@ -1260,7 +1252,7 @@
</span><span class="cx"> m_webFrame->webView()->registerForIconNotification(listen);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<FrameNetworkingContext> WebFrameLoaderClient::createNetworkingContext()
</del><ins>+Ref<FrameNetworkingContext> WebFrameLoaderClient::createNetworkingContext()
</ins><span class="cx"> {
</span><span class="cx"> return WebFrameNetworkingContext::create(core(m_webFrame));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2006-2016 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2006-2017 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -49,10 +49,12 @@
</span><span class="cx"> void setWebFrame(WebFrame* webFrame) { m_webFrame = webFrame; }
</span><span class="cx"> WebFrame* webFrame() const { return m_webFrame; }
</span><span class="cx">
</span><del>- virtual bool hasWebView() const;
</del><ins>+ void dispatchDidFailToStartPlugin(const WebCore::PluginView*) const;
</ins><span class="cx">
</span><del>- virtual PassRefPtr<WebCore::FrameNetworkingContext> createNetworkingContext();
</del><ins>+ bool hasWebView() const override;
</ins><span class="cx">
</span><ins>+ Ref<WebCore::FrameNetworkingContext> createNetworkingContext() override;
+
</ins><span class="cx"> void frameLoaderDestroyed() override;
</span><span class="cx"> void makeRepresentation(WebCore::DocumentLoader*) override;
</span><span class="cx"> void forceLayoutForNonHTML() override;
</span><span class="lines">@@ -63,7 +65,7 @@
</span><span class="cx"> void detachedFromParent3() override;
</span><span class="cx">
</span><span class="cx"> void convertMainResourceLoadToDownload(WebCore::DocumentLoader*, WebCore::SessionID, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&) override;
</span><del>- virtual void assignIdentifierToInitialRequest(unsigned long identifier, WebCore::DocumentLoader*, const WebCore::ResourceRequest&);
</del><ins>+ void assignIdentifierToInitialRequest(unsigned long identifier, WebCore::DocumentLoader*, const WebCore::ResourceRequest&) override;
</ins><span class="cx">
</span><span class="cx"> void dispatchWillSendRequest(WebCore::DocumentLoader*, unsigned long identifier, WebCore::ResourceRequest&, const WebCore::ResourceResponse& redirectResponse) override;
</span><span class="cx"> bool shouldUseCredentialStorage(WebCore::DocumentLoader*, unsigned long identifier) override;
</span><span class="lines">@@ -72,7 +74,7 @@
</span><span class="cx"> void dispatchDidReceiveContentLength(WebCore::DocumentLoader*, unsigned long identifier, int dataLength) override;
</span><span class="cx"> void dispatchDidFinishLoading(WebCore::DocumentLoader*, unsigned long identifier) override;
</span><span class="cx"> void dispatchDidFailLoading(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::ResourceError&) override;
</span><del>- virtual bool shouldCacheResponse(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::ResourceResponse&, const unsigned char* data, unsigned long long length);
</del><ins>+ bool shouldCacheResponse(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::ResourceResponse&, const unsigned char* data, unsigned long long length) override;
</ins><span class="cx">
</span><span class="cx"> void dispatchDidDispatchOnloadEvents() override;
</span><span class="cx"> void dispatchDidReceiveServerRedirectForProvisionalLoad() override;
</span><span class="lines">@@ -94,14 +96,14 @@
</span><span class="cx"> void dispatchDidReachLayoutMilestone(WebCore::LayoutMilestones) override;
</span><span class="cx">
</span><span class="cx"> void dispatchDecidePolicyForResponse(const WebCore::ResourceResponse&, const WebCore::ResourceRequest&, WebCore::FramePolicyFunction) override;
</span><del>- void dispatchDecidePolicyForNewWindowAction(const WebCore::NavigationAction&, const WebCore::ResourceRequest&, PassRefPtr<WebCore::FormState>, const WTF::String& frameName, WebCore::FramePolicyFunction) override;
- void dispatchDecidePolicyForNavigationAction(const WebCore::NavigationAction&, const WebCore::ResourceRequest&, PassRefPtr<WebCore::FormState>, WebCore::FramePolicyFunction) override;
</del><ins>+ void dispatchDecidePolicyForNewWindowAction(const WebCore::NavigationAction&, const WebCore::ResourceRequest&, WebCore::FormState*, const WTF::String& frameName, WebCore::FramePolicyFunction) override;
+ void dispatchDecidePolicyForNavigationAction(const WebCore::NavigationAction&, const WebCore::ResourceRequest&, WebCore::FormState*, WebCore::FramePolicyFunction) override;
</ins><span class="cx"> void cancelPolicyCheck() override;
</span><span class="cx">
</span><span class="cx"> void dispatchUnableToImplementPolicy(const WebCore::ResourceError&) override;
</span><span class="cx">
</span><del>- void dispatchWillSendSubmitEvent(PassRefPtr<WebCore::FormState>) override;
- void dispatchWillSubmitForm(PassRefPtr<WebCore::FormState>, WebCore::FramePolicyFunction) override;
</del><ins>+ void dispatchWillSendSubmitEvent(Ref<WebCore::FormState>&&) override;
+ void dispatchWillSubmitForm(WebCore::FormState&, WebCore::FramePolicyFunction) override;
</ins><span class="cx">
</span><span class="cx"> void revertToProvisionalState(WebCore::DocumentLoader*) override;
</span><span class="cx"> bool dispatchDidLoadResourceFromMemoryCache(WebCore::DocumentLoader*, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&, int length) override;
</span><span class="lines">@@ -114,9 +116,9 @@
</span><span class="cx">
</span><span class="cx"> void startDownload(const WebCore::ResourceRequest&, const String& suggestedName = String()) override;
</span><span class="cx">
</span><del>- virtual void progressStarted(WebCore::Frame&);
- virtual void progressEstimateChanged(WebCore::Frame&);
- virtual void progressFinished(WebCore::Frame&);
</del><ins>+ void progressStarted(WebCore::Frame&) override;
+ void progressEstimateChanged(WebCore::Frame&) override;
+ void progressFinished(WebCore::Frame&) override;
</ins><span class="cx">
</span><span class="cx"> void committedLoad(WebCore::DocumentLoader*, const char*, int) override;
</span><span class="cx"> void finishedLoading(WebCore::DocumentLoader*) override;
</span><span class="lines">@@ -149,10 +151,10 @@
</span><span class="cx">
</span><span class="cx"> WTF::String userAgent(const WebCore::URL&) override;
</span><span class="cx">
</span><del>- virtual Ref<WebCore::DocumentLoader> createDocumentLoader(const WebCore::ResourceRequest&, const WebCore::SubstituteData&);
</del><ins>+ Ref<WebCore::DocumentLoader> createDocumentLoader(const WebCore::ResourceRequest&, const WebCore::SubstituteData&) override;
</ins><span class="cx"> void updateCachedDocumentLoader(WebCore::DocumentLoader&) override { }
</span><span class="cx">
</span><del>- virtual void setTitle(const WebCore::StringWithDirection&, const WebCore::URL&);
</del><ins>+ void setTitle(const WebCore::StringWithDirection&, const WebCore::URL&) override;
</ins><span class="cx">
</span><span class="cx"> void savePlatformDataToCachedFrame(WebCore::CachedFrame*) override;
</span><span class="cx"> void transitionToCommittedFromCachedFrame(WebCore::CachedFrame*) override;
</span><span class="lines">@@ -176,15 +178,15 @@
</span><span class="cx">
</span><span class="cx"> void dispatchDidBecomeFrameset(bool) override;
</span><span class="cx">
</span><del>- virtual bool canCachePage() const;
</del><ins>+ bool canCachePage() const override;
</ins><span class="cx">
</span><del>- RefPtr<WebCore::Frame> createFrame(const WebCore::URL&, const WTF::String& name, WebCore::HTMLFrameOwnerElement*,
</del><ins>+ RefPtr<WebCore::Frame> createFrame(const WebCore::URL&, const WTF::String& name, WebCore::HTMLFrameOwnerElement&,
</ins><span class="cx"> const WTF::String& referrer, bool allowsScrolling, int marginWidth, int marginHeight) override;
</span><del>- RefPtr<WebCore::Widget> createPlugin(const WebCore::IntSize&, WebCore::HTMLPlugInElement*, const WebCore::URL&, const Vector<WTF::String>&, const Vector<WTF::String>&, const WTF::String&, bool loadManually) override;
</del><ins>+ RefPtr<WebCore::Widget> createPlugin(const WebCore::IntSize&, WebCore::HTMLPlugInElement&, const WebCore::URL&, const Vector<WTF::String>&, const Vector<WTF::String>&, const WTF::String&, bool loadManually) override;
</ins><span class="cx"> void recreatePlugin(WebCore::Widget*) override { }
</span><span class="cx"> void redirectDataToPlugin(WebCore::Widget* pluginWidget) override;
</span><span class="cx">
</span><del>- PassRefPtr<WebCore::Widget> createJavaAppletWidget(const WebCore::IntSize&, WebCore::HTMLAppletElement*, const WebCore::URL& baseURL, const Vector<WTF::String>& paramNames, const Vector<WTF::String>& paramValues) override;
</del><ins>+ RefPtr<WebCore::Widget> createJavaAppletWidget(const WebCore::IntSize&, WebCore::HTMLAppletElement&, const WebCore::URL& baseURL, const Vector<WTF::String>& paramNames, const Vector<WTF::String>& paramValues) override;
</ins><span class="cx">
</span><span class="cx"> WebCore::ObjectContentType objectContentType(const WebCore::URL&, const WTF::String& mimeType) override;
</span><span class="cx"> WTF::String overrideMediaType() const override;
</span><span class="lines">@@ -196,20 +198,16 @@
</span><span class="cx">
</span><span class="cx"> void registerForIconNotification(bool listen) override;
</span><span class="cx">
</span><del>- virtual bool shouldAlwaysUsePluginDocument(const WTF::String& mimeType) const;
</del><ins>+ bool shouldAlwaysUsePluginDocument(const WTF::String& mimeType) const override;
</ins><span class="cx">
</span><del>- virtual void dispatchDidFailToStartPlugin(const WebCore::PluginView*) const;
-
</del><span class="cx"> void prefetchDNS(const String&) override;
</span><span class="cx">
</span><del>-protected:
</del><ins>+private:
+ WebHistory* webHistory() const;
+
</ins><span class="cx"> class WebFramePolicyListenerPrivate;
</span><span class="cx"> std::unique_ptr<WebFramePolicyListenerPrivate> m_policyListenerPrivate;
</span><span class="cx">
</span><del>-private:
- RefPtr<WebCore::Frame> createFrame(const WebCore::URL&, const WTF::String& name, WebCore::HTMLFrameOwnerElement*, const WTF::String& referrer);
- WebHistory* webHistory() const;
-
</del><span class="cx"> WebFrame* m_webFrame;
</span><span class="cx">
</span><span class="cx"> // Points to the manual loader that data should be redirected to.
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebFrameNetworkingContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebFrameNetworkingContext.h (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebFrameNetworkingContext.h 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebFrameNetworkingContext.h 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -28,9 +28,9 @@
</span><span class="cx">
</span><span class="cx"> class WebFrameNetworkingContext : public WebCore::FrameNetworkingContext {
</span><span class="cx"> public:
</span><del>- static PassRefPtr<WebFrameNetworkingContext> create(WebCore::Frame* frame)
</del><ins>+ static Ref<WebFrameNetworkingContext> create(WebCore::Frame* frame)
</ins><span class="cx"> {
</span><del>- return adoptRef(new WebFrameNetworkingContext(frame));
</del><ins>+ return adoptRef(*new WebFrameNetworkingContext(frame));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if USE(CFURLCONNECTION)
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebKit2/ChangeLog 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -1,3 +1,133 @@
</span><ins>+2017-01-15 Darin Adler <darin@apple.com>
+
+ Remove PassRefPtr from "loader" directory of WebCore
+ https://bugs.webkit.org/show_bug.cgi?id=167055
+
+ Reviewed by Alex Christensen.
+
+ * Shared/APIWebArchive.h: Use RefPtr&& instead of PassRefPtr.
+ * Shared/APIWebArchive.mm:
+ (API::WebArchive::create): Ditto.
+ (API::WebArchive::WebArchive): Ditto.
+ (API::WebArchive::subresources): Ditto.
+ (API::WebArchive::subframeArchives): Ditto.
+
+ * Shared/TextCheckerState.h: Initialize data members so classes
+ using this won't have to explicitly initalize them.
+
+ * UIProcess/WebIconDatabase.cpp:
+ (WebKit::WebIconDatabase::setIconDataForIconURL): Pass a raw
+ pointer to WebCore.
+
+ * UIProcess/WebPageProxy.h: Removed forward declaration of
+ StringPairVector, not needed here.
+
+ * WebProcess/IconDatabase/WebIconDatabaseProxy.cpp:
+ (WebKit::WebIconDatabaseProxy::WebIconDatabaseProxy): Take a reference.
+ (WebKit::WebIconDatabaseProxy::retainIconForPageURL): Updated for reference.
+ (WebKit::WebIconDatabaseProxy::releaseIconForPageURL): Ditto.
+ (WebKit::WebIconDatabaseProxy::synchronousIconForPageURL): Ditto.
+ (WebKit::WebIconDatabaseProxy::loadDecisionForIconURL): Ditto.
+ (WebKit::WebIconDatabaseProxy::receivedIconLoadDecision): Ditto.
+ (WebKit::WebIconDatabaseProxy::iconDataForIconURL): Ditto.
+ (WebKit::WebIconDatabaseProxy::setIconURLForPageURL): Ditto.
+ (WebKit::WebIconDatabaseProxy::setIconDataForIconURL): Ditto.
+ * WebProcess/IconDatabase/WebIconDatabaseProxy.h: Updated for the above.
+ Marked the class final, made most functions private and final.
+
+ * WebProcess/InjectedBundle/InjectedBundleNavigationAction.cpp:
+ (WebKit::InjectedBundleNavigationAction::InjectedBundleNavigationAction):
+ Removed assertion that a pointer is non-null since that pointer is now a
+ reference. Left use of PassRefPtr here for now.z
+
+ * WebProcess/Network/WebLoaderStrategy.cpp:
+ (WebKit::WebLoaderStrategy::scheduleLoad): Updated since application cache
+ host is now a reference rather thna a pointer.
+ * WebProcess/Network/WebResourceLoader.cpp:
+ (WebKit::WebResourceLoader::willSendRequest): Ditto.
+ (WebKit::WebResourceLoader::didReceiveResponse): Ditto.
+ (WebKit::WebResourceLoader::didFailResourceLoad): Ditto.
+
+ * WebProcess/Plugins/PluginView.cpp:
+ (WebKit::buildHTTPHeaders): Got rid of unneeded use of String::format.
+ (WebKit::PluginView::create): Take a reference instead of PassRefPtr.
+ (WebKit::PluginView::PluginView): Ditto. Also moved much of the data
+ member initialization to the class definition.
+ (WebKit::PluginView::recreateAndInitialize): Take Ref&& instead of PassRefPtr.
+ (WebKit::PluginView::manualLoadDidReceiveResponse): Updated for change to
+ ManualStreamState enumeration.
+ (WebKit::PluginView::manualLoadDidReceiveData): Ditto.
+ (WebKit::PluginView::manualLoadDidFinishLoading Ditto.):
+ (WebKit::PluginView::manualLoadDidFail): Ditto.
+ (WebKit::PluginView::liveResourceData): Return RefPtr insead of PassRefPtr.
+ (WebKit::PluginView::redeliverManualStream): Updated for ManualStreamState.
+ * WebProcess/Plugins/PluginView.h: Updated for the above. Also changed
+ ManualStreamState into an enum class.
+
+ * WebProcess/WebCoreSupport/WebChromeClient.cpp: Changed m_page to a reference.
+ (WebKit::WebChromeClient::runOpenPanel): Take both arguments as references.
+ * WebProcess/WebCoreSupport/WebChromeClient.h: Updated for the above.
+
+ * WebProcess/WebCoreSupport/WebEditorClient.cpp:
+ (WebKit::WebEditorClient::registerUndoStep): Take reference instead of PassRefPtr.
+ (WebKit::WebEditorClient::registerRedoStep): Ditto.
+ * WebProcess/WebCoreSupport/WebEditorClient.h: Updated for the above
+
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::dispatchDecidePolicyForNewWindowAction):
+ Updated for change to FrameLoaderClient.
+ (WebKit::WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction): Ditto.
+ (WebKit::WebFrameLoaderClient::dispatchWillSendSubmitEvent): Ditto.
+ (WebKit::WebFrameLoaderClient::dispatchWillSubmitForm): Ditto.
+ (WebKit::WebFrameLoaderClient::createFrame): Ditto.
+ (WebKit::WebFrameLoaderClient::createPlugin): Ditto.
+ (WebKit::WebFrameLoaderClient::recreatePlugin): Ditto.
+ (WebKit::WebFrameLoaderClient::createJavaAppletWidget): Ditto.
+ (WebKit::WebFrameLoaderClient::createNetworkingContext): Ditto.
+ (WebKit::WebFrameLoaderClient::didRequestAutocomplete): Ditto.
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.h: Updated for the above.
+
+ * WebProcess/WebCoreSupport/ios/WebChromeClientIOS.mm:
+ (WebKit::WebChromeClient::didReceiveMobileDocType): Updated since m_page is a
+ reference now.
+ (WebKit::WebChromeClient::observedContentChange): Ditto.
+ (WebKit::WebChromeClient::notifyRevealedSelectionByScrollingFrame): Ditto.
+ (WebKit::WebChromeClient::didLayout): Ditto.
+ (WebKit::WebChromeClient::didStartOverflowScroll): Ditto.
+ (WebKit::WebChromeClient::didEndOverflowScroll): Ditto.
+ (WebKit::WebChromeClient::hasStablePageScaleFactor): Ditto.
+ (WebKit::WebChromeClient::showPlaybackTargetPicker): Ditto.
+ (WebKit::WebChromeClient::eventThrottlingDelay): Ditto.
+ (WebKit::WebChromeClient::deviceOrientation): Ditto.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::WebPage): Pass reference.
+ (WebKit::WebPage::createPlugin): Return RefPtr instead of PassRefPtr.
+ (WebKit::WebPage::fromCorePage): Updated for change to WebChromeClient.
+ (WebKit::WebPage::setHeaderPageBanner): Take pointer instead of PassRefPtr.
+ (WebKit::WebPage::setFooterPageBanner): Ditto.
+ (WebKit::WebPage::setActiveOpenPanelResultListener): Take Ref&& instead of
+ PassRefPtr.
+ (WebKit::WebPage::currentSelectionAsRange): Return RefPtr instead of PassRefPtr.
+ (WebKit::WebPage::rangeFromEditingRange): Ditto.
+ * WebProcess/WebPage/WebPage.h: Updated for the above.
+
+ * WebProcess/WebPage/efl/WebPageEfl.cpp:
+ (WebKit::WebPage::cachedResponseDataForURL): Return RefPtr instead of PassRefPtr.
+ * WebProcess/WebPage/gtk/WebPageGtk.cpp:
+ (WebKit::WebPage::cachedResponseDataForURL): Ditto.
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::cachedResponseDataForURL): Ditto.
+ * WebProcess/WebPage/mac/WebPageMac.mm:
+ (WebKit::WebPage::cachedResponseDataForURL): Ditto.
+ (WebKit::WebPage::setTopOverhangImage): Take raw pointer instead of PassRefPtr.
+ (WebKit::WebPage::setBottomOverhangImage): Ditto.
+
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::WebProcess): Pass a reference. Move most initialization to
+ the class definition.
+ * WebProcess/WebProcess.h: Updaed for the above.
+
</ins><span class="cx"> 2017-01-17 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r210834
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIWebArchiveh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/APIWebArchive.h (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/APIWebArchive.h 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebKit2/Shared/APIWebArchive.h 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx">
</span><span class="cx"> #include "APIObject.h"
</span><del>-#include <wtf/PassRefPtr.h>
</del><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx">
</span><span class="cx"> namespace API {
</span><span class="lines">@@ -50,9 +49,9 @@
</span><span class="cx"> public:
</span><span class="cx"> virtual ~WebArchive();
</span><span class="cx">
</span><del>- static Ref<WebArchive> create(WebArchiveResource* mainResource, PassRefPtr<API::Array> subresources, PassRefPtr<API::Array> subframeArchives);
</del><ins>+ static Ref<WebArchive> create(WebArchiveResource* mainResource, RefPtr<API::Array>&& subresources, RefPtr<API::Array>&& subframeArchives);
</ins><span class="cx"> static Ref<WebArchive> create(API::Data*);
</span><del>- static Ref<WebArchive> create(PassRefPtr<WebCore::LegacyWebArchive>);
</del><ins>+ static Ref<WebArchive> create(RefPtr<WebCore::LegacyWebArchive>&&);
</ins><span class="cx"> static Ref<WebArchive> create(WebCore::Range*);
</span><span class="cx">
</span><span class="cx"> WebArchiveResource* mainResource();
</span><span class="lines">@@ -64,9 +63,9 @@
</span><span class="cx"> WebCore::LegacyWebArchive* coreLegacyWebArchive();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- WebArchive(WebArchiveResource* mainResource, PassRefPtr<API::Array> subresources, PassRefPtr<API::Array> subframeArchives);
</del><ins>+ WebArchive(WebArchiveResource* mainResource, RefPtr<API::Array>&& subresources, RefPtr<API::Array>&& subframeArchives);
</ins><span class="cx"> WebArchive(API::Data*);
</span><del>- WebArchive(PassRefPtr<WebCore::LegacyWebArchive>);
</del><ins>+ WebArchive(RefPtr<WebCore::LegacyWebArchive>&&);
</ins><span class="cx">
</span><span class="cx"> RefPtr<WebCore::LegacyWebArchive> m_legacyWebArchive;
</span><span class="cx"> RefPtr<WebArchiveResource> m_cachedMainResource;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIWebArchivemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/APIWebArchive.mm (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/APIWebArchive.mm 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebKit2/Shared/APIWebArchive.mm 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -38,9 +38,9 @@
</span><span class="cx">
</span><span class="cx"> namespace API {
</span><span class="cx">
</span><del>-Ref<WebArchive> WebArchive::create(WebArchiveResource* mainResource, PassRefPtr<API::Array> subresources, PassRefPtr<API::Array> subframeArchives)
</del><ins>+Ref<WebArchive> WebArchive::create(WebArchiveResource* mainResource, RefPtr<API::Array>&& subresources, RefPtr<API::Array>&& subframeArchives)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new WebArchive(mainResource, subresources, subframeArchives));
</del><ins>+ return adoptRef(*new WebArchive(mainResource, WTFMove(subresources), WTFMove(subframeArchives)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Ref<WebArchive> WebArchive::create(API::Data* data)
</span><span class="lines">@@ -48,9 +48,9 @@
</span><span class="cx"> return adoptRef(*new WebArchive(data));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<WebArchive> WebArchive::create(PassRefPtr<LegacyWebArchive> legacyWebArchive)
</del><ins>+Ref<WebArchive> WebArchive::create(RefPtr<LegacyWebArchive>&& legacyWebArchive)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new WebArchive(legacyWebArchive));
</del><ins>+ return adoptRef(*new WebArchive(legacyWebArchive.releaseNonNull()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Ref<WebArchive> WebArchive::create(Range* range)
</span><span class="lines">@@ -58,31 +58,32 @@
</span><span class="cx"> return adoptRef(*new WebArchive(LegacyWebArchive::create(range)));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebArchive::WebArchive(WebArchiveResource* mainResource, PassRefPtr<API::Array> subresources, PassRefPtr<API::Array> subframeArchives)
</del><ins>+WebArchive::WebArchive(WebArchiveResource* mainResource, RefPtr<API::Array>&& subresources, RefPtr<API::Array>&& subframeArchives)
</ins><span class="cx"> : m_cachedMainResource(mainResource)
</span><span class="cx"> , m_cachedSubresources(subresources)
</span><span class="cx"> , m_cachedSubframeArchives(subframeArchives)
</span><span class="cx"> {
</span><del>- RefPtr<ArchiveResource> coreMainResource = m_cachedMainResource->coreArchiveResource();
</del><ins>+ auto coreMainResource = m_cachedMainResource->coreArchiveResource();
</ins><span class="cx">
</span><del>- Vector<RefPtr<ArchiveResource>> coreArchiveResources;
</del><ins>+ Vector<Ref<ArchiveResource>> coreArchiveResources;
</ins><span class="cx"> coreArchiveResources.reserveInitialCapacity(m_cachedSubresources->size());
</span><span class="cx"> for (size_t i = 0; i < m_cachedSubresources->size(); ++i) {
</span><del>- RefPtr<WebArchiveResource> resource = m_cachedSubresources->at<WebArchiveResource>(i);
</del><ins>+ auto resource = m_cachedSubresources->at<WebArchiveResource>(i);
</ins><span class="cx"> ASSERT(resource);
</span><del>- coreArchiveResources.uncheckedAppend(resource->coreArchiveResource());
</del><ins>+ ASSERT(resource->coreArchiveResource());
+ coreArchiveResources.uncheckedAppend(*resource->coreArchiveResource());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- Vector<RefPtr<LegacyWebArchive>> coreSubframeLegacyWebArchives;
</del><ins>+ Vector<Ref<LegacyWebArchive>> coreSubframeLegacyWebArchives;
</ins><span class="cx"> coreSubframeLegacyWebArchives.reserveInitialCapacity(m_cachedSubframeArchives->size());
</span><del>-
</del><span class="cx"> for (size_t i = 0; i < m_cachedSubframeArchives->size(); ++i) {
</span><del>- RefPtr<WebArchive> subframeWebArchive = m_cachedSubframeArchives->at<WebArchive>(i);
</del><ins>+ auto subframeWebArchive = m_cachedSubframeArchives->at<WebArchive>(i);
</ins><span class="cx"> ASSERT(subframeWebArchive);
</span><del>- coreSubframeLegacyWebArchives.uncheckedAppend(subframeWebArchive->coreLegacyWebArchive());
</del><ins>+ ASSERT(subframeWebArchive->coreLegacyWebArchive());
+ coreSubframeLegacyWebArchives.uncheckedAppend(*subframeWebArchive->coreLegacyWebArchive());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- m_legacyWebArchive = LegacyWebArchive::create(WTFMove(coreMainResource), WTFMove(coreArchiveResources), WTFMove(coreSubframeLegacyWebArchives));
</del><ins>+ m_legacyWebArchive = LegacyWebArchive::create(*coreMainResource, WTFMove(coreArchiveResources), WTFMove(coreSubframeLegacyWebArchives));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebArchive::WebArchive(API::Data* data)
</span><span class="lines">@@ -90,7 +91,7 @@
</span><span class="cx"> m_legacyWebArchive = LegacyWebArchive::create(SharedBuffer::create(data->bytes(), data->size()).get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebArchive::WebArchive(PassRefPtr<LegacyWebArchive> legacyWebArchive)
</del><ins>+WebArchive::WebArchive(RefPtr<LegacyWebArchive>&& legacyWebArchive)
</ins><span class="cx"> : m_legacyWebArchive(legacyWebArchive)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -111,10 +112,8 @@
</span><span class="cx"> if (!m_cachedSubresources) {
</span><span class="cx"> Vector<RefPtr<API::Object>> subresources;
</span><span class="cx"> subresources.reserveInitialCapacity(m_legacyWebArchive->subresources().size());
</span><del>-
- for (const auto& subresource : m_legacyWebArchive->subresources())
- subresources.uncheckedAppend(WebArchiveResource::create(subresource));
-
</del><ins>+ for (auto& subresource : m_legacyWebArchive->subresources())
+ subresources.uncheckedAppend(WebArchiveResource::create(subresource.ptr()));
</ins><span class="cx"> m_cachedSubresources = API::Array::create(WTFMove(subresources));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -126,10 +125,8 @@
</span><span class="cx"> if (!m_cachedSubframeArchives) {
</span><span class="cx"> Vector<RefPtr<API::Object>> subframeWebArchives;
</span><span class="cx"> subframeWebArchives.reserveInitialCapacity(m_legacyWebArchive->subframeArchives().size());
</span><del>-
- for (const auto& subframeArchive : m_legacyWebArchive->subframeArchives())
- subframeWebArchives.uncheckedAppend(WebArchive::create(static_cast<LegacyWebArchive*>(subframeArchive.get())));
-
</del><ins>+ for (auto& subframeArchive : m_legacyWebArchive->subframeArchives())
+ subframeWebArchives.uncheckedAppend(WebArchive::create(static_cast<LegacyWebArchive*>(subframeArchive.ptr())));
</ins><span class="cx"> m_cachedSubframeArchives = API::Array::create(WTFMove(subframeWebArchives));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedTextCheckerStateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/TextCheckerState.h (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/TextCheckerState.h 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebKit2/Shared/TextCheckerState.h 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -23,8 +23,7 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef TextCheckerState_h
-#define TextCheckerState_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "ArgumentCoders.h"
</span><span class="cx">
</span><span class="lines">@@ -31,15 +30,15 @@
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> struct TextCheckerState {
</span><del>- bool isContinuousSpellCheckingEnabled;
- bool isGrammarCheckingEnabled;
</del><ins>+ bool isContinuousSpellCheckingEnabled { false };
+ bool isGrammarCheckingEnabled { false };
</ins><span class="cx">
</span><span class="cx"> #if USE(APPKIT)
</span><del>- bool isAutomaticSpellingCorrectionEnabled;
- bool isAutomaticQuoteSubstitutionEnabled;
- bool isAutomaticDashSubstitutionEnabled;
- bool isAutomaticLinkDetectionEnabled;
- bool isAutomaticTextReplacementEnabled;
</del><ins>+ bool isAutomaticSpellingCorrectionEnabled { false };
+ bool isAutomaticQuoteSubstitutionEnabled { false };
+ bool isAutomaticDashSubstitutionEnabled { false };
+ bool isAutomaticLinkDetectionEnabled { false };
+ bool isAutomaticTextReplacementEnabled { false };
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -48,5 +47,3 @@
</span><span class="cx"> namespace IPC {
</span><span class="cx"> template<> struct ArgumentCoder<WebKit::TextCheckerState> : SimpleArgumentCoder<WebKit::TextCheckerState> { };
</span><span class="cx"> };
</span><del>-
-#endif // TextCheckerState_h
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebIconDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebIconDatabase.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebIconDatabase.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebKit2/UIProcess/WebIconDatabase.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx"> LOG(IconDatabase, "WK2 UIProcess setting icon data (%i bytes) for page URL %s", (int)iconData.size(), iconURL.ascii().data());
</span><span class="cx"> if (!m_iconDatabaseImpl)
</span><span class="cx"> return;
</span><del>- m_iconDatabaseImpl->setIconDataForIconURL(SharedBuffer::create(iconData.data(), iconData.size()), iconURL);
</del><ins>+ m_iconDatabaseImpl->setIconDataForIconURL(SharedBuffer::create(iconData.data(), iconData.size()).ptr(), iconURL);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebIconDatabase::synchronousIconDataForPageURL(const String&, IPC::DataReference& iconData)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -186,7 +186,6 @@
</span><span class="cx"> class RemoteLayerTreeScrollingPerformanceData;
</span><span class="cx"> class RemoteLayerTreeTransaction;
</span><span class="cx"> class RemoteScrollingCoordinatorProxy;
</span><del>-class StringPairVector;
</del><span class="cx"> class UserData;
</span><span class="cx"> class ViewSnapshot;
</span><span class="cx"> class VisitedLinkStore;
</span><span class="lines">@@ -206,11 +205,12 @@
</span><span class="cx"> class WebUserContentControllerProxy;
</span><span class="cx"> class WebWheelEvent;
</span><span class="cx"> class WebsiteDataStore;
</span><ins>+class GamepadData;
+
</ins><span class="cx"> struct AttributedString;
</span><span class="cx"> struct ColorSpaceData;
</span><span class="cx"> struct EditingRange;
</span><span class="cx"> struct EditorState;
</span><del>-class GamepadData;
</del><span class="cx"> struct InteractionInformationRequest;
</span><span class="cx"> struct LoadParameters;
</span><span class="cx"> struct PlatformPopupMenuData;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessIconDatabaseWebIconDatabaseProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -42,11 +42,10 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebIconDatabaseProxy::WebIconDatabaseProxy(WebProcess* process)
- : m_isEnabled(false)
- , m_process(process)
</del><ins>+WebIconDatabaseProxy::WebIconDatabaseProxy(WebProcess& process)
+ : m_process(process)
</ins><span class="cx"> {
</span><del>- m_process->addMessageReceiver(Messages::WebIconDatabaseProxy::messageReceiverName(), *this);
</del><ins>+ m_process.addMessageReceiver(Messages::WebIconDatabaseProxy::messageReceiverName(), *this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebIconDatabaseProxy::isEnabled() const
</span><span class="lines">@@ -65,18 +64,18 @@
</span><span class="cx">
</span><span class="cx"> void WebIconDatabaseProxy::retainIconForPageURL(const String& pageURL)
</span><span class="cx"> {
</span><del>- m_process->parentProcessConnection()->send(Messages::WebProcessProxy::RetainIconForPageURL(pageURL), 0);
</del><ins>+ m_process.parentProcessConnection()->send(Messages::WebProcessProxy::RetainIconForPageURL(pageURL), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebIconDatabaseProxy::releaseIconForPageURL(const String& pageURL)
</span><span class="cx"> {
</span><del>- m_process->parentProcessConnection()->send(Messages::WebProcessProxy::ReleaseIconForPageURL(pageURL), 0);
</del><ins>+ m_process.parentProcessConnection()->send(Messages::WebProcessProxy::ReleaseIconForPageURL(pageURL), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Image* WebIconDatabaseProxy::synchronousIconForPageURL(const String& pageURL, const IntSize& /*size*/)
</span><span class="cx"> {
</span><span class="cx"> IPC::DataReference result;
</span><del>- if (!m_process->parentProcessConnection()->sendSync(Messages::WebIconDatabase::SynchronousIconDataForPageURL(pageURL), Messages::WebIconDatabase::SynchronousIconDataForPageURL::Reply(result), 0))
</del><ins>+ if (!m_process.parentProcessConnection()->sendSync(Messages::WebIconDatabase::SynchronousIconDataForPageURL(pageURL), Messages::WebIconDatabase::SynchronousIconDataForPageURL::Reply(result), 0))
</ins><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> // FIXME: Return Image created with the above data.
</span><span class="lines">@@ -110,34 +109,32 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIconDatabaseProxy::loadDecisionForIconURL(const String& iconURL, PassRefPtr<WebCore::IconLoadDecisionCallback> callback)
</del><ins>+void WebIconDatabaseProxy::loadDecisionForIconURL(const String& iconURL, WebCore::IconLoadDecisionCallback& callback)
</ins><span class="cx"> {
</span><del>- uint64_t id = callback->callbackID();
- m_iconLoadDecisionCallbacks.add(id, callback);
-
- m_process->parentProcessConnection()->send(Messages::WebIconDatabase::GetLoadDecisionForIconURL(iconURL, id), 0);
</del><ins>+ uint64_t id = callback.callbackID();
+ m_iconLoadDecisionCallbacks.add(id, &callback);
+ m_process.parentProcessConnection()->send(Messages::WebIconDatabase::GetLoadDecisionForIconURL(iconURL, id), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebIconDatabaseProxy::receivedIconLoadDecision(int decision, uint64_t callbackID)
</span><span class="cx"> {
</span><del>- RefPtr<WebCore::IconLoadDecisionCallback> callback = m_iconLoadDecisionCallbacks.take(callbackID);
- if (callback)
</del><ins>+ if (auto callback = m_iconLoadDecisionCallbacks.take(callbackID))
</ins><span class="cx"> callback->performCallback(static_cast<WebCore::IconLoadDecision>(decision));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIconDatabaseProxy::iconDataForIconURL(const String& /*iconURL*/, PassRefPtr<WebCore::IconDataCallback>)
</del><ins>+void WebIconDatabaseProxy::iconDataForIconURL(const String&, WebCore::IconDataCallback&)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebIconDatabaseProxy::setIconURLForPageURL(const String& iconURL, const String& pageURL)
</span><span class="cx"> {
</span><del>- m_process->parentProcessConnection()->send(Messages::WebIconDatabase::SetIconURLForPageURL(iconURL, pageURL), 0);
</del><ins>+ m_process.parentProcessConnection()->send(Messages::WebIconDatabase::SetIconURLForPageURL(iconURL, pageURL), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIconDatabaseProxy::setIconDataForIconURL(PassRefPtr<SharedBuffer> iconData, const String& iconURL)
</del><ins>+void WebIconDatabaseProxy::setIconDataForIconURL(SharedBuffer* iconData, const String& iconURL)
</ins><span class="cx"> {
</span><del>- IPC::DataReference data(reinterpret_cast<const uint8_t*>(iconData ? iconData->data() : 0), iconData ? iconData->size() : 0);
- m_process->parentProcessConnection()->send(Messages::WebIconDatabase::SetIconDataForIconURL(data, iconURL), 0);
</del><ins>+ IPC::DataReference data(reinterpret_cast<const uint8_t*>(iconData ? iconData->data() : nullptr), iconData ? iconData->size() : 0);
+ m_process.parentProcessConnection()->send(Messages::WebIconDatabase::SetIconDataForIconURL(data, iconURL), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebIconDatabaseProxy::urlImportFinished()
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessIconDatabaseWebIconDatabaseProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.h (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.h 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.h 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -23,8 +23,7 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef WebIconDatabaseProxy_h
-#define WebIconDatabaseProxy_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "APIObject.h"
</span><span class="cx"> #include "MessageReceiver.h"
</span><span class="lines">@@ -37,43 +36,41 @@
</span><span class="cx">
</span><span class="cx"> class WebProcess;
</span><span class="cx">
</span><del>-class WebIconDatabaseProxy : public WebCore::IconDatabaseBase, private IPC::MessageReceiver {
</del><ins>+class WebIconDatabaseProxy final : public WebCore::IconDatabaseBase, private IPC::MessageReceiver {
</ins><span class="cx"> public:
</span><del>- explicit WebIconDatabaseProxy(WebProcess*);
</del><ins>+ explicit WebIconDatabaseProxy(WebProcess&);
</ins><span class="cx"> virtual ~WebIconDatabaseProxy();
</span><span class="cx">
</span><del>- bool isEnabled() const override;
- void setEnabled(bool) override;
</del><ins>+ void setEnabled(bool) final;
</ins><span class="cx">
</span><del>- void retainIconForPageURL(const String&) override;
- void releaseIconForPageURL(const String&) override;
- void setIconURLForPageURL(const String&, const String&) override;
- void setIconDataForIconURL(PassRefPtr<WebCore::SharedBuffer>, const String&) override;
</del><ins>+private:
+ bool isEnabled() const final;
</ins><span class="cx">
</span><del>- String synchronousIconURLForPageURL(const String&) override;
- bool synchronousIconDataKnownForIconURL(const String&) override;
- WebCore::IconLoadDecision synchronousLoadDecisionForIconURL(const String&, WebCore::DocumentLoader*) override;
- WebCore::Image* synchronousIconForPageURL(const String&, const WebCore::IntSize&) override;
</del><ins>+ void retainIconForPageURL(const String&) final;
+ void releaseIconForPageURL(const String&) final;
+ void setIconURLForPageURL(const String&, const String&) final;
+ void setIconDataForIconURL(WebCore::SharedBuffer*, const String&) final;
+
+ String synchronousIconURLForPageURL(const String&) final;
+ bool synchronousIconDataKnownForIconURL(const String&) final;
+ WebCore::IconLoadDecision synchronousLoadDecisionForIconURL(const String&, WebCore::DocumentLoader*) final;
+ WebCore::Image* synchronousIconForPageURL(const String&, const WebCore::IntSize&) final;
</ins><span class="cx">
</span><del>- // Asynchronous calls we should use to replace the above when supported.
- bool supportsAsynchronousMode() override;
- void loadDecisionForIconURL(const String&, PassRefPtr<WebCore::IconLoadDecisionCallback>) override;
</del><ins>+ bool supportsAsynchronousMode() final;
+ void loadDecisionForIconURL(const String&, WebCore::IconLoadDecisionCallback&) final;
</ins><span class="cx"> void receivedIconLoadDecision(int decision, uint64_t callbackID);
</span><del>- void iconDataForIconURL(const String&, PassRefPtr<WebCore::IconDataCallback>) override;
</del><ins>+ void iconDataForIconURL(const String&, WebCore::IconDataCallback&) final;
</ins><span class="cx">
</span><del>-private:
</del><span class="cx"> // IPC::MessageReceiver
</span><del>- void didReceiveMessage(IPC::Connection&, IPC::Decoder&) override;
</del><ins>+ void didReceiveMessage(IPC::Connection&, IPC::Decoder&) final;
</ins><span class="cx">
</span><span class="cx"> // Callbacks from the UIProcess
</span><span class="cx"> void urlImportFinished();
</span><span class="cx">
</span><del>- bool m_isEnabled;
- WebProcess* m_process;
</del><ins>+ bool m_isEnabled { false };
+ WebProcess& m_process;
</ins><span class="cx">
</span><span class="cx"> HashMap<uint64_t, RefPtr<WebCore::IconLoadDecisionCallback>> m_iconLoadDecisionCallbacks;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><del>-
-#endif // WebIconDatabaseProxy_h
</del></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleInjectedBundleNavigationActioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleNavigationAction.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleNavigationAction.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleNavigationAction.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> return adoptRef(*new InjectedBundleNavigationAction(frame, action, formState));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-InjectedBundleNavigationAction::InjectedBundleNavigationAction(WebFrame* frame, const NavigationAction& navigationAction, PassRefPtr<FormState> prpFormState)
</del><ins>+InjectedBundleNavigationAction::InjectedBundleNavigationAction(WebFrame* frame, const NavigationAction& navigationAction, PassRefPtr<FormState> formState)
</ins><span class="cx"> : m_navigationType(navigationAction.type())
</span><span class="cx"> , m_modifiers(modifiersForNavigationAction(navigationAction))
</span><span class="cx"> , m_mouseButton(WebMouseEvent::NoButton)
</span><span class="lines">@@ -116,11 +116,8 @@
</span><span class="cx"> m_syntheticClickType = syntheticClickTypeForNavigationAction(navigationAction);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RefPtr<FormState> formState = prpFormState;
- if (formState) {
- ASSERT(formState->form());
- m_formElement = InjectedBundleNodeHandle::getOrCreate(formState->form());
- }
</del><ins>+ if (formState)
+ m_formElement = InjectedBundleNodeHandle::getOrCreate(formState->form());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkWebLoaderStrategycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -164,7 +164,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- if (resourceLoader.documentLoader()->applicationCacheHost()->maybeLoadResource(resourceLoader, resourceLoader.request(), resourceLoader.request().url())) {
</del><ins>+ if (resourceLoader.documentLoader()->applicationCacheHost().maybeLoadResource(resourceLoader, resourceLoader.request(), resourceLoader.request().url())) {
</ins><span class="cx"> LOG(NetworkScheduling, "(WebProcess) WebLoaderStrategy::scheduleLoad, url '%s' will be loaded from application cache.", resourceLoader.url().string().utf8().data());
</span><span class="cx"> RELEASE_LOG_IF_ALLOWED(resourceLoader, "scheduleLoad: URL will be loaded from application cache (frame = %p, resourceID = %" PRIu64 ")", resourceLoader.frame(), identifier);
</span><span class="cx"> m_webResourceLoaders.set(identifier, WebResourceLoader::create(resourceLoader, trackingParameters));
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkWebResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<WebResourceLoader> protectedThis(this);
</span><span class="cx">
</span><del>- if (m_coreLoader->documentLoader()->applicationCacheHost()->maybeLoadFallbackForRedirect(m_coreLoader.get(), proposedRequest, redirectResponse))
</del><ins>+ if (m_coreLoader->documentLoader()->applicationCacheHost().maybeLoadFallbackForRedirect(m_coreLoader.get(), proposedRequest, redirectResponse))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_coreLoader->willSendRequest(WTFMove(proposedRequest), redirectResponse, [protectedThis](ResourceRequest&& request) {
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx">
</span><span class="cx"> Ref<WebResourceLoader> protect(*this);
</span><span class="cx">
</span><del>- if (m_coreLoader->documentLoader()->applicationCacheHost()->maybeLoadFallbackForResponse(m_coreLoader.get(), response))
</del><ins>+ if (m_coreLoader->documentLoader()->applicationCacheHost().maybeLoadFallbackForResponse(m_coreLoader.get(), response))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_coreLoader->didReceiveResponse(response);
</span><span class="lines">@@ -156,7 +156,7 @@
</span><span class="cx"> LOG(Network, "(WebProcess) WebResourceLoader::didFailResourceLoad for '%s'", m_coreLoader->url().string().latin1().data());
</span><span class="cx"> RELEASE_LOG_IF_ALLOWED("didFailResourceLoad: (pageID = %" PRIu64 ", frameID = %" PRIu64 ", resourceID = %" PRIu64 ")", m_trackingParameters.pageID, m_trackingParameters.frameID, m_trackingParameters.resourceID);
</span><span class="cx">
</span><del>- if (m_coreLoader->documentLoader()->applicationCacheHost()->maybeLoadFallbackForError(m_coreLoader.get(), error))
</del><ins>+ if (m_coreLoader->documentLoader()->applicationCacheHost().maybeLoadFallbackForError(m_coreLoader.get(), error))
</ins><span class="cx"> return;
</span><span class="cx"> m_coreLoader->didFail(error);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -185,23 +185,19 @@
</span><span class="cx"> if (!response.isHTTP())
</span><span class="cx"> return String();
</span><span class="cx">
</span><del>- StringBuilder stringBuilder;
-
- String statusLine = String::format("HTTP %d ", response.httpStatusCode());
- stringBuilder.append(statusLine);
- stringBuilder.append(response.httpStatusText());
- stringBuilder.append('\n');
-
- HTTPHeaderMap::const_iterator end = response.httpHeaderFields().end();
- for (HTTPHeaderMap::const_iterator it = response.httpHeaderFields().begin(); it != end; ++it) {
- stringBuilder.append(it->key);
- stringBuilder.appendLiteral(": ");
- stringBuilder.append(it->value);
- stringBuilder.append('\n');
</del><ins>+ StringBuilder header;
+ header.appendLiteral("HTTP ");
+ header.appendNumber(response.httpStatusCode());
+ header.append(' ');
+ header.append(response.httpStatusText());
+ header.append('\n');
+ for (auto& field : response.httpHeaderFields()) {
+ header.append(field.key);
+ header.appendLiteral(": ");
+ header.append(field.value);
+ header.append('\n');
</ins><span class="cx"> }
</span><del>-
- String headers = stringBuilder.toString();
-
</del><ins>+
</ins><span class="cx"> // If the content is encoded (most likely compressed), then don't send its length to the plugin,
</span><span class="cx"> // which is only interested in the decoded length, not yet known at the moment.
</span><span class="cx"> // <rdar://problem/4470599> tracks a request for -[NSURLResponse expectedContentLength] to incorporate this logic.
</span><span class="lines">@@ -209,7 +205,7 @@
</span><span class="cx"> if (!contentEncoding.isNull() && contentEncoding != "identity")
</span><span class="cx"> expectedContentLength = -1;
</span><span class="cx">
</span><del>- return headers;
</del><ins>+ return header.toString();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static uint32_t lastModifiedDateMS(const ResourceResponse& response)
</span><span class="lines">@@ -292,37 +288,19 @@
</span><span class="cx"> return webFrame->page();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<PluginView> PluginView::create(PassRefPtr<HTMLPlugInElement> pluginElement, PassRefPtr<Plugin> plugin, const Plugin::Parameters& parameters)
</del><ins>+Ref<PluginView> PluginView::create(HTMLPlugInElement& pluginElement, Ref<Plugin>&& plugin, const Plugin::Parameters& parameters)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new PluginView(pluginElement, plugin, parameters));
</del><ins>+ return adoptRef(*new PluginView(pluginElement, WTFMove(plugin), parameters));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-PluginView::PluginView(PassRefPtr<HTMLPlugInElement> pluginElement, PassRefPtr<Plugin> plugin, const Plugin::Parameters& parameters)
</del><ins>+PluginView::PluginView(HTMLPlugInElement& pluginElement, Ref<Plugin>&& plugin, const Plugin::Parameters& parameters)
</ins><span class="cx"> : PluginViewBase(0)
</span><del>- , m_pluginElement(pluginElement)
- , m_plugin(plugin)
</del><ins>+ , m_pluginElement(&pluginElement)
+ , m_plugin(WTFMove(plugin))
</ins><span class="cx"> , m_webPage(webPage(m_pluginElement.get()))
</span><span class="cx"> , m_parameters(parameters)
</span><del>- , m_isInitialized(false)
- , m_isWaitingForSynchronousInitialization(false)
- , m_isWaitingUntilMediaCanStart(false)
- , m_isBeingDestroyed(false)
- , m_pluginProcessHasCrashed(false)
-#if ENABLE(PRIMARY_SNAPSHOTTED_PLUGIN_HEURISTIC)
- , m_didPlugInStartOffScreen(false)
-#endif
</del><span class="cx"> , m_pendingURLRequestsTimer(RunLoop::main(), this, &PluginView::pendingURLRequestsTimerFired)
</span><del>-#if ENABLE(NETSCAPE_PLUGIN_API)
- , m_npRuntimeObjectMap(this)
-#endif
- , m_manualStreamState(StreamStateInitial)
</del><span class="cx"> , m_pluginSnapshotTimer(*this, &PluginView::pluginSnapshotTimerFired, pluginSnapshotTimerDelay)
</span><del>-#if ENABLE(PRIMARY_SNAPSHOTTED_PLUGIN_HEURISTIC) || PLATFORM(COCOA)
- , m_countSnapshotRetries(0)
-#endif
- , m_didReceiveUserInteraction(false)
- , m_pageScaleFactor(1)
- , m_pluginIsPlayingAudio(false)
</del><span class="cx"> {
</span><span class="cx"> m_webPage->addPluginView(this);
</span><span class="cx"> }
</span><span class="lines">@@ -374,7 +352,7 @@
</span><span class="cx"> cancelAllStreams();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PluginView::recreateAndInitialize(PassRefPtr<Plugin> plugin)
</del><ins>+void PluginView::recreateAndInitialize(Ref<Plugin>&& plugin)
</ins><span class="cx"> {
</span><span class="cx"> if (m_plugin) {
</span><span class="cx"> if (m_pluginSnapshotTimer.isActive())
</span><span class="lines">@@ -382,13 +360,12 @@
</span><span class="cx"> destroyPluginAndReset();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Reset member variables to initial values.
- m_plugin = plugin;
</del><ins>+ m_plugin = WTFMove(plugin);
</ins><span class="cx"> m_isInitialized = false;
</span><span class="cx"> m_isWaitingForSynchronousInitialization = false;
</span><span class="cx"> m_isWaitingUntilMediaCanStart = false;
</span><span class="cx"> m_isBeingDestroyed = false;
</span><del>- m_manualStreamState = StreamStateInitial;
</del><ins>+ m_manualStreamState = ManualStreamState::Initial;
</ins><span class="cx"> m_transientPaintingSnapshot = nullptr;
</span><span class="cx">
</span><span class="cx"> initializePlugin();
</span><span class="lines">@@ -421,8 +398,8 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (!m_isInitialized) {
</span><del>- ASSERT(m_manualStreamState == StreamStateInitial);
- m_manualStreamState = StreamStateHasReceivedResponse;
</del><ins>+ ASSERT(m_manualStreamState == ManualStreamState::Initial);
+ m_manualStreamState = ManualStreamState::HasReceivedResponse;
</ins><span class="cx"> m_manualStreamResponse = response;
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -448,7 +425,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (!m_isInitialized) {
</span><del>- ASSERT(m_manualStreamState == StreamStateHasReceivedResponse);
</del><ins>+ ASSERT(m_manualStreamState == ManualStreamState::HasReceivedResponse);
</ins><span class="cx"> if (!m_manualStreamData)
</span><span class="cx"> m_manualStreamData = SharedBuffer::create();
</span><span class="cx">
</span><span class="lines">@@ -466,8 +443,8 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (!m_isInitialized) {
</span><del>- ASSERT(m_manualStreamState == StreamStateHasReceivedResponse);
- m_manualStreamState = StreamStateFinished;
</del><ins>+ ASSERT(m_manualStreamState == ManualStreamState::HasReceivedResponse);
+ m_manualStreamState = ManualStreamState::Finished;
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -481,7 +458,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (!m_isInitialized) {
</span><del>- m_manualStreamState = StreamStateFinished;
</del><ins>+ m_manualStreamState = ManualStreamState::Finished;
</ins><span class="cx"> m_manualStreamError = error;
</span><span class="cx"> m_manualStreamData = nullptr;
</span><span class="cx"> return;
</span><span class="lines">@@ -1007,7 +984,7 @@
</span><span class="cx"> m_plugin->willDetatchRenderer();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<SharedBuffer> PluginView::liveResourceData() const
</del><ins>+RefPtr<SharedBuffer> PluginView::liveResourceData() const
</ins><span class="cx"> {
</span><span class="cx"> if (!m_isInitialized || !m_plugin)
</span><span class="cx"> return 0;
</span><span class="lines">@@ -1308,12 +1285,12 @@
</span><span class="cx">
</span><span class="cx"> void PluginView::redeliverManualStream()
</span><span class="cx"> {
</span><del>- if (m_manualStreamState == StreamStateInitial) {
</del><ins>+ if (m_manualStreamState == ManualStreamState::Initial) {
</ins><span class="cx"> // Nothing to do.
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (m_manualStreamState == StreamStateFailed) {
</del><ins>+ if (m_manualStreamState == ManualStreamState::Failed) {
</ins><span class="cx"> manualLoadDidFail(m_manualStreamError);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -1334,7 +1311,7 @@
</span><span class="cx"> m_manualStreamData = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (m_manualStreamState == StreamStateFinished)
</del><ins>+ if (m_manualStreamState == ManualStreamState::Finished)
</ins><span class="cx"> manualLoadDidFinishLoading();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -64,9 +64,9 @@
</span><span class="cx">
</span><span class="cx"> class PluginView : public WebCore::PluginViewBase, public PluginController, private WebCore::MediaCanStartListener, private WebFrame::LoadListener, private WebCore::MediaProducer {
</span><span class="cx"> public:
</span><del>- static Ref<PluginView> create(PassRefPtr<WebCore::HTMLPlugInElement>, PassRefPtr<Plugin>, const Plugin::Parameters&);
</del><ins>+ static Ref<PluginView> create(WebCore::HTMLPlugInElement&, Ref<Plugin>&&, const Plugin::Parameters&);
</ins><span class="cx">
</span><del>- void recreateAndInitialize(PassRefPtr<Plugin>);
</del><ins>+ void recreateAndInitialize(Ref<Plugin>&&);
</ins><span class="cx">
</span><span class="cx"> WebCore::Frame* frame() const;
</span><span class="cx">
</span><span class="lines">@@ -112,13 +112,13 @@
</span><span class="cx">
</span><span class="cx"> bool shouldAllowScripting();
</span><span class="cx">
</span><del>- PassRefPtr<WebCore::SharedBuffer> liveResourceData() const;
</del><ins>+ RefPtr<WebCore::SharedBuffer> liveResourceData() const;
</ins><span class="cx"> bool performDictionaryLookupAtLocation(const WebCore::FloatPoint&);
</span><span class="cx"> String getSelectionForWordAtPoint(const WebCore::FloatPoint&) const;
</span><span class="cx"> bool existingSelectionContainsPoint(const WebCore::FloatPoint&) const;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- PluginView(PassRefPtr<WebCore::HTMLPlugInElement>, PassRefPtr<Plugin>, const Plugin::Parameters& parameters);
</del><ins>+ PluginView(WebCore::HTMLPlugInElement&, Ref<Plugin>&&, const Plugin::Parameters&);
</ins><span class="cx"> virtual ~PluginView();
</span><span class="cx">
</span><span class="cx"> void initializePlugin();
</span><span class="lines">@@ -244,14 +244,14 @@
</span><span class="cx"> WebPage* m_webPage;
</span><span class="cx"> Plugin::Parameters m_parameters;
</span><span class="cx">
</span><del>- bool m_isInitialized;
- bool m_isWaitingForSynchronousInitialization;
- bool m_isWaitingUntilMediaCanStart;
- bool m_isBeingDestroyed;
- bool m_pluginProcessHasCrashed;
</del><ins>+ bool m_isInitialized { false };
+ bool m_isWaitingForSynchronousInitialization { false };
+ bool m_isWaitingUntilMediaCanStart { false };
+ bool m_isBeingDestroyed { false };
+ bool m_pluginProcessHasCrashed { false };
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(PRIMARY_SNAPSHOTTED_PLUGIN_HEURISTIC)
</span><del>- bool m_didPlugInStartOffScreen;
</del><ins>+ bool m_didPlugInStartOffScreen { false };
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // Pending URLRequests that the plug-in has made.
</span><span class="lines">@@ -267,18 +267,13 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> // A map of all related NPObjects for this plug-in view.
</span><del>- NPRuntimeObjectMap m_npRuntimeObjectMap;
</del><ins>+ NPRuntimeObjectMap m_npRuntimeObjectMap { this };
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // The manual stream state. This is used so we can deliver a manual stream to a plug-in
</span><span class="cx"> // when it is initialized.
</span><del>- enum ManualStreamState {
- StreamStateInitial,
- StreamStateHasReceivedResponse,
- StreamStateFinished,
- StreamStateFailed
- };
- ManualStreamState m_manualStreamState;
</del><ins>+ enum class ManualStreamState { Initial, HasReceivedResponse, Finished, Failed };
+ ManualStreamState m_manualStreamState { ManualStreamState::Initial };
</ins><span class="cx">
</span><span class="cx"> WebCore::ResourceResponse m_manualStreamResponse;
</span><span class="cx"> WebCore::ResourceError m_manualStreamError;
</span><span class="lines">@@ -289,13 +284,13 @@
</span><span class="cx"> // This timer is used when plugin snapshotting is enabled, to capture a plugin placeholder.
</span><span class="cx"> WebCore::DeferrableOneShotTimer m_pluginSnapshotTimer;
</span><span class="cx"> #if ENABLE(PRIMARY_SNAPSHOTTED_PLUGIN_HEURISTIC) || PLATFORM(COCOA)
</span><del>- unsigned m_countSnapshotRetries;
</del><ins>+ unsigned m_countSnapshotRetries { 0 };
</ins><span class="cx"> #endif
</span><del>- bool m_didReceiveUserInteraction;
</del><ins>+ bool m_didReceiveUserInteraction { false };
</ins><span class="cx">
</span><del>- double m_pageScaleFactor;
</del><ins>+ double m_pageScaleFactor { 1 };
</ins><span class="cx">
</span><del>- bool m_pluginIsPlayingAudio;
</del><ins>+ bool m_pluginIsPlayingAudio { false };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -103,20 +103,20 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-static WebFrame* findLargestFrameInFrameSet(WebPage* page)
</del><ins>+static WebFrame* findLargestFrameInFrameSet(WebPage& page)
</ins><span class="cx"> {
</span><span class="cx"> // Approximate what a user could consider a default target frame for application menu operations.
</span><span class="cx">
</span><del>- WebFrame* mainFrame = page->mainWebFrame();
</del><ins>+ WebFrame* mainFrame = page.mainWebFrame();
</ins><span class="cx"> if (!mainFrame || !mainFrame->isFrameSet())
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><del>- WebFrame* largestSoFar = 0;
</del><ins>+ WebFrame* largestSoFar = nullptr;
</ins><span class="cx">
</span><span class="cx"> Ref<API::Array> frameChildren = mainFrame->childFrames();
</span><span class="cx"> size_t count = frameChildren->size();
</span><span class="cx"> for (size_t i = 0; i < count; ++i) {
</span><del>- WebFrame* childFrame = frameChildren->at<WebFrame>(i);
</del><ins>+ auto* childFrame = frameChildren->at<WebFrame>(i);
</ins><span class="cx"> if (!largestSoFar || area(childFrame) > area(largestSoFar))
</span><span class="cx"> largestSoFar = childFrame;
</span><span class="cx"> }
</span><span class="lines">@@ -124,6 +124,15 @@
</span><span class="cx"> return largestSoFar;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+WebChromeClient::WebChromeClient(WebPage& page)
+ : m_page(page)
+{
+}
+
+inline WebChromeClient::~WebChromeClient()
+{
+}
+
</ins><span class="cx"> void WebChromeClient::chromeDestroyed()
</span><span class="cx"> {
</span><span class="cx"> delete this;
</span><span class="lines">@@ -131,7 +140,7 @@
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::setWindowRect(const FloatRect& windowFrame)
</span><span class="cx"> {
</span><del>- m_page->sendSetWindowFrame(windowFrame);
</del><ins>+ m_page.sendSetWindowFrame(windowFrame);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FloatRect WebChromeClient::windowRect()
</span><span class="lines">@@ -140,13 +149,13 @@
</span><span class="cx"> return FloatRect();
</span><span class="cx"> #else
</span><span class="cx"> #if PLATFORM(MAC)
</span><del>- if (m_page->hasCachedWindowFrame())
- return m_page->windowFrameInUnflippedScreenCoordinates();
</del><ins>+ if (m_page.hasCachedWindowFrame())
+ return m_page.windowFrameInUnflippedScreenCoordinates();
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> FloatRect newWindowFrame;
</span><span class="cx">
</span><del>- if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::GetWindowFrame(), Messages::WebPageProxy::GetWindowFrame::Reply(newWindowFrame), m_page->pageID()))
</del><ins>+ if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::GetWindowFrame(), Messages::WebPageProxy::GetWindowFrame::Reply(newWindowFrame), m_page.pageID()))
</ins><span class="cx"> return FloatRect();
</span><span class="cx">
</span><span class="cx"> return newWindowFrame;
</span><span class="lines">@@ -155,33 +164,33 @@
</span><span class="cx">
</span><span class="cx"> FloatRect WebChromeClient::pageRect()
</span><span class="cx"> {
</span><del>- return FloatRect(FloatPoint(), m_page->size());
</del><ins>+ return FloatRect(FloatPoint(), m_page.size());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::focus()
</span><span class="cx"> {
</span><del>- m_page->send(Messages::WebPageProxy::SetFocus(true));
</del><ins>+ m_page.send(Messages::WebPageProxy::SetFocus(true));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::unfocus()
</span><span class="cx"> {
</span><del>- m_page->send(Messages::WebPageProxy::SetFocus(false));
</del><ins>+ m_page.send(Messages::WebPageProxy::SetFocus(false));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> void WebChromeClient::elementDidFocus(const WebCore::Node* node)
</span><span class="cx"> {
</span><del>- m_page->elementDidFocus(const_cast<WebCore::Node*>(node));
</del><ins>+ m_page.elementDidFocus(const_cast<WebCore::Node*>(node));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::elementDidBlur(const WebCore::Node* node)
</span><span class="cx"> {
</span><del>- m_page->elementDidBlur(const_cast<WebCore::Node*>(node));
</del><ins>+ m_page.elementDidBlur(const_cast<WebCore::Node*>(node));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::makeFirstResponder()
</span><span class="cx"> {
</span><del>- m_page->send(Messages::WebPageProxy::MakeFirstResponder());
</del><ins>+ m_page.send(Messages::WebPageProxy::MakeFirstResponder());
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -193,7 +202,7 @@
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::takeFocus(FocusDirection direction)
</span><span class="cx"> {
</span><del>- m_page->send(Messages::WebPageProxy::TakeFocus(direction));
</del><ins>+ m_page.send(Messages::WebPageProxy::TakeFocus(direction));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::focusedElementChanged(Element* element)
</span><span class="lines">@@ -207,7 +216,7 @@
</span><span class="cx">
</span><span class="cx"> WebFrame* webFrame = WebFrame::fromCoreFrame(*element->document().frame());
</span><span class="cx"> ASSERT(webFrame);
</span><del>- m_page->injectedBundleFormClient().didFocusTextField(m_page, &inputElement, webFrame);
</del><ins>+ m_page.injectedBundleFormClient().didFocusTextField(&m_page, &inputElement, webFrame);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::focusedFrameChanged(Frame* frame)
</span><span class="lines">@@ -214,7 +223,7 @@
</span><span class="cx"> {
</span><span class="cx"> WebFrame* webFrame = frame ? WebFrame::fromCoreFrame(*frame) : nullptr;
</span><span class="cx">
</span><del>- WebProcess::singleton().parentProcessConnection()->send(Messages::WebPageProxy::FocusedFrameChanged(webFrame ? webFrame->frameID() : 0), m_page->pageID());
</del><ins>+ WebProcess::singleton().parentProcessConnection()->send(Messages::WebPageProxy::FocusedFrameChanged(webFrame ? webFrame->frameID() : 0), m_page.pageID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Page* WebChromeClient::createWindow(Frame* frame, const FrameLoadRequest& request, const WindowFeatures& windowFeatures, const NavigationAction& navigationAction)
</span><span class="lines">@@ -234,13 +243,13 @@
</span><span class="cx"> navigationActionData.mouseButton = InjectedBundleNavigationAction::mouseButtonForNavigationAction(navigationAction);
</span><span class="cx"> navigationActionData.syntheticClickType = InjectedBundleNavigationAction::syntheticClickTypeForNavigationAction(navigationAction);
</span><span class="cx"> navigationActionData.userGestureTokenIdentifier = webProcess.userGestureTokenIdentifier(navigationAction.userGestureToken());
</span><del>- navigationActionData.canHandleRequest = m_page->canHandleRequest(request.resourceRequest());
</del><ins>+ navigationActionData.canHandleRequest = m_page.canHandleRequest(request.resourceRequest());
</ins><span class="cx"> navigationActionData.shouldOpenExternalURLsPolicy = navigationAction.shouldOpenExternalURLsPolicy();
</span><span class="cx"> navigationActionData.downloadAttribute = navigationAction.downloadAttribute();
</span><span class="cx">
</span><span class="cx"> uint64_t newPageID = 0;
</span><span class="cx"> WebPageCreationParameters parameters;
</span><del>- if (!webProcess.parentProcessConnection()->sendSync(Messages::WebPageProxy::CreateNewPage(webFrame->frameID(), SecurityOriginData::fromFrame(frame), request.resourceRequest(), windowFeatures, navigationActionData), Messages::WebPageProxy::CreateNewPage::Reply(newPageID, parameters), m_page->pageID()))
</del><ins>+ if (!webProcess.parentProcessConnection()->sendSync(Messages::WebPageProxy::CreateNewPage(webFrame->frameID(), SecurityOriginData::fromFrame(frame), request.resourceRequest(), windowFeatures, navigationActionData), Messages::WebPageProxy::CreateNewPage::Reply(newPageID, parameters), m_page.pageID()))
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> if (!newPageID)
</span><span class="lines">@@ -252,32 +261,32 @@
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::show()
</span><span class="cx"> {
</span><del>- m_page->show();
</del><ins>+ m_page.show();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebChromeClient::canRunModal()
</span><span class="cx"> {
</span><del>- return m_page->canRunModal();
</del><ins>+ return m_page.canRunModal();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::runModal()
</span><span class="cx"> {
</span><del>- m_page->runModal();
</del><ins>+ m_page.runModal();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::setToolbarsVisible(bool toolbarsAreVisible)
</span><span class="cx"> {
</span><del>- m_page->send(Messages::WebPageProxy::SetToolbarsAreVisible(toolbarsAreVisible));
</del><ins>+ m_page.send(Messages::WebPageProxy::SetToolbarsAreVisible(toolbarsAreVisible));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebChromeClient::toolbarsVisible()
</span><span class="cx"> {
</span><del>- API::InjectedBundle::PageUIClient::UIElementVisibility toolbarsVisibility = m_page->injectedBundleUIClient().toolbarsAreVisible(m_page);
</del><ins>+ API::InjectedBundle::PageUIClient::UIElementVisibility toolbarsVisibility = m_page.injectedBundleUIClient().toolbarsAreVisible(&m_page);
</ins><span class="cx"> if (toolbarsVisibility != API::InjectedBundle::PageUIClient::UIElementVisibility::Unknown)
</span><span class="cx"> return toolbarsVisibility == API::InjectedBundle::PageUIClient::UIElementVisibility::Visible;
</span><span class="cx">
</span><span class="cx"> bool toolbarsAreVisible = true;
</span><del>- if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::GetToolbarsAreVisible(), Messages::WebPageProxy::GetToolbarsAreVisible::Reply(toolbarsAreVisible), m_page->pageID()))
</del><ins>+ if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::GetToolbarsAreVisible(), Messages::WebPageProxy::GetToolbarsAreVisible::Reply(toolbarsAreVisible), m_page.pageID()))
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> return toolbarsAreVisible;
</span><span class="lines">@@ -285,17 +294,17 @@
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::setStatusbarVisible(bool statusBarIsVisible)
</span><span class="cx"> {
</span><del>- m_page->send(Messages::WebPageProxy::SetStatusBarIsVisible(statusBarIsVisible));
</del><ins>+ m_page.send(Messages::WebPageProxy::SetStatusBarIsVisible(statusBarIsVisible));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebChromeClient::statusbarVisible()
</span><span class="cx"> {
</span><del>- API::InjectedBundle::PageUIClient::UIElementVisibility statusbarVisibility = m_page->injectedBundleUIClient().statusBarIsVisible(m_page);
</del><ins>+ API::InjectedBundle::PageUIClient::UIElementVisibility statusbarVisibility = m_page.injectedBundleUIClient().statusBarIsVisible(&m_page);
</ins><span class="cx"> if (statusbarVisibility != API::InjectedBundle::PageUIClient::UIElementVisibility::Unknown)
</span><span class="cx"> return statusbarVisibility == API::InjectedBundle::PageUIClient::UIElementVisibility::Visible;
</span><span class="cx">
</span><span class="cx"> bool statusBarIsVisible = true;
</span><del>- if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::GetStatusBarIsVisible(), Messages::WebPageProxy::GetStatusBarIsVisible::Reply(statusBarIsVisible), m_page->pageID()))
</del><ins>+ if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::GetStatusBarIsVisible(), Messages::WebPageProxy::GetStatusBarIsVisible::Reply(statusBarIsVisible), m_page.pageID()))
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> return statusBarIsVisible;
</span><span class="lines">@@ -314,17 +323,17 @@
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::setMenubarVisible(bool menuBarVisible)
</span><span class="cx"> {
</span><del>- m_page->send(Messages::WebPageProxy::SetMenuBarIsVisible(menuBarVisible));
</del><ins>+ m_page.send(Messages::WebPageProxy::SetMenuBarIsVisible(menuBarVisible));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebChromeClient::menubarVisible()
</span><span class="cx"> {
</span><del>- API::InjectedBundle::PageUIClient::UIElementVisibility menubarVisibility = m_page->injectedBundleUIClient().menuBarIsVisible(m_page);
</del><ins>+ API::InjectedBundle::PageUIClient::UIElementVisibility menubarVisibility = m_page.injectedBundleUIClient().menuBarIsVisible(&m_page);
</ins><span class="cx"> if (menubarVisibility != API::InjectedBundle::PageUIClient::UIElementVisibility::Unknown)
</span><span class="cx"> return menubarVisibility == API::InjectedBundle::PageUIClient::UIElementVisibility::Visible;
</span><span class="cx">
</span><span class="cx"> bool menuBarIsVisible = true;
</span><del>- if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::GetMenuBarIsVisible(), Messages::WebPageProxy::GetMenuBarIsVisible::Reply(menuBarIsVisible), m_page->pageID()))
</del><ins>+ if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::GetMenuBarIsVisible(), Messages::WebPageProxy::GetMenuBarIsVisible::Reply(menuBarIsVisible), m_page.pageID()))
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> return menuBarIsVisible;
</span><span class="lines">@@ -332,18 +341,18 @@
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::setResizable(bool resizable)
</span><span class="cx"> {
</span><del>- m_page->send(Messages::WebPageProxy::SetIsResizable(resizable));
</del><ins>+ m_page.send(Messages::WebPageProxy::SetIsResizable(resizable));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::addMessageToConsole(MessageSource source, MessageLevel level, const String& message, unsigned lineNumber, unsigned columnNumber, const String& sourceID)
</span><span class="cx"> {
</span><span class="cx"> // Notify the bundle client.
</span><del>- m_page->injectedBundleUIClient().willAddMessageToConsole(m_page, source, level, message, lineNumber, columnNumber, sourceID);
</del><ins>+ m_page.injectedBundleUIClient().willAddMessageToConsole(&m_page, source, level, message, lineNumber, columnNumber, sourceID);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebChromeClient::canRunBeforeUnloadConfirmPanel()
</span><span class="cx"> {
</span><del>- return m_page->canRunBeforeUnloadConfirmPanel();
</del><ins>+ return m_page.canRunBeforeUnloadConfirmPanel();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebChromeClient::runBeforeUnloadConfirmPanel(const String& message, Frame* frame)
</span><span class="lines">@@ -354,7 +363,7 @@
</span><span class="cx">
</span><span class="cx"> HangDetectionDisabler hangDetectionDisabler;
</span><span class="cx">
</span><del>- if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::RunBeforeUnloadConfirmPanel(message, webFrame->frameID()), Messages::WebPageProxy::RunBeforeUnloadConfirmPanel::Reply(shouldClose), m_page->pageID(), Seconds::infinity(), IPC::SendSyncOption::InformPlatformProcessWillSuspend))
</del><ins>+ if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::RunBeforeUnloadConfirmPanel(message, webFrame->frameID()), Messages::WebPageProxy::RunBeforeUnloadConfirmPanel::Reply(shouldClose), m_page.pageID(), Seconds::infinity(), IPC::SendSyncOption::InformPlatformProcessWillSuspend))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> return shouldClose;
</span><span class="lines">@@ -369,14 +378,14 @@
</span><span class="cx"> // a close execute synchronously as part of window.close, but other parts
</span><span class="cx"> // later on.
</span><span class="cx">
</span><del>- m_page->corePage()->setGroupName(String());
</del><ins>+ m_page.corePage()->setGroupName(String());
</ins><span class="cx">
</span><del>- if (WebFrame* frame = m_page->mainWebFrame()) {
</del><ins>+ if (WebFrame* frame = m_page.mainWebFrame()) {
</ins><span class="cx"> if (Frame* coreFrame = frame->coreFrame())
</span><span class="cx"> coreFrame->loader().stopForUserCancel();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_page->sendClose();
</del><ins>+ m_page.sendClose();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static bool shouldSuppressJavaScriptDialogs(Frame& frame)
</span><span class="lines">@@ -396,11 +405,11 @@
</span><span class="cx"> ASSERT(webFrame);
</span><span class="cx">
</span><span class="cx"> // Notify the bundle client.
</span><del>- m_page->injectedBundleUIClient().willRunJavaScriptAlert(m_page, alertText, webFrame);
</del><ins>+ m_page.injectedBundleUIClient().willRunJavaScriptAlert(&m_page, alertText, webFrame);
</ins><span class="cx">
</span><span class="cx"> HangDetectionDisabler hangDetectionDisabler;
</span><span class="cx">
</span><del>- WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::RunJavaScriptAlert(webFrame->frameID(), SecurityOriginData::fromFrame(frame), alertText), Messages::WebPageProxy::RunJavaScriptAlert::Reply(), m_page->pageID(), Seconds::infinity(), IPC::SendSyncOption::InformPlatformProcessWillSuspend);
</del><ins>+ WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::RunJavaScriptAlert(webFrame->frameID(), SecurityOriginData::fromFrame(frame), alertText), Messages::WebPageProxy::RunJavaScriptAlert::Reply(), m_page.pageID(), Seconds::infinity(), IPC::SendSyncOption::InformPlatformProcessWillSuspend);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebChromeClient::runJavaScriptConfirm(Frame* frame, const String& message)
</span><span class="lines">@@ -412,12 +421,12 @@
</span><span class="cx"> ASSERT(webFrame);
</span><span class="cx">
</span><span class="cx"> // Notify the bundle client.
</span><del>- m_page->injectedBundleUIClient().willRunJavaScriptConfirm(m_page, message, webFrame);
</del><ins>+ m_page.injectedBundleUIClient().willRunJavaScriptConfirm(&m_page, message, webFrame);
</ins><span class="cx">
</span><span class="cx"> HangDetectionDisabler hangDetectionDisabler;
</span><span class="cx">
</span><span class="cx"> bool result = false;
</span><del>- if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::RunJavaScriptConfirm(webFrame->frameID(), SecurityOriginData::fromFrame(frame), message), Messages::WebPageProxy::RunJavaScriptConfirm::Reply(result), m_page->pageID(), Seconds::infinity(), IPC::SendSyncOption::InformPlatformProcessWillSuspend))
</del><ins>+ if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::RunJavaScriptConfirm(webFrame->frameID(), SecurityOriginData::fromFrame(frame), message), Messages::WebPageProxy::RunJavaScriptConfirm::Reply(result), m_page.pageID(), Seconds::infinity(), IPC::SendSyncOption::InformPlatformProcessWillSuspend))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> return result;
</span><span class="lines">@@ -432,11 +441,11 @@
</span><span class="cx"> ASSERT(webFrame);
</span><span class="cx">
</span><span class="cx"> // Notify the bundle client.
</span><del>- m_page->injectedBundleUIClient().willRunJavaScriptPrompt(m_page, message, defaultValue, webFrame);
</del><ins>+ m_page.injectedBundleUIClient().willRunJavaScriptPrompt(&m_page, message, defaultValue, webFrame);
</ins><span class="cx">
</span><span class="cx"> HangDetectionDisabler hangDetectionDisabler;
</span><span class="cx">
</span><del>- if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::RunJavaScriptPrompt(webFrame->frameID(), SecurityOriginData::fromFrame(frame), message, defaultValue), Messages::WebPageProxy::RunJavaScriptPrompt::Reply(result), m_page->pageID(), Seconds::infinity(), IPC::SendSyncOption::InformPlatformProcessWillSuspend))
</del><ins>+ if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::RunJavaScriptPrompt(webFrame->frameID(), SecurityOriginData::fromFrame(frame), message, defaultValue), Messages::WebPageProxy::RunJavaScriptPrompt::Reply(result), m_page.pageID(), Seconds::infinity(), IPC::SendSyncOption::InformPlatformProcessWillSuspend))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> return !result.isNull();
</span><span class="lines">@@ -445,27 +454,29 @@
</span><span class="cx"> void WebChromeClient::setStatusbarText(const String& statusbarText)
</span><span class="cx"> {
</span><span class="cx"> // Notify the bundle client.
</span><del>- m_page->injectedBundleUIClient().willSetStatusbarText(m_page, statusbarText);
</del><ins>+ m_page.injectedBundleUIClient().willSetStatusbarText(&m_page, statusbarText);
</ins><span class="cx">
</span><del>- m_page->send(Messages::WebPageProxy::SetStatusText(statusbarText));
</del><ins>+ m_page.send(Messages::WebPageProxy::SetStatusText(statusbarText));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> KeyboardUIMode WebChromeClient::keyboardUIMode()
</span><span class="cx"> {
</span><del>- return m_page->keyboardUIMode();
</del><ins>+ return m_page.keyboardUIMode();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(POINTER_LOCK)
</span><ins>+
</ins><span class="cx"> bool WebChromeClient::requestPointerLock()
</span><span class="cx"> {
</span><del>- m_page->send(Messages::WebPageProxy::RequestPointerLock());
</del><ins>+ m_page.send(Messages::WebPageProxy::RequestPointerLock());
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::requestPointerUnlock()
</span><span class="cx"> {
</span><del>- m_page->send(Messages::WebPageProxy::RequestPointerUnlock());
</del><ins>+ m_page.send(Messages::WebPageProxy::RequestPointerUnlock());
</ins><span class="cx"> }
</span><ins>+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::invalidateRootView(const IntRect&)
</span><span class="lines">@@ -475,61 +486,61 @@
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::invalidateContentsAndRootView(const IntRect& rect)
</span><span class="cx"> {
</span><del>- if (Document* document = m_page->corePage()->mainFrame().document()) {
</del><ins>+ if (Document* document = m_page.corePage()->mainFrame().document()) {
</ins><span class="cx"> if (document->printing())
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_page->drawingArea()->setNeedsDisplayInRect(rect);
</del><ins>+ m_page.drawingArea()->setNeedsDisplayInRect(rect);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::invalidateContentsForSlowScroll(const IntRect& rect)
</span><span class="cx"> {
</span><del>- if (Document* document = m_page->corePage()->mainFrame().document()) {
</del><ins>+ if (Document* document = m_page.corePage()->mainFrame().document()) {
</ins><span class="cx"> if (document->printing())
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_page->pageDidScroll();
</del><ins>+ m_page.pageDidScroll();
</ins><span class="cx"> #if USE(COORDINATED_GRAPHICS)
</span><del>- m_page->drawingArea()->scroll(rect, IntSize());
</del><ins>+ m_page.drawingArea()->scroll(rect, IntSize());
</ins><span class="cx"> #else
</span><del>- m_page->drawingArea()->setNeedsDisplayInRect(rect);
</del><ins>+ m_page.drawingArea()->setNeedsDisplayInRect(rect);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::scroll(const IntSize& scrollDelta, const IntRect& scrollRect, const IntRect& clipRect)
</span><span class="cx"> {
</span><del>- m_page->pageDidScroll();
- m_page->drawingArea()->scroll(intersection(scrollRect, clipRect), scrollDelta);
</del><ins>+ m_page.pageDidScroll();
+ m_page.drawingArea()->scroll(intersection(scrollRect, clipRect), scrollDelta);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if USE(COORDINATED_GRAPHICS)
</span><span class="cx"> void WebChromeClient::delegatedScrollRequested(const IntPoint& scrollOffset)
</span><span class="cx"> {
</span><del>- m_page->pageDidRequestScroll(scrollOffset);
</del><ins>+ m_page.pageDidRequestScroll(scrollOffset);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> IntPoint WebChromeClient::screenToRootView(const IntPoint& point) const
</span><span class="cx"> {
</span><del>- return m_page->screenToRootView(point);
</del><ins>+ return m_page.screenToRootView(point);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IntRect WebChromeClient::rootViewToScreen(const IntRect& rect) const
</span><span class="cx"> {
</span><del>- return m_page->rootViewToScreen(rect);
</del><ins>+ return m_page.rootViewToScreen(rect);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> IntPoint WebChromeClient::accessibilityScreenToRootView(const IntPoint& point) const
</span><span class="cx"> {
</span><del>- return m_page->accessibilityScreenToRootView(point);
</del><ins>+ return m_page.accessibilityScreenToRootView(point);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IntRect WebChromeClient::rootViewToAccessibilityScreen(const IntRect& rect) const
</span><span class="cx"> {
</span><del>- return m_page->rootViewToAccessibilityScreen(rect);
</del><ins>+ return m_page.rootViewToAccessibilityScreen(rect);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -541,11 +552,11 @@
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::contentsSizeChanged(Frame* frame, const IntSize& size) const
</span><span class="cx"> {
</span><del>- if (!m_page->corePage()->settings().frameFlatteningEnabled()) {
</del><ins>+ if (!m_page.corePage()->settings().frameFlatteningEnabled()) {
</ins><span class="cx"> WebFrame* largestFrame = findLargestFrameInFrameSet(m_page);
</span><span class="cx"> if (largestFrame != m_cachedFrameSetLargestFrame.get()) {
</span><span class="cx"> m_cachedFrameSetLargestFrame = largestFrame;
</span><del>- m_page->send(Messages::WebPageProxy::FrameSetLargestFrameChanged(largestFrame ? largestFrame->frameID() : 0));
</del><ins>+ m_page.send(Messages::WebPageProxy::FrameSetLargestFrameChanged(largestFrame ? largestFrame->frameID() : 0));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -552,9 +563,9 @@
</span><span class="cx"> if (&frame->page()->mainFrame() != frame)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_page->send(Messages::WebPageProxy::DidChangeContentSize(size));
</del><ins>+ m_page.send(Messages::WebPageProxy::DidChangeContentSize(size));
</ins><span class="cx">
</span><del>- m_page->drawingArea()->mainFrameContentSizeChanged(size);
</del><ins>+ m_page.drawingArea()->mainFrameContentSizeChanged(size);
</ins><span class="cx">
</span><span class="cx"> FrameView* frameView = frame->view();
</span><span class="cx"> if (frameView && !frameView->delegatesScrolling()) {
</span><span class="lines">@@ -562,7 +573,7 @@
</span><span class="cx"> bool hasVerticalScrollbar = frameView->verticalScrollbar();
</span><span class="cx">
</span><span class="cx"> if (hasHorizontalScrollbar != m_cachedMainFrameHasHorizontalScrollbar || hasVerticalScrollbar != m_cachedMainFrameHasVerticalScrollbar) {
</span><del>- m_page->send(Messages::WebPageProxy::DidChangeScrollbarsForMainFrame(hasHorizontalScrollbar, hasVerticalScrollbar));
</del><ins>+ m_page.send(Messages::WebPageProxy::DidChangeScrollbarsForMainFrame(hasHorizontalScrollbar, hasVerticalScrollbar));
</ins><span class="cx">
</span><span class="cx"> m_cachedMainFrameHasHorizontalScrollbar = hasHorizontalScrollbar;
</span><span class="cx"> m_cachedMainFrameHasVerticalScrollbar = hasVerticalScrollbar;
</span><span class="lines">@@ -603,12 +614,12 @@
</span><span class="cx"> HTMLPlugInImageElement* pluginElement = static_cast<HTMLPlugInImageElement*>(element);
</span><span class="cx">
</span><span class="cx"> String frameURLString = pluginElement->document().frame()->loader().documentLoader()->responseURL().string();
</span><del>- String pageURLString = m_page->mainFrame()->loader().documentLoader()->responseURL().string();
</del><ins>+ String pageURLString = m_page.mainFrame()->loader().documentLoader()->responseURL().string();
</ins><span class="cx"> String pluginURLString = pluginElement->document().completeURL(pluginElement->url()).string();
</span><span class="cx"> URL pluginspageAttributeURL = element->document().completeURL(stripLeadingAndTrailingHTMLSpaces(pluginElement->getAttribute(pluginspageAttr)));
</span><span class="cx"> if (!pluginspageAttributeURL.protocolIsInHTTPFamily())
</span><span class="cx"> pluginspageAttributeURL = URL();
</span><del>- m_page->send(Messages::WebPageProxy::UnavailablePluginButtonClicked(pluginUnavailabilityReason, pluginElement->serviceType(), pluginURLString, pluginspageAttributeURL.string(), frameURLString, pageURLString));
</del><ins>+ m_page.send(Messages::WebPageProxy::UnavailablePluginButtonClicked(pluginUnavailabilityReason, pluginElement->serviceType(), pluginURLString, pluginspageAttributeURL.string(), frameURLString, pageURLString));
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(element);
</span><span class="cx"> UNUSED_PARAM(pluginUnavailabilityReason);
</span><span class="lines">@@ -625,11 +636,11 @@
</span><span class="cx"> RefPtr<API::Object> userData;
</span><span class="cx">
</span><span class="cx"> // Notify the bundle client.
</span><del>- m_page->injectedBundleUIClient().mouseDidMoveOverElement(m_page, hitTestResult, static_cast<WebEvent::Modifiers>(modifierFlags), userData);
</del><ins>+ m_page.injectedBundleUIClient().mouseDidMoveOverElement(&m_page, hitTestResult, static_cast<WebEvent::Modifiers>(modifierFlags), userData);
</ins><span class="cx">
</span><span class="cx"> // Notify the UIProcess.
</span><span class="cx"> WebHitTestResultData webHitTestResultData(hitTestResult);
</span><del>- m_page->send(Messages::WebPageProxy::MouseDidMoveOverElement(webHitTestResultData, modifierFlags, UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
</del><ins>+ m_page.send(Messages::WebPageProxy::MouseDidMoveOverElement(webHitTestResultData, modifierFlags, UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::setToolTip(const String& toolTip, TextDirection)
</span><span class="lines">@@ -640,7 +651,7 @@
</span><span class="cx"> return;
</span><span class="cx"> m_cachedToolTip = toolTip;
</span><span class="cx">
</span><del>- m_page->send(Messages::WebPageProxy::SetToolTip(m_cachedToolTip));
</del><ins>+ m_page.send(Messages::WebPageProxy::SetToolTip(m_cachedToolTip));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::print(Frame* frame)
</span><span class="lines">@@ -668,7 +679,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- m_page->sendSync(Messages::WebPageProxy::PrintFrame(webFrame->frameID()), Messages::WebPageProxy::PrintFrame::Reply(), Seconds::infinity(), IPC::SendSyncOption::InformPlatformProcessWillSuspend);
</del><ins>+ m_page.sendSync(Messages::WebPageProxy::PrintFrame(webFrame->frameID()), Messages::WebPageProxy::PrintFrame::Reply(), Seconds::infinity(), IPC::SendSyncOption::InformPlatformProcessWillSuspend);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::exceededDatabaseQuota(Frame* frame, const String& databaseName, DatabaseDetails details)
</span><span class="lines">@@ -686,12 +697,12 @@
</span><span class="cx"> auto currentOriginUsage = tracker.usage(originData);
</span><span class="cx"> uint64_t newQuota = 0;
</span><span class="cx"> RefPtr<API::SecurityOrigin> securityOrigin = API::SecurityOrigin::create(WebCore::SecurityOriginData::fromDatabaseIdentifier(WebCore::SecurityOriginData::fromSecurityOrigin(*origin).databaseIdentifier())->securityOrigin());
</span><del>- newQuota = m_page->injectedBundleUIClient().didExceedDatabaseQuota(m_page, securityOrigin.get(), databaseName, details.displayName(), currentQuota, currentOriginUsage, details.currentUsage(), details.expectedUsage());
</del><ins>+ newQuota = m_page.injectedBundleUIClient().didExceedDatabaseQuota(&m_page, securityOrigin.get(), databaseName, details.displayName(), currentQuota, currentOriginUsage, details.currentUsage(), details.expectedUsage());
</ins><span class="cx">
</span><span class="cx"> if (!newQuota) {
</span><span class="cx"> WebProcess::singleton().parentProcessConnection()->sendSync(
</span><span class="cx"> Messages::WebPageProxy::ExceededDatabaseQuota(webFrame->frameID(), WebCore::SecurityOriginData::fromSecurityOrigin(*origin).databaseIdentifier(), databaseName, details.displayName(), currentQuota, currentOriginUsage, details.currentUsage(), details.expectedUsage()),
</span><del>- Messages::WebPageProxy::ExceededDatabaseQuota::Reply(newQuota), m_page->pageID(), Seconds::infinity(), IPC::SendSyncOption::InformPlatformProcessWillSuspend);
</del><ins>+ Messages::WebPageProxy::ExceededDatabaseQuota::Reply(newQuota), m_page.pageID(), Seconds::infinity(), IPC::SendSyncOption::InformPlatformProcessWillSuspend);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> tracker.setQuota(originData, newQuota);
</span><span class="lines">@@ -705,10 +716,10 @@
</span><span class="cx"> void WebChromeClient::reachedApplicationCacheOriginQuota(SecurityOrigin* origin, int64_t totalBytesNeeded)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<API::SecurityOrigin> securityOrigin = API::SecurityOrigin::createFromString(origin->toString());
</span><del>- if (m_page->injectedBundleUIClient().didReachApplicationCacheOriginQuota(m_page, securityOrigin.get(), totalBytesNeeded))
</del><ins>+ if (m_page.injectedBundleUIClient().didReachApplicationCacheOriginQuota(&m_page, securityOrigin.get(), totalBytesNeeded))
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- auto& cacheStorage = m_page->corePage()->applicationCacheStorage();
</del><ins>+ auto& cacheStorage = m_page.corePage()->applicationCacheStorage();
</ins><span class="cx"> int64_t currentQuota = 0;
</span><span class="cx"> if (!cacheStorage.calculateQuotaForOrigin(origin, currentQuota))
</span><span class="cx"> return;
</span><span class="lines">@@ -716,7 +727,7 @@
</span><span class="cx"> uint64_t newQuota = 0;
</span><span class="cx"> WebProcess::singleton().parentProcessConnection()->sendSync(
</span><span class="cx"> Messages::WebPageProxy::ReachedApplicationCacheOriginQuota(WebCore::SecurityOriginData::fromSecurityOrigin(*origin).databaseIdentifier(), currentQuota, totalBytesNeeded),
</span><del>- Messages::WebPageProxy::ReachedApplicationCacheOriginQuota::Reply(newQuota), m_page->pageID(), Seconds::infinity(), IPC::SendSyncOption::InformPlatformProcessWillSuspend);
</del><ins>+ Messages::WebPageProxy::ReachedApplicationCacheOriginQuota::Reply(newQuota), m_page.pageID(), Seconds::infinity(), IPC::SendSyncOption::InformPlatformProcessWillSuspend);
</ins><span class="cx">
</span><span class="cx"> cacheStorage.storeUpdatedQuotaForOrigin(origin, newQuota);
</span><span class="cx"> }
</span><span class="lines">@@ -730,35 +741,32 @@
</span><span class="cx">
</span><span class="cx"> bool WebChromeClient::shouldReplaceWithGeneratedFileForUpload(const String& path, String& generatedFilename)
</span><span class="cx"> {
</span><del>- generatedFilename = m_page->injectedBundleUIClient().shouldGenerateFileForUpload(m_page, path);
</del><ins>+ generatedFilename = m_page.injectedBundleUIClient().shouldGenerateFileForUpload(&m_page, path);
</ins><span class="cx"> return !generatedFilename.isNull();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String WebChromeClient::generateReplacementFile(const String& path)
</span><span class="cx"> {
</span><del>- return m_page->injectedBundleUIClient().generateFileForUpload(m_page, path);
</del><ins>+ return m_page.injectedBundleUIClient().generateFileForUpload(&m_page, path);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INPUT_TYPE_COLOR)
</span><span class="cx"> std::unique_ptr<ColorChooser> WebChromeClient::createColorChooser(ColorChooserClient* client, const Color& initialColor)
</span><span class="cx"> {
</span><del>- return std::make_unique<WebColorChooser>(m_page, client, initialColor);
</del><ins>+ return std::make_unique<WebColorChooser>(&m_page, client, initialColor);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-void WebChromeClient::runOpenPanel(Frame* frame, PassRefPtr<FileChooser> prpFileChooser)
</del><ins>+void WebChromeClient::runOpenPanel(Frame& frame, FileChooser& fileChooser)
</ins><span class="cx"> {
</span><del>- if (m_page->activeOpenPanelResultListener())
</del><ins>+ if (m_page.activeOpenPanelResultListener())
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- RefPtr<FileChooser> fileChooser = prpFileChooser;
</del><ins>+ m_page.setActiveOpenPanelResultListener(WebOpenPanelResultListener::create(&m_page, &fileChooser));
</ins><span class="cx">
</span><del>- m_page->setActiveOpenPanelResultListener(WebOpenPanelResultListener::create(m_page, fileChooser.get()));
-
- WebFrame* webFrame = WebFrame::fromCoreFrame(*frame);
</del><ins>+ auto* webFrame = WebFrame::fromCoreFrame(frame);
</ins><span class="cx"> ASSERT(webFrame);
</span><del>-
- m_page->send(Messages::WebPageProxy::RunOpenPanel(webFrame->frameID(), SecurityOriginData::fromFrame(frame), fileChooser->settings()));
</del><ins>+ m_page.send(Messages::WebPageProxy::RunOpenPanel(webFrame->frameID(), SecurityOriginData::fromFrame(&frame), fileChooser.settings()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::loadIconForFiles(const Vector<String>& filenames, FileIconLoader& loader)
</span><span class="lines">@@ -767,34 +775,38 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><ins>+
</ins><span class="cx"> void WebChromeClient::setCursor(const WebCore::Cursor& cursor)
</span><span class="cx"> {
</span><del>- m_page->send(Messages::WebPageProxy::SetCursor(cursor));
</del><ins>+ m_page.send(Messages::WebPageProxy::SetCursor(cursor));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::setCursorHiddenUntilMouseMoves(bool hiddenUntilMouseMoves)
</span><span class="cx"> {
</span><del>- m_page->send(Messages::WebPageProxy::SetCursorHiddenUntilMouseMoves(hiddenUntilMouseMoves));
</del><ins>+ m_page.send(Messages::WebPageProxy::SetCursorHiddenUntilMouseMoves(hiddenUntilMouseMoves));
</ins><span class="cx"> }
</span><ins>+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if !USE(REQUEST_ANIMATION_FRAME_TIMER)
</span><ins>+
</ins><span class="cx"> void WebChromeClient::scheduleAnimation()
</span><span class="cx"> {
</span><span class="cx"> #if USE(COORDINATED_GRAPHICS)
</span><del>- m_page->drawingArea()->layerTreeHost()->scheduleAnimation();
</del><ins>+ m_page.drawingArea()->layerTreeHost()->scheduleAnimation();
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::didAssociateFormControls(const Vector<RefPtr<WebCore::Element>>& elements)
</span><span class="cx"> {
</span><del>- return m_page->injectedBundleFormClient().didAssociateFormControls(m_page, elements);
</del><ins>+ return m_page.injectedBundleFormClient().didAssociateFormControls(&m_page, elements);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebChromeClient::shouldNotifyOnFormChanges()
</span><span class="cx"> {
</span><del>- return m_page->injectedBundleFormClient().shouldNotifyOnFormChanges(m_page);
</del><ins>+ return m_page.injectedBundleFormClient().shouldNotifyOnFormChanges(&m_page);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebChromeClient::selectItemWritingDirectionIsNatural()
</span><span class="lines">@@ -819,39 +831,41 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<WebCore::PopupMenu> WebChromeClient::createPopupMenu(WebCore::PopupMenuClient* client) const
</span><span class="cx"> {
</span><del>- return WebPopupMenu::create(m_page, client);
</del><ins>+ return WebPopupMenu::create(&m_page, client);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<WebCore::SearchPopupMenu> WebChromeClient::createSearchPopupMenu(WebCore::PopupMenuClient* client) const
</span><span class="cx"> {
</span><del>- return WebSearchPopupMenu::create(m_page, client);
</del><ins>+ return WebSearchPopupMenu::create(&m_page, client);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> GraphicsLayerFactory* WebChromeClient::graphicsLayerFactory() const
</span><span class="cx"> {
</span><del>- if (auto drawingArea = m_page->drawingArea())
</del><ins>+ if (auto drawingArea = m_page.drawingArea())
</ins><span class="cx"> return drawingArea->graphicsLayerFactory();
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
</span><ins>+
</ins><span class="cx"> RefPtr<WebCore::DisplayRefreshMonitor> WebChromeClient::createDisplayRefreshMonitor(PlatformDisplayID displayID) const
</span><span class="cx"> {
</span><del>- return m_page->drawingArea()->createDisplayRefreshMonitor(displayID);
</del><ins>+ return m_page.drawingArea()->createDisplayRefreshMonitor(displayID);
</ins><span class="cx"> }
</span><ins>+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::attachRootGraphicsLayer(Frame*, GraphicsLayer* layer)
</span><span class="cx"> {
</span><span class="cx"> if (layer)
</span><del>- m_page->enterAcceleratedCompositingMode(layer);
</del><ins>+ m_page.enterAcceleratedCompositingMode(layer);
</ins><span class="cx"> else
</span><del>- m_page->exitAcceleratedCompositingMode();
</del><ins>+ m_page.exitAcceleratedCompositingMode();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::attachViewOverlayGraphicsLayer(Frame* frame, GraphicsLayer* graphicsLayer)
</span><span class="cx"> {
</span><del>- if (auto drawingArea = m_page->drawingArea())
</del><ins>+ if (auto drawingArea = m_page.drawingArea())
</ins><span class="cx"> drawingArea->attachViewOverlayGraphicsLayer(frame, graphicsLayer);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -862,128 +876,136 @@
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::scheduleCompositingLayerFlush()
</span><span class="cx"> {
</span><del>- if (m_page->drawingArea())
- m_page->drawingArea()->scheduleCompositingLayerFlush();
</del><ins>+ if (m_page.drawingArea())
+ m_page.drawingArea()->scheduleCompositingLayerFlush();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebChromeClient::adjustLayerFlushThrottling(WebCore::LayerFlushThrottleState::Flags flags)
</span><span class="cx"> {
</span><del>- return m_page->drawingArea() && m_page->drawingArea()->adjustLayerFlushThrottling(flags);
</del><ins>+ return m_page.drawingArea() && m_page.drawingArea()->adjustLayerFlushThrottling(flags);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebChromeClient::layerTreeStateIsFrozen() const
</span><span class="cx"> {
</span><del>- if (m_page->drawingArea())
- return m_page->drawingArea()->layerTreeStateIsFrozen();
</del><ins>+ if (m_page.drawingArea())
+ return m_page.drawingArea()->layerTreeStateIsFrozen();
</ins><span class="cx">
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(ASYNC_SCROLLING)
</span><ins>+
</ins><span class="cx"> PassRefPtr<ScrollingCoordinator> WebChromeClient::createScrollingCoordinator(Page* page) const
</span><span class="cx"> {
</span><del>- ASSERT(m_page->corePage() == page);
- if (m_page->drawingArea()->type() == DrawingAreaTypeRemoteLayerTree)
- return RemoteScrollingCoordinator::create(m_page);
</del><ins>+ ASSERT(m_page.corePage() == page);
+ if (m_page.drawingArea()->type() != DrawingAreaTypeRemoteLayerTree)
+ return nullptr;
+ return RemoteScrollingCoordinator::create(&m_page);
+}
</ins><span class="cx">
</span><del>- return 0;
-}
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if (PLATFORM(IOS) && HAVE(AVKIT)) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
</span><ins>+
</ins><span class="cx"> bool WebChromeClient::supportsVideoFullscreen(WebCore::HTMLMediaElementEnums::VideoFullscreenMode mode)
</span><span class="cx"> {
</span><del>- return m_page->videoFullscreenManager().supportsVideoFullscreen(mode);
</del><ins>+ return m_page.videoFullscreenManager().supportsVideoFullscreen(mode);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::setUpPlaybackControlsManager(WebCore::HTMLMediaElement& mediaElement)
</span><span class="cx"> {
</span><del>- m_page->playbackSessionManager().setUpPlaybackControlsManager(mediaElement);
</del><ins>+ m_page.playbackSessionManager().setUpPlaybackControlsManager(mediaElement);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::clearPlaybackControlsManager()
</span><span class="cx"> {
</span><del>- m_page->playbackSessionManager().clearPlaybackControlsManager();
</del><ins>+ m_page.playbackSessionManager().clearPlaybackControlsManager();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::enterVideoFullscreenForVideoElement(WebCore::HTMLVideoElement& videoElement, WebCore::HTMLMediaElementEnums::VideoFullscreenMode mode)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(mode != HTMLMediaElementEnums::VideoFullscreenModeNone);
</span><del>- m_page->videoFullscreenManager().enterVideoFullscreenForVideoElement(videoElement, mode);
</del><ins>+ m_page.videoFullscreenManager().enterVideoFullscreenForVideoElement(videoElement, mode);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::exitVideoFullscreenForVideoElement(WebCore::HTMLVideoElement& videoElement)
</span><span class="cx"> {
</span><del>- m_page->videoFullscreenManager().exitVideoFullscreenForVideoElement(videoElement);
</del><ins>+ m_page.videoFullscreenManager().exitVideoFullscreenForVideoElement(videoElement);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+#endif
+
</ins><span class="cx"> #if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
</span><ins>+
</ins><span class="cx"> void WebChromeClient::exitVideoFullscreenToModeWithoutAnimation(WebCore::HTMLVideoElement& videoElement, HTMLMediaElementEnums::VideoFullscreenMode targetMode)
</span><span class="cx"> {
</span><del>- m_page->videoFullscreenManager().exitVideoFullscreenToModeWithoutAnimation(videoElement, targetMode);
</del><ins>+ m_page.videoFullscreenManager().exitVideoFullscreenToModeWithoutAnimation(videoElement, targetMode);
</ins><span class="cx"> }
</span><ins>+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>-#endif
-
</del><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span><ins>+
</ins><span class="cx"> bool WebChromeClient::supportsFullScreenForElement(const WebCore::Element*, bool withKeyboard)
</span><span class="cx"> {
</span><del>- return m_page->fullScreenManager()->supportsFullScreen(withKeyboard);
</del><ins>+ return m_page.fullScreenManager()->supportsFullScreen(withKeyboard);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::enterFullScreenForElement(WebCore::Element* element)
</span><span class="cx"> {
</span><del>- m_page->fullScreenManager()->enterFullScreenForElement(element);
</del><ins>+ m_page.fullScreenManager()->enterFullScreenForElement(element);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::exitFullScreenForElement(WebCore::Element* element)
</span><span class="cx"> {
</span><del>- m_page->fullScreenManager()->exitFullScreenForElement(element);
</del><ins>+ m_page.fullScreenManager()->exitFullScreenForElement(element);
</ins><span class="cx"> }
</span><ins>+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><ins>+
</ins><span class="cx"> FloatSize WebChromeClient::screenSize() const
</span><span class="cx"> {
</span><del>- return m_page->screenSize();
</del><ins>+ return m_page.screenSize();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FloatSize WebChromeClient::availableScreenSize() const
</span><span class="cx"> {
</span><del>- return m_page->availableScreenSize();
</del><ins>+ return m_page.availableScreenSize();
</ins><span class="cx"> }
</span><ins>+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::dispatchViewportPropertiesDidChange(const ViewportArguments& viewportArguments) const
</span><span class="cx"> {
</span><del>- m_page->viewportPropertiesDidChange(viewportArguments);
</del><ins>+ m_page.viewportPropertiesDidChange(viewportArguments);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::notifyScrollerThumbIsVisibleInRect(const IntRect& scrollerThumb)
</span><span class="cx"> {
</span><del>- m_page->send(Messages::WebPageProxy::NotifyScrollerThumbIsVisibleInRect(scrollerThumb));
</del><ins>+ m_page.send(Messages::WebPageProxy::NotifyScrollerThumbIsVisibleInRect(scrollerThumb));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::recommendedScrollbarStyleDidChange(ScrollbarStyle newStyle)
</span><span class="cx"> {
</span><del>- m_page->send(Messages::WebPageProxy::RecommendedScrollbarStyleDidChange(static_cast<int32_t>(newStyle)));
</del><ins>+ m_page.send(Messages::WebPageProxy::RecommendedScrollbarStyleDidChange(static_cast<int32_t>(newStyle)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> std::optional<ScrollbarOverlayStyle> WebChromeClient::preferredScrollbarOverlayStyle()
</span><span class="cx"> {
</span><del>- return m_page->scrollbarOverlayStyle();
</del><ins>+ return m_page.scrollbarOverlayStyle();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Color WebChromeClient::underlayColor() const
</span><span class="cx"> {
</span><del>- return m_page->underlayColor();
</del><ins>+ return m_page.underlayColor();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::pageExtendedBackgroundColorDidChange(Color backgroundColor) const
</span><span class="cx"> {
</span><span class="cx"> #if PLATFORM(MAC) || PLATFORM(EFL)
</span><del>- m_page->send(Messages::WebPageProxy::PageExtendedBackgroundColorDidChange(backgroundColor));
</del><ins>+ m_page.send(Messages::WebPageProxy::PageExtendedBackgroundColorDidChange(backgroundColor));
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(backgroundColor);
</span><span class="cx"> #endif
</span><span class="lines">@@ -991,43 +1013,43 @@
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::wheelEventHandlersChanged(bool hasHandlers)
</span><span class="cx"> {
</span><del>- m_page->wheelEventHandlersChanged(hasHandlers);
</del><ins>+ m_page.wheelEventHandlersChanged(hasHandlers);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String WebChromeClient::plugInStartLabelTitle(const String& mimeType) const
</span><span class="cx"> {
</span><del>- return m_page->injectedBundleUIClient().plugInStartLabelTitle(mimeType);
</del><ins>+ return m_page.injectedBundleUIClient().plugInStartLabelTitle(mimeType);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String WebChromeClient::plugInStartLabelSubtitle(const String& mimeType) const
</span><span class="cx"> {
</span><del>- return m_page->injectedBundleUIClient().plugInStartLabelSubtitle(mimeType);
</del><ins>+ return m_page.injectedBundleUIClient().plugInStartLabelSubtitle(mimeType);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String WebChromeClient::plugInExtraStyleSheet() const
</span><span class="cx"> {
</span><del>- return m_page->injectedBundleUIClient().plugInExtraStyleSheet();
</del><ins>+ return m_page.injectedBundleUIClient().plugInExtraStyleSheet();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String WebChromeClient::plugInExtraScript() const
</span><span class="cx"> {
</span><del>- return m_page->injectedBundleUIClient().plugInExtraScript();
</del><ins>+ return m_page.injectedBundleUIClient().plugInExtraScript();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::enableSuddenTermination()
</span><span class="cx"> {
</span><del>- m_page->send(Messages::WebProcessProxy::EnableSuddenTermination());
</del><ins>+ m_page.send(Messages::WebProcessProxy::EnableSuddenTermination());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::disableSuddenTermination()
</span><span class="cx"> {
</span><del>- m_page->send(Messages::WebProcessProxy::DisableSuddenTermination());
</del><ins>+ m_page.send(Messages::WebProcessProxy::DisableSuddenTermination());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::didAddHeaderLayer(GraphicsLayer* headerParent)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(RUBBER_BANDING)
</span><del>- if (PageBanner* banner = m_page->headerPageBanner())
</del><ins>+ if (PageBanner* banner = m_page.headerPageBanner())
</ins><span class="cx"> banner->didAddParentLayer(headerParent);
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(headerParent);
</span><span class="lines">@@ -1037,7 +1059,7 @@
</span><span class="cx"> void WebChromeClient::didAddFooterLayer(GraphicsLayer* footerParent)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(RUBBER_BANDING)
</span><del>- if (PageBanner* banner = m_page->footerPageBanner())
</del><ins>+ if (PageBanner* banner = m_page.footerPageBanner())
</ins><span class="cx"> banner->didAddParentLayer(footerParent);
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(footerParent);
</span><span class="lines">@@ -1046,36 +1068,39 @@
</span><span class="cx">
</span><span class="cx"> bool WebChromeClient::shouldUseTiledBackingForFrameView(const FrameView* frameView) const
</span><span class="cx"> {
</span><del>- return m_page->drawingArea()->shouldUseTiledBackingForFrameView(frameView);
</del><ins>+ return m_page.drawingArea()->shouldUseTiledBackingForFrameView(frameView);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::isPlayingMediaDidChange(WebCore::MediaProducer::MediaStateFlags state, uint64_t sourceElementID)
</span><span class="cx"> {
</span><del>- m_page->send(Messages::WebPageProxy::IsPlayingMediaDidChange(state, sourceElementID));
</del><ins>+ m_page.send(Messages::WebPageProxy::IsPlayingMediaDidChange(state, sourceElementID));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_SESSION)
</span><ins>+
</ins><span class="cx"> void WebChromeClient::hasMediaSessionWithActiveMediaElementsDidChange(bool state)
</span><span class="cx"> {
</span><del>- m_page->send(Messages::WebPageProxy::HasMediaSessionWithActiveMediaElementsDidChange(state));
</del><ins>+ m_page.send(Messages::WebPageProxy::HasMediaSessionWithActiveMediaElementsDidChange(state));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::mediaSessionMetadataDidChange(const WebCore::MediaSessionMetadata& metadata)
</span><span class="cx"> {
</span><del>- m_page->send(Messages::WebPageProxy::MediaSessionMetadataDidChange(metadata));
</del><ins>+ m_page.send(Messages::WebPageProxy::MediaSessionMetadataDidChange(metadata));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::focusedContentMediaElementDidChange(uint64_t elementID)
</span><span class="cx"> {
</span><del>- m_page->send(Messages::WebPageProxy::FocusedContentMediaElementDidChange(elementID));
</del><ins>+ m_page.send(Messages::WebPageProxy::FocusedContentMediaElementDidChange(elementID));
</ins><span class="cx"> }
</span><ins>+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SUBTLE_CRYPTO)
</span><ins>+
</ins><span class="cx"> bool WebChromeClient::wrapCryptoKey(const Vector<uint8_t>& key, Vector<uint8_t>& wrappedKey) const
</span><span class="cx"> {
</span><span class="cx"> bool succeeded;
</span><del>- if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::WrapCryptoKey(key), Messages::WebPageProxy::WrapCryptoKey::Reply(succeeded, wrappedKey), m_page->pageID()))
</del><ins>+ if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::WrapCryptoKey(key), Messages::WebPageProxy::WrapCryptoKey::Reply(succeeded, wrappedKey), m_page.pageID()))
</ins><span class="cx"> return false;
</span><span class="cx"> return succeeded;
</span><span class="cx"> }
</span><span class="lines">@@ -1083,23 +1108,27 @@
</span><span class="cx"> bool WebChromeClient::unwrapCryptoKey(const Vector<uint8_t>& wrappedKey, Vector<uint8_t>& key) const
</span><span class="cx"> {
</span><span class="cx"> bool succeeded;
</span><del>- if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::UnwrapCryptoKey(wrappedKey), Messages::WebPageProxy::UnwrapCryptoKey::Reply(succeeded, key), m_page->pageID()))
</del><ins>+ if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::UnwrapCryptoKey(wrappedKey), Messages::WebPageProxy::UnwrapCryptoKey::Reply(succeeded, key), m_page.pageID()))
</ins><span class="cx"> return false;
</span><span class="cx"> return succeeded;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(TELEPHONE_NUMBER_DETECTION) && PLATFORM(MAC)
</span><ins>+
</ins><span class="cx"> void WebChromeClient::handleTelephoneNumberClick(const String& number, const WebCore::IntPoint& point)
</span><span class="cx"> {
</span><del>- m_page->handleTelephoneNumberClick(number, point);
</del><ins>+ m_page.handleTelephoneNumberClick(number, point);
</ins><span class="cx"> }
</span><ins>+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SERVICE_CONTROLS)
</span><ins>+
</ins><span class="cx"> void WebChromeClient::handleSelectionServiceClick(WebCore::FrameSelection& selection, const Vector<String>& telephoneNumbers, const WebCore::IntPoint& point)
</span><span class="cx"> {
</span><del>- m_page->handleSelectionServiceClick(selection, telephoneNumbers, point);
</del><ins>+ m_page.handleSelectionServiceClick(selection, telephoneNumbers, point);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebChromeClient::hasRelevantSelectionServices(bool isTextOnly) const
</span><span class="lines">@@ -1106,11 +1135,12 @@
</span><span class="cx"> {
</span><span class="cx"> return (isTextOnly && WebProcess::singleton().hasSelectionServices()) || WebProcess::singleton().hasRichContentServices();
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> bool WebChromeClient::shouldDispatchFakeMouseMoveEvents() const
</span><span class="cx"> {
</span><del>- return m_page->shouldDispatchFakeMouseMoveEvents();
</del><ins>+ return m_page.shouldDispatchFakeMouseMoveEvents();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::handleAutoFillButtonClick(HTMLInputElement& inputElement)
</span><span class="lines">@@ -1119,64 +1149,65 @@
</span><span class="cx">
</span><span class="cx"> // Notify the bundle client.
</span><span class="cx"> auto nodeHandle = InjectedBundleNodeHandle::getOrCreate(inputElement);
</span><del>- m_page->injectedBundleUIClient().didClickAutoFillButton(*m_page, nodeHandle.get(), userData);
</del><ins>+ m_page.injectedBundleUIClient().didClickAutoFillButton(m_page, nodeHandle.get(), userData);
</ins><span class="cx">
</span><span class="cx"> // Notify the UIProcess.
</span><del>- m_page->send(Messages::WebPageProxy::HandleAutoFillButtonClick(UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
</del><ins>+ m_page.send(Messages::WebPageProxy::HandleAutoFillButtonClick(UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS)
</span><ins>+
</ins><span class="cx"> void WebChromeClient::addPlaybackTargetPickerClient(uint64_t contextId)
</span><span class="cx"> {
</span><del>- m_page->send(Messages::WebPageProxy::AddPlaybackTargetPickerClient(contextId));
</del><ins>+ m_page.send(Messages::WebPageProxy::AddPlaybackTargetPickerClient(contextId));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::removePlaybackTargetPickerClient(uint64_t contextId)
</span><span class="cx"> {
</span><del>- m_page->send(Messages::WebPageProxy::RemovePlaybackTargetPickerClient(contextId));
</del><ins>+ m_page.send(Messages::WebPageProxy::RemovePlaybackTargetPickerClient(contextId));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><span class="cx"> void WebChromeClient::showPlaybackTargetPicker(uint64_t contextId, const WebCore::IntPoint& position, bool isVideo)
</span><span class="cx"> {
</span><del>- FrameView* frameView = m_page->mainFrame()->view();
</del><ins>+ FrameView* frameView = m_page.mainFrame()->view();
</ins><span class="cx"> FloatRect rect(frameView->contentsToRootView(frameView->windowToContents(position)), FloatSize());
</span><del>- m_page->send(Messages::WebPageProxy::ShowPlaybackTargetPicker(contextId, rect, isVideo));
</del><ins>+ m_page.send(Messages::WebPageProxy::ShowPlaybackTargetPicker(contextId, rect, isVideo));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::playbackTargetPickerClientStateDidChange(uint64_t contextId, WebCore::MediaProducer::MediaStateFlags state)
</span><span class="cx"> {
</span><del>- m_page->send(Messages::WebPageProxy::PlaybackTargetPickerClientStateDidChange(contextId, state));
</del><ins>+ m_page.send(Messages::WebPageProxy::PlaybackTargetPickerClientStateDidChange(contextId, state));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::setMockMediaPlaybackTargetPickerEnabled(bool enabled)
</span><span class="cx"> {
</span><del>- m_page->send(Messages::WebPageProxy::SetMockMediaPlaybackTargetPickerEnabled(enabled));
</del><ins>+ m_page.send(Messages::WebPageProxy::SetMockMediaPlaybackTargetPickerEnabled(enabled));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::setMockMediaPlaybackTargetPickerState(const String& name, WebCore::MediaPlaybackTargetContext::State state)
</span><span class="cx"> {
</span><del>- m_page->send(Messages::WebPageProxy::SetMockMediaPlaybackTargetPickerState(name, state));
</del><ins>+ m_page.send(Messages::WebPageProxy::SetMockMediaPlaybackTargetPickerState(name, state));
</ins><span class="cx"> }
</span><ins>+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::imageOrMediaDocumentSizeChanged(const WebCore::IntSize& newSize)
</span><span class="cx"> {
</span><del>- m_page->imageOrMediaDocumentSizeChanged(newSize);
</del><ins>+ m_page.imageOrMediaDocumentSizeChanged(newSize);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(VIDEO)
-#if USE(GSTREAMER)
</del><ins>+#if ENABLE(VIDEO) && USE(GSTREAMER)
+
</ins><span class="cx"> void WebChromeClient::requestInstallMissingMediaPlugins(const String& details, const String& description, WebCore::MediaPlayerRequestInstallMissingPluginsCallback& callback)
</span><span class="cx"> {
</span><del>- m_page->requestInstallMissingMediaPlugins(details, description, callback);
</del><ins>+ m_page.requestInstallMissingMediaPlugins(details, description, callback);
</ins><span class="cx"> }
</span><ins>+
</ins><span class="cx"> #endif
</span><del>-#endif // ENABLE(VIDEO)
</del><span class="cx">
</span><span class="cx"> void WebChromeClient::didInvalidateDocumentMarkerRects()
</span><span class="cx"> {
</span><del>- m_page->findController().didInvalidateDocumentMarkerRects();
</del><ins>+ m_page.findController().didInvalidateDocumentMarkerRects();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -26,198 +26,196 @@
</span><span class="cx">
</span><span class="cx"> #pragma once
</span><span class="cx">
</span><del>-#include "WebFrame.h"
</del><span class="cx"> #include <WebCore/ChromeClient.h>
</span><del>-#include <WebCore/ViewportArguments.h>
-#include <wtf/text/WTFString.h>
</del><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><ins>+class WebFrame;
</ins><span class="cx"> class WebPage;
</span><span class="cx">
</span><del>-class WebChromeClient : public WebCore::ChromeClient {
</del><ins>+class WebChromeClient final : public WebCore::ChromeClient {
</ins><span class="cx"> public:
</span><del>- WebChromeClient(WebPage* page)
- : m_cachedMainFrameHasHorizontalScrollbar(false)
- , m_cachedMainFrameHasVerticalScrollbar(false)
- , m_page(page)
- {
- }
-
- WebPage* page() const { return m_page; }
</del><ins>+ WebChromeClient(WebPage&);
</ins><span class="cx">
</span><del>- virtual void* webView() const { return 0; }
</del><ins>+ WebPage& page() const { return m_page; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><del>- void chromeDestroyed() override;
</del><ins>+ ~WebChromeClient();
+
+ void chromeDestroyed() final;
</ins><span class="cx">
</span><del>- void setWindowRect(const WebCore::FloatRect&) override;
- WebCore::FloatRect windowRect() override;
</del><ins>+ void setWindowRect(const WebCore::FloatRect&) final;
+ WebCore::FloatRect windowRect() final;
</ins><span class="cx">
</span><del>- WebCore::FloatRect pageRect() override;
</del><ins>+ WebCore::FloatRect pageRect() final;
</ins><span class="cx">
</span><del>- void focus() override;
- void unfocus() override;
</del><ins>+ void focus() final;
+ void unfocus() final;
</ins><span class="cx">
</span><del>- bool canTakeFocus(WebCore::FocusDirection) override;
- void takeFocus(WebCore::FocusDirection) override;
</del><ins>+ bool canTakeFocus(WebCore::FocusDirection) final;
+ void takeFocus(WebCore::FocusDirection) final;
</ins><span class="cx">
</span><del>- void focusedElementChanged(WebCore::Element*) override;
- void focusedFrameChanged(WebCore::Frame*) override;
</del><ins>+ void focusedElementChanged(WebCore::Element*) final;
+ void focusedFrameChanged(WebCore::Frame*) final;
</ins><span class="cx">
</span><span class="cx"> // The Frame pointer provides the ChromeClient with context about which
</span><span class="cx"> // Frame wants to create the new Page. Also, the newly created window
</span><span class="cx"> // should not be shown to the user until the ChromeClient of the newly
</span><span class="cx"> // created Page has its show method called.
</span><del>- WebCore::Page* createWindow(WebCore::Frame*, const WebCore::FrameLoadRequest&, const WebCore::WindowFeatures&, const WebCore::NavigationAction&) override;
- void show() override;
</del><ins>+ WebCore::Page* createWindow(WebCore::Frame*, const WebCore::FrameLoadRequest&, const WebCore::WindowFeatures&, const WebCore::NavigationAction&) final;
+ void show() final;
</ins><span class="cx">
</span><del>- bool canRunModal() override;
- void runModal() override;
</del><ins>+ bool canRunModal() final;
+ void runModal() final;
</ins><span class="cx">
</span><del>- void setToolbarsVisible(bool) override;
- bool toolbarsVisible() override;
</del><ins>+ void setToolbarsVisible(bool) final;
+ bool toolbarsVisible() final;
</ins><span class="cx">
</span><del>- void setStatusbarVisible(bool) override;
- bool statusbarVisible() override;
</del><ins>+ void setStatusbarVisible(bool) final;
+ bool statusbarVisible() final;
</ins><span class="cx">
</span><del>- void setScrollbarsVisible(bool) override;
- bool scrollbarsVisible() override;
</del><ins>+ void setScrollbarsVisible(bool) final;
+ bool scrollbarsVisible() final;
</ins><span class="cx">
</span><del>- void setMenubarVisible(bool) override;
- bool menubarVisible() override;
</del><ins>+ void setMenubarVisible(bool) final;
+ bool menubarVisible() final;
</ins><span class="cx">
</span><del>- void setResizable(bool) override;
</del><ins>+ void setResizable(bool) final;
</ins><span class="cx">
</span><del>- void addMessageToConsole(JSC::MessageSource, JSC::MessageLevel, const String& message, unsigned lineNumber, unsigned columnNumber, const String& sourceID) override;
</del><ins>+ void addMessageToConsole(JSC::MessageSource, JSC::MessageLevel, const String& message, unsigned lineNumber, unsigned columnNumber, const String& sourceID) final;
</ins><span class="cx">
</span><del>- bool canRunBeforeUnloadConfirmPanel() override;
- bool runBeforeUnloadConfirmPanel(const String& message, WebCore::Frame*) override;
</del><ins>+ bool canRunBeforeUnloadConfirmPanel() final;
+ bool runBeforeUnloadConfirmPanel(const String& message, WebCore::Frame*) final;
</ins><span class="cx">
</span><del>- void closeWindowSoon() override;
</del><ins>+ void closeWindowSoon() final;
</ins><span class="cx">
</span><del>- void runJavaScriptAlert(WebCore::Frame*, const String&) override;
- bool runJavaScriptConfirm(WebCore::Frame*, const String&) override;
- bool runJavaScriptPrompt(WebCore::Frame*, const String& message, const String& defaultValue, String& result) override;
- void setStatusbarText(const String&) override;
</del><ins>+ void runJavaScriptAlert(WebCore::Frame*, const String&) final;
+ bool runJavaScriptConfirm(WebCore::Frame*, const String&) final;
+ bool runJavaScriptPrompt(WebCore::Frame*, const String& message, const String& defaultValue, String& result) final;
+ void setStatusbarText(const String&) final;
</ins><span class="cx">
</span><del>- WebCore::KeyboardUIMode keyboardUIMode() override;
</del><ins>+ WebCore::KeyboardUIMode keyboardUIMode() final;
</ins><span class="cx">
</span><del>- // HostWindow member function overrides.
- void invalidateRootView(const WebCore::IntRect&) override;
- void invalidateContentsAndRootView(const WebCore::IntRect&) override;
- void invalidateContentsForSlowScroll(const WebCore::IntRect&) override;
- void scroll(const WebCore::IntSize& scrollDelta, const WebCore::IntRect& scrollRect, const WebCore::IntRect& clipRect) override;
</del><ins>+ // HostWindow member function finals.
+ void invalidateRootView(const WebCore::IntRect&) final;
+ void invalidateContentsAndRootView(const WebCore::IntRect&) final;
+ void invalidateContentsForSlowScroll(const WebCore::IntRect&) final;
+ void scroll(const WebCore::IntSize& scrollDelta, const WebCore::IntRect& scrollRect, const WebCore::IntRect& clipRect) final;
+
</ins><span class="cx"> #if USE(COORDINATED_GRAPHICS)
</span><del>- void delegatedScrollRequested(const WebCore::IntPoint& scrollOffset) override;
</del><ins>+ void delegatedScrollRequested(const WebCore::IntPoint& scrollOffset) final;
</ins><span class="cx"> #endif
</span><del>- WebCore::IntPoint screenToRootView(const WebCore::IntPoint&) const override;
- WebCore::IntRect rootViewToScreen(const WebCore::IntRect&) const override;
</del><ins>+
+ WebCore::IntPoint screenToRootView(const WebCore::IntPoint&) const final;
+ WebCore::IntRect rootViewToScreen(const WebCore::IntRect&) const final;
+
</ins><span class="cx"> #if PLATFORM(IOS)
</span><del>- WebCore::IntPoint accessibilityScreenToRootView(const WebCore::IntPoint&) const override;
- WebCore::IntRect rootViewToAccessibilityScreen(const WebCore::IntRect&) const override;
</del><ins>+ WebCore::IntPoint accessibilityScreenToRootView(const WebCore::IntPoint&) const final;
+ WebCore::IntRect rootViewToAccessibilityScreen(const WebCore::IntRect&) const final;
</ins><span class="cx"> #endif
</span><del>- PlatformPageClient platformPageClient() const override;
- void contentsSizeChanged(WebCore::Frame*, const WebCore::IntSize&) const override;
- void scrollRectIntoView(const WebCore::IntRect&) const override; // Currently only Mac has a non empty implementation.
</del><span class="cx">
</span><del>- bool shouldUnavailablePluginMessageBeButton(WebCore::RenderEmbeddedObject::PluginUnavailabilityReason) const override;
- void unavailablePluginButtonClicked(WebCore::Element*, WebCore::RenderEmbeddedObject::PluginUnavailabilityReason) const override;
</del><ins>+ PlatformPageClient platformPageClient() const final;
+ void contentsSizeChanged(WebCore::Frame*, const WebCore::IntSize&) const final;
+ void scrollRectIntoView(const WebCore::IntRect&) const final; // Currently only Mac has a non empty implementation.
</ins><span class="cx">
</span><del>- void scrollbarsModeDidChange() const override;
- void mouseDidMoveOverElement(const WebCore::HitTestResult&, unsigned modifierFlags) override;
</del><ins>+ bool shouldUnavailablePluginMessageBeButton(WebCore::RenderEmbeddedObject::PluginUnavailabilityReason) const final;
+ void unavailablePluginButtonClicked(WebCore::Element*, WebCore::RenderEmbeddedObject::PluginUnavailabilityReason) const final;
</ins><span class="cx">
</span><del>- void setToolTip(const String&, WebCore::TextDirection) override;
</del><ins>+ void scrollbarsModeDidChange() const final;
+ void mouseDidMoveOverElement(const WebCore::HitTestResult&, unsigned modifierFlags) final;
+
+ void setToolTip(const String&, WebCore::TextDirection) final;
</ins><span class="cx">
</span><del>- void print(WebCore::Frame*) override;
</del><ins>+ void print(WebCore::Frame*) final;
</ins><span class="cx">
</span><del>- void exceededDatabaseQuota(WebCore::Frame*, const String& databaseName, WebCore::DatabaseDetails) override;
</del><ins>+ void exceededDatabaseQuota(WebCore::Frame*, const String& databaseName, WebCore::DatabaseDetails) final;
</ins><span class="cx">
</span><del>- void reachedMaxAppCacheSize(int64_t spaceNeeded) override;
- void reachedApplicationCacheOriginQuota(WebCore::SecurityOrigin*, int64_t spaceNeeded) override;
</del><ins>+ void reachedMaxAppCacheSize(int64_t spaceNeeded) final;
+ void reachedApplicationCacheOriginQuota(WebCore::SecurityOrigin*, int64_t spaceNeeded) final;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(DASHBOARD_SUPPORT)
</span><del>- void annotatedRegionsChanged() override;
</del><ins>+ void annotatedRegionsChanged() final;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- bool shouldReplaceWithGeneratedFileForUpload(const String& path, String& generatedFilename) override;
- String generateReplacementFile(const String& path) override;
</del><ins>+ bool shouldReplaceWithGeneratedFileForUpload(const String& path, String& generatedFilename) final;
+ String generateReplacementFile(const String& path) final;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(INPUT_TYPE_COLOR)
</span><del>- std::unique_ptr<WebCore::ColorChooser> createColorChooser(WebCore::ColorChooserClient*, const WebCore::Color&) override;
</del><ins>+ std::unique_ptr<WebCore::ColorChooser> createColorChooser(WebCore::ColorChooserClient*, const WebCore::Color&) final;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(IOS_TOUCH_EVENTS)
</span><del>- void didPreventDefaultForEvent() override;
</del><ins>+ void didPreventDefaultForEvent() final;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- void didReceiveMobileDocType(bool) override;
- void setNeedsScrollNotifications(WebCore::Frame*, bool) override;
- void observedContentChange(WebCore::Frame*) override;
- void clearContentChangeObservers(WebCore::Frame*) override;
- void notifyRevealedSelectionByScrollingFrame(WebCore::Frame*) override;
- bool isStopping() override;
</del><ins>+ void didReceiveMobileDocType(bool) final;
+ void setNeedsScrollNotifications(WebCore::Frame*, bool) final;
+ void observedContentChange(WebCore::Frame*) final;
+ void clearContentChangeObservers(WebCore::Frame*) final;
+ void notifyRevealedSelectionByScrollingFrame(WebCore::Frame*) final;
+ bool isStopping() final;
</ins><span class="cx">
</span><del>- void didLayout(LayoutType = NormalLayout) override;
- void didStartOverflowScroll() override;
- void didEndOverflowScroll() override;
- bool hasStablePageScaleFactor() const override;
</del><ins>+ void didLayout(LayoutType = NormalLayout) final;
+ void didStartOverflowScroll() final;
+ void didEndOverflowScroll() final;
+ bool hasStablePageScaleFactor() const final;
</ins><span class="cx">
</span><span class="cx"> // FIXME: See <rdar://problem/5975559>
</span><del>- void suppressFormNotifications() override;
- void restoreFormNotifications() override;
</del><ins>+ void suppressFormNotifications() final;
+ void restoreFormNotifications() final;
</ins><span class="cx">
</span><del>- void addOrUpdateScrollingLayer(WebCore::Node*, PlatformLayer* scrollingLayer, PlatformLayer* contentsLayer, const WebCore::IntSize& scrollSize, bool allowHorizontalScrollbar, bool allowVerticalScrollbar) override;
- void removeScrollingLayer(WebCore::Node*, PlatformLayer* scrollingLayer, PlatformLayer* contentsLayer) override;
</del><ins>+ void addOrUpdateScrollingLayer(WebCore::Node*, PlatformLayer* scrollingLayer, PlatformLayer* contentsLayer, const WebCore::IntSize& scrollSize, bool allowHorizontalScrollbar, bool allowVerticalScrollbar) final;
+ void removeScrollingLayer(WebCore::Node*, PlatformLayer* scrollingLayer, PlatformLayer* contentsLayer) final;
</ins><span class="cx">
</span><del>- void webAppOrientationsUpdated() override;
- void showPlaybackTargetPicker(bool hasVideo) override;
</del><ins>+ void webAppOrientationsUpdated() final;
+ void showPlaybackTargetPicker(bool hasVideo) final;
</ins><span class="cx">
</span><del>- Seconds eventThrottlingDelay() override;
</del><ins>+ Seconds eventThrottlingDelay() final;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(ORIENTATION_EVENTS)
</span><del>- int deviceOrientation() const override;
</del><ins>+ int deviceOrientation() const final;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- void runOpenPanel(WebCore::Frame*, PassRefPtr<WebCore::FileChooser>) override;
- void loadIconForFiles(const Vector<String>&, WebCore::FileIconLoader&) override;
</del><ins>+ void runOpenPanel(WebCore::Frame&, WebCore::FileChooser&) final;
+ void loadIconForFiles(const Vector<String>&, WebCore::FileIconLoader&) final;
</ins><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><del>- void setCursor(const WebCore::Cursor&) override;
- void setCursorHiddenUntilMouseMoves(bool) override;
</del><ins>+ void setCursor(const WebCore::Cursor&) final;
+ void setCursorHiddenUntilMouseMoves(bool) final;
</ins><span class="cx"> #endif
</span><ins>+
</ins><span class="cx"> #if !USE(REQUEST_ANIMATION_FRAME_TIMER)
</span><del>- void scheduleAnimation() override;
</del><ins>+ void scheduleAnimation() final;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(POINTER_LOCK)
</span><del>- bool requestPointerLock() override;
- void requestPointerUnlock() override;
</del><ins>+ bool requestPointerLock() final;
+ void requestPointerUnlock() final;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- void didAssociateFormControls(const Vector<RefPtr<WebCore::Element>>&) override;
- bool shouldNotifyOnFormChanges() override;
</del><ins>+ void didAssociateFormControls(const Vector<RefPtr<WebCore::Element>>&) final;
+ bool shouldNotifyOnFormChanges() final;
</ins><span class="cx">
</span><del>- bool selectItemWritingDirectionIsNatural() override;
- bool selectItemAlignmentFollowsMenuWritingDirection() override;
- bool hasOpenedPopup() const override;
- RefPtr<WebCore::PopupMenu> createPopupMenu(WebCore::PopupMenuClient*) const override;
- RefPtr<WebCore::SearchPopupMenu> createSearchPopupMenu(WebCore::PopupMenuClient*) const override;
</del><ins>+ bool selectItemWritingDirectionIsNatural() final;
+ bool selectItemAlignmentFollowsMenuWritingDirection() final;
+ bool hasOpenedPopup() const final;
+ RefPtr<WebCore::PopupMenu> createPopupMenu(WebCore::PopupMenuClient*) const final;
+ RefPtr<WebCore::SearchPopupMenu> createSearchPopupMenu(WebCore::PopupMenuClient*) const final;
</ins><span class="cx">
</span><del>- WebCore::GraphicsLayerFactory* graphicsLayerFactory() const override;
- void attachRootGraphicsLayer(WebCore::Frame*, WebCore::GraphicsLayer*) override;
- void attachViewOverlayGraphicsLayer(WebCore::Frame*, WebCore::GraphicsLayer*) override;
- void setNeedsOneShotDrawingSynchronization() override;
- void scheduleCompositingLayerFlush() override;
- bool adjustLayerFlushThrottling(WebCore::LayerFlushThrottleState::Flags) override;
</del><ins>+ WebCore::GraphicsLayerFactory* graphicsLayerFactory() const final;
+ void attachRootGraphicsLayer(WebCore::Frame*, WebCore::GraphicsLayer*) final;
+ void attachViewOverlayGraphicsLayer(WebCore::Frame*, WebCore::GraphicsLayer*) final;
+ void setNeedsOneShotDrawingSynchronization() final;
+ void scheduleCompositingLayerFlush() final;
+ bool adjustLayerFlushThrottling(WebCore::LayerFlushThrottleState::Flags) final;
</ins><span class="cx">
</span><span class="cx"> #if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
</span><del>- RefPtr<WebCore::DisplayRefreshMonitor> createDisplayRefreshMonitor(WebCore::PlatformDisplayID) const override;
</del><ins>+ RefPtr<WebCore::DisplayRefreshMonitor> createDisplayRefreshMonitor(WebCore::PlatformDisplayID) const final;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- CompositingTriggerFlags allowedCompositingTriggers() const override
</del><ins>+ CompositingTriggerFlags allowedCompositingTriggers() const final
</ins><span class="cx"> {
</span><span class="cx"> return static_cast<CompositingTriggerFlags>(
</span><span class="cx"> ThreeDTransformTrigger |
</span><span class="lines">@@ -230,119 +228,121 @@
</span><span class="cx"> AnimationTrigger);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- bool layerTreeStateIsFrozen() const override;
</del><ins>+ bool layerTreeStateIsFrozen() const final;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(ASYNC_SCROLLING)
</span><del>- PassRefPtr<WebCore::ScrollingCoordinator> createScrollingCoordinator(WebCore::Page*) const override;
</del><ins>+ PassRefPtr<WebCore::ScrollingCoordinator> createScrollingCoordinator(WebCore::Page*) const final;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- void elementDidRefocus(const WebCore::Node*) override;
</del><ins>+ void elementDidRefocus(const WebCore::Node*) final;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if (PLATFORM(IOS) && HAVE(AVKIT)) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
</span><del>- bool supportsVideoFullscreen(WebCore::HTMLMediaElementEnums::VideoFullscreenMode) override;
- void setUpPlaybackControlsManager(WebCore::HTMLMediaElement&) override;
- void clearPlaybackControlsManager() override;
- void enterVideoFullscreenForVideoElement(WebCore::HTMLVideoElement&, WebCore::HTMLMediaElementEnums::VideoFullscreenMode) override;
- void exitVideoFullscreenForVideoElement(WebCore::HTMLVideoElement&) override;
</del><ins>+ bool supportsVideoFullscreen(WebCore::HTMLMediaElementEnums::VideoFullscreenMode) final;
+ void setUpPlaybackControlsManager(WebCore::HTMLMediaElement&) final;
+ void clearPlaybackControlsManager() final;
+ void enterVideoFullscreenForVideoElement(WebCore::HTMLVideoElement&, WebCore::HTMLMediaElementEnums::VideoFullscreenMode) final;
+ void exitVideoFullscreenForVideoElement(WebCore::HTMLVideoElement&) final;
+#endif
+
</ins><span class="cx"> #if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
</span><del>- void exitVideoFullscreenToModeWithoutAnimation(WebCore::HTMLVideoElement&, WebCore::HTMLMediaElementEnums::VideoFullscreenMode) override;
</del><ins>+ void exitVideoFullscreenToModeWithoutAnimation(WebCore::HTMLVideoElement&, WebCore::HTMLMediaElementEnums::VideoFullscreenMode) final;
</ins><span class="cx"> #endif
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span><del>- bool supportsFullScreenForElement(const WebCore::Element*, bool withKeyboard) override;
- void enterFullScreenForElement(WebCore::Element*) override;
- void exitFullScreenForElement(WebCore::Element*) override;
</del><ins>+ bool supportsFullScreenForElement(const WebCore::Element*, bool withKeyboard) final;
+ void enterFullScreenForElement(WebCore::Element*) final;
+ void exitFullScreenForElement(WebCore::Element*) final;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>- void elementDidFocus(const WebCore::Node*) override;
- void elementDidBlur(const WebCore::Node*) override;
</del><ins>+ void elementDidFocus(const WebCore::Node*) final;
+ void elementDidBlur(const WebCore::Node*) final;
</ins><span class="cx">
</span><del>- void makeFirstResponder() override;
</del><ins>+ void makeFirstResponder() final;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- void enableSuddenTermination() override;
- void disableSuddenTermination() override;
</del><ins>+ void enableSuddenTermination() final;
+ void disableSuddenTermination() final;
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- WebCore::FloatSize screenSize() const override;
- WebCore::FloatSize availableScreenSize() const override;
</del><ins>+ WebCore::FloatSize screenSize() const final;
+ WebCore::FloatSize availableScreenSize() const final;
</ins><span class="cx"> #endif
</span><del>- void dispatchViewportPropertiesDidChange(const WebCore::ViewportArguments&) const override;
</del><span class="cx">
</span><del>- void notifyScrollerThumbIsVisibleInRect(const WebCore::IntRect&) override;
- void recommendedScrollbarStyleDidChange(WebCore::ScrollbarStyle newStyle) override;
</del><ins>+ void dispatchViewportPropertiesDidChange(const WebCore::ViewportArguments&) const final;
</ins><span class="cx">
</span><del>- std::optional<WebCore::ScrollbarOverlayStyle> preferredScrollbarOverlayStyle() override;
</del><ins>+ void notifyScrollerThumbIsVisibleInRect(const WebCore::IntRect&) final;
+ void recommendedScrollbarStyleDidChange(WebCore::ScrollbarStyle newStyle) final;
</ins><span class="cx">
</span><del>- WebCore::Color underlayColor() const override;
</del><ins>+ std::optional<WebCore::ScrollbarOverlayStyle> preferredScrollbarOverlayStyle() final;
</ins><span class="cx">
</span><del>- void pageExtendedBackgroundColorDidChange(WebCore::Color) const override;
</del><ins>+ WebCore::Color underlayColor() const final;
+
+ void pageExtendedBackgroundColorDidChange(WebCore::Color) const final;
</ins><span class="cx">
</span><del>- void wheelEventHandlersChanged(bool) override;
</del><ins>+ void wheelEventHandlersChanged(bool) final;
</ins><span class="cx">
</span><del>- String plugInStartLabelTitle(const String& mimeType) const override;
- String plugInStartLabelSubtitle(const String& mimeType) const override;
- String plugInExtraStyleSheet() const override;
- String plugInExtraScript() const override;
</del><ins>+ String plugInStartLabelTitle(const String& mimeType) const final;
+ String plugInStartLabelSubtitle(const String& mimeType) const final;
+ String plugInExtraStyleSheet() const final;
+ String plugInExtraScript() const final;
</ins><span class="cx">
</span><del>- void didAddHeaderLayer(WebCore::GraphicsLayer*) override;
- void didAddFooterLayer(WebCore::GraphicsLayer*) override;
</del><ins>+ void didAddHeaderLayer(WebCore::GraphicsLayer*) final;
+ void didAddFooterLayer(WebCore::GraphicsLayer*) final;
</ins><span class="cx">
</span><del>- bool shouldUseTiledBackingForFrameView(const WebCore::FrameView*) const override;
</del><ins>+ bool shouldUseTiledBackingForFrameView(const WebCore::FrameView*) const final;
</ins><span class="cx">
</span><del>- void isPlayingMediaDidChange(WebCore::MediaProducer::MediaStateFlags, uint64_t) override;
</del><ins>+ void isPlayingMediaDidChange(WebCore::MediaProducer::MediaStateFlags, uint64_t) final;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_SESSION)
</span><del>- void hasMediaSessionWithActiveMediaElementsDidChange(bool) override;
- void mediaSessionMetadataDidChange(const WebCore::MediaSessionMetadata&) override;
- void focusedContentMediaElementDidChange(uint64_t) override;
</del><ins>+ void hasMediaSessionWithActiveMediaElementsDidChange(bool) final;
+ void mediaSessionMetadataDidChange(const WebCore::MediaSessionMetadata&) final;
+ void focusedContentMediaElementDidChange(uint64_t) final;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SUBTLE_CRYPTO)
</span><del>- bool wrapCryptoKey(const Vector<uint8_t>&, Vector<uint8_t>&) const override;
- bool unwrapCryptoKey(const Vector<uint8_t>&, Vector<uint8_t>&) const override;
</del><ins>+ bool wrapCryptoKey(const Vector<uint8_t>&, Vector<uint8_t>&) const final;
+ bool unwrapCryptoKey(const Vector<uint8_t>&, Vector<uint8_t>&) const final;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(TELEPHONE_NUMBER_DETECTION) && PLATFORM(MAC)
</span><del>- void handleTelephoneNumberClick(const String& number, const WebCore::IntPoint&) override;
</del><ins>+ void handleTelephoneNumberClick(const String& number, const WebCore::IntPoint&) final;
</ins><span class="cx"> #endif
</span><ins>+
</ins><span class="cx"> #if ENABLE(SERVICE_CONTROLS)
</span><del>- void handleSelectionServiceClick(WebCore::FrameSelection&, const Vector<String>& telephoneNumbers, const WebCore::IntPoint&) override;
- bool hasRelevantSelectionServices(bool isTextOnly) const override;
</del><ins>+ void handleSelectionServiceClick(WebCore::FrameSelection&, const Vector<String>& telephoneNumbers, const WebCore::IntPoint&) final;
+ bool hasRelevantSelectionServices(bool isTextOnly) const final;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- bool shouldDispatchFakeMouseMoveEvents() const override;
</del><ins>+ bool shouldDispatchFakeMouseMoveEvents() const final;
</ins><span class="cx">
</span><del>- void handleAutoFillButtonClick(WebCore::HTMLInputElement&) override;
</del><ins>+ void handleAutoFillButtonClick(WebCore::HTMLInputElement&) final;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS)
</span><del>- void addPlaybackTargetPickerClient(uint64_t /*contextId*/) override;
- void removePlaybackTargetPickerClient(uint64_t /*contextId*/) override;
- void showPlaybackTargetPicker(uint64_t contextId, const WebCore::IntPoint&, bool) override;
- void playbackTargetPickerClientStateDidChange(uint64_t, WebCore::MediaProducer::MediaStateFlags) override;
- void setMockMediaPlaybackTargetPickerEnabled(bool) override;
- void setMockMediaPlaybackTargetPickerState(const String&, WebCore::MediaPlaybackTargetContext::State) override;
</del><ins>+ void addPlaybackTargetPickerClient(uint64_t /*contextId*/) final;
+ void removePlaybackTargetPickerClient(uint64_t /*contextId*/) final;
+ void showPlaybackTargetPicker(uint64_t contextId, const WebCore::IntPoint&, bool) final;
+ void playbackTargetPickerClientStateDidChange(uint64_t, WebCore::MediaProducer::MediaStateFlags) final;
+ void setMockMediaPlaybackTargetPickerEnabled(bool) final;
+ void setMockMediaPlaybackTargetPickerState(const String&, WebCore::MediaPlaybackTargetContext::State) final;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- void imageOrMediaDocumentSizeChanged(const WebCore::IntSize&) override;
-#if ENABLE(VIDEO)
-#if USE(GSTREAMER)
- void requestInstallMissingMediaPlugins(const String& /*details*/, const String& /*description*/, WebCore::MediaPlayerRequestInstallMissingPluginsCallback&) override;
</del><ins>+ void imageOrMediaDocumentSizeChanged(const WebCore::IntSize&) final;
+
+#if ENABLE(VIDEO) && USE(GSTREAMER)
+ void requestInstallMissingMediaPlugins(const String& /*details*/, const String& /*description*/, WebCore::MediaPlayerRequestInstallMissingPluginsCallback&) final;
</ins><span class="cx"> #endif
</span><del>-#endif
</del><span class="cx">
</span><del>- void didInvalidateDocumentMarkerRects() override;
</del><ins>+ void didInvalidateDocumentMarkerRects() final;
</ins><span class="cx">
</span><span class="cx"> String m_cachedToolTip;
</span><span class="cx"> mutable RefPtr<WebFrame> m_cachedFrameSetLargestFrame;
</span><del>- mutable bool m_cachedMainFrameHasHorizontalScrollbar;
- mutable bool m_cachedMainFrameHasVerticalScrollbar;
</del><ins>+ mutable bool m_cachedMainFrameHasHorizontalScrollbar { false };
+ mutable bool m_cachedMainFrameHasVerticalScrollbar { false };
</ins><span class="cx">
</span><del>- WebPage* m_page;
</del><ins>+ WebPage& m_page;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebEditorClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -238,7 +238,7 @@
</span><span class="cx"> m_page->injectedBundleEditorClient().getPasteboardDataForRange(*m_page, range, pasteboardTypes, pasteboardData);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebEditorClient::registerUndoStep(PassRefPtr<UndoStep> step)
</del><ins>+void WebEditorClient::registerUndoStep(UndoStep& step)
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: Add assertion that the command being reapplied is the same command that is
</span><span class="cx"> // being passed to us.
</span><span class="lines">@@ -245,14 +245,14 @@
</span><span class="cx"> if (m_page->isInRedo())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- RefPtr<WebUndoStep> webStep = WebUndoStep::create(step);
- m_page->addWebUndoStep(webStep->stepID(), webStep.get());
- uint32_t editAction = static_cast<uint32_t>(webStep->step()->editingAction());
</del><ins>+ auto webStep = WebUndoStep::create(&step);
+ auto editAction = static_cast<uint32_t>(webStep->step()->editingAction());
</ins><span class="cx">
</span><ins>+ m_page->addWebUndoStep(webStep->stepID(), webStep.ptr());
</ins><span class="cx"> m_page->send(Messages::WebPageProxy::RegisterEditCommandForUndo(webStep->stepID(), editAction));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebEditorClient::registerRedoStep(PassRefPtr<UndoStep>)
</del><ins>+void WebEditorClient::registerRedoStep(UndoStep&)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebEditorClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -71,8 +71,8 @@
</span><span class="cx"> void didWriteSelectionToPasteboard() final;
</span><span class="cx"> void getClientPasteboardDataForRange(WebCore::Range*, Vector<String>& pasteboardTypes, Vector<RefPtr<WebCore::SharedBuffer>>& pasteboardData) final;
</span><span class="cx">
</span><del>- void registerUndoStep(PassRefPtr<WebCore::UndoStep>) final;
- void registerRedoStep(PassRefPtr<WebCore::UndoStep>) final;
</del><ins>+ void registerUndoStep(WebCore::UndoStep&) final;
+ void registerRedoStep(WebCore::UndoStep&) final;
</ins><span class="cx"> void clearUndoRedoOperations() final;
</span><span class="cx">
</span><span class="cx"> bool canCopyCut(WebCore::Frame*, bool defaultValue) const final;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -701,7 +701,7 @@
</span><span class="cx"> m_frame->didReceivePolicyDecision(listenerID, static_cast<PolicyAction>(policyAction), 0, downloadID);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebFrameLoaderClient::dispatchDecidePolicyForNewWindowAction(const NavigationAction& navigationAction, const ResourceRequest& request, PassRefPtr<FormState> formState, const String& frameName, FramePolicyFunction function)
</del><ins>+void WebFrameLoaderClient::dispatchDecidePolicyForNewWindowAction(const NavigationAction& navigationAction, const ResourceRequest& request, FormState* formState, const String& frameName, FramePolicyFunction function)
</ins><span class="cx"> {
</span><span class="cx"> WebPage* webPage = m_frame->page();
</span><span class="cx"> if (!webPage) {
</span><span class="lines">@@ -737,7 +737,7 @@
</span><span class="cx"> webPage->send(Messages::WebPageProxy::DecidePolicyForNewWindowAction(m_frame->frameID(), SecurityOriginData::fromFrame(coreFrame), navigationActionData, request, frameName, listenerID, UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction(const NavigationAction& navigationAction, const ResourceRequest& request, PassRefPtr<FormState> prpFormState, FramePolicyFunction function)
</del><ins>+void WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction(const NavigationAction& navigationAction, const ResourceRequest& request, FormState* formState, FramePolicyFunction function)
</ins><span class="cx"> {
</span><span class="cx"> WebPage* webPage = m_frame->page();
</span><span class="cx"> if (!webPage) {
</span><span class="lines">@@ -752,7 +752,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<API::Object> userData;
</span><del>- RefPtr<FormState> formState = prpFormState;
</del><span class="cx">
</span><span class="cx"> RefPtr<InjectedBundleNavigationAction> action = InjectedBundleNavigationAction::create(m_frame, navigationAction, formState);
</span><span class="cx">
</span><span class="lines">@@ -782,7 +781,7 @@
</span><span class="cx"> case NavigationType::FormSubmitted:
</span><span class="cx"> case NavigationType::FormResubmitted:
</span><span class="cx"> if (formState)
</span><del>- originatingFrame = WebFrame::fromCoreFrame(*formState->sourceDocument()->frame());
</del><ins>+ originatingFrame = WebFrame::fromCoreFrame(*formState->sourceDocument().frame());
</ins><span class="cx"> break;
</span><span class="cx"> case NavigationType::BackForward:
</span><span class="cx"> case NavigationType::Reload:
</span><span class="lines">@@ -843,41 +842,37 @@
</span><span class="cx"> webPage->send(Messages::WebPageProxy::UnableToImplementPolicy(m_frame->frameID(), error, UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebFrameLoaderClient::dispatchWillSendSubmitEvent(PassRefPtr<FormState> prpFormState)
</del><ins>+void WebFrameLoaderClient::dispatchWillSendSubmitEvent(Ref<FormState>&& formState)
</ins><span class="cx"> {
</span><del>- WebPage* webPage = m_frame->page();
</del><ins>+ auto* webPage = m_frame->page();
</ins><span class="cx"> if (!webPage)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- RefPtr<FormState> formState = prpFormState;
- HTMLFormElement* form = formState->form();
</del><ins>+ auto& form = formState->form();
</ins><span class="cx">
</span><del>- WebFrame* sourceFrame = WebFrame::fromCoreFrame(*formState->sourceDocument()->frame());
</del><ins>+ ASSERT(formState->sourceDocument().frame());
+ auto* sourceFrame = WebFrame::fromCoreFrame(*formState->sourceDocument().frame());
</ins><span class="cx"> ASSERT(sourceFrame);
</span><span class="cx">
</span><del>- webPage->injectedBundleFormClient().willSendSubmitEvent(webPage, form, m_frame, sourceFrame, formState->textFieldValues());
</del><ins>+ webPage->injectedBundleFormClient().willSendSubmitEvent(webPage, &form, m_frame, sourceFrame, formState->textFieldValues());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebFrameLoaderClient::dispatchWillSubmitForm(PassRefPtr<FormState> prpFormState, FramePolicyFunction function)
</del><ins>+void WebFrameLoaderClient::dispatchWillSubmitForm(FormState& formState, FramePolicyFunction function)
</ins><span class="cx"> {
</span><span class="cx"> WebPage* webPage = m_frame->page();
</span><span class="cx"> if (!webPage)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- // FIXME: Pass more of the form state.
- RefPtr<FormState> formState = prpFormState;
-
- HTMLFormElement* form = formState->form();
</del><ins>+ auto& form = formState.form();
</ins><span class="cx">
</span><del>- WebFrame* sourceFrame = WebFrame::fromCoreFrame(*formState->sourceDocument()->frame());
</del><ins>+ auto* sourceFrame = WebFrame::fromCoreFrame(*formState.sourceDocument().frame());
</ins><span class="cx"> ASSERT(sourceFrame);
</span><span class="cx">
</span><del>- const Vector<std::pair<String, String>>& values = formState->textFieldValues();
</del><ins>+ auto& values = formState.textFieldValues();
</ins><span class="cx">
</span><span class="cx"> RefPtr<API::Object> userData;
</span><del>- webPage->injectedBundleFormClient().willSubmitForm(webPage, form, m_frame, sourceFrame, values, userData);
</del><ins>+ webPage->injectedBundleFormClient().willSubmitForm(webPage, &form, m_frame, sourceFrame, values, userData);
</ins><span class="cx">
</span><del>-
</del><span class="cx"> uint64_t listenerID = m_frame->setUpPolicyListener(WTFMove(function));
</span><span class="cx">
</span><span class="cx"> webPage->send(Messages::WebPageProxy::WillSubmitForm(m_frame->frameID(), sourceFrame->frameID(), values, listenerID, UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
</span><span class="lines">@@ -1400,14 +1395,13 @@
</span><span class="cx"> m_frame->convertMainResourceLoadToDownload(documentLoader, sessionID, request, response);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<Frame> WebFrameLoaderClient::createFrame(const URL& url, const String& name, HTMLFrameOwnerElement* ownerElement,
- const String& referrer, bool /*allowsScrolling*/, int /*marginWidth*/, int /*marginHeight*/)
</del><ins>+RefPtr<Frame> WebFrameLoaderClient::createFrame(const URL& url, const String& name, HTMLFrameOwnerElement& ownerElement,
+ const String& referrer, bool /*allowsScrolling*/, int /*marginWidth*/, int /*marginHeight*/)
</ins><span class="cx"> {
</span><del>- WebPage* webPage = m_frame->page();
</del><ins>+ auto* webPage = m_frame->page();
</ins><span class="cx">
</span><del>- RefPtr<WebFrame> subframe = WebFrame::createSubframe(webPage, name, ownerElement);
-
- Frame* coreSubframe = subframe->coreFrame();
</del><ins>+ auto subframe = WebFrame::createSubframe(webPage, name, &ownerElement);
+ auto* coreSubframe = subframe->coreFrame();
</ins><span class="cx"> if (!coreSubframe)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="lines">@@ -1427,7 +1421,7 @@
</span><span class="cx"> return coreSubframe;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<Widget> WebFrameLoaderClient::createPlugin(const IntSize&, HTMLPlugInElement* pluginElement, const URL& url, const Vector<String>& paramNames, const Vector<String>& paramValues, const String& mimeType, bool loadManually)
</del><ins>+RefPtr<Widget> WebFrameLoaderClient::createPlugin(const IntSize&, HTMLPlugInElement& pluginElement, const URL& url, const Vector<String>& paramNames, const Vector<String>& paramValues, const String& mimeType, bool loadManually)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(paramNames.size() == paramValues.size());
</span><span class="cx"> ASSERT(m_frame->page());
</span><span class="lines">@@ -1444,11 +1438,11 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>- auto plugin = m_frame->page()->createPlugin(m_frame, pluginElement, parameters, parameters.mimeType);
</del><ins>+ auto plugin = m_frame->page()->createPlugin(m_frame, &pluginElement, parameters, parameters.mimeType);
</ins><span class="cx"> if (!plugin)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- return PluginView::create(pluginElement, WTFMove(plugin), parameters);
</del><ins>+ return PluginView::create(pluginElement, plugin.releaseNonNull(), parameters);
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(pluginElement);
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -1458,13 +1452,14 @@
</span><span class="cx"> void WebFrameLoaderClient::recreatePlugin(Widget* widget)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>- ASSERT(widget && widget->isPluginViewBase());
</del><ins>+ ASSERT(widget);
+ ASSERT(widget->isPluginViewBase());
</ins><span class="cx"> ASSERT(m_frame->page());
</span><span class="cx">
</span><del>- PluginView* pluginView = static_cast<PluginView*>(widget);
</del><ins>+ auto& pluginView = static_cast<PluginView&>(*widget);
</ins><span class="cx"> String newMIMEType;
</span><del>- auto plugin = m_frame->page()->createPlugin(m_frame, pluginView->pluginElement(), pluginView->initialParameters(), newMIMEType);
- pluginView->recreateAndInitialize(WTFMove(plugin));
</del><ins>+ auto plugin = m_frame->page()->createPlugin(m_frame, pluginView.pluginElement(), pluginView.initialParameters(), newMIMEType);
+ pluginView.recreateAndInitialize(plugin.releaseNonNull());
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(widget);
</span><span class="cx"> #endif
</span><span class="lines">@@ -1477,9 +1472,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEBGL)
</span><ins>+
</ins><span class="cx"> WebCore::WebGLLoadPolicy WebFrameLoaderClient::webGLPolicyForURL(const String& url) const
</span><span class="cx"> {
</span><del>- if (WebPage* webPage = m_frame->page())
</del><ins>+ if (auto* webPage = m_frame->page())
</ins><span class="cx"> return webPage->webGLPolicyForURL(m_frame, url);
</span><span class="cx">
</span><span class="cx"> return WebGLAllowCreation;
</span><span class="lines">@@ -1487,31 +1483,32 @@
</span><span class="cx">
</span><span class="cx"> WebCore::WebGLLoadPolicy WebFrameLoaderClient::resolveWebGLPolicyForURL(const String& url) const
</span><span class="cx"> {
</span><del>- if (WebPage* webPage = m_frame->page())
</del><ins>+ if (auto* webPage = m_frame->page())
</ins><span class="cx"> return webPage->resolveWebGLPolicyForURL(m_frame, url);
</span><span class="cx">
</span><span class="cx"> return WebGLAllowCreation;
</span><span class="cx"> }
</span><del>-#endif // ENABLE(WEBGL)
</del><span class="cx">
</span><del>-PassRefPtr<Widget> WebFrameLoaderClient::createJavaAppletWidget(const IntSize& pluginSize, HTMLAppletElement* appletElement, const URL&, const Vector<String>& paramNames, const Vector<String>& paramValues)
</del><ins>+#endif
+
+RefPtr<Widget> WebFrameLoaderClient::createJavaAppletWidget(const IntSize& pluginSize, HTMLAppletElement& appletElement, const URL&, const Vector<String>& paramNames, const Vector<String>& paramValues)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>- auto plugin = createPlugin(pluginSize, appletElement, URL(), paramNames, paramValues, appletElement->serviceType(), false);
</del><ins>+ auto plugin = createPlugin(pluginSize, appletElement, URL(), paramNames, paramValues, appletElement.serviceType(), false);
</ins><span class="cx"> if (!plugin) {
</span><del>- if (WebPage* webPage = m_frame->page()) {
- String frameURLString = m_frame->coreFrame()->loader().documentLoader()->responseURL().string();
- String pageURLString = webPage->corePage()->mainFrame().loader().documentLoader()->responseURL().string();
- webPage->send(Messages::WebPageProxy::DidFailToInitializePlugin(appletElement->serviceType(), frameURLString, pageURLString));
</del><ins>+ if (auto* webPage = m_frame->page()) {
+ auto frameURLString = m_frame->coreFrame()->loader().documentLoader()->responseURL().string();
+ auto pageURLString = webPage->corePage()->mainFrame().loader().documentLoader()->responseURL().string();
+ webPage->send(Messages::WebPageProxy::DidFailToInitializePlugin(appletElement.serviceType(), frameURLString, pageURLString));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><del>- return WTFMove(plugin);
</del><ins>+ return plugin;
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(pluginSize);
</span><span class="cx"> UNUSED_PARAM(appletElement);
</span><span class="cx"> UNUSED_PARAM(paramNames);
</span><span class="cx"> UNUSED_PARAM(paramValues);
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1717,13 +1714,13 @@
</span><span class="cx"> return webPage->injectedBundleLoaderClient().shouldForceUniversalAccessFromLocalURL(webPage, url.string());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<FrameNetworkingContext> WebFrameLoaderClient::createNetworkingContext()
</del><ins>+Ref<FrameNetworkingContext> WebFrameLoaderClient::createNetworkingContext()
</ins><span class="cx"> {
</span><del>- auto context = WebFrameNetworkingContext::create(m_frame);
- return WTFMove(context);
</del><ins>+ return WebFrameNetworkingContext::create(m_frame);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CONTENT_FILTERING)
</span><ins>+
</ins><span class="cx"> void WebFrameLoaderClient::contentFilterDidBlockLoad(WebCore::ContentFilterUnblockHandler unblockHandler)
</span><span class="cx"> {
</span><span class="cx"> if (!unblockHandler.needsUIProcess()) {
</span><span class="lines">@@ -1734,12 +1731,15 @@
</span><span class="cx"> if (WebPage* webPage { m_frame->page() })
</span><span class="cx"> webPage->send(Messages::WebPageProxy::ContentFilterDidBlockLoadForFrame(unblockHandler, m_frame->frameID()));
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(REQUEST_AUTOCOMPLETE)
</span><del>-void WebFrameLoaderClient::didRequestAutocomplete(PassRefPtr<WebCore::FormState>)
</del><ins>+
+void WebFrameLoaderClient::didRequestAutocomplete(Ref<WebCore::FormState>&&)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void WebFrameLoaderClient::prefetchDNS(const String& hostname)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> class PluginView;
</span><span class="cx"> class WebFrame;
</span><span class="cx">
</span><del>-class WebFrameLoaderClient : public WebCore::FrameLoaderClient {
</del><ins>+class WebFrameLoaderClient final : public WebCore::FrameLoaderClient {
</ins><span class="cx"> public:
</span><span class="cx"> WebFrameLoaderClient();
</span><span class="cx"> ~WebFrameLoaderClient();
</span><span class="lines">@@ -49,217 +49,216 @@
</span><span class="cx"> void setUseIconLoadingClient(bool useIconLoadingClient) { m_useIconLoadingClient = useIconLoadingClient; }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- void frameLoaderDestroyed() override;
</del><ins>+ void frameLoaderDestroyed() final;
</ins><span class="cx">
</span><del>- bool hasHTMLView() const override;
- bool hasWebView() const override;
</del><ins>+ bool hasHTMLView() const final;
+ bool hasWebView() const final;
</ins><span class="cx">
</span><del>- void makeRepresentation(WebCore::DocumentLoader*) override;
</del><ins>+ void makeRepresentation(WebCore::DocumentLoader*) final;
</ins><span class="cx"> #if PLATFORM(IOS)
</span><del>- bool forceLayoutOnRestoreFromPageCache() override;
</del><ins>+ bool forceLayoutOnRestoreFromPageCache() final;
</ins><span class="cx"> #endif
</span><del>- void forceLayoutForNonHTML() override;
</del><ins>+ void forceLayoutForNonHTML() final;
</ins><span class="cx">
</span><del>- void setCopiesOnScroll() override;
</del><ins>+ void setCopiesOnScroll() final;
</ins><span class="cx">
</span><del>- void detachedFromParent2() override;
- void detachedFromParent3() override;
</del><ins>+ void detachedFromParent2() final;
+ void detachedFromParent3() final;
</ins><span class="cx">
</span><del>- void assignIdentifierToInitialRequest(unsigned long identifier, WebCore::DocumentLoader*, const WebCore::ResourceRequest&) override;
</del><ins>+ void assignIdentifierToInitialRequest(unsigned long identifier, WebCore::DocumentLoader*, const WebCore::ResourceRequest&) final;
</ins><span class="cx">
</span><del>- void dispatchWillSendRequest(WebCore::DocumentLoader*, unsigned long identifier, WebCore::ResourceRequest&, const WebCore::ResourceResponse& redirectResponse) override;
- bool shouldUseCredentialStorage(WebCore::DocumentLoader*, unsigned long identifier) override;
- void dispatchDidReceiveAuthenticationChallenge(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::AuthenticationChallenge&) override;
</del><ins>+ void dispatchWillSendRequest(WebCore::DocumentLoader*, unsigned long identifier, WebCore::ResourceRequest&, const WebCore::ResourceResponse& redirectResponse) final;
+ bool shouldUseCredentialStorage(WebCore::DocumentLoader*, unsigned long identifier) final;
+ void dispatchDidReceiveAuthenticationChallenge(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::AuthenticationChallenge&) final;
</ins><span class="cx"> #if USE(PROTECTION_SPACE_AUTH_CALLBACK)
</span><del>- bool canAuthenticateAgainstProtectionSpace(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::ProtectionSpace&) override;
</del><ins>+ bool canAuthenticateAgainstProtectionSpace(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::ProtectionSpace&) final;
</ins><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- RetainPtr<CFDictionaryRef> connectionProperties(WebCore::DocumentLoader*, unsigned long identifier) override;
</del><ins>+ RetainPtr<CFDictionaryRef> connectionProperties(WebCore::DocumentLoader*, unsigned long identifier) final;
</ins><span class="cx"> #endif
</span><del>- void dispatchDidReceiveResponse(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::ResourceResponse&) override;
- void dispatchDidReceiveContentLength(WebCore::DocumentLoader*, unsigned long identifier, int dataLength) override;
- void dispatchDidFinishLoading(WebCore::DocumentLoader*, unsigned long identifier) override;
- void dispatchDidFailLoading(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::ResourceError&) override;
- bool dispatchDidLoadResourceFromMemoryCache(WebCore::DocumentLoader*, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&, int length) override;
</del><ins>+ void dispatchDidReceiveResponse(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::ResourceResponse&) final;
+ void dispatchDidReceiveContentLength(WebCore::DocumentLoader*, unsigned long identifier, int dataLength) final;
+ void dispatchDidFinishLoading(WebCore::DocumentLoader*, unsigned long identifier) final;
+ void dispatchDidFailLoading(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::ResourceError&) final;
+ bool dispatchDidLoadResourceFromMemoryCache(WebCore::DocumentLoader*, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&, int length) final;
</ins><span class="cx"> #if ENABLE(DATA_DETECTION)
</span><del>- void dispatchDidFinishDataDetection(NSArray *detectionResults) override;
</del><ins>+ void dispatchDidFinishDataDetection(NSArray *detectionResults) final;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- void dispatchDidDispatchOnloadEvents() override;
- void dispatchDidReceiveServerRedirectForProvisionalLoad() override;
- void dispatchDidChangeProvisionalURL() override;
- void dispatchDidCancelClientRedirect() override;
- void dispatchWillPerformClientRedirect(const WebCore::URL&, double interval, double fireDate) override;
- void dispatchDidChangeLocationWithinPage() override;
- void dispatchDidPushStateWithinPage() override;
- void dispatchDidReplaceStateWithinPage() override;
- void dispatchDidPopStateWithinPage() override;
- void dispatchWillClose() override;
- void dispatchDidReceiveIcon() override;
- void dispatchDidStartProvisionalLoad() override;
- void dispatchDidReceiveTitle(const WebCore::StringWithDirection&) override;
- void dispatchDidCommitLoad(std::optional<WebCore::HasInsecureContent>) override;
- void dispatchDidFailProvisionalLoad(const WebCore::ResourceError&) override;
- void dispatchDidFailLoad(const WebCore::ResourceError&) override;
- void dispatchDidFinishDocumentLoad() override;
- void dispatchDidFinishLoad() override;
</del><ins>+ void dispatchDidDispatchOnloadEvents() final;
+ void dispatchDidReceiveServerRedirectForProvisionalLoad() final;
+ void dispatchDidChangeProvisionalURL() final;
+ void dispatchDidCancelClientRedirect() final;
+ void dispatchWillPerformClientRedirect(const WebCore::URL&, double interval, double fireDate) final;
+ void dispatchDidChangeLocationWithinPage() final;
+ void dispatchDidPushStateWithinPage() final;
+ void dispatchDidReplaceStateWithinPage() final;
+ void dispatchDidPopStateWithinPage() final;
+ void dispatchWillClose() final;
+ void dispatchDidReceiveIcon() final;
+ void dispatchDidStartProvisionalLoad() final;
+ void dispatchDidReceiveTitle(const WebCore::StringWithDirection&) final;
+ void dispatchDidCommitLoad(std::optional<WebCore::HasInsecureContent>) final;
+ void dispatchDidFailProvisionalLoad(const WebCore::ResourceError&) final;
+ void dispatchDidFailLoad(const WebCore::ResourceError&) final;
+ void dispatchDidFinishDocumentLoad() final;
+ void dispatchDidFinishLoad() final;
</ins><span class="cx">
</span><del>- void dispatchDidReachLayoutMilestone(WebCore::LayoutMilestones) override;
- void dispatchDidLayout() override;
</del><ins>+ void dispatchDidReachLayoutMilestone(WebCore::LayoutMilestones) final;
+ void dispatchDidLayout() final;
</ins><span class="cx">
</span><del>- WebCore::Frame* dispatchCreatePage(const WebCore::NavigationAction&) override;
- void dispatchShow() override;
</del><ins>+ WebCore::Frame* dispatchCreatePage(const WebCore::NavigationAction&) final;
+ void dispatchShow() final;
</ins><span class="cx">
</span><del>- void dispatchDecidePolicyForResponse(const WebCore::ResourceResponse&, const WebCore::ResourceRequest&, WebCore::FramePolicyFunction) override;
- void dispatchDecidePolicyForNewWindowAction(const WebCore::NavigationAction&, const WebCore::ResourceRequest&, PassRefPtr<WebCore::FormState>, const String& frameName, WebCore::FramePolicyFunction) override;
- void dispatchDecidePolicyForNavigationAction(const WebCore::NavigationAction&, const WebCore::ResourceRequest&, PassRefPtr<WebCore::FormState>, WebCore::FramePolicyFunction) override;
- void cancelPolicyCheck() override;
</del><ins>+ void dispatchDecidePolicyForResponse(const WebCore::ResourceResponse&, const WebCore::ResourceRequest&, WebCore::FramePolicyFunction) final;
+ void dispatchDecidePolicyForNewWindowAction(const WebCore::NavigationAction&, const WebCore::ResourceRequest&, WebCore::FormState*, const String& frameName, WebCore::FramePolicyFunction) final;
+ void dispatchDecidePolicyForNavigationAction(const WebCore::NavigationAction&, const WebCore::ResourceRequest&, WebCore::FormState*, WebCore::FramePolicyFunction) final;
+ void cancelPolicyCheck() final;
</ins><span class="cx">
</span><del>- void dispatchUnableToImplementPolicy(const WebCore::ResourceError&) override;
</del><ins>+ void dispatchUnableToImplementPolicy(const WebCore::ResourceError&) final;
</ins><span class="cx">
</span><del>- void dispatchWillSendSubmitEvent(PassRefPtr<WebCore::FormState>) override;
- void dispatchWillSubmitForm(PassRefPtr<WebCore::FormState>, WebCore::FramePolicyFunction) override;
</del><ins>+ void dispatchWillSendSubmitEvent(Ref<WebCore::FormState>&&) final;
+ void dispatchWillSubmitForm(WebCore::FormState&, WebCore::FramePolicyFunction) final;
</ins><span class="cx">
</span><del>- void revertToProvisionalState(WebCore::DocumentLoader*) override;
- void setMainDocumentError(WebCore::DocumentLoader*, const WebCore::ResourceError&) override;
</del><ins>+ void revertToProvisionalState(WebCore::DocumentLoader*) final;
+ void setMainDocumentError(WebCore::DocumentLoader*, const WebCore::ResourceError&) final;
</ins><span class="cx">
</span><del>- void setMainFrameDocumentReady(bool) override;
</del><ins>+ void setMainFrameDocumentReady(bool) final;
</ins><span class="cx">
</span><del>- void startDownload(const WebCore::ResourceRequest&, const String& suggestedName = String()) override;
</del><ins>+ void startDownload(const WebCore::ResourceRequest&, const String& suggestedName = String()) final;
</ins><span class="cx">
</span><del>- void willChangeTitle(WebCore::DocumentLoader*) override;
- void didChangeTitle(WebCore::DocumentLoader*) override;
</del><ins>+ void willChangeTitle(WebCore::DocumentLoader*) final;
+ void didChangeTitle(WebCore::DocumentLoader*) final;
</ins><span class="cx">
</span><del>- void willReplaceMultipartContent() override;
- void didReplaceMultipartContent() override;
</del><ins>+ void willReplaceMultipartContent() final;
+ void didReplaceMultipartContent() final;
</ins><span class="cx">
</span><del>- void committedLoad(WebCore::DocumentLoader*, const char*, int) override;
- void finishedLoading(WebCore::DocumentLoader*) override;
</del><ins>+ void committedLoad(WebCore::DocumentLoader*, const char*, int) final;
+ void finishedLoading(WebCore::DocumentLoader*) final;
</ins><span class="cx">
</span><del>- void updateGlobalHistory() override;
- void updateGlobalHistoryRedirectLinks() override;
</del><ins>+ void updateGlobalHistory() final;
+ void updateGlobalHistoryRedirectLinks() final;
</ins><span class="cx">
</span><del>- bool shouldGoToHistoryItem(WebCore::HistoryItem*) const override;
</del><ins>+ bool shouldGoToHistoryItem(WebCore::HistoryItem*) const final;
</ins><span class="cx">
</span><del>- void didDisplayInsecureContent() override;
- void didRunInsecureContent(WebCore::SecurityOrigin*, const WebCore::URL&) override;
- void didDetectXSS(const WebCore::URL&, bool didBlockEntirePage) override;
</del><ins>+ void didDisplayInsecureContent() final;
+ void didRunInsecureContent(WebCore::SecurityOrigin*, const WebCore::URL&) final;
+ void didDetectXSS(const WebCore::URL&, bool didBlockEntirePage) final;
</ins><span class="cx">
</span><del>- WebCore::ResourceError cancelledError(const WebCore::ResourceRequest&) override;
- WebCore::ResourceError blockedError(const WebCore::ResourceRequest&) override;
- WebCore::ResourceError blockedByContentBlockerError(const WebCore::ResourceRequest&) override;
- WebCore::ResourceError cannotShowURLError(const WebCore::ResourceRequest&) override;
- WebCore::ResourceError interruptedForPolicyChangeError(const WebCore::ResourceRequest&) override;
</del><ins>+ WebCore::ResourceError cancelledError(const WebCore::ResourceRequest&) final;
+ WebCore::ResourceError blockedError(const WebCore::ResourceRequest&) final;
+ WebCore::ResourceError blockedByContentBlockerError(const WebCore::ResourceRequest&) final;
+ WebCore::ResourceError cannotShowURLError(const WebCore::ResourceRequest&) final;
+ WebCore::ResourceError interruptedForPolicyChangeError(const WebCore::ResourceRequest&) final;
</ins><span class="cx"> #if ENABLE(CONTENT_FILTERING)
</span><del>- WebCore::ResourceError blockedByContentFilterError(const WebCore::ResourceRequest&) override;
</del><ins>+ WebCore::ResourceError blockedByContentFilterError(const WebCore::ResourceRequest&) final;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- WebCore::ResourceError cannotShowMIMETypeError(const WebCore::ResourceResponse&) override;
- WebCore::ResourceError fileDoesNotExistError(const WebCore::ResourceResponse&) override;
- WebCore::ResourceError pluginWillHandleLoadError(const WebCore::ResourceResponse&) override;
</del><ins>+ WebCore::ResourceError cannotShowMIMETypeError(const WebCore::ResourceResponse&) final;
+ WebCore::ResourceError fileDoesNotExistError(const WebCore::ResourceResponse&) final;
+ WebCore::ResourceError pluginWillHandleLoadError(const WebCore::ResourceResponse&) final;
</ins><span class="cx">
</span><del>- bool shouldFallBack(const WebCore::ResourceError&) override;
</del><ins>+ bool shouldFallBack(const WebCore::ResourceError&) final;
</ins><span class="cx">
</span><del>- bool canHandleRequest(const WebCore::ResourceRequest&) const override;
- bool canShowMIMEType(const String& MIMEType) const override;
- bool canShowMIMETypeAsHTML(const String& MIMEType) const override;
- bool representationExistsForURLScheme(const String& URLScheme) const override;
- String generatedMIMETypeForURLScheme(const String& URLScheme) const override;
</del><ins>+ bool canHandleRequest(const WebCore::ResourceRequest&) const final;
+ bool canShowMIMEType(const String& MIMEType) const final;
+ bool canShowMIMETypeAsHTML(const String& MIMEType) const final;
+ bool representationExistsForURLScheme(const String& URLScheme) const final;
+ String generatedMIMETypeForURLScheme(const String& URLScheme) const final;
</ins><span class="cx">
</span><del>- void frameLoadCompleted() override;
- void saveViewStateToItem(WebCore::HistoryItem&) override;
- void restoreViewState() override;
- void provisionalLoadStarted() override;
- void didFinishLoad() override;
- void prepareForDataSourceReplacement() override;
</del><ins>+ void frameLoadCompleted() final;
+ void saveViewStateToItem(WebCore::HistoryItem&) final;
+ void restoreViewState() final;
+ void provisionalLoadStarted() final;
+ void didFinishLoad() final;
+ void prepareForDataSourceReplacement() final;
</ins><span class="cx">
</span><del>- Ref<WebCore::DocumentLoader> createDocumentLoader(const WebCore::ResourceRequest&, const WebCore::SubstituteData&) override;
- void updateCachedDocumentLoader(WebCore::DocumentLoader&) override;
</del><ins>+ Ref<WebCore::DocumentLoader> createDocumentLoader(const WebCore::ResourceRequest&, const WebCore::SubstituteData&) final;
+ void updateCachedDocumentLoader(WebCore::DocumentLoader&) final;
</ins><span class="cx">
</span><del>- void setTitle(const WebCore::StringWithDirection&, const WebCore::URL&) override;
</del><ins>+ void setTitle(const WebCore::StringWithDirection&, const WebCore::URL&) final;
</ins><span class="cx">
</span><del>- String userAgent(const WebCore::URL&) override;
</del><ins>+ String userAgent(const WebCore::URL&) final;
</ins><span class="cx">
</span><del>- void savePlatformDataToCachedFrame(WebCore::CachedFrame*) override;
- void transitionToCommittedFromCachedFrame(WebCore::CachedFrame*) override;
</del><ins>+ void savePlatformDataToCachedFrame(WebCore::CachedFrame*) final;
+ void transitionToCommittedFromCachedFrame(WebCore::CachedFrame*) final;
</ins><span class="cx"> #if PLATFORM(IOS)
</span><del>- void didRestoreFrameHierarchyForCachedFrame() override;
</del><ins>+ void didRestoreFrameHierarchyForCachedFrame() final;
</ins><span class="cx"> #endif
</span><del>- void transitionToCommittedForNewPage() override;
</del><ins>+ void transitionToCommittedForNewPage() final;
</ins><span class="cx">
</span><del>- void didSaveToPageCache() override;
- void didRestoreFromPageCache() override;
</del><ins>+ void didSaveToPageCache() final;
+ void didRestoreFromPageCache() final;
</ins><span class="cx">
</span><del>- void dispatchDidBecomeFrameset(bool) override;
</del><ins>+ void dispatchDidBecomeFrameset(bool) final;
</ins><span class="cx">
</span><del>- bool canCachePage() const override;
- void convertMainResourceLoadToDownload(WebCore::DocumentLoader*, WebCore::SessionID, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&) override;
</del><ins>+ bool canCachePage() const final;
+ void convertMainResourceLoadToDownload(WebCore::DocumentLoader*, WebCore::SessionID, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&) final;
</ins><span class="cx">
</span><del>- RefPtr<WebCore::Frame> createFrame(const WebCore::URL&, const String& name, WebCore::HTMLFrameOwnerElement*,
- const String& referrer, bool allowsScrolling, int marginWidth, int marginHeight) override;
</del><ins>+ RefPtr<WebCore::Frame> createFrame(const WebCore::URL&, const String& name, WebCore::HTMLFrameOwnerElement&, const String& referrer, bool allowsScrolling, int marginWidth, int marginHeight) final;
+
+ RefPtr<WebCore::Widget> createPlugin(const WebCore::IntSize&, WebCore::HTMLPlugInElement&, const WebCore::URL&, const Vector<String>&, const Vector<String>&, const String&, bool loadManually) final;
+ void recreatePlugin(WebCore::Widget*) final;
+ void redirectDataToPlugin(WebCore::Widget* pluginWidget) final;
</ins><span class="cx">
</span><del>- RefPtr<WebCore::Widget> createPlugin(const WebCore::IntSize&, WebCore::HTMLPlugInElement*, const WebCore::URL&, const Vector<String>&, const Vector<String>&, const String&, bool loadManually) override;
- void recreatePlugin(WebCore::Widget*) override;
- void redirectDataToPlugin(WebCore::Widget* pluginWidget) override;
-
</del><span class="cx"> #if ENABLE(WEBGL)
</span><del>- WebCore::WebGLLoadPolicy webGLPolicyForURL(const String&) const override;
- WebCore::WebGLLoadPolicy resolveWebGLPolicyForURL(const String&) const override;
</del><ins>+ WebCore::WebGLLoadPolicy webGLPolicyForURL(const String&) const final;
+ WebCore::WebGLLoadPolicy resolveWebGLPolicyForURL(const String&) const final;
</ins><span class="cx"> #endif // ENABLE(WEBGL)
</span><span class="cx">
</span><del>- PassRefPtr<WebCore::Widget> createJavaAppletWidget(const WebCore::IntSize&, WebCore::HTMLAppletElement*, const WebCore::URL& baseURL, const Vector<String>& paramNames, const Vector<String>& paramValues) override;
</del><ins>+ RefPtr<WebCore::Widget> createJavaAppletWidget(const WebCore::IntSize&, WebCore::HTMLAppletElement&, const WebCore::URL& baseURL, const Vector<String>& paramNames, const Vector<String>& paramValues) final;
</ins><span class="cx">
</span><del>- WebCore::ObjectContentType objectContentType(const WebCore::URL&, const String& mimeType) override;
- String overrideMediaType() const override;
</del><ins>+ WebCore::ObjectContentType objectContentType(const WebCore::URL&, const String& mimeType) final;
+ String overrideMediaType() const final;
</ins><span class="cx">
</span><del>- void dispatchDidClearWindowObjectInWorld(WebCore::DOMWrapperWorld&) override;
</del><ins>+ void dispatchDidClearWindowObjectInWorld(WebCore::DOMWrapperWorld&) final;
</ins><span class="cx">
</span><del>- void dispatchGlobalObjectAvailable(WebCore::DOMWrapperWorld&) override;
- void dispatchWillDisconnectDOMWindowExtensionFromGlobalObject(WebCore::DOMWindowExtension*) override;
- void dispatchDidReconnectDOMWindowExtensionToGlobalObject(WebCore::DOMWindowExtension*) override;
- void dispatchWillDestroyGlobalObjectForDOMWindowExtension(WebCore::DOMWindowExtension*) override;
</del><ins>+ void dispatchGlobalObjectAvailable(WebCore::DOMWrapperWorld&) final;
+ void dispatchWillDisconnectDOMWindowExtensionFromGlobalObject(WebCore::DOMWindowExtension*) final;
+ void dispatchDidReconnectDOMWindowExtensionToGlobalObject(WebCore::DOMWindowExtension*) final;
+ void dispatchWillDestroyGlobalObjectForDOMWindowExtension(WebCore::DOMWindowExtension*) final;
</ins><span class="cx">
</span><del>- void registerForIconNotification(bool listen = true) override;
</del><ins>+ void registerForIconNotification(bool listen = true) final;
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>- RemoteAXObjectRef accessibilityRemoteObject() override;
</del><ins>+ RemoteAXObjectRef accessibilityRemoteObject() final;
</ins><span class="cx">
</span><del>- NSCachedURLResponse* willCacheResponse(WebCore::DocumentLoader*, unsigned long identifier, NSCachedURLResponse*) const override;
</del><ins>+ NSCachedURLResponse* willCacheResponse(WebCore::DocumentLoader*, unsigned long identifier, NSCachedURLResponse*) const final;
</ins><span class="cx">
</span><del>- NSDictionary *dataDetectionContext() override;
</del><ins>+ NSDictionary *dataDetectionContext() final;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- bool shouldAlwaysUsePluginDocument(const String& /*mimeType*/) const override;
</del><ins>+ bool shouldAlwaysUsePluginDocument(const String& /*mimeType*/) const final;
</ins><span class="cx">
</span><del>- void didChangeScrollOffset() override;
</del><ins>+ void didChangeScrollOffset() final;
</ins><span class="cx">
</span><del>- bool allowScript(bool enabledPerSettings) override;
</del><ins>+ bool allowScript(bool enabledPerSettings) final;
</ins><span class="cx">
</span><del>- bool shouldForceUniversalAccessFromLocalURL(const WebCore::URL&) override;
</del><ins>+ bool shouldForceUniversalAccessFromLocalURL(const WebCore::URL&) final;
</ins><span class="cx">
</span><del>- PassRefPtr<WebCore::FrameNetworkingContext> createNetworkingContext() override;
</del><ins>+ Ref<WebCore::FrameNetworkingContext> createNetworkingContext() final;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(REQUEST_AUTOCOMPLETE)
</span><del>- void didRequestAutocomplete(PassRefPtr<WebCore::FormState>) override;
</del><ins>+ void didRequestAutocomplete(Ref<WebCore::FormState>&&) final;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- void forcePageTransitionIfNeeded() override;
</del><ins>+ void forcePageTransitionIfNeeded() final;
</ins><span class="cx">
</span><span class="cx"> #if USE(QUICK_LOOK)
</span><del>- void didCreateQuickLookHandle(WebCore::QuickLookHandle&) override;
</del><ins>+ void didCreateQuickLookHandle(WebCore::QuickLookHandle&) final;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CONTENT_FILTERING)
</span><del>- void contentFilterDidBlockLoad(WebCore::ContentFilterUnblockHandler) override;
</del><ins>+ void contentFilterDidBlockLoad(WebCore::ContentFilterUnblockHandler) final;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- void prefetchDNS(const String&) override;
</del><ins>+ void prefetchDNS(const String&) final;
</ins><span class="cx">
</span><del>- void didRestoreScrollPosition() override;
</del><ins>+ void didRestoreScrollPosition() final;
</ins><span class="cx">
</span><del>- bool useIconLoadingClient() override;
- void getLoadDecisionForIcon(const WebCore::LinkIcon&, uint64_t callbackID) override;
- void finishedLoadingIcon(uint64_t loadIdentifier, WebCore::SharedBuffer*) override;
</del><ins>+ bool useIconLoadingClient() final;
+ void getLoadDecisionForIcon(const WebCore::LinkIcon&, uint64_t callbackID) final;
+ void finishedLoadingIcon(uint64_t loadIdentifier, WebCore::SharedBuffer*) final;
</ins><span class="cx">
</span><span class="cx"> WebFrame* m_frame;
</span><span class="cx"> RefPtr<PluginView> m_pluginView;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportiosWebChromeClientIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/ios/WebChromeClientIOS.mm (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/ios/WebChromeClientIOS.mm 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/ios/WebChromeClientIOS.mm 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -38,10 +38,12 @@
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> #if ENABLE(IOS_TOUCH_EVENTS)
</span><ins>+
</ins><span class="cx"> void WebChromeClient::didPreventDefaultForEvent()
</span><span class="cx"> {
</span><span class="cx"> notImplemented();
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::elementDidRefocus(const WebCore::Node* node)
</span><span class="lines">@@ -51,7 +53,7 @@
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::didReceiveMobileDocType(bool isMobileDoctype)
</span><span class="cx"> {
</span><del>- m_page->didReceiveMobileDocType(isMobileDoctype);
</del><ins>+ m_page.didReceiveMobileDocType(isMobileDoctype);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::setNeedsScrollNotifications(WebCore::Frame*, bool)
</span><span class="lines">@@ -61,7 +63,7 @@
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::observedContentChange(WebCore::Frame*)
</span><span class="cx"> {
</span><del>- m_page->completePendingSyntheticClickForContentChangeObserver();
</del><ins>+ m_page.completePendingSyntheticClickForContentChangeObserver();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::clearContentChangeObservers(WebCore::Frame*)
</span><span class="lines">@@ -71,7 +73,7 @@
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::notifyRevealedSelectionByScrollingFrame(WebCore::Frame*)
</span><span class="cx"> {
</span><del>- m_page->didChangeSelection();
</del><ins>+ m_page.didChangeSelection();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebChromeClient::isStopping()
</span><span class="lines">@@ -83,22 +85,22 @@
</span><span class="cx"> void WebChromeClient::didLayout(LayoutType type)
</span><span class="cx"> {
</span><span class="cx"> if (type == Scroll)
</span><del>- m_page->didChangeSelection();
</del><ins>+ m_page.didChangeSelection();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::didStartOverflowScroll()
</span><span class="cx"> {
</span><del>- m_page->send(Messages::WebPageProxy::OverflowScrollWillStartScroll());
</del><ins>+ m_page.send(Messages::WebPageProxy::OverflowScrollWillStartScroll());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::didEndOverflowScroll()
</span><span class="cx"> {
</span><del>- m_page->send(Messages::WebPageProxy::OverflowScrollDidEndScroll());
</del><ins>+ m_page.send(Messages::WebPageProxy::OverflowScrollDidEndScroll());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebChromeClient::hasStablePageScaleFactor() const
</span><span class="cx"> {
</span><del>- return m_page->hasStablePageScaleFactor();
</del><ins>+ return m_page.hasStablePageScaleFactor();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::suppressFormNotifications()
</span><span class="lines">@@ -128,17 +130,17 @@
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::showPlaybackTargetPicker(bool hasVideo)
</span><span class="cx"> {
</span><del>- m_page->send(Messages::WebPageProxy::ShowPlaybackTargetPicker(hasVideo, m_page->rectForElementAtInteractionLocation()));
</del><ins>+ m_page.send(Messages::WebPageProxy::ShowPlaybackTargetPicker(hasVideo, m_page.rectForElementAtInteractionLocation()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Seconds WebChromeClient::eventThrottlingDelay()
</span><span class="cx"> {
</span><del>- return m_page->eventThrottlingDelay();
</del><ins>+ return m_page.eventThrottlingDelay();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int WebChromeClient::deviceOrientation() const
</span><span class="cx"> {
</span><del>- return m_page->deviceOrientation();
</del><ins>+ return m_page.deviceOrientation();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -374,7 +374,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> PageConfiguration pageConfiguration(makeUniqueRef<WebEditorClient>(this), WebSocketProvider::create());
</span><del>- pageConfiguration.chromeClient = new WebChromeClient(this);
</del><ins>+ pageConfiguration.chromeClient = new WebChromeClient(*this);
</ins><span class="cx"> #if ENABLE(CONTEXT_MENUS)
</span><span class="cx"> pageConfiguration.contextMenuClient = new WebContextMenuClient(this);
</span><span class="cx"> #endif
</span><span class="lines">@@ -730,7 +730,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>-PassRefPtr<Plugin> WebPage::createPlugin(WebFrame* frame, HTMLPlugInElement* pluginElement, const Plugin::Parameters& parameters, String& newMIMEType)
</del><ins>+
+RefPtr<Plugin> WebPage::createPlugin(WebFrame* frame, HTMLPlugInElement* pluginElement, const Plugin::Parameters& parameters, String& newMIMEType)
</ins><span class="cx"> {
</span><span class="cx"> String frameURLString = frame->coreFrame()->loader().documentLoader()->responseURL().string();
</span><span class="cx"> String pageURLString = m_page->mainFrame().loader().documentLoader()->responseURL().string();
</span><span class="lines">@@ -1360,7 +1361,7 @@
</span><span class="cx">
</span><span class="cx"> WebPage* WebPage::fromCorePage(Page* page)
</span><span class="cx"> {
</span><del>- return static_cast<WebChromeClient&>(page->chrome().client()).page();
</del><ins>+ return &static_cast<WebChromeClient&>(page->chrome().client()).page();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPage::setSize(const WebCore::IntSize& viewSize)
</span><span class="lines">@@ -1826,7 +1827,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><del>-void WebPage::setHeaderPageBanner(PassRefPtr<PageBanner> pageBanner)
</del><ins>+
+void WebPage::setHeaderPageBanner(PageBanner* pageBanner)
</ins><span class="cx"> {
</span><span class="cx"> if (m_headerBanner)
</span><span class="cx"> m_headerBanner->detachFromPage();
</span><span class="lines">@@ -1842,7 +1844,7 @@
</span><span class="cx"> return m_headerBanner.get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPage::setFooterPageBanner(PassRefPtr<PageBanner> pageBanner)
</del><ins>+void WebPage::setFooterPageBanner(PageBanner* pageBanner)
</ins><span class="cx"> {
</span><span class="cx"> if (m_footerBanner)
</span><span class="cx"> m_footerBanner->detachFromPage();
</span><span class="lines">@@ -3609,6 +3611,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INPUT_TYPE_COLOR)
</span><ins>+
</ins><span class="cx"> void WebPage::setActiveColorChooser(WebColorChooser* colorChooser)
</span><span class="cx"> {
</span><span class="cx"> m_activeColorChooser = colorChooser;
</span><span class="lines">@@ -3623,11 +3626,12 @@
</span><span class="cx"> {
</span><span class="cx"> m_activeColorChooser->didChooseColor(color);
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>-void WebPage::setActiveOpenPanelResultListener(PassRefPtr<WebOpenPanelResultListener> openPanelResultListener)
</del><ins>+void WebPage::setActiveOpenPanelResultListener(Ref<WebOpenPanelResultListener>&& openPanelResultListener)
</ins><span class="cx"> {
</span><del>- m_activeOpenPanelResultListener = openPanelResultListener;
</del><ins>+ m_activeOpenPanelResultListener = WTFMove(openPanelResultListener);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebPage::findStringFromInjectedBundle(const String& target, FindOptions options)
</span><span class="lines">@@ -5442,11 +5446,11 @@
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(PRIMARY_SNAPSHOTTED_PLUGIN_HEURISTIC)
</span><span class="cx">
</span><del>-PassRefPtr<Range> WebPage::currentSelectionAsRange()
</del><ins>+RefPtr<Range> WebPage::currentSelectionAsRange()
</ins><span class="cx"> {
</span><del>- Frame* frame = frameWithSelection(m_page.get());
</del><ins>+ auto* frame = frameWithSelection(m_page.get());
</ins><span class="cx"> if (!frame)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> return frame->selection().toNormalizedRange();
</span><span class="cx"> }
</span><span class="lines">@@ -5546,7 +5550,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<WebCore::Range> WebPage::rangeFromEditingRange(WebCore::Frame& frame, const EditingRange& range, EditingRangeIsRelativeTo editingRangeIsRelativeTo)
</del><ins>+RefPtr<WebCore::Range> WebPage::rangeFromEditingRange(WebCore::Frame& frame, const EditingRange& range, EditingRangeIsRelativeTo editingRangeIsRelativeTo)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(range.location != notFound);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -74,7 +74,6 @@
</span><span class="cx"> #include <memory>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/MonotonicTime.h>
</span><del>-#include <wtf/PassRefPtr.h>
</del><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx"> #include <wtf/RunLoop.h>
</span><span class="cx"> #include <wtf/Seconds.h>
</span><span class="lines">@@ -314,7 +313,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> WebOpenPanelResultListener* activeOpenPanelResultListener() const { return m_activeOpenPanelResultListener.get(); }
</span><del>- void setActiveOpenPanelResultListener(PassRefPtr<WebOpenPanelResultListener>);
</del><ins>+ void setActiveOpenPanelResultListener(Ref<WebOpenPanelResultListener>&&);
</ins><span class="cx">
</span><span class="cx"> void didReceiveMessage(IPC::Connection&, IPC::Decoder&) override;
</span><span class="cx"> void didReceiveSyncMessage(IPC::Connection&, IPC::Decoder&, std::unique_ptr<IPC::Encoder>&) override;
</span><span class="lines">@@ -355,16 +354,16 @@
</span><span class="cx"> WebCore::MainFrame* mainFrame() const; // May return 0.
</span><span class="cx"> WebCore::FrameView* mainFrameView() const; // May return 0.
</span><span class="cx">
</span><del>- PassRefPtr<WebCore::Range> currentSelectionAsRange();
</del><ins>+ RefPtr<WebCore::Range> currentSelectionAsRange();
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>- PassRefPtr<Plugin> createPlugin(WebFrame*, WebCore::HTMLPlugInElement*, const Plugin::Parameters&, String& newMIMEType);
</del><ins>+ RefPtr<Plugin> createPlugin(WebFrame*, WebCore::HTMLPlugInElement*, const Plugin::Parameters&, String& newMIMEType);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEBGL)
</span><span class="cx"> WebCore::WebGLLoadPolicy webGLPolicyForURL(WebFrame*, const String&);
</span><span class="cx"> WebCore::WebGLLoadPolicy resolveWebGLPolicyForURL(WebFrame*, const String&);
</span><del>-#endif // ENABLE(WEBGL)
</del><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> enum class IncludePostLayoutDataHint { No, Yes };
</span><span class="cx"> EditorState editorState(IncludePostLayoutDataHint = IncludePostLayoutDataHint::Yes) const;
</span><span class="lines">@@ -455,21 +454,21 @@
</span><span class="cx">
</span><span class="cx"> bool hasCachedWindowFrame() const { return m_hasCachedWindowFrame; }
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS)
- void setTopOverhangImage(PassRefPtr<WebImage>);
- void setBottomOverhangImage(PassRefPtr<WebImage>);
-#endif // !PLATFORM(IOS)
-
</del><span class="cx"> void updateHeaderAndFooterLayersForDeviceScaleChange(float scaleFactor);
</span><del>-#endif // PLATFORM(COCOA)
</del><ins>+#endif
</ins><span class="cx">
</span><ins>+#if PLATFORM(MAC)
+ void setTopOverhangImage(WebImage*);
+ void setBottomOverhangImage(WebImage*);
+#endif
+
</ins><span class="cx"> bool windowIsFocused() const;
</span><span class="cx"> bool windowAndWebPageAreFocused() const;
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><del>- void setHeaderPageBanner(PassRefPtr<PageBanner>);
</del><ins>+ void setHeaderPageBanner(PageBanner*);
</ins><span class="cx"> PageBanner* headerPageBanner();
</span><del>- void setFooterPageBanner(PassRefPtr<PageBanner>);
</del><ins>+ void setFooterPageBanner(PageBanner*);
</ins><span class="cx"> PageBanner* footerPageBanner();
</span><span class="cx">
</span><span class="cx"> void hidePageBanners();
</span><span class="lines">@@ -477,7 +476,7 @@
</span><span class="cx">
</span><span class="cx"> void setHeaderBannerHeightForTesting(int);
</span><span class="cx"> void setFooterBannerHeightForTesting(int);
</span><del>-#endif // !PLATFORM(IOS)
</del><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> WebCore::IntPoint screenToRootView(const WebCore::IntPoint&);
</span><span class="cx"> WebCore::IntRect rootViewToScreen(const WebCore::IntRect&);
</span><span class="lines">@@ -621,7 +620,7 @@
</span><span class="cx"> bool hasLocalDataForURL(const WebCore::URL&);
</span><span class="cx"> String cachedResponseMIMETypeForURL(const WebCore::URL&);
</span><span class="cx"> String cachedSuggestedFilenameForURL(const WebCore::URL&);
</span><del>- PassRefPtr<WebCore::SharedBuffer> cachedResponseDataForURL(const WebCore::URL&);
</del><ins>+ RefPtr<WebCore::SharedBuffer> cachedResponseDataForURL(const WebCore::URL&);
</ins><span class="cx">
</span><span class="cx"> static bool canHandleRequest(const WebCore::ResourceRequest&);
</span><span class="cx">
</span><span class="lines">@@ -1016,9 +1015,11 @@
</span><span class="cx"> bool shouldSwitchToBlockModeForHandle(const WebCore::IntPoint& handlePoint, SelectionHandlePosition);
</span><span class="cx"> RefPtr<WebCore::Range> switchToBlockSelectionAtPoint(const WebCore::IntPoint&, SelectionHandlePosition);
</span><span class="cx"> #endif
</span><ins>+
</ins><span class="cx"> #if !PLATFORM(COCOA)
</span><span class="cx"> static const char* interpretKeyEvent(const WebCore::KeyboardEvent*);
</span><span class="cx"> #endif
</span><ins>+
</ins><span class="cx"> bool performDefaultBehaviorForKeyEvent(const WebKeyboardEvent&);
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="lines">@@ -1206,7 +1207,7 @@
</span><span class="cx"> static PluginView* focusedPluginViewForFrame(WebCore::Frame&);
</span><span class="cx"> static PluginView* pluginViewForFrame(WebCore::Frame*);
</span><span class="cx">
</span><del>- static PassRefPtr<WebCore::Range> rangeFromEditingRange(WebCore::Frame&, const EditingRange&, EditingRangeIsRelativeTo = EditingRangeIsRelativeTo::EditableRoot);
</del><ins>+ static RefPtr<WebCore::Range> rangeFromEditingRange(WebCore::Frame&, const EditingRange&, EditingRangeIsRelativeTo = EditingRangeIsRelativeTo::EditableRoot);
</ins><span class="cx">
</span><span class="cx"> void reportUsedFeatures();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageeflWebPageEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/efl/WebPageEfl.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/efl/WebPageEfl.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebKit2/WebProcess/WebPage/efl/WebPageEfl.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -157,7 +157,7 @@
</span><span class="cx"> return String();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<SharedBuffer> WebPage::cachedResponseDataForURL(const URL&)
</del><ins>+RefPtr<SharedBuffer> WebPage::cachedResponseDataForURL(const URL&)
</ins><span class="cx"> {
</span><span class="cx"> notImplemented();
</span><span class="cx"> return 0;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagegtkWebPageGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebPageGtk.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebPageGtk.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebPageGtk.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -185,13 +185,12 @@
</span><span class="cx"> return String();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<SharedBuffer> WebPage::cachedResponseDataForURL(const URL&)
</del><ins>+RefPtr<SharedBuffer> WebPage::cachedResponseDataForURL(const URL&)
</ins><span class="cx"> {
</span><span class="cx"> notImplemented();
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><span class="cx"> String WebPage::platformUserAgent(const URL& url) const
</span><span class="cx"> {
</span><span class="cx"> if (url.isNull() || !m_page->settings().needsSiteSpecificQuirks())
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -468,10 +468,10 @@
</span><span class="cx"> return String();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<SharedBuffer> WebPage::cachedResponseDataForURL(const URL&)
</del><ins>+RefPtr<SharedBuffer> WebPage::cachedResponseDataForURL(const URL&)
</ins><span class="cx"> {
</span><span class="cx"> notImplemented();
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebPage::platformCanHandleRequest(const WebCore::ResourceRequest&)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacWebPageMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -724,7 +724,7 @@
</span><span class="cx"> return [[cachedResponseForURL(this, url) response] MIMEType];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<SharedBuffer> WebPage::cachedResponseDataForURL(const URL& url)
</del><ins>+RefPtr<SharedBuffer> WebPage::cachedResponseDataForURL(const URL& url)
</ins><span class="cx"> {
</span><span class="cx"> return SharedBuffer::wrapNSData([cachedResponseForURL(this, url) data]);
</span><span class="cx"> }
</span><span class="lines">@@ -773,37 +773,33 @@
</span><span class="cx"> result = !!hitResult.scrollbar();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPage::setTopOverhangImage(PassRefPtr<WebImage> image)
</del><ins>+void WebPage::setTopOverhangImage(WebImage* image)
</ins><span class="cx"> {
</span><del>- FrameView* frameView = m_mainFrame->coreFrame()->view();
</del><ins>+ auto* frameView = m_mainFrame->coreFrame()->view();
</ins><span class="cx"> if (!frameView)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- GraphicsLayer* layer = frameView->setWantsLayerForTopOverHangArea(image.get());
</del><ins>+ auto* layer = frameView->setWantsLayerForTopOverHangArea(image);
</ins><span class="cx"> if (!layer)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> layer->setSize(image->size());
</span><span class="cx"> layer->setPosition(FloatPoint(0, -image->size().height()));
</span><del>-
- RetainPtr<CGImageRef> cgImage = image->bitmap().makeCGImageCopy();
- layer->platformLayer().contents = (id)cgImage.get();
</del><ins>+ layer->platformLayer().contents = (id)image->bitmap().makeCGImageCopy().get();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPage::setBottomOverhangImage(PassRefPtr<WebImage> image)
</del><ins>+void WebPage::setBottomOverhangImage(WebImage* image)
</ins><span class="cx"> {
</span><del>- FrameView* frameView = m_mainFrame->coreFrame()->view();
</del><ins>+ auto* frameView = m_mainFrame->coreFrame()->view();
</ins><span class="cx"> if (!frameView)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- GraphicsLayer* layer = frameView->setWantsLayerForBottomOverHangArea(image.get());
</del><ins>+ auto* layer = frameView->setWantsLayerForBottomOverHangArea(image);
</ins><span class="cx"> if (!layer)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> layer->setSize(image->size());
</span><del>-
- RetainPtr<CGImageRef> cgImage = image->bitmap().makeCGImageCopy();
- layer->platformLayer().contents = (id)cgImage.get();
</del><ins>+ layer->platformLayer().contents = (id)image->bitmap().makeCGImageCopy().get();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPage::updateHeaderAndFooterLayersForDeviceScaleChange(float scaleFactor)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -158,22 +158,12 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> , m_viewUpdateDispatcher(ViewUpdateDispatcher::create())
</span><span class="cx"> #endif
</span><del>- , m_inDidClose(false)
- , m_hasSetCacheModel(false)
- , m_cacheModel(CacheModelDocumentViewer)
- , m_fullKeyboardAccessEnabled(false)
- , m_textCheckerState()
- , m_iconDatabaseProxy(*new WebIconDatabaseProxy(this))
</del><ins>+ , m_iconDatabaseProxy(*new WebIconDatabaseProxy(*this))
</ins><span class="cx"> , m_webLoaderStrategy(*new WebLoaderStrategy)
</span><span class="cx"> , m_dnsPrefetchHystereris([this](HysteresisState state) { if (state == HysteresisState::Stopped) m_dnsPrefetchedHosts.clear(); })
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> , m_pluginProcessConnectionManager(PluginProcessConnectionManager::create())
</span><span class="cx"> #endif
</span><del>-#if ENABLE(SERVICE_CONTROLS)
- , m_hasImageServices(false)
- , m_hasSelectionServices(false)
- , m_hasRichContentServices(false)
-#endif
</del><span class="cx"> , m_nonVisibleProcessCleanupTimer(*this, &WebProcess::nonVisibleProcessCleanupTimerFired)
</span><span class="cx"> , m_statisticsChangedTimer(*this, &WebProcess::statisticsChangedTimerFired)
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="lines">@@ -194,9 +184,11 @@
</span><span class="cx"> #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
</span><span class="cx"> addSupplement<WebNotificationManager>();
</span><span class="cx"> #endif
</span><ins>+
</ins><span class="cx"> #if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</span><span class="cx"> addSupplement<WebMediaKeyStorageManager>();
</span><span class="cx"> #endif
</span><ins>+
</ins><span class="cx"> m_plugInAutoStartOriginHashes.add(SessionID::defaultSessionID(), HashMap<unsigned, double>());
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE)
</span><span class="lines">@@ -207,7 +199,6 @@
</span><span class="cx"> m_resourceLoadStatisticsStorage->setNotificationCallback([this] {
</span><span class="cx"> if (m_statisticsChangedTimer.isActive())
</span><span class="cx"> return;
</span><del>-
</del><span class="cx"> m_statisticsChangedTimer.startOneShot(std::chrono::seconds(5));
</span><span class="cx"> });
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.h (210844 => 210845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.h 2017-01-18 04:22:45 UTC (rev 210844)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.h 2017-01-18 05:17:17 UTC (rev 210845)
</span><span class="lines">@@ -23,8 +23,7 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef WebProcess_h
-#define WebProcess_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "CacheModel.h"
</span><span class="cx"> #include "ChildProcess.h"
</span><span class="lines">@@ -346,13 +345,13 @@
</span><span class="cx"> RefPtr<ViewUpdateDispatcher> m_viewUpdateDispatcher;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- bool m_inDidClose;
</del><ins>+ bool m_inDidClose { false };
</ins><span class="cx">
</span><span class="cx"> HashMap<WebCore::SessionID, HashMap<unsigned, double>> m_plugInAutoStartOriginHashes;
</span><span class="cx"> HashSet<String> m_plugInAutoStartOrigins;
</span><span class="cx">
</span><del>- bool m_hasSetCacheModel;
- CacheModel m_cacheModel;
</del><ins>+ bool m_hasSetCacheModel { false };
+ CacheModel m_cacheModel { CacheModelDocumentViewer };
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> WebCore::MachSendRight m_compositingRenderServerPort;
</span><span class="lines">@@ -359,7 +358,7 @@
</span><span class="cx"> pid_t m_presenterApplicationPid;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- bool m_fullKeyboardAccessEnabled;
</del><ins>+ bool m_fullKeyboardAccessEnabled { false };
</ins><span class="cx">
</span><span class="cx"> HashMap<uint64_t, WebFrame*> m_frameMap;
</span><span class="cx">
</span><span class="lines">@@ -388,9 +387,9 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SERVICE_CONTROLS)
</span><del>- bool m_hasImageServices;
- bool m_hasSelectionServices;
- bool m_hasRichContentServices;
</del><ins>+ bool m_hasImageServices { false };
+ bool m_hasSelectionServices { false };
+ bool m_hasRichContentServices { false };
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> HashSet<uint64_t> m_pagesInWindows;
</span><span class="lines">@@ -416,5 +415,3 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><del>-
-#endif // WebProcess_h
</del></span></pre>
</div>
</div>
</body>
</html>