Title: [242139] trunk/Source/WebKit
Revision
242139
Author
cdu...@apple.com
Date
2019-02-27 11:15:28 -0800 (Wed, 27 Feb 2019)

Log Message

[HTTPSUpgrade] Use open source database until the feature is ready
https://bugs.webkit.org/show_bug.cgi?id=195069
<rdar://problem/47838224>

Reviewed by Geoffrey Garen.

* DerivedSources-input.xcfilelist:
* DerivedSources.make:

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (242138 => 242139)


--- trunk/Source/WebKit/ChangeLog	2019-02-27 19:03:21 UTC (rev 242138)
+++ trunk/Source/WebKit/ChangeLog	2019-02-27 19:15:28 UTC (rev 242139)
@@ -1,3 +1,14 @@
+2019-02-27  Chris Dumez  <cdu...@apple.com>
+
+        [HTTPSUpgrade] Use open source database until the feature is ready
+        https://bugs.webkit.org/show_bug.cgi?id=195069
+        <rdar://problem/47838224>
+
+        Reviewed by Geoffrey Garen.
+
+        * DerivedSources-input.xcfilelist:
+        * DerivedSources.make:
+
 2019-02-27  Antoine Quint  <grao...@apple.com>
 
         Support Pointer Events on macOS

Modified: trunk/Source/WebKit/DerivedSources-input.xcfilelist (242138 => 242139)


--- trunk/Source/WebKit/DerivedSources-input.xcfilelist	2019-02-27 19:03:21 UTC (rev 242138)
+++ trunk/Source/WebKit/DerivedSources-input.xcfilelist	2019-02-27 19:15:28 UTC (rev 242139)
@@ -54,6 +54,7 @@
 $(PROJECT_DIR)/Shared/API/Cocoa/RemoteObjectRegistry.messages.in
 $(PROJECT_DIR)/Shared/Authentication/AuthenticationManager.messages.in
 $(PROJECT_DIR)/Shared/AuxiliaryProcess.messages.in
+$(PROJECT_DIR)/Shared/HTTPSUpgrade/HTTPSUpgradeList.txt
 $(PROJECT_DIR)/Shared/Plugins/NPObjectMessageReceiver.messages.in
 $(PROJECT_DIR)/Shared/WebConnection.messages.in
 $(PROJECT_DIR)/Shared/WebPreferences.yaml

Modified: trunk/Source/WebKit/DerivedSources.make (242138 => 242139)


--- trunk/Source/WebKit/DerivedSources.make	2019-02-27 19:03:21 UTC (rev 242138)
+++ trunk/Source/WebKit/DerivedSources.make	2019-02-27 19:15:28 UTC (rev 242139)
@@ -316,7 +316,10 @@
 $(WEB_PREFERENCES_PATTERNS) : $(WebKit2)/Scripts/GeneratePreferences.rb $(WEB_PREFERENCES_TEMPLATES) $(WEB_PREFERENCES_COMBINED_INPUT_FILE)
 	$(RUBY) $< --input $(WEB_PREFERENCES_COMBINED_INPUT_FILE)
 
-VPATH += $(WebKit2)/Shared/HTTPSUpgrade/
+# FIXME: We should switch to the internal HTTPSUpgradeList.txt once the feature is ready.
+# VPATH += $(WebKit2)/Shared/HTTPSUpgrade/
+VPATH := $(WebKit2)/Shared/HTTPSUpgrade/ $(VPATH)
+
 all : HTTPSUpgradeList.db
 HTTPSUpgradeList.db : HTTPSUpgradeList.txt $(WebKit2)/Scripts/generate-https-upgrade-database.sh
 	sh $(WebKit2)/Scripts/generate-https-upgrade-database.sh $< $@
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to