diff options
| author | Iain Merrick <husky@google.com> | 2010-08-19 17:55:56 +0100 |
|---|---|---|
| committer | Iain Merrick <husky@google.com> | 2010-08-23 11:05:40 +0100 |
| commit | f486d19d62f1bc33246748b14b14a9dfa617b57f (patch) | |
| tree | 195485454c93125455a30e553a73981c3816144d /JavaScriptCore/runtime/RopeImpl.h | |
| parent | 6ba0b43722d16bc295606bec39f396f596e4fef1 (diff) | |
| download | external_webkit-f486d19d62f1bc33246748b14b14a9dfa617b57f.zip external_webkit-f486d19d62f1bc33246748b14b14a9dfa617b57f.tar.gz external_webkit-f486d19d62f1bc33246748b14b14a9dfa617b57f.tar.bz2 | |
Merge WebKit at r65615 : Initial merge by git.
Change-Id: Ifbf384f4531e3b58475a662e38195c2d9152ae79
Diffstat (limited to 'JavaScriptCore/runtime/RopeImpl.h')
| -rw-r--r-- | JavaScriptCore/runtime/RopeImpl.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/JavaScriptCore/runtime/RopeImpl.h b/JavaScriptCore/runtime/RopeImpl.h index ac2b502..dfacbf5 100644 --- a/JavaScriptCore/runtime/RopeImpl.h +++ b/JavaScriptCore/runtime/RopeImpl.h @@ -26,14 +26,14 @@ #ifndef RopeImpl_h #define RopeImpl_h -#include "UStringImpl.h" +#include <wtf/text/StringImpl.h> namespace JSC { class RopeImpl : public StringImplBase { public: // A RopeImpl is composed from a set of smaller strings called Fibers. - // Each Fiber in a rope is either UStringImpl or another RopeImpl. + // Each Fiber in a rope is either StringImpl or another RopeImpl. typedef StringImplBase* Fiber; // Creates a RopeImpl comprising of 'fiberCount' Fibers. @@ -56,7 +56,7 @@ public: if (isRope(fiber)) static_cast<RopeImpl*>(fiber)->deref(); else - static_cast<UStringImpl*>(fiber)->deref(); + static_cast<StringImpl*>(fiber)->deref(); } void initializeFiber(unsigned &index, Fiber fiber) |