Changeset 191180 in webkit

Timestamp:

Oct 16, 2015 10:06:06 AM (9 years ago)

Author:

Chris Dumez

Message:

HTMLPreloadScanner should preload iframes
​https://bugs.webkit.org/show_bug.cgi?id=150097
<rdar://problem/23094475>

Reviewed by Antti Koivisto.

Source/WebCore:

HTMLPreloadScanner should preload iframes to decrease page load time.

Tests:

• fast/preloader/frame-src.html
• http/tests/loading/preload-no-store-frame-src.html

• html/parser/HTMLPreloadScanner.cpp:

(WebCore::TokenPreloadScanner::tagIdFor):
(WebCore::TokenPreloadScanner::initiatorFor):
(WebCore::TokenPreloadScanner::StartTagScanner::createPreloadRequest):
(WebCore::TokenPreloadScanner::StartTagScanner::processAttribute):
(WebCore::TokenPreloadScanner::StartTagScanner::resourceType):
(WebCore::TokenPreloadScanner::StartTagScanner::setUrlToLoad): Deleted.
(WebCore::TokenPreloadScanner::StartTagScanner::charset): Deleted.

• html/parser/HTMLPreloadScanner.h:

LayoutTests:

Add layout test to check that iframes are indeed preloaded.

• fast/preloader/frame-src-expected.txt: Added.
• fast/preloader/frame-src.html: Added.
• fast/preloader/resources/testFrame.html: Added.
• http/tests/loading/preload-no-store-frame-src-expected.txt: Added.
• http/tests/loading/preload-no-store-frame-src.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/preloader/frame-src-expected.txt (added)
• LayoutTests/fast/preloader/frame-src.html (added)
• LayoutTests/fast/preloader/resources/testFrame.html (added)
• LayoutTests/http/tests/loading/preload-no-store-frame-src-expected.txt (added)
• LayoutTests/http/tests/loading/preload-no-store-frame-src.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/parser/HTMLPreloadScanner.cpp (modified) (5 diffs)
• Source/WebCore/html/parser/HTMLPreloadScanner.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-10-16  Chris Dumez  <cdumez@apple.com>
+
+        HTMLPreloadScanner should preload iframes
+        https://bugs.webkit.org/show_bug.cgi?id=150097
+        <rdar://problem/23094475>
+
+        Reviewed by Antti Koivisto.
+
+        Add layout test to check that iframes are indeed preloaded.
+
+        * fast/preloader/frame-src-expected.txt: Added.
+        * fast/preloader/frame-src.html: Added.
+        * fast/preloader/resources/testFrame.html: Added.
+        * http/tests/loading/preload-no-store-frame-src-expected.txt: Added.
+        * http/tests/loading/preload-no-store-frame-src.html: Added.
+
 2015-10-16  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-10-16  Chris Dumez  <cdumez@apple.com>
+
+        HTMLPreloadScanner should preload iframes
+        https://bugs.webkit.org/show_bug.cgi?id=150097
+        <rdar://problem/23094475>
+
+        Reviewed by Antti Koivisto.
+
+        HTMLPreloadScanner should preload iframes to decrease page load time.
+
+        Tests:
+        - fast/preloader/frame-src.html
+        - http/tests/loading/preload-no-store-frame-src.html
+
+        * html/parser/HTMLPreloadScanner.cpp:
+        (WebCore::TokenPreloadScanner::tagIdFor):
+        (WebCore::TokenPreloadScanner::initiatorFor):
+        (WebCore::TokenPreloadScanner::StartTagScanner::createPreloadRequest):
+        (WebCore::TokenPreloadScanner::StartTagScanner::processAttribute):
+        (WebCore::TokenPreloadScanner::StartTagScanner::resourceType):
+        (WebCore::TokenPreloadScanner::StartTagScanner::setUrlToLoad): Deleted.
+        (WebCore::TokenPreloadScanner::StartTagScanner::charset): Deleted.
+        * html/parser/HTMLPreloadScanner.h:
+
 2015-10-16  David Hyatt  <hyatt@apple.com>
 

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

@@ -45 +45 @@
 {
     AtomicString tagName(data);
+    if (tagName == iframeTag)
+        return TagId::Iframe;
     if (tagName == imgTag)
         return TagId::Img;
@@ -67 +69 @@
 {
     switch (tagId) {
+    case TagId::Iframe:
+        return "iframe";
     case TagId::Img:
         return "img";
@@ -154 +158 @@
     {
         switch (m_tagId) {
+        case TagId::Iframe:
+            if (match(attributeName, srcAttr))
+                setUrlToLoad(attributeValue);
+            break;
         case TagId::Img:
             if (match(attributeName, srcsetAttr) && m_srcSetAttribute.isNull()) {
@@ -223 +231 @@
     CachedResource::Type resourceType() const
     {
-        if (m_tagId == TagId::Script)
+        switch (m_tagId) {
+        case TagId::Iframe:
+            return CachedResource::MainResource;
+        case TagId::Script:
             return CachedResource::Script;
-        if (m_tagId == TagId::Img || (m_tagId == TagId::Input && m_inputIsImage))
+        case TagId::Img:
+        case TagId::Input:
+            ASSERT(m_tagId != TagId::Input || m_inputIsImage);
             return CachedResource::ImageResource;
-        if (m_tagId == TagId::Link && m_linkIsStyleSheet)
+        case TagId::Link:
+            ASSERT(m_linkIsStyleSheet);
             return CachedResource::CSSStyleSheet;
+        case TagId::Meta:
+        case TagId::Unknown:
+        case TagId::Style:
+        case TagId::Base:
+        case TagId::Template:
+            break;
+        }
         ASSERT_NOT_REACHED();
         return CachedResource::RawResource;
@@ -238 +259 @@
             return false;
 
-        if (protocolIs(m_urlToLoad, "data"))
+        if (protocolIs(m_urlToLoad, "data") || protocolIs(m_urlToLoad, "about"))
             return false;
 

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

@@ -46 +46 @@
     enum class TagId {
         // These tags are scanned by the StartTagScanner.
+        Iframe,
         Img,
         Input,