Changeset 183920 in webkit


Ignore:
Timestamp:
May 7, 2015 1:09:03 AM (9 years ago)
Author:
yoav@yoav.ws
Message:

Fix <script srcset> being loaded by the preloader.
https://bugs.webkit.org/show_bug.cgi?id=144675

Reviewed by Darin Adler.

Source/WebCore:

Fix HTMLPreloadScanner to make sure that srcset is only loaded
when it is present on an <img>.

Tests: http/tests/loading/preload-script-src.html

http/tests/loading/preload-script-srcset-ignored.html

  • html/parser/HTMLPreloadScanner.cpp:

(WebCore::TokenPreloadScanner::StartTagScanner::processAttributes):

LayoutTests:

Add preloader tests to make sure that <script src> is preloaded,
and <script srcset> is not.

  • http/tests/loading/preload-script-src-expected.txt: Added.
  • http/tests/loading/preload-script-src.html: Added.
  • http/tests/loading/preload-script-srcset-ignored-expected.txt: Added.
  • http/tests/loading/preload-script-srcset-ignored.html: Added.
Location:
trunk
Files:
4 added
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r183914 r183920  
     12015-05-07  Yoav Weiss  <yoav@yoav.ws>
     2
     3        Fix <script srcset> being loaded by the preloader.
     4        https://bugs.webkit.org/show_bug.cgi?id=144675
     5
     6        Reviewed by Darin Adler.
     7
     8        Add preloader tests to make sure that <script src> is preloaded,
     9        and <script srcset> is not.
     10
     11        * http/tests/loading/preload-script-src-expected.txt: Added.
     12        * http/tests/loading/preload-script-src.html: Added.
     13        * http/tests/loading/preload-script-srcset-ignored-expected.txt: Added.
     14        * http/tests/loading/preload-script-srcset-ignored.html: Added.
     15
    1162015-05-06  Yoav Weiss  <yoav@yoav.ws>
    217
  • trunk/Source/WebCore/ChangeLog

    r183918 r183920  
     12015-05-07  Yoav Weiss  <yoav@yoav.ws>
     2
     3        Fix <script srcset> being loaded by the preloader.
     4        https://bugs.webkit.org/show_bug.cgi?id=144675
     5
     6        Reviewed by Darin Adler.
     7
     8        Fix HTMLPreloadScanner to make sure that srcset is only loaded
     9        when it is present on an <img>.
     10
     11        Tests: http/tests/loading/preload-script-src.html
     12               http/tests/loading/preload-script-srcset-ignored.html
     13
     14        * html/parser/HTMLPreloadScanner.cpp:
     15        (WebCore::TokenPreloadScanner::StartTagScanner::processAttributes):
     16
    1172015-05-07  Žan Doberšek  <zdobersek@igalia.com>
    218
  • trunk/Source/WebCore/html/parser/HTMLPreloadScanner.cpp

    r183901 r183920  
    106106        }
    107107
    108         // Resolve between src and srcSet if we have them.
    109         if (!m_srcSetAttribute.isEmpty()) {
     108        // Resolve between src and srcSet if we have them and the tag is img.
     109        if (m_tagId == TagId::Img && !m_srcSetAttribute.isEmpty()) {
    110110            unsigned sourceSize = 0;
    111111#if ENABLE(PICTURE_SIZES)
Note: See TracChangeset for help on using the changeset viewer.