Title: [90143] releases/WebKitGTK/webkit-1.4/Source/_javascript_Core
Diff
Modified: releases/WebKitGTK/webkit-1.4/Source/_javascript_Core/ChangeLog (90142 => 90143)
--- releases/WebKitGTK/webkit-1.4/Source/_javascript_Core/ChangeLog 2011-06-30 19:15:31 UTC (rev 90142)
+++ releases/WebKitGTK/webkit-1.4/Source/_javascript_Core/ChangeLog 2011-06-30 19:16:53 UTC (rev 90143)
@@ -1,3 +1,17 @@
+2011-06-30 Oliver Hunt <[email protected]>
+
+ Reviewed by Gavin Barraclough.
+
+ Stop JSObject::isUsingInlineStorage() from using the structure
+ https://bugs.webkit.org/show_bug.cgi?id=57986
+
+ Make the isUsingInlineStorage() implementation just look at
+ whether the property storage is inside the object.
+
+ * runtime/JSObject.h:
+ (JSC::JSObject::isUsingInlineStorage):
+ (JSC::JSObject::JSObject):
+
2011-06-30 Geoffrey Garen <[email protected]>
Reviewed by Oliver Hunt.
Modified: releases/WebKitGTK/webkit-1.4/Source/_javascript_Core/runtime/JSObject.h (90142 => 90143)
--- releases/WebKitGTK/webkit-1.4/Source/_javascript_Core/runtime/JSObject.h 2011-06-30 19:15:31 UTC (rev 90142)
+++ releases/WebKitGTK/webkit-1.4/Source/_javascript_Core/runtime/JSObject.h 2011-06-30 19:16:53 UTC (rev 90143)
@@ -220,7 +220,7 @@
virtual ComplType exceptionType() const { return Throw; }
void allocatePropertyStorage(size_t oldSize, size_t newSize);
- bool isUsingInlineStorage() const { return m_structure->isUsingInlineStorage(); }
+ bool isUsingInlineStorage() const { return static_cast<const void*>(m_propertyStorage) == static_cast<const void*>(this + 1); }
static const unsigned baseExternalStorageCapacity = 16;
@@ -401,6 +401,7 @@
ASSERT(m_structure->propertyStorageCapacity() < baseExternalStorageCapacity);
ASSERT(m_structure->isEmpty());
ASSERT(prototype().isNull() || Heap::heap(this) == Heap::heap(prototype()));
+ ASSERT(static_cast<void*>(inlineStorage) == static_cast<void*>(this + 1));
}
inline JSObject::~JSObject()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
