[webkit-changes] [149107] trunk/Source/WebKit2

Thu, 25 Apr 2013 06:44:32 -0700

Title: [149107] trunk/Source/WebKit2
Revision
149107
Author
[email protected]
Date
2013-04-25 06:46:17 -0700 (Thu, 25 Apr 2013)

Log Message

Unreviewed build fix: Fix the name of DyldInterpose.h in
SecItemShimLibrary.mm, fix the name of WebProcessShim.dyld in
WebContentServiceEntryPoint.mm, and stop linking against libWTF.a
directly (which means removing ASSERTs from
CookieStorageShimLibrary.cpp).

* Shared/mac/CookieStorageShimLibrary.cpp:
(WebKit::shimCFHTTPCookieStorageCopyRequestHeaderFieldsForURL):
(WebKit::WebKitCookieStorageShimInitialize):
* WebKit2.xcodeproj/project.pbxproj:
* WebProcess/EntryPoint/mac/XPCService/WebContentServiceEntryPoint.mm:
(WebContentServiceInitializer):
* WebProcess/mac/SecItemShimLibrary.mm:

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (149106 => 149107)


--- trunk/Source/WebKit2/ChangeLog	2013-04-25 13:43:33 UTC (rev 149106)
+++ trunk/Source/WebKit2/ChangeLog	2013-04-25 13:46:17 UTC (rev 149107)
@@ -1,3 +1,19 @@
+2013-04-25  Jer Noble  <[email protected]>
+
+        Unreviewed build fix: Fix the name of DyldInterpose.h in
+        SecItemShimLibrary.mm, fix the name of WebProcessShim.dyld in
+        WebContentServiceEntryPoint.mm, and stop linking against libWTF.a
+        directly (which means removing ASSERTs from
+        CookieStorageShimLibrary.cpp).
+
+        * Shared/mac/CookieStorageShimLibrary.cpp:
+        (WebKit::shimCFHTTPCookieStorageCopyRequestHeaderFieldsForURL):
+        (WebKit::WebKitCookieStorageShimInitialize):
+        * WebKit2.xcodeproj/project.pbxproj:
+        * WebProcess/EntryPoint/mac/XPCService/WebContentServiceEntryPoint.mm:
+        (WebContentServiceInitializer):
+        * WebProcess/mac/SecItemShimLibrary.mm:
+
 2013-04-24  Tim Horton  <[email protected]>
 
         PDFPlugin: Cursor should become an i-beam when over selectable text

Modified: trunk/Source/WebKit2/Shared/mac/CookieStorageShimLibrary.cpp (149106 => 149107)


--- trunk/Source/WebKit2/Shared/mac/CookieStorageShimLibrary.cpp	2013-04-25 13:43:33 UTC (rev 149106)
+++ trunk/Source/WebKit2/Shared/mac/CookieStorageShimLibrary.cpp	2013-04-25 13:46:17 UTC (rev 149107)
@@ -59,7 +59,6 @@
             break;
 
         // Protect against accidental recursion:
-        ASSERT(ShimProtector::count() == 1);
         if (ShimProtector::count() > 1)
             break;
 
@@ -83,7 +82,6 @@
     // only allow it to be initialized once.
     static int initialized = 0;
     if (!OSAtomicCompareAndSwapInt(0, 1, &initialized)) {
-        ASSERT_NOT_REACHED();
         return;
     }

Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (149106 => 149107)


--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj	2013-04-25 13:43:33 UTC (rev 149106)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj	2013-04-25 13:46:17 UTC (rev 149107)
@@ -1086,7 +1086,6 @@
 		C5E1AFED16B21017006CC1F2 /* WebArchive.h in Headers */ = {isa = PBXBuildFile; fileRef = BC329D9A16ACCE9900316DE2 /* WebArchive.h */; };
 		C5E1AFEE16B21025006CC1F2 /* WebArchiveResource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC329D9E16ACD47800316DE2 /* WebArchiveResource.cpp */; };
 		C5E1AFEF16B21029006CC1F2 /* WebArchiveResource.h in Headers */ = {isa = PBXBuildFile; fileRef = BC329D9F16ACD47800316DE2 /* WebArchiveResource.h */; };
-		CD471F5D1721BC3E00D65CDA /* libWTF.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CD471F5C1721BC3E00D65CDA /* libWTF.a */; };
 		CD5C66A0134B9D38004FE2A8 /* InjectedBundlePageFullScreenClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD5C669E134B9D36004FE2A8 /* InjectedBundlePageFullScreenClient.cpp */; };
 		CD5C66A1134B9D38004FE2A8 /* InjectedBundlePageFullScreenClient.h in Headers */ = {isa = PBXBuildFile; fileRef = CD5C669F134B9D37004FE2A8 /* InjectedBundlePageFullScreenClient.h */; };
 		CD67D30E15C08F9A00843ADF /* InjectedBundlePageDiagnosticLoggingClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD67D30815C07BE000843ADF /* InjectedBundlePageDiagnosticLoggingClient.cpp */; };
@@ -2847,7 +2846,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				CDDF622F1728A20D001EC01F /* CoreServices.framework in Frameworks */,
-				CD471F5D1721BC3E00D65CDA /* libWTF.a in Frameworks */,
 				CDC3830117211799008A2FC3 /* Security.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

Modified: trunk/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentServiceEntryPoint.mm (149106 => 149107)


--- trunk/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentServiceEntryPoint.mm	2013-04-25 13:43:33 UTC (rev 149106)
+++ trunk/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentServiceEntryPoint.mm	2013-04-25 13:46:17 UTC (rev 149107)
@@ -42,7 +42,7 @@
 {
     // Remove the SecItemShim from the DYLD_INSERT_LIBRARIES environment variable so any processes spawned by
     // the this process don't try to insert the shim and crash.
-    EnvironmentUtilities::stripValuesEndingWithString("DYLD_INSERT_LIBRARIES", "/WebContentShim.dylib");
+    EnvironmentUtilities::stripValuesEndingWithString("DYLD_INSERT_LIBRARIES", "/WebProcessShim.dylib");
 
     RunLoop::setUseApplicationRunLoopOnMainRunLoop();

Modified: trunk/Source/WebKit2/WebProcess/mac/SecItemShimLibrary.mm (149106 => 149107)


--- trunk/Source/WebKit2/WebProcess/mac/SecItemShimLibrary.mm	2013-04-25 13:43:33 UTC (rev 149106)
+++ trunk/Source/WebKit2/WebProcess/mac/SecItemShimLibrary.mm	2013-04-25 13:46:17 UTC (rev 149107)
@@ -24,7 +24,7 @@
  */
 #import "SecItemShimLibrary.h"
 
-#import "DYLDInterpose.h"
+#import "DyldInterpose.h"
 #import <Security/SecItem.h>
 #import <wtf/Platform.h>
 

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

Reply via email to