Changeset 183951 in webkit

Timestamp:

May 7, 2015 3:16:27 PM (9 years ago)

Author:

yoav@yoav.ws

Message:

Handle meta viewport in HTMLPreloadScanner
​https://bugs.webkit.org/show_bug.cgi?id=144640

Reviewed by Dean Jackson.

Source/WebCore:

Add support for the <meta> tag to the HTMLPreloadScanner
and when the meta tag's name is viewport, get the document
to process the tag's attribute value, and set its ViewportArgument.

Tests: fast/dom/HTMLMetaElement/meta-preloader.html

• html/parser/HTMLPreloadScanner.cpp:

(WebCore::TokenPreloadScanner::tagIdFor): Added meta.
(WebCore::TokenPreloadScanner::initiatorFor): Added meta.
(WebCore::TokenPreloadScanner::StartTagScanner::StartTagScanner): Call document.processViewport is meta viewport encountered.
(WebCore::TokenPreloadScanner::StartTagScanner::processAttributes):
(WebCore::TokenPreloadScanner::StartTagScanner::processAttribute): Keep track of meta viewport tags.
(WebCore::testPreloadScannerViewportSupport): Testing function that makes sure this functionality is working.

• html/parser/HTMLPreloadScanner.h:
• testing/Internals.cpp:

(WebCore::Internals::testPreloaderSettingViewport): Calls the testing function.

• testing/Internals.h:
• testing/Internals.idl:

LayoutTests:

Added a layout test that is simply calling an internals method
that tests the HTMLPreloadScanner.

• fast/dom/HTMLMetaElement/meta-preloader-expected.txt: Added.
• fast/dom/HTMLMetaElement/meta-preloader.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/HTMLMetaElement/meta-preloader-expected.txt (added)
• LayoutTests/fast/dom/HTMLMetaElement/meta-preloader.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/parser/HTMLPreloadScanner.cpp (modified) (7 diffs)
• Source/WebCore/html/parser/HTMLPreloadScanner.h (modified) (2 diffs)
• Source/WebCore/testing/Internals.cpp (modified) (2 diffs)
• Source/WebCore/testing/Internals.h (modified) (1 diff)
• Source/WebCore/testing/Internals.idl (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-05-07  Yoav Weiss  <yoav@yoav.ws>
+
+        Handle meta viewport in HTMLPreloadScanner
+        https://bugs.webkit.org/show_bug.cgi?id=144640
+
+        Reviewed by Dean Jackson.
+
+        Added a layout test that is simply calling an internals method
+        that tests the HTMLPreloadScanner.
+
+        * fast/dom/HTMLMetaElement/meta-preloader-expected.txt: Added.
+        * fast/dom/HTMLMetaElement/meta-preloader.html: Added.
+
 2015-05-07  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-05-07  Yoav Weiss  <yoav@yoav.ws>
+
+        Handle meta viewport in HTMLPreloadScanner
+        https://bugs.webkit.org/show_bug.cgi?id=144640
+
+        Reviewed by Dean Jackson.
+
+        Add support for the <meta> tag to the HTMLPreloadScanner
+        and when the meta tag's name is viewport, get the document
+        to process the tag's attribute value, and set its ViewportArgument.
+
+        Tests: fast/dom/HTMLMetaElement/meta-preloader.html
+
+        * html/parser/HTMLPreloadScanner.cpp:
+        (WebCore::TokenPreloadScanner::tagIdFor): Added meta.
+        (WebCore::TokenPreloadScanner::initiatorFor): Added meta.
+        (WebCore::TokenPreloadScanner::StartTagScanner::StartTagScanner): Call document.processViewport is meta viewport encountered.
+        (WebCore::TokenPreloadScanner::StartTagScanner::processAttributes):
+        (WebCore::TokenPreloadScanner::StartTagScanner::processAttribute): Keep track of meta viewport tags.
+        (WebCore::testPreloadScannerViewportSupport): Testing function that makes sure this functionality is working.
+        * html/parser/HTMLPreloadScanner.h:
+        * testing/Internals.cpp:
+        (WebCore::Internals::testPreloaderSettingViewport): Calls the testing function.
+        * testing/Internals.h:
+        * testing/Internals.idl:
+
 2015-05-07  Zalan Bujtas  <zalan@apple.com>
 

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

@@ -59 +59 @@
     if (tagName == templateTag)
         return TagId::Template;
+    if (tagName == metaTag)
+        return TagId::Meta;
     return TagId::Unknown;
 }
@@ -77 +79 @@
     case TagId::Base:
     case TagId::Template:
+    case TagId::Meta:
         ASSERT_NOT_REACHED();
         return "unknown";
@@ -89 +92 @@
         : m_tagId(tagId)
         , m_linkIsStyleSheet(false)
+        , m_metaIsViewport(false)
         , m_inputIsImage(false)
         , m_deviceScaleFactor(deviceScaleFactor)
@@ -117 +121 @@
             setUrlToLoad(imageCandidate.string.toString(), true);
         }
+
+        if (m_metaIsViewport && !m_metaContent.isNull())
+            document.processViewport(m_metaContent, ViewportArguments::ViewportMeta);
     }
 
@@ -167 +174 @@
             else if (match(attributeName, typeAttr))
                 m_inputIsImage = equalIgnoringCase(attributeValue, InputTypeNames::image());
+        } else if (m_tagId == TagId::Meta) {
+            if (match(attributeName, contentAttr))
+                m_metaContent = attributeValue;
+            else if (match(attributeName, nameAttr))
+                m_metaIsViewport = equalIgnoringCase(attributeValue, "viewport");
         }
     }
@@ -237 +249 @@
     bool m_linkIsStyleSheet;
     String m_mediaAttribute;
+    String m_metaContent;
+    bool m_metaIsViewport;
     bool m_inputIsImage;
     float m_deviceScaleFactor;
@@ -348 +362 @@
 }
 
-}
+bool testPreloadScannerViewportSupport(Document* document)
+{
+    ASSERT(document);
+    HTMLParserOptions options(*document);
+    HTMLPreloadScanner scanner(options, document->url());
+    HTMLResourcePreloader preloader(*document);
+    scanner.appendToEnd(String("<meta name=viewport content='width=400'>"));
+    scanner.scan(preloader, *document);
+    return (document->viewportArguments().width == 400);
+}
+
+}

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

@@ -50 +50 @@
         Link,
         Script,
+        Meta,
 
         // These tags are not scanned by the StartTagScanner.
@@ -91 +92 @@
 };
 
+WEBCORE_EXPORT bool testPreloadScannerViewportSupport(Document*);
+
 }
 

trunk/Source/WebCore/testing/Internals.cpp

@@ -59 +59 @@
 #include "HTMLNames.h"
 #include "HTMLPlugInElement.h"
+#include "HTMLPreloadScanner.h"
 #include "HTMLSelectElement.h"
 #include "HTMLTextAreaElement.h"
@@ -2835 +2836 @@
 #endif
 
-}
+bool Internals::testPreloaderSettingViewport()
+{
+    return testPreloadScannerViewportSupport(contextDocument());
+}
+
+}

trunk/Source/WebCore/testing/Internals.h

@@ -396 +396 @@
     RefPtr<File> createFile(const String&);
     void queueMicroTask(int);
+    bool testPreloaderSettingViewport();
 
 #if ENABLE(CONTENT_FILTERING)

trunk/Source/WebCore/testing/Internals.idl

@@ -358 +358 @@
     File createFile(DOMString url);
     void queueMicroTask(long testNumber);
+    boolean testPreloaderSettingViewport();
 
     [Conditional=CONTENT_FILTERING] readonly attribute MockContentFilterSettings mockContentFilterSettings;