Title: [274074] trunk/Source
Revision
274074
Author
wei...@apple.com
Date
2021-03-08 08:57:53 -0800 (Mon, 08 Mar 2021)

Log Message

Remove quirks for the no longer supported iAd Producer
https://bugs.webkit.org/show_bug.cgi?id=222894

Reviewed by Chris Dumez.

Source/WebCore:

Remove two quirks that were only for iAd Producer, which is no longer
supported on the latest macOS operating systems.

By removing one quirk, we can also remove some indirection in CSSStyleDeclaration.

* bindings/scripts/CodeGeneratorJS.pm:
(GenerateAttributeSetterBodyDefinition):
* bindings/scripts/test/JS/JSTestCSSProperty.cpp:
(WebCore::setJSTestCSSProperty_propertySetter):
* css/CSSStyleDeclaration.cpp:
(WebCore::CSSStyleDeclaration::setNamedItem):
(WebCore::CSSStyleDeclaration::setPropertyValueInternal): Deleted.
* css/CSSStyleDeclaration.h:
* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::isLoadingInAPISense const):
* page/DeprecatedGlobalSettings.cpp:
(WebCore::DeprecatedGlobalSettings::setShouldRespectPriorityInCSSAttributeSetters): Deleted.
(WebCore::DeprecatedGlobalSettings::shouldRespectPriorityInCSSAttributeSetters): Deleted.
* page/DeprecatedGlobalSettings.h:

Source/WebKitLegacy/mac:

Remove two quirks that were only for iAd Producer, which is no longer
supported on the latest macOS operating systems.

* WebView/WebPreferencesDefaultValues.h:
* WebView/WebPreferencesDefaultValues.mm:
(WebKit::defaultNeedsIsLoadingInAPISenseQuirk): Deleted.
* WebView/WebView.mm:
(-[WebView _commonInitializationWithFrameName:groupName:]):
(shouldRespectPriorityInCSSAttributeSetters): Deleted.

Source/WTF:

* Scripts/Preferences/WebPreferences.yaml:
Remove NeedsIsLoadingInAPISenseQuirk preference which only existed to enable
a quirk for iAd Producer.

Modified Paths

Diff

Modified: trunk/Source/WTF/ChangeLog (274073 => 274074)


--- trunk/Source/WTF/ChangeLog	2021-03-08 16:01:44 UTC (rev 274073)
+++ trunk/Source/WTF/ChangeLog	2021-03-08 16:57:53 UTC (rev 274074)
@@ -1,3 +1,14 @@
+2021-03-08  Sam Weinig  <wei...@apple.com>
+
+        Remove quirks for the no longer supported iAd Producer
+        https://bugs.webkit.org/show_bug.cgi?id=222894
+
+        Reviewed by Chris Dumez.
+
+        * Scripts/Preferences/WebPreferences.yaml:
+        Remove NeedsIsLoadingInAPISenseQuirk preference which only existed to enable
+        a quirk for iAd Producer.
+
 2021-03-07  Sam Weinig  <wei...@apple.com>
 
         Move new color(), lab() and lch() color functions behind runtime settings.

Modified: trunk/Source/WTF/Scripts/Preferences/WebPreferences.yaml (274073 => 274074)


--- trunk/Source/WTF/Scripts/Preferences/WebPreferences.yaml	2021-03-08 16:01:44 UTC (rev 274073)
+++ trunk/Source/WTF/Scripts/Preferences/WebPreferences.yaml	2021-03-08 16:57:53 UTC (rev 274074)
@@ -1556,18 +1556,6 @@
     WebCore:
       default: false
 
-NeedsIsLoadingInAPISenseQuirk:
-  comment: Some apps needs isLoadingInAPISense to account for active subresource loaders.
-  type: bool
-  defaultValue:
-    WebKitLegacy:
-      PLATFORM(MAC): WebKit::defaultNeedsIsLoadingInAPISenseQuirk()
-      default: false
-    WebKit:
-      default: false
-    WebCore:
-      default: false
-
 NeedsKeyboardEventDisambiguationQuirks:
   comment: This is a quirk we are pro-actively applying to old applications. It changes
     keyboard event dispatching, making keyIdentifier available on keypress events,

Modified: trunk/Source/WebCore/ChangeLog (274073 => 274074)


--- trunk/Source/WebCore/ChangeLog	2021-03-08 16:01:44 UTC (rev 274073)
+++ trunk/Source/WebCore/ChangeLog	2021-03-08 16:57:53 UTC (rev 274074)
@@ -1,3 +1,30 @@
+2021-03-08  Sam Weinig  <wei...@apple.com>
+
+        Remove quirks for the no longer supported iAd Producer
+        https://bugs.webkit.org/show_bug.cgi?id=222894
+
+        Reviewed by Chris Dumez.
+
+        Remove two quirks that were only for iAd Producer, which is no longer
+        supported on the latest macOS operating systems.
+
+        By removing one quirk, we can also remove some indirection in CSSStyleDeclaration.
+
+        * bindings/scripts/CodeGeneratorJS.pm:
+        (GenerateAttributeSetterBodyDefinition):
+        * bindings/scripts/test/JS/JSTestCSSProperty.cpp:
+        (WebCore::setJSTestCSSProperty_propertySetter):
+        * css/CSSStyleDeclaration.cpp:
+        (WebCore::CSSStyleDeclaration::setNamedItem):
+        (WebCore::CSSStyleDeclaration::setPropertyValueInternal): Deleted.
+        * css/CSSStyleDeclaration.h:
+        * loader/DocumentLoader.cpp:
+        (WebCore::DocumentLoader::isLoadingInAPISense const):
+        * page/DeprecatedGlobalSettings.cpp:
+        (WebCore::DeprecatedGlobalSettings::setShouldRespectPriorityInCSSAttributeSetters): Deleted.
+        (WebCore::DeprecatedGlobalSettings::shouldRespectPriorityInCSSAttributeSetters): Deleted.
+        * page/DeprecatedGlobalSettings.h:
+
 2021-03-08  Commit Queue  <commit-qu...@webkit.org>
 
         Unreviewed, reverting r273197.

Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (274073 => 274074)


--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm	2021-03-08 16:01:44 UTC (rev 274073)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm	2021-03-08 16:57:53 UTC (rev 274074)
@@ -5496,7 +5496,7 @@
         push(@$outputArray, "    auto nativeValue = ${toNativeExpression};\n");
         push(@$outputArray, "    RETURN_IF_EXCEPTION(throwScope, false);\n");
         push(@$outputArray, "    AttributeSetter::call(lexicalGlobalObject, throwScope, [&] {\n");
-        push(@$outputArray, "        return impl.setPropertyValueInternal(CSSProperty${propertyID}, WTFMove(nativeValue));\n");
+        push(@$outputArray, "        return impl.setPropertyInternal(CSSProperty${propertyID}, WTFMove(nativeValue), false);\n");
         push(@$outputArray, "    });\n");
         push(@$outputArray, "    return true;\n");
     } elsif ($isConstructor) {

Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCSSProperty.cpp (274073 => 274074)


--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCSSProperty.cpp	2021-03-08 16:01:44 UTC (rev 274073)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCSSProperty.cpp	2021-03-08 16:57:53 UTC (rev 274074)
@@ -193,7 +193,7 @@
     auto nativeValue = convert<IDLLegacyNullToEmptyStringAdaptor<IDLUSVString>>(lexicalGlobalObject, value);
     RETURN_IF_EXCEPTION(throwScope, false);
     AttributeSetter::call(lexicalGlobalObject, throwScope, [&] {
-        return impl.setPropertyValueInternal(CSSPropertyPropertyName, WTFMove(nativeValue));
+        return impl.setPropertyInternal(CSSPropertyPropertyName, WTFMove(nativeValue), false);
     });
     return true;
 }

Modified: trunk/Source/WebCore/css/CSSStyleDeclaration.cpp (274073 => 274074)


--- trunk/Source/WebCore/css/CSSStyleDeclaration.cpp	2021-03-08 16:01:44 UTC (rev 274073)
+++ trunk/Source/WebCore/css/CSSStyleDeclaration.cpp	2021-03-08 16:57:53 UTC (rev 274074)
@@ -212,20 +212,6 @@
     return propertyIDFromJavaScriptCSSPropertyName(propertyName, nullptr);
 }
 
-ExceptionOr<void> CSSStyleDeclaration::setPropertyValueInternal(CSSPropertyID propertyID, String value)
-{
-    bool important = false;
-    if (DeprecatedGlobalSettings::shouldRespectPriorityInCSSAttributeSetters()) {
-        auto importantIndex = value.findIgnoringASCIICase("!important");
-        if (importantIndex && importantIndex != notFound) {
-            important = true;
-            value = value.left(importantIndex - 1);
-        }
-    }
-
-    return setPropertyInternal(propertyID, WTFMove(value), important);
-}
-
 const Settings* CSSStyleDeclaration::settings() const
 {
     return parentElement() ? &parentElement()->document().settings() : nullptr;
@@ -257,7 +243,7 @@
     }
 
     propertySupported = true;
-    return setPropertyValueInternal(propertyID, WTFMove(value));
+    return setPropertyInternal(propertyID, WTFMove(value), false);
 }
 
 Vector<AtomString> CSSStyleDeclaration::supportedPropertyNames() const

Modified: trunk/Source/WebCore/css/CSSStyleDeclaration.h (274073 => 274074)


--- trunk/Source/WebCore/css/CSSStyleDeclaration.h	2021-03-08 16:01:44 UTC (rev 274073)
+++ trunk/Source/WebCore/css/CSSStyleDeclaration.h	2021-03-08 16:57:53 UTC (rev 274074)
@@ -67,7 +67,6 @@
     virtual RefPtr<CSSValue> getPropertyCSSValueInternal(CSSPropertyID) = 0;
     virtual String getPropertyValueInternal(CSSPropertyID) = 0;
     virtual ExceptionOr<void> setPropertyInternal(CSSPropertyID, const String& value, bool important) = 0;
-    ExceptionOr<void> setPropertyValueInternal(CSSPropertyID, String);
 
     virtual Ref<MutableStyleProperties> copyProperties() const = 0;
 

Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (274073 => 274074)


--- trunk/Source/WebCore/loader/DocumentLoader.cpp	2021-03-08 16:01:44 UTC (rev 274073)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp	2021-03-08 16:57:53 UTC (rev 274074)
@@ -1474,9 +1474,6 @@
     // Once a frame has loaded, we no longer need to consider subresources,
     // but we still need to consider subframes.
     if (frameLoader()->state() != FrameState::Complete) {
-        if (m_frame->settings().needsIsLoadingInAPISenseQuirk() && !m_subresourceLoaders.isEmpty())
-            return true;
-
         ASSERT(m_frame->document());
         auto& document = *m_frame->document();
         if ((isLoadingMainResource() || !document.loadEventFinished()) && isLoading())

Modified: trunk/Source/WebCore/page/DeprecatedGlobalSettings.cpp (274073 => 274074)


--- trunk/Source/WebCore/page/DeprecatedGlobalSettings.cpp	2021-03-08 16:01:44 UTC (rev 274073)
+++ trunk/Source/WebCore/page/DeprecatedGlobalSettings.cpp	2021-03-08 16:57:53 UTC (rev 274074)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All rights reserved.
+ * Copyright (C) 2006-2021 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -49,7 +49,6 @@
 bool DeprecatedGlobalSettings::gShouldUseHighResolutionTimers = true;
 #endif
     
-bool DeprecatedGlobalSettings::gShouldRespectPriorityInCSSAttributeSetters = false;
 bool DeprecatedGlobalSettings::gLowPowerVideoAudioBufferSizeEnabled = false;
 bool DeprecatedGlobalSettings::gResourceLoadStatisticsEnabledEnabled = false;
 bool DeprecatedGlobalSettings::gAllowsAnySSLCertificate = false;
@@ -138,16 +137,6 @@
     return gMockScrollAnimatorEnabled;
 }
 
-void DeprecatedGlobalSettings::setShouldRespectPriorityInCSSAttributeSetters(bool flag)
-{
-    gShouldRespectPriorityInCSSAttributeSetters = flag;
-}
-
-bool DeprecatedGlobalSettings::shouldRespectPriorityInCSSAttributeSetters()
-{
-    return gShouldRespectPriorityInCSSAttributeSetters;
-}
-
 void DeprecatedGlobalSettings::setLowPowerVideoAudioBufferSizeEnabled(bool flag)
 {
     gLowPowerVideoAudioBufferSizeEnabled = flag;

Modified: trunk/Source/WebCore/page/DeprecatedGlobalSettings.h (274073 => 274074)


--- trunk/Source/WebCore/page/DeprecatedGlobalSettings.h	2021-03-08 16:01:44 UTC (rev 274073)
+++ trunk/Source/WebCore/page/DeprecatedGlobalSettings.h	2021-03-08 16:57:53 UTC (rev 274074)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2003-2021 Apple Inc. All rights reserved.
  *           (C) 2006 Graham Dennis (graham.den...@gmail.com)
  *
  * Redistribution and use in source and binary forms, with or without
@@ -60,9 +60,6 @@
     WEBCORE_EXPORT static void setUsesMockScrollAnimator(bool);
     static bool usesMockScrollAnimator();
 
-    WEBCORE_EXPORT static void setShouldRespectPriorityInCSSAttributeSetters(bool);
-    static bool shouldRespectPriorityInCSSAttributeSetters();
-
     static bool lowPowerVideoAudioBufferSizeEnabled() { return gLowPowerVideoAudioBufferSizeEnabled; }
     WEBCORE_EXPORT static void setLowPowerVideoAudioBufferSizeEnabled(bool);
 
@@ -115,7 +112,6 @@
 #if PLATFORM(WIN)
     static bool gShouldUseHighResolutionTimers;
 #endif
-    static bool gShouldRespectPriorityInCSSAttributeSetters;
 #if PLATFORM(IOS_FAMILY)
     static bool gNetworkDataUsageTrackingEnabled;
     WEBCORE_EXPORT static bool gAVKitEnabled;

Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (274073 => 274074)


--- trunk/Source/WebKitLegacy/mac/ChangeLog	2021-03-08 16:01:44 UTC (rev 274073)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog	2021-03-08 16:57:53 UTC (rev 274074)
@@ -1,3 +1,20 @@
+2021-03-08  Sam Weinig  <wei...@apple.com>
+
+        Remove quirks for the no longer supported iAd Producer
+        https://bugs.webkit.org/show_bug.cgi?id=222894
+
+        Reviewed by Chris Dumez.
+
+        Remove two quirks that were only for iAd Producer, which is no longer
+        supported on the latest macOS operating systems.
+
+        * WebView/WebPreferencesDefaultValues.h:
+        * WebView/WebPreferencesDefaultValues.mm:
+        (WebKit::defaultNeedsIsLoadingInAPISenseQuirk): Deleted.
+        * WebView/WebView.mm:
+        (-[WebView _commonInitializationWithFrameName:groupName:]):
+        (shouldRespectPriorityInCSSAttributeSetters): Deleted.
+
 2021-03-06  Sam Weinig  <wei...@apple.com>
 
         Simplify DumpRenderTree WebPreferences reset

Modified: trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesDefaultValues.h (274073 => 274074)


--- trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesDefaultValues.h	2021-03-08 16:01:44 UTC (rev 274073)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesDefaultValues.h	2021-03-08 16:57:53 UTC (rev 274074)
@@ -72,7 +72,6 @@
 bool defaultNeedsFrameNameFallbackToIdQuirk();
 bool defaultNeedsKeyboardEventDisambiguationQuirks();
 bool defaultEnforceCSSMIMETypeInNoQuirksMode();
-bool defaultNeedsIsLoadingInAPISenseQuirk();
 #endif
 
 bool defaultAttachmentElementEnabled();

Modified: trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesDefaultValues.mm (274073 => 274074)


--- trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesDefaultValues.mm	2021-03-08 16:01:44 UTC (rev 274073)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesDefaultValues.mm	2021-03-08 16:57:53 UTC (rev 274074)
@@ -227,12 +227,6 @@
     return needsQuirk;
 }
 
-bool defaultNeedsIsLoadingInAPISenseQuirk()
-{
-    static bool needsQuirk = _CFAppVersionCheckLessThan(CFSTR("com.apple.iAdProducer"), -1, 2.1);
-    return needsQuirk;
-}
-
 #endif // PLATFORM(MAC)
 
 bool defaultAttachmentElementEnabled()

Modified: trunk/Source/WebKitLegacy/mac/WebView/WebView.mm (274073 => 274074)


--- trunk/Source/WebKitLegacy/mac/WebView/WebView.mm	2021-03-08 16:01:44 UTC (rev 274073)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebView.mm	2021-03-08 16:57:53 UTC (rev 274074)
@@ -1390,18 +1390,7 @@
 }
 #endif
 
-static bool shouldRespectPriorityInCSSAttributeSetters()
-{
 #if PLATFORM(IOS_FAMILY)
-    return false;
-#else
-    static bool isIAdProducerNeedingAttributeSetterQuirk = !WebKitLinkedOnOrAfter(WEBKIT_FIRST_VERSION_WITH_CSS_ATTRIBUTE_SETTERS_IGNORING_PRIORITY)
-        && [[[NSBundle mainBundle] bundleIdentifier] isEqualToString:@"com.apple.iAdProducer"];
-    return isIAdProducerNeedingAttributeSetterQuirk;
-#endif
-}
-
-#if PLATFORM(IOS_FAMILY)
 static bool isInternalInstall()
 {
     static bool isInternal = MGGetBoolAnswer(kMGQAppleInternalInstallCapability);
@@ -1502,7 +1491,6 @@
 #if PLATFORM(MAC)
         WebCore::SwitchingGPUClient::setSingleton(WebKit::WebSwitchingGPUClient::singleton());
 #endif
-        WebCore::DeprecatedGlobalSettings::setShouldRespectPriorityInCSSAttributeSetters(shouldRespectPriorityInCSSAttributeSetters());
 
 #if PLATFORM(IOS_FAMILY)
         if (WebCore::IOSApplication::isMobileSafari())
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to