From cfd86b747d32ac22246a1aa908eaa720c63a88c1 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@digia.com>
Date: Wed, 7 Nov 2012 11:22:47 +0100
Subject: Imported WebKit commit 20271caf2e2c016d5cef40184cddeefeac4f1876
 (http://svn.webkit.org/repository/webkit/trunk@133733)

New snapshot that contains all previous fixes as well as build fix for latest QtMultimedia API changes.
---
 Source/JavaScriptCore/runtime/JSGlobalObject.h | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

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

diff --git a/Source/JavaScriptCore/runtime/JSGlobalObject.h b/Source/JavaScriptCore/runtime/JSGlobalObject.h
index 2994aa64b..3212363ab 100644
--- a/Source/JavaScriptCore/runtime/JSGlobalObject.h
+++ b/Source/JavaScriptCore/runtime/JSGlobalObject.h
@@ -43,6 +43,10 @@ namespace JSC {
     class Debugger;
     class ErrorConstructor;
     class ErrorPrototype;
+    class EvalCodeBlock;
+    class EvalExecutable;
+    class FunctionCodeBlock;
+    class FunctionExecutable;
     class FunctionPrototype;
     class GetterSetter;
     class GlobalCodeBlock;
@@ -50,9 +54,10 @@ namespace JSC {
     class LLIntOffsetsExtractor;
     class NativeErrorConstructor;
     class ProgramCodeBlock;
+    class ProgramExecutable;
     class RegExpConstructor;
     class RegExpPrototype;
-
+    class SourceCode;
     struct ActivationStackNode;
     struct HashTable;
 
@@ -185,6 +190,9 @@ namespace JSC {
 
         static JS_EXPORTDATA const ClassInfo s_info;
 
+        bool hasDebugger() const { return m_debugger; }
+        bool hasProfiler() const { return globalObjectMethodTable()->supportsProfiling(this); }
+
     protected:
         JS_EXPORT_PRIVATE explicit JSGlobalObject(JSGlobalData&, Structure*, const GlobalObjectMethodTable* = 0);
 
@@ -271,6 +279,10 @@ namespace JSC {
         Structure* arrayStructureWithArrayStorage() const { return m_arrayStructureWithArrayStorage.get(); }
         void* addressOfArrayStructure() { return &m_arrayStructure; }
         void* addressOfArrayStructureWithArrayStorage() { return &m_arrayStructureWithArrayStorage; }
+        bool isOriginalArrayStructure(Structure* structure)
+        {
+            return structure == m_arrayStructure.get() || structure == m_arrayStructureWithArrayStorage.get();
+        }
         Structure* booleanObjectStructure() const { return m_booleanObjectStructure.get(); }
         Structure* callbackConstructorStructure() const { return m_callbackConstructorStructure.get(); }
         Structure* callbackFunctionStructure() const { return m_callbackFunctionStructure.get(); }
@@ -362,6 +374,11 @@ namespace JSC {
 
         double weakRandomNumber() { return m_weakRandom.get(); }
         unsigned weakRandomInteger() { return m_weakRandom.getUint32(); }
+
+        UnlinkedProgramCodeBlock* createProgramCodeBlock(CallFrame*, ProgramExecutable*, JSObject** exception);
+        UnlinkedEvalCodeBlock* createEvalCodeBlock(CallFrame*, EvalExecutable*, JSObject** exception);
+        UnlinkedFunctionExecutable* createFunctionExecutableFromGlobalCode(CallFrame*, const Identifier&, const SourceCode&, JSObject** exception);
+
     protected:
 
         static const unsigned StructureFlags = OverridesGetOwnPropertySlot | OverridesVisitChildren | OverridesGetPropertyNames | Base::StructureFlags;
-- 
cgit v1.2.1