Title: [125721] trunk/Source/WebKit/blackberry
- Revision
- 125721
- Author
- [email protected]
- Date
- 2012-08-15 16:34:51 -0700 (Wed, 15 Aug 2012)
Log Message
[BlackBerry] When there is an exception we want to check if the ref is 0, not the
value as JSObjectCallAsFunction returns 0 in that case.
https://bugs.webkit.org/show_bug.cgi?id=94153
Patch by Benjamin C Meyer <[email protected]> on 2012-08-15
Reviewed by Yong Li.
* Api/WebPage.cpp:
(BlackBerry::WebKit::WebPage::executeJavaScriptFunction):
Modified Paths
Diff
Modified: trunk/Source/WebKit/blackberry/Api/WebPage.cpp (125720 => 125721)
--- trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2012-08-15 23:32:28 UTC (rev 125720)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2012-08-15 23:34:51 UTC (rev 125721)
@@ -885,8 +885,7 @@
if (functionObject && thisObject)
result = JSObjectCallAsFunction(ctx, functionObject, thisObject, args.size(), argListRef.data(), 0);
- JSC::JSValue value = toJS(exec, result);
- if (!value) {
+ if (!result) {
returnValue.setType(_javascript_Variant::Exception);
return;
}
Modified: trunk/Source/WebKit/blackberry/ChangeLog (125720 => 125721)
--- trunk/Source/WebKit/blackberry/ChangeLog 2012-08-15 23:32:28 UTC (rev 125720)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-08-15 23:34:51 UTC (rev 125721)
@@ -1,3 +1,14 @@
+2012-08-15 Benjamin C Meyer <[email protected]>
+
+ [BlackBerry] When there is an exception we want to check if the ref is 0, not the
+ value as JSObjectCallAsFunction returns 0 in that case.
+ https://bugs.webkit.org/show_bug.cgi?id=94153
+
+ Reviewed by Yong Li.
+
+ * Api/WebPage.cpp:
+ (BlackBerry::WebKit::WebPage::executeJavaScriptFunction):
+
2012-08-15 Yong Li <[email protected]>
[BlackBerry] Upstream FrameLoaderClientBlackBerry::securityOriginForNewDocument()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
