Title: [91195] trunk/Source/WebCore
- Revision
- 91195
- Author
- [email protected]
- Date
- 2011-07-18 11:11:01 -0700 (Mon, 18 Jul 2011)
Log Message
Speculative fix for Leopard assertions caused by 91095.
Rubber stamped by Sam Weinig.
* bridge/NP_jsobject.cpp:
(_NPN_Invoke):
- ensure we pass the window shell, not the global object.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (91194 => 91195)
--- trunk/Source/WebCore/ChangeLog 2011-07-18 17:47:13 UTC (rev 91194)
+++ trunk/Source/WebCore/ChangeLog 2011-07-18 18:11:01 UTC (rev 91195)
@@ -1,3 +1,13 @@
+2011-07-18 Gavin Barraclough <[email protected]>
+
+ Speculative fix for Leopard assertions caused by 91095.
+
+ Rubber stamped by Sam Weinig.
+
+ * bridge/NP_jsobject.cpp:
+ (_NPN_Invoke):
+ - ensure we pass the window shell, not the global object.
+
2011-07-18 Mark Hahnenberg <[email protected]>
Refactor JSC to replace JSCell::operator new with static create method
Modified: trunk/Source/WebCore/bridge/NP_jsobject.cpp (91194 => 91195)
--- trunk/Source/WebCore/bridge/NP_jsobject.cpp 2011-07-18 17:47:13 UTC (rev 91194)
+++ trunk/Source/WebCore/bridge/NP_jsobject.cpp 2011-07-18 18:11:01 UTC (rev 91195)
@@ -241,7 +241,7 @@
getListFromVariantArgs(exec, args, argCount, rootObject, argList);
RefPtr<JSGlobalData> globalData(&exec->globalData());
globalData->timeoutChecker.start();
- JSValue resultV = JSC::call(exec, function, callType, callData, obj->imp, argList);
+ JSValue resultV = JSC::call(exec, function, callType, callData, obj->imp->toThisObject(exec), argList);
globalData->timeoutChecker.stop();
// Convert and return the result of the function call.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
