Changeset 55935 in webkit

Timestamp:

Mar 12, 2010, 1:23:57 PM (15 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:

• ChangeLog (modified) (1 diff)
• css/CSSImportRule.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-03-12  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Alexey Proskuryakov.
+
+        <rdar://problem/7709115> REGRESSION: toolbar is missing at http://www.glom.org/
+        https://bugs.webkit.org/show_bug.cgi?id=35507
+
+        * 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.
+
 2010-03-12  Gavin Barraclough  <barraclough@apple.com>
 

trunk/WebCore/css/CSSImportRule.cpp

@@ -89 +89 @@
         DEFINE_STATIC_LOCAL(const String, slashKHTMLFixesDotCss, ("/KHTMLFixes.css"));
         DEFINE_STATIC_LOCAL(const String, mediaWikiKHTMLFixesStyleSheet, ("/* KHTML fix stylesheet */\n/* work around the horizontal scrollbars */\n#column-content { margin-left: 0; }\n\n"));
-        if (baseURL.string().endsWith(slashKHTMLFixesDotCss) && sheetText == mediaWikiKHTMLFixesStyleSheet) {
+        // There are two variants of KHTMLFixes.css. One is equal to mediaWikiKHTMLFixesStyleSheet,
+        // while the other lacks the second trailing newline.
+        if (baseURL.string().endsWith(slashKHTMLFixesDotCss) && !sheetText.isNull() && mediaWikiKHTMLFixesStyleSheet.startsWith(sheetText)
+                && sheetText.length() >= mediaWikiKHTMLFixesStyleSheet.length() - 1) {
             ASSERT(m_styleSheet->length() == 1);
             ExceptionCode ec;