From 5ea819f80c6840c492386bfafbffb059c7e2091f Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@digia.com>
Date: Tue, 23 Oct 2012 10:25:11 +0200
Subject: Imported WebKit commit 20434eb8eb95065803473139d8794e98a7672f75
 (http://svn.webkit.org/repository/webkit/trunk@132191)

New snapshot that should fix build with latest qtbase and the QPlastiqueStyle removal
---
 Source/JavaScriptCore/runtime/StringRecursionChecker.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'Source/JavaScriptCore/runtime/StringRecursionChecker.h')

diff --git a/Source/JavaScriptCore/runtime/StringRecursionChecker.h b/Source/JavaScriptCore/runtime/StringRecursionChecker.h
index 831e25b46..a1b4a51fe 100644
--- a/Source/JavaScriptCore/runtime/StringRecursionChecker.h
+++ b/Source/JavaScriptCore/runtime/StringRecursionChecker.h
@@ -22,6 +22,7 @@
 
 #include "Interpreter.h"
 #include <wtf/StackStats.h>
+#include <wtf/WTFThreadData.h>
 
 namespace JSC {
 
@@ -48,8 +49,8 @@ private:
 
 inline JSValue StringRecursionChecker::performCheck()
 {
-    int size = m_exec->globalData().stringRecursionCheckVisitedObjects.size();
-    if (size >= MaxSmallThreadReentryDepth && size >= m_exec->globalData().maxReentryDepth)
+    const StackBounds& nativeStack = wtfThreadData().stack();
+    if (!nativeStack.isSafeToRecurse())
         return throwStackOverflowError();
     bool alreadyVisited = !m_exec->globalData().stringRecursionCheckVisitedObjects.add(m_thisObject).isNewEntry;
     if (alreadyVisited)
-- 
cgit v1.2.1