Diff
Modified: trunk/Source/WebKit/ChangeLog (235992 => 235993)
--- trunk/Source/WebKit/ChangeLog 2018-09-13 22:32:33 UTC (rev 235992)
+++ trunk/Source/WebKit/ChangeLog 2018-09-13 22:33:10 UTC (rev 235993)
@@ -1,3 +1,25 @@
+2018-09-13 Dean Jackson <[email protected]>
+
+ Generate warnings for Preferences files
+ https://bugs.webkit.org/show_bug.cgi?id=189573
+
+ Reviewed by Sam Weinig.
+
+ Generate the "DO NOT EDIT" warnings, rather than have
+ them in the template (which was confusing).
+
+ While here, simplify some of the templating generation code
+ to avoid duplication.
+
+ * Scripts/GeneratePreferences.rb:
+ * Scripts/PreferencesTemplates/WebPageUpdatePreferences.cpp.erb:
+ * Scripts/PreferencesTemplates/WebPreferencesDefinitions.h.erb:
+ * Scripts/PreferencesTemplates/WebPreferencesExperimentalFeatures.cpp.erb:
+ * Scripts/PreferencesTemplates/WebPreferencesInternalDebugFeatures.cpp.erb:
+ * Scripts/PreferencesTemplates/WebPreferencesKeys.cpp.erb:
+ * Scripts/PreferencesTemplates/WebPreferencesKeys.h.erb:
+ * Scripts/PreferencesTemplates/WebPreferencesStoreDefaultsMap.cpp.erb:
+
2018-09-13 Keith Rollin <[email protected]>
WebPageProxy::reportPageLoadResult can crash on some code paths
Modified: trunk/Source/WebKit/Scripts/GeneratePreferences.rb (235992 => 235993)
--- trunk/Source/WebKit/Scripts/GeneratePreferences.rb 2018-09-13 22:32:33 UTC (rev 235992)
+++ trunk/Source/WebKit/Scripts/GeneratePreferences.rb 2018-09-13 22:33:10 UTC (rev 235993)
@@ -129,7 +129,9 @@
class Preferences
attr_accessor :preferences
- def initialize(hash)
+ def initialize(hash, outputDirectory)
+ @outputDirectory = outputDirectory
+
@preferences = []
hash.each do |name, options|
@preferences << Preference.new(name, options)
@@ -144,23 +146,25 @@
@preferencesBoundToSetting = @preferences.select { |p| !p.webcoreBinding }
@preferencesBoundToDeprecatedGlobalSettings = @preferences.select { |p| p.webcoreBinding == "DeprecatedGlobalSettings" }
@preferencesBoundToRuntimeEnabledFeatures = @preferences.select { |p| p.webcoreBinding == "RuntimeEnabledFeatures" }
+
+ @warning = "THIS FILE WAS AUTOMATICALLY GENERATED, DO NOT EDIT."
end
- def renderToFile(template, file)
- template = File.join(File.dirname(__FILE__), template)
+ def renderTemplate(template)
+ templateFile = File.join(File.dirname(__FILE__), "PreferencesTemplates", template + ".erb")
- output = ERB.new(File.read(template), 0, "-").result(binding)
- File.open(file, "w+") do |f|
+ output = ERB.new(File.read(templateFile), 0, "-").result(binding)
+ File.open(File.join(@outputDirectory, template), "w+") do |f|
f.write(output)
end
end
end
-preferences = Preferences.new(parsedPreferences)
-preferences.renderToFile("PreferencesTemplates/WebPreferencesDefinitions.h.erb", File.join(options[:outputDirectory], "WebPreferencesDefinitions.h"))
-preferences.renderToFile("PreferencesTemplates/WebPageUpdatePreferences.cpp.erb", File.join(options[:outputDirectory], "WebPageUpdatePreferences.cpp"))
-preferences.renderToFile("PreferencesTemplates/WebPreferencesKeys.h.erb", File.join(options[:outputDirectory], "WebPreferencesKeys.h"))
-preferences.renderToFile("PreferencesTemplates/WebPreferencesKeys.cpp.erb", File.join(options[:outputDirectory], "WebPreferencesKeys.cpp"))
-preferences.renderToFile("PreferencesTemplates/WebPreferencesStoreDefaultsMap.cpp.erb", File.join(options[:outputDirectory], "WebPreferencesStoreDefaultsMap.cpp"))
-preferences.renderToFile("PreferencesTemplates/WebPreferencesInternalDebugFeatures.cpp.erb", File.join(options[:outputDirectory], "WebPreferencesInternalDebugFeatures.cpp"))
-preferences.renderToFile("PreferencesTemplates/WebPreferencesExperimentalFeatures.cpp.erb", File.join(options[:outputDirectory], "WebPreferencesExperimentalFeatures.cpp"))
+preferences = Preferences.new(parsedPreferences, options[:outputDirectory])
+preferences.renderTemplate("WebPreferencesDefinitions.h")
+preferences.renderTemplate("WebPageUpdatePreferences.cpp")
+preferences.renderTemplate("WebPreferencesKeys.h")
+preferences.renderTemplate("WebPreferencesKeys.cpp")
+preferences.renderTemplate("WebPreferencesStoreDefaultsMap.cpp")
+preferences.renderTemplate("WebPreferencesInternalDebugFeatures.cpp")
+preferences.renderTemplate("WebPreferencesExperimentalFeatures.cpp")
Modified: trunk/Source/WebKit/Scripts/PreferencesTemplates/WebPageUpdatePreferences.cpp.erb (235992 => 235993)
--- trunk/Source/WebKit/Scripts/PreferencesTemplates/WebPageUpdatePreferences.cpp.erb 2018-09-13 22:32:33 UTC (rev 235992)
+++ trunk/Source/WebKit/Scripts/PreferencesTemplates/WebPageUpdatePreferences.cpp.erb 2018-09-13 22:33:10 UTC (rev 235993)
@@ -1,5 +1,5 @@
/*
- * THIS FILE WAS AUTOMATICALLY GENERATED, DO NOT EDIT.
+ * <%= @warning %>
*
* Copyright (C) 2017 Apple Inc. All rights reserved.
*
Modified: trunk/Source/WebKit/Scripts/PreferencesTemplates/WebPreferencesDefinitions.h.erb (235992 => 235993)
--- trunk/Source/WebKit/Scripts/PreferencesTemplates/WebPreferencesDefinitions.h.erb 2018-09-13 22:32:33 UTC (rev 235992)
+++ trunk/Source/WebKit/Scripts/PreferencesTemplates/WebPreferencesDefinitions.h.erb 2018-09-13 22:33:10 UTC (rev 235993)
@@ -1,5 +1,5 @@
/*
- * THIS FILE WAS AUTOMATICALLY GENERATED, DO NOT EDIT.
+ * <%= @warning %>
*
* Copyright (C) 2017 Apple Inc. All rights reserved.
*
Modified: trunk/Source/WebKit/Scripts/PreferencesTemplates/WebPreferencesExperimentalFeatures.cpp.erb (235992 => 235993)
--- trunk/Source/WebKit/Scripts/PreferencesTemplates/WebPreferencesExperimentalFeatures.cpp.erb 2018-09-13 22:32:33 UTC (rev 235992)
+++ trunk/Source/WebKit/Scripts/PreferencesTemplates/WebPreferencesExperimentalFeatures.cpp.erb 2018-09-13 22:33:10 UTC (rev 235993)
@@ -1,5 +1,5 @@
/*
- * THIS FILE WAS AUTOMATICALLY GENERATED, DO NOT EDIT.
+ * <%= @warning %>
*
* Copyright (C) 2017 Apple Inc. All rights reserved.
*
Modified: trunk/Source/WebKit/Scripts/PreferencesTemplates/WebPreferencesInternalDebugFeatures.cpp.erb (235992 => 235993)
--- trunk/Source/WebKit/Scripts/PreferencesTemplates/WebPreferencesInternalDebugFeatures.cpp.erb 2018-09-13 22:32:33 UTC (rev 235992)
+++ trunk/Source/WebKit/Scripts/PreferencesTemplates/WebPreferencesInternalDebugFeatures.cpp.erb 2018-09-13 22:33:10 UTC (rev 235993)
@@ -1,5 +1,5 @@
/*
-* THIS FILE WAS AUTOMATICALLY GENERATED, DO NOT EDIT.
+* <%= @warning %>
*
* Copyright (C) 2018 Apple Inc. All rights reserved.
*
Modified: trunk/Source/WebKit/Scripts/PreferencesTemplates/WebPreferencesKeys.cpp.erb (235992 => 235993)
--- trunk/Source/WebKit/Scripts/PreferencesTemplates/WebPreferencesKeys.cpp.erb 2018-09-13 22:32:33 UTC (rev 235992)
+++ trunk/Source/WebKit/Scripts/PreferencesTemplates/WebPreferencesKeys.cpp.erb 2018-09-13 22:33:10 UTC (rev 235993)
@@ -1,5 +1,5 @@
/*
- * THIS FILE WAS AUTOMATICALLY GENERATED, DO NOT EDIT.
+ * <%= @warning %>
*
* Copyright (C) 2017 Apple Inc. All rights reserved.
*
Modified: trunk/Source/WebKit/Scripts/PreferencesTemplates/WebPreferencesKeys.h.erb (235992 => 235993)
--- trunk/Source/WebKit/Scripts/PreferencesTemplates/WebPreferencesKeys.h.erb 2018-09-13 22:32:33 UTC (rev 235992)
+++ trunk/Source/WebKit/Scripts/PreferencesTemplates/WebPreferencesKeys.h.erb 2018-09-13 22:33:10 UTC (rev 235993)
@@ -1,5 +1,5 @@
/*
- * THIS FILE WAS AUTOMATICALLY GENERATED, DO NOT EDIT.
+ * <%= @warning %>
*
* Copyright (C) 2017 Apple Inc. All rights reserved.
*
Modified: trunk/Source/WebKit/Scripts/PreferencesTemplates/WebPreferencesStoreDefaultsMap.cpp.erb (235992 => 235993)
--- trunk/Source/WebKit/Scripts/PreferencesTemplates/WebPreferencesStoreDefaultsMap.cpp.erb 2018-09-13 22:32:33 UTC (rev 235992)
+++ trunk/Source/WebKit/Scripts/PreferencesTemplates/WebPreferencesStoreDefaultsMap.cpp.erb 2018-09-13 22:33:10 UTC (rev 235993)
@@ -1,5 +1,5 @@
/*
- * THIS FILE WAS AUTOMATICALLY GENERATED, DO NOT EDIT.
+ * <%= @warning %>
*
* Copyright (C) 2017 Apple Inc. All rights reserved.
*
