<!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>[206006] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/206006">206006</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2016-09-15 17:27:11 -0700 (Thu, 15 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>WKWebView.hasOnlySecureContent always returns "YES" after going back to a CachedPage (even if it has http resources).
<rdar://problem/27681261> and https://bugs.webkit.org/show_bug.cgi?id=162043
Reviewed by Brent Fulgham.
Source/WebCore:
No new tests (Not possible with current testing infrastructure).
This adds the infrastructure for WebCore to track whether or not a CachedFrame had insecure content at the time
it was cached, and then to report that back to the client when a CachedPage is restored.
Since "has insecure content" is currently only tracked in the WK2 UI process, that is the only client of this code.
* history/CachedFrame.cpp:
(WebCore::CachedFrame::setHasInsecureContent):
* history/CachedFrame.h:
(WebCore::CachedFrame::hasInsecureContent):
* loader/EmptyClients.h:
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::receivedFirstData):
(WebCore::FrameLoader::commitProvisionalLoad):
(WebCore::FrameLoader::dispatchDidCommitLoad):
* loader/FrameLoader.h:
* loader/FrameLoaderClient.h:
* loader/FrameLoaderTypes.h:
Source/WebKit/mac:
* WebCoreSupport/WebFrameLoaderClient.h:
* WebCoreSupport/WebFrameLoaderClient.mm:
(WebFrameLoaderClient::dispatchDidCommitLoad):
Source/WebKit/win:
* WebCoreSupport/WebFrameLoaderClient.cpp:
(WebFrameLoaderClient::dispatchDidCommitLoad):
* WebCoreSupport/WebFrameLoaderClient.h:
Source/WebKit2:
* Scripts/webkit/messages.py:
(headers_for_type): Add a custom header, and alphabetize existing ones.
* Shared/WebCoreArgumentCoders.h: Add EnumTraits for HasInsecureContent.
* UIProcess/PageLoadState.h:
(WebKit::PageLoadState::committedHasInsecureContent):
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::hasInsecureContent):
(WebKit::WebPageProxy::didCommitLoadForFrame): If the WebProcess included an existing "HasInsecureContent" value, use it.
* UIProcess/WebPageProxy.h:
* UIProcess/WebPageProxy.messages.in:
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::dispatchDidCommitLoad):
(WebKit::WebFrameLoaderClient::savePlatformDataToCachedFrame): Save the "HasInsecureContent" value to the CachedFrame in
case we restore it in the future.
* WebProcess/WebCoreSupport/WebFrameLoaderClient.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehistoryCachedFramecpp">trunk/Source/WebCore/history/CachedFrame.cpp</a></li>
<li><a href="#trunkSourceWebCorehistoryCachedFrameh">trunk/Source/WebCore/history/CachedFrame.h</a></li>
<li><a href="#trunkSourceWebCoreloaderEmptyClientsh">trunk/Source/WebCore/loader/EmptyClients.h</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoadercpp">trunk/Source/WebCore/loader/FrameLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoaderh">trunk/Source/WebCore/loader/FrameLoader.h</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoaderClienth">trunk/Source/WebCore/loader/FrameLoaderClient.h</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoaderTypesh">trunk/Source/WebCore/loader/FrameLoaderTypes.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClienth">trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebFrameLoaderClientcpp">trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebFrameLoaderClienth">trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2Scriptswebkitmessagespy">trunk/Source/WebKit2/Scripts/webkit/messages.py</a></li>
<li><a href="#trunkSourceWebKit2SharedWebCoreArgumentCodersh">trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPageLoadStateh">trunk/Source/WebKit2/UIProcess/PageLoadState.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxymessagesin">trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClienth">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (206005 => 206006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-09-16 00:20:03 UTC (rev 206005)
+++ trunk/Source/WebCore/ChangeLog 2016-09-16 00:27:11 UTC (rev 206006)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2016-09-15 Brady Eidson <beidson@apple.com>
+
+ WKWebView.hasOnlySecureContent always returns "YES" after going back to a CachedPage (even if it has http resources).
+ <rdar://problem/27681261> and https://bugs.webkit.org/show_bug.cgi?id=162043
+
+ Reviewed by Brent Fulgham.
+
+ No new tests (Not possible with current testing infrastructure).
+
+ This adds the infrastructure for WebCore to track whether or not a CachedFrame had insecure content at the time
+ it was cached, and then to report that back to the client when a CachedPage is restored.
+
+ Since "has insecure content" is currently only tracked in the WK2 UI process, that is the only client of this code.
+
+ * history/CachedFrame.cpp:
+ (WebCore::CachedFrame::setHasInsecureContent):
+ * history/CachedFrame.h:
+ (WebCore::CachedFrame::hasInsecureContent):
+
+ * loader/EmptyClients.h:
+
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::receivedFirstData):
+ (WebCore::FrameLoader::commitProvisionalLoad):
+ (WebCore::FrameLoader::dispatchDidCommitLoad):
+ * loader/FrameLoader.h:
+
+ * loader/FrameLoaderClient.h:
+
+ * loader/FrameLoaderTypes.h:
+
</ins><span class="cx"> 2016-09-13 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> [media-source] web-platform-test/media-source/mediasource-remove.html test failing
</span></span></pre></div>
<a id="trunkSourceWebCorehistoryCachedFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/history/CachedFrame.cpp (206005 => 206006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/history/CachedFrame.cpp 2016-09-16 00:20:03 UTC (rev 206005)
+++ trunk/Source/WebCore/history/CachedFrame.cpp 2016-09-16 00:27:11 UTC (rev 206006)
</span><span class="lines">@@ -280,6 +280,11 @@
</span><span class="cx"> return m_cachedFramePlatformData.get();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void CachedFrame::setHasInsecureContent(HasInsecureContent hasInsecureContent)
+{
+ m_hasInsecureContent = hasInsecureContent;
+}
+
</ins><span class="cx"> int CachedFrame::descendantFrameCount() const
</span><span class="cx"> {
</span><span class="cx"> int count = m_childFrames.size();
</span></span></pre></div>
<a id="trunkSourceWebCorehistoryCachedFrameh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/history/CachedFrame.h (206005 => 206006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/history/CachedFrame.h 2016-09-16 00:20:03 UTC (rev 206005)
+++ trunk/Source/WebCore/history/CachedFrame.h 2016-09-16 00:27:11 UTC (rev 206006)
</span><span class="lines">@@ -39,6 +39,7 @@
</span><span class="cx"> class DocumentLoader;
</span><span class="cx"> class FrameView;
</span><span class="cx"> class Node;
</span><ins>+enum class HasInsecureContent;
</ins><span class="cx">
</span><span class="cx"> class CachedFrameBase {
</span><span class="cx"> public:
</span><span class="lines">@@ -61,7 +62,8 @@
</span><span class="cx"> std::unique_ptr<CachedFramePlatformData> m_cachedFramePlatformData;
</span><span class="cx"> bool m_isMainFrame;
</span><span class="cx"> bool m_isComposited;
</span><del>-
</del><ins>+ Optional<HasInsecureContent> m_hasInsecureContent;
+
</ins><span class="cx"> Vector<std::unique_ptr<CachedFrame>> m_childFrames;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -77,6 +79,9 @@
</span><span class="cx"> WEBCORE_EXPORT void setCachedFramePlatformData(std::unique_ptr<CachedFramePlatformData>);
</span><span class="cx"> WEBCORE_EXPORT CachedFramePlatformData* cachedFramePlatformData();
</span><span class="cx">
</span><ins>+ WEBCORE_EXPORT void setHasInsecureContent(HasInsecureContent);
+ Optional<HasInsecureContent> hasInsecureContent() const { return m_hasInsecureContent; }
+
</ins><span class="cx"> using CachedFrameBase::document;
</span><span class="cx"> using CachedFrameBase::view;
</span><span class="cx"> using CachedFrameBase::url;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderEmptyClientsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/EmptyClients.h (206005 => 206006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/EmptyClients.h 2016-09-16 00:20:03 UTC (rev 206005)
+++ trunk/Source/WebCore/loader/EmptyClients.h 2016-09-16 00:27:11 UTC (rev 206006)
</span><span class="lines">@@ -296,7 +296,7 @@
</span><span class="cx"> void dispatchDidReceiveIcon() override { }
</span><span class="cx"> void dispatchDidStartProvisionalLoad() override { }
</span><span class="cx"> void dispatchDidReceiveTitle(const StringWithDirection&) override { }
</span><del>- void dispatchDidCommitLoad() override { }
</del><ins>+ void dispatchDidCommitLoad(Optional<HasInsecureContent>) override { }
</ins><span class="cx"> void dispatchDidFailProvisionalLoad(const ResourceError&) override { }
</span><span class="cx"> void dispatchDidFailLoad(const ResourceError&) override { }
</span><span class="cx"> void dispatchDidFinishDocumentLoad() override { }
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (206005 => 206006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.cpp 2016-09-16 00:20:03 UTC (rev 206005)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2016-09-16 00:27:11 UTC (rev 206006)
</span><span class="lines">@@ -638,7 +638,7 @@
</span><span class="cx">
</span><span class="cx"> void FrameLoader::receivedFirstData()
</span><span class="cx"> {
</span><del>- dispatchDidCommitLoad();
</del><ins>+ dispatchDidCommitLoad(Nullopt);
</ins><span class="cx"> dispatchDidClearWindowObjectsInAllWorlds();
</span><span class="cx"> dispatchGlobalObjectAvailableInAllWorlds();
</span><span class="cx">
</span><span class="lines">@@ -1826,10 +1826,12 @@
</span><span class="cx"> requestFromDelegate(mainResourceRequest, mainResourceIdentifier, mainResouceError);
</span><span class="cx"> notifier().dispatchDidReceiveResponse(cachedPage->documentLoader(), mainResourceIdentifier, cachedPage->documentLoader()->response());
</span><span class="cx">
</span><ins>+ Optional<HasInsecureContent> hasInsecureContent = cachedPage->cachedMainFrame()->hasInsecureContent();
+
</ins><span class="cx"> // FIXME: This API should be turned around so that we ground CachedPage into the Page.
</span><span class="cx"> cachedPage->restore(*m_frame.page());
</span><span class="cx">
</span><del>- dispatchDidCommitLoad();
</del><ins>+ dispatchDidCommitLoad(hasInsecureContent);
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> m_frame.page()->chrome().setDispatchViewportDataDidChangeSuppressed(false);
</span><span class="cx"> m_frame.page()->chrome().dispatchViewportPropertiesDidChange(m_frame.page()->viewportArguments());
</span><span class="lines">@@ -3532,12 +3534,12 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FrameLoader::dispatchDidCommitLoad()
</del><ins>+void FrameLoader::dispatchDidCommitLoad(Optional<HasInsecureContent> initialHasInsecureContent)
</ins><span class="cx"> {
</span><span class="cx"> if (m_stateMachine.creatingInitialEmptyDocument())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_client.dispatchDidCommitLoad();
</del><ins>+ m_client.dispatchDidCommitLoad(initialHasInsecureContent);
</ins><span class="cx">
</span><span class="cx"> if (m_frame.isMainFrame()) {
</span><span class="cx"> m_frame.page()->resetSeenPlugins();
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.h (206005 => 206006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.h 2016-09-16 00:20:03 UTC (rev 206005)
+++ trunk/Source/WebCore/loader/FrameLoader.h 2016-09-16 00:27:11 UTC (rev 206006)
</span><span class="lines">@@ -50,6 +50,7 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class Archive;
</span><ins>+class CachedFrame;
</ins><span class="cx"> class CachedFrameBase;
</span><span class="cx"> class CachedPage;
</span><span class="cx"> class CachedResource;
</span><span class="lines">@@ -350,7 +351,7 @@
</span><span class="cx">
</span><span class="cx"> bool shouldReloadToHandleUnreachableURL(DocumentLoader*);
</span><span class="cx">
</span><del>- void dispatchDidCommitLoad();
</del><ins>+ void dispatchDidCommitLoad(Optional<HasInsecureContent> initialHasInsecureContent);
</ins><span class="cx">
</span><span class="cx"> void urlSelected(const FrameLoadRequest&, Event*);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoaderClient.h (206005 => 206006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoaderClient.h 2016-09-16 00:20:03 UTC (rev 206005)
+++ trunk/Source/WebCore/loader/FrameLoaderClient.h 2016-09-16 00:27:11 UTC (rev 206006)
</span><span class="lines">@@ -164,7 +164,7 @@
</span><span class="cx"> virtual void dispatchDidReceiveIcon() = 0;
</span><span class="cx"> virtual void dispatchDidStartProvisionalLoad() = 0;
</span><span class="cx"> virtual void dispatchDidReceiveTitle(const StringWithDirection&) = 0;
</span><del>- virtual void dispatchDidCommitLoad() = 0;
</del><ins>+ virtual void dispatchDidCommitLoad(Optional<HasInsecureContent>) = 0;
</ins><span class="cx"> virtual void dispatchDidFailProvisionalLoad(const ResourceError&) = 0;
</span><span class="cx"> virtual void dispatchDidFailLoad(const ResourceError&) = 0;
</span><span class="cx"> virtual void dispatchDidFinishDocumentLoad() = 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoaderTypesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoaderTypes.h (206005 => 206006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoaderTypes.h 2016-09-16 00:20:03 UTC (rev 206005)
+++ trunk/Source/WebCore/loader/FrameLoaderTypes.h 2016-09-16 00:27:11 UTC (rev 206006)
</span><span class="lines">@@ -129,4 +129,9 @@
</span><span class="cx"> No
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+enum class HasInsecureContent {
+ Yes,
+ No,
+};
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (206005 => 206006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-09-16 00:20:03 UTC (rev 206005)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-09-16 00:27:11 UTC (rev 206006)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-09-15 Brady Eidson <beidson@apple.com>
+
+ WKWebView.hasOnlySecureContent always returns "YES" after going back to a CachedPage (even if it has http resources).
+ <rdar://problem/27681261> and https://bugs.webkit.org/show_bug.cgi?id=162043
+
+ Reviewed by Brent Fulgham.
+
+ * WebCoreSupport/WebFrameLoaderClient.h:
+ * WebCoreSupport/WebFrameLoaderClient.mm:
+ (WebFrameLoaderClient::dispatchDidCommitLoad):
+
</ins><span class="cx"> 2016-09-15 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> This was supposed to be committed with the previous patch!
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h (206005 => 206006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h 2016-09-16 00:20:03 UTC (rev 206005)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h 2016-09-16 00:27:11 UTC (rev 206006)
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx"> void dispatchDidReceiveIcon() override;
</span><span class="cx"> void dispatchDidStartProvisionalLoad() override;
</span><span class="cx"> void dispatchDidReceiveTitle(const WebCore::StringWithDirection&) override;
</span><del>- void dispatchDidCommitLoad() override;
</del><ins>+ void dispatchDidCommitLoad(Optional<WebCore::HasInsecureContent>) override;
</ins><span class="cx"> void dispatchDidFailProvisionalLoad(const WebCore::ResourceError&) override;
</span><span class="cx"> void dispatchDidFailLoad(const WebCore::ResourceError&) override;
</span><span class="cx"> void dispatchDidFinishDocumentLoad() override;
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm (206005 => 206006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2016-09-16 00:20:03 UTC (rev 206005)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2016-09-16 00:27:11 UTC (rev 206006)
</span><span class="lines">@@ -690,7 +690,7 @@
</span><span class="cx"> CallFrameLoadDelegate(implementations->didReceiveTitleForFrameFunc, webView, @selector(webView:didReceiveTitle:forFrame:), (NSString *)title.string(), m_webFrame.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebFrameLoaderClient::dispatchDidCommitLoad()
</del><ins>+void WebFrameLoaderClient::dispatchDidCommitLoad(Optional<HasInsecureContent>)
</ins><span class="cx"> {
</span><span class="cx"> // Tell the client we've committed this URL.
</span><span class="cx"> ASSERT([m_webFrame->_private->webFrameView documentView] != nil);
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (206005 => 206006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2016-09-16 00:20:03 UTC (rev 206005)
+++ trunk/Source/WebKit/win/ChangeLog 2016-09-16 00:27:11 UTC (rev 206006)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-09-15 Brady Eidson <beidson@apple.com>
+
+ WKWebView.hasOnlySecureContent always returns "YES" after going back to a CachedPage (even if it has http resources).
+ <rdar://problem/27681261> and https://bugs.webkit.org/show_bug.cgi?id=162043
+
+ Reviewed by Brent Fulgham.
+
+ * WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebFrameLoaderClient::dispatchDidCommitLoad):
+ * WebCoreSupport/WebFrameLoaderClient.h:
+
</ins><span class="cx"> 2016-09-07 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Add CatchScope and force all exception checks to be via ThrowScope or CatchScope.
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebFrameLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp (206005 => 206006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp 2016-09-16 00:20:03 UTC (rev 206005)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp 2016-09-16 00:27:11 UTC (rev 206006)
</span><span class="lines">@@ -423,7 +423,7 @@
</span><span class="cx"> frameLoadDelegate->didReceiveTitle(webView, BString(title.string()), m_webFrame);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebFrameLoaderClient::dispatchDidCommitLoad()
</del><ins>+void WebFrameLoaderClient::dispatchDidCommitLoad(Optional<HasInsecureContent>)
</ins><span class="cx"> {
</span><span class="cx"> WebView* webView = m_webFrame->webView();
</span><span class="cx"> COMPtr<IWebFrameLoadDelegate> frameLoadDelegate;
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h (206005 => 206006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h 2016-09-16 00:20:03 UTC (rev 206005)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h 2016-09-16 00:27:11 UTC (rev 206006)
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> void dispatchDidReceiveIcon() override;
</span><span class="cx"> void dispatchDidStartProvisionalLoad() override;
</span><span class="cx"> void dispatchDidReceiveTitle(const WebCore::StringWithDirection&) override;
</span><del>- void dispatchDidCommitLoad() override;
</del><ins>+ void dispatchDidCommitLoad(Optional<WebCore::HasInsecureContent>) override;
</ins><span class="cx"> void dispatchDidFailProvisionalLoad(const WebCore::ResourceError&) override;
</span><span class="cx"> void dispatchDidFailLoad(const WebCore::ResourceError&) override;
</span><span class="cx"> void dispatchDidFinishDocumentLoad() override;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (206005 => 206006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-09-16 00:20:03 UTC (rev 206005)
+++ trunk/Source/WebKit2/ChangeLog 2016-09-16 00:27:11 UTC (rev 206006)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2016-09-15 Brady Eidson <beidson@apple.com>
+
+ WKWebView.hasOnlySecureContent always returns "YES" after going back to a CachedPage (even if it has http resources).
+ <rdar://problem/27681261> and https://bugs.webkit.org/show_bug.cgi?id=162043
+
+ Reviewed by Brent Fulgham.
+
+ * Scripts/webkit/messages.py:
+ (headers_for_type): Add a custom header, and alphabetize existing ones.
+
+ * Shared/WebCoreArgumentCoders.h: Add EnumTraits for HasInsecureContent.
+
+ * UIProcess/PageLoadState.h:
+ (WebKit::PageLoadState::committedHasInsecureContent):
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::hasInsecureContent):
+ (WebKit::WebPageProxy::didCommitLoadForFrame): If the WebProcess included an existing "HasInsecureContent" value, use it.
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebPageProxy.messages.in:
+
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::dispatchDidCommitLoad):
+ (WebKit::WebFrameLoaderClient::savePlatformDataToCachedFrame): Save the "HasInsecureContent" value to the CachedFrame in
+ case we restore it in the future.
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
+
</ins><span class="cx"> 2016-09-15 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Actually assign the decoded enum value to the output value
</span></span></pre></div>
<a id="trunkSourceWebKit2Scriptswebkitmessagespy"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Scripts/webkit/messages.py (206005 => 206006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Scripts/webkit/messages.py 2016-09-16 00:20:03 UTC (rev 206005)
+++ trunk/Source/WebKit2/Scripts/webkit/messages.py 2016-09-16 00:27:11 UTC (rev 206006)
</span><span class="lines">@@ -349,21 +349,23 @@
</span><span class="cx"> 'String': ['<wtf/text/WTFString.h>'],
</span><span class="cx"> 'WebCore::CompositionUnderline': ['<WebCore/Editor.h>'],
</span><span class="cx"> 'WebCore::ExceptionDetails': ['<WebCore/JSDOMBinding.h>'],
</span><ins>+ 'WebCore::FileChooserSettings': ['<WebCore/FileChooser.h>'],
</ins><span class="cx"> 'WebCore::GrammarDetail': ['<WebCore/TextCheckerClient.h>'],
</span><del>- 'WebCore::TextureMapperAnimations': ['<WebCore/TextureMapperAnimation.h>'],
</del><ins>+ 'WebCore::HasInsecureContent': ['<WebCore/FrameLoaderTypes.h>'],
+ 'WebCore::Highlight': ['<WebCore/InspectorOverlay.h>'],
</ins><span class="cx"> 'WebCore::KeyframeValueList': ['<WebCore/GraphicsLayer.h>'],
</span><span class="cx"> 'WebCore::KeypressCommand': ['<WebCore/KeyboardEvent.h>'],
</span><del>- 'WebCore::FileChooserSettings': ['<WebCore/FileChooser.h>'],
- 'WebCore::Highlight': ['<WebCore/InspectorOverlay.h>'],
- 'WebCore::PluginInfo': ['<WebCore/PluginData.h>'],
</del><span class="cx"> 'WebCore::PasteboardImage': ['<WebCore/Pasteboard.h>'],
</span><span class="cx"> 'WebCore::PasteboardWebContent': ['<WebCore/Pasteboard.h>'],
</span><ins>+ 'WebCore::PluginInfo': ['<WebCore/PluginData.h>'],
</ins><span class="cx"> 'WebCore::RecentSearch': ['<WebCore/SearchPopupMenu.h>'],
</span><span class="cx"> 'WebCore::TextCheckingRequestData': ['<WebCore/TextChecking.h>'],
</span><span class="cx"> 'WebCore::TextCheckingResult': ['<WebCore/TextCheckerClient.h>'],
</span><span class="cx"> 'WebCore::TextIndicatorData': ['<WebCore/TextIndicator.h>'],
</span><ins>+ 'WebCore::TextureMapperAnimations': ['<WebCore/TextureMapperAnimation.h>'],
</ins><span class="cx"> 'WebCore::ViewportAttributes': ['<WebCore/ViewportArguments.h>'],
</span><span class="cx"> 'WebKit::BackForwardListItemState': ['"SessionState.h"'],
</span><ins>+ 'WebKit::LayerHostingMode': ['"LayerTreeContext.h"'],
</ins><span class="cx"> 'WebKit::PageState': ['"SessionState.h"'],
</span><span class="cx"> 'WebKit::WebGestureEvent': ['"WebEvent.h"'],
</span><span class="cx"> 'WebKit::WebKeyboardEvent': ['"WebEvent.h"'],
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebCoreArgumentCodersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h (206005 => 206006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h 2016-09-16 00:20:03 UTC (rev 206005)
+++ trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h 2016-09-16 00:27:11 UTC (rev 206006)
</span><span class="lines">@@ -23,10 +23,10 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef WebCoreArgumentCoders_h
-#define WebCoreArgumentCoders_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "ArgumentCoders.h"
</span><ins>+#include <WebCore/FrameLoaderTypes.h>
</ins><span class="cx"> #include <WebCore/PaymentHeaders.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -530,4 +530,14 @@
</span><span class="cx">
</span><span class="cx"> } // namespace IPC
</span><span class="cx">
</span><del>-#endif // WebCoreArgumentCoders_h
</del><ins>+namespace WTF {
+
+template<> struct EnumTraits<WebCore::HasInsecureContent> {
+ using values = EnumValues<
+ WebCore::HasInsecureContent,
+ WebCore::HasInsecureContent::No,
+ WebCore::HasInsecureContent::Yes
+ >;
+};
+
+} // namespace WTF
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPageLoadStateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/PageLoadState.h (206005 => 206006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/PageLoadState.h 2016-09-16 00:20:03 UTC (rev 206005)
+++ trunk/Source/WebKit2/UIProcess/PageLoadState.h 2016-09-16 00:27:11 UTC (rev 206006)
</span><span class="lines">@@ -165,6 +165,8 @@
</span><span class="cx"> void didFinishProgress(const Transaction::Token&);
</span><span class="cx"> void setNetworkRequestsInProgress(const Transaction::Token&, bool);
</span><span class="cx">
</span><ins>+ bool committedHasInsecureContent() const { return m_committedState.hasInsecureContent; }
+
</ins><span class="cx"> // FIXME: We piggy-back off PageLoadState::Observer so that both WKWebView and WKObservablePageState
</span><span class="cx"> // can listen for changes. Once we get rid of WKObservablePageState these could just be part of API::NavigationClient.
</span><span class="cx"> void willChangeProcessIsResponsive();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (206005 => 206006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-09-16 00:20:03 UTC (rev 206005)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-09-16 00:27:11 UTC (rev 206006)
</span><span class="lines">@@ -3106,6 +3106,11 @@
</span><span class="cx"> m_pageLoadState.setNetworkRequestsInProgress(transaction, networkRequestsInProgress);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebPageProxy::hasInsecureContent(HasInsecureContent& hasInsecureContent)
+{
+ hasInsecureContent = m_pageLoadState.committedHasInsecureContent() ? HasInsecureContent::Yes : HasInsecureContent::No;
+}
+
</ins><span class="cx"> void WebPageProxy::didDestroyNavigation(uint64_t navigationID)
</span><span class="cx"> {
</span><span class="cx"> PageClientProtector protector(m_pageClient);
</span><span class="lines">@@ -3242,7 +3247,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::didCommitLoadForFrame(uint64_t frameID, uint64_t navigationID, const String& mimeType, bool frameHasCustomContentProvider, uint32_t opaqueFrameLoadType, const WebCore::CertificateInfo& certificateInfo, bool containsPluginDocument, const UserData& userData)
</del><ins>+void WebPageProxy::didCommitLoadForFrame(uint64_t frameID, uint64_t navigationID, const String& mimeType, bool frameHasCustomContentProvider, uint32_t opaqueFrameLoadType, const WebCore::CertificateInfo& certificateInfo, bool containsPluginDocument, Optional<HasInsecureContent> hasInsecureContent, const UserData& userData)
</ins><span class="cx"> {
</span><span class="cx"> PageClientProtector protector(m_pageClient);
</span><span class="cx">
</span><span class="lines">@@ -3262,8 +3267,9 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> auto transaction = m_pageLoadState.transaction();
</span><del>- bool markPageInsecure = m_treatsSHA1CertificatesAsInsecure && certificateInfo.containsNonRootSHA1SignedCertificate();
</del><span class="cx"> Ref<WebCertificateInfo> webCertificateInfo = WebCertificateInfo::create(certificateInfo);
</span><ins>+ bool markPageInsecure = hasInsecureContent ? hasInsecureContent.value() == HasInsecureContent::Yes : m_treatsSHA1CertificatesAsInsecure && certificateInfo.containsNonRootSHA1SignedCertificate();
+
</ins><span class="cx"> if (frame->isMainFrame()) {
</span><span class="cx"> m_pageLoadState.didCommitLoad(transaction, webCertificateInfo, markPageInsecure);
</span><span class="cx"> m_suppressNavigationSnapshotting = false;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (206005 => 206006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2016-09-16 00:20:03 UTC (rev 206005)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2016-09-16 00:27:11 UTC (rev 206006)
</span><span class="lines">@@ -153,6 +153,7 @@
</span><span class="cx"> class RunLoopObserver;
</span><span class="cx"> class SharedBuffer;
</span><span class="cx"> class TextIndicator;
</span><ins>+enum class HasInsecureContent;
</ins><span class="cx"> struct DictionaryPopupInfo;
</span><span class="cx"> struct ExceptionDetails;
</span><span class="cx"> struct FileChooserSettings;
</span><span class="lines">@@ -1172,7 +1173,7 @@
</span><span class="cx"> void didReceiveServerRedirectForProvisionalLoadForFrame(uint64_t frameID, uint64_t navigationID, const String&, const UserData&);
</span><span class="cx"> void didChangeProvisionalURLForFrame(uint64_t frameID, uint64_t navigationID, const String& url);
</span><span class="cx"> void didFailProvisionalLoadForFrame(uint64_t frameID, const WebCore::SecurityOriginData& frameSecurityOrigin, uint64_t navigationID, const String& provisionalURL, const WebCore::ResourceError&, const UserData&);
</span><del>- void didCommitLoadForFrame(uint64_t frameID, uint64_t navigationID, const String& mimeType, bool frameHasCustomContentProvider, uint32_t frameLoadType, const WebCore::CertificateInfo&, bool containsPluginDocument, const UserData&);
</del><ins>+ void didCommitLoadForFrame(uint64_t frameID, uint64_t navigationID, const String& mimeType, bool frameHasCustomContentProvider, uint32_t frameLoadType, const WebCore::CertificateInfo&, bool containsPluginDocument, Optional<WebCore::HasInsecureContent> forcedHasInsecureContent, const UserData&);
</ins><span class="cx"> void didFinishDocumentLoadForFrame(uint64_t frameID, uint64_t navigationID, const UserData&);
</span><span class="cx"> void didFinishLoadForFrame(uint64_t frameID, uint64_t navigationID, const UserData&);
</span><span class="cx"> void didFailLoadForFrame(uint64_t frameID, uint64_t navigationID, const WebCore::ResourceError&, const UserData&);
</span><span class="lines">@@ -1190,6 +1191,8 @@
</span><span class="cx"> void didFinishProgress();
</span><span class="cx"> void setNetworkRequestsInProgress(bool);
</span><span class="cx">
</span><ins>+ void hasInsecureContent(WebCore::HasInsecureContent&);
+
</ins><span class="cx"> void didDestroyNavigation(uint64_t navigationID);
</span><span class="cx">
</span><span class="cx"> void decidePolicyForNavigationAction(uint64_t frameID, const WebCore::SecurityOriginData& frameSecurityOrigin, uint64_t navigationID, const NavigationActionData&, uint64_t originatingFrameID, const WebCore::SecurityOriginData& originatingFrameSecurityOrigin, const WebCore::ResourceRequest& originalRequest, const WebCore::ResourceRequest&, uint64_t listenerID, const UserData&, bool& receivedPolicyAction, uint64_t& newNavigationID, uint64_t& policyAction, DownloadID&);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in (206005 => 206006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2016-09-16 00:20:03 UTC (rev 206005)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2016-09-16 00:27:11 UTC (rev 206006)
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx"> DidReceiveServerRedirectForProvisionalLoadForFrame(uint64_t frameID, uint64_t navigationID, String url, WebKit::UserData userData)
</span><span class="cx"> DidChangeProvisionalURLForFrame(uint64_t frameID, uint64_t navigationID, String url)
</span><span class="cx"> DidFailProvisionalLoadForFrame(uint64_t frameID, struct WebCore::SecurityOriginData frameSecurityOrigin, uint64_t navigationID, String provisionalURL, WebCore::ResourceError error, WebKit::UserData userData)
</span><del>- DidCommitLoadForFrame(uint64_t frameID, uint64_t navigationID, String mimeType, bool hasCustomContentProvider, uint32_t loadType, WebCore::CertificateInfo certificateInfo, bool containsPluginDocument, WebKit::UserData userData)
</del><ins>+ DidCommitLoadForFrame(uint64_t frameID, uint64_t navigationID, String mimeType, bool hasCustomContentProvider, uint32_t loadType, WebCore::CertificateInfo certificateInfo, bool containsPluginDocument, Optional<WebCore::HasInsecureContent> forcedHasInsecureContent, WebKit::UserData userData)
</ins><span class="cx"> DidFailLoadForFrame(uint64_t frameID, uint64_t navigationID, WebCore::ResourceError error, WebKit::UserData userData)
</span><span class="cx"> DidFinishDocumentLoadForFrame(uint64_t frameID, uint64_t navigationID, WebKit::UserData userData)
</span><span class="cx"> DidFinishLoadForFrame(uint64_t frameID, uint64_t navigationID, WebKit::UserData userData)
</span><span class="lines">@@ -140,6 +140,8 @@
</span><span class="cx"> DidSameDocumentNavigationForFrame(uint64_t frameID, uint64_t navigationID, uint32_t type, String url, WebKit::UserData userData)
</span><span class="cx"> DidDestroyNavigation(uint64_t navigationID)
</span><span class="cx">
</span><ins>+ HasInsecureContent() -> (enum WebCore::HasInsecureContent hasInsecureContent)
+
</ins><span class="cx"> MainFramePluginHandlesPageScaleGestureDidChange(bool mainFramePluginHandlesPageScaleGesture)
</span><span class="cx">
</span><span class="cx"> FrameDidBecomeFrameSet(uint64_t frameID, bool value)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (206005 => 206006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2016-09-16 00:20:03 UTC (rev 206005)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2016-09-16 00:27:11 UTC (rev 206006)
</span><span class="lines">@@ -55,6 +55,7 @@
</span><span class="cx"> #include "WebProcessPoolMessages.h"
</span><span class="cx"> #include <JavaScriptCore/APICast.h>
</span><span class="cx"> #include <JavaScriptCore/JSObject.h>
</span><ins>+#include <WebCore/CachedFrame.h>
</ins><span class="cx"> #include <WebCore/CertificateInfo.h>
</span><span class="cx"> #include <WebCore/Chrome.h>
</span><span class="cx"> #include <WebCore/DOMWrapperWorld.h>
</span><span class="lines">@@ -438,7 +439,7 @@
</span><span class="cx"> webPage->send(Messages::WebPageProxy::DidReceiveTitleForFrame(m_frame->frameID(), title.string(), UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebFrameLoaderClient::dispatchDidCommitLoad()
</del><ins>+void WebFrameLoaderClient::dispatchDidCommitLoad(Optional<HasInsecureContent> hasInsecureContent)
</ins><span class="cx"> {
</span><span class="cx"> WebPage* webPage = m_frame->page();
</span><span class="cx"> if (!webPage)
</span><span class="lines">@@ -453,8 +454,7 @@
</span><span class="cx"> webPage->sandboxExtensionTracker().didCommitProvisionalLoad(m_frame);
</span><span class="cx">
</span><span class="cx"> // Notify the UIProcess.
</span><del>-
- webPage->send(Messages::WebPageProxy::DidCommitLoadForFrame(m_frame->frameID(), documentLoader.navigationID(), documentLoader.response().mimeType(), m_frameHasCustomContentProvider, static_cast<uint32_t>(m_frame->coreFrame()->loader().loadType()), documentLoader.response().certificateInfo().valueOrCompute([] { return CertificateInfo(); }), m_frame->coreFrame()->document()->isPluginDocument(), UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
</del><ins>+ webPage->send(Messages::WebPageProxy::DidCommitLoadForFrame(m_frame->frameID(), documentLoader.navigationID(), documentLoader.response().mimeType(), m_frameHasCustomContentProvider, static_cast<uint32_t>(m_frame->coreFrame()->loader().loadType()), documentLoader.response().certificateInfo().valueOrCompute([] { return CertificateInfo(); }), m_frame->coreFrame()->document()->isPluginDocument(), hasInsecureContent, UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
</ins><span class="cx"> webPage->didCommitLoad(m_frame);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1281,8 +1281,15 @@
</span><span class="cx"> return webPage->userAgent(m_frame, url);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebFrameLoaderClient::savePlatformDataToCachedFrame(CachedFrame*)
</del><ins>+void WebFrameLoaderClient::savePlatformDataToCachedFrame(CachedFrame* cachedFrame)
</ins><span class="cx"> {
</span><ins>+ WebPage* webPage = m_frame->page();
+ if (!webPage)
+ return;
+
+ HasInsecureContent hasInsecureContent;
+ if (webPage->sendSync(Messages::WebPageProxy::HasInsecureContent(), Messages::WebPageProxy::HasInsecureContent::Reply(hasInsecureContent)))
+ cachedFrame->setHasInsecureContent(hasInsecureContent);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebFrameLoaderClient::transitionToCommittedFromCachedFrame(CachedFrame*)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h (206005 => 206006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h 2016-09-16 00:20:03 UTC (rev 206005)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h 2016-09-16 00:27:11 UTC (rev 206006)
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> void dispatchDidReceiveIcon() override;
</span><span class="cx"> void dispatchDidStartProvisionalLoad() override;
</span><span class="cx"> void dispatchDidReceiveTitle(const WebCore::StringWithDirection&) override;
</span><del>- void dispatchDidCommitLoad() override;
</del><ins>+ void dispatchDidCommitLoad(Optional<WebCore::HasInsecureContent>) override;
</ins><span class="cx"> void dispatchDidFailProvisionalLoad(const WebCore::ResourceError&) override;
</span><span class="cx"> void dispatchDidFailLoad(const WebCore::ResourceError&) override;
</span><span class="cx"> void dispatchDidFinishDocumentLoad() override;
</span></span></pre>
</div>
</div>
</body>
</html>