Merge WebKit at r61871: Initial merge by git.

Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5

1 files changed, 7 insertions, 0 deletions

diff --git a/JavaScriptCore/runtime/JSGlobalData.h b/JavaScriptCore/runtime/JSGlobalData.h
index f48aec8..f99c8d6 100644
--- a/JavaScriptCore/runtime/JSGlobalData.h
+++ b/JavaScriptCore/runtime/JSGlobalData.h
@@ -44,6 +44,7 @@
 #include <wtf/Forward.h>
 #include <wtf/HashMap.h>
 #include <wtf/RefCounted.h>
+#include <wtf/ThreadSpecific.h>
 
 struct OpaqueJSClass;
 struct OpaqueJSClassContextData;
@@ -58,6 +59,7 @@ namespace JSC {
     class JSObject;
     class Lexer;
     class Parser;
+    class RegExpCache;
     class Stringifier;
     class Structure;
     class UString;
@@ -211,17 +213,22 @@ namespace JSC {
         WeakRandom weakRandom;
 
         int maxReentryDepth;
+
+        RegExpCache* m_regExpCache;
+
 #ifndef NDEBUG
         ThreadIdentifier exclusiveThread;
 #endif
 
         CachedTranscendentalFunction<sin> cachedSin;
+        WTF::ThreadSpecific<char*> stackGuards;
 
         void resetDateCache();
 
         void startSampling();
         void stopSampling();
         void dumpSampleData(ExecState* exec);
+        RegExpCache* regExpCache() { return m_regExpCache; }
     private:
         JSGlobalData(GlobalDataType, ThreadStackType);
         static JSGlobalData*& sharedInstanceInternal();