Changeset 55935 in webkit


Ignore:
Timestamp:
Mar 12, 2010 1:23:57 PM (14 years ago)
Author:
mitz@apple.com
Message:

<rdar://problem/7709115> REGRESSION: toolbar is missing at http://www.glom.org/
https://bugs.webkit.org/show_bug.cgi?id=35507

Reviewed by Alexey Proskuryakov.

  • css/CSSImportRule.cpp:

(WebCore::CSSImportRule::setCSSStyleSheet): Extend the change made in
<http://trac.webkit.org/changeset/48818> to detect the two variants of
KHTMLFixes.css in @import rules as well as in <link> elements.

Location:
trunk/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebCore/ChangeLog

    r55934 r55935  
     12010-03-12  Dan Bernstein  <mitz@apple.com>
     2
     3        Reviewed by Alexey Proskuryakov.
     4
     5        <rdar://problem/7709115> REGRESSION: toolbar is missing at http://www.glom.org/
     6        https://bugs.webkit.org/show_bug.cgi?id=35507
     7
     8        * css/CSSImportRule.cpp:
     9        (WebCore::CSSImportRule::setCSSStyleSheet): Extend the change made in
     10        <http://trac.webkit.org/changeset/48818> to detect the two variants of
     11        KHTMLFixes.css in @import rules as well as in <link> elements.
     12
    1132010-03-12  Gavin Barraclough  <barraclough@apple.com>
    214
  • trunk/WebCore/css/CSSImportRule.cpp

    r54645 r55935  
    8989        DEFINE_STATIC_LOCAL(const String, slashKHTMLFixesDotCss, ("/KHTMLFixes.css"));
    9090        DEFINE_STATIC_LOCAL(const String, mediaWikiKHTMLFixesStyleSheet, ("/* KHTML fix stylesheet */\n/* work around the horizontal scrollbars */\n#column-content { margin-left: 0; }\n\n"));
    91         if (baseURL.string().endsWith(slashKHTMLFixesDotCss) && sheetText == mediaWikiKHTMLFixesStyleSheet) {
     91        // There are two variants of KHTMLFixes.css. One is equal to mediaWikiKHTMLFixesStyleSheet,
     92        // while the other lacks the second trailing newline.
     93        if (baseURL.string().endsWith(slashKHTMLFixesDotCss) && !sheetText.isNull() && mediaWikiKHTMLFixesStyleSheet.startsWith(sheetText)
     94                && sheetText.length() >= mediaWikiKHTMLFixesStyleSheet.length() - 1) {
    9295            ASSERT(m_styleSheet->length() == 1);
    9396            ExceptionCode ec;
Note: See TracChangeset for help on using the changeset viewer.