⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 110626 in webkit


Ignore:
Timestamp:
Mar 13, 2012, 3:40:16 PM (15 years ago)
Author:
commit-queue@webkit.org
Message:

Alternate stylesheets (without title attribute) are loaded on refresh
​https://bugs.webkit.org/show_bug.cgi?id=24354

Patch by Dave Tharp <​dtharp@codeaurora.org> on 2012-03-13
Reviewed by David Hyatt.

Source/WebCore:

Alternate stylesheets are now ignored in <link> tags if
they have no title attribute (per spec).

Tests: fast/css/link-alternate-stylesheet-1.html

fast/css/link-alternate-stylesheet-2.html
fast/css/link-alternate-stylesheet-3.html
fast/css/link-alternate-stylesheet-4.html
fast/css/link-alternate-stylesheet-5.html

  • dom/Document.cpp:

(WebCore::Document::collectActiveStylesheets):

LayoutTests:

Addapted alternate stylesheet tests from ​http://robballou.com/switcher/sandbox/alternate1.php

  • fast/css/link-alternate-stylesheet-1-expected.txt: Added.
  • fast/css/link-alternate-stylesheet-1.html: Added.
  • fast/css/link-alternate-stylesheet-2-expected.txt: Added.
  • fast/css/link-alternate-stylesheet-2.html: Added.
  • fast/css/link-alternate-stylesheet-3-expected.txt: Added.
  • fast/css/link-alternate-stylesheet-3.html: Added.
  • fast/css/link-alternate-stylesheet-4-expected.txt: Added.
  • fast/css/link-alternate-stylesheet-4.html: Added.
  • fast/css/link-alternate-stylesheet-5-expected.txt: Added.
  • fast/css/link-alternate-stylesheet-5.html: Added.
  • fast/css/resources/basic.css: Added.

(body):
(code):
(#source):

  • fast/css/resources/high.css: Added.

(body):
(h1):

  • fast/css/resources/normal.css: Added.

(body):
(h1):

  • fast/css/resources/small.css: Added.

(body):

Location:
trunk
Files:
14 added
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r110625 r110626  
     12012-03-13  Dave Tharp  <dtharp@codeaurora.org>
     2
     3        Alternate stylesheets (without title attribute) are loaded on refresh
     4        https://bugs.webkit.org/show_bug.cgi?id=24354
     5
     6        Reviewed by David Hyatt.
     7
     8        Addapted alternate stylesheet tests from http://robballou.com/switcher/sandbox/alternate1.php
     9
     10        * fast/css/link-alternate-stylesheet-1-expected.txt: Added.
     11        * fast/css/link-alternate-stylesheet-1.html: Added.
     12        * fast/css/link-alternate-stylesheet-2-expected.txt: Added.
     13        * fast/css/link-alternate-stylesheet-2.html: Added.
     14        * fast/css/link-alternate-stylesheet-3-expected.txt: Added.
     15        * fast/css/link-alternate-stylesheet-3.html: Added.
     16        * fast/css/link-alternate-stylesheet-4-expected.txt: Added.
     17        * fast/css/link-alternate-stylesheet-4.html: Added.
     18        * fast/css/link-alternate-stylesheet-5-expected.txt: Added.
     19        * fast/css/link-alternate-stylesheet-5.html: Added.
     20        * fast/css/resources/basic.css: Added.
     21        (body):
     22        (code):
     23        (#source):
     24        * fast/css/resources/high.css: Added.
     25        (body):
     26        (h1):
     27        * fast/css/resources/normal.css: Added.
     28        (body):
     29        (h1):
     30        * fast/css/resources/small.css: Added.
     31        (body):
     32
    1332012-03-13  Jessie Berlin  <jberlin@apple.com>
    234

  • trunk/Source/WebCore/ChangeLog

    r110624 r110626  
     12012-03-13  Dave Tharp  <dtharp@codeaurora.org>
     2
     3        Alternate stylesheets (without title attribute) are loaded on refresh
     4        https://bugs.webkit.org/show_bug.cgi?id=24354
     5
     6        Reviewed by David Hyatt.
     7
     8        Alternate stylesheets are now ignored in <link> tags if
     9        they have no title attribute (per spec).
     10
     11        Tests: fast/css/link-alternate-stylesheet-1.html
     12               fast/css/link-alternate-stylesheet-2.html
     13               fast/css/link-alternate-stylesheet-3.html
     14               fast/css/link-alternate-stylesheet-4.html
     15               fast/css/link-alternate-stylesheet-5.html
     16
     17        * dom/Document.cpp:
     18        (WebCore::Document::collectActiveStylesheets):
     19
    1202012-03-13  Dana Jansens  <danakj@chromium.org>
    221

  • trunk/Source/WebCore/dom/Document.cpp

    r110238 r110626  
    31983198            // (thus making it PREFERRED or ALTERNATE rather than
    31993199            // PERSISTENT).
     3200            AtomicString rel = e->getAttribute(relAttr);
    32003201            if (!enabledViaScript && !title.isEmpty()) {
    32013202                // Yes, we have a title.
    … …  
    32053206                    // us as the preferred set.  Otherwise, just ignore
    32063207                    // this sheet.
    3207                     AtomicString rel = e->getAttribute(relAttr);
    32083208                    if (e->hasLocalName(styleTag) || !rel.contains("alternate"))
    32093209                        m_preferredStylesheetSet = m_selectedStylesheetSet = title;
    … …  
    32123212                    sheet = 0;
    32133213            }
     3214
     3215            if (rel.contains("alternate") && title.isEmpty())
     3216                sheet = 0;
    32143217        }
    32153218        if (sheet)
Note: See TracChangeset for help on using the changeset viewer.