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/RegExpCachedResult.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'Source/JavaScriptCore/runtime/RegExpCachedResult.cpp') diff --git a/Source/JavaScriptCore/runtime/RegExpCachedResult.cpp b/Source/JavaScriptCore/runtime/RegExpCachedResult.cpp index 47cff15f1..c54b4783d 100644 --- a/Source/JavaScriptCore/runtime/RegExpCachedResult.cpp +++ b/Source/JavaScriptCore/runtime/RegExpCachedResult.cpp @@ -26,6 +26,7 @@ #include "config.h" #include "RegExpCachedResult.h" +#include "Operations.h" #include "RegExpMatchesArray.h" namespace JSC { @@ -41,8 +42,8 @@ void RegExpCachedResult::visitChildren(SlotVisitor& visitor) RegExpMatchesArray* RegExpCachedResult::lastResult(ExecState* exec, JSObject* owner) { if (m_result) { - m_reifiedInput.set(exec->globalData(), owner, m_lastInput.get()); - m_reifiedResult.set(exec->globalData(), owner, RegExpMatchesArray::create(exec, m_lastInput.get(), m_lastRegExp.get(), m_result)); + m_reifiedInput.set(exec->vm(), owner, m_lastInput.get()); + m_reifiedResult.set(exec->vm(), owner, RegExpMatchesArray::create(exec, m_lastInput.get(), m_lastRegExp.get(), m_result)); m_result = MatchResult::failed(); } return m_reifiedResult.get(); @@ -53,7 +54,7 @@ void RegExpCachedResult::setInput(ExecState* exec, JSObject* owner, JSString* in // Make sure we're reified, otherwise m_reifiedInput will be ignored. lastResult(exec, owner); ASSERT(!m_result); - m_reifiedInput.set(exec->globalData(), owner, input); + m_reifiedInput.set(exec->vm(), owner, input); } } // namespace JSC -- cgit v1.2.1