Changeset 242780 in webkit

Timestamp:

Mar 11, 2019 11:09:58 PM (5 years ago)

Author:

rniwa@webkit.org

Message:

Remove MediaWiki site specific quirks
​https://bugs.webkit.org/show_bug.cgi?id=195597

Reviewed by Simon Fraser.

r47383 added a site specific quirk for the KHTML workaround in MediaWiki.

Blink since removed this workaround:
​https://github.com/chromium/chromium/commit/ecf84fc9c1a51c8ede7adfd0b0cba446d9a8caa0

Given Chrome has been shipping without this quirk for six years, it's safe to assume
this site specific quirk is no longer neeed for Web compatibility.

• css/StyleSheetContents.cpp:

(WebCore::StyleSheetContents::parseAuthorStyleSheet):

• css/parser/CSSParserContext.cpp:

(WebCore::CSSParserContext::CSSParserContext):
(WebCore::operator==):

• css/parser/CSSParserContext.h:

(WebCore::CSSParserContextHash::hash):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/StyleSheetContents.cpp (modified) (1 diff)
• css/parser/CSSParserContext.cpp (modified) (4 diffs)
• css/parser/CSSParserContext.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-03-12  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Remove MediaWiki site specific quirks
+        https://bugs.webkit.org/show_bug.cgi?id=195597
+
+        Reviewed by Simon Fraser.
+
+        r47383 added a site specific quirk for the KHTML workaround in MediaWiki.
+
+        Blink since removed this workaround:
+        https://github.com/chromium/chromium/commit/ecf84fc9c1a51c8ede7adfd0b0cba446d9a8caa0
+
+        Given Chrome has been shipping without this quirk for six years, it's safe to assume
+        this site specific quirk is no longer neeed for Web compatibility.
+
+        * css/StyleSheetContents.cpp:
+        (WebCore::StyleSheetContents::parseAuthorStyleSheet):
+        * css/parser/CSSParserContext.cpp:
+        (WebCore::CSSParserContext::CSSParserContext):
+        (WebCore::operator==):
+        * css/parser/CSSParserContext.h:
+        (WebCore::CSSParserContextHash::hash):
+
 2019-03-11  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/css/StyleSheetContents.cpp

@@ -338 +338 @@
     }
 
-    CSSParser p(parserContext());
-    p.parseSheet(this, sheetText, CSSParser::RuleParsing::Deferred);
-
-    if (m_parserContext.needsSiteSpecificQuirks && isStrictParserMode(m_parserContext.mode)) {
-        // Work around <https://bugs.webkit.org/show_bug.cgi?id=28350>.
-        static NeverDestroyed<const String> mediaWikiKHTMLFixesStyleSheet(MAKE_STATIC_STRING_IMPL("/* KHTML fix stylesheet */\n/* work around the horizontal scrollbars */\n#column-content { margin-left: 0; }\n\n"));
-        // There are two variants of KHTMLFixes.css. One is equal to mediaWikiKHTMLFixesStyleSheet,
-        // while the other lacks the second trailing newline.
-        if (baseURL().string().endsWith("/KHTMLFixes.css") && !sheetText.isNull() && mediaWikiKHTMLFixesStyleSheet.get().startsWith(sheetText)
-            && sheetText.length() >= mediaWikiKHTMLFixesStyleSheet.get().length() - 1)
-            clearRules();
-    }
+    CSSParser(parserContext()).parseSheet(this, sheetText, CSSParser::RuleParsing::Deferred);
 }
 

trunk/Source/WebCore/css/parser/CSSParserContext.cpp

@@ -45 +45 @@
     , mode(mode)
 {
-#if PLATFORM(IOS_FAMILY)
-    // FIXME: Force the site specific quirk below to work on iOS. Investigating other site specific quirks
-    // to see if we can enable the preference all together is to be handled by:
-    // <rdar://problem/8493309> Investigate Enabling Site Specific Quirks in MobileSafari and UIWebView
-    needsSiteSpecificQuirks = true;
-#endif
 }
 
@@ -60 +54 @@
     , hasDocumentSecurityOrigin(sheetBaseURL.isNull() || document.securityOrigin().canRequest(baseURL))
 {
-
-    needsSiteSpecificQuirks = document.settings().needsSiteSpecificQuirks();
     enforcesCSSMIMETypeInNoQuirksMode = document.settings().enforceCSSMIMETypeInNoQuirksMode();
     useLegacyBackgroundSizeShorthandBehavior = document.settings().useLegacyBackgroundSizeShorthandBehavior();
@@ -75 +67 @@
     deferredCSSParserEnabled = document.settings().deferredCSSParserEnabled();
     useSystemAppearance = document.page() ? document.page()->useSystemAppearance() : false;
-
-#if PLATFORM(IOS_FAMILY)
-    // FIXME: Force the site specific quirk below to work on iOS. Investigating other site specific quirks
-    // to see if we can enable the preference all together is to be handled by:
-    // <rdar://problem/8493309> Investigate Enabling Site Specific Quirks in MobileSafari and UIWebView
-    needsSiteSpecificQuirks = true;
-#endif
 }
 
@@ -93 +78 @@
         && a.textAutosizingEnabled == b.textAutosizingEnabled
 #endif
-        && a.needsSiteSpecificQuirks == b.needsSiteSpecificQuirks
         && a.enforcesCSSMIMETypeInNoQuirksMode == b.enforcesCSSMIMETypeInNoQuirksMode
         && a.useLegacyBackgroundSizeShorthandBehavior == b.useLegacyBackgroundSizeShorthandBehavior

trunk/Source/WebCore/css/parser/CSSParserContext.h

@@ -50 +50 @@
     bool textAutosizingEnabled { false };
 #endif
-    bool needsSiteSpecificQuirks { false };
     bool enforcesCSSMIMETypeInNoQuirksMode { true };
     bool useLegacyBackgroundSizeShorthandBehavior { false };
@@ -95 +94 @@
             & key.textAutosizingEnabled                     << 1
 #endif
-            & key.needsSiteSpecificQuirks                   << 2
-            & key.enforcesCSSMIMETypeInNoQuirksMode         << 3
-            & key.useLegacyBackgroundSizeShorthandBehavior  << 4
-            & key.springTimingFunctionEnabled               << 5
-            & key.constantPropertiesEnabled                 << 6
-            & key.colorFilterEnabled                        << 7
-            & key.deferredCSSParserEnabled                  << 8
-            & key.hasDocumentSecurityOrigin                 << 9
-            & key.useSystemAppearance                       << 10
+            & key.enforcesCSSMIMETypeInNoQuirksMode         << 2
+            & key.useLegacyBackgroundSizeShorthandBehavior  << 3
+            & key.springTimingFunctionEnabled               << 4
+            & key.constantPropertiesEnabled                 << 5
+            & key.colorFilterEnabled                        << 6
+            & key.deferredCSSParserEnabled                  << 7
+            & key.hasDocumentSecurityOrigin                 << 8
+            & key.useSystemAppearance                       << 9
 #if ENABLE(ATTACHMENT_ELEMENT)
-            & key.attachmentEnabled                         << 11
+            & key.attachmentEnabled                         << 10
 #endif
-            & key.mode                                      << 12; // Keep this last.
+            & key.mode                                      << 11; // Keep this last.
         hash ^= WTF::intHash(bits);
         return hash;