Modified: tags/Safari-538.43/Source/WebKit2/ChangeLog (170492 => 170493)
--- tags/Safari-538.43/Source/WebKit2/ChangeLog 2014-06-26 20:37:08 UTC (rev 170492)
+++ tags/Safari-538.43/Source/WebKit2/ChangeLog 2014-06-26 21:07:20 UTC (rev 170493)
@@ -1,3 +1,15 @@
+2014-06-26 Lucas Forschler <[email protected]>
+
+ Merge r170492
+
+ 2014-06-26 Ada Chan <[email protected]>
+
+ Change the target membership of WKBackForwardListPrivate.h from WebKit2 to WebKit.
+
+ Rubber-stamped by Dan Bernstein.
+
+ * WebKit2.xcodeproj/project.pbxproj:
+
2014-06-26 Dean Jackson <[email protected]>
<rdar://problem/17446703> Disable features.
Modified: tags/Safari-538.43/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (170492 => 170493)
--- tags/Safari-538.43/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-06-26 20:37:08 UTC (rev 170492)
+++ tags/Safari-538.43/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-06-26 21:07:20 UTC (rev 170493)
@@ -303,7 +303,6 @@
1A9E329E1822FEDD00F5D04C /* WKRemoteObjectCoder.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A9E329C1822FEDD00F5D04C /* WKRemoteObjectCoder.mm */; };
1A9E329F1822FEDD00F5D04C /* WKRemoteObjectCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A9E329D1822FEDD00F5D04C /* WKRemoteObjectCoder.h */; };
1A9E32A11823018900F5D04C /* _WKRemoteObjectRegistryInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A9E32A01823018900F5D04C /* _WKRemoteObjectRegistryInternal.h */; };
- 1A9F28111958F478008CAC72 /* WKBackForwardListPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A9F28101958F478008CAC72 /* WKBackForwardListPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
1A9FBA8D13FF04E600DEED67 /* PluginComplexTextInputState.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A9FBA8C13FF04E600DEED67 /* PluginComplexTextInputState.h */; };
1AA13212191D5924009C1489 /* WKNavigationResponsePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA13211191D5924009C1489 /* WKNavigationResponsePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
1AA20D5118AD50E0005D1ED4 /* WKNavigationDelegatePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA20D5018AD50E0005D1ED4 /* WKNavigationDelegatePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -991,6 +990,7 @@
51FD18B61651FBAD00DBE1CE /* NetworkResourceLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 51FD18B41651FBAD00DBE1CE /* NetworkResourceLoader.h */; };
5272B28A1406985D0096A5D0 /* StatisticsData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5272B2881406985D0096A5D0 /* StatisticsData.cpp */; };
5272B28B1406985D0096A5D0 /* StatisticsData.h in Headers */ = {isa = PBXBuildFile; fileRef = 5272B2891406985D0096A5D0 /* StatisticsData.h */; };
+ 528C37C1195CBB1A00D8B9CC /* WKBackForwardListPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A9F28101958F478008CAC72 /* WKBackForwardListPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
5DA6ED0A1490606900B41D12 /* DynamicLinkerEnvironmentExtractor.h in Headers */ = {isa = PBXBuildFile; fileRef = 5DA6ED081490606900B41D12 /* DynamicLinkerEnvironmentExtractor.h */; };
5DA6ED0B1490606900B41D12 /* DynamicLinkerEnvironmentExtractor.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5DA6ED091490606900B41D12 /* DynamicLinkerEnvironmentExtractor.mm */; };
6501BD1A12F1243400E9F248 /* WKBundleInspector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 65B86F1712F11D7B00B7DD8A /* WKBundleInspector.cpp */; };
@@ -7009,7 +7009,6 @@
1ADAE12E1919A5B400F48E21 /* WKPreferences.h in Headers */,
1AF459321946559500F9D4A2 /* WKError.h in Headers */,
E19BDA8A193686A400B97F57 /* SandboxUtilities.h in Headers */,
- 1A9F28111958F478008CAC72 /* WKBackForwardListPrivate.h in Headers */,
1A7284471959ED100007BCE5 /* SessionStateConversion.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -7115,6 +7114,7 @@
515E7730184015800007203F /* UniqueIDBDatabase.h in Headers */,
2D3EF4431917646300034184 /* WebMemoryPressureHandlerIOS.h in Headers */,
B878B615133428DC006888E9 /* CorrectionPanel.h in Headers */,
+ 528C37C1195CBB1A00D8B9CC /* WKBackForwardListPrivate.h in Headers */,
2989A414167D184B004F96D2 /* CustomProtocolManager.h in Headers */,
371B32DE184D67490013E2B2 /* WKNSURLProtectionSpace.h in Headers */,
2984F589164BA095004BC0C6 /* CustomProtocolManagerMessages.h in Headers */,
