Remove a few includes from JSGlobalObject.h
authorggaren@apple.com <ggaren@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 6 Oct 2015 01:59:02 +0000 (01:59 +0000)
committerggaren@apple.com <ggaren@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 6 Oct 2015 01:59:02 +0000 (01:59 +0000)
https://bugs.webkit.org/show_bug.cgi?id=148004

Reviewed by Saam Barati.

* parser/VariableEnvironment.cpp:
* parser/VariableEnvironment.h:
* runtime/JSGlobalObject.h:
* runtime/JSString.cpp:
(JSC::JSString::createStructure):
(JSC::JSRopeString::RopeBuilder::expand):
* runtime/JSString.h:
(JSC::JSString::canGetIndex):
(JSC::JSString::offsetOfLength):
(JSC::JSString::offsetOfFlags):
(JSC::JSString::createStructure): Deleted.
* runtime/Structure.h:
* runtime/StructureInlines.h:
* runtime/StructureRareDataInlines.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@190601 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/parser/VariableEnvironment.cpp
Source/JavaScriptCore/parser/VariableEnvironment.h
Source/JavaScriptCore/runtime/JSGlobalObject.h
Source/JavaScriptCore/runtime/JSString.cpp
Source/JavaScriptCore/runtime/JSString.h
Source/JavaScriptCore/runtime/Structure.h
Source/JavaScriptCore/runtime/StructureInlines.h
Source/JavaScriptCore/runtime/StructureRareDataInlines.h

index 3b15887..b37fcb0 100644 (file)
@@ -1,3 +1,25 @@
+2015-10-05  Geoffrey Garen  <ggaren@apple.com>
+
+        Remove a few includes from JSGlobalObject.h
+        https://bugs.webkit.org/show_bug.cgi?id=148004
+
+        Reviewed by Saam Barati.
+
+        * parser/VariableEnvironment.cpp:
+        * parser/VariableEnvironment.h:
+        * runtime/JSGlobalObject.h:
+        * runtime/JSString.cpp:
+        (JSC::JSString::createStructure):
+        (JSC::JSRopeString::RopeBuilder::expand):
+        * runtime/JSString.h:
+        (JSC::JSString::canGetIndex):
+        (JSC::JSString::offsetOfLength):
+        (JSC::JSString::offsetOfFlags):
+        (JSC::JSString::createStructure): Deleted.
+        * runtime/Structure.h:
+        * runtime/StructureInlines.h:
+        * runtime/StructureRareDataInlines.h:
+
 2015-10-05  Filip Pizlo  <fpizlo@apple.com>
 
         GC shouldn't cancel every FTL compilation
index ed055f9..6dc2fbb 100644 (file)
@@ -25,6 +25,7 @@
 
 #include "config.h"
 #include "VariableEnvironment.h"
+#include <wtf/text/UniquedStringImpl.h>
 
 namespace JSC {
 
index 76c7096..519d012 100644 (file)
@@ -28,7 +28,6 @@
 
 #include "Identifier.h"
 #include <wtf/HashMap.h>
-#include <wtf/text/UniquedStringImpl.h>
 
 namespace JSC {
 
index 21085d6..8e1629c 100644 (file)
 #include "RuntimeFlags.h"
 #include "SpecialPointer.h"
 #include "StringPrototype.h"
-#include "StructureChain.h"
-#include "StructureRareDataInlines.h"
 #include "SymbolPrototype.h"
 #include "TemplateRegistry.h"
 #include "VM.h"
-#include "VariableEnvironment.h"
 #include "Watchpoint.h"
 #include <JavaScriptCore/JSBase.h>
 #include <array>
 #include <wtf/HashSet.h>
 #include <wtf/PassRefPtr.h>
-#include <wtf/RandomNumber.h>
 
 struct OpaqueJSClass;
 struct OpaqueJSClassContextData;
@@ -71,16 +67,18 @@ class GetterSetter;
 class GlobalCodeBlock;
 class InputCursor;
 class JSGlobalObjectDebuggable;
+class JSInternalPromise;
 class JSPromise;
 class JSPromiseConstructor;
 class JSPromisePrototype;
-class JSInternalPromise;
 class JSStack;
 class LLIntOffsetsExtractor;
 class Microtask;
 class ModuleLoaderObject;
 class ModuleProgramExecutable;
 class NativeErrorConstructor;
+class NullGetterFunction;
+class NullSetterFunction;
 class ObjectConstructor;
 class ProgramCodeBlock;
 class ProgramExecutable;
@@ -88,8 +86,7 @@ class RegExpConstructor;
 class RegExpPrototype;
 class SourceCode;
 class UnlinkedModuleProgramCodeBlock;
-class NullGetterFunction;
-class NullSetterFunction;
+class VariableEnvironment;
 enum class ThisTDZMode;
 struct ActivationStackNode;
 struct HashTable;
index c58354a..6d94c42 100644 (file)
@@ -35,6 +35,11 @@ namespace JSC {
     
 const ClassInfo JSString::s_info = { "string", 0, 0, CREATE_METHOD_TABLE(JSString) };
 
+Structure* JSString::createStructure(VM& vm, JSGlobalObject* globalObject, JSValue proto)
+{
+    return Structure::create(vm, globalObject, proto, TypeInfo(StringType, StructureFlags), info());
+}
+
 void JSRopeString::RopeBuilder::expand()
 {
     ASSERT(m_index == JSRopeString::s_maxInternalRopeLength);
index fdb3842..a67cd44 100644 (file)
@@ -173,10 +173,7 @@ public:
     bool canGetIndex(unsigned i) { return i < m_length; }
     JSString* getIndex(ExecState*, unsigned);
 
-    static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue proto)
-    {
-        return Structure::create(vm, globalObject, proto, TypeInfo(StringType, StructureFlags), info());
-    }
+    static Structure* createStructure(VM&, JSGlobalObject*, JSValue);
 
     static size_t offsetOfLength() { return OBJECT_OFFSETOF(JSString, m_length); }
     static size_t offsetOfFlags() { return OBJECT_OFFSETOF(JSString, m_flags); }
index 7823832..cabaae9 100644 (file)
@@ -40,6 +40,7 @@
 #include "PutPropertySlot.h"
 #include "StructureIDBlob.h"
 #include "StructureRareData.h"
+#include "StructureRareDataInlines.h"
 #include "StructureTransitionTable.h"
 #include "JSTypeInfo.h"
 #include "Watchpoint.h"
index 6a665d5..19555eb 100644 (file)
@@ -29,6 +29,7 @@
 #include "JSArrayBufferView.h"
 #include "PropertyMapHashTable.h"
 #include "Structure.h"
+#include "StructureChain.h"
 
 namespace JSC {
 
index 99ac3c0..3294e77 100644 (file)
@@ -26,6 +26,7 @@
 #ifndef StructureRareDataInlines_h
 #define StructureRareDataInlines_h
 
+#include "JSString.h"
 #include "StructureRareData.h"
 
 namespace JSC {