Changeset 200519 in webkit

Timestamp:

May 6, 2016 1:38:55 PM (8 years ago)

Author:

andersca@apple.com

Message:

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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.xcodeproj/project.pbxproj (modified) (4 diffs)
• dom/IconURL.h (deleted)
• html/HTMLLinkElement.cpp (modified) (2 diffs)
• html/HTMLLinkElement.h (modified) (1 diff)
• html/LinkRelAttribute.cpp (modified) (2 diffs)
• html/LinkRelAttribute.h (modified) (3 diffs)
• html/parser/HTMLPreloadScanner.cpp (modified) (1 diff)
• loader/FrameLoader.h (modified) (1 diff)
• loader/FrameLoaderClient.h (modified) (2 diffs)
• loader/icon/IconController.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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):
+
 2016-05-06  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -1730 +1730 @@
                 458FE4091589DF0B005609E6 /* RenderSearchField.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 458FE4071589DF0B005609E6 /* RenderSearchField.cpp */; };
                 458FE40A1589DF0B005609E6 /* RenderSearchField.h in Headers */ = {isa = PBXBuildFile; fileRef = 458FE4081589DF0B005609E6 /* RenderSearchField.h */; };
-                45BAC2B01360BBAB005DA258 /* IconURL.h in Headers */ = {isa = PBXBuildFile; fileRef = 45BAC2AF1360BBAB005DA258 /* IconURL.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 45FEA5CF156DDE8C00654101 /* Decimal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 45FEA5CD156DDE8C00654101 /* Decimal.cpp */; };
                 45FEA5D0156DDE8C00654101 /* Decimal.h in Headers */ = {isa = PBXBuildFile; fileRef = 45FEA5CE156DDE8C00654101 /* Decimal.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -9273 +9272 @@
                 458FE4071589DF0B005609E6 /* RenderSearchField.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderSearchField.cpp; sourceTree = "<group>"; };
                 458FE4081589DF0B005609E6 /* RenderSearchField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderSearchField.h; sourceTree = "<group>"; };
-                45BAC2AF1360BBAB005DA258 /* IconURL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IconURL.h; sourceTree = "<group>"; };
                 45FEA5CD156DDE8C00654101 /* Decimal.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Decimal.cpp; sourceTree = "<group>"; };
                 45FEA5CE156DDE8C00654101 /* Decimal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Decimal.h; sourceTree = "<group>"; };
@@ -24402 +24400 @@
                                 2442BBF81194C9D300D49469 /* HashChangeEvent.h */,
                                 8482B7441198C32E00BFB005 /* HashChangeEvent.idl */,
-                                45BAC2AF1360BBAB005DA258 /* IconURL.h */,
                                 C3CF17A015B0063F00276D39 /* IdTargetObserver.cpp */,
                                 C3CF17A115B0063F00276D39 /* IdTargetObserver.h */,
@@ -26339 +26336 @@
                                 513F14540AB634C400094DDF /* IconLoader.h in Headers */,
                                 51E1ECC10C91C90400DC255B /* IconRecord.h in Headers */,
-                                45BAC2B01360BBAB005DA258 /* IconURL.h in Headers */,
                                 51BA4ACC1BBC5BDD00DF3D6D /* IDBBackingStore.h in Headers */,
                                 C585A66311D4FAC5004C3E4B /* IDBBindingUtilities.h in Headers */,

trunk/Source/WebCore/html/HTMLLinkElement.cpp

@@ -496 +496 @@
 }
 
-IconType HTMLLinkElement::iconType() const
+Optional<LinkRelAttribute::IconType> HTMLLinkElement::iconType() const
 {
     return m_relAttribute.iconType;
@@ -511 +511 @@
 
     // Favicons are handled by a special case in LegacyWebArchive::create()
-    if (m_relAttribute.iconType != InvalidIcon)
+    if (m_relAttribute.iconType)
         return;
 

trunk/Source/WebCore/html/HTMLLinkElement.h

@@ -55 +55 @@
     const AtomicString& type() const;
 
-    IconType iconType() const;
+    Optional<LinkRelAttribute::IconType> iconType() const;
 
     // the icon size string as parsed from the HTML attribute

trunk/Source/WebCore/html/LinkRelAttribute.cpp

@@ -47 +47 @@
         isStyleSheet = true;
     else if (equalLettersIgnoringASCIICase(rel, "icon") || equalLettersIgnoringASCIICase(rel, "shortcut icon"))
-        iconType = Favicon;
-#if ENABLE(TOUCH_ICON_LOADING)
+        iconType = IconType::Favicon;
     else if (equalLettersIgnoringASCIICase(rel, "apple-touch-icon"))
-        iconType = TouchIcon;
+        iconType = IconType::TouchIcon;
     else if (equalLettersIgnoringASCIICase(rel, "apple-touch-icon-precomposed"))
-        iconType = TouchPrecomposedIcon;
-#endif
+        iconType = IconType::TouchPrecomposedIcon;
     else if (equalLettersIgnoringASCIICase(rel, "dns-prefetch"))
         isDNSPrefetch = true;
@@ -73 +71 @@
                 isAlternate = true;
             else if (equalLettersIgnoringASCIICase(word, "icon"))
-                iconType = Favicon;
-#if ENABLE(TOUCH_ICON_LOADING)
+                iconType = IconType::Favicon;
             else if (equalLettersIgnoringASCIICase(word, "apple-touch-icon"))
-                iconType = TouchIcon;
+                iconType = IconType::TouchIcon;
             else if (equalLettersIgnoringASCIICase(word, "apple-touch-icon-precomposed"))
-                iconType = TouchPrecomposedIcon;
-#endif
+                iconType = IconType::TouchPrecomposedIcon;
 #if ENABLE(LINK_PREFETCH)
             else if (equalLettersIgnoringASCIICase(word, "prefetch"))

trunk/Source/WebCore/html/LinkRelAttribute.h

@@ -1 +1 @@
 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30 +31 @@
  */
 
-#ifndef LinkRelAttribute_h
-#define LinkRelAttribute_h
+#pragma once
 
-#include "IconURL.h"
 #include <wtf/Forward.h>
+#include <wtf/Optional.h>
 
 namespace WebCore {
 
 struct LinkRelAttribute {
+    enum class IconType {
+        Favicon,
+        TouchIcon,
+        TouchPrecomposedIcon,
+    };
+
     bool isStyleSheet { false };
-    IconType iconType { InvalidIcon };
+    Optional<IconType> iconType;
     bool isAlternate { false };
     bool isDNSPrefetch { false };
@@ -54 +60 @@
 
 }
-
-#endif

trunk/Source/WebCore/html/parser/HTMLPreloadScanner.cpp

@@ -242 +242 @@
     {
         LinkRelAttribute parsedAttribute { attributeValue };
-        return parsedAttribute.isStyleSheet && !parsedAttribute.isAlternate && parsedAttribute.iconType == InvalidIcon && !parsedAttribute.isDNSPrefetch;
+        return parsedAttribute.isStyleSheet && !parsedAttribute.isAlternate && !parsedAttribute.iconType && !parsedAttribute.isDNSPrefetch;
     }
 

trunk/Source/WebCore/loader/FrameLoader.h

@@ -36 +36 @@
 #include "FrameLoaderStateMachine.h"
 #include "FrameLoaderTypes.h"
-#include "IconURL.h"
 #include "LayoutMilestones.h"
 #include "MixedContentChecker.h"

trunk/Source/WebCore/loader/FrameLoaderClient.h

@@ -32 +32 @@
 
 #include "FrameLoaderTypes.h"
-#include "IconURL.h"
 #include "LayoutMilestones.h"
 #include "ResourceLoadPriority.h"
@@ -52 +51 @@
 #endif
 #endif
-
-typedef class _jobject* jobject;
 
 #if PLATFORM(COCOA)

trunk/Source/WebCore/loader/icon/IconController.cpp

@@ -80 +80 @@
 
     for (auto& linkElement : childrenOfType<HTMLLinkElement>(*head)) {
-        if (!(linkElement.iconType() & Favicon))
+        if (!linkElement.iconType())
+            continue;
+        if (*linkElement.iconType() != LinkRelAttribute::IconType::Favicon)
             continue;
         if (linkElement.href().isEmpty())