Changeset 269775 in webkit

Timestamp:

Nov 13, 2020 7:30:59 AM (3 years ago)

Author:

Aditya Keerthi

Message:

[iOS][FCR] Add an internal feature flag to enable the new appearance
​https://bugs.webkit.org/show_bug.cgi?id=218873
<rdar://problem/71345270>

Reviewed by Tim Horton.

Source/WebCore:

Add a feature flag for the iOS form control refresh, so that the
feature can be tested.

A new user-agent stylesheet is introduced for the refresh so that
the new styles can be opted in to at runtime. Only styles which
differ from the existing stylesheet will be added to the new one.

• DerivedSources-input.xcfilelist:
• DerivedSources.make:
• WebCore.xcodeproj/project.pbxproj:
• css/iOSFormControlRefresh.css: Added.
• style/InspectorCSSOMWrappers.cpp:

(WebCore::Style::InspectorCSSOMWrappers::collectDocumentWrappers):

• style/UserAgentStyle.cpp:

(WebCore::Style::UserAgentStyle::ensureDefaultStyleSheetsForElement):

• style/UserAgentStyle.h:

Source/WTF:

Enable the feature at build time on PLATFORM(IOS_FAMILY) and disable
the feature at runtime.

• Scripts/Preferences/WebPreferencesInternal.yaml:
• wtf/PlatformEnable.h:
• wtf/PlatformEnableCocoa.h:

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/Scripts/Preferences/WebPreferencesInternal.yaml (modified) (1 diff)
• WTF/wtf/PlatformEnable.h (modified) (1 diff)
• WTF/wtf/PlatformEnableCocoa.h (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/DerivedSources-input.xcfilelist (modified) (1 diff)
• WebCore/DerivedSources.make (modified) (1 diff)
• WebCore/WebCore.xcodeproj/project.pbxproj (modified) (2 diffs)
• WebCore/css/iOSFormControlRefresh.css (added)
• WebCore/style/InspectorCSSOMWrappers.cpp (modified) (1 diff)
• WebCore/style/UserAgentStyle.cpp (modified) (2 diffs)
• WebCore/style/UserAgentStyle.h (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2020-11-13  Aditya Keerthi  <akeerthi@apple.com>
+
+        [iOS][FCR] Add an internal feature flag to enable the new appearance
+        https://bugs.webkit.org/show_bug.cgi?id=218873
+        <rdar://problem/71345270>
+
+        Reviewed by Tim Horton.
+
+        Enable the feature at build time on PLATFORM(IOS_FAMILY) and disable
+        the feature at runtime.
+
+        * Scripts/Preferences/WebPreferencesInternal.yaml:
+        * wtf/PlatformEnable.h:
+        * wtf/PlatformEnableCocoa.h:
+
 2020-11-12  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WTF/Scripts/Preferences/WebPreferencesInternal.yaml

@@ -307 +307 @@
       default: true
 
+IOSFormControlRefreshEnabled:
+  type: bool
+  humanReadableName: "iOS Form Control Refresh"
+  humanReadableDescription: "Enable the new appearance for form controls on iOS"
+  condition: ENABLE(IOS_FORM_CONTROL_REFRESH)
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      default: false
+    WebCore:
+      default: false
+
 IPCTestingAPIEnabled:
   type: bool

trunk/Source/WTF/wtf/PlatformEnable.h

@@ -312 +312 @@
 #endif
 
+#if !defined(ENABLE_IOS_FORM_CONTROL_REFRESH)
+#define ENABLE_IOS_FORM_CONTROL_REFRESH 0
+#endif
+
 #if !defined(ENABLE_IPC_TESTING_API)
 /* Enable IPC testing on all ASAN builds and debug builds. */

trunk/Source/WTF/wtf/PlatformEnableCocoa.h

@@ -285 +285 @@
 #endif
 
+#if !defined(ENABLE_IOS_FORM_CONTROL_REFRESH) && PLATFORM(IOS_FAMILY)
+#define ENABLE_IOS_FORM_CONTROL_REFRESH 1
+#endif
+
 #if !defined(ENABLE_IOS_GESTURE_EVENTS) && PLATFORM(IOS_FAMILY) && USE(APPLE_INTERNAL_SDK)
 #define ENABLE_IOS_GESTURE_EVENTS 1

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-11-13  Aditya Keerthi  <akeerthi@apple.com>
+
+        [iOS][FCR] Add an internal feature flag to enable the new appearance
+        https://bugs.webkit.org/show_bug.cgi?id=218873
+        <rdar://problem/71345270>
+
+        Reviewed by Tim Horton.
+
+        Add a feature flag for the iOS form control refresh, so that the
+        feature can be tested.
+
+        A new user-agent stylesheet is introduced for the refresh so that
+        the new styles can be opted in to at runtime. Only styles which
+        differ from the existing stylesheet will be added to the new one.
+
+        * DerivedSources-input.xcfilelist:
+        * DerivedSources.make:
+        * WebCore.xcodeproj/project.pbxproj:
+        * css/iOSFormControlRefresh.css: Added.
+        * style/InspectorCSSOMWrappers.cpp:
+        (WebCore::Style::InspectorCSSOMWrappers::collectDocumentWrappers):
+        * style/UserAgentStyle.cpp:
+        (WebCore::Style::UserAgentStyle::ensureDefaultStyleSheetsForElement):
+        * style/UserAgentStyle.h:
+
 2020-11-13  Antoine Quint  <graouts@webkit.org>
 

trunk/Source/WebCore/DerivedSources-input.xcfilelist

@@ -676 +676 @@
 $(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

trunk/Source/WebCore/DerivedSources.make

@@ -1499 +1499 @@
     $(WebCore)/css/fullscreen.css \
     $(WebCore)/css/html.css \
+    $(WebCore)/css/iOSFormControlRefresh.css \
     $(WebCore)/css/mathml.css \
     $(WebCore)/css/mediaControls.css \

trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -16277 +16277 @@
                 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>"; };
                 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>"; };
@@ -29221 +29222 @@
                                 CD4E0AFA11F7BC27009D3811 /* fullscreen.css */,
                                 93CA4C9909DF93FA00DF8677 /* html.css */,
+                                E54CA6DD255DE2D500F901A3 /* iOSFormControlRefresh.css */,
                                 E55F4979151B888000BB67DB /* LengthFunctions.cpp */,
                                 E5BA7D62151437CA00FE1E3F /* LengthFunctions.h */,

trunk/Source/WebCore/style/InspectorCSSOMWrappers.cpp

@@ -119 +119 @@
         collectFromStyleSheetContents(UserAgentStyle::colorInputStyleSheet);
 #endif
+#if ENABLE(IOS_FORM_CONTROL_REFRESH)
+        collectFromStyleSheetContents(UserAgentStyle::iOSFormControlRefreshStyleSheet);
+#endif
         collectFromStyleSheetContents(UserAgentStyle::plugInsStyleSheet);
         collectFromStyleSheetContents(UserAgentStyle::mediaQueryStyleSheet);

trunk/Source/WebCore/style/UserAgentStyle.cpp

@@ -85 +85 @@
 StyleSheetContents* UserAgentStyle::colorInputStyleSheet;
 #endif
+#if ENABLE(IOS_FORM_CONTROL_REFRESH)
+StyleSheetContents* UserAgentStyle::iOSFormControlRefreshStyleSheet;
+#endif
 
 #if PLATFORM(IOS_FAMILY)
@@ -297 +300 @@
 #endif // ENABLE(FULLSCREEN_API)
 
+#if ENABLE(IOS_FORM_CONTROL_REFRESH)
+    if (!iOSFormControlRefreshStyleSheet && element.document().settings().iOSFormControlRefreshEnabled()) {
+        iOSFormControlRefreshStyleSheet = parseUASheet(iOSFormControlRefreshUserAgentStyleSheet, sizeof(iOSFormControlRefreshUserAgentStyleSheet));
+        addToDefaultStyle(*iOSFormControlRefreshStyleSheet);
+    }
+#endif
+
     ASSERT(defaultStyle->features().idsInRules.isEmpty());
     ASSERT(mathMLStyleSheet || defaultStyle->features().siblingRules.isEmpty());

trunk/Source/WebCore/style/UserAgentStyle.h

@@ -55 +55 @@
     static StyleSheetContents* colorInputStyleSheet;
 #endif
+#if ENABLE(IOS_FORM_CONTROL_REFRESH)
+    static StyleSheetContents* iOSFormControlRefreshStyleSheet;
+#endif
 
     static StyleSheetContents* mediaQueryStyleSheet;