- a/Source/WebKit/blackberry/Api/WebPage.cpp +2 lines
Lines 836-841 bool WebPagePrivate::executeJavaScriptInIsolatedWorld(const ScriptSourceCode& so a/Source/WebKit/blackberry/Api/WebPage.cpp_sec1
836
    JSC::ExecState* exec = m_mainFrame->script()->globalObject(m_isolatedWorld.get())->globalExec();
836
    JSC::ExecState* exec = m_mainFrame->script()->globalObject(m_isolatedWorld.get())->globalExec();
837
    JSGlobalContextRef context = toGlobalRef(exec);
837
    JSGlobalContextRef context = toGlobalRef(exec);
838
838
839
    JSC::JSLockHolder lock(exec);
839
    JSType type = JSValueGetType(context, toRef(exec, value));
840
    JSType type = JSValueGetType(context, toRef(exec, value));
840
841
841
    switch (type) {
842
    switch (type) {
Lines 910-915 void WebPage::executeJavaScriptFunction(const std::vector<BlackBerry::Platform:: a/Source/WebKit/blackberry/Api/WebPage.cpp_sec2
910
    JSC::ExecState* exec = root->globalObject()->globalExec();
911
    JSC::ExecState* exec = root->globalObject()->globalExec();
911
    JSGlobalContextRef ctx = toGlobalRef(exec);
912
    JSGlobalContextRef ctx = toGlobalRef(exec);
912
913
914
    JSC::JSLockHolder lock(exec);
913
    WTF::Vector<JSValueRef> argListRef(args.size());
915
    WTF::Vector<JSValueRef> argListRef(args.size());
914
    for (unsigned i = 0; i < args.size(); ++i)
916
    for (unsigned i = 0; i < args.size(); ++i)
915
        argListRef[i] = BlackBerryJavaScriptVariantToJSValueRef(ctx, args[i]);
917
        argListRef[i] = BlackBerryJavaScriptVariantToJSValueRef(ctx, args[i]);
- a/Source/WebKit/blackberry/ChangeLog -1 / +18 lines
Lines 1-3 a/Source/WebKit/blackberry/ChangeLog_sec1
1
2012-10-26  Sean Wang  <Xuewen.Wang@torchmobile.com.cn>
2
3
        [BlackBerry] ASSERT currentThreadIsHoldingLock() failed in MarkedAllocator::allocateSlowCase()
4
        https://bugs.webkit.org/show_bug.cgi?id=100504
5
6
        Reviewed by NOBODY (OOPS!).
7
8
        PR #232038 The similar PR # 200724.
9
        Reviewed internally by Petter Wang.
10
11
        This issue is same as bug 95492, and this patch is same as its patch.
12
        Hold the JSLock for the current thread before we call toRef to avoid
13
        the ASSERT failure.
14
15
        * Api/WebPage.cpp:
16
        (BlackBerry::WebKit::WebPagePrivate::executeJavaScriptInIsolatedWorld):
17
        (BlackBerry::WebKit::WebPage::executeJavaScriptFunction):
18
1
2012-10-25  Sean Wang  <Xuewen.Wang@torchmobile.com.cn>
19
2012-10-25  Sean Wang  <Xuewen.Wang@torchmobile.com.cn>
2
20
3
        [BlackBerry] WebView process crashed at AuthenticationChallengeManager::pageVisibilityChanged()
21
        [BlackBerry] WebView process crashed at AuthenticationChallengeManager::pageVisibilityChanged()
4
- 

Return to Bug 100504