Changeset 269999 in webkit

Timestamp:

Nov 18, 2020 4:15:12 PM (3 years ago)

Author:

Aditya Keerthi

Message:

[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:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• DerivedSources-input.xcfilelist (modified) (1 diff)
• DerivedSources.make (modified) (1 diff)
• WebCore.xcodeproj/project.pbxproj (modified) (2 diffs)
• css/formControlsIOS.css (moved) (moved from trunk/Source/WebCore/css/iOSFormControlRefresh.css)
• style/InspectorCSSOMWrappers.cpp (modified) (1 diff)
• style/UserAgentStyle.cpp (modified) (2 diffs)
• style/UserAgentStyle.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-11-18  Aditya Keerthi  <akeerthi@apple.com>
+
+        [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  <cdumez@apple.com>
 

trunk/Source/WebCore/DerivedSources-input.xcfilelist

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

trunk/Source/WebCore/DerivedSources.make

@@ -1499 +1499 @@
 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 \

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

@@ -16321 +16321 @@
                 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>"; };
@@ -29302 +29302 @@
                                 1C3249101C6D6A3B007EDB32 /* FontVariantBuilder.cpp */,
                                 C2015C091BE6FE2C00822389 /* FontVariantBuilder.h */,
+                                E54CA6DD255DE2D500F901A3 /* formControlsIOS.css */,
                                 CD4E0AFA11F7BC27009D3811 /* fullscreen.css */,
                                 93CA4C9909DF93FA00DF8677 /* html.css */,
-                                E54CA6DD255DE2D500F901A3 /* iOSFormControlRefresh.css */,
                                 E55F4979151B888000BB67DB /* LengthFunctions.cpp */,
                                 E5BA7D62151437CA00FE1E3F /* LengthFunctions.h */,

trunk/Source/WebCore/style/InspectorCSSOMWrappers.cpp

@@ -120 +120 @@
 #endif
 #if ENABLE(IOS_FORM_CONTROL_REFRESH)
-        collectFromStyleSheetContents(UserAgentStyle::iOSFormControlRefreshStyleSheet);
+        collectFromStyleSheetContents(UserAgentStyle::formControlsIOSStyleSheet);
 #endif
         collectFromStyleSheetContents(UserAgentStyle::plugInsStyleSheet);

trunk/Source/WebCore/style/UserAgentStyle.cpp

@@ -86 +86 @@
 #endif
 #if ENABLE(IOS_FORM_CONTROL_REFRESH)
-StyleSheetContents* UserAgentStyle::iOSFormControlRefreshStyleSheet;
+StyleSheetContents* UserAgentStyle::formControlsIOSStyleSheet;
 #endif
 
@@ -301 +301 @@
 
 #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

trunk/Source/WebCore/style/UserAgentStyle.h

@@ -56 +56 @@
 #endif
 #if ENABLE(IOS_FORM_CONTROL_REFRESH)
-    static StyleSheetContents* iOSFormControlRefreshStyleSheet;
+    static StyleSheetContents* formControlsIOSStyleSheet;
 #endif