From 284837daa07b29d6a63a748544a90b1f5842ac5c Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@nokia.com>
Date: Mon, 10 Sep 2012 19:10:20 +0200
Subject: Imported WebKit commit 68645295d2e3e09af2c942f092556f06aa5f8b0d
 (http://svn.webkit.org/repository/webkit/trunk@128073)

New snapshot
---
 Source/JavaScriptCore/API/OpaqueJSString.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'Source/JavaScriptCore/API/OpaqueJSString.h')

diff --git a/Source/JavaScriptCore/API/OpaqueJSString.h b/Source/JavaScriptCore/API/OpaqueJSString.h
index 1c63150cf..35543cdd6 100644
--- a/Source/JavaScriptCore/API/OpaqueJSString.h
+++ b/Source/JavaScriptCore/API/OpaqueJSString.h
@@ -27,7 +27,7 @@
 #define OpaqueJSString_h
 
 #include <wtf/ThreadSafeRefCounted.h>
-#include <runtime/UString.h>
+#include <wtf/text/WTFString.h>
 
 namespace JSC {
     class Identifier;
@@ -46,12 +46,12 @@ struct OpaqueJSString : public ThreadSafeRefCounted<OpaqueJSString> {
         return adoptRef(new OpaqueJSString(characters, length));
     }
 
-    JS_EXPORT_PRIVATE static PassRefPtr<OpaqueJSString> create(const JSC::UString&);
+    JS_EXPORT_PRIVATE static PassRefPtr<OpaqueJSString> create(const String&);
 
     UChar* characters() { return this ? m_characters : 0; }
     unsigned length() { return this ? m_length : 0; }
 
-    JSC::UString ustring() const;
+    String string() const;
     JSC::Identifier identifier(JSC::JSGlobalData*) const;
 
 private:
-- 
cgit v1.2.1