diff options
| author | John Reck <jreck@google.com> | 2010-11-04 12:00:17 -0700 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2010-11-09 11:35:04 -0800 |
| commit | e14391e94c850b8bd03680c23b38978db68687a8 (patch) | |
| tree | 3fed87e6620fecaf3edc7259ae58a11662bedcb2 /WebCore/bridge/c | |
| parent | 1bd705833a68f07850cf7e204b26f8d328d16951 (diff) | |
| download | external_webkit-e14391e94c850b8bd03680c23b38978db68687a8.zip external_webkit-e14391e94c850b8bd03680c23b38978db68687a8.tar.gz external_webkit-e14391e94c850b8bd03680c23b38978db68687a8.tar.bz2 | |
Merge Webkit at r70949: Initial merge by git.
Change-Id: I77b8645c083b5d0da8dba73ed01d4014aab9848e
Diffstat (limited to 'WebCore/bridge/c')
| -rw-r--r-- | WebCore/bridge/c/c_instance.cpp | 4 | ||||
| -rw-r--r-- | WebCore/bridge/c/c_utility.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/WebCore/bridge/c/c_instance.cpp b/WebCore/bridge/c/c_instance.cpp index 03e72fc..f1dd4e5 100644 --- a/WebCore/bridge/c/c_instance.cpp +++ b/WebCore/bridge/c/c_instance.cpp @@ -265,10 +265,10 @@ JSValue CInstance::stringValue(ExecState* exec) const return jsString(exec, buf); } -JSValue CInstance::numberValue(ExecState* exec) const +JSValue CInstance::numberValue(ExecState*) const { // FIXME: Implement something sensible. - return jsNumber(exec, 0); + return jsNumber(0); } JSValue CInstance::booleanValue() const diff --git a/WebCore/bridge/c/c_utility.cpp b/WebCore/bridge/c/c_utility.cpp index b160f9f..e786896 100644 --- a/WebCore/bridge/c/c_utility.cpp +++ b/WebCore/bridge/c/c_utility.cpp @@ -118,9 +118,9 @@ JSValue convertNPVariantToValue(ExecState* exec, const NPVariant* variant, RootO if (type == NPVariantType_Void) return jsUndefined(); if (type == NPVariantType_Int32) - return jsNumber(exec, NPVARIANT_TO_INT32(*variant)); + return jsNumber(NPVARIANT_TO_INT32(*variant)); if (type == NPVariantType_Double) - return jsNumber(exec, NPVARIANT_TO_DOUBLE(*variant)); + return jsNumber(NPVARIANT_TO_DOUBLE(*variant)); if (type == NPVariantType_String) return WebCore::jsString(exec, convertNPStringToUTF16(&variant->value.stringValue)); if (type == NPVariantType_Object) { |