Changeset 164679 in webkit


Ignore:
Timestamp:
Feb 25, 2014 3:53:41 PM (10 years ago)
Author:
mark.lam@apple.com
Message:

JSDOMPromise methods should acquire VM lock before calling into JS.
<​https://webkit.org/b/129341>

Reviewed by Geoffrey Garen.

No new tests.

  • bindings/js/JSDOMPromise.h:

(WebCore::DeferredWrapper::resolve):
(WebCore::DeferredWrapper::reject):
(WebCore::DeferredWrapper::resolve<String>):
(WebCore::DeferredWrapper::resolve<bool>):
(WebCore::char>>):
(WebCore::DeferredWrapper::reject<String>):

Location:
trunk/Source/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r164678 r164679  
     12014-02-25  Mark Lam  <mark.lam@apple.com>
     2
     3        JSDOMPromise methods should acquire VM lock before calling into JS.
     4        <https://webkit.org/b/129341>
     5
     6        Reviewed by Geoffrey Garen.
     7
     8        No new tests.
     9
     10        * bindings/js/JSDOMPromise.h:
     11        (WebCore::DeferredWrapper::resolve):
     12        (WebCore::DeferredWrapper::reject):
     13        (WebCore::DeferredWrapper::resolve<String>):
     14        (WebCore::DeferredWrapper::resolve<bool>):
     15        (WebCore::char>>):
     16        (WebCore::DeferredWrapper::reject<String>):
     17
    1182014-02-25  Anders Carlsson  <andersca@apple.com>
    219

  • trunk/Source/WebCore/bindings/js/JSDOMPromise.h

    r161241 r164679  
    3030#include "JSCryptoKeyPair.h"
    3131#include "JSDOMBinding.h"
     32#include <JavaScriptCore/APIShims.h>
    3233#include <heap/StrongInlines.h>
    3334#include <runtime/JSPromiseDeferred.h>
    … …  
    5960{
    6061    JSC::ExecState* exec = m_globalObject->globalExec();
     62    JSC::APIEntryShim entryShim(exec);
    6163    resolve(exec, toJS(exec, m_globalObject.get(), result));
    6264}
    … …  
    6668{
    6769    JSC::ExecState* exec = m_globalObject->globalExec();
     70    JSC::APIEntryShim entryShim(exec);
    6871    reject(exec, toJS(exec, m_globalObject.get(), result));
    6972}
    … …  
    7376{
    7477    JSC::ExecState* exec = m_globalObject->globalExec();
     78    JSC::APIEntryShim entryShim(exec);
    7579    reject(exec, JSC::jsNull());
    7680}
    … …  
    8084{
    8185    JSC::ExecState* exec = m_globalObject->globalExec();
     86    JSC::APIEntryShim entryShim(exec);
    8287    resolve(exec, jsString(exec, result));
    8388}
    … …  
    8792{
    8893    JSC::ExecState* exec = m_globalObject->globalExec();
     94    JSC::APIEntryShim entryShim(exec);
    8995    resolve(exec, JSC::jsBoolean(result));
    9096}
    … …  
    94100{
    95101    JSC::ExecState* exec = m_globalObject->globalExec();
     102    JSC::APIEntryShim entryShim(exec);
    96103    RefPtr<ArrayBuffer> buffer = ArrayBuffer::create(result.data(), result.size());
    97104    resolve(exec, toJS(exec, m_globalObject.get(), buffer.get()));
    … …  
    102109{
    103110    JSC::ExecState* exec = m_globalObject->globalExec();
     111    JSC::APIEntryShim entryShim(exec);
    104112    reject(exec, jsString(exec, result));
    105113}
Note: See TracChangeset for help on using the changeset viewer.