Changeset 57748 in webkit for trunk/JavaScriptCore/runtime

Timestamp:

Apr 16, 2010, 2:50:05 PM (15 years ago)

Author:

[email protected]

Message:

Bug 37730 - Remove JSC::UString dependencies from WebCore::StringImpl
(Following on from bug #37675).

Reviewed by Oliver Hunt.

JavaScriptCore:

Make the argument ordering for UStringImpl's constructor & create
methods match, when passed a shared buffer.

• JavaScriptCore.exp:
• runtime/UStringImpl.cpp:

(JSC::UStringImpl::create):

• runtime/UStringImpl.h:

WebCore:

Remove ustring() method, and constructor passed a UString.

• WebCore.base.exp:
• bindings/js/JSDOMBinding.cpp:

(WebCore::stringimplToUString):
(WebCore::jsStringSlowCase):
(WebCore::ustringToString):
(WebCore::stringToUString):
(WebCore::identifierToString):

• bindings/js/JSDOMBinding.h:

(WebCore::jsString):

• platform/text/AtomicString.cpp:

(WebCore::AtomicString::operator UString):

• platform/text/StringImpl.cpp:

(WebCore::StringImpl::create):

• platform/text/StringImpl.h:

Location:

trunk/JavaScriptCore/runtime

Files:

• UStringImpl.cpp (modified) (1 diff)
• UStringImpl.h (modified) (1 diff)

trunk/JavaScriptCore/runtime/UStringImpl.cpp

@@ -128 +128 @@
 }
 
-PassRefPtr<UStringImpl> UStringImpl::create(PassRefPtr<SharedUChar> sharedBuffer, const UChar* buffer, unsigned length)
+PassRefPtr<UStringImpl> UStringImpl::create(const UChar* buffer, unsigned length, PassRefPtr<SharedUChar> sharedBuffer)
 {
     if (!length)

trunk/JavaScriptCore/runtime/UStringImpl.h

@@ -188 +188 @@
     static PassRefPtr<UStringImpl> create(const char*, unsigned length);
     static PassRefPtr<UStringImpl> create(const char*);
-    static PassRefPtr<UStringImpl> create(PassRefPtr<SharedUChar>, const UChar*, unsigned length);
+    static PassRefPtr<UStringImpl> create(const UChar*, unsigned length, PassRefPtr<SharedUChar>);
     static PassRefPtr<UStringImpl> create(PassRefPtr<UStringImpl> rep, unsigned offset, unsigned length)
     {