Generate IPC serialization for WebCore::UserStyleLevel enumeration

https://bugs.webkit.org/show_bug.cgi?id=264403 Reviewed by Chris Dumez and Michael Catanzaro. Turn the WebCore::UserStyleLevel enumeration into a scoped one, adjusting uses of values accordingly. This enables removing the EnumTraits specialization in favor of better-handled IPC serialization specification. * Source/WebCore/dom/ExtensionStyleSheets.cpp: (WebCore::createExtensionsStyleSheet): (WebCore::ExtensionStyleSheets::pageUserSheet): * Source/WebCore/page/UserStyleSheet.h: (WebCore::UserStyleSheet::UserStyleSheet): * Source/WebCore/page/UserStyleSheetTypes.h: * Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in: * Source/WebKit/UIProcess/API/Cocoa/_WKUserStyleSheet.mm: (-[_WKUserStyleSheet initWithSource:forMainFrameOnly:]): * Source/WebKit/UIProcess/API/Cocoa/_WKUserStyleSheetInternal.h: (API::toWebCoreUserStyleLevel): * Source/WebKit/UIProcess/API/glib/WebKitUserContent.cpp: (toUserStyleLevel): * Source/WebKit/UIProcess/Extensions/Cocoa/WebExtensionContextCocoa.mm: (WebKit::WebExtensionContext::addInjectedContent): * Source/WebKit/UIProcess/Extensions/Cocoa/WebExtensionDynamicScriptsCocoa.mm: (WebKit::WebExtensionDynamicScripts::injectStyleSheets): * Source/WebKit/WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::addUserStyleSheet): * Source/WebKitLegacy/mac/WebView/WebView.mm: (+[WebView _addUserStyleSheetToGroup:world:source:url:includeMatchPatternStrings:excludeMatchPatternStrings:injectedFrames:]): Canonical link: https://commits.webkit.org/270452@main
WebKit · Nov 9, 2023 · ead871f · ead871f
1 parent 5a9734b
commit ead871f
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 28 deletions.
diff --git a/Source/WebCore/dom/ExtensionStyleSheets.cpp b/Source/WebCore/dom/ExtensionStyleSheets.cpp
@@ -62,7 +62,7 @@ static Ref<CSSStyleSheet> createExtensionsStyleSheet(Document& document, URL url
     auto contents = StyleSheetContents::create(url.string(), CSSParserContext(document, url));
     auto styleSheet = CSSStyleSheet::create(contents.get(), document, true);
 
-    contents->setIsUserStyleSheet(level == UserStyleUserLevel);
+    contents->setIsUserStyleSheet(level == UserStyleLevel::User);
     contents->parseString(text);
 
     return styleSheet;
@@ -81,7 +81,7 @@ CSSStyleSheet* ExtensionStyleSheets::pageUserSheet()
     if (userSheetText.isEmpty())
         return 0;
 
-    m_pageUserSheet = createExtensionsStyleSheet(m_document, m_document.settings().userStyleSheetLocation(), userSheetText, UserStyleUserLevel);
+    m_pageUserSheet = createExtensionsStyleSheet(m_document, m_document.settings().userStyleSheetLocation(), userSheetText, UserStyleLevel::User);
 
     return m_pageUserSheet.get();
 }

diff --git a/Source/WebCore/page/UserStyleSheet.h b/Source/WebCore/page/UserStyleSheet.h
@@ -38,7 +38,7 @@ class UserStyleSheet {
 public:
     UserStyleSheet()
         : m_injectedFrames(UserContentInjectedFrames::InjectInAllFrames)
-        , m_level(UserStyleUserLevel)
+        , m_level(UserStyleLevel::User)
     {
     }
 

diff --git a/Source/WebCore/page/UserStyleSheetTypes.h b/Source/WebCore/page/UserStyleSheetTypes.h
@@ -25,14 +25,13 @@
 
 #pragma once
 
-#include <wtf/EnumTraits.h>
 #include <wtf/HashMap.h>
 #include <wtf/Vector.h>
 
 namespace WebCore {
 
 enum UserStyleInjectionTime { InjectInExistingDocuments, InjectInSubsequentDocuments };
-enum UserStyleLevel { UserStyleUserLevel, UserStyleAuthorLevel };
+enum class UserStyleLevel : bool { User, Author };
 
 class DOMWrapperWorld;
 class UserStyleSheet;
@@ -41,15 +40,3 @@ typedef Vector<std::unique_ptr<UserStyleSheet>> UserStyleSheetVector;
 typedef HashMap<RefPtr<DOMWrapperWorld>, std::unique_ptr<UserStyleSheetVector>> UserStyleSheetMap;
 
 } // namespace WebCore
-
-namespace WTF {
-
-template<> struct EnumTraits<WebCore::UserStyleLevel> {
-    using values = EnumValues<
-        WebCore::UserStyleLevel,
-        WebCore::UserStyleLevel::UserStyleUserLevel,
-        WebCore::UserStyleLevel::UserStyleAuthorLevel
-    >;
-};
-
-} // namespace WTF
diff --git a/Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in b/Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in
@@ -6660,3 +6660,5 @@ struct WebCore::KeypressCommand {
     String text;
 }
 #endif
+
+[Nested] enum class WebCore::UserStyleLevel : bool;
diff --git a/Source/WebKit/UIProcess/API/Cocoa/_WKUserStyleSheet.mm b/Source/WebKit/UIProcess/API/Cocoa/_WKUserStyleSheet.mm
@@ -47,7 +47,7 @@ - (instancetype)initWithSource:(NSString *)source forMainFrameOnly:(BOOL)forMain
     // FIXME: In the API test, we can use generateUniqueURL below before the API::Object constructor has done this... where should this really be?
     WebKit::InitializeWebKit2();
 
-    API::Object::constructInWrapper<API::UserStyleSheet>(self, WebCore::UserStyleSheet { source, API::UserStyleSheet::generateUniqueURL(), { }, { }, forMainFrameOnly ? WebCore::UserContentInjectedFrames::InjectInTopFrameOnly : WebCore::UserContentInjectedFrames::InjectInAllFrames, WebCore::UserStyleUserLevel }, API::ContentWorld::pageContentWorld());
+    API::Object::constructInWrapper<API::UserStyleSheet>(self, WebCore::UserStyleSheet { source, API::UserStyleSheet::generateUniqueURL(), { }, { }, forMainFrameOnly ? WebCore::UserContentInjectedFrames::InjectInTopFrameOnly : WebCore::UserContentInjectedFrames::InjectInAllFrames, WebCore::UserStyleLevel::User }, API::ContentWorld::pageContentWorld());
 
     return self;
 }

diff --git a/Source/WebKit/UIProcess/API/Cocoa/_WKUserStyleSheetInternal.h b/Source/WebKit/UIProcess/API/Cocoa/_WKUserStyleSheetInternal.h
@@ -41,13 +41,13 @@ inline WebCore::UserStyleLevel toWebCoreUserStyleLevel(_WKUserStyleLevel level)
 {
     switch (level) {
     case _WKUserStyleUserLevel:
-        return WebCore::UserStyleUserLevel;
+        return WebCore::UserStyleLevel::User;
     case _WKUserStyleAuthorLevel:
-        return WebCore::UserStyleAuthorLevel;
+        return WebCore::UserStyleLevel::Author;
     }
 
     ASSERT_NOT_REACHED();
-    return WebCore::UserStyleUserLevel;
+    return WebCore::UserStyleLevel::User;
 }
 
 }

diff --git a/Source/WebKit/UIProcess/API/glib/WebKitUserContent.cpp b/Source/WebKit/UIProcess/API/glib/WebKitUserContent.cpp
@@ -52,12 +52,12 @@ static inline UserStyleLevel toUserStyleLevel(WebKitUserStyleLevel styleLevel)
 {
     switch (styleLevel) {
     case WEBKIT_USER_STYLE_LEVEL_USER:
-        return UserStyleUserLevel;
+        return UserStyleLevel::User;
     case WEBKIT_USER_STYLE_LEVEL_AUTHOR:
-        return UserStyleAuthorLevel;
+        return UserStyleLevel::Author;
     default:
         ASSERT_NOT_REACHED();
-        return UserStyleAuthorLevel;
+        return UserStyleLevel::Author;
     }
 }
 

diff --git a/Source/WebKit/UIProcess/Extensions/Cocoa/WebExtensionContextCocoa.mm b/Source/WebKit/UIProcess/Extensions/Cocoa/WebExtensionContextCocoa.mm
@@ -2357,7 +2357,7 @@ static _WKWebExtensionContextError toAPI(WebExtensionContext::Error error)
             if (!styleSheetString)
                 continue;
 
-            auto userStyleSheet = API::UserStyleSheet::create(WebCore::UserStyleSheet { styleSheetString, URL { m_baseURL, styleSheetPath }, makeVector<String>(includeMatchPatterns), makeVector<String>(excludeMatchPatterns), injectedFrames, WebCore::UserStyleUserLevel, std::nullopt }, executionWorld);
+            auto userStyleSheet = API::UserStyleSheet::create(WebCore::UserStyleSheet { styleSheetString, URL { m_baseURL, styleSheetPath }, makeVector<String>(includeMatchPatterns), makeVector<String>(excludeMatchPatterns), injectedFrames, WebCore::UserStyleLevel::User, std::nullopt }, executionWorld);
             originInjectedStyleSheets.append(userStyleSheet);
 
             for (auto& userContentController : userContentControllers)

diff --git a/Source/WebKit/UIProcess/Extensions/Cocoa/WebExtensionDynamicScriptsCocoa.mm b/Source/WebKit/UIProcess/Extensions/Cocoa/WebExtensionDynamicScriptsCocoa.mm
@@ -106,7 +106,7 @@ void injectStyleSheets(SourcePairs styleSheetPairs, WKWebView *webView, API::Con
         if (!styleSheet)
             continue;
 
-        auto userStyleSheet = API::UserStyleSheet::create(WebCore::UserStyleSheet { styleSheet.value().first, styleSheet.value().second.value_or(URL { }), Vector<String> { }, Vector<String> { }, injectedFrames, WebCore::UserStyleUserLevel, pageID }, executionWorld);
+        auto userStyleSheet = API::UserStyleSheet::create(WebCore::UserStyleSheet { styleSheet.value().first, styleSheet.value().second.value_or(URL { }), Vector<String> { }, Vector<String> { }, injectedFrames, WebCore::UserStyleLevel::User, pageID }, executionWorld);
 
         for (auto& controller : context.extensionController()->allUserContentControllers())
             controller.addUserStyleSheet(userStyleSheet);

diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.cpp b/Source/WebKit/WebProcess/WebPage/WebPage.cpp
@@ -7607,7 +7607,7 @@ void WebPage::addUserScript(String&& source, InjectedBundleScriptWorld& world, W
 
 void WebPage::addUserStyleSheet(const String& source, WebCore::UserContentInjectedFrames injectedFrames)
 {
-    WebCore::UserStyleSheet userStyleSheet {source, aboutBlankURL(), Vector<String>(), Vector<String>(), injectedFrames, UserStyleUserLevel };
+    WebCore::UserStyleSheet userStyleSheet { source, aboutBlankURL(), Vector<String>(), Vector<String>(), injectedFrames, UserStyleLevel::User };
 
     Ref { m_userContentController }->addUserStyleSheet(InjectedBundleScriptWorld::normalWorld(), WTFMove(userStyleSheet));
 }

diff --git a/Source/WebKitLegacy/mac/WebView/WebView.mm b/Source/WebKitLegacy/mac/WebView/WebView.mm
@@ -4274,7 +4274,7 @@ + (void)_addUserStyleSheetToGroup:(NSString *)groupName world:(WebScriptWorld *)
     if (!world)
         return;
 
-    auto styleSheet = makeUnique<WebCore::UserStyleSheet>(source, url, makeVector<String>(includeMatchPatternStrings), makeVector<String>(excludeMatchPatternStrings), injectedFrames == WebInjectInAllFrames ? WebCore::UserContentInjectedFrames::InjectInAllFrames : WebCore::UserContentInjectedFrames::InjectInTopFrameOnly, WebCore::UserStyleUserLevel);
+    auto styleSheet = makeUnique<WebCore::UserStyleSheet>(source, url, makeVector<String>(includeMatchPatternStrings), makeVector<String>(excludeMatchPatternStrings), injectedFrames == WebInjectInAllFrames ? WebCore::UserContentInjectedFrames::InjectInAllFrames : WebCore::UserContentInjectedFrames::InjectInTopFrameOnly, WebCore::UserStyleLevel::User);
     viewGroup->userContentController().addUserStyleSheet(*core(world), WTFMove(styleSheet), WebCore::InjectInExistingDocuments);
 }