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/StringRecursionChecker.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'Source/JavaScriptCore/runtime/StringRecursionChecker.h') diff --git a/Source/JavaScriptCore/runtime/StringRecursionChecker.h b/Source/JavaScriptCore/runtime/StringRecursionChecker.h index a1b4a51fe..6f236f1f1 100644 --- a/Source/JavaScriptCore/runtime/StringRecursionChecker.h +++ b/Source/JavaScriptCore/runtime/StringRecursionChecker.h @@ -21,6 +21,7 @@ #define StringRecursionChecker_h #include "Interpreter.h" +#include "VMStackBounds.h" #include #include @@ -49,10 +50,11 @@ private: inline JSValue StringRecursionChecker::performCheck() { - const StackBounds& nativeStack = wtfThreadData().stack(); + VM& vm = m_exec->vm(); + const VMStackBounds nativeStack(vm, wtfThreadData().stack()); if (!nativeStack.isSafeToRecurse()) return throwStackOverflowError(); - bool alreadyVisited = !m_exec->globalData().stringRecursionCheckVisitedObjects.add(m_thisObject).isNewEntry; + bool alreadyVisited = !vm.stringRecursionCheckVisitedObjects.add(m_thisObject).isNewEntry; if (alreadyVisited) return emptyString(); // Return empty string to avoid infinite recursion. return JSValue(); // Indicate success. @@ -74,8 +76,8 @@ inline StringRecursionChecker::~StringRecursionChecker() { if (m_earlyReturnValue) return; - ASSERT(m_exec->globalData().stringRecursionCheckVisitedObjects.contains(m_thisObject)); - m_exec->globalData().stringRecursionCheckVisitedObjects.remove(m_thisObject); + ASSERT(m_exec->vm().stringRecursionCheckVisitedObjects.contains(m_thisObject)); + m_exec->vm().stringRecursionCheckVisitedObjects.remove(m_thisObject); } } -- cgit v1.2.1