diff options
| author | Ben Murdoch <benm@google.com> | 2010-08-12 12:47:25 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-08-13 12:42:01 +0100 |
| commit | 338f67f7c981483bf535f24815081199ece234ca (patch) | |
| tree | 751dc3ac61cf39e8c572767a6a05c0528f5b8d08 /WebKit/android | |
| parent | 45b64f60af3cbfa8c78388e35e9b669a0c284bdc (diff) | |
| download | external_webkit-338f67f7c981483bf535f24815081199ece234ca.zip external_webkit-338f67f7c981483bf535f24815081199ece234ca.tar.gz external_webkit-338f67f7c981483bf535f24815081199ece234ca.tar.bz2 | |
Merge WebKit at r65072 : Build fix for JSC, update ambiguous usage of JSLock.
Need to update the parameter passed to JSLock ctor as new
ctor added in r64585 creates an ambiguity.
See http://trac.webkit.org/changeset/64585
Change-Id: Ibb4b089d66aa984038b66eef03d4d788575bfaaf
Diffstat (limited to 'WebKit/android')
| -rw-r--r-- | WebKit/android/jni/WebCoreFrameBridge.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp index 0d00433..392f931 100644 --- a/WebKit/android/jni/WebCoreFrameBridge.cpp +++ b/WebKit/android/jni/WebCoreFrameBridge.cpp @@ -1421,7 +1421,7 @@ static void AddJavascriptInterface(JNIEnv *env, jobject obj, jint nativeFramePoi #if USE(JSC) // Copied from qwebframe.cpp - JSC::JSLock lock(false); + JSC::JSLock lock(JSC::SilenceAssertionsOnly); WebCore::JSDOMWindow *window = WebCore::toJSDOMWindow(pFrame, mainThreadNormalWorld()); if (window) { RootObject *root = pFrame->script()->bindingRootObject(); |