Changeset 82898 in webkit

Timestamp:

Apr 4, 2011 6:33:58 PM (13 years ago)

Author:

oliver@apple.com

Message:

2011-04-04 Oliver Hunt <​oliver@apple.com>

Reviewed by Antti Koivisto.

Stop JSCell.h from including Structure.h
​https://bugs.webkit.org/show_bug.cgi?id=57809

• runtime/GetterSetter.h:
• runtime/JSAPIValueWrapper.h:
• runtime/JSCell.h: (JSC::JSCell::JSValue::toThisObject):
• runtime/JSString.h:
• runtime/ScopeChain.h:
• runtime/Structure.h: (JSC::JSCell::isObject): (JSC::JSCell::isString): (JSC::JSCell::classInfo): (JSC::JSCell::createDummyStructure): (JSC::JSValue::needsThisConversion): (JSC::MarkStack::internalAppend):
• runtime/StructureChain.h:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/GetterSetter.h (modified) (1 diff)
• runtime/JSAPIValueWrapper.h (modified) (1 diff)
• runtime/JSCell.h (modified) (8 diffs)
• runtime/JSString.h (modified) (1 diff)
• runtime/ScopeChain.h (modified) (1 diff)
• runtime/Structure.h (modified) (2 diffs)
• runtime/StructureChain.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-04-04  Oliver Hunt  <oliver@apple.com>
+
+        Reviewed by Antti Koivisto.
+
+        Stop JSCell.h from including Structure.h
+        https://bugs.webkit.org/show_bug.cgi?id=57809
+
+        * runtime/GetterSetter.h:
+        * runtime/JSAPIValueWrapper.h:
+        * runtime/JSCell.h:
+        (JSC::JSCell::JSValue::toThisObject):
+        * runtime/JSString.h:
+        * runtime/ScopeChain.h:
+        * runtime/Structure.h:
+        (JSC::JSCell::isObject):
+        (JSC::JSCell::isString):
+        (JSC::JSCell::classInfo):
+        (JSC::JSCell::createDummyStructure):
+        (JSC::JSValue::needsThisConversion):
+        (JSC::MarkStack::internalAppend):
+        * runtime/StructureChain.h:
+
 2011-04-04  Oliver Hunt  <oliver@apple.com>
 

trunk/Source/JavaScriptCore/runtime/GetterSetter.h

@@ -27 +27 @@
 
 #include "CallFrame.h"
+#include "Structure.h"
 
 namespace JSC {

trunk/Source/JavaScriptCore/runtime/JSAPIValueWrapper.h

@@ -26 +26 @@
 #include "JSCell.h"
 #include "CallFrame.h"
+#include "Structure.h"
 
 namespace JSC {

trunk/Source/JavaScriptCore/runtime/JSCell.h

@@ -25 +25 @@
 
 #include "CallData.h"
+#include "CallFrame.h"
 #include "ConstructData.h"
 #include "Heap.h"
@@ -31 +32 @@
 #include "JSValue.h"
 #include "MarkStack.h"
-#include "Structure.h"
+#include "UString.h"
 #include <wtf/Noncopyable.h>
 
@@ -37 +38 @@
 
     class JSGlobalObject;
+    class Structure;
 
 #if COMPILER(MSVC)
@@ -76 +78 @@
 
     public:
-        static PassRefPtr<Structure> createDummyStructure(JSGlobalData& globalData)
-        {
-            return Structure::create(globalData, jsNull(), TypeInfo(UnspecifiedType), AnonymousSlotCount, 0);
-        }
+        static PassRefPtr<Structure> createDummyStructure(JSGlobalData&);
 
         // Querying the type.
@@ -123 +122 @@
 
         // Object operations, with the toObject operation included.
-        const ClassInfo* classInfo() const { return m_structure->classInfo(); }
+        const ClassInfo* classInfo() const;
         virtual void put(ExecState*, const Identifier& propertyName, JSValue, PutPropertySlot&);
         virtual void put(ExecState*, unsigned propertyName, JSValue);
@@ -168 +167 @@
     inline JSCell::~JSCell()
     {
-    }
-
-    inline bool JSCell::isObject() const
-    {
-        return m_structure->typeInfo().type() == ObjectType;
-    }
-
-    inline bool JSCell::isString() const
-    {
-        return m_structure->typeInfo().type() == StringType;
     }
 
@@ -322 +311 @@
     }
 
-    inline bool JSValue::needsThisConversion() const
-    {
-        if (UNLIKELY(!isCell()))
-            return true;
-        return asCell()->structure()->typeInfo().needsThisConversion();
-    }
-
     inline JSValue JSValue::getJSNumber()
     {
@@ -351 +333 @@
     {
         return isCell() ? asCell()->toThisObject(exec) : toThisObjectSlowCase(exec);
-    }
-    
-    ALWAYS_INLINE void MarkStack::internalAppend(JSCell* cell)
-    {
-        ASSERT(!m_isCheckingForDefaultMarkViolation);
-        ASSERT(cell);
-        if (Heap::testAndSetMarked(cell))
-            return;
-        if (cell->structure()->typeInfo().type() >= CompoundType)
-            m_values.append(cell);
     }
 

trunk/Source/JavaScriptCore/runtime/JSString.h

@@ -31 +31 @@
 #include "PropertySlot.h"
 #include "RopeImpl.h"
+#include "Structure.h"
 
 namespace JSC {

trunk/Source/JavaScriptCore/runtime/ScopeChain.h

@@ -23 +23 @@
 
 #include "JSCell.h"
+#include "Structure.h"
 #include <wtf/FastAllocBase.h>
 

trunk/Source/JavaScriptCore/runtime/Structure.h

@@ -28 +28 @@
 
 #include "Identifier.h"
+#include "JSCell.h"
 #include "JSType.h"
 #include "JSValue.h"
@@ -263 +264 @@
     }
 
+    inline bool JSCell::isObject() const
+    {
+        return m_structure->typeInfo().type() == ObjectType;
+    }
+
+    inline bool JSCell::isString() const
+    {
+        return m_structure->typeInfo().type() == StringType;
+    }
+
+    inline const ClassInfo* JSCell::classInfo() const
+    {
+        return m_structure->classInfo();
+    }
+
+    inline PassRefPtr<Structure> JSCell::createDummyStructure(JSGlobalData& globalData)
+    {
+        return Structure::create(globalData, jsNull(), TypeInfo(UnspecifiedType), AnonymousSlotCount, 0);
+    }
+
+    inline bool JSValue::needsThisConversion() const
+    {
+        if (UNLIKELY(!isCell()))
+            return true;
+        return asCell()->structure()->typeInfo().needsThisConversion();
+    }
+
+    ALWAYS_INLINE void MarkStack::internalAppend(JSCell* cell)
+    {
+        ASSERT(!m_isCheckingForDefaultMarkViolation);
+        ASSERT(cell);
+        if (Heap::testAndSetMarked(cell))
+            return;
+        if (cell->structure()->typeInfo().type() >= CompoundType)
+            m_values.append(cell);
+    }
+
 } // namespace JSC
 

trunk/Source/JavaScriptCore/runtime/StructureChain.h

@@ -28 +28 @@
 
 #include "JSCell.h"
+#include "Structure.h"
 
 #include <wtf/OwnArrayPtr.h>