diff options
Diffstat (limited to 'WebCore/bridge/c/c_utility.cpp')
-rw-r--r-- | WebCore/bridge/c/c_utility.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/WebCore/bridge/c/c_utility.cpp b/WebCore/bridge/c/c_utility.cpp index 3e65eb9..443ecca 100644 --- a/WebCore/bridge/c/c_utility.cpp +++ b/WebCore/bridge/c/c_utility.cpp @@ -31,6 +31,7 @@ #include "c_utility.h" #include "CRuntimeObject.h" +#include "JSDOMBinding.h" #include "JSDOMWindow.h" #include "NP_jsobject.h" #include "c_instance.h" @@ -43,8 +44,6 @@ #include "runtime_root.h" #include <wtf/Assertions.h> -using WebCore::String; - namespace JSC { namespace Bindings { static String convertUTF8ToUTF16WithLatin1Fallback(const NPUTF8* UTF8Chars, int UTF8Length) @@ -123,7 +122,7 @@ JSValue convertNPVariantToValue(ExecState* exec, const NPVariant* variant, RootO if (type == NPVariantType_Double) return jsNumber(exec, NPVARIANT_TO_DOUBLE(*variant)); if (type == NPVariantType_String) - return jsString(exec, convertNPStringToUTF16(&variant->value.stringValue)); + return WebCore::jsString(exec, convertNPStringToUTF16(&variant->value.stringValue)); if (type == NPVariantType_Object) { NPObject* obj = variant->value.objectValue; @@ -145,7 +144,7 @@ String convertNPStringToUTF16(const NPString* string) Identifier identifierFromNPIdentifier(ExecState* exec, const NPUTF8* name) { - return Identifier(exec, stringToUString(convertUTF8ToUTF16WithLatin1Fallback(name, -1))); + return Identifier(exec, WebCore::stringToUString(convertUTF8ToUTF16WithLatin1Fallback(name, -1))); } } } |