Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (95357 => 95358)
--- trunk/Source/_javascript_Core/ChangeLog 2011-09-17 02:47:09 UTC (rev 95357)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-09-17 02:57:36 UTC (rev 95358)
@@ -1,5 +1,23 @@
2011-09-16 Sam Weinig <[email protected]>
+ Rename APIValueWrapper type to APIValueWrapperType for consistency
+ https://bugs.webkit.org/show_bug.cgi?id=68306
+
+ Reviewed by Anders Carlsson.
+
+ * runtime/JSAPIValueWrapper.h:
+ (JSC::JSAPIValueWrapper::createStructure):
+ Update name.
+
+ * runtime/JSType.h:
+ Update name and un-indent.
+
+ * runtime/Structure.h:
+ (JSC::JSCell::isAPIValueWrapper):
+ Update name.
+
+2011-09-16 Sam Weinig <[email protected]>
+
Remove unused isStrictModeFunction function
https://bugs.webkit.org/show_bug.cgi?id=68305
Modified: trunk/Source/_javascript_Core/runtime/JSAPIValueWrapper.h (95357 => 95358)
--- trunk/Source/_javascript_Core/runtime/JSAPIValueWrapper.h 2011-09-17 02:47:09 UTC (rev 95357)
+++ trunk/Source/_javascript_Core/runtime/JSAPIValueWrapper.h 2011-09-17 02:57:36 UTC (rev 95358)
@@ -39,7 +39,7 @@
static Structure* createStructure(JSGlobalData& globalData, JSGlobalObject* globalObject, JSValue prototype)
{
- return Structure::create(globalData, globalObject, prototype, TypeInfo(APIValueWrapper, OverridesVisitChildren | OverridesGetPropertyNames), &s_info);
+ return Structure::create(globalData, globalObject, prototype, TypeInfo(APIValueWrapperType, OverridesVisitChildren | OverridesGetPropertyNames), &s_info);
}
static const ClassInfo s_info;
Modified: trunk/Source/_javascript_Core/runtime/JSType.h (95357 => 95358)
--- trunk/Source/_javascript_Core/runtime/JSType.h 2011-09-17 02:47:09 UTC (rev 95357)
+++ trunk/Source/_javascript_Core/runtime/JSType.h 2011-09-17 02:57:36 UTC (rev 95358)
@@ -23,26 +23,25 @@
namespace JSC {
- /**
- * Primitive types
- */
- enum JSType {
- UnspecifiedType = 0,
- UndefinedType = 1,
- BooleanType = 2,
- NumberType = 3,
- NullType = 4,
- StringType = 5,
- LeafType = 6,
- // The CompoundType value must come before any JSType that may have children
- CompoundType = 7,
- GetterSetterType = 8,
- APIValueWrapper = 9,
- // The ObjectType value must come before any JSType that is a subclass of JSObject
- ObjectType = 10,
- FinalObjectType = 11,
- };
+enum JSType {
+ UnspecifiedType = 0,
+ UndefinedType = 1,
+ BooleanType = 2,
+ NumberType = 3,
+ NullType = 4,
+ StringType = 5,
+ LeafType = 6,
+ // The CompoundType value must come before any JSType that may have children.
+ CompoundType = 7,
+ GetterSetterType = 8,
+ APIValueWrapperType = 9,
+
+ // The ObjectType value must come before any JSType that is a subclass of JSObject.
+ ObjectType = 10,
+ FinalObjectType = 11,
+};
+
} // namespace JSC
#endif
Modified: trunk/Source/_javascript_Core/runtime/Structure.h (95357 => 95358)
--- trunk/Source/_javascript_Core/runtime/Structure.h 2011-09-17 02:47:09 UTC (rev 95357)
+++ trunk/Source/_javascript_Core/runtime/Structure.h 2011-09-17 02:57:36 UTC (rev 95358)
@@ -322,7 +322,7 @@
inline bool JSCell::isAPIValueWrapper() const
{
- return m_structure->typeInfo().type() == APIValueWrapper;
+ return m_structure->typeInfo().type() == APIValueWrapperType;
}
inline const ClassInfo* JSCell::classInfo() const
