<!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>[199673] trunk</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/199673">199673</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2016-04-18 09:45:35 -0700 (Mon, 18 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Source/WebCore:
CSP: Remove stubs for dynamically-added favicons (via link rel="icon")
https://bugs.webkit.org/show_bug.cgi?id=153151
<rdar://problem/24383176>
Reviewed by Darin Adler.
Remove the unused dynamic favicon code and tests.
* loader/EmptyClients.h:
* loader/FrameLoaderClient.h:
* loader/LinkLoader.cpp:
(WebCore::LinkLoader::loadLink):
Source/WebKit/mac:
CSP: Remove stubs for dynamically-added favicons (via link rel="icon")
https://bugs.webkit.org/show_bug.cgi?id=153151
<rdar://problem/24383176>
Reviewed by Darin Adler.
Remove the unused dynamic favicon code and tests.
* WebCoreSupport/WebFrameLoaderClient.h:
* WebCoreSupport/WebFrameLoaderClient.mm:
(WebFrameLoaderClient::dispatchDidChangeIcons): Deleted.
Source/WebKit/win:
CSP: Make dynamically-added favicons (via link rel="icon") obey Content-Security-Policy
https://bugs.webkit.org/show_bug.cgi?id=153151
<rdar://problem/24383176>
Reviewed by Darin Adler.
Remove the unused dynamic favicon code and tests.
* WebCoreSupport/WebFrameLoaderClient.cpp:
(WebFrameLoaderClient::dispatchDidChangeIcons): Deleted.
* WebCoreSupport/WebFrameLoaderClient.h:
Source/WebKit2:
CSP: Remove stubs for dynamically-added favicons (via link rel="icon")
https://bugs.webkit.org/show_bug.cgi?id=153151
<rdar://problem/24383176>
Reviewed by Darin Adler.
Remove the unused dynamic favicon code and tests.
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::dispatchDidChangeIcons): Deleted.
* WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
LayoutTests:
CSP: Remove stubs for dynamically-added favicons (via link rel="icon")
https://bugs.webkit.org/show_bug.cgi?id=153151
<rdar://problem/24383176>
Reviewed by Darin Adler.
Remove the unused dynamic favicon code and tests.
* TestExpectations:
* http/tests/security/contentSecurityPolicy/icon-allowed-expected.txt: Removed.
* http/tests/security/contentSecurityPolicy/icon-allowed.html: Removed.
* http/tests/security/contentSecurityPolicy/icon-blocked-expected.txt: Removed.
* http/tests/security/contentSecurityPolicy/icon-blocked.html: Removed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsTestExpectations">trunk/LayoutTests/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderEmptyClientsh">trunk/Source/WebCore/loader/EmptyClients.h</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoaderClienth">trunk/Source/WebCore/loader/FrameLoaderClient.h</a></li>
<li><a href="#trunkSourceWebCoreloaderLinkLoadercpp">trunk/Source/WebCore/loader/LinkLoader.cpp</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="#trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClienth">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestssecuritycontentSecurityPolicyiconallowedexpectedtxt">trunk/LayoutTests/http/tests/security/contentSecurityPolicy/icon-allowed-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritycontentSecurityPolicyiconallowedhtml">trunk/LayoutTests/http/tests/security/contentSecurityPolicy/icon-allowed.html</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritycontentSecurityPolicyiconblockedexpectedtxt">trunk/LayoutTests/http/tests/security/contentSecurityPolicy/icon-blocked-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritycontentSecurityPolicyiconblockedhtml">trunk/LayoutTests/http/tests/security/contentSecurityPolicy/icon-blocked.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (199672 => 199673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-04-18 16:14:36 UTC (rev 199672)
+++ trunk/LayoutTests/ChangeLog 2016-04-18 16:45:35 UTC (rev 199673)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-04-18 Brent Fulgham <bfulgham@apple.com>
+
+ CSP: Remove stubs for dynamically-added favicons (via link rel="icon")
+ https://bugs.webkit.org/show_bug.cgi?id=153151
+ <rdar://problem/24383176>
+
+ Reviewed by Darin Adler.
+
+ Remove the unused dynamic favicon code and tests.
+
+ * TestExpectations:
+ * http/tests/security/contentSecurityPolicy/icon-allowed-expected.txt: Removed.
+ * http/tests/security/contentSecurityPolicy/icon-allowed.html: Removed.
+ * http/tests/security/contentSecurityPolicy/icon-blocked-expected.txt: Removed.
+ * http/tests/security/contentSecurityPolicy/icon-blocked.html: Removed.
+
</ins><span class="cx"> 2016-04-18 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> Media element "user gesture for fullscreen" restriction is never lifted
</span></span></pre></div>
<a id="trunkLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/TestExpectations (199672 => 199673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/TestExpectations 2016-04-18 16:14:36 UTC (rev 199672)
+++ trunk/LayoutTests/TestExpectations 2016-04-18 16:45:35 UTC (rev 199673)
</span><span class="lines">@@ -811,8 +811,6 @@
</span><span class="cx"> webkit.org/b/153150 http/tests/security/contentSecurityPolicy/1.1/child-src/frame-fires-load-event-when-blocked.html
</span><span class="cx"> webkit.org/b/153150 http/tests/security/contentSecurityPolicy/1.1/child-src/frame-fires-load-event-when-redirect-blocked.html
</span><span class="cx"> webkit.org/b/153150 http/tests/security/contentSecurityPolicy/frame-src-cross-origin-load.html
</span><del>-webkit.org/b/153151 http/tests/security/contentSecurityPolicy/icon-allowed.html [ Failure ]
-webkit.org/b/153151 http/tests/security/contentSecurityPolicy/icon-blocked.html [ Failure ]
</del><span class="cx"> webkit.org/b/153152 http/tests/security/contentSecurityPolicy/manifest-src-allowed.html # Needs testRunner.getManifestThen()
</span><span class="cx"> webkit.org/b/153152 http/tests/security/contentSecurityPolicy/manifest-src-blocked.html # Needs testRunner.getManifestThen()
</span><span class="cx"> webkit.org/b/153155 http/tests/security/contentSecurityPolicy/1.1/scripthash-basic-blocked-error-event.html
</span></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritycontentSecurityPolicyiconallowedexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/http/tests/security/contentSecurityPolicy/icon-allowed-expected.txt (199672 => 199673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/contentSecurityPolicy/icon-allowed-expected.txt 2016-04-18 16:14:36 UTC (rev 199672)
+++ trunk/LayoutTests/http/tests/security/contentSecurityPolicy/icon-allowed-expected.txt 2016-04-18 16:45:35 UTC (rev 199673)
</span><span class="lines">@@ -1,2 +0,0 @@
</span><del>-main frame - didChangeIcons
-Use callbacks to show that favicons are loaded as allowed by CSP when link tags are dynamically added to the page.
</del></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritycontentSecurityPolicyiconallowedhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/http/tests/security/contentSecurityPolicy/icon-allowed.html (199672 => 199673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/contentSecurityPolicy/icon-allowed.html 2016-04-18 16:14:36 UTC (rev 199672)
+++ trunk/LayoutTests/http/tests/security/contentSecurityPolicy/icon-allowed.html 2016-04-18 16:45:35 UTC (rev 199673)
</span><span class="lines">@@ -1,27 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<meta http-equiv="Content-Security-Policy" content="img-src http://localhost:8000"/>
-<script>
-if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
- testRunner.dumpResourceLoadCallbacks();
- testRunner.dumpIconChanges();
-}
-
-function createLink(rel, src) {
- var link = document.createElement('link');
- link.rel = rel;
- link.href = src;
- document.head.appendChild(link);
-}
-
-window.addEventListener('DOMContentLoaded', function() {
- createLink('icon', 'http://localhost:8000/foo?q=from_icon');
- if (window.testRunner) {
- testRunner.notifyDone();
- }
-});
-</script>
-<p>Use callbacks to show that favicons are loaded as allowed by CSP when link tags are dynamically added to the page.</p>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritycontentSecurityPolicyiconblockedexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/http/tests/security/contentSecurityPolicy/icon-blocked-expected.txt (199672 => 199673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/contentSecurityPolicy/icon-blocked-expected.txt 2016-04-18 16:14:36 UTC (rev 199672)
+++ trunk/LayoutTests/http/tests/security/contentSecurityPolicy/icon-blocked-expected.txt 2016-04-18 16:45:35 UTC (rev 199673)
</span><span class="lines">@@ -1,3 +0,0 @@
</span><del>-CONSOLE MESSAGE: Refused to load the image 'http://localhost/foo?q=from_icon' because it violates the following Content Security Policy directive: "img-src 'none'".
-
-Use callbacks to show that favicons are not loaded in violation of CSP when link tags are dynamically added to the page.
</del></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritycontentSecurityPolicyiconblockedhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/http/tests/security/contentSecurityPolicy/icon-blocked.html (199672 => 199673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/contentSecurityPolicy/icon-blocked.html 2016-04-18 16:14:36 UTC (rev 199672)
+++ trunk/LayoutTests/http/tests/security/contentSecurityPolicy/icon-blocked.html 2016-04-18 16:45:35 UTC (rev 199673)
</span><span class="lines">@@ -1,27 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<meta http-equiv="Content-Security-Policy" content="img-src 'none'"/>
-<script>
-if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
- testRunner.dumpResourceLoadCallbacks();
- testRunner.dumpIconChanges();
-}
-
-function createLink(rel, src) {
- var link = document.createElement('link');
- link.rel = rel;
- link.href = src;
- document.head.appendChild(link);
-}
-
-window.addEventListener('DOMContentLoaded', function() {
- createLink('icon', 'http://localhost:8000/foo?q=from_icon');
- if (window.testRunner) {
- testRunner.notifyDone();
- }
-});
-</script>
-<p>Use callbacks to show that favicons are not loaded in violation of CSP when link tags are dynamically added to the page.</p>
-</html>
</del></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (199672 => 199673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-18 16:14:36 UTC (rev 199672)
+++ trunk/Source/WebCore/ChangeLog 2016-04-18 16:45:35 UTC (rev 199673)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-04-18 Brent Fulgham <bfulgham@apple.com>
+
+ CSP: Remove stubs for dynamically-added favicons (via link rel="icon")
+ https://bugs.webkit.org/show_bug.cgi?id=153151
+ <rdar://problem/24383176>
+
+ Reviewed by Darin Adler.
+
+ Remove the unused dynamic favicon code and tests.
+
+ * loader/EmptyClients.h:
+ * loader/FrameLoaderClient.h:
+ * loader/LinkLoader.cpp:
+ (WebCore::LinkLoader::loadLink):
+
</ins><span class="cx"> 2016-04-15 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac][EME] Protected content over HLS is not notified when a HDCP violation occurs.
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderEmptyClientsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/EmptyClients.h (199672 => 199673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/EmptyClients.h 2016-04-18 16:14:36 UTC (rev 199672)
+++ trunk/Source/WebCore/loader/EmptyClients.h 2016-04-18 16:45:35 UTC (rev 199673)
</span><span class="lines">@@ -294,7 +294,6 @@
</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 dispatchDidChangeIcons(IconType) override { }
</del><span class="cx"> void dispatchDidCommitLoad() override { }
</span><span class="cx"> void dispatchDidFailProvisionalLoad(const ResourceError&) override { }
</span><span class="cx"> void dispatchDidFailLoad(const ResourceError&) override { }
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoaderClient.h (199672 => 199673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoaderClient.h 2016-04-18 16:14:36 UTC (rev 199672)
+++ trunk/Source/WebCore/loader/FrameLoaderClient.h 2016-04-18 16:45:35 UTC (rev 199673)
</span><span class="lines">@@ -168,7 +168,6 @@
</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 dispatchDidChangeIcons(IconType) = 0;
</del><span class="cx"> virtual void dispatchDidCommitLoad() = 0;
</span><span class="cx"> virtual void dispatchDidFailProvisionalLoad(const ResourceError&) = 0;
</span><span class="cx"> virtual void dispatchDidFailLoad(const ResourceError&) = 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderLinkLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/LinkLoader.cpp (199672 => 199673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/LinkLoader.cpp 2016-04-18 16:14:36 UTC (rev 199672)
+++ trunk/Source/WebCore/loader/LinkLoader.cpp 2016-04-18 16:45:35 UTC (rev 199673)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2011 Google Inc. All rights reserved.
</span><ins>+ * Copyright (C) 2016 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions are
</span><span class="lines">@@ -140,8 +141,6 @@
</span><span class="cx"> if (relAttribute.iconType != InvalidIcon && href.isValid() && !href.isEmpty()) {
</span><span class="cx"> if (!m_client.shouldLoadLink())
</span><span class="cx"> return false;
</span><del>- if (Frame* frame = document.frame())
- frame->loader().client().dispatchDidChangeIcons(relAttribute.iconType);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (relAttribute.isDNSPrefetch) {
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (199672 => 199673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-04-18 16:14:36 UTC (rev 199672)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-04-18 16:45:35 UTC (rev 199673)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-04-18 Brent Fulgham <bfulgham@apple.com>
+
+ CSP: Remove stubs for dynamically-added favicons (via link rel="icon")
+ https://bugs.webkit.org/show_bug.cgi?id=153151
+ <rdar://problem/24383176>
+
+ Reviewed by Darin Adler.
+
+ Remove the unused dynamic favicon code and tests.
+
+ * WebCoreSupport/WebFrameLoaderClient.h:
+ * WebCoreSupport/WebFrameLoaderClient.mm:
+ (WebFrameLoaderClient::dispatchDidChangeIcons): Deleted.
+
</ins><span class="cx"> 2016-04-15 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Reduce use of Deprecated::ScriptXXX classes
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h (199672 => 199673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h 2016-04-18 16:14:36 UTC (rev 199672)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h 2016-04-18 16:45:35 UTC (rev 199673)
</span><span class="lines">@@ -112,7 +112,6 @@
</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 dispatchDidChangeIcons(WebCore::IconType) override;
</del><span class="cx"> void dispatchDidCommitLoad() override;
</span><span class="cx"> void dispatchDidFailProvisionalLoad(const WebCore::ResourceError&) override;
</span><span class="cx"> void dispatchDidFailLoad(const WebCore::ResourceError&) override;
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm (199672 => 199673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2016-04-18 16:14:36 UTC (rev 199672)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2016-04-18 16:45:35 UTC (rev 199673)
</span><span class="lines">@@ -702,11 +702,6 @@
</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::dispatchDidChangeIcons(WebCore::IconType)
-{
- // FIXME: Implement this to allow container to update favicon.
-}
-
</del><span class="cx"> void WebFrameLoaderClient::dispatchDidCommitLoad()
</span><span class="cx"> {
</span><span class="cx"> // Tell the client we've committed this URL.
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (199672 => 199673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2016-04-18 16:14:36 UTC (rev 199672)
+++ trunk/Source/WebKit/win/ChangeLog 2016-04-18 16:45:35 UTC (rev 199673)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-04-15 Brent Fulgham <bfulgham@apple.com>
+
+ CSP: Make dynamically-added favicons (via link rel="icon") obey Content-Security-Policy
+ https://bugs.webkit.org/show_bug.cgi?id=153151
+ <rdar://problem/24383176>
+
+ Reviewed by Darin Adler.
+
+ Remove the unused dynamic favicon code and tests.
+
+ * WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebFrameLoaderClient::dispatchDidChangeIcons): Deleted.
+ * WebCoreSupport/WebFrameLoaderClient.h:
+
</ins><span class="cx"> 2016-04-15 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Reduce use of Deprecated::ScriptXXX classes
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebFrameLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp (199672 => 199673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp 2016-04-18 16:14:36 UTC (rev 199672)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp 2016-04-18 16:45:35 UTC (rev 199673)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2006, 2007, 2008, 2009, 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2006-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -434,23 +434,6 @@
</span><span class="cx"> frameLoadDelegate->didReceiveTitle(webView, BString(title.string()), m_webFrame);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebFrameLoaderClient::dispatchDidChangeIcons(WebCore::IconType type)
-{
- if (type != WebCore::Favicon)
- return;
-
- WebView* webView = m_webFrame->webView();
- COMPtr<IWebFrameLoadDelegatePrivate> frameLoadDelegatePriv;
- if (FAILED(webView->frameLoadDelegatePrivate(&frameLoadDelegatePriv)) || !frameLoadDelegatePriv)
- return;
-
- COMPtr<IWebFrameLoadDelegatePrivate2> frameLoadDelegatePriv2(Query, frameLoadDelegatePriv);
- if (!frameLoadDelegatePriv2)
- return;
-
- frameLoadDelegatePriv2->didChangeIcons(webView, m_webFrame);
-}
-
</del><span class="cx"> void WebFrameLoaderClient::dispatchDidCommitLoad()
</span><span class="cx"> {
</span><span class="cx"> WebView* webView = m_webFrame->webView();
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h (199672 => 199673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h 2016-04-18 16:14:36 UTC (rev 199672)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h 2016-04-18 16:45:35 UTC (rev 199673)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2006, 2007, 2008, 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2006-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -88,7 +88,6 @@
</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 dispatchDidChangeIcons(WebCore::IconType) override;
</del><span class="cx"> void dispatchDidCommitLoad() override;
</span><span class="cx"> void dispatchDidFailProvisionalLoad(const WebCore::ResourceError&) override;
</span><span class="cx"> void dispatchDidFailLoad(const WebCore::ResourceError&) override;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (199672 => 199673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-04-18 16:14:36 UTC (rev 199672)
+++ trunk/Source/WebKit2/ChangeLog 2016-04-18 16:45:35 UTC (rev 199673)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-04-18 Brent Fulgham <bfulgham@apple.com>
+
+ CSP: Remove stubs for dynamically-added favicons (via link rel="icon")
+ https://bugs.webkit.org/show_bug.cgi?id=153151
+ <rdar://problem/24383176>
+
+ Reviewed by Darin Adler.
+
+ Remove the unused dynamic favicon code and tests.
+
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::dispatchDidChangeIcons): Deleted.
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
+
</ins><span class="cx"> 2016-04-18 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION( r199603): Pandora crashes WebKit in WebPlaybackSessionManager::removeClientForContext
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (199672 => 199673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2016-04-18 16:14:36 UTC (rev 199672)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2016-04-18 16:45:35 UTC (rev 199673)
</span><span class="lines">@@ -452,11 +452,6 @@
</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::dispatchDidChangeIcons(WebCore::IconType)
-{
- notImplemented();
-}
-
</del><span class="cx"> void WebFrameLoaderClient::dispatchDidCommitLoad()
</span><span class="cx"> {
</span><span class="cx"> WebPage* webPage = m_frame->page();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h (199672 => 199673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h 2016-04-18 16:14:36 UTC (rev 199672)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h 2016-04-18 16:45:35 UTC (rev 199673)
</span><span class="lines">@@ -98,7 +98,6 @@
</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 dispatchDidChangeIcons(WebCore::IconType) override;
</del><span class="cx"> void dispatchDidCommitLoad() override;
</span><span class="cx"> void dispatchDidFailProvisionalLoad(const WebCore::ResourceError&) override;
</span><span class="cx"> void dispatchDidFailLoad(const WebCore::ResourceError&) override;
</span></span></pre>
</div>
</div>
</body>
</html>