Diff
Modified: trunk/Source/WebCore/ChangeLog (269998 => 269999)
--- trunk/Source/WebCore/ChangeLog 2020-11-18 23:50:34 UTC (rev 269998)
+++ trunk/Source/WebCore/ChangeLog 2020-11-19 00:15:12 UTC (rev 269999)
@@ -1,3 +1,20 @@
+2020-11-18 Aditya Keerthi <[email protected]>
+
+ [iOS][FCR] Rename UA style sheet to follow naming convention
+ https://bugs.webkit.org/show_bug.cgi?id=219108
+
+ Reviewed by Tim Horton.
+
+ * DerivedSources-input.xcfilelist:
+ * DerivedSources.make:
+ * WebCore.xcodeproj/project.pbxproj:
+ * css/formControlsIOS.css: Renamed from Source/WebCore/css/iOSFormControlRefresh.css.
+ * style/InspectorCSSOMWrappers.cpp:
+ (WebCore::Style::InspectorCSSOMWrappers::collectDocumentWrappers):
+ * style/UserAgentStyle.cpp:
+ (WebCore::Style::UserAgentStyle::ensureDefaultStyleSheetsForElement):
+ * style/UserAgentStyle.h:
+
2020-11-18 Chris Dumez <[email protected]>
REGRESSION (r269227?): Flaky crash in WebCore::DOMPromiseProxy seen with imported/w3c/web-platform-tests/service-workers/service-worker/referrer-toplevel-script-fetch.https.html
Modified: trunk/Source/WebCore/DerivedSources-input.xcfilelist (269998 => 269999)
--- trunk/Source/WebCore/DerivedSources-input.xcfilelist 2020-11-18 23:50:34 UTC (rev 269998)
+++ trunk/Source/WebCore/DerivedSources-input.xcfilelist 2020-11-19 00:15:12 UTC (rev 269999)
@@ -675,9 +675,9 @@
$(PROJECT_DIR)/css/WebKitCSSViewportRule.idl
$(PROJECT_DIR)/css/WebKitFontFamilyNames.in
$(PROJECT_DIR)/css/dialog.css
+$(PROJECT_DIR)/css/formControlsIOS.css
$(PROJECT_DIR)/css/fullscreen.css
$(PROJECT_DIR)/css/html.css
-$(PROJECT_DIR)/css/iOSFormControlRefresh.css
$(PROJECT_DIR)/css/make-css-file-arrays.pl
$(PROJECT_DIR)/css/makeSelectorPseudoClassAndCompatibilityElementMap.py
$(PROJECT_DIR)/css/makeSelectorPseudoElementsMap.py
Modified: trunk/Source/WebCore/DerivedSources.make (269998 => 269999)
--- trunk/Source/WebCore/DerivedSources.make 2020-11-18 23:50:34 UTC (rev 269998)
+++ trunk/Source/WebCore/DerivedSources.make 2020-11-19 00:15:12 UTC (rev 269999)
@@ -1498,9 +1498,9 @@
USER_AGENT_STYLE_SHEETS = \
$(WebCore)/css/dialog.css \
+ $(WebCore)/css/formControlsIOS.css \
$(WebCore)/css/fullscreen.css \
$(WebCore)/css/html.css \
- $(WebCore)/css/iOSFormControlRefresh.css \
$(WebCore)/css/mathml.css \
$(WebCore)/css/mediaControls.css \
$(WebCore)/css/plugIns.css \
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (269998 => 269999)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2020-11-18 23:50:34 UTC (rev 269998)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2020-11-19 00:15:12 UTC (rev 269999)
@@ -16320,7 +16320,7 @@
E52CF54E20A35A2800DADA27 /* DataListSuggestionPicker.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DataListSuggestionPicker.h; sourceTree = "<group>"; };
E52EFDF22112875A00AD282A /* InputMode.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = InputMode.h; sourceTree = "<group>"; };
E52EFDF32112875A00AD282A /* InputMode.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = InputMode.cpp; sourceTree = "<group>"; };
- E54CA6DD255DE2D500F901A3 /* iOSFormControlRefresh.css */ = {isa = PBXFileReference; lastKnownFileType = text.css; path = iOSFormControlRefresh.css; sourceTree = "<group>"; };
+ E54CA6DD255DE2D500F901A3 /* formControlsIOS.css */ = {isa = PBXFileReference; lastKnownFileType = text.css; path = formControlsIOS.css; sourceTree = "<group>"; };
E55F4979151B888000BB67DB /* LengthFunctions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LengthFunctions.cpp; sourceTree = "<group>"; };
E58B45B820AD07DD00991025 /* DataListButtonElement.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DataListButtonElement.h; sourceTree = "<group>"; };
E596DD26251903D100C275A7 /* NavigatorContacts.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NavigatorContacts.h; sourceTree = "<group>"; };
@@ -29301,9 +29301,9 @@
C2AB0B031E6DE92C001348C5 /* FontSelectionValueInlines.h */,
1C3249101C6D6A3B007EDB32 /* FontVariantBuilder.cpp */,
C2015C091BE6FE2C00822389 /* FontVariantBuilder.h */,
+ E54CA6DD255DE2D500F901A3 /* formControlsIOS.css */,
CD4E0AFA11F7BC27009D3811 /* fullscreen.css */,
93CA4C9909DF93FA00DF8677 /* html.css */,
- E54CA6DD255DE2D500F901A3 /* iOSFormControlRefresh.css */,
E55F4979151B888000BB67DB /* LengthFunctions.cpp */,
E5BA7D62151437CA00FE1E3F /* LengthFunctions.h */,
93CA4C9A09DF93FA00DF8677 /* make-css-file-arrays.pl */,
Copied: trunk/Source/WebCore/css/formControlsIOS.css (from rev 269998, trunk/Source/WebCore/css/iOSFormControlRefresh.css) (0 => 269999)
--- trunk/Source/WebCore/css/formControlsIOS.css (rev 0)
+++ trunk/Source/WebCore/css/formControlsIOS.css 2020-11-19 00:15:12 UTC (rev 269999)
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2020 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#if defined(ENABLE_IOS_FORM_CONTROL_REFRESH) && ENABLE_IOS_FORM_CONTROL_REFRESH
+
+input:matches([type="checkbox"], [type="radio"]) {
+ border: initial;
+ box-sizing: border-box;
+}
+
+input::-webkit-list-button {
+ width: 12px;
+ content: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 71 42"><path fill="rgb(0, 122, 255)" d="M36.00979 41.8692c1.70898 0 3.17383-.63483 4.49219-2.00201L69.45706 10.6192c1.02539-1.07428 1.61133-2.39264 1.61133-3.95514C71.06839 3.49017 68.52933 1 65.40433 1c-1.51367 0-2.97852.63477-4.10156 1.75781L36.05863 28.4414 10.76566 2.75781C9.64261 1.63476 8.2266 1 6.61527 1c-3.125 0-5.61523 2.49017-5.61523 5.66406 0 1.5625.53711 2.88086 1.61133 3.95514l28.95508 29.24799c1.36719 1.36719 2.7832 2.00201 4.44336 2.00201z"/></svg>');
+}
+
+#endif
Deleted: trunk/Source/WebCore/css/iOSFormControlRefresh.css (269998 => 269999)
--- trunk/Source/WebCore/css/iOSFormControlRefresh.css 2020-11-18 23:50:34 UTC (rev 269998)
+++ trunk/Source/WebCore/css/iOSFormControlRefresh.css 2020-11-19 00:15:12 UTC (rev 269999)
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2020 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#if defined(ENABLE_IOS_FORM_CONTROL_REFRESH) && ENABLE_IOS_FORM_CONTROL_REFRESH
-
-input:matches([type="checkbox"], [type="radio"]) {
- border: initial;
- box-sizing: border-box;
-}
-
-input::-webkit-list-button {
- width: 12px;
- content: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 71 42"><path fill="rgb(0, 122, 255)" d="M36.00979 41.8692c1.70898 0 3.17383-.63483 4.49219-2.00201L69.45706 10.6192c1.02539-1.07428 1.61133-2.39264 1.61133-3.95514C71.06839 3.49017 68.52933 1 65.40433 1c-1.51367 0-2.97852.63477-4.10156 1.75781L36.05863 28.4414 10.76566 2.75781C9.64261 1.63476 8.2266 1 6.61527 1c-3.125 0-5.61523 2.49017-5.61523 5.66406 0 1.5625.53711 2.88086 1.61133 3.95514l28.95508 29.24799c1.36719 1.36719 2.7832 2.00201 4.44336 2.00201z"/></svg>');
-}
-
-#endif
Modified: trunk/Source/WebCore/style/InspectorCSSOMWrappers.cpp (269998 => 269999)
--- trunk/Source/WebCore/style/InspectorCSSOMWrappers.cpp 2020-11-18 23:50:34 UTC (rev 269998)
+++ trunk/Source/WebCore/style/InspectorCSSOMWrappers.cpp 2020-11-19 00:15:12 UTC (rev 269999)
@@ -119,7 +119,7 @@
collectFromStyleSheetContents(UserAgentStyle::colorInputStyleSheet);
#endif
#if ENABLE(IOS_FORM_CONTROL_REFRESH)
- collectFromStyleSheetContents(UserAgentStyle::iOSFormControlRefreshStyleSheet);
+ collectFromStyleSheetContents(UserAgentStyle::formControlsIOSStyleSheet);
#endif
collectFromStyleSheetContents(UserAgentStyle::plugInsStyleSheet);
collectFromStyleSheetContents(UserAgentStyle::mediaQueryStyleSheet);
Modified: trunk/Source/WebCore/style/UserAgentStyle.cpp (269998 => 269999)
--- trunk/Source/WebCore/style/UserAgentStyle.cpp 2020-11-18 23:50:34 UTC (rev 269998)
+++ trunk/Source/WebCore/style/UserAgentStyle.cpp 2020-11-19 00:15:12 UTC (rev 269999)
@@ -85,7 +85,7 @@
StyleSheetContents* UserAgentStyle::colorInputStyleSheet;
#endif
#if ENABLE(IOS_FORM_CONTROL_REFRESH)
-StyleSheetContents* UserAgentStyle::iOSFormControlRefreshStyleSheet;
+StyleSheetContents* UserAgentStyle::formControlsIOSStyleSheet;
#endif
#if PLATFORM(IOS_FAMILY)
@@ -300,9 +300,9 @@
#endif // ENABLE(FULLSCREEN_API)
#if ENABLE(IOS_FORM_CONTROL_REFRESH)
- if (!iOSFormControlRefreshStyleSheet && element.document().settings().iOSFormControlRefreshEnabled()) {
- iOSFormControlRefreshStyleSheet = parseUASheet(iOSFormControlRefreshUserAgentStyleSheet, sizeof(iOSFormControlRefreshUserAgentStyleSheet));
- addToDefaultStyle(*iOSFormControlRefreshStyleSheet);
+ if (!formControlsIOSStyleSheet && element.document().settings().iOSFormControlRefreshEnabled()) {
+ formControlsIOSStyleSheet = parseUASheet(formControlsIOSUserAgentStyleSheet, sizeof(formControlsIOSUserAgentStyleSheet));
+ addToDefaultStyle(*formControlsIOSStyleSheet);
}
#endif
Modified: trunk/Source/WebCore/style/UserAgentStyle.h (269998 => 269999)
--- trunk/Source/WebCore/style/UserAgentStyle.h 2020-11-18 23:50:34 UTC (rev 269998)
+++ trunk/Source/WebCore/style/UserAgentStyle.h 2020-11-19 00:15:12 UTC (rev 269999)
@@ -55,7 +55,7 @@
static StyleSheetContents* colorInputStyleSheet;
#endif
#if ENABLE(IOS_FORM_CONTROL_REFRESH)
- static StyleSheetContents* iOSFormControlRefreshStyleSheet;
+ static StyleSheetContents* formControlsIOSStyleSheet;
#endif
static StyleSheetContents* mediaQueryStyleSheet;
