<!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>[200519] 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/200519">200519</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2016-05-06 13:38:55 -0700 (Fri, 06 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Tidy up the LinkRelAttribute code
https://bugs.webkit.org/show_bug.cgi?id=157429
Reviewed by Sam Weinig.
Get rid of IconURL.h and move the IconType enumeration inside LinkRelAttribute.
Remove the InvalidIcon enum declaration and use WTF::Optional instead.
* WebCore.xcodeproj/project.pbxproj:
* dom/IconURL.h: Removed.
* html/HTMLLinkElement.cpp:
(WebCore::HTMLLinkElement::iconType):
(WebCore::HTMLLinkElement::addSubresourceAttributeURLs):
* html/HTMLLinkElement.h:
* html/LinkRelAttribute.cpp:
(WebCore::LinkRelAttribute::LinkRelAttribute):
* html/LinkRelAttribute.h:
* html/parser/HTMLPreloadScanner.cpp:
(WebCore::TokenPreloadScanner::StartTagScanner::relAttributeIsStyleSheet):
* loader/FrameLoader.h:
* loader/FrameLoaderClient.h:
* loader/icon/IconController.cpp:
(WebCore::iconFromLinkElements):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLLinkElementcpp">trunk/Source/WebCore/html/HTMLLinkElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLLinkElementh">trunk/Source/WebCore/html/HTMLLinkElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlLinkRelAttributecpp">trunk/Source/WebCore/html/LinkRelAttribute.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlLinkRelAttributeh">trunk/Source/WebCore/html/LinkRelAttribute.h</a></li>
<li><a href="#trunkSourceWebCorehtmlparserHTMLPreloadScannercpp">trunk/Source/WebCore/html/parser/HTMLPreloadScanner.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="#trunkSourceWebCoreloadericonIconControllercpp">trunk/Source/WebCore/loader/icon/IconController.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoredomIconURLh">trunk/Source/WebCore/dom/IconURL.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (200518 => 200519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-06 20:37:16 UTC (rev 200518)
+++ trunk/Source/WebCore/ChangeLog 2016-05-06 20:38:55 UTC (rev 200519)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2016-05-06 Anders Carlsson <andersca@apple.com>
+
+ Tidy up the LinkRelAttribute code
+ https://bugs.webkit.org/show_bug.cgi?id=157429
+
+ Reviewed by Sam Weinig.
+
+ Get rid of IconURL.h and move the IconType enumeration inside LinkRelAttribute.
+ Remove the InvalidIcon enum declaration and use WTF::Optional instead.
+
+ * WebCore.xcodeproj/project.pbxproj:
+ * dom/IconURL.h: Removed.
+ * html/HTMLLinkElement.cpp:
+ (WebCore::HTMLLinkElement::iconType):
+ (WebCore::HTMLLinkElement::addSubresourceAttributeURLs):
+ * html/HTMLLinkElement.h:
+ * html/LinkRelAttribute.cpp:
+ (WebCore::LinkRelAttribute::LinkRelAttribute):
+ * html/LinkRelAttribute.h:
+ * html/parser/HTMLPreloadScanner.cpp:
+ (WebCore::TokenPreloadScanner::StartTagScanner::relAttributeIsStyleSheet):
+ * loader/FrameLoader.h:
+ * loader/FrameLoaderClient.h:
+ * loader/icon/IconController.cpp:
+ (WebCore::iconFromLinkElements):
+
</ins><span class="cx"> 2016-05-06 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> Muted media elements should be allowed to autoplay, even if RequireUserGestureForAudioRateChange is set.
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (200518 => 200519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-05-06 20:37:16 UTC (rev 200518)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-05-06 20:38:55 UTC (rev 200519)
</span><span class="lines">@@ -1729,7 +1729,6 @@
</span><span class="cx"> 45830D4E1679B4F800ACF8C3 /* AutoscrollController.h in Headers */ = {isa = PBXBuildFile; fileRef = 45830D4C1679B4F800ACF8C3 /* AutoscrollController.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 458FE4091589DF0B005609E6 /* RenderSearchField.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 458FE4071589DF0B005609E6 /* RenderSearchField.cpp */; };
</span><span class="cx"> 458FE40A1589DF0B005609E6 /* RenderSearchField.h in Headers */ = {isa = PBXBuildFile; fileRef = 458FE4081589DF0B005609E6 /* RenderSearchField.h */; };
</span><del>- 45BAC2B01360BBAB005DA258 /* IconURL.h in Headers */ = {isa = PBXBuildFile; fileRef = 45BAC2AF1360BBAB005DA258 /* IconURL.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx"> 45FEA5CF156DDE8C00654101 /* Decimal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 45FEA5CD156DDE8C00654101 /* Decimal.cpp */; };
</span><span class="cx"> 45FEA5D0156DDE8C00654101 /* Decimal.h in Headers */ = {isa = PBXBuildFile; fileRef = 45FEA5CE156DDE8C00654101 /* Decimal.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 4634592C1AC2271000ECB71C /* PowerObserverMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4634592B1AC2271000ECB71C /* PowerObserverMac.cpp */; };
</span><span class="lines">@@ -9272,7 +9271,6 @@
</span><span class="cx"> 45830D4C1679B4F800ACF8C3 /* AutoscrollController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AutoscrollController.h; sourceTree = "<group>"; };
</span><span class="cx"> 458FE4071589DF0B005609E6 /* RenderSearchField.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderSearchField.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 458FE4081589DF0B005609E6 /* RenderSearchField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderSearchField.h; sourceTree = "<group>"; };
</span><del>- 45BAC2AF1360BBAB005DA258 /* IconURL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IconURL.h; sourceTree = "<group>"; };
</del><span class="cx"> 45FEA5CD156DDE8C00654101 /* Decimal.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Decimal.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 45FEA5CE156DDE8C00654101 /* Decimal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Decimal.h; sourceTree = "<group>"; };
</span><span class="cx"> 4634592B1AC2271000ECB71C /* PowerObserverMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PowerObserverMac.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -24401,7 +24399,6 @@
</span><span class="cx"> 7C4189AB1B07C170000FA757 /* GlobalEventHandlers.idl */,
</span><span class="cx"> 2442BBF81194C9D300D49469 /* HashChangeEvent.h */,
</span><span class="cx"> 8482B7441198C32E00BFB005 /* HashChangeEvent.idl */,
</span><del>- 45BAC2AF1360BBAB005DA258 /* IconURL.h */,
</del><span class="cx"> C3CF17A015B0063F00276D39 /* IdTargetObserver.cpp */,
</span><span class="cx"> C3CF17A115B0063F00276D39 /* IdTargetObserver.h */,
</span><span class="cx"> C3CF17A215B0063F00276D39 /* IdTargetObserverRegistry.cpp */,
</span><span class="lines">@@ -26338,7 +26335,6 @@
</span><span class="cx"> 51E1ECBE0C91C90400DC255B /* IconDatabaseClient.h in Headers */,
</span><span class="cx"> 513F14540AB634C400094DDF /* IconLoader.h in Headers */,
</span><span class="cx"> 51E1ECC10C91C90400DC255B /* IconRecord.h in Headers */,
</span><del>- 45BAC2B01360BBAB005DA258 /* IconURL.h in Headers */,
</del><span class="cx"> 51BA4ACC1BBC5BDD00DF3D6D /* IDBBackingStore.h in Headers */,
</span><span class="cx"> C585A66311D4FAC5004C3E4B /* IDBBindingUtilities.h in Headers */,
</span><span class="cx"> 517B25AA1CC82B2A0061C011 /* IDBConnectionProxy.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebCoredomIconURLh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/dom/IconURL.h (200518 => 200519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/IconURL.h 2016-05-06 20:37:16 UTC (rev 200518)
+++ trunk/Source/WebCore/dom/IconURL.h 2016-05-06 20:38:55 UTC (rev 200519)
</span><span class="lines">@@ -1,48 +0,0 @@
</span><del>-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- * Copyright (C) 2015 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef IconURL_h
-#define IconURL_h
-
-// FIXME: Rename this header to IconType.h unless we bring back the concept of an "icon URL" structure.
-
-namespace WebCore {
-
-enum IconType {
- InvalidIcon = 0,
- Favicon = 1,
- TouchIcon = 1 << 1,
- TouchPrecomposedIcon = 1 << 2,
-};
-
-}
-
-#endif // IconURL_h
</del></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLLinkElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLLinkElement.cpp (200518 => 200519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLLinkElement.cpp 2016-05-06 20:37:16 UTC (rev 200518)
+++ trunk/Source/WebCore/html/HTMLLinkElement.cpp 2016-05-06 20:38:55 UTC (rev 200519)
</span><span class="lines">@@ -495,7 +495,7 @@
</span><span class="cx"> return getAttribute(typeAttr);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IconType HTMLLinkElement::iconType() const
</del><ins>+Optional<LinkRelAttribute::IconType> HTMLLinkElement::iconType() const
</ins><span class="cx"> {
</span><span class="cx"> return m_relAttribute.iconType;
</span><span class="cx"> }
</span><span class="lines">@@ -510,7 +510,7 @@
</span><span class="cx"> HTMLElement::addSubresourceAttributeURLs(urls);
</span><span class="cx">
</span><span class="cx"> // Favicons are handled by a special case in LegacyWebArchive::create()
</span><del>- if (m_relAttribute.iconType != InvalidIcon)
</del><ins>+ if (m_relAttribute.iconType)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (!m_relAttribute.isStyleSheet)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLLinkElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLLinkElement.h (200518 => 200519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLLinkElement.h 2016-05-06 20:37:16 UTC (rev 200518)
+++ trunk/Source/WebCore/html/HTMLLinkElement.h 2016-05-06 20:38:55 UTC (rev 200519)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx">
</span><span class="cx"> const AtomicString& type() const;
</span><span class="cx">
</span><del>- IconType iconType() const;
</del><ins>+ Optional<LinkRelAttribute::IconType> iconType() const;
</ins><span class="cx">
</span><span class="cx"> // the icon size string as parsed from the HTML attribute
</span><span class="cx"> String iconSizes();
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlLinkRelAttributecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/LinkRelAttribute.cpp (200518 => 200519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/LinkRelAttribute.cpp 2016-05-06 20:37:16 UTC (rev 200518)
+++ trunk/Source/WebCore/html/LinkRelAttribute.cpp 2016-05-06 20:38:55 UTC (rev 200519)
</span><span class="lines">@@ -46,13 +46,11 @@
</span><span class="cx"> if (equalLettersIgnoringASCIICase(rel, "stylesheet"))
</span><span class="cx"> isStyleSheet = true;
</span><span class="cx"> else if (equalLettersIgnoringASCIICase(rel, "icon") || equalLettersIgnoringASCIICase(rel, "shortcut icon"))
</span><del>- iconType = Favicon;
-#if ENABLE(TOUCH_ICON_LOADING)
</del><ins>+ iconType = IconType::Favicon;
</ins><span class="cx"> else if (equalLettersIgnoringASCIICase(rel, "apple-touch-icon"))
</span><del>- iconType = TouchIcon;
</del><ins>+ iconType = IconType::TouchIcon;
</ins><span class="cx"> else if (equalLettersIgnoringASCIICase(rel, "apple-touch-icon-precomposed"))
</span><del>- iconType = TouchPrecomposedIcon;
-#endif
</del><ins>+ iconType = IconType::TouchPrecomposedIcon;
</ins><span class="cx"> else if (equalLettersIgnoringASCIICase(rel, "dns-prefetch"))
</span><span class="cx"> isDNSPrefetch = true;
</span><span class="cx"> else if (RuntimeEnabledFeatures::sharedFeatures().linkPreloadEnabled() && equalLettersIgnoringASCIICase(rel, "preload"))
</span><span class="lines">@@ -72,13 +70,11 @@
</span><span class="cx"> else if (equalLettersIgnoringASCIICase(word, "alternate"))
</span><span class="cx"> isAlternate = true;
</span><span class="cx"> else if (equalLettersIgnoringASCIICase(word, "icon"))
</span><del>- iconType = Favicon;
-#if ENABLE(TOUCH_ICON_LOADING)
</del><ins>+ iconType = IconType::Favicon;
</ins><span class="cx"> else if (equalLettersIgnoringASCIICase(word, "apple-touch-icon"))
</span><del>- iconType = TouchIcon;
</del><ins>+ iconType = IconType::TouchIcon;
</ins><span class="cx"> else if (equalLettersIgnoringASCIICase(word, "apple-touch-icon-precomposed"))
</span><del>- iconType = TouchPrecomposedIcon;
-#endif
</del><ins>+ iconType = IconType::TouchPrecomposedIcon;
</ins><span class="cx"> #if ENABLE(LINK_PREFETCH)
</span><span class="cx"> else if (equalLettersIgnoringASCIICase(word, "prefetch"))
</span><span class="cx"> isLinkPrefetch = true;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlLinkRelAttributeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/LinkRelAttribute.h (200518 => 200519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/LinkRelAttribute.h 2016-05-06 20:37:16 UTC (rev 200518)
+++ trunk/Source/WebCore/html/LinkRelAttribute.h 2016-05-06 20:38:55 UTC (rev 200519)
</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">@@ -29,17 +30,22 @@
</span><span class="cx"> *
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef LinkRelAttribute_h
-#define LinkRelAttribute_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><del>-#include "IconURL.h"
</del><span class="cx"> #include <wtf/Forward.h>
</span><ins>+#include <wtf/Optional.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> struct LinkRelAttribute {
</span><ins>+ enum class IconType {
+ Favicon,
+ TouchIcon,
+ TouchPrecomposedIcon,
+ };
+
</ins><span class="cx"> bool isStyleSheet { false };
</span><del>- IconType iconType { InvalidIcon };
</del><ins>+ Optional<IconType> iconType;
</ins><span class="cx"> bool isAlternate { false };
</span><span class="cx"> bool isDNSPrefetch { false };
</span><span class="cx"> bool isLinkPreload { false };
</span><span class="lines">@@ -53,5 +59,3 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span><del>-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCorehtmlparserHTMLPreloadScannercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/parser/HTMLPreloadScanner.cpp (200518 => 200519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/parser/HTMLPreloadScanner.cpp 2016-05-06 20:37:16 UTC (rev 200518)
+++ trunk/Source/WebCore/html/parser/HTMLPreloadScanner.cpp 2016-05-06 20:38:55 UTC (rev 200519)
</span><span class="lines">@@ -241,7 +241,7 @@
</span><span class="cx"> static bool relAttributeIsStyleSheet(const String& attributeValue)
</span><span class="cx"> {
</span><span class="cx"> LinkRelAttribute parsedAttribute { attributeValue };
</span><del>- return parsedAttribute.isStyleSheet && !parsedAttribute.isAlternate && parsedAttribute.iconType == InvalidIcon && !parsedAttribute.isDNSPrefetch;
</del><ins>+ return parsedAttribute.isStyleSheet && !parsedAttribute.isAlternate && !parsedAttribute.iconType && !parsedAttribute.isDNSPrefetch;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void setUrlToLoad(const String& value, bool allowReplacement = false)
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.h (200518 => 200519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.h 2016-05-06 20:37:16 UTC (rev 200518)
+++ trunk/Source/WebCore/loader/FrameLoader.h 2016-05-06 20:38:55 UTC (rev 200519)
</span><span class="lines">@@ -35,7 +35,6 @@
</span><span class="cx"> #include "CachePolicy.h"
</span><span class="cx"> #include "FrameLoaderStateMachine.h"
</span><span class="cx"> #include "FrameLoaderTypes.h"
</span><del>-#include "IconURL.h"
</del><span class="cx"> #include "LayoutMilestones.h"
</span><span class="cx"> #include "MixedContentChecker.h"
</span><span class="cx"> #include "Page.h"
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoaderClient.h (200518 => 200519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoaderClient.h 2016-05-06 20:37:16 UTC (rev 200518)
+++ trunk/Source/WebCore/loader/FrameLoaderClient.h 2016-05-06 20:38:55 UTC (rev 200519)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx"> #define FrameLoaderClient_h
</span><span class="cx">
</span><span class="cx"> #include "FrameLoaderTypes.h"
</span><del>-#include "IconURL.h"
</del><span class="cx"> #include "LayoutMilestones.h"
</span><span class="cx"> #include "ResourceLoadPriority.h"
</span><span class="cx"> #include <functional>
</span><span class="lines">@@ -52,8 +51,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-typedef class _jobject* jobject;
-
</del><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> OBJC_CLASS NSArray;
</span><span class="cx"> OBJC_CLASS NSCachedURLResponse;
</span></span></pre></div>
<a id="trunkSourceWebCoreloadericonIconControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/icon/IconController.cpp (200518 => 200519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/icon/IconController.cpp 2016-05-06 20:37:16 UTC (rev 200518)
+++ trunk/Source/WebCore/loader/icon/IconController.cpp 2016-05-06 20:38:55 UTC (rev 200519)
</span><span class="lines">@@ -79,8 +79,10 @@
</span><span class="cx"> return result;
</span><span class="cx">
</span><span class="cx"> for (auto& linkElement : childrenOfType<HTMLLinkElement>(*head)) {
</span><del>- if (!(linkElement.iconType() & Favicon))
</del><ins>+ if (!linkElement.iconType())
</ins><span class="cx"> continue;
</span><ins>+ if (*linkElement.iconType() != LinkRelAttribute::IconType::Favicon)
+ continue;
</ins><span class="cx"> if (linkElement.href().isEmpty())
</span><span class="cx"> continue;
</span><span class="cx"> result = linkElement.href();
</span></span></pre>
</div>
</div>
</body>
</html>