Skip to content
Browse files

[BlackBerry] When there is an exception we want to check if the ref i…

…s 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 <bmeyer@rim.com> on 2012-08-15
Reviewed by Yong Li.

* Api/WebPage.cpp:
(BlackBerry::WebKit::WebPage::executeJavaScriptFunction):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@125721 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information...
1 parent e314f85 commit 687e79f4d347bc3000012f54ddf8bafebbbcba7a commit-queue committed Aug 15, 2012
Showing with 12 additions and 2 deletions.
  1. +1 −2 Source/WebKit/blackberry/Api/WebPage.cpp
  2. +11 −0 Source/WebKit/blackberry/ChangeLog
View
3 Source/WebKit/blackberry/Api/WebPage.cpp
@@ -885,8 +885,7 @@ void WebPage::executeJavaScriptFunction(const std::vector<std::string> &function
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(JavaScriptVariant::Exception);
return;
}
View
11 Source/WebKit/blackberry/ChangeLog
@@ -1,3 +1,14 @@
+2012-08-15 Benjamin C Meyer <bmeyer@rim.com>
+
+ [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 <yoli@rim.com>
[BlackBerry] Upstream FrameLoaderClientBlackBerry::securityOriginForNewDocument()

0 comments on commit 687e79f

Please sign in to comment.
Something went wrong with that request. Please try again.