<!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>[208804] trunk/Source/WebCore</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/208804">208804</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2016-11-16 12:43:14 -0800 (Wed, 16 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Re-indent some old headers.
Rubberstamped by Alex Christensen
No new tests (No behavior change).
(Also #pragma once a few of them)
* loader/DocumentLoader.h:
* loader/FrameLoaderClient.h:
* page/Frame.h:
* page/FrameTree.h:
* page/PageGroup.h:
* platform/Cursor.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentLoaderh">trunk/Source/WebCore/loader/DocumentLoader.h</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoaderClienth">trunk/Source/WebCore/loader/FrameLoaderClient.h</a></li>
<li><a href="#trunkSourceWebCorepageFrameh">trunk/Source/WebCore/page/Frame.h</a></li>
<li><a href="#trunkSourceWebCorepageFrameTreeh">trunk/Source/WebCore/page/FrameTree.h</a></li>
<li><a href="#trunkSourceWebCorepagePageGrouph">trunk/Source/WebCore/page/PageGroup.h</a></li>
<li><a href="#trunkSourceWebCoreplatformCursorh">trunk/Source/WebCore/platform/Cursor.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208803 => 208804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-16 20:26:59 UTC (rev 208803)
+++ trunk/Source/WebCore/ChangeLog 2016-11-16 20:43:14 UTC (rev 208804)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-11-16 Brady Eidson <beidson@apple.com>
+
+ Re-indent some old headers.
+
+ Rubberstamped by Alex Christensen
+
+ No new tests (No behavior change).
+
+ (Also #pragma once a few of them)
+
+ * loader/DocumentLoader.h:
+ * loader/FrameLoaderClient.h:
+ * page/Frame.h:
+ * page/FrameTree.h:
+ * page/PageGroup.h:
+ * platform/Cursor.h:
+
</ins><span class="cx"> 2016-11-16 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r208672): Crash in com.apple.WebCore: WebCore::DatabaseContext::stopDatabases + 34
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentLoader.h (208803 => 208804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentLoader.h 2016-11-16 20:26:59 UTC (rev 208803)
+++ trunk/Source/WebCore/loader/DocumentLoader.h 2016-11-16 20:43:14 UTC (rev 208804)
</span><span class="lines">@@ -61,422 +61,422 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>- class ApplicationCacheHost;
- class Archive;
- class ArchiveResource;
- class ArchiveResourceCollection;
- class CachedRawResource;
- class CachedResourceLoader;
- class ContentFilter;
- class FormState;
- class Frame;
- class FrameLoader;
- class Page;
- class ResourceLoader;
- class SharedBuffer;
- class SubresourceLoader;
- class SubstituteResource;
</del><ins>+class ApplicationCacheHost;
+class Archive;
+class ArchiveResource;
+class ArchiveResourceCollection;
+class CachedRawResource;
+class CachedResourceLoader;
+class ContentFilter;
+class FormState;
+class Frame;
+class FrameLoader;
+class Page;
+class ResourceLoader;
+class SharedBuffer;
+class SubresourceLoader;
+class SubstituteResource;
</ins><span class="cx">
</span><del>- typedef HashMap<unsigned long, RefPtr<ResourceLoader>> ResourceLoaderMap;
- typedef Vector<ResourceResponse> ResponseVector;
</del><ins>+typedef HashMap<unsigned long, RefPtr<ResourceLoader>> ResourceLoaderMap;
+typedef Vector<ResourceResponse> ResponseVector;
</ins><span class="cx">
</span><del>- class DocumentLoader : public RefCounted<DocumentLoader>, private CachedRawResourceClient {
- WTF_MAKE_FAST_ALLOCATED;
- friend class ContentFilter;
- public:
- static Ref<DocumentLoader> create(const ResourceRequest& request, const SubstituteData& data)
- {
- return adoptRef(*new DocumentLoader(request, data));
- }
- WEBCORE_EXPORT virtual ~DocumentLoader();
</del><ins>+class DocumentLoader : public RefCounted<DocumentLoader>, private CachedRawResourceClient {
+ WTF_MAKE_FAST_ALLOCATED;
+ friend class ContentFilter;
+public:
+ static Ref<DocumentLoader> create(const ResourceRequest& request, const SubstituteData& data)
+ {
+ return adoptRef(*new DocumentLoader(request, data));
+ }
+ WEBCORE_EXPORT virtual ~DocumentLoader();
</ins><span class="cx">
</span><del>- void attachToFrame(Frame&);
- Frame* frame() const { return m_frame; }
</del><ins>+ void attachToFrame(Frame&);
+ Frame* frame() const { return m_frame; }
</ins><span class="cx">
</span><del>- WEBCORE_EXPORT virtual void detachFromFrame();
</del><ins>+ WEBCORE_EXPORT virtual void detachFromFrame();
</ins><span class="cx">
</span><del>- WEBCORE_EXPORT FrameLoader* frameLoader() const;
- WEBCORE_EXPORT SubresourceLoader* mainResourceLoader() const;
- WEBCORE_EXPORT RefPtr<SharedBuffer> mainResourceData() const;
-
- DocumentWriter& writer() const { return m_writer; }
</del><ins>+ WEBCORE_EXPORT FrameLoader* frameLoader() const;
+ WEBCORE_EXPORT SubresourceLoader* mainResourceLoader() const;
+ WEBCORE_EXPORT RefPtr<SharedBuffer> mainResourceData() const;
+
+ DocumentWriter& writer() const { return m_writer; }
</ins><span class="cx">
</span><del>- WEBCORE_EXPORT const ResourceRequest& originalRequest() const;
- WEBCORE_EXPORT const ResourceRequest& originalRequestCopy() const;
</del><ins>+ WEBCORE_EXPORT const ResourceRequest& originalRequest() const;
+ WEBCORE_EXPORT const ResourceRequest& originalRequestCopy() const;
</ins><span class="cx">
</span><del>- WEBCORE_EXPORT const ResourceRequest& request() const;
- WEBCORE_EXPORT ResourceRequest& request();
</del><ins>+ WEBCORE_EXPORT const ResourceRequest& request() const;
+ WEBCORE_EXPORT ResourceRequest& request();
</ins><span class="cx">
</span><del>- CachedResourceLoader& cachedResourceLoader() { return m_cachedResourceLoader; }
</del><ins>+ CachedResourceLoader& cachedResourceLoader() { return m_cachedResourceLoader; }
</ins><span class="cx">
</span><del>- const SubstituteData& substituteData() const { return m_substituteData; }
</del><ins>+ const SubstituteData& substituteData() const { return m_substituteData; }
</ins><span class="cx">
</span><del>- WEBCORE_EXPORT const URL& url() const;
- WEBCORE_EXPORT const URL& unreachableURL() const;
</del><ins>+ WEBCORE_EXPORT const URL& url() const;
+ WEBCORE_EXPORT const URL& unreachableURL() const;
</ins><span class="cx">
</span><del>- const URL& originalURL() const;
- WEBCORE_EXPORT const URL& responseURL() const;
- WEBCORE_EXPORT const String& responseMIMEType() const;
</del><ins>+ const URL& originalURL() const;
+ WEBCORE_EXPORT const URL& responseURL() const;
+ WEBCORE_EXPORT const String& responseMIMEType() const;
</ins><span class="cx"> #if PLATFORM(IOS)
</span><del>- // FIXME: This method seems to violate the encapsulation of this class.
- WEBCORE_EXPORT void setResponseMIMEType(const String&);
</del><ins>+ // FIXME: This method seems to violate the encapsulation of this class.
+ WEBCORE_EXPORT void setResponseMIMEType(const String&);
</ins><span class="cx"> #endif
</span><del>- const String& currentContentType() const;
- void replaceRequestURLForSameDocumentNavigation(const URL&);
- bool isStopping() const { return m_isStopping; }
- void stopLoading();
- void setCommitted(bool committed) { m_committed = committed; }
- bool isCommitted() const { return m_committed; }
- WEBCORE_EXPORT bool isLoading() const;
</del><ins>+ const String& currentContentType() const;
+ void replaceRequestURLForSameDocumentNavigation(const URL&);
+ bool isStopping() const { return m_isStopping; }
+ void stopLoading();
+ void setCommitted(bool committed) { m_committed = committed; }
+ bool isCommitted() const { return m_committed; }
+ WEBCORE_EXPORT bool isLoading() const;
</ins><span class="cx">
</span><del>- const ResourceError& mainDocumentError() const { return m_mainDocumentError; }
</del><ins>+ const ResourceError& mainDocumentError() const { return m_mainDocumentError; }
</ins><span class="cx">
</span><del>- const ResourceResponse& response() const { return m_response; }
</del><ins>+ const ResourceResponse& response() const { return m_response; }
</ins><span class="cx"> #if PLATFORM(IOS)
</span><del>- // FIXME: This method seems to violate the encapsulation of this class.
- void setResponse(const ResourceResponse& response) { m_response = response; }
</del><ins>+ // FIXME: This method seems to violate the encapsulation of this class.
+ void setResponse(const ResourceResponse& response) { m_response = response; }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- bool isClientRedirect() const { return m_isClientRedirect; }
- void setIsClientRedirect(bool isClientRedirect) { m_isClientRedirect = isClientRedirect; }
- void dispatchOnloadEvents();
- bool wasOnloadDispatched() { return m_wasOnloadDispatched; }
- WEBCORE_EXPORT bool isLoadingInAPISense() const;
- WEBCORE_EXPORT void setTitle(const StringWithDirection&);
- const String& overrideEncoding() const { return m_overrideEncoding; }
</del><ins>+ bool isClientRedirect() const { return m_isClientRedirect; }
+ void setIsClientRedirect(bool isClientRedirect) { m_isClientRedirect = isClientRedirect; }
+ void dispatchOnloadEvents();
+ bool wasOnloadDispatched() { return m_wasOnloadDispatched; }
+ WEBCORE_EXPORT bool isLoadingInAPISense() const;
+ WEBCORE_EXPORT void setTitle(const StringWithDirection&);
+ const String& overrideEncoding() const { return m_overrideEncoding; }
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA) && !USE(CFURLCONNECTION)
</span><del>- void schedule(SchedulePair&);
- void unschedule(SchedulePair&);
</del><ins>+ void schedule(SchedulePair&);
+ void unschedule(SchedulePair&);
</ins><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*);
- WEBCORE_EXPORT void addArchiveResource(Ref<ArchiveResource>&&);
- PassRefPtr<Archive> popArchiveForSubframe(const String& frameName, const URL&);
- WEBCORE_EXPORT SharedBuffer* parsedArchiveData() const;
</del><ins>+ void setArchive(PassRefPtr<Archive>);
+ WEBCORE_EXPORT void addAllArchiveResources(Archive*);
+ WEBCORE_EXPORT void addArchiveResource(Ref<ArchiveResource>&&);
+ PassRefPtr<Archive> popArchiveForSubframe(const String& frameName, const URL&);
+ WEBCORE_EXPORT SharedBuffer* parsedArchiveData() const;
</ins><span class="cx">
</span><del>- WEBCORE_EXPORT bool scheduleArchiveLoad(ResourceLoader&, const ResourceRequest&);
</del><ins>+ WEBCORE_EXPORT bool scheduleArchiveLoad(ResourceLoader&, const ResourceRequest&);
</ins><span class="cx"> #endif
</span><del>- void scheduleSubstituteResourceLoad(ResourceLoader&, SubstituteResource&);
</del><ins>+ void scheduleSubstituteResourceLoad(ResourceLoader&, SubstituteResource&);
</ins><span class="cx">
</span><del>- // Return the ArchiveResource for the URL only when loading an Archive
- WEBCORE_EXPORT ArchiveResource* archiveResourceForURL(const URL&) const;
</del><ins>+ // Return the ArchiveResource for the URL only when loading an Archive
+ WEBCORE_EXPORT ArchiveResource* archiveResourceForURL(const URL&) const;
</ins><span class="cx">
</span><del>- WEBCORE_EXPORT RefPtr<ArchiveResource> mainResource() const;
</del><ins>+ WEBCORE_EXPORT RefPtr<ArchiveResource> mainResource() const;
</ins><span class="cx">
</span><del>- // Return an ArchiveResource for the URL, either creating from live data or
- // pulling from the ArchiveResourceCollection
- WEBCORE_EXPORT PassRefPtr<ArchiveResource> subresource(const URL&) const;
- WEBCORE_EXPORT Vector<RefPtr<ArchiveResource>> subresources() const;
</del><ins>+ // Return an ArchiveResource for the URL, either creating from live data or
+ // pulling from the ArchiveResourceCollection
+ WEBCORE_EXPORT PassRefPtr<ArchiveResource> subresource(const URL&) const;
+ WEBCORE_EXPORT Vector<RefPtr<ArchiveResource>> subresources() const;
</ins><span class="cx">
</span><span class="cx"> #ifndef NDEBUG
</span><del>- bool isSubstituteLoadPending(ResourceLoader*) const;
</del><ins>+ bool isSubstituteLoadPending(ResourceLoader*) const;
</ins><span class="cx"> #endif
</span><del>- void cancelPendingSubstituteLoad(ResourceLoader*);
-
- void addResponse(const ResourceResponse&);
- const ResponseVector& responses() const { return m_responses; }
</del><ins>+ void cancelPendingSubstituteLoad(ResourceLoader*);
+
+ void addResponse(const ResourceResponse&);
+ const ResponseVector& responses() const { return m_responses; }
</ins><span class="cx">
</span><del>- const NavigationAction& triggeringAction() const { return m_triggeringAction; }
- void setTriggeringAction(const NavigationAction&);
- void setOverrideEncoding(const String& encoding) { m_overrideEncoding = encoding; }
- void setLastCheckedRequest(const ResourceRequest& request) { m_lastCheckedRequest = request; }
- const ResourceRequest& lastCheckedRequest() { return m_lastCheckedRequest; }
</del><ins>+ const NavigationAction& triggeringAction() const { return m_triggeringAction; }
+ void setTriggeringAction(const NavigationAction&);
+ void setOverrideEncoding(const String& encoding) { m_overrideEncoding = encoding; }
+ void setLastCheckedRequest(const ResourceRequest& request) { m_lastCheckedRequest = request; }
+ const ResourceRequest& lastCheckedRequest() { return m_lastCheckedRequest; }
</ins><span class="cx">
</span><del>- void stopRecordingResponses();
- const StringWithDirection& title() const { return m_pageTitle; }
</del><ins>+ void stopRecordingResponses();
+ const StringWithDirection& title() const { return m_pageTitle; }
</ins><span class="cx">
</span><del>- WEBCORE_EXPORT URL urlForHistory() const;
- WEBCORE_EXPORT bool urlForHistoryReflectsFailure() const;
</del><ins>+ WEBCORE_EXPORT URL urlForHistory() const;
+ WEBCORE_EXPORT bool urlForHistoryReflectsFailure() const;
</ins><span class="cx">
</span><del>- // These accessors accommodate WebCore's somewhat fickle custom of creating history
- // items for redirects, but only sometimes. For "source" and "destination",
- // these accessors return the URL that would have been used if a history
- // item were created. This allows WebKit to link history items reflecting
- // redirects into a chain from start to finish.
- String clientRedirectSourceForHistory() const { return m_clientRedirectSourceForHistory; } // null if no client redirect occurred.
- String clientRedirectDestinationForHistory() const { return urlForHistory(); }
- void setClientRedirectSourceForHistory(const String& clientRedirectSourceForHistory) { m_clientRedirectSourceForHistory = clientRedirectSourceForHistory; }
-
- String serverRedirectSourceForHistory() const { return (urlForHistory() == url() || url() == blankURL()) ? String() : urlForHistory().string(); } // null if no server redirect occurred.
- String serverRedirectDestinationForHistory() const { return url(); }
</del><ins>+ // These accessors accommodate WebCore's somewhat fickle custom of creating history
+ // items for redirects, but only sometimes. For "source" and "destination",
+ // these accessors return the URL that would have been used if a history
+ // item were created. This allows WebKit to link history items reflecting
+ // redirects into a chain from start to finish.
+ String clientRedirectSourceForHistory() const { return m_clientRedirectSourceForHistory; } // null if no client redirect occurred.
+ String clientRedirectDestinationForHistory() const { return urlForHistory(); }
+ void setClientRedirectSourceForHistory(const String& clientRedirectSourceForHistory) { m_clientRedirectSourceForHistory = clientRedirectSourceForHistory; }
+
+ String serverRedirectSourceForHistory() const { return (urlForHistory() == url() || url() == blankURL()) ? String() : urlForHistory().string(); } // null if no server redirect occurred.
+ String serverRedirectDestinationForHistory() const { return url(); }
</ins><span class="cx">
</span><del>- bool didCreateGlobalHistoryEntry() const { return m_didCreateGlobalHistoryEntry; }
- void setDidCreateGlobalHistoryEntry(bool didCreateGlobalHistoryEntry) { m_didCreateGlobalHistoryEntry = didCreateGlobalHistoryEntry; }
</del><ins>+ bool didCreateGlobalHistoryEntry() const { return m_didCreateGlobalHistoryEntry; }
+ void setDidCreateGlobalHistoryEntry(bool didCreateGlobalHistoryEntry) { m_didCreateGlobalHistoryEntry = didCreateGlobalHistoryEntry; }
</ins><span class="cx">
</span><del>- bool subresourceLoadersArePageCacheAcceptable() const { return m_subresourceLoadersArePageCacheAcceptable; }
</del><ins>+ bool subresourceLoadersArePageCacheAcceptable() const { return m_subresourceLoadersArePageCacheAcceptable; }
</ins><span class="cx">
</span><del>- void setDefersLoading(bool);
- void setMainResourceDataBufferingPolicy(DataBufferingPolicy);
</del><ins>+ void setDefersLoading(bool);
+ void setMainResourceDataBufferingPolicy(DataBufferingPolicy);
</ins><span class="cx">
</span><del>- void startLoadingMainResource();
- WEBCORE_EXPORT void cancelMainResourceLoad(const ResourceError&);
- void willContinueMainResourceLoadAfterRedirect(const ResourceRequest&);
</del><ins>+ void startLoadingMainResource();
+ WEBCORE_EXPORT void cancelMainResourceLoad(const ResourceError&);
+ void willContinueMainResourceLoadAfterRedirect(const ResourceRequest&);
</ins><span class="cx">
</span><del>- // Support iconDatabase in synchronous mode.
- void iconLoadDecisionAvailable();
-
- // Support iconDatabase in asynchronous mode.
- void continueIconLoadWithDecision(IconLoadDecision);
- void getIconLoadDecisionForIconURL(const String&);
- void getIconDataForIconURL(const String&);
</del><ins>+ // Support iconDatabase in synchronous mode.
+ void iconLoadDecisionAvailable();
+
+ // Support iconDatabase in asynchronous mode.
+ void continueIconLoadWithDecision(IconLoadDecision);
+ void getIconLoadDecisionForIconURL(const String&);
+ void getIconDataForIconURL(const String&);
</ins><span class="cx">
</span><del>- bool isLoadingMainResource() const { return m_loadingMainResource; }
- bool isLoadingMultipartContent() const { return m_isLoadingMultipartContent; }
</del><ins>+ bool isLoadingMainResource() const { return m_loadingMainResource; }
+ bool isLoadingMultipartContent() const { return m_isLoadingMultipartContent; }
</ins><span class="cx">
</span><del>- void stopLoadingPlugIns();
- void stopLoadingSubresources();
</del><ins>+ void stopLoadingPlugIns();
+ void stopLoadingSubresources();
</ins><span class="cx">
</span><del>- bool userContentExtensionsEnabled() const { return m_userContentExtensionsEnabled; }
- void setUserContentExtensionsEnabled(bool enabled) { m_userContentExtensionsEnabled = enabled; }
</del><ins>+ bool userContentExtensionsEnabled() const { return m_userContentExtensionsEnabled; }
+ void setUserContentExtensionsEnabled(bool enabled) { m_userContentExtensionsEnabled = enabled; }
</ins><span class="cx">
</span><del>- void addSubresourceLoader(ResourceLoader*);
- void removeSubresourceLoader(ResourceLoader*);
- void addPlugInStreamLoader(ResourceLoader&);
- void removePlugInStreamLoader(ResourceLoader&);
</del><ins>+ void addSubresourceLoader(ResourceLoader*);
+ void removeSubresourceLoader(ResourceLoader*);
+ void addPlugInStreamLoader(ResourceLoader&);
+ void removePlugInStreamLoader(ResourceLoader&);
</ins><span class="cx">
</span><del>- void subresourceLoaderFinishedLoadingOnePart(ResourceLoader*);
</del><ins>+ void subresourceLoaderFinishedLoadingOnePart(ResourceLoader*);
</ins><span class="cx">
</span><del>- void setDeferMainResourceDataLoad(bool defer) { m_deferMainResourceDataLoad = defer; }
-
- void didTellClientAboutLoad(const String& url)
- {
</del><ins>+ void setDeferMainResourceDataLoad(bool defer) { m_deferMainResourceDataLoad = defer; }
+
+ void didTellClientAboutLoad(const String& url)
+ {
</ins><span class="cx"> #if !PLATFORM(COCOA)
</span><del>- // 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;
</del><ins>+ // 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;
</ins><span class="cx"> #endif
</span><del>- if (!url.isEmpty())
- m_resourcesClientKnowsAbout.add(url);
- }
- bool haveToldClientAboutLoad(const String& url) { return m_resourcesClientKnowsAbout.contains(url); }
- void recordMemoryCacheLoadForFutureClientNotification(const ResourceRequest&);
- void takeMemoryCacheLoadsForClientNotification(Vector<ResourceRequest>& loads);
</del><ins>+ if (!url.isEmpty())
+ m_resourcesClientKnowsAbout.add(url);
+ }
+ bool haveToldClientAboutLoad(const String& url) { return m_resourcesClientKnowsAbout.contains(url); }
+ void recordMemoryCacheLoadForFutureClientNotification(const ResourceRequest&);
+ void takeMemoryCacheLoadsForClientNotification(Vector<ResourceRequest>& loads);
</ins><span class="cx">
</span><del>- LoadTiming& timing() { return m_loadTiming; }
- void resetTiming() { m_loadTiming = LoadTiming(); }
</del><ins>+ LoadTiming& timing() { return m_loadTiming; }
+ void resetTiming() { m_loadTiming = LoadTiming(); }
</ins><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.
- WEBCORE_EXPORT void commitData(const char* bytes, size_t length);
</del><ins>+ // The WebKit layer calls this function when it's ready for the data to
+ // actually be added to the document.
+ WEBCORE_EXPORT void commitData(const char* bytes, size_t length);
</ins><span class="cx">
</span><del>- ApplicationCacheHost* applicationCacheHost() const { return m_applicationCacheHost.get(); }
</del><ins>+ ApplicationCacheHost* applicationCacheHost() const { return m_applicationCacheHost.get(); }
</ins><span class="cx">
</span><del>- void checkLoadComplete();
</del><ins>+ void checkLoadComplete();
</ins><span class="cx">
</span><del>- // The URL of the document resulting from this DocumentLoader.
- URL documentURL() const;
</del><ins>+ // The URL of the document resulting from this DocumentLoader.
+ URL documentURL() const;
</ins><span class="cx">
</span><span class="cx"> #if USE(QUICK_LOOK)
</span><del>- void setQuickLookHandle(std::unique_ptr<QuickLookHandle> quickLookHandle) { m_quickLookHandle = WTFMove(quickLookHandle); }
- QuickLookHandle* quickLookHandle() const { return m_quickLookHandle.get(); }
</del><ins>+ void setQuickLookHandle(std::unique_ptr<QuickLookHandle> quickLookHandle) { m_quickLookHandle = WTFMove(quickLookHandle); }
+ QuickLookHandle* quickLookHandle() const { return m_quickLookHandle.get(); }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CONTENT_EXTENSIONS)
</span><del>- void addPendingContentExtensionSheet(const String& identifier, StyleSheetContents&);
- void addPendingContentExtensionDisplayNoneSelector(const String& identifier, const String& selector, uint32_t selectorID);
</del><ins>+ void addPendingContentExtensionSheet(const String& identifier, StyleSheetContents&);
+ void addPendingContentExtensionDisplayNoneSelector(const String& identifier, const String& selector, uint32_t selectorID);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- void setShouldOpenExternalURLsPolicy(ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicy) { m_shouldOpenExternalURLsPolicy = shouldOpenExternalURLsPolicy; }
- ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicyToPropagate() const;
</del><ins>+ void setShouldOpenExternalURLsPolicy(ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicy) { m_shouldOpenExternalURLsPolicy = shouldOpenExternalURLsPolicy; }
+ ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicyToPropagate() const;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(CONTENT_FILTERING)
</span><del>- ContentFilter* contentFilter() const;
</del><ins>+ ContentFilter* contentFilter() const;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- bool isAlwaysOnLoggingAllowed() const;
</del><ins>+ bool isAlwaysOnLoggingAllowed() const;
</ins><span class="cx">
</span><del>- protected:
- WEBCORE_EXPORT DocumentLoader(const ResourceRequest&, const SubstituteData&);
</del><ins>+protected:
+ WEBCORE_EXPORT DocumentLoader(const ResourceRequest&, const SubstituteData&);
</ins><span class="cx">
</span><del>- WEBCORE_EXPORT virtual void attachToFrame();
</del><ins>+ WEBCORE_EXPORT virtual void attachToFrame();
</ins><span class="cx">
</span><del>- bool m_deferMainResourceDataLoad;
</del><ins>+ bool m_deferMainResourceDataLoad;
</ins><span class="cx">
</span><del>- private:
- Document* document() const;
</del><ins>+private:
+ Document* document() const;
</ins><span class="cx">
</span><del>- void setRequest(const ResourceRequest&);
</del><ins>+ void setRequest(const ResourceRequest&);
</ins><span class="cx">
</span><del>- void commitIfReady();
- void setMainDocumentError(const ResourceError&);
- void commitLoad(const char*, int);
- void clearMainResourceLoader();
</del><ins>+ void commitIfReady();
+ void setMainDocumentError(const ResourceError&);
+ void commitLoad(const char*, int);
+ void clearMainResourceLoader();
</ins><span class="cx">
</span><del>- void setupForReplace();
- void maybeFinishLoadingMultipartContent();
-
- bool maybeCreateArchive();
</del><ins>+ void setupForReplace();
+ void maybeFinishLoadingMultipartContent();
+
+ bool maybeCreateArchive();
</ins><span class="cx"> #if ENABLE(WEB_ARCHIVE) || ENABLE(MHTML)
</span><del>- void clearArchiveResources();
</del><ins>+ void clearArchiveResources();
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- void willSendRequest(ResourceRequest&, const ResourceResponse&);
- void finishedLoading(double finishTime);
- void mainReceivedError(const ResourceError&);
- WEBCORE_EXPORT void redirectReceived(CachedResource&, ResourceRequest&, const ResourceResponse&) override;
- WEBCORE_EXPORT void responseReceived(CachedResource&, const ResourceResponse&) override;
- WEBCORE_EXPORT void dataReceived(CachedResource&, const char* data, int length) override;
- WEBCORE_EXPORT void notifyFinished(CachedResource&) override;
</del><ins>+ void willSendRequest(ResourceRequest&, const ResourceResponse&);
+ void finishedLoading(double finishTime);
+ void mainReceivedError(const ResourceError&);
+ WEBCORE_EXPORT void redirectReceived(CachedResource&, ResourceRequest&, const ResourceResponse&) override;
+ WEBCORE_EXPORT void responseReceived(CachedResource&, const ResourceResponse&) override;
+ WEBCORE_EXPORT void dataReceived(CachedResource&, const char* data, int length) override;
+ WEBCORE_EXPORT void notifyFinished(CachedResource&) override;
</ins><span class="cx">
</span><del>- void responseReceived(const ResourceResponse&);
- void dataReceived(const char* data, int length);
</del><ins>+ void responseReceived(const ResourceResponse&);
+ void dataReceived(const char* data, int length);
</ins><span class="cx">
</span><del>- bool maybeLoadEmpty();
</del><ins>+ bool maybeLoadEmpty();
</ins><span class="cx">
</span><del>- bool isMultipartReplacingLoad() const;
- bool isPostOrRedirectAfterPost(const ResourceRequest&, const ResourceResponse&);
</del><ins>+ bool isMultipartReplacingLoad() const;
+ bool isPostOrRedirectAfterPost(const ResourceRequest&, const ResourceResponse&);
</ins><span class="cx">
</span><del>- void continueAfterNavigationPolicy(const ResourceRequest&, bool shouldContinue);
- void continueAfterContentPolicy(PolicyAction);
</del><ins>+ void continueAfterNavigationPolicy(const ResourceRequest&, bool shouldContinue);
+ void continueAfterContentPolicy(PolicyAction);
</ins><span class="cx">
</span><del>- void stopLoadingForPolicyChange();
- ResourceError interruptedForPolicyChangeError() const;
</del><ins>+ void stopLoadingForPolicyChange();
+ ResourceError interruptedForPolicyChangeError() const;
</ins><span class="cx">
</span><del>- void stopLoadingAfterXFrameOptionsOrContentSecurityPolicyDenied(unsigned long identifier, const ResourceResponse&);
</del><ins>+ void stopLoadingAfterXFrameOptionsOrContentSecurityPolicyDenied(unsigned long identifier, const ResourceResponse&);
</ins><span class="cx">
</span><span class="cx"> #if HAVE(RUNLOOP_TIMER)
</span><del>- typedef RunLoopTimer<DocumentLoader> DocumentLoaderTimer;
</del><ins>+ typedef RunLoopTimer<DocumentLoader> DocumentLoaderTimer;
</ins><span class="cx"> #else
</span><del>- typedef Timer DocumentLoaderTimer;
</del><ins>+ typedef Timer DocumentLoaderTimer;
</ins><span class="cx"> #endif
</span><del>- void handleSubstituteDataLoadSoon();
- void handleSubstituteDataLoadNow();
- void startDataLoadTimer();
</del><ins>+ void handleSubstituteDataLoadSoon();
+ void handleSubstituteDataLoadNow();
+ void startDataLoadTimer();
</ins><span class="cx">
</span><del>- void deliverSubstituteResourcesAfterDelay();
- void substituteResourceDeliveryTimerFired();
</del><ins>+ void deliverSubstituteResourcesAfterDelay();
+ void substituteResourceDeliveryTimerFired();
</ins><span class="cx">
</span><del>- void clearMainResource();
</del><ins>+ void clearMainResource();
</ins><span class="cx">
</span><del>- void cancelPolicyCheckIfNeeded();
- void becomeMainResourceClient();
</del><ins>+ void cancelPolicyCheckIfNeeded();
+ void becomeMainResourceClient();
</ins><span class="cx">
</span><del>- Frame* m_frame;
- Ref<CachedResourceLoader> m_cachedResourceLoader;
</del><ins>+ Frame* m_frame;
+ Ref<CachedResourceLoader> m_cachedResourceLoader;
</ins><span class="cx">
</span><del>- CachedResourceHandle<CachedRawResource> m_mainResource;
- ResourceLoaderMap m_subresourceLoaders;
- ResourceLoaderMap m_multipartSubresourceLoaders;
- ResourceLoaderMap m_plugInStreamLoaders;
-
- mutable DocumentWriter m_writer;
</del><ins>+ CachedResourceHandle<CachedRawResource> m_mainResource;
+ ResourceLoaderMap m_subresourceLoaders;
+ ResourceLoaderMap m_multipartSubresourceLoaders;
+ ResourceLoaderMap m_plugInStreamLoaders;
+
+ mutable DocumentWriter m_writer;
</ins><span class="cx">
</span><del>- // A reference to actual request used to create the data source.
- // This should only be used by the resourceLoadDelegate's
- // identifierForInitialRequest:fromDatasource: method. It is
- // not guaranteed to remain unchanged, as requests are mutable.
- ResourceRequest m_originalRequest;
</del><ins>+ // A reference to actual request used to create the data source.
+ // This should only be used by the resourceLoadDelegate's
+ // identifierForInitialRequest:fromDatasource: method. It is
+ // not guaranteed to remain unchanged, as requests are mutable.
+ ResourceRequest m_originalRequest;
</ins><span class="cx">
</span><del>- SubstituteData m_substituteData;
</del><ins>+ SubstituteData m_substituteData;
</ins><span class="cx">
</span><del>- // A copy of the original request used to create the data source.
- // We have to copy the request because requests are mutable.
- ResourceRequest m_originalRequestCopy;
-
- // The 'working' request. It may be mutated
- // several times from the original request to include additional
- // headers, cookie information, canonicalization and redirects.
- ResourceRequest m_request;
-
- ResourceResponse m_response;
</del><ins>+ // A copy of the original request used to create the data source.
+ // We have to copy the request because requests are mutable.
+ ResourceRequest m_originalRequestCopy;
</ins><span class="cx">
</span><del>- ResourceError m_mainDocumentError;
</del><ins>+ // The 'working' request. It may be mutated
+ // several times from the original request to include additional
+ // headers, cookie information, canonicalization and redirects.
+ ResourceRequest m_request;
</ins><span class="cx">
</span><del>- bool m_originalSubstituteDataWasValid;
- bool m_committed;
- bool m_isStopping;
- bool m_gotFirstByte;
- bool m_isClientRedirect;
- bool m_isLoadingMultipartContent;
</del><ins>+ ResourceResponse m_response;
</ins><span class="cx">
</span><del>- // FIXME: Document::m_processingLoadEvent and DocumentLoader::m_wasOnloadDispatched are roughly the same
- // and should be merged.
- bool m_wasOnloadDispatched;
</del><ins>+ ResourceError m_mainDocumentError;
</ins><span class="cx">
</span><del>- StringWithDirection m_pageTitle;
</del><ins>+ bool m_originalSubstituteDataWasValid;
+ bool m_committed;
+ bool m_isStopping;
+ bool m_gotFirstByte;
+ bool m_isClientRedirect;
+ bool m_isLoadingMultipartContent;
</ins><span class="cx">
</span><del>- String m_overrideEncoding;
</del><ins>+ // FIXME: Document::m_processingLoadEvent and DocumentLoader::m_wasOnloadDispatched are roughly the same
+ // and should be merged.
+ bool m_wasOnloadDispatched;
</ins><span class="cx">
</span><del>- // The action that triggered loading - we keep this around for the
- // benefit of the various policy handlers.
- NavigationAction m_triggeringAction;
</del><ins>+ StringWithDirection m_pageTitle;
</ins><span class="cx">
</span><del>- // The last request that we checked click policy for - kept around
- // so we can avoid asking again needlessly.
- ResourceRequest m_lastCheckedRequest;
</del><ins>+ String m_overrideEncoding;
</ins><span class="cx">
</span><del>- // We retain all the received responses so we can play back the
- // WebResourceLoadDelegate messages if the item is loaded from the
- // page cache.
- ResponseVector m_responses;
- bool m_stopRecordingResponses;
-
- typedef HashMap<RefPtr<ResourceLoader>, RefPtr<SubstituteResource>> SubstituteResourceMap;
- SubstituteResourceMap m_pendingSubstituteResources;
- Timer m_substituteResourceDeliveryTimer;
</del><ins>+ // The action that triggered loading - we keep this around for the
+ // benefit of the various policy handlers.
+ NavigationAction m_triggeringAction;
</ins><span class="cx">
</span><del>- std::unique_ptr<ArchiveResourceCollection> m_archiveResourceCollection;
</del><ins>+ // The last request that we checked click policy for - kept around
+ // so we can avoid asking again needlessly.
+ ResourceRequest m_lastCheckedRequest;
+
+ // We retain all the received responses so we can play back the
+ // WebResourceLoadDelegate messages if the item is loaded from the
+ // page cache.
+ ResponseVector m_responses;
+ bool m_stopRecordingResponses;
+
+ typedef HashMap<RefPtr<ResourceLoader>, RefPtr<SubstituteResource>> SubstituteResourceMap;
+ SubstituteResourceMap m_pendingSubstituteResources;
+ Timer m_substituteResourceDeliveryTimer;
+
+ std::unique_ptr<ArchiveResourceCollection> m_archiveResourceCollection;
</ins><span class="cx"> #if ENABLE(WEB_ARCHIVE) || ENABLE(MHTML)
</span><del>- RefPtr<Archive> m_archive;
- RefPtr<SharedBuffer> m_parsedArchiveData;
</del><ins>+ RefPtr<Archive> m_archive;
+ RefPtr<SharedBuffer> m_parsedArchiveData;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- HashSet<String> m_resourcesClientKnowsAbout;
- Vector<ResourceRequest> m_resourcesLoadedFromMemoryCacheForClientNotification;
-
- String m_clientRedirectSourceForHistory;
- bool m_didCreateGlobalHistoryEntry;
</del><ins>+ HashSet<String> m_resourcesClientKnowsAbout;
+ Vector<ResourceRequest> m_resourcesLoadedFromMemoryCacheForClientNotification;
+
+ String m_clientRedirectSourceForHistory;
+ bool m_didCreateGlobalHistoryEntry;
</ins><span class="cx">
</span><del>- bool m_loadingMainResource;
- LoadTiming m_loadTiming;
</del><ins>+ bool m_loadingMainResource;
+ LoadTiming m_loadTiming;
</ins><span class="cx">
</span><del>- double m_timeOfLastDataReceived;
- unsigned long m_identifierForLoadWithoutResourceLoader;
</del><ins>+ double m_timeOfLastDataReceived;
+ unsigned long m_identifierForLoadWithoutResourceLoader;
</ins><span class="cx">
</span><del>- DocumentLoaderTimer m_dataLoadTimer;
- bool m_waitingForContentPolicy { false };
- bool m_waitingForNavigationPolicy { false };
</del><ins>+ DocumentLoaderTimer m_dataLoadTimer;
+ bool m_waitingForContentPolicy { false };
+ bool m_waitingForNavigationPolicy { false };
</ins><span class="cx">
</span><del>- RefPtr<IconLoadDecisionCallback> m_iconLoadDecisionCallback;
- RefPtr<IconDataCallback> m_iconDataCallback;
</del><ins>+ RefPtr<IconLoadDecisionCallback> m_iconLoadDecisionCallback;
+ RefPtr<IconDataCallback> m_iconDataCallback;
</ins><span class="cx">
</span><del>- bool m_subresourceLoadersArePageCacheAcceptable;
- ShouldOpenExternalURLsPolicy m_shouldOpenExternalURLsPolicy { ShouldOpenExternalURLsPolicy::ShouldNotAllow };
</del><ins>+ bool m_subresourceLoadersArePageCacheAcceptable;
+ ShouldOpenExternalURLsPolicy m_shouldOpenExternalURLsPolicy { ShouldOpenExternalURLsPolicy::ShouldNotAllow };
</ins><span class="cx">
</span><del>- std::unique_ptr<ApplicationCacheHost> m_applicationCacheHost;
</del><ins>+ std::unique_ptr<ApplicationCacheHost> m_applicationCacheHost;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(CONTENT_FILTERING)
</span><del>- std::unique_ptr<ContentFilter> m_contentFilter;
</del><ins>+ std::unique_ptr<ContentFilter> m_contentFilter;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if USE(QUICK_LOOK)
</span><del>- std::unique_ptr<QuickLookHandle> m_quickLookHandle;
</del><ins>+ std::unique_ptr<QuickLookHandle> m_quickLookHandle;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CONTENT_EXTENSIONS)
</span><del>- HashMap<String, RefPtr<StyleSheetContents>> m_pendingNamedContentExtensionStyleSheets;
- HashMap<String, Vector<std::pair<String, uint32_t>>> m_pendingContentExtensionDisplayNoneSelectors;
</del><ins>+ HashMap<String, RefPtr<StyleSheetContents>> m_pendingNamedContentExtensionStyleSheets;
+ HashMap<String, Vector<std::pair<String, uint32_t>>> m_pendingContentExtensionDisplayNoneSelectors;
</ins><span class="cx"> #endif
</span><del>- bool m_userContentExtensionsEnabled { true };
</del><ins>+ bool m_userContentExtensionsEnabled { true };
</ins><span class="cx">
</span><span class="cx"> #ifndef NDEBUG
</span><del>- bool m_hasEverBeenAttached { false };
</del><ins>+ bool m_hasEverBeenAttached { false };
</ins><span class="cx"> #endif
</span><del>- };
</del><ins>+};
</ins><span class="cx">
</span><del>- inline void DocumentLoader::recordMemoryCacheLoadForFutureClientNotification(const ResourceRequest& request)
- {
- m_resourcesLoadedFromMemoryCacheForClientNotification.append(request);
- }
</del><ins>+inline void DocumentLoader::recordMemoryCacheLoadForFutureClientNotification(const ResourceRequest& request)
+{
+ m_resourcesLoadedFromMemoryCacheForClientNotification.append(request);
+}
</ins><span class="cx">
</span><del>- inline void DocumentLoader::takeMemoryCacheLoadsForClientNotification(Vector<ResourceRequest>& loadsSet)
- {
- loadsSet.swap(m_resourcesLoadedFromMemoryCacheForClientNotification);
- m_resourcesLoadedFromMemoryCacheForClientNotification.clear();
- }
</del><ins>+inline void DocumentLoader::takeMemoryCacheLoadsForClientNotification(Vector<ResourceRequest>& loadsSet)
+{
+ loadsSet.swap(m_resourcesLoadedFromMemoryCacheForClientNotification);
+ m_resourcesLoadedFromMemoryCacheForClientNotification.clear();
+}
</ins><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 (208803 => 208804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoaderClient.h 2016-11-16 20:26:59 UTC (rev 208803)
+++ trunk/Source/WebCore/loader/FrameLoaderClient.h 2016-11-16 20:43:14 UTC (rev 208804)
</span><span class="lines">@@ -59,301 +59,301 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>- class AuthenticationChallenge;
- class CachedFrame;
- class CachedResourceRequest;
- class Color;
- class DOMWindowExtension;
- class DOMWrapperWorld;
- class DocumentLoader;
- class Element;
- class FormState;
- class Frame;
- class FrameLoader;
- class FrameNetworkingContext;
- class HistoryItem;
- class HTMLAppletElement;
- class HTMLFormElement;
- class HTMLFrameOwnerElement;
- class HTMLPlugInElement;
- class IntSize;
- class URL;
- class MessageEvent;
- class NavigationAction;
- class Page;
- class ProtectionSpace;
- class PluginViewBase;
- class PolicyChecker;
- class ResourceError;
- class ResourceHandle;
- class ResourceRequest;
- class ResourceResponse;
</del><ins>+class AuthenticationChallenge;
+class CachedFrame;
+class CachedResourceRequest;
+class Color;
+class DOMWindowExtension;
+class DOMWrapperWorld;
+class DocumentLoader;
+class Element;
+class FormState;
+class Frame;
+class FrameLoader;
+class FrameNetworkingContext;
+class HistoryItem;
+class HTMLAppletElement;
+class HTMLFormElement;
+class HTMLFrameOwnerElement;
+class HTMLPlugInElement;
+class IntSize;
+class URL;
+class MessageEvent;
+class NavigationAction;
+class Page;
+class ProtectionSpace;
+class PluginViewBase;
+class PolicyChecker;
+class ResourceError;
+class ResourceHandle;
+class ResourceRequest;
+class ResourceResponse;
</ins><span class="cx"> #if ENABLE(WEB_RTC)
</span><del>- class RTCPeerConnectionHandler;
</del><ins>+class RTCPeerConnectionHandler;
</ins><span class="cx"> #endif
</span><del>- class SecurityOrigin;
- class SessionID;
- class SharedBuffer;
- class StringWithDirection;
- class SubstituteData;
- class Widget;
</del><ins>+class SecurityOrigin;
+class SessionID;
+class SharedBuffer;
+class StringWithDirection;
+class SubstituteData;
+class Widget;
</ins><span class="cx">
</span><span class="cx"> #if USE(QUICK_LOOK)
</span><del>- class QuickLookHandle;
</del><ins>+class QuickLookHandle;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- typedef std::function<void (PolicyAction)> FramePolicyFunction;
</del><ins>+typedef std::function<void (PolicyAction)> FramePolicyFunction;
</ins><span class="cx">
</span><del>- class WEBCORE_EXPORT FrameLoaderClient {
- public:
- // An inline function cannot be the first non-abstract virtual function declared
- // in the class as it results in the vtable being generated as a weak symbol.
- // This hurts performance (in Mac OS X at least, when loadig frameworks), so we
- // don't want to do it in WebKit.
- virtual bool hasHTMLView() const;
</del><ins>+class WEBCORE_EXPORT FrameLoaderClient {
+public:
+ // An inline function cannot be the first non-abstract virtual function declared
+ // in the class as it results in the vtable being generated as a weak symbol.
+ // This hurts performance (in Mac OS X at least, when loadig frameworks), so we
+ // don't want to do it in WebKit.
+ virtual bool hasHTMLView() const;
</ins><span class="cx">
</span><del>- virtual ~FrameLoaderClient() { }
</del><ins>+ virtual ~FrameLoaderClient() { }
</ins><span class="cx">
</span><del>- virtual void frameLoaderDestroyed() = 0;
</del><ins>+ virtual void frameLoaderDestroyed() = 0;
</ins><span class="cx">
</span><del>- virtual bool hasWebView() const = 0; // mainly for assertions
</del><ins>+ virtual bool hasWebView() const = 0; // mainly for assertions
</ins><span class="cx">
</span><del>- virtual void makeRepresentation(DocumentLoader*) = 0;
-
</del><ins>+ virtual void makeRepresentation(DocumentLoader*) = 0;
+
</ins><span class="cx"> #if PLATFORM(IOS)
</span><del>- // Returns true if the client forced the layout.
- virtual bool forceLayoutOnRestoreFromPageCache() = 0;
</del><ins>+ // Returns true if the client forced the layout.
+ virtual bool forceLayoutOnRestoreFromPageCache() = 0;
</ins><span class="cx"> #endif
</span><del>- virtual void forceLayoutForNonHTML() = 0;
</del><ins>+ virtual void forceLayoutForNonHTML() = 0;
</ins><span class="cx">
</span><del>- virtual void setCopiesOnScroll() = 0;
</del><ins>+ virtual void setCopiesOnScroll() = 0;
</ins><span class="cx">
</span><del>- virtual void detachedFromParent2() = 0;
- virtual void detachedFromParent3() = 0;
</del><ins>+ virtual void detachedFromParent2() = 0;
+ virtual void detachedFromParent3() = 0;
</ins><span class="cx">
</span><del>- virtual void assignIdentifierToInitialRequest(unsigned long identifier, DocumentLoader*, const ResourceRequest&) = 0;
</del><ins>+ virtual void assignIdentifierToInitialRequest(unsigned long identifier, DocumentLoader*, const ResourceRequest&) = 0;
</ins><span class="cx">
</span><del>- virtual void dispatchWillSendRequest(DocumentLoader*, unsigned long identifier, ResourceRequest&, const ResourceResponse& redirectResponse) = 0;
- virtual bool shouldUseCredentialStorage(DocumentLoader*, unsigned long identifier) = 0;
- virtual void dispatchDidReceiveAuthenticationChallenge(DocumentLoader*, unsigned long identifier, const AuthenticationChallenge&) = 0;
</del><ins>+ virtual void dispatchWillSendRequest(DocumentLoader*, unsigned long identifier, ResourceRequest&, const ResourceResponse& redirectResponse) = 0;
+ virtual bool shouldUseCredentialStorage(DocumentLoader*, unsigned long identifier) = 0;
+ virtual void dispatchDidReceiveAuthenticationChallenge(DocumentLoader*, unsigned long identifier, const AuthenticationChallenge&) = 0;
</ins><span class="cx"> #if USE(PROTECTION_SPACE_AUTH_CALLBACK)
</span><del>- virtual bool canAuthenticateAgainstProtectionSpace(DocumentLoader*, unsigned long identifier, const ProtectionSpace&) = 0;
</del><ins>+ virtual bool canAuthenticateAgainstProtectionSpace(DocumentLoader*, unsigned long identifier, const ProtectionSpace&) = 0;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- virtual RetainPtr<CFDictionaryRef> connectionProperties(DocumentLoader*, unsigned long identifier) = 0;
</del><ins>+ virtual RetainPtr<CFDictionaryRef> connectionProperties(DocumentLoader*, unsigned long identifier) = 0;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- virtual void dispatchDidReceiveResponse(DocumentLoader*, unsigned long identifier, const ResourceResponse&) = 0;
- virtual void dispatchDidReceiveContentLength(DocumentLoader*, unsigned long identifier, int dataLength) = 0;
- virtual void dispatchDidFinishLoading(DocumentLoader*, unsigned long identifier) = 0;
- virtual void dispatchDidFailLoading(DocumentLoader*, unsigned long identifier, const ResourceError&) = 0;
- virtual bool dispatchDidLoadResourceFromMemoryCache(DocumentLoader*, const ResourceRequest&, const ResourceResponse&, int length) = 0;
</del><ins>+ virtual void dispatchDidReceiveResponse(DocumentLoader*, unsigned long identifier, const ResourceResponse&) = 0;
+ virtual void dispatchDidReceiveContentLength(DocumentLoader*, unsigned long identifier, int dataLength) = 0;
+ virtual void dispatchDidFinishLoading(DocumentLoader*, unsigned long identifier) = 0;
+ virtual void dispatchDidFailLoading(DocumentLoader*, unsigned long identifier, const ResourceError&) = 0;
+ virtual bool dispatchDidLoadResourceFromMemoryCache(DocumentLoader*, const ResourceRequest&, const ResourceResponse&, int length) = 0;
</ins><span class="cx">
</span><del>- virtual void dispatchDidDispatchOnloadEvents() = 0;
- virtual void dispatchDidReceiveServerRedirectForProvisionalLoad() = 0;
- virtual void dispatchDidChangeProvisionalURL() { }
- virtual void dispatchDidCancelClientRedirect() = 0;
- virtual void dispatchWillPerformClientRedirect(const URL&, double interval, double fireDate) = 0;
- virtual void dispatchDidNavigateWithinPage() { }
- virtual void dispatchDidChangeLocationWithinPage() = 0;
- virtual void dispatchDidPushStateWithinPage() = 0;
- virtual void dispatchDidReplaceStateWithinPage() = 0;
- virtual void dispatchDidPopStateWithinPage() = 0;
- virtual void dispatchWillClose() = 0;
- virtual void dispatchDidReceiveIcon() = 0;
- virtual void dispatchDidStartProvisionalLoad() = 0;
- virtual void dispatchDidReceiveTitle(const StringWithDirection&) = 0;
- virtual void dispatchDidCommitLoad(Optional<HasInsecureContent>) = 0;
- virtual void dispatchDidFailProvisionalLoad(const ResourceError&) = 0;
- virtual void dispatchDidFailLoad(const ResourceError&) = 0;
- virtual void dispatchDidFinishDocumentLoad() = 0;
- virtual void dispatchDidFinishLoad() = 0;
</del><ins>+ virtual void dispatchDidDispatchOnloadEvents() = 0;
+ virtual void dispatchDidReceiveServerRedirectForProvisionalLoad() = 0;
+ virtual void dispatchDidChangeProvisionalURL() { }
+ virtual void dispatchDidCancelClientRedirect() = 0;
+ virtual void dispatchWillPerformClientRedirect(const URL&, double interval, double fireDate) = 0;
+ virtual void dispatchDidNavigateWithinPage() { }
+ virtual void dispatchDidChangeLocationWithinPage() = 0;
+ virtual void dispatchDidPushStateWithinPage() = 0;
+ virtual void dispatchDidReplaceStateWithinPage() = 0;
+ virtual void dispatchDidPopStateWithinPage() = 0;
+ virtual void dispatchWillClose() = 0;
+ virtual void dispatchDidReceiveIcon() = 0;
+ virtual void dispatchDidStartProvisionalLoad() = 0;
+ virtual void dispatchDidReceiveTitle(const StringWithDirection&) = 0;
+ virtual void dispatchDidCommitLoad(Optional<HasInsecureContent>) = 0;
+ virtual void dispatchDidFailProvisionalLoad(const ResourceError&) = 0;
+ virtual void dispatchDidFailLoad(const ResourceError&) = 0;
+ virtual void dispatchDidFinishDocumentLoad() = 0;
+ virtual void dispatchDidFinishLoad() = 0;
</ins><span class="cx"> #if ENABLE(DATA_DETECTION)
</span><del>- virtual void dispatchDidFinishDataDetection(NSArray *detectionResults) = 0;
</del><ins>+ virtual void dispatchDidFinishDataDetection(NSArray *detectionResults) = 0;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- virtual void dispatchDidLayout() { }
- virtual void dispatchDidReachLayoutMilestone(LayoutMilestones) { }
</del><ins>+ virtual void dispatchDidLayout() { }
+ virtual void dispatchDidReachLayoutMilestone(LayoutMilestones) { }
</ins><span class="cx">
</span><del>- virtual Frame* dispatchCreatePage(const NavigationAction&) = 0;
- virtual void dispatchShow() = 0;
</del><ins>+ virtual Frame* dispatchCreatePage(const NavigationAction&) = 0;
+ virtual void dispatchShow() = 0;
</ins><span class="cx">
</span><del>- virtual void dispatchDecidePolicyForResponse(const ResourceResponse&, const ResourceRequest&, FramePolicyFunction) = 0;
- 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;
- virtual void cancelPolicyCheck() = 0;
</del><ins>+ virtual void dispatchDecidePolicyForResponse(const ResourceResponse&, const ResourceRequest&, FramePolicyFunction) = 0;
+ 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;
+ virtual void cancelPolicyCheck() = 0;
</ins><span class="cx">
</span><del>- virtual void dispatchUnableToImplementPolicy(const ResourceError&) = 0;
</del><ins>+ virtual void dispatchUnableToImplementPolicy(const ResourceError&) = 0;
</ins><span class="cx">
</span><del>- virtual void dispatchWillSendSubmitEvent(PassRefPtr<FormState>) = 0;
- virtual void dispatchWillSubmitForm(PassRefPtr<FormState>, FramePolicyFunction) = 0;
</del><ins>+ virtual void dispatchWillSendSubmitEvent(PassRefPtr<FormState>) = 0;
+ virtual void dispatchWillSubmitForm(PassRefPtr<FormState>, FramePolicyFunction) = 0;
</ins><span class="cx">
</span><del>- virtual void revertToProvisionalState(DocumentLoader*) = 0;
- virtual void setMainDocumentError(DocumentLoader*, const ResourceError&) = 0;
</del><ins>+ virtual void revertToProvisionalState(DocumentLoader*) = 0;
+ virtual void setMainDocumentError(DocumentLoader*, const ResourceError&) = 0;
</ins><span class="cx">
</span><del>- virtual void setMainFrameDocumentReady(bool) = 0;
</del><ins>+ virtual void setMainFrameDocumentReady(bool) = 0;
</ins><span class="cx">
</span><del>- virtual void startDownload(const ResourceRequest&, const String& suggestedName = String()) = 0;
</del><ins>+ virtual void startDownload(const ResourceRequest&, const String& suggestedName = String()) = 0;
</ins><span class="cx">
</span><del>- virtual void willChangeTitle(DocumentLoader*) = 0;
- virtual void didChangeTitle(DocumentLoader*) = 0;
</del><ins>+ virtual void willChangeTitle(DocumentLoader*) = 0;
+ virtual void didChangeTitle(DocumentLoader*) = 0;
</ins><span class="cx">
</span><del>- virtual void willReplaceMultipartContent() = 0;
- virtual void didReplaceMultipartContent() = 0;
</del><ins>+ virtual void willReplaceMultipartContent() = 0;
+ virtual void didReplaceMultipartContent() = 0;
</ins><span class="cx">
</span><del>- virtual void committedLoad(DocumentLoader*, const char*, int) = 0;
- virtual void finishedLoading(DocumentLoader*) = 0;
-
- virtual void updateGlobalHistory() = 0;
- virtual void updateGlobalHistoryRedirectLinks() = 0;
</del><ins>+ virtual void committedLoad(DocumentLoader*, const char*, int) = 0;
+ virtual void finishedLoading(DocumentLoader*) = 0;
+
+ virtual void updateGlobalHistory() = 0;
+ virtual void updateGlobalHistoryRedirectLinks() = 0;
</ins><span class="cx">
</span><del>- virtual bool shouldGoToHistoryItem(HistoryItem*) const = 0;
- virtual void updateGlobalHistoryItemForPage() { }
</del><ins>+ virtual bool shouldGoToHistoryItem(HistoryItem*) const = 0;
+ virtual void updateGlobalHistoryItemForPage() { }
</ins><span class="cx">
</span><del>- // This frame has set its opener to null, disowning it for the lifetime of the frame.
- // See http://html.spec.whatwg.org/#dom-opener.
- // FIXME: JSC should allow disowning opener. - <https://bugs.webkit.org/show_bug.cgi?id=103913>.
- virtual void didDisownOpener() { }
</del><ins>+ // This frame has set its opener to null, disowning it for the lifetime of the frame.
+ // See http://html.spec.whatwg.org/#dom-opener.
+ // FIXME: JSC should allow disowning opener. - <https://bugs.webkit.org/show_bug.cgi?id=103913>.
+ virtual void didDisownOpener() { }
</ins><span class="cx">
</span><del>- // This frame has displayed inactive content (such as an image) from an
- // insecure source. Inactive content cannot spread to other frames.
- virtual void didDisplayInsecureContent() = 0;
</del><ins>+ // This frame has displayed inactive content (such as an image) from an
+ // insecure source. Inactive content cannot spread to other frames.
+ virtual void didDisplayInsecureContent() = 0;
</ins><span class="cx">
</span><del>- // The indicated security origin has run active content (such as a
- // script) from an insecure source. Note that the insecure content can
- // spread to other frames in the same origin.
- virtual void didRunInsecureContent(SecurityOrigin*, const URL&) = 0;
- virtual void didDetectXSS(const URL&, bool didBlockEntirePage) = 0;
</del><ins>+ // The indicated security origin has run active content (such as a
+ // script) from an insecure source. Note that the insecure content can
+ // spread to other frames in the same origin.
+ virtual void didRunInsecureContent(SecurityOrigin*, const URL&) = 0;
+ virtual void didDetectXSS(const URL&, bool didBlockEntirePage) = 0;
</ins><span class="cx">
</span><del>- virtual ResourceError cancelledError(const ResourceRequest&) = 0;
- virtual ResourceError blockedError(const ResourceRequest&) = 0;
- virtual ResourceError blockedByContentBlockerError(const ResourceRequest&) = 0;
- virtual ResourceError cannotShowURLError(const ResourceRequest&) = 0;
- virtual ResourceError interruptedForPolicyChangeError(const ResourceRequest&) = 0;
</del><ins>+ virtual ResourceError cancelledError(const ResourceRequest&) = 0;
+ virtual ResourceError blockedError(const ResourceRequest&) = 0;
+ virtual ResourceError blockedByContentBlockerError(const ResourceRequest&) = 0;
+ virtual ResourceError cannotShowURLError(const ResourceRequest&) = 0;
+ virtual ResourceError interruptedForPolicyChangeError(const ResourceRequest&) = 0;
</ins><span class="cx"> #if ENABLE(CONTENT_FILTERING)
</span><del>- virtual ResourceError blockedByContentFilterError(const ResourceRequest&) = 0;
</del><ins>+ virtual ResourceError blockedByContentFilterError(const ResourceRequest&) = 0;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- virtual ResourceError cannotShowMIMETypeError(const ResourceResponse&) = 0;
- virtual ResourceError fileDoesNotExistError(const ResourceResponse&) = 0;
- virtual ResourceError pluginWillHandleLoadError(const ResourceResponse&) = 0;
</del><ins>+ virtual ResourceError cannotShowMIMETypeError(const ResourceResponse&) = 0;
+ virtual ResourceError fileDoesNotExistError(const ResourceResponse&) = 0;
+ virtual ResourceError pluginWillHandleLoadError(const ResourceResponse&) = 0;
</ins><span class="cx">
</span><del>- virtual bool shouldFallBack(const ResourceError&) = 0;
</del><ins>+ virtual bool shouldFallBack(const ResourceError&) = 0;
</ins><span class="cx">
</span><del>- virtual bool canHandleRequest(const ResourceRequest&) const = 0;
- virtual bool canShowMIMEType(const String& MIMEType) const = 0;
- virtual bool canShowMIMETypeAsHTML(const String& MIMEType) const = 0;
- virtual bool representationExistsForURLScheme(const String& URLScheme) const = 0;
- virtual String generatedMIMETypeForURLScheme(const String& URLScheme) const = 0;
</del><ins>+ virtual bool canHandleRequest(const ResourceRequest&) const = 0;
+ virtual bool canShowMIMEType(const String& MIMEType) const = 0;
+ virtual bool canShowMIMETypeAsHTML(const String& MIMEType) const = 0;
+ virtual bool representationExistsForURLScheme(const String& URLScheme) const = 0;
+ virtual String generatedMIMETypeForURLScheme(const String& URLScheme) const = 0;
</ins><span class="cx">
</span><del>- virtual void frameLoadCompleted() = 0;
- virtual void saveViewStateToItem(HistoryItem&) = 0;
- virtual void restoreViewState() = 0;
- virtual void provisionalLoadStarted() = 0;
- virtual void didFinishLoad() = 0;
- virtual void prepareForDataSourceReplacement() = 0;
</del><ins>+ virtual void frameLoadCompleted() = 0;
+ virtual void saveViewStateToItem(HistoryItem&) = 0;
+ virtual void restoreViewState() = 0;
+ virtual void provisionalLoadStarted() = 0;
+ virtual void didFinishLoad() = 0;
+ virtual void prepareForDataSourceReplacement() = 0;
</ins><span class="cx">
</span><del>- virtual Ref<DocumentLoader> createDocumentLoader(const ResourceRequest&, const SubstituteData&) = 0;
- virtual void updateCachedDocumentLoader(DocumentLoader&) = 0;
- virtual void setTitle(const StringWithDirection&, const URL&) = 0;
</del><ins>+ virtual Ref<DocumentLoader> createDocumentLoader(const ResourceRequest&, const SubstituteData&) = 0;
+ virtual void updateCachedDocumentLoader(DocumentLoader&) = 0;
+ virtual void setTitle(const StringWithDirection&, const URL&) = 0;
</ins><span class="cx">
</span><del>- virtual String userAgent(const URL&) = 0;
-
- virtual void savePlatformDataToCachedFrame(CachedFrame*) = 0;
- virtual void transitionToCommittedFromCachedFrame(CachedFrame*) = 0;
</del><ins>+ virtual String userAgent(const URL&) = 0;
+
+ virtual void savePlatformDataToCachedFrame(CachedFrame*) = 0;
+ virtual void transitionToCommittedFromCachedFrame(CachedFrame*) = 0;
</ins><span class="cx"> #if PLATFORM(IOS)
</span><del>- virtual void didRestoreFrameHierarchyForCachedFrame() = 0;
</del><ins>+ virtual void didRestoreFrameHierarchyForCachedFrame() = 0;
</ins><span class="cx"> #endif
</span><del>- virtual void transitionToCommittedForNewPage() = 0;
</del><ins>+ virtual void transitionToCommittedForNewPage() = 0;
</ins><span class="cx">
</span><del>- virtual void didSaveToPageCache() = 0;
- virtual void didRestoreFromPageCache() = 0;
</del><ins>+ virtual void didSaveToPageCache() = 0;
+ virtual void didRestoreFromPageCache() = 0;
</ins><span class="cx">
</span><del>- virtual void dispatchDidBecomeFrameset(bool) = 0; // Can change due to navigation or DOM modification.
</del><ins>+ virtual void dispatchDidBecomeFrameset(bool) = 0; // Can change due to navigation or DOM modification.
</ins><span class="cx">
</span><del>- virtual bool canCachePage() const = 0;
- virtual void convertMainResourceLoadToDownload(DocumentLoader*, SessionID, const ResourceRequest&, const ResourceResponse&) = 0;
</del><ins>+ virtual bool canCachePage() const = 0;
+ virtual void convertMainResourceLoadToDownload(DocumentLoader*, SessionID, const ResourceRequest&, const ResourceResponse&) = 0;
</ins><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;
- virtual void recreatePlugin(Widget*) = 0;
- virtual void redirectDataToPlugin(Widget* pluginWidget) = 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;
+ virtual void recreatePlugin(Widget*) = 0;
+ virtual void redirectDataToPlugin(Widget* pluginWidget) = 0;
</ins><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 PassRefPtr<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><ins>+ virtual void dispatchDidFailToStartPlugin(const PluginViewBase*) const { }
</ins><span class="cx">
</span><del>- virtual ObjectContentType objectContentType(const URL&, const String& mimeType) = 0;
- virtual String overrideMediaType() const = 0;
</del><ins>+ virtual ObjectContentType objectContentType(const URL&, const String& mimeType) = 0;
+ virtual String overrideMediaType() const = 0;
</ins><span class="cx">
</span><del>- virtual void dispatchDidClearWindowObjectInWorld(DOMWrapperWorld&) = 0;
</del><ins>+ virtual void dispatchDidClearWindowObjectInWorld(DOMWrapperWorld&) = 0;
</ins><span class="cx">
</span><del>- virtual void registerForIconNotification(bool listen = true) = 0;
</del><ins>+ virtual void registerForIconNotification(bool listen = true) = 0;
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>- // Allow an accessibility object to retrieve a Frame parent if there's no PlatformWidget.
- virtual RemoteAXObjectRef accessibilityRemoteObject() = 0;
- virtual NSCachedURLResponse* willCacheResponse(DocumentLoader*, unsigned long identifier, NSCachedURLResponse*) const = 0;
- virtual NSDictionary *dataDetectionContext() { return nullptr; }
</del><ins>+ // Allow an accessibility object to retrieve a Frame parent if there's no PlatformWidget.
+ virtual RemoteAXObjectRef accessibilityRemoteObject() = 0;
+ virtual NSCachedURLResponse* willCacheResponse(DocumentLoader*, unsigned long identifier, NSCachedURLResponse*) const = 0;
+ virtual NSDictionary *dataDetectionContext() { return nullptr; }
</ins><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(WIN) && USE(CFURLCONNECTION)
</span><del>- // FIXME: Windows should use willCacheResponse - <https://bugs.webkit.org/show_bug.cgi?id=57257>.
- virtual bool shouldCacheResponse(DocumentLoader*, unsigned long identifier, const ResourceResponse&, const unsigned char* data, unsigned long long length) = 0;
</del><ins>+ // FIXME: Windows should use willCacheResponse - <https://bugs.webkit.org/show_bug.cgi?id=57257>.
+ virtual bool shouldCacheResponse(DocumentLoader*, unsigned long identifier, const ResourceResponse&, const unsigned char* data, unsigned long long length) = 0;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- virtual bool shouldAlwaysUsePluginDocument(const String& /*mimeType*/) const { return false; }
- virtual bool shouldLoadMediaElementURL(const URL&) const { return true; }
</del><ins>+ virtual bool shouldAlwaysUsePluginDocument(const String& /*mimeType*/) const { return false; }
+ virtual bool shouldLoadMediaElementURL(const URL&) const { return true; }
</ins><span class="cx">
</span><del>- virtual void didChangeScrollOffset() { }
</del><ins>+ virtual void didChangeScrollOffset() { }
</ins><span class="cx">
</span><del>- virtual bool allowScript(bool enabledPerSettings) { return enabledPerSettings; }
</del><ins>+ virtual bool allowScript(bool enabledPerSettings) { return enabledPerSettings; }
</ins><span class="cx">
</span><del>- // Clients that generally disallow universal access can make exceptions for particular URLs.
- virtual bool shouldForceUniversalAccessFromLocalURL(const URL&) { return false; }
</del><ins>+ // Clients that generally disallow universal access can make exceptions for particular URLs.
+ virtual bool shouldForceUniversalAccessFromLocalURL(const URL&) { return false; }
</ins><span class="cx">
</span><del>- virtual PassRefPtr<FrameNetworkingContext> createNetworkingContext() = 0;
</del><ins>+ virtual PassRefPtr<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(PassRefPtr<FormState>) = 0;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- virtual bool shouldPaintBrokenImage(const URL&) const { return true; }
</del><ins>+ virtual bool shouldPaintBrokenImage(const URL&) const { return true; }
</ins><span class="cx">
</span><del>- virtual void dispatchGlobalObjectAvailable(DOMWrapperWorld&) { }
- virtual void dispatchWillDisconnectDOMWindowExtensionFromGlobalObject(DOMWindowExtension*) { }
- virtual void dispatchDidReconnectDOMWindowExtensionToGlobalObject(DOMWindowExtension*) { }
- virtual void dispatchWillDestroyGlobalObjectForDOMWindowExtension(DOMWindowExtension*) { }
</del><ins>+ virtual void dispatchGlobalObjectAvailable(DOMWrapperWorld&) { }
+ virtual void dispatchWillDisconnectDOMWindowExtensionFromGlobalObject(DOMWindowExtension*) { }
+ virtual void dispatchDidReconnectDOMWindowExtensionToGlobalObject(DOMWindowExtension*) { }
+ virtual void dispatchWillDestroyGlobalObjectForDOMWindowExtension(DOMWindowExtension*) { }
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_RTC)
</span><del>- virtual void dispatchWillStartUsingPeerConnectionHandler(RTCPeerConnectionHandler*) { }
</del><ins>+ virtual void dispatchWillStartUsingPeerConnectionHandler(RTCPeerConnectionHandler*) { }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEBGL)
</span><del>- virtual bool allowWebGL(bool enabledPerSettings) { return enabledPerSettings; }
- // Informs the embedder that a WebGL canvas inside this frame received a lost context
- // notification with the given GL_ARB_robustness guilt/innocence code (see Extensions3D.h).
- virtual void didLoseWebGLContext(int) { }
- virtual WebGLLoadPolicy webGLPolicyForURL(const String&) const { return WebGLAllowCreation; }
- virtual WebGLLoadPolicy resolveWebGLPolicyForURL(const String&) const { return WebGLAllowCreation; }
</del><ins>+ virtual bool allowWebGL(bool enabledPerSettings) { return enabledPerSettings; }
+ // Informs the embedder that a WebGL canvas inside this frame received a lost context
+ // notification with the given GL_ARB_robustness guilt/innocence code (see Extensions3D.h).
+ virtual void didLoseWebGLContext(int) { }
+ virtual WebGLLoadPolicy webGLPolicyForURL(const String&) const { return WebGLAllowCreation; }
+ virtual WebGLLoadPolicy resolveWebGLPolicyForURL(const String&) const { return WebGLAllowCreation; }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- virtual void forcePageTransitionIfNeeded() { }
</del><ins>+ virtual void forcePageTransitionIfNeeded() { }
</ins><span class="cx">
</span><del>- // FIXME (bug 116233): We need to get rid of EmptyFrameLoaderClient completely, then this will no longer be needed.
- virtual bool isEmptyFrameLoaderClient() { return false; }
</del><ins>+ // FIXME (bug 116233): We need to get rid of EmptyFrameLoaderClient completely, then this will no longer be needed.
+ virtual bool isEmptyFrameLoaderClient() { return false; }
</ins><span class="cx">
</span><span class="cx"> #if USE(QUICK_LOOK)
</span><del>- virtual void didCreateQuickLookHandle(QuickLookHandle&) { }
</del><ins>+ virtual void didCreateQuickLookHandle(QuickLookHandle&) { }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CONTENT_FILTERING)
</span><del>- virtual void contentFilterDidBlockLoad(ContentFilterUnblockHandler) { }
</del><ins>+ virtual void contentFilterDidBlockLoad(ContentFilterUnblockHandler) { }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- virtual void prefetchDNS(const String&) = 0;
</del><ins>+ virtual void prefetchDNS(const String&) = 0;
</ins><span class="cx">
</span><del>- virtual void didRestoreScrollPosition() { }
- };
</del><ins>+ virtual void didRestoreScrollPosition() { }
+};
</ins><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Frame.h (208803 => 208804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Frame.h 2016-11-16 20:26:59 UTC (rev 208803)
+++ trunk/Source/WebCore/page/Frame.h 2016-11-16 20:43:14 UTC (rev 208804)
</span><span class="lines">@@ -60,353 +60,353 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>- class AnimationController;
- class Color;
- class Document;
- class Editor;
- class Element;
- class EventHandler;
- class FloatSize;
- class FrameDestructionObserver;
- class FrameSelection;
- class FrameView;
- class HTMLFrameOwnerElement;
- class HTMLTableCellElement;
- class HitTestResult;
- class ImageBuffer;
- class IntRect;
- class MainFrame;
- class Node;
- class Range;
- class RenderLayer;
- class RenderView;
- class RenderWidget;
- class ScriptController;
- class Settings;
- class VisiblePosition;
- class Widget;
</del><ins>+class AnimationController;
+class Color;
+class Document;
+class Editor;
+class Element;
+class EventHandler;
+class FloatSize;
+class FrameDestructionObserver;
+class FrameSelection;
+class FrameView;
+class HTMLFrameOwnerElement;
+class HTMLTableCellElement;
+class HitTestResult;
+class ImageBuffer;
+class IntRect;
+class MainFrame;
+class Node;
+class Range;
+class RenderLayer;
+class RenderView;
+class RenderWidget;
+class ScriptController;
+class Settings;
+class VisiblePosition;
+class Widget;
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- enum {
- OverflowScrollNone = 0,
- OverflowScrollLeft = 1 << 0,
- OverflowScrollRight = 1 << 1,
- OverflowScrollUp = 1 << 2,
- OverflowScrollDown = 1 << 3
- };
</del><ins>+enum {
+ OverflowScrollNone = 0,
+ OverflowScrollLeft = 1 << 0,
+ OverflowScrollRight = 1 << 1,
+ OverflowScrollUp = 1 << 2,
+ OverflowScrollDown = 1 << 3
+};
</ins><span class="cx">
</span><del>- enum OverflowScrollAction { DoNotPerformOverflowScroll, PerformOverflowScroll };
- typedef Node* (*NodeQualifier)(const HitTestResult&, Node* terminationNode, IntRect* nodeBounds);
</del><ins>+enum OverflowScrollAction { DoNotPerformOverflowScroll, PerformOverflowScroll };
+typedef Node* (*NodeQualifier)(const HitTestResult&, Node* terminationNode, IntRect* nodeBounds);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- enum {
- LayerTreeFlagsIncludeDebugInfo = 1 << 0,
- LayerTreeFlagsIncludeVisibleRects = 1 << 1,
- LayerTreeFlagsIncludeTileCaches = 1 << 2,
- LayerTreeFlagsIncludeRepaintRects = 1 << 3,
- LayerTreeFlagsIncludePaintingPhases = 1 << 4,
- LayerTreeFlagsIncludeContentLayers = 1 << 5
- };
- typedef unsigned LayerTreeFlags;
</del><ins>+enum {
+ LayerTreeFlagsIncludeDebugInfo = 1 << 0,
+ LayerTreeFlagsIncludeVisibleRects = 1 << 1,
+ LayerTreeFlagsIncludeTileCaches = 1 << 2,
+ LayerTreeFlagsIncludeRepaintRects = 1 << 3,
+ LayerTreeFlagsIncludePaintingPhases = 1 << 4,
+ LayerTreeFlagsIncludeContentLayers = 1 << 5
+};
+typedef unsigned LayerTreeFlags;
</ins><span class="cx">
</span><del>- class Frame : public ThreadSafeRefCounted<Frame> {
- public:
- WEBCORE_EXPORT static Ref<Frame> create(Page*, HTMLFrameOwnerElement*, FrameLoaderClient*);
</del><ins>+class Frame : public ThreadSafeRefCounted<Frame> {
+public:
+ WEBCORE_EXPORT static Ref<Frame> create(Page*, HTMLFrameOwnerElement*, FrameLoaderClient*);
</ins><span class="cx">
</span><del>- void init();
</del><ins>+ void init();
</ins><span class="cx"> #if PLATFORM(IOS)
</span><del>- // Creates <html><body style="..."></body></html> doing minimal amount of work.
- WEBCORE_EXPORT void initWithSimpleHTMLDocument(const String& style, const URL&);
</del><ins>+ // Creates <html><body style="..."></body></html> doing minimal amount of work.
+ WEBCORE_EXPORT void initWithSimpleHTMLDocument(const String& style, const URL&);
</ins><span class="cx"> #endif
</span><del>- WEBCORE_EXPORT void setView(RefPtr<FrameView>&&);
- WEBCORE_EXPORT void createView(const IntSize&, const Color&, bool,
- const IntSize& fixedLayoutSize = IntSize(), const IntRect& fixedVisibleContentRect = IntRect(),
- bool useFixedLayout = false, ScrollbarMode = ScrollbarAuto, bool horizontalLock = false,
- ScrollbarMode = ScrollbarAuto, bool verticalLock = false);
</del><ins>+ WEBCORE_EXPORT void setView(RefPtr<FrameView>&&);
+ WEBCORE_EXPORT void createView(const IntSize&, const Color&, bool,
+ const IntSize& fixedLayoutSize = IntSize(), const IntRect& fixedVisibleContentRect = IntRect(),
+ bool useFixedLayout = false, ScrollbarMode = ScrollbarAuto, bool horizontalLock = false,
+ ScrollbarMode = ScrollbarAuto, bool verticalLock = false);
</ins><span class="cx">
</span><del>- WEBCORE_EXPORT virtual ~Frame();
</del><ins>+ WEBCORE_EXPORT virtual ~Frame();
</ins><span class="cx">
</span><del>- void addDestructionObserver(FrameDestructionObserver*);
- void removeDestructionObserver(FrameDestructionObserver*);
</del><ins>+ void addDestructionObserver(FrameDestructionObserver*);
+ void removeDestructionObserver(FrameDestructionObserver*);
</ins><span class="cx">
</span><del>- void willDetachPage();
- void detachFromPage();
- void disconnectOwnerElement();
</del><ins>+ void willDetachPage();
+ void detachFromPage();
+ void disconnectOwnerElement();
</ins><span class="cx">
</span><del>- MainFrame& mainFrame() const;
- bool isMainFrame() const { return this == static_cast<void*>(&m_mainFrame); }
</del><ins>+ MainFrame& mainFrame() const;
+ bool isMainFrame() const { return this == static_cast<void*>(&m_mainFrame); }
</ins><span class="cx">
</span><del>- Page* page() const;
- HTMLFrameOwnerElement* ownerElement() const;
</del><ins>+ Page* page() const;
+ HTMLFrameOwnerElement* ownerElement() const;
</ins><span class="cx">
</span><del>- Document* document() const;
- FrameView* view() const;
</del><ins>+ Document* document() const;
+ FrameView* view() const;
</ins><span class="cx">
</span><del>- Editor& editor() const;
- EventHandler& eventHandler() const;
- EventHandler* eventHandlerPtr() const;
- FrameLoader& loader() const;
- NavigationScheduler& navigationScheduler() const;
- FrameSelection& selection() const;
- FrameTree& tree() const;
- AnimationController& animation() const;
- ScriptController& script();
-
- WEBCORE_EXPORT RenderView* contentRenderer() const; // Root of the render tree for the document contained in this frame.
- WEBCORE_EXPORT RenderWidget* ownerRenderer() const; // Renderer for the element that contains this frame.
</del><ins>+ Editor& editor() const;
+ EventHandler& eventHandler() const;
+ EventHandler* eventHandlerPtr() const;
+ FrameLoader& loader() const;
+ NavigationScheduler& navigationScheduler() const;
+ FrameSelection& selection() const;
+ FrameTree& tree() const;
+ AnimationController& animation() const;
+ ScriptController& script();
+
+ WEBCORE_EXPORT RenderView* contentRenderer() const; // Root of the render tree for the document contained in this frame.
+ WEBCORE_EXPORT RenderWidget* ownerRenderer() const; // Renderer for the element that contains this frame.
</ins><span class="cx">
</span><del>- // ======== All public functions below this point are candidates to move out of Frame into another class. ========
</del><ins>+// ======== All public functions below this point are candidates to move out of Frame into another class. ========
</ins><span class="cx">
</span><del>- void injectUserScripts(UserScriptInjectionTime);
-
- WEBCORE_EXPORT String layerTreeAsText(LayerTreeFlags = 0) const;
- WEBCORE_EXPORT String trackedRepaintRectsAsText() const;
</del><ins>+ void injectUserScripts(UserScriptInjectionTime);
+
+ WEBCORE_EXPORT String layerTreeAsText(LayerTreeFlags = 0) const;
+ WEBCORE_EXPORT String trackedRepaintRectsAsText() const;
</ins><span class="cx">
</span><del>- WEBCORE_EXPORT static Frame* frameForWidget(const Widget*);
</del><ins>+ WEBCORE_EXPORT static Frame* frameForWidget(const Widget*);
</ins><span class="cx">
</span><del>- Settings& settings() const { return *m_settings; }
</del><ins>+ Settings& settings() const { return *m_settings; }
</ins><span class="cx">
</span><del>- void setPrinting(bool printing, const FloatSize& pageSize, const FloatSize& originalPageSize, float maximumShrinkRatio, AdjustViewSizeOrNot);
- bool shouldUsePrintingLayout() const;
- WEBCORE_EXPORT FloatSize resizePageRectsKeepingRatio(const FloatSize& originalSize, const FloatSize& expectedSize);
</del><ins>+ void setPrinting(bool printing, const FloatSize& pageSize, const FloatSize& originalPageSize, float maximumShrinkRatio, AdjustViewSizeOrNot);
+ bool shouldUsePrintingLayout() const;
+ WEBCORE_EXPORT FloatSize resizePageRectsKeepingRatio(const FloatSize& originalSize, const FloatSize& expectedSize);
</ins><span class="cx">
</span><del>- void setDocument(RefPtr<Document>&&);
</del><ins>+ void setDocument(RefPtr<Document>&&);
</ins><span class="cx">
</span><del>- WEBCORE_EXPORT void setPageZoomFactor(float);
- float pageZoomFactor() const { return m_pageZoomFactor; }
- WEBCORE_EXPORT void setTextZoomFactor(float);
- float textZoomFactor() const { return m_textZoomFactor; }
- WEBCORE_EXPORT void setPageAndTextZoomFactors(float pageZoomFactor, float textZoomFactor);
</del><ins>+ WEBCORE_EXPORT void setPageZoomFactor(float);
+ float pageZoomFactor() const { return m_pageZoomFactor; }
+ WEBCORE_EXPORT void setTextZoomFactor(float);
+ float textZoomFactor() const { return m_textZoomFactor; }
+ WEBCORE_EXPORT void setPageAndTextZoomFactors(float pageZoomFactor, float textZoomFactor);
</ins><span class="cx">
</span><del>- // Scale factor of this frame with respect to the container.
- WEBCORE_EXPORT float frameScaleFactor() const;
</del><ins>+ // Scale factor of this frame with respect to the container.
+ WEBCORE_EXPORT float frameScaleFactor() const;
</ins><span class="cx">
</span><del>- void deviceOrPageScaleFactorChanged();
-
</del><ins>+ void deviceOrPageScaleFactorChanged();
+
</ins><span class="cx"> #if ENABLE(DATA_DETECTION)
</span><del>- void setDataDetectionResults(NSArray *results) { m_dataDetectionResults = results; }
- NSArray *dataDetectionResults() const { return m_dataDetectionResults.get(); }
</del><ins>+ void setDataDetectionResults(NSArray *results) { m_dataDetectionResults = results; }
+ NSArray *dataDetectionResults() const { return m_dataDetectionResults.get(); }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- const ViewportArguments& viewportArguments() const;
- WEBCORE_EXPORT void setViewportArguments(const ViewportArguments&);
</del><ins>+ const ViewportArguments& viewportArguments() const;
+ WEBCORE_EXPORT void setViewportArguments(const ViewportArguments&);
</ins><span class="cx">
</span><del>- WEBCORE_EXPORT Node* deepestNodeAtLocation(const FloatPoint& viewportLocation);
- WEBCORE_EXPORT Node* nodeRespondingToClickEvents(const FloatPoint& viewportLocation, FloatPoint& adjustedViewportLocation);
- WEBCORE_EXPORT Node* nodeRespondingToScrollWheelEvents(const FloatPoint& viewportLocation);
</del><ins>+ WEBCORE_EXPORT Node* deepestNodeAtLocation(const FloatPoint& viewportLocation);
+ WEBCORE_EXPORT Node* nodeRespondingToClickEvents(const FloatPoint& viewportLocation, FloatPoint& adjustedViewportLocation);
+ WEBCORE_EXPORT Node* nodeRespondingToScrollWheelEvents(const FloatPoint& viewportLocation);
</ins><span class="cx">
</span><del>- WEBCORE_EXPORT NSArray *wordsInCurrentParagraph() const;
- WEBCORE_EXPORT CGRect renderRectForPoint(CGPoint, bool* isReplaced, float* fontSize) const;
</del><ins>+ WEBCORE_EXPORT NSArray *wordsInCurrentParagraph() const;
+ WEBCORE_EXPORT CGRect renderRectForPoint(CGPoint, bool* isReplaced, float* fontSize) const;
</ins><span class="cx">
</span><del>- WEBCORE_EXPORT void setSelectionChangeCallbacksDisabled(bool = true);
- bool selectionChangeCallbacksDisabled() const;
</del><ins>+ WEBCORE_EXPORT void setSelectionChangeCallbacksDisabled(bool = true);
+ bool selectionChangeCallbacksDisabled() const;
</ins><span class="cx">
</span><del>- enum ViewportOffsetChangeType { IncrementalScrollOffset, CompletedScrollOffset };
- WEBCORE_EXPORT void viewportOffsetChanged(ViewportOffsetChangeType);
- bool containsTiledBackingLayers() const;
</del><ins>+ enum ViewportOffsetChangeType { IncrementalScrollOffset, CompletedScrollOffset };
+ WEBCORE_EXPORT void viewportOffsetChanged(ViewportOffsetChangeType);
+ bool containsTiledBackingLayers() const;
</ins><span class="cx">
</span><del>- WEBCORE_EXPORT void overflowScrollPositionChangedForNode(const IntPoint&, Node*, bool isUserScroll);
</del><ins>+ WEBCORE_EXPORT void overflowScrollPositionChangedForNode(const IntPoint&, Node*, bool isUserScroll);
</ins><span class="cx">
</span><del>- WEBCORE_EXPORT void resetAllGeolocationPermission();
</del><ins>+ WEBCORE_EXPORT void resetAllGeolocationPermission();
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(ORIENTATION_EVENTS)
</span><del>- // Orientation is the interface orientation in degrees. Some examples are:
- // 0 is straight up; -90 is when the device is rotated 90 clockwise;
- // 90 is when rotated counter clockwise.
- WEBCORE_EXPORT void orientationChanged();
- int orientation() const;
</del><ins>+ // Orientation is the interface orientation in degrees. Some examples are:
+ // 0 is straight up; -90 is when the device is rotated 90 clockwise;
+ // 90 is when rotated counter clockwise.
+ WEBCORE_EXPORT void orientationChanged();
+ int orientation() const;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- void clearTimers();
- static void clearTimers(FrameView*, Document*);
</del><ins>+ void clearTimers();
+ static void clearTimers(FrameView*, Document*);
</ins><span class="cx">
</span><del>- WEBCORE_EXPORT String displayStringModifiedByEncoding(const String&) const;
</del><ins>+ WEBCORE_EXPORT String displayStringModifiedByEncoding(const String&) const;
</ins><span class="cx">
</span><del>- WEBCORE_EXPORT VisiblePosition visiblePositionForPoint(const IntPoint& framePoint) const;
- Document* documentAtPoint(const IntPoint& windowPoint);
- WEBCORE_EXPORT RefPtr<Range> rangeForPoint(const IntPoint& framePoint);
</del><ins>+ WEBCORE_EXPORT VisiblePosition visiblePositionForPoint(const IntPoint& framePoint) const;
+ Document* documentAtPoint(const IntPoint& windowPoint);
+ WEBCORE_EXPORT RefPtr<Range> rangeForPoint(const IntPoint& framePoint);
</ins><span class="cx">
</span><del>- WEBCORE_EXPORT String searchForLabelsAboveCell(const JSC::Yarr::RegularExpression&, HTMLTableCellElement*, size_t* resultDistanceFromStartOfCell);
- String searchForLabelsBeforeElement(const Vector<String>& labels, Element*, size_t* resultDistance, bool* resultIsInCellAbove);
- String matchLabelsAgainstElement(const Vector<String>& labels, Element*);
</del><ins>+ WEBCORE_EXPORT String searchForLabelsAboveCell(const JSC::Yarr::RegularExpression&, HTMLTableCellElement*, size_t* resultDistanceFromStartOfCell);
+ String searchForLabelsBeforeElement(const Vector<String>& labels, Element*, size_t* resultDistance, bool* resultIsInCellAbove);
+ String matchLabelsAgainstElement(const Vector<String>& labels, Element*);
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- // Scroll the selection in an overflow layer.
- void scrollOverflowLayer(RenderLayer*, const IntRect& visibleRect, const IntRect& exposeRect);
</del><ins>+ // Scroll the selection in an overflow layer.
+ void scrollOverflowLayer(RenderLayer*, const IntRect& visibleRect, const IntRect& exposeRect);
</ins><span class="cx">
</span><del>- WEBCORE_EXPORT int preferredHeight() const;
- WEBCORE_EXPORT void updateLayout() const;
- WEBCORE_EXPORT NSRect caretRect() const;
- WEBCORE_EXPORT NSRect rectForScrollToVisible() const;
- WEBCORE_EXPORT unsigned formElementsCharacterCount() const;
</del><ins>+ WEBCORE_EXPORT int preferredHeight() const;
+ WEBCORE_EXPORT void updateLayout() const;
+ WEBCORE_EXPORT NSRect caretRect() const;
+ WEBCORE_EXPORT NSRect rectForScrollToVisible() const;
+ WEBCORE_EXPORT unsigned formElementsCharacterCount() const;
</ins><span class="cx">
</span><del>- // This function is used by Legacy WebKit.
- WEBCORE_EXPORT void setTimersPaused(bool);
</del><ins>+ // This function is used by Legacy WebKit.
+ WEBCORE_EXPORT void setTimersPaused(bool);
</ins><span class="cx">
</span><del>- WEBCORE_EXPORT void dispatchPageHideEventBeforePause();
- WEBCORE_EXPORT void dispatchPageShowEventBeforeResume();
- WEBCORE_EXPORT void setRangedSelectionBaseToCurrentSelection();
- WEBCORE_EXPORT void setRangedSelectionBaseToCurrentSelectionStart();
- WEBCORE_EXPORT void setRangedSelectionBaseToCurrentSelectionEnd();
- WEBCORE_EXPORT void clearRangedSelectionInitialExtent();
- WEBCORE_EXPORT void setRangedSelectionInitialExtentToCurrentSelectionStart();
- WEBCORE_EXPORT void setRangedSelectionInitialExtentToCurrentSelectionEnd();
- WEBCORE_EXPORT VisibleSelection rangedSelectionBase() const;
- WEBCORE_EXPORT VisibleSelection rangedSelectionInitialExtent() const;
- WEBCORE_EXPORT void recursiveSetUpdateAppearanceEnabled(bool);
- WEBCORE_EXPORT NSArray *interpretationsForCurrentRoot() const;
</del><ins>+ WEBCORE_EXPORT void dispatchPageHideEventBeforePause();
+ WEBCORE_EXPORT void dispatchPageShowEventBeforeResume();
+ WEBCORE_EXPORT void setRangedSelectionBaseToCurrentSelection();
+ WEBCORE_EXPORT void setRangedSelectionBaseToCurrentSelectionStart();
+ WEBCORE_EXPORT void setRangedSelectionBaseToCurrentSelectionEnd();
+ WEBCORE_EXPORT void clearRangedSelectionInitialExtent();
+ WEBCORE_EXPORT void setRangedSelectionInitialExtentToCurrentSelectionStart();
+ WEBCORE_EXPORT void setRangedSelectionInitialExtentToCurrentSelectionEnd();
+ WEBCORE_EXPORT VisibleSelection rangedSelectionBase() const;
+ WEBCORE_EXPORT VisibleSelection rangedSelectionInitialExtent() const;
+ WEBCORE_EXPORT void recursiveSetUpdateAppearanceEnabled(bool);
+ WEBCORE_EXPORT NSArray *interpretationsForCurrentRoot() const;
</ins><span class="cx"> #endif
</span><del>- void suspendActiveDOMObjectsAndAnimations();
- void resumeActiveDOMObjectsAndAnimations();
- bool activeDOMObjectsAndAnimationsSuspended() const { return m_activeDOMObjectsAndAnimationsSuspendedCount > 0; }
</del><ins>+ void suspendActiveDOMObjectsAndAnimations();
+ void resumeActiveDOMObjectsAndAnimations();
+ bool activeDOMObjectsAndAnimationsSuspended() const { return m_activeDOMObjectsAndAnimationsSuspendedCount > 0; }
</ins><span class="cx">
</span><del>- bool isURLAllowed(const URL&) const;
- WEBCORE_EXPORT bool isAlwaysOnLoggingAllowed() const;
</del><ins>+ bool isURLAllowed(const URL&) const;
+ WEBCORE_EXPORT bool isAlwaysOnLoggingAllowed() const;
</ins><span class="cx">
</span><del>- // ========
</del><ins>+// ========
</ins><span class="cx">
</span><del>- protected:
- Frame(Page&, HTMLFrameOwnerElement*, FrameLoaderClient&);
- void setMainFrameWasDestroyed();
</del><ins>+protected:
+ Frame(Page&, HTMLFrameOwnerElement*, FrameLoaderClient&);
+ void setMainFrameWasDestroyed();
</ins><span class="cx">
</span><del>- private:
- HashSet<FrameDestructionObserver*> m_destructionObservers;
</del><ins>+private:
+ HashSet<FrameDestructionObserver*> m_destructionObservers;
</ins><span class="cx">
</span><del>- MainFrame& m_mainFrame;
- Page* m_page;
- const RefPtr<Settings> m_settings;
- mutable FrameTree m_treeNode;
- mutable FrameLoader m_loader;
- mutable NavigationScheduler m_navigationScheduler;
</del><ins>+ MainFrame& m_mainFrame;
+ Page* m_page;
+ const RefPtr<Settings> m_settings;
+ mutable FrameTree m_treeNode;
+ mutable FrameLoader m_loader;
+ mutable NavigationScheduler m_navigationScheduler;
</ins><span class="cx">
</span><del>- HTMLFrameOwnerElement* m_ownerElement;
- RefPtr<FrameView> m_view;
- RefPtr<Document> m_doc;
</del><ins>+ HTMLFrameOwnerElement* m_ownerElement;
+ RefPtr<FrameView> m_view;
+ RefPtr<Document> m_doc;
</ins><span class="cx">
</span><del>- const std::unique_ptr<ScriptController> m_script;
- const std::unique_ptr<Editor> m_editor;
- const std::unique_ptr<FrameSelection> m_selection;
- const std::unique_ptr<AnimationController> m_animationController;
</del><ins>+ const std::unique_ptr<ScriptController> m_script;
+ const std::unique_ptr<Editor> m_editor;
+ const std::unique_ptr<FrameSelection> m_selection;
+ const std::unique_ptr<AnimationController> m_animationController;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(DATA_DETECTION)
</span><del>- RetainPtr<NSArray> m_dataDetectionResults;
</del><ins>+ RetainPtr<NSArray> m_dataDetectionResults;
</ins><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- void betterApproximateNode(const IntPoint& testPoint, NodeQualifier, Node*& best, Node* failedNode, IntPoint& bestPoint, IntRect& bestRect, const IntRect& testRect);
- bool hitTestResultAtViewportLocation(const FloatPoint& viewportLocation, HitTestResult&, IntPoint& center);
- Node* qualifyingNodeAtViewportLocation(const FloatPoint& viewportLocation, FloatPoint& adjustedViewportLocation, NodeQualifier, bool shouldApproximate);
</del><ins>+ void betterApproximateNode(const IntPoint& testPoint, NodeQualifier, Node*& best, Node* failedNode, IntPoint& bestPoint, IntRect& bestRect, const IntRect& testRect);
+ bool hitTestResultAtViewportLocation(const FloatPoint& viewportLocation, HitTestResult&, IntPoint& center);
+ Node* qualifyingNodeAtViewportLocation(const FloatPoint& viewportLocation, FloatPoint& adjustedViewportLocation, NodeQualifier, bool shouldApproximate);
</ins><span class="cx">
</span><del>- void overflowAutoScrollTimerFired();
- void startOverflowAutoScroll(const IntPoint&);
- int checkOverflowScroll(OverflowScrollAction);
</del><ins>+ void overflowAutoScrollTimerFired();
+ void startOverflowAutoScroll(const IntPoint&);
+ int checkOverflowScroll(OverflowScrollAction);
</ins><span class="cx">
</span><del>- void setTimersPausedInternal(bool);
</del><ins>+ void setTimersPausedInternal(bool);
</ins><span class="cx">
</span><del>- Timer m_overflowAutoScrollTimer;
- float m_overflowAutoScrollDelta;
- IntPoint m_overflowAutoScrollPos;
- ViewportArguments m_viewportArguments;
- bool m_selectionChangeCallbacksDisabled;
- VisibleSelection m_rangedSelectionBase;
- VisibleSelection m_rangedSelectionInitialExtent;
</del><ins>+ Timer m_overflowAutoScrollTimer;
+ float m_overflowAutoScrollDelta;
+ IntPoint m_overflowAutoScrollPos;
+ ViewportArguments m_viewportArguments;
+ bool m_selectionChangeCallbacksDisabled;
+ VisibleSelection m_rangedSelectionBase;
+ VisibleSelection m_rangedSelectionInitialExtent;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- float m_pageZoomFactor;
- float m_textZoomFactor;
</del><ins>+ float m_pageZoomFactor;
+ float m_textZoomFactor;
</ins><span class="cx">
</span><del>- int m_activeDOMObjectsAndAnimationsSuspendedCount;
- bool m_mainFrameWasDestroyed { false };
</del><ins>+ int m_activeDOMObjectsAndAnimationsSuspendedCount;
+ bool m_mainFrameWasDestroyed { false };
</ins><span class="cx">
</span><del>- protected:
- std::unique_ptr<EventHandler> m_eventHandler;
- };
</del><ins>+protected:
+ std::unique_ptr<EventHandler> m_eventHandler;
+};
</ins><span class="cx">
</span><del>- inline void Frame::init()
- {
- m_loader.init();
- }
</del><ins>+inline void Frame::init()
+{
+ m_loader.init();
+}
</ins><span class="cx">
</span><del>- inline FrameLoader& Frame::loader() const
- {
- return m_loader;
- }
</del><ins>+inline FrameLoader& Frame::loader() const
+{
+ return m_loader;
+}
</ins><span class="cx">
</span><del>- inline NavigationScheduler& Frame::navigationScheduler() const
- {
- return m_navigationScheduler;
- }
</del><ins>+inline NavigationScheduler& Frame::navigationScheduler() const
+{
+ return m_navigationScheduler;
+}
</ins><span class="cx">
</span><del>- inline FrameView* Frame::view() const
- {
- return m_view.get();
- }
</del><ins>+inline FrameView* Frame::view() const
+{
+ return m_view.get();
+}
</ins><span class="cx">
</span><del>- inline ScriptController& Frame::script()
- {
- return *m_script;
- }
</del><ins>+inline ScriptController& Frame::script()
+{
+ return *m_script;
+}
</ins><span class="cx">
</span><del>- inline Document* Frame::document() const
- {
- return m_doc.get();
- }
</del><ins>+inline Document* Frame::document() const
+{
+ return m_doc.get();
+}
</ins><span class="cx">
</span><del>- inline FrameSelection& Frame::selection() const
- {
- return *m_selection;
- }
</del><ins>+inline FrameSelection& Frame::selection() const
+{
+ return *m_selection;
+}
</ins><span class="cx">
</span><del>- inline Editor& Frame::editor() const
- {
- return *m_editor;
- }
</del><ins>+inline Editor& Frame::editor() const
+{
+ return *m_editor;
+}
</ins><span class="cx">
</span><del>- inline AnimationController& Frame::animation() const
- {
- return *m_animationController;
- }
</del><ins>+inline AnimationController& Frame::animation() const
+{
+ return *m_animationController;
+}
</ins><span class="cx">
</span><del>- inline HTMLFrameOwnerElement* Frame::ownerElement() const
- {
- return m_ownerElement;
- }
</del><ins>+inline HTMLFrameOwnerElement* Frame::ownerElement() const
+{
+ return m_ownerElement;
+}
</ins><span class="cx">
</span><del>- inline FrameTree& Frame::tree() const
- {
- return m_treeNode;
- }
</del><ins>+inline FrameTree& Frame::tree() const
+{
+ return m_treeNode;
+}
</ins><span class="cx">
</span><del>- inline Page* Frame::page() const
- {
- return m_page;
- }
</del><ins>+inline Page* Frame::page() const
+{
+ return m_page;
+}
</ins><span class="cx">
</span><del>- inline void Frame::detachFromPage()
- {
- m_page = nullptr;
- }
</del><ins>+inline void Frame::detachFromPage()
+{
+ m_page = nullptr;
+}
</ins><span class="cx">
</span><del>- inline EventHandler& Frame::eventHandler() const
- {
- return *m_eventHandler;
- }
</del><ins>+inline EventHandler& Frame::eventHandler() const
+{
+ return *m_eventHandler;
+}
</ins><span class="cx">
</span><del>- inline EventHandler* Frame::eventHandlerPtr() const
- {
- return m_eventHandler.get();
- }
</del><ins>+inline EventHandler* Frame::eventHandlerPtr() const
+{
+ return m_eventHandler.get();
+}
</ins><span class="cx">
</span><del>- inline MainFrame& Frame::mainFrame() const
- {
- ASSERT_WITH_SECURITY_IMPLICATION(!m_mainFrameWasDestroyed);
- return m_mainFrame;
- }
</del><ins>+inline MainFrame& Frame::mainFrame() const
+{
+ ASSERT_WITH_SECURITY_IMPLICATION(!m_mainFrameWasDestroyed);
+ return m_mainFrame;
+}
</ins><span class="cx">
</span><del>- inline void Frame::setMainFrameWasDestroyed()
- {
- m_mainFrameWasDestroyed = false;
- }
</del><ins>+inline void Frame::setMainFrameWasDestroyed()
+{
+ m_mainFrameWasDestroyed = false;
+}
</ins><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameTreeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameTree.h (208803 => 208804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameTree.h 2016-11-16 20:26:59 UTC (rev 208803)
+++ trunk/Source/WebCore/page/FrameTree.h 2016-11-16 20:43:14 UTC (rev 208804)
</span><span class="lines">@@ -23,89 +23,89 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>- class Frame;
- class TreeScope;
</del><ins>+class Frame;
+class TreeScope;
</ins><span class="cx">
</span><del>- class FrameTree {
- WTF_MAKE_NONCOPYABLE(FrameTree);
- public:
- const static unsigned invalidCount = static_cast<unsigned>(-1);
</del><ins>+class FrameTree {
+ WTF_MAKE_NONCOPYABLE(FrameTree);
+public:
+ const static unsigned invalidCount = static_cast<unsigned>(-1);
</ins><span class="cx">
</span><del>- FrameTree(Frame& thisFrame, Frame* parentFrame)
- : m_thisFrame(thisFrame)
- , m_parent(parentFrame)
- , m_previousSibling(nullptr)
- , m_lastChild(nullptr)
- , m_scopedChildCount(invalidCount)
- {
- }
</del><ins>+ FrameTree(Frame& thisFrame, Frame* parentFrame)
+ : m_thisFrame(thisFrame)
+ , m_parent(parentFrame)
+ , m_previousSibling(nullptr)
+ , m_lastChild(nullptr)
+ , m_scopedChildCount(invalidCount)
+ {
+ }
</ins><span class="cx">
</span><del>- ~FrameTree();
</del><ins>+ ~FrameTree();
</ins><span class="cx">
</span><del>- const AtomicString& name() const { return m_name; }
- const AtomicString& uniqueName() const { return m_uniqueName; }
- WEBCORE_EXPORT void setName(const AtomicString&);
- WEBCORE_EXPORT void clearName();
- WEBCORE_EXPORT Frame* parent() const;
- void setParent(Frame* parent) { m_parent = parent; }
-
- Frame* nextSibling() const { return m_nextSibling.get(); }
- Frame* previousSibling() const { return m_previousSibling; }
- Frame* firstChild() const { return m_firstChild.get(); }
- Frame* lastChild() const { return m_lastChild; }
</del><ins>+ const AtomicString& name() const { return m_name; }
+ const AtomicString& uniqueName() const { return m_uniqueName; }
+ WEBCORE_EXPORT void setName(const AtomicString&);
+ WEBCORE_EXPORT void clearName();
+ WEBCORE_EXPORT Frame* parent() const;
+ void setParent(Frame* parent) { m_parent = parent; }
+
+ Frame* nextSibling() const { return m_nextSibling.get(); }
+ Frame* previousSibling() const { return m_previousSibling; }
+ Frame* firstChild() const { return m_firstChild.get(); }
+ Frame* lastChild() const { return m_lastChild; }
</ins><span class="cx">
</span><del>- Frame* firstRenderedChild() const;
- Frame* nextRenderedSibling() const;
</del><ins>+ Frame* firstRenderedChild() const;
+ Frame* nextRenderedSibling() const;
</ins><span class="cx">
</span><del>- WEBCORE_EXPORT bool isDescendantOf(const Frame* ancestor) const;
-
- WEBCORE_EXPORT Frame* traverseNext(const Frame* stayWithin = nullptr) const;
- // Rendered means being the main frame or having an ownerRenderer. It may not have been parented in the Widget tree yet (see WidgetHierarchyUpdatesSuspensionScope).
- WEBCORE_EXPORT Frame* traverseNextRendered(const Frame* stayWithin = nullptr) const;
- WEBCORE_EXPORT Frame* traverseNextWithWrap(bool) const;
- WEBCORE_EXPORT Frame* traversePreviousWithWrap(bool) const;
-
- WEBCORE_EXPORT void appendChild(PassRefPtr<Frame>);
- bool transferChild(PassRefPtr<Frame>);
- void detachFromParent() { m_parent = nullptr; }
- void removeChild(Frame*);
</del><ins>+ WEBCORE_EXPORT bool isDescendantOf(const Frame* ancestor) const;
+
+ WEBCORE_EXPORT Frame* traverseNext(const Frame* stayWithin = nullptr) const;
+ // Rendered means being the main frame or having an ownerRenderer. It may not have been parented in the Widget tree yet (see WidgetHierarchyUpdatesSuspensionScope).
+ WEBCORE_EXPORT Frame* traverseNextRendered(const Frame* stayWithin = nullptr) const;
+ WEBCORE_EXPORT Frame* traverseNextWithWrap(bool) const;
+ WEBCORE_EXPORT Frame* traversePreviousWithWrap(bool) const;
+
+ WEBCORE_EXPORT void appendChild(PassRefPtr<Frame>);
+ bool transferChild(PassRefPtr<Frame>);
+ void detachFromParent() { m_parent = nullptr; }
+ void removeChild(Frame*);
</ins><span class="cx">
</span><del>- Frame* child(unsigned index) const;
- Frame* child(const AtomicString& name) const;
- WEBCORE_EXPORT Frame* find(const AtomicString& name) const;
- WEBCORE_EXPORT unsigned childCount() const;
</del><ins>+ Frame* child(unsigned index) const;
+ Frame* child(const AtomicString& name) const;
+ WEBCORE_EXPORT Frame* find(const AtomicString& name) const;
+ WEBCORE_EXPORT unsigned childCount() const;
</ins><span class="cx">
</span><del>- AtomicString uniqueChildName(const AtomicString& requestedName) const;
</del><ins>+ AtomicString uniqueChildName(const AtomicString& requestedName) const;
</ins><span class="cx">
</span><del>- WEBCORE_EXPORT Frame& top() const;
</del><ins>+ WEBCORE_EXPORT Frame& top() const;
</ins><span class="cx">
</span><del>- WEBCORE_EXPORT Frame* scopedChild(unsigned index) const;
- WEBCORE_EXPORT Frame* scopedChild(const AtomicString& name) const;
- unsigned scopedChildCount() const;
</del><ins>+ WEBCORE_EXPORT Frame* scopedChild(unsigned index) const;
+ WEBCORE_EXPORT Frame* scopedChild(const AtomicString& name) const;
+ unsigned scopedChildCount() const;
</ins><span class="cx">
</span><del>- unsigned indexInParent() const;
</del><ins>+ unsigned indexInParent() const;
</ins><span class="cx">
</span><del>- private:
- Frame* deepLastChild() const;
- void actuallyAppendChild(PassRefPtr<Frame>);
</del><ins>+private:
+ Frame* deepLastChild() const;
+ void actuallyAppendChild(PassRefPtr<Frame>);
</ins><span class="cx">
</span><del>- bool scopedBy(TreeScope*) const;
- Frame* scopedChild(unsigned index, TreeScope*) const;
- Frame* scopedChild(const AtomicString& name, TreeScope*) const;
- unsigned scopedChildCount(TreeScope*) const;
</del><ins>+ bool scopedBy(TreeScope*) const;
+ Frame* scopedChild(unsigned index, TreeScope*) const;
+ Frame* scopedChild(const AtomicString& name, TreeScope*) const;
+ unsigned scopedChildCount(TreeScope*) const;
</ins><span class="cx">
</span><del>- Frame& m_thisFrame;
</del><ins>+ Frame& m_thisFrame;
</ins><span class="cx">
</span><del>- Frame* m_parent;
- AtomicString m_name; // The actual frame name (may be empty).
- AtomicString m_uniqueName;
</del><ins>+ Frame* m_parent;
+ AtomicString m_name; // The actual frame name (may be empty).
+ AtomicString m_uniqueName;
</ins><span class="cx">
</span><del>- RefPtr<Frame> m_nextSibling;
- Frame* m_previousSibling;
- RefPtr<Frame> m_firstChild;
- Frame* m_lastChild;
- mutable unsigned m_scopedChildCount;
- };
</del><ins>+ RefPtr<Frame> m_nextSibling;
+ Frame* m_previousSibling;
+ RefPtr<Frame> m_firstChild;
+ Frame* m_lastChild;
+ mutable unsigned m_scopedChildCount;
+};
</ins><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageGrouph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PageGroup.h (208803 => 208804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PageGroup.h 2016-11-16 20:26:59 UTC (rev 208803)
+++ trunk/Source/WebCore/page/PageGroup.h 2016-11-16 20:43:14 UTC (rev 208804)
</span><span class="lines">@@ -32,42 +32,42 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>- class Page;
</del><ins>+class Page;
</ins><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><del>- class CaptionUserPreferences;
</del><ins>+class CaptionUserPreferences;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- class PageGroup {
- WTF_MAKE_NONCOPYABLE(PageGroup); WTF_MAKE_FAST_ALLOCATED;
- public:
- WEBCORE_EXPORT explicit PageGroup(const String& name);
- explicit PageGroup(Page&);
- ~PageGroup();
</del><ins>+class PageGroup {
+ WTF_MAKE_NONCOPYABLE(PageGroup); WTF_MAKE_FAST_ALLOCATED;
+public:
+ WEBCORE_EXPORT explicit PageGroup(const String& name);
+ explicit PageGroup(Page&);
+ ~PageGroup();
</ins><span class="cx">
</span><del>- WEBCORE_EXPORT static PageGroup* pageGroup(const String& groupName);
</del><ins>+ WEBCORE_EXPORT static PageGroup* pageGroup(const String& groupName);
</ins><span class="cx">
</span><del>- const HashSet<Page*>& pages() const { return m_pages; }
</del><ins>+ const HashSet<Page*>& pages() const { return m_pages; }
</ins><span class="cx">
</span><del>- void addPage(Page&);
- void removePage(Page&);
</del><ins>+ void addPage(Page&);
+ void removePage(Page&);
</ins><span class="cx">
</span><del>- const String& name() { return m_name; }
- unsigned identifier() { return m_identifier; }
</del><ins>+ const String& name() { return m_name; }
+ unsigned identifier() { return m_identifier; }
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><del>- WEBCORE_EXPORT void captionPreferencesChanged();
- WEBCORE_EXPORT CaptionUserPreferences& captionPreferences();
</del><ins>+ WEBCORE_EXPORT void captionPreferencesChanged();
+ WEBCORE_EXPORT CaptionUserPreferences& captionPreferences();
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- private:
- String m_name;
- HashSet<Page*> m_pages;
</del><ins>+private:
+ String m_name;
+ HashSet<Page*> m_pages;
</ins><span class="cx">
</span><del>- unsigned m_identifier;
</del><ins>+ unsigned m_identifier;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><del>- std::unique_ptr<CaptionUserPreferences> m_captionPreferences;
</del><ins>+ std::unique_ptr<CaptionUserPreferences> m_captionPreferences;
</ins><span class="cx"> #endif
</span><del>- };
</del><ins>+};
</ins><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformCursorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Cursor.h (208803 => 208804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/Cursor.h 2016-11-16 20:26:59 UTC (rev 208803)
+++ trunk/Source/WebCore/platform/Cursor.h 2016-11-16 20:43:14 UTC (rev 208804)
</span><span class="lines">@@ -23,8 +23,7 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef Cursor_h
-#define Cursor_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "Image.h"
</span><span class="cx"> #include "IntPoint.h"
</span><span class="lines">@@ -52,183 +51,181 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>- class Image;
</del><ins>+class Image;
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(WIN)
</span><del>- class SharedCursor : public RefCounted<SharedCursor> {
- public:
- static Ref<SharedCursor> create(HCURSOR nativeCursor) { return adoptRef(*new SharedCursor(nativeCursor)); }
- ~SharedCursor();
- HCURSOR nativeCursor() const { return m_nativeCursor; }
- private:
- SharedCursor(HCURSOR nativeCursor) : m_nativeCursor(nativeCursor) { }
- HCURSOR m_nativeCursor;
- };
- typedef RefPtr<SharedCursor> PlatformCursor;
</del><ins>+class SharedCursor : public RefCounted<SharedCursor> {
+public:
+ static Ref<SharedCursor> create(HCURSOR nativeCursor) { return adoptRef(*new SharedCursor(nativeCursor)); }
+ ~SharedCursor();
+ HCURSOR nativeCursor() const { return m_nativeCursor; }
+private:
+ SharedCursor(HCURSOR nativeCursor) : m_nativeCursor(nativeCursor) { }
+ HCURSOR m_nativeCursor;
+};
+typedef RefPtr<SharedCursor> PlatformCursor;
</ins><span class="cx"> #elif USE(APPKIT)
</span><del>- typedef NSCursor *PlatformCursor;
</del><ins>+typedef NSCursor *PlatformCursor;
</ins><span class="cx"> #elif PLATFORM(GTK)
</span><del>- typedef GRefPtr<GdkCursor> PlatformCursor;
</del><ins>+typedef GRefPtr<GdkCursor> PlatformCursor;
</ins><span class="cx"> #elif PLATFORM(EFL)
</span><del>- typedef const char* PlatformCursor;
</del><ins>+typedef const char* PlatformCursor;
</ins><span class="cx"> #else
</span><del>- typedef void* PlatformCursor;
</del><ins>+typedef void* PlatformCursor;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- class Cursor {
- WTF_MAKE_FAST_ALLOCATED;
- public:
- enum Type {
- Pointer = 0,
- Cross,
- Hand,
- IBeam,
- Wait,
- Help,
- EastResize,
- NorthResize,
- NorthEastResize,
- NorthWestResize,
- SouthResize,
- SouthEastResize,
- SouthWestResize,
- WestResize,
- NorthSouthResize,
- EastWestResize,
- NorthEastSouthWestResize,
- NorthWestSouthEastResize,
- ColumnResize,
- RowResize,
- MiddlePanning,
- EastPanning,
- NorthPanning,
- NorthEastPanning,
- NorthWestPanning,
- SouthPanning,
- SouthEastPanning,
- SouthWestPanning,
- WestPanning,
- Move,
- VerticalText,
- Cell,
- ContextMenu,
- Alias,
- Progress,
- NoDrop,
- Copy,
- None,
- NotAllowed,
- ZoomIn,
- ZoomOut,
- Grab,
- Grabbing,
- Custom
- };
</del><ins>+class Cursor {
+ WTF_MAKE_FAST_ALLOCATED;
+public:
+ enum Type {
+ Pointer = 0,
+ Cross,
+ Hand,
+ IBeam,
+ Wait,
+ Help,
+ EastResize,
+ NorthResize,
+ NorthEastResize,
+ NorthWestResize,
+ SouthResize,
+ SouthEastResize,
+ SouthWestResize,
+ WestResize,
+ NorthSouthResize,
+ EastWestResize,
+ NorthEastSouthWestResize,
+ NorthWestSouthEastResize,
+ ColumnResize,
+ RowResize,
+ MiddlePanning,
+ EastPanning,
+ NorthPanning,
+ NorthEastPanning,
+ NorthWestPanning,
+ SouthPanning,
+ SouthEastPanning,
+ SouthWestPanning,
+ WestPanning,
+ Move,
+ VerticalText,
+ Cell,
+ ContextMenu,
+ Alias,
+ Progress,
+ NoDrop,
+ Copy,
+ None,
+ NotAllowed,
+ ZoomIn,
+ ZoomOut,
+ Grab,
+ Grabbing,
+ Custom
+ };
</ins><span class="cx">
</span><del>- WEBCORE_EXPORT static const Cursor& fromType(Cursor::Type);
</del><ins>+ WEBCORE_EXPORT static const Cursor& fromType(Cursor::Type);
</ins><span class="cx">
</span><del>- Cursor()
</del><ins>+ Cursor()
</ins><span class="cx"> #if !PLATFORM(IOS)
</span><del>- // This is an invalid Cursor and should never actually get used.
- : m_type(static_cast<Type>(-1))
</del><ins>+ // This is an invalid Cursor and should never actually get used.
+ : m_type(static_cast<Type>(-1))
</ins><span class="cx"> #if ENABLE(MOUSE_CURSOR_SCALE)
</span><del>- , m_imageScaleFactor(1)
</del><ins>+ , m_imageScaleFactor(1)
</ins><span class="cx"> #endif
</span><del>- , m_platformCursor(0)
</del><ins>+ , m_platformCursor(0)
</ins><span class="cx"> #endif // !PLATFORM(IOS)
</span><del>- {
- }
</del><ins>+ {
+ }
</ins><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><del>- WEBCORE_EXPORT Cursor(Image*, const IntPoint& hotSpot);
- WEBCORE_EXPORT Cursor(const Cursor&);
</del><ins>+ WEBCORE_EXPORT Cursor(Image*, const IntPoint& hotSpot);
+ WEBCORE_EXPORT Cursor(const Cursor&);
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(MOUSE_CURSOR_SCALE)
</span><del>- // Hot spot is in image pixels.
- WEBCORE_EXPORT Cursor(Image*, const IntPoint& hotSpot, float imageScaleFactor);
</del><ins>+ // Hot spot is in image pixels.
+ WEBCORE_EXPORT Cursor(Image*, const IntPoint& hotSpot, float imageScaleFactor);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- WEBCORE_EXPORT ~Cursor();
- WEBCORE_EXPORT Cursor& operator=(const Cursor&);
</del><ins>+ WEBCORE_EXPORT ~Cursor();
+ WEBCORE_EXPORT Cursor& operator=(const Cursor&);
</ins><span class="cx">
</span><del>- explicit Cursor(Type);
- Type type() const
- {
- ASSERT(m_type >= 0 && m_type <= Custom);
- return m_type;
- }
- Image* image() const { return m_image.get(); }
- const IntPoint& hotSpot() const { return m_hotSpot; }
</del><ins>+ explicit Cursor(Type);
+ Type type() const
+ {
+ ASSERT(m_type >= 0 && m_type <= Custom);
+ return m_type;
+ }
+ Image* image() const { return m_image.get(); }
+ const IntPoint& hotSpot() const { return m_hotSpot; }
</ins><span class="cx"> #if ENABLE(MOUSE_CURSOR_SCALE)
</span><del>- // Image scale in image pixels per logical (UI) pixel.
- float imageScaleFactor() const { return m_imageScaleFactor; }
</del><ins>+ // Image scale in image pixels per logical (UI) pixel.
+ float imageScaleFactor() const { return m_imageScaleFactor; }
</ins><span class="cx"> #endif
</span><del>- WEBCORE_EXPORT PlatformCursor platformCursor() const;
</del><ins>+ WEBCORE_EXPORT PlatformCursor platformCursor() const;
</ins><span class="cx">
</span><del>- private:
- void ensurePlatformCursor() const;
</del><ins>+ private:
+ void ensurePlatformCursor() const;
</ins><span class="cx">
</span><del>- Type m_type;
- RefPtr<Image> m_image;
- IntPoint m_hotSpot;
</del><ins>+ Type m_type;
+ RefPtr<Image> m_image;
+ IntPoint m_hotSpot;
</ins><span class="cx"> #if ENABLE(MOUSE_CURSOR_SCALE)
</span><del>- float m_imageScaleFactor;
</del><ins>+ float m_imageScaleFactor;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if !USE(APPKIT)
</span><del>- mutable PlatformCursor m_platformCursor;
</del><ins>+ mutable PlatformCursor m_platformCursor;
</ins><span class="cx"> #else
</span><del>- mutable RetainPtr<NSCursor> m_platformCursor;
</del><ins>+ mutable RetainPtr<NSCursor> m_platformCursor;
</ins><span class="cx"> #endif
</span><span class="cx"> #endif // !PLATFORM(IOS)
</span><del>- };
</del><ins>+};
</ins><span class="cx">
</span><del>- IntPoint determineHotSpot(Image*, const IntPoint& specifiedHotSpot);
-
- WEBCORE_EXPORT const Cursor& pointerCursor();
- const Cursor& crossCursor();
- WEBCORE_EXPORT const Cursor& handCursor();
- const Cursor& moveCursor();
- WEBCORE_EXPORT const Cursor& iBeamCursor();
- const Cursor& waitCursor();
- const Cursor& helpCursor();
- const Cursor& eastResizeCursor();
- const Cursor& northResizeCursor();
- const Cursor& northEastResizeCursor();
- const Cursor& northWestResizeCursor();
- const Cursor& southResizeCursor();
- const Cursor& southEastResizeCursor();
- const Cursor& southWestResizeCursor();
- const Cursor& westResizeCursor();
- const Cursor& northSouthResizeCursor();
- const Cursor& eastWestResizeCursor();
- const Cursor& northEastSouthWestResizeCursor();
- const Cursor& northWestSouthEastResizeCursor();
- const Cursor& columnResizeCursor();
- const Cursor& rowResizeCursor();
- const Cursor& middlePanningCursor();
- const Cursor& eastPanningCursor();
- const Cursor& northPanningCursor();
- const Cursor& northEastPanningCursor();
- const Cursor& northWestPanningCursor();
- const Cursor& southPanningCursor();
- const Cursor& southEastPanningCursor();
- const Cursor& southWestPanningCursor();
- const Cursor& westPanningCursor();
- const Cursor& verticalTextCursor();
- const Cursor& cellCursor();
- const Cursor& contextMenuCursor();
- const Cursor& noDropCursor();
- const Cursor& notAllowedCursor();
- const Cursor& progressCursor();
- const Cursor& aliasCursor();
- const Cursor& zoomInCursor();
- const Cursor& zoomOutCursor();
- const Cursor& copyCursor();
- const Cursor& noneCursor();
- const Cursor& grabCursor();
- const Cursor& grabbingCursor();
</del><ins>+IntPoint determineHotSpot(Image*, const IntPoint& specifiedHotSpot);
</ins><span class="cx">
</span><ins>+WEBCORE_EXPORT const Cursor& pointerCursor();
+const Cursor& crossCursor();
+WEBCORE_EXPORT const Cursor& handCursor();
+const Cursor& moveCursor();
+WEBCORE_EXPORT const Cursor& iBeamCursor();
+const Cursor& waitCursor();
+const Cursor& helpCursor();
+const Cursor& eastResizeCursor();
+const Cursor& northResizeCursor();
+const Cursor& northEastResizeCursor();
+const Cursor& northWestResizeCursor();
+const Cursor& southResizeCursor();
+const Cursor& southEastResizeCursor();
+const Cursor& southWestResizeCursor();
+const Cursor& westResizeCursor();
+const Cursor& northSouthResizeCursor();
+const Cursor& eastWestResizeCursor();
+const Cursor& northEastSouthWestResizeCursor();
+const Cursor& northWestSouthEastResizeCursor();
+const Cursor& columnResizeCursor();
+const Cursor& rowResizeCursor();
+const Cursor& middlePanningCursor();
+const Cursor& eastPanningCursor();
+const Cursor& northPanningCursor();
+const Cursor& northEastPanningCursor();
+const Cursor& northWestPanningCursor();
+const Cursor& southPanningCursor();
+const Cursor& southEastPanningCursor();
+const Cursor& southWestPanningCursor();
+const Cursor& westPanningCursor();
+const Cursor& verticalTextCursor();
+const Cursor& cellCursor();
+const Cursor& contextMenuCursor();
+const Cursor& noDropCursor();
+const Cursor& notAllowedCursor();
+const Cursor& progressCursor();
+const Cursor& aliasCursor();
+const Cursor& zoomInCursor();
+const Cursor& zoomOutCursor();
+const Cursor& copyCursor();
+const Cursor& noneCursor();
+const Cursor& grabCursor();
+const Cursor& grabbingCursor();
+
</ins><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // Cursor_h
</del></span></pre>
</div>
</div>
</body>
</html>