Title: [171888] trunk/Source/_javascript_Core
- Revision
- 171888
- Author
- [email protected]
- Date
- 2014-07-31 14:56:38 -0700 (Thu, 31 Jul 2014)
Log Message
JSCell::classInfo() belongs in JSCellInlines.h.
<https://webkit.org/b/135475>
Reviewed by Mark Hahnenberg.
* runtime/JSCellInlines.h:
(JSC::JSCell::classInfo):
* runtime/JSDestructibleObject.h:
(JSC::JSCell::classInfo): Deleted.
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (171887 => 171888)
--- trunk/Source/_javascript_Core/ChangeLog 2014-07-31 21:48:33 UTC (rev 171887)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-07-31 21:56:38 UTC (rev 171888)
@@ -1,3 +1,15 @@
+2014-07-31 Mark Lam <[email protected]>
+
+ JSCell::classInfo() belongs in JSCellInlines.h.
+ <https://webkit.org/b/135475>
+
+ Reviewed by Mark Hahnenberg.
+
+ * runtime/JSCellInlines.h:
+ (JSC::JSCell::classInfo):
+ * runtime/JSDestructibleObject.h:
+ (JSC::JSCell::classInfo): Deleted.
+
2014-07-31 Tanay C <[email protected]>
Build warning in webkit/Source/_javascript_Core/llint/LLIntSlowPaths.cpp
Modified: trunk/Source/_javascript_Core/runtime/JSCellInlines.h (171887 => 171888)
--- trunk/Source/_javascript_Core/runtime/JSCellInlines.h 2014-07-31 21:48:33 UTC (rev 171887)
+++ trunk/Source/_javascript_Core/runtime/JSCellInlines.h 2014-07-31 21:56:38 UTC (rev 171888)
@@ -30,6 +30,7 @@
#include "DeferGC.h"
#include "Handle.h"
#include "JSCell.h"
+#include "JSDestructibleObject.h"
#include "JSObject.h"
#include "JSString.h"
#include "Structure.h"
@@ -231,6 +232,14 @@
&& !structure.typeInfo().overridesGetOwnPropertySlot();
}
+inline const ClassInfo* JSCell::classInfo() const
+{
+ MarkedBlock* block = MarkedBlock::blockFor(this);
+ if (block->destructorType() == MarkedBlock::Normal)
+ return static_cast<const JSDestructibleObject*>(this)->classInfo();
+ return structure(*block->vm())->classInfo();
+}
+
inline bool JSCell::toBoolean(ExecState* exec) const
{
if (isString())
Modified: trunk/Source/_javascript_Core/runtime/JSDestructibleObject.h (171887 => 171888)
--- trunk/Source/_javascript_Core/runtime/JSDestructibleObject.h 2014-07-31 21:48:33 UTC (rev 171887)
+++ trunk/Source/_javascript_Core/runtime/JSDestructibleObject.h 2014-07-31 21:56:38 UTC (rev 171888)
@@ -29,14 +29,6 @@
const ClassInfo* m_classInfo;
};
-inline const ClassInfo* JSCell::classInfo() const
-{
- MarkedBlock* block = MarkedBlock::blockFor(this);
- if (block->destructorType() == MarkedBlock::Normal)
- return static_cast<const JSDestructibleObject*>(this)->classInfo();
- return structure(*block->vm())->classInfo();
-}
-
} // namespace JSC
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
