Unreviewed, rolling out r142568.
[WebKit-https.git] / Source / WebCore / bindings / js / JSIntentConstructor.cpp
index 60a214a73871ba108642c168d0bbdcafd643ec94..9e76368b9083168a4dafe752c9500b8ab6401e8c 100644 (file)
 
 #include "Dictionary.h"
 #include "ExceptionCode.h"
+#include "JSCJSValue.h"
 #include "JSDOMBinding.h"
 #include "JSIntent.h"
 #include "JSMessagePortCustom.h"
-#include "JSValue.h"
 #include <runtime/Error.h>
 #include <wtf/ArrayBuffer.h>
 
@@ -61,11 +61,11 @@ EncodedJSValue JSC_HOST_CALL JSIntentConstructor::constructJSIntent(ExecState* e
         return JSValue::encode(asObject(toJS(exec, castedThis->globalObject(), impl.get())));
     }
 
-    const String& action(ustringToString(MAYBE_MISSING_PARAMETER(exec, 0, DefaultIsUndefined).isEmpty() ? UString() : MAYBE_MISSING_PARAMETER(exec, 0, DefaultIsUndefined).toString(exec)->value(exec)));
+    const String action(MAYBE_MISSING_PARAMETER(exec, 0, DefaultIsUndefined).isEmpty() ? String() : MAYBE_MISSING_PARAMETER(exec, 0, DefaultIsUndefined).toWTFString(exec));
     if (exec->hadException())
         return JSValue::encode(jsUndefined());
 
-    const String& type(ustringToString(MAYBE_MISSING_PARAMETER(exec, 1, DefaultIsUndefined).isEmpty() ? UString() : MAYBE_MISSING_PARAMETER(exec, 1, DefaultIsUndefined).toString(exec)->value(exec)));
+    const String type(MAYBE_MISSING_PARAMETER(exec, 1, DefaultIsUndefined).isEmpty() ? String() : MAYBE_MISSING_PARAMETER(exec, 1, DefaultIsUndefined).toWTFString(exec));
     if (exec->hadException())
         return JSValue::encode(jsUndefined());