Skip to content

Commit 0387ba8

Browse files
geoffreygarengeoffreygaren
committed
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: Canonical link: https://commits.webkit.org/167949@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@190601 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 4932b1f commit 0387ba8

9 files changed

Lines changed: 36 additions & 12 deletions

File tree

‎Source/JavaScriptCore/ChangeLog‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,25 @@
1+
2015-10-05 Geoffrey Garen <ggaren@apple.com>
2+
3+
Remove a few includes from JSGlobalObject.h
4+
https://bugs.webkit.org/show_bug.cgi?id=148004
5+
6+
Reviewed by Saam Barati.
7+
8+
* parser/VariableEnvironment.cpp:
9+
* parser/VariableEnvironment.h:
10+
* runtime/JSGlobalObject.h:
11+
* runtime/JSString.cpp:
12+
(JSC::JSString::createStructure):
13+
(JSC::JSRopeString::RopeBuilder::expand):
14+
* runtime/JSString.h:
15+
(JSC::JSString::canGetIndex):
16+
(JSC::JSString::offsetOfLength):
17+
(JSC::JSString::offsetOfFlags):
18+
(JSC::JSString::createStructure): Deleted.
19+
* runtime/Structure.h:
20+
* runtime/StructureInlines.h:
21+
* runtime/StructureRareDataInlines.h:
22+
123
2015-10-05 Filip Pizlo <fpizlo@apple.com>
224

325
GC shouldn't cancel every FTL compilation

‎Source/JavaScriptCore/parser/VariableEnvironment.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525

2626
#include "config.h"
2727
#include "VariableEnvironment.h"
28+
#include <wtf/text/UniquedStringImpl.h>
2829

2930
namespace JSC {
3031

‎Source/JavaScriptCore/parser/VariableEnvironment.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828

2929
#include "Identifier.h"
3030
#include <wtf/HashMap.h>
31-
#include <wtf/text/UniquedStringImpl.h>
3231

3332
namespace JSC {
3433

‎Source/JavaScriptCore/runtime/JSGlobalObject.h‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,14 @@
3434
#include "RuntimeFlags.h"
3535
#include "SpecialPointer.h"
3636
#include "StringPrototype.h"
37-
#include "StructureChain.h"
38-
#include "StructureRareDataInlines.h"
3937
#include "SymbolPrototype.h"
4038
#include "TemplateRegistry.h"
4139
#include "VM.h"
42-
#include "VariableEnvironment.h"
4340
#include "Watchpoint.h"
4441
#include <JavaScriptCore/JSBase.h>
4542
#include <array>
4643
#include <wtf/HashSet.h>
4744
#include <wtf/PassRefPtr.h>
48-
#include <wtf/RandomNumber.h>
4945

5046
struct OpaqueJSClass;
5147
struct OpaqueJSClassContextData;
@@ -71,25 +67,26 @@ class GetterSetter;
7167
class GlobalCodeBlock;
7268
class InputCursor;
7369
class JSGlobalObjectDebuggable;
70+
class JSInternalPromise;
7471
class JSPromise;
7572
class JSPromiseConstructor;
7673
class JSPromisePrototype;
77-
class JSInternalPromise;
7874
class JSStack;
7975
class LLIntOffsetsExtractor;
8076
class Microtask;
8177
class ModuleLoaderObject;
8278
class ModuleProgramExecutable;
8379
class NativeErrorConstructor;
80+
class NullGetterFunction;
81+
class NullSetterFunction;
8482
class ObjectConstructor;
8583
class ProgramCodeBlock;
8684
class ProgramExecutable;
8785
class RegExpConstructor;
8886
class RegExpPrototype;
8987
class SourceCode;
9088
class UnlinkedModuleProgramCodeBlock;
91-
class NullGetterFunction;
92-
class NullSetterFunction;
89+
class VariableEnvironment;
9390
enum class ThisTDZMode;
9491
struct ActivationStackNode;
9592
struct HashTable;

‎Source/JavaScriptCore/runtime/JSString.cpp‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,11 @@ namespace JSC {
3535

3636
const ClassInfo JSString::s_info = { "string", 0, 0, CREATE_METHOD_TABLE(JSString) };
3737

38+
Structure* JSString::createStructure(VM& vm, JSGlobalObject* globalObject, JSValue proto)
39+
{
40+
return Structure::create(vm, globalObject, proto, TypeInfo(StringType, StructureFlags), info());
41+
}
42+
3843
void JSRopeString::RopeBuilder::expand()
3944
{
4045
ASSERT(m_index == JSRopeString::s_maxInternalRopeLength);

‎Source/JavaScriptCore/runtime/JSString.h‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -173,10 +173,7 @@ class JSString : public JSCell {
173173
bool canGetIndex(unsigned i) { return i < m_length; }
174174
JSString* getIndex(ExecState*, unsigned);
175175

176-
static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue proto)
177-
{
178-
return Structure::create(vm, globalObject, proto, TypeInfo(StringType, StructureFlags), info());
179-
}
176+
static Structure* createStructure(VM&, JSGlobalObject*, JSValue);
180177

181178
static size_t offsetOfLength() { return OBJECT_OFFSETOF(JSString, m_length); }
182179
static size_t offsetOfFlags() { return OBJECT_OFFSETOF(JSString, m_flags); }

‎Source/JavaScriptCore/runtime/Structure.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
#include "PutPropertySlot.h"
4141
#include "StructureIDBlob.h"
4242
#include "StructureRareData.h"
43+
#include "StructureRareDataInlines.h"
4344
#include "StructureTransitionTable.h"
4445
#include "JSTypeInfo.h"
4546
#include "Watchpoint.h"

‎Source/JavaScriptCore/runtime/StructureInlines.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
#include "JSArrayBufferView.h"
3030
#include "PropertyMapHashTable.h"
3131
#include "Structure.h"
32+
#include "StructureChain.h"
3233

3334
namespace JSC {
3435

‎Source/JavaScriptCore/runtime/StructureRareDataInlines.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
#ifndef StructureRareDataInlines_h
2727
#define StructureRareDataInlines_h
2828

29+
#include "JSString.h"
2930
#include "StructureRareData.h"
3031

3132
namespace JSC {

0 commit comments

Comments
 (0)