Attachment 349611 Details for Bug 189573 – Patch

[patch] Patch

bug-189573-20180913114823.patch (text/plain), 8.52 KB, created by Dean Jackson on 2018-09-12 18:48:24 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Dean Jackson

Created: 2018-09-12 18:48:24 PDT

Size: 8.52 KB

patch

obsolete

>Subversion Revision: 235921
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index c64a01e08a0aa389387a403527b81003e23150ac..44d2801870f54550aa6efb756d400e45621888f4 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,25 @@
>+2018-09-12  Dean Jackson  <dino@grorg.org>
>+
>+        Generate warnings for Preferences files
>+        https://bugs.webkit.org/show_bug.cgi?id=189573
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        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-11  Dean Jackson  <dino@apple.com>
> 
>         Header parsing for experimental and internal debug features
>diff --git a/Source/WebKit/Scripts/GeneratePreferences.rb b/Source/WebKit/Scripts/GeneratePreferences.rb
>index 5ff5bd87b6cea6d185ac3dba3429bfdf5dce108b..9a7a438ed113df303db8b945c89118b88df231bf 100755
>--- a/Source/WebKit/Scripts/GeneratePreferences.rb
>+++ b/Source/WebKit/Scripts/GeneratePreferences.rb
>@@ -129,7 +129,9 @@ end
> 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 @@ class Preferences
>     @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")
>diff --git a/Source/WebKit/Scripts/PreferencesTemplates/WebPageUpdatePreferences.cpp.erb b/Source/WebKit/Scripts/PreferencesTemplates/WebPageUpdatePreferences.cpp.erb
>index 7a181f02d4e9fae6ea9d76f692f609c015423a5b..201e40bf13cb67b6f79ee61d08683438db6c0663 100644
>--- a/Source/WebKit/Scripts/PreferencesTemplates/WebPageUpdatePreferences.cpp.erb
>+++ b/Source/WebKit/Scripts/PreferencesTemplates/WebPageUpdatePreferences.cpp.erb
>@@ -1,5 +1,5 @@
> /*
>- * THIS FILE WAS AUTOMATICALLY GENERATED, DO NOT EDIT.
>+ * <%= @warning %>
>  *
>  * Copyright (C) 2017 Apple Inc. All rights reserved.
>  *
>diff --git a/Source/WebKit/Scripts/PreferencesTemplates/WebPreferencesDefinitions.h.erb b/Source/WebKit/Scripts/PreferencesTemplates/WebPreferencesDefinitions.h.erb
>index e6774e26be834486eb6458eb86bcc96c8fcaf358..dfc4b39ee6f763f841d3405862511b23451ef4c4 100644
>--- a/Source/WebKit/Scripts/PreferencesTemplates/WebPreferencesDefinitions.h.erb
>+++ b/Source/WebKit/Scripts/PreferencesTemplates/WebPreferencesDefinitions.h.erb
>@@ -1,5 +1,5 @@
> /*
>- * THIS FILE WAS AUTOMATICALLY GENERATED, DO NOT EDIT.
>+ * <%= @warning %>
>  *
>  * Copyright (C) 2017 Apple Inc. All rights reserved.
>  *
>diff --git a/Source/WebKit/Scripts/PreferencesTemplates/WebPreferencesExperimentalFeatures.cpp.erb b/Source/WebKit/Scripts/PreferencesTemplates/WebPreferencesExperimentalFeatures.cpp.erb
>index 76fc02ae55699cd701dd3b406d1638fdcf0b9004..fe7fb46376d47ecbfe0d0a9d77bf30992c8ec5fa 100644
>--- a/Source/WebKit/Scripts/PreferencesTemplates/WebPreferencesExperimentalFeatures.cpp.erb
>+++ b/Source/WebKit/Scripts/PreferencesTemplates/WebPreferencesExperimentalFeatures.cpp.erb
>@@ -1,5 +1,5 @@
> /*
>- * THIS FILE WAS AUTOMATICALLY GENERATED, DO NOT EDIT.
>+ * <%= @warning %>
>  *
>  * Copyright (C) 2017 Apple Inc. All rights reserved.
>  *
>diff --git a/Source/WebKit/Scripts/PreferencesTemplates/WebPreferencesInternalDebugFeatures.cpp.erb b/Source/WebKit/Scripts/PreferencesTemplates/WebPreferencesInternalDebugFeatures.cpp.erb
>index cec892b9cd3a16ecb112bee1131bd92b2872311b..4a46c5517a17319dc8fbe5201985a162d78b4533 100644
>--- a/Source/WebKit/Scripts/PreferencesTemplates/WebPreferencesInternalDebugFeatures.cpp.erb
>+++ b/Source/WebKit/Scripts/PreferencesTemplates/WebPreferencesInternalDebugFeatures.cpp.erb
>@@ -1,5 +1,5 @@
> /*
>-* THIS FILE WAS AUTOMATICALLY GENERATED, DO NOT EDIT.
>+* <%= @warning %>
> *
> * Copyright (C) 2018 Apple Inc. All rights reserved.
> *
>diff --git a/Source/WebKit/Scripts/PreferencesTemplates/WebPreferencesKeys.cpp.erb b/Source/WebKit/Scripts/PreferencesTemplates/WebPreferencesKeys.cpp.erb
>index ff13d578b0a294eabc8207c58ee1be64b182dd3b..c6fba001677afaefd5720e0eee5a93609f3f4236 100644
>--- a/Source/WebKit/Scripts/PreferencesTemplates/WebPreferencesKeys.cpp.erb
>+++ b/Source/WebKit/Scripts/PreferencesTemplates/WebPreferencesKeys.cpp.erb
>@@ -1,5 +1,5 @@
> /*
>- * THIS FILE WAS AUTOMATICALLY GENERATED, DO NOT EDIT.
>+ * <%= @warning %>
>  *
>  * Copyright (C) 2017 Apple Inc. All rights reserved.
>  *
>diff --git a/Source/WebKit/Scripts/PreferencesTemplates/WebPreferencesKeys.h.erb b/Source/WebKit/Scripts/PreferencesTemplates/WebPreferencesKeys.h.erb
>index a56b26937914a53b0245e747191e9c9979429269..60f5fe88166629a39b193d4437742e85f6dd77ad 100644
>--- a/Source/WebKit/Scripts/PreferencesTemplates/WebPreferencesKeys.h.erb
>+++ b/Source/WebKit/Scripts/PreferencesTemplates/WebPreferencesKeys.h.erb
>@@ -1,5 +1,5 @@
> /*
>- * THIS FILE WAS AUTOMATICALLY GENERATED, DO NOT EDIT.
>+ * <%= @warning %>
>  *
>  * Copyright (C) 2017 Apple Inc. All rights reserved.
>  *
>diff --git a/Source/WebKit/Scripts/PreferencesTemplates/WebPreferencesStoreDefaultsMap.cpp.erb b/Source/WebKit/Scripts/PreferencesTemplates/WebPreferencesStoreDefaultsMap.cpp.erb
>index 9dcb04512fbf229274f1e7325aa92fe34718c885..8f528108154ba4c7957560ce226ee9875bdc3615 100644
>--- a/Source/WebKit/Scripts/PreferencesTemplates/WebPreferencesStoreDefaultsMap.cpp.erb
>+++ b/Source/WebKit/Scripts/PreferencesTemplates/WebPreferencesStoreDefaultsMap.cpp.erb
>@@ -1,5 +1,5 @@
> /*
>- * THIS FILE WAS AUTOMATICALLY GENERATED, DO NOT EDIT.
>+ * <%= @warning %>
>  *
>  * Copyright (C) 2017 Apple Inc. All rights reserved.
>  *

Flags:

sam: review+
ews-watchlist: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 189573: 349611 | 349656