From d441d6f39bb846989d95bcf5caf387b42414718d Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Fri, 13 Sep 2013 12:51:20 +0200 Subject: Import Qt5x2 branch of QtWebkit for Qt 5.2 Importing a new snapshot of webkit. Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c Reviewed-by: Allan Sandfeld Jensen --- Source/JavaScriptCore/runtime/JSString.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Source/JavaScriptCore/runtime/JSString.cpp') diff --git a/Source/JavaScriptCore/runtime/JSString.cpp b/Source/JavaScriptCore/runtime/JSString.cpp index f0e796d89..86704d715 100644 --- a/Source/JavaScriptCore/runtime/JSString.cpp +++ b/Source/JavaScriptCore/runtime/JSString.cpp @@ -40,7 +40,7 @@ void JSRopeString::RopeBuilder::expand() { ASSERT(m_index == JSRopeString::s_maxInternalRopeLength); JSString* jsString = m_jsString; - m_jsString = jsStringBuilder(&m_globalData); + m_jsString = jsStringBuilder(&m_vm); m_index = 0; append(jsString); } @@ -154,7 +154,7 @@ void JSRopeString::resolveRope(ExecState* exec) const void JSRopeString::resolveRopeSlowCase8(LChar* buffer) const { LChar* position = buffer + m_length; // We will be working backwards over the rope. - Vector workQueue; // Putting strings into a Vector is only OK because there are no GC points in this method. + Vector workQueue; // Putting strings into a Vector is only OK because there are no GC points in this method. for (size_t i = 0; i < s_maxInternalRopeLength && m_fibers[i]; ++i) { workQueue.append(m_fibers[i].get()); @@ -186,7 +186,7 @@ void JSRopeString::resolveRopeSlowCase8(LChar* buffer) const void JSRopeString::resolveRopeSlowCase(UChar* buffer) const { UChar* position = buffer + m_length; // We will be working backwards over the rope. - Vector workQueue; // These strings are kept alive by the parent rope, so using a Vector is OK. + Vector workQueue; // These strings are kept alive by the parent rope, so using a Vector is OK. for (size_t i = 0; i < s_maxInternalRopeLength && m_fibers[i]; ++i) workQueue.append(m_fibers[i].get()); @@ -233,7 +233,7 @@ JSString* JSRopeString::getIndexSlowCase(ExecState* exec, unsigned i) if (exec->exception()) return jsEmptyString(exec); ASSERT(!isRope()); - ASSERT(i < m_value.length()); + RELEASE_ASSERT(i < m_value.length()); return jsSingleCharacterSubstring(exec, m_value, i); } @@ -261,8 +261,8 @@ double JSString::toNumber(ExecState* exec) const inline StringObject* StringObject::create(ExecState* exec, JSGlobalObject* globalObject, JSString* string) { - StringObject* object = new (NotNull, allocateCell(*exec->heap())) StringObject(exec->globalData(), globalObject->stringObjectStructure()); - object->finishCreation(exec->globalData(), string); + StringObject* object = new (NotNull, allocateCell(*exec->heap())) StringObject(exec->vm(), globalObject->stringObjectStructure()); + object->finishCreation(exec->vm(), string); return object; } -- cgit v1.2.1