Changeset 268647 in webkit

Timestamp:

Oct 17, 2020 11:30:42 AM (4 years ago)

Author:

weinig@apple.com

Message:

Source/WebKitLegacy:
[Preferences] Add infrastructure for generating preferences for Windows WebKitLegacy
​https://bugs.webkit.org/show_bug.cgi?id=217876

Reviewed by Simon Fraser.

• PlatformWin.cmake:

Add generation of WebPreferences.

Source/WebKitLegacy/win:
[Preferences] Add infrastructure for generating preferences for WWindows WebKitLegacy
​https://bugs.webkit.org/show_bug.cgi?id=217876

Reviewed by Simon Fraser.

• Scripts: Added.
• Scripts/PreferencesTemplates: Added.
• Scripts/PreferencesTemplates/WebPreferencesDefinitions.h.erb: Added.
• Scripts/PreferencesTemplates/WebViewPreferencesChangedGenerated.cpp.erb: Added.

Adds mostly empty generated files to establish infrastructure for generation.

• WebPreferences.cpp:

(WebPreferences::initializeDefaultSettings):

• WebView.cpp:

(WebView::notifyPreferencesChanged):

• WebView.h:

Adopt generated files, which currently don't do anything.

Location:

trunk/Source/WebKitLegacy

Files:

• ChangeLog (modified) (1 diff)
• PlatformWin.cmake (modified) (1 diff)
• win/ChangeLog (modified) (1 diff)
• win/Scripts (added)
• win/Scripts/PreferencesTemplates (added)
• win/Scripts/PreferencesTemplates/WebPreferencesDefinitions.h.erb (added)
• win/Scripts/PreferencesTemplates/WebViewPreferencesChangedGenerated.cpp.erb (added)
• win/WebPreferences.cpp (modified) (2 diffs)
• win/WebView.cpp (modified) (1 diff)
• win/WebView.h (modified) (1 diff)

trunk/Source/WebKitLegacy/ChangeLog

@@ +1 @@
+2020-10-17  Sam Weinig  <weinig@apple.com>
+
+        [Preferences] Add infrastructure for generating preferences for Windows WebKitLegacy
+        https://bugs.webkit.org/show_bug.cgi?id=217876
+
+        Reviewed by Simon Fraser.
+
+        * PlatformWin.cmake:
+        Add generation of WebPreferences.
+
 2020-10-07  Keith Rollin  <krollin@apple.com>
 

trunk/Source/WebKitLegacy/PlatformWin.cmake

@@ -248 +248 @@
     )
 endif ()
+
+
+set(WebKitLegacy_WEB_PREFERENCES_TEMPLATES
+    ${WEBKITLEGACY_DIR}/win/Scripts/PreferencesTemplates/WebPreferencesDefinitions.h.erb
+    ${WEBKITLEGACY_DIR}/win/Scripts/PreferencesTemplates/WebViewPreferencesChangedGenerated.cpp.erb
+)
+
+set(WebKitLegacy_WEB_PREFERENCES
+    ${WTF_SCRIPTS_DIR}/Preferences/WebPreferences.yaml
+    ${WTF_SCRIPTS_DIR}/Preferences/WebPreferencesDebug.yaml
+    ${WTF_SCRIPTS_DIR}/Preferences/WebPreferencesExperimental.yaml
+    ${WTF_SCRIPTS_DIR}/Preferences/WebPreferencesInternal.yaml
+)
+
+set_source_files_properties(${WebKitLegacy_WEB_PREFERENCES} PROPERTIES GENERATED TRUE)
+
+add_custom_command(
+    OUTPUT ${WebKitLegacy_DERIVED_SOURCES_DIR}/WebPreferencesDefinitions.h ${WebKitLegacy_DERIVED_SOURCES_DIR}/WebViewPreferencesChangedGenerated.cpp
+    DEPENDS ${WebKitLegacy_WEB_PREFERENCES_TEMPLATES} ${WebKitLegacy_WEB_PREFERENCES} WTF_CopyPreferences
+    COMMAND ${RUBY_EXECUTABLE} ${WTF_SCRIPTS_DIR}/GeneratePreferences.rb --frontend WebKitLegacy --base ${WTF_SCRIPTS_DIR}/Preferences/WebPreferences.yaml --debug ${WTF_SCRIPTS_DIR}/Preferences/WebPreferencesDebug.yaml --experimental ${WTF_SCRIPTS_DIR}/Preferences/WebPreferencesExperimental.yaml --internal ${WTF_SCRIPTS_DIR}/Preferences/WebPreferencesInternal.yaml --outputDir "${WebKitLegacy_DERIVED_SOURCES_DIR}" --template ${WEBKITLEGACY_DIR}/win/Scripts/PreferencesTemplates/WebPreferencesDefinitions.h.erb --template ${WEBKITLEGACY_DIR}/win/Scripts/PreferencesTemplates/WebViewPreferencesChangedGenerated.cpp.erb
+    VERBATIM)
+
+list(APPEND WebKitLegacy_SOURCES
+    ${WebKitLegacy_DERIVED_SOURCES_DIR}/WebPreferencesDefinitions.h
+    ${WebKitLegacy_DERIVED_SOURCES_DIR}/WebViewPreferencesChangedGenerated.cpp
+)
+
 
 if (CMAKE_SIZEOF_VOID_P EQUAL 8)

trunk/Source/WebKitLegacy/win/ChangeLog

@@ +1 @@
+2020-10-17  Sam Weinig  <weinig@apple.com>
+
+        [Preferences] Add infrastructure for generating preferences for WWindows WebKitLegacy
+        https://bugs.webkit.org/show_bug.cgi?id=217876
+
+        Reviewed by Simon Fraser.
+
+        * Scripts: Added.
+        * Scripts/PreferencesTemplates: Added.
+        * Scripts/PreferencesTemplates/WebPreferencesDefinitions.h.erb: Added.
+        * Scripts/PreferencesTemplates/WebViewPreferencesChangedGenerated.cpp.erb: Added.
+        Adds mostly empty generated files to establish infrastructure for generation.
+        
+        * WebPreferences.cpp:
+        (WebPreferences::initializeDefaultSettings):
+        * WebView.cpp:
+        (WebView::notifyPreferencesChanged):
+        * WebView.h:
+        Adopt generated files, which currently don't do anything.
+
 2020-10-16  Antoine Quint  <graouts@webkit.org>
 

trunk/Source/WebKitLegacy/win/WebPreferences.cpp

@@ -31 +31 @@
 #include "WebNotificationCenter.h"
 #include "WebPreferenceKeysPrivate.h"
+#include "WebPreferencesDefinitions.h"
 
 #if USE(CG)
@@ -208 +209 @@
 
     CFMutableDictionaryRef defaults = CFDictionaryCreateMutable(0, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
+
+    INITIALIZE_DEFAULT_PREFERENCES_DICTIONARY_FROM_GENERATED_PREFERENCES;
 
     CFDictionaryAddValue(defaults, CFSTR(WebKitStandardFontPreferenceKey), CFSTR("Times New Roman"));

trunk/Source/WebKitLegacy/win/WebView.cpp

@@ -5127 +5127 @@
     ASSERT(preferences == m_preferences);
 
+    hr = preferencesChangedGenerated(*m_preferences);
+    if (FAILED(hr))
+        return hr;
+
     BString str;
     int size;

trunk/Source/WebKitLegacy/win/WebView.h

@@ -483 +483 @@
     HRESULT notifyDidAddIcon(IWebNotification*);
     HRESULT notifyPreferencesChanged(IWebNotification*);
+    HRESULT preferencesChangedGenerated(const WebPreferences&);
 
     static void setCacheModel(WebCacheModel);