[webkit-changes] [239998] branches/safari-607-branch/Source/WebKit

Tue, 15 Jan 2019 12:38:47 -0800

Title: [239998] branches/safari-607-branch/Source/WebKit

Diff

Modified: branches/safari-607-branch/Source/WebKit/ChangeLog (239997 => 239998)


--- branches/safari-607-branch/Source/WebKit/ChangeLog	2019-01-15 20:29:50 UTC (rev 239997)
+++ branches/safari-607-branch/Source/WebKit/ChangeLog	2019-01-15 20:34:54 UTC (rev 239998)
@@ -1,5 +1,26 @@
 2019-01-15  Alan Coon  <[email protected]>
 
+        Apply patch. rdar://problem/47260255
+
+    2019-01-15  Chris Dumez  <[email protected]>
+
+            Better disable Automatic HTTPS upgrade
+            <rdar://problem/47213216>
+
+            Reviewed by Geoff Garen.
+
+            Drop database file from the bundle as it is currently huge and increases
+            our project size unnecessarily.
+
+            Also hide the feature from the experimental feature menu since enabling
+            it will not do anything without its database.
+
+            * DerivedSources.make:
+            * Shared/WebPreferences.yaml:
+            * WebKit.xcodeproj/project.pbxproj:
+
+2019-01-15  Alan Coon  <[email protected]>
+
         Revert r239446. rdar://problem/47125351
 
 2019-01-09  Kocsen Chung  <[email protected]>

Modified: branches/safari-607-branch/Source/WebKit/DerivedSources.make (239997 => 239998)


--- branches/safari-607-branch/Source/WebKit/DerivedSources.make	2019-01-15 20:29:50 UTC (rev 239997)
+++ branches/safari-607-branch/Source/WebKit/DerivedSources.make	2019-01-15 20:34:54 UTC (rev 239998)
@@ -316,7 +316,3 @@
 $(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/
-all : HTTPSUpgradeList.db
-HTTPSUpgradeList.db : HTTPSUpgradeList.txt $(WebKit2)/Scripts/generate-https-upgrade-database.sh
-	sh $(WebKit2)/Scripts/generate-https-upgrade-database.sh $< $@

Modified: branches/safari-607-branch/Source/WebKit/Shared/WebPreferences.yaml (239997 => 239998)


--- branches/safari-607-branch/Source/WebKit/Shared/WebPreferences.yaml	2019-01-15 20:29:50 UTC (rev 239997)
+++ branches/safari-607-branch/Source/WebKit/Shared/WebPreferences.yaml	2019-01-15 20:34:54 UTC (rev 239998)
@@ -40,7 +40,6 @@
    defaultValue: false
    humanReadableName: "Automatic HTTPS upgrade"
    humanReadableDescription: "Automatic HTTPS upgrade for known supported sites"
-   category: experimental
 
 JavaEnabled:
   type: bool

Modified: branches/safari-607-branch/Source/WebKit/WebKit.xcodeproj/project.pbxproj (239997 => 239998)


--- branches/safari-607-branch/Source/WebKit/WebKit.xcodeproj/project.pbxproj	2019-01-15 20:29:50 UTC (rev 239997)
+++ branches/safari-607-branch/Source/WebKit/WebKit.xcodeproj/project.pbxproj	2019-01-15 20:34:54 UTC (rev 239998)
@@ -1038,7 +1038,6 @@
 		57DCEDC3214F114C0016B847 /* MockLocalService.h in Headers */ = {isa = PBXBuildFile; fileRef = 57DCEDC1214F114C0016B847 /* MockLocalService.h */; };
 		57DCEDC7214F18300016B847 /* MockLocalConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 57DCEDC5214F18300016B847 /* MockLocalConnection.h */; };
 		57DCEDCB214F4E420016B847 /* MockAuthenticatorManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 57DCEDC9214F4E420016B847 /* MockAuthenticatorManager.h */; };
-		587743A621C30BBE00AE9084 /* HTTPSUpgradeList.db in Resources */ = {isa = PBXBuildFile; fileRef = 587743A421C30AD800AE9084 /* HTTPSUpgradeList.db */; };
 		58E977DF21C49A00005D92A6 /* NetworkHTTPSUpgradeChecker.h in Headers */ = {isa = PBXBuildFile; fileRef = 58E977DD21C49A00005D92A6 /* NetworkHTTPSUpgradeChecker.h */; };
 		5C0B17781E7C880E00E9123C /* NetworkSocketStreamMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C0B17741E7C879C00E9123C /* NetworkSocketStreamMessageReceiver.cpp */; };
 		5C0B17791E7C882100E9123C /* WebSocketStreamMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C0B17761E7C879C00E9123C /* WebSocketStreamMessageReceiver.cpp */; };
@@ -3408,7 +3407,6 @@
 		57DCEDC6214F18300016B847 /* MockLocalConnection.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MockLocalConnection.mm; sourceTree = "<group>"; };
 		57DCEDC9214F4E420016B847 /* MockAuthenticatorManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MockAuthenticatorManager.h; sourceTree = "<group>"; };
 		57DCEDCD214F51680016B847 /* MockAuthenticatorManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MockAuthenticatorManager.cpp; sourceTree = "<group>"; };
-		587743A421C30AD800AE9084 /* HTTPSUpgradeList.db */ = {isa = PBXFileReference; lastKnownFileType = file; name = HTTPSUpgradeList.db; path = DerivedSources/WebKit2/HTTPSUpgradeList.db; sourceTree = BUILT_PRODUCTS_DIR; };
 		58E977DC21C499FE005D92A6 /* NetworkHTTPSUpgradeChecker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkHTTPSUpgradeChecker.cpp; sourceTree = "<group>"; };
 		58E977DD21C49A00005D92A6 /* NetworkHTTPSUpgradeChecker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkHTTPSUpgradeChecker.h; sourceTree = "<group>"; };
 		5C0B17741E7C879C00E9123C /* NetworkSocketStreamMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NetworkSocketStreamMessageReceiver.cpp; path = DerivedSources/WebKit2/NetworkSocketStreamMessageReceiver.cpp; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -8358,7 +8356,6 @@
 				1A64230712DD09EB00CAAE2C /* DrawingAreaProxyMessages.h */,
 				1AA575FF1496B7C000A4EE06 /* EventDispatcherMessageReceiver.cpp */,
 				1AA576001496B7C000A4EE06 /* EventDispatcherMessages.h */,
-				587743A421C30AD800AE9084 /* HTTPSUpgradeList.db */,
 				2984F586164BA095004BC0C6 /* LegacyCustomProtocolManagerMessageReceiver.cpp */,
 				2984F587164BA095004BC0C6 /* LegacyCustomProtocolManagerMessages.h */,
 				2984F57A164B915F004BC0C6 /* LegacyCustomProtocolManagerProxyMessageReceiver.cpp */,
@@ -10166,7 +10163,6 @@
 				E11D35AE16B63D1B006D23D7 /* com.apple.WebProcess.sb in Resources */,
 				414DD37920BF43F5006959FB /* com.cisco.webex.plugin.gpc64.sb in Resources */,
 				6BE969C11E54D452008B7483 /* corePrediction_model in Resources */,
-				587743A621C30BBE00AE9084 /* HTTPSUpgradeList.db in Resources */,
 				8DC2EF530486A6940098B216 /* InfoPlist.strings in Resources */,
 				3FB08E431F60B240005E5312 /* iOS.xcassets in Resources */,
 				93A2A3461D246125002B59D3 /* mediaIcon.pdf in Resources */,

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to