Title: [195773] branches/safari-601-branch/Source/WebKit/win
- Revision
- 195773
- Author
- [email protected]
- Date
- 2016-01-28 12:13:20 -0800 (Thu, 28 Jan 2016)
Log Message
Merge patch for rdar://problem/23025615.
Modified Paths
Diff
Modified: branches/safari-601-branch/Source/WebKit/win/ChangeLog (195772 => 195773)
--- branches/safari-601-branch/Source/WebKit/win/ChangeLog 2016-01-28 20:11:54 UTC (rev 195772)
+++ branches/safari-601-branch/Source/WebKit/win/ChangeLog 2016-01-28 20:13:20 UTC (rev 195773)
@@ -2,6 +2,21 @@
Merge patch for rdar://problem/23025615.
+ 2015-10-09 Brent Fulgham <[email protected]>
+
+ [Win] Load the proper library for _javascript_Core symbols
+ <rdar://problem/23025615>
+
+ Rubberstamped by Jer Noble.
+
+ * WebKitDLL.cpp:
+ (bindJavaScriptTrampoline): We need to use "_javascript_Core.dll",
+ not the LLVM library.
+
+2016-01-28 Babak Shafiei <[email protected]>
+
+ Merge patch for rdar://problem/23025615.
+
2015-09-10 Brent Fulgham <[email protected]>
[Win] Re-export a few symbols for backwards compatibility
Modified: branches/safari-601-branch/Source/WebKit/win/WebKitDLL.cpp (195772 => 195773)
--- branches/safari-601-branch/Source/WebKit/win/WebKitDLL.cpp 2016-01-28 20:11:54 UTC (rev 195772)
+++ branches/safari-601-branch/Source/WebKit/win/WebKitDLL.cpp 2016-01-28 20:13:20 UTC (rev 195773)
@@ -262,7 +262,7 @@
void bindJavaScriptTrampoline()
{
- const wchar_t* libraryName = L"libllvmForJSC.dll";
+ const wchar_t* libraryName = L"_javascript_Core.dll";
HMODULE library = ::LoadLibrary(libraryName);
if (!library)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
