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/API/OpaqueJSString.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Source/JavaScriptCore/API/OpaqueJSString.cpp') diff --git a/Source/JavaScriptCore/API/OpaqueJSString.cpp b/Source/JavaScriptCore/API/OpaqueJSString.cpp index 90bc1c095..a7cef8d9a 100644 --- a/Source/JavaScriptCore/API/OpaqueJSString.cpp +++ b/Source/JavaScriptCore/API/OpaqueJSString.cpp @@ -48,7 +48,7 @@ String OpaqueJSString::string() const return m_string.isolatedCopy(); } -Identifier OpaqueJSString::identifier(JSGlobalData* globalData) const +Identifier OpaqueJSString::identifier(VM* vm) const { if (!this || m_string.isNull()) return Identifier(); @@ -57,7 +57,7 @@ Identifier OpaqueJSString::identifier(JSGlobalData* globalData) const return Identifier(Identifier::EmptyIdentifier); if (m_string.is8Bit()) - return Identifier(globalData, m_string.characters8(), m_string.length()); + return Identifier(vm, m_string.characters8(), m_string.length()); - return Identifier(globalData, m_string.characters16(), m_string.length()); + return Identifier(vm, m_string.characters16(), m_string.length()); } -- cgit v1.2.1