Title: [204711] releases/WebKitGTK/webkit-2.12/Source/bmalloc
- Revision
- 204711
- Author
- carlo...@webkit.org
- Date
- 2016-08-22 06:51:38 -0700 (Mon, 22 Aug 2016)
Log Message
Merge r201983 - Crash in com.apple.WebKit.WebContent at std::__1::__call_once_proxy<std::__1::tuple<CrashReporterSupportLibrary()::$_0&&> >
<https://webkit.org/b/158660>
<rdar://problem/25652686>
Reviewed by Darin Adler.
* bmalloc/Logging.cpp: Switch to use
BSOFT_LINK_PRIVATE_FRAMEWORK() to link
CrashReporterSupport.framework.
* bmalloc/darwin/BSoftLinking.h:
(BSOFT_LINK_PRIVATE_FRAMEWORK): Rename from BSOFT_LINK_FRAMEWORK.
Switch to use /System/Library/PrivateFrameworks/.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.12/Source/bmalloc/ChangeLog (204710 => 204711)
--- releases/WebKitGTK/webkit-2.12/Source/bmalloc/ChangeLog 2016-08-22 13:51:31 UTC (rev 204710)
+++ releases/WebKitGTK/webkit-2.12/Source/bmalloc/ChangeLog 2016-08-22 13:51:38 UTC (rev 204711)
@@ -1,3 +1,18 @@
+2016-06-12 David Kilzer <ddkil...@apple.com>
+
+ Crash in com.apple.WebKit.WebContent at std::__1::__call_once_proxy<std::__1::tuple<CrashReporterSupportLibrary()::$_0&&> >
+ <https://webkit.org/b/158660>
+ <rdar://problem/25652686>
+
+ Reviewed by Darin Adler.
+
+ * bmalloc/Logging.cpp: Switch to use
+ BSOFT_LINK_PRIVATE_FRAMEWORK() to link
+ CrashReporterSupport.framework.
+ * bmalloc/darwin/BSoftLinking.h:
+ (BSOFT_LINK_PRIVATE_FRAMEWORK): Rename from BSOFT_LINK_FRAMEWORK.
+ Switch to use /System/Library/PrivateFrameworks/.
+
2016-06-11 David Kilzer <ddkil...@apple.com>
Implement logging for RELEASE_BASSERT_WITH_MESSAGE() in BAssert.h
Modified: releases/WebKitGTK/webkit-2.12/Source/bmalloc/bmalloc/Logging.cpp (204710 => 204711)
--- releases/WebKitGTK/webkit-2.12/Source/bmalloc/bmalloc/Logging.cpp 2016-08-22 13:51:31 UTC (rev 204710)
+++ releases/WebKitGTK/webkit-2.12/Source/bmalloc/bmalloc/Logging.cpp 2016-08-22 13:51:38 UTC (rev 204711)
@@ -37,7 +37,7 @@
#include <unistd.h>
#include "BSoftLinking.h"
-BSOFT_LINK_FRAMEWORK(CrashReporterSupport);
+BSOFT_LINK_PRIVATE_FRAMEWORK(CrashReporterSupport);
BSOFT_LINK_FUNCTION(CrashReporterSupport, SimulateCrash, BOOL, (pid_t pid, mach_exception_data_type_t exceptionCode, id description), (pid, exceptionCode, description));
#endif
Modified: releases/WebKitGTK/webkit-2.12/Source/bmalloc/bmalloc/darwin/BSoftLinking.h (204710 => 204711)
--- releases/WebKitGTK/webkit-2.12/Source/bmalloc/bmalloc/darwin/BSoftLinking.h 2016-08-22 13:51:31 UTC (rev 204710)
+++ releases/WebKitGTK/webkit-2.12/Source/bmalloc/bmalloc/darwin/BSoftLinking.h 2016-08-22 13:51:38 UTC (rev 204711)
@@ -29,13 +29,13 @@
#include <dlfcn.h>
#include <mutex>
-#define BSOFT_LINK_FRAMEWORK(framework) \
+#define BSOFT_LINK_PRIVATE_FRAMEWORK(framework) \
static void* framework##Library() \
{ \
static void* frameworkLibrary; \
static std::once_flag once; \
std::call_once(once, [] { \
- frameworkLibrary = dlopen("/System/Library/Frameworks/" #framework ".framework/" #framework, RTLD_NOW); \
+ frameworkLibrary = dlopen("/System/Library/PrivateFrameworks/" #framework ".framework/" #framework, RTLD_NOW); \
RELEASE_BASSERT_WITH_MESSAGE(frameworkLibrary, "%s", dlerror()); \
}); \
return frameworkLibrary; \
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
