Diff
Modified: releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/ChangeLog (205627 => 205628)
--- releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/ChangeLog 2016-09-08 12:02:30 UTC (rev 205627)
+++ releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/ChangeLog 2016-09-08 12:19:11 UTC (rev 205628)
@@ -1,3 +1,45 @@
+2016-09-01 Mark Lam <[email protected]>
+
+ Move some JSObject and JSArray inline functions to their respective Inlines.h files.
+ https://bugs.webkit.org/show_bug.cgi?id=161499
+
+ Reviewed by Saam Barati.
+
+ This is just a refactoring patch to move some inline functions to their Inlines.h
+ files. This will be needed to enable https://bugs.webkit.org/show_bug.cgi?id=161498
+ later.
+
+ * bindings/ScriptValue.cpp:
+ * interpreter/Interpreter.cpp:
+ * runtime/IntlDateTimeFormatPrototype.cpp:
+ * runtime/IntlNumberFormatPrototype.cpp:
+ * runtime/JSArray.cpp:
+ * runtime/JSArray.h:
+ (JSC::getLength): Deleted.
+ (JSC::toLength): Deleted.
+ * runtime/JSArrayInlines.h:
+ (JSC::JSArray::mergeIndexingTypeForCopying):
+ (JSC::JSArray::canFastCopy):
+ (JSC::getLength):
+ (JSC::toLength):
+ * runtime/JSInternalPromise.cpp:
+ * runtime/JSInternalPromiseDeferred.cpp:
+ * runtime/JSJob.cpp:
+ * runtime/JSModuleRecord.cpp:
+ * runtime/JSObject.h:
+ (JSC::JSObject::getPropertySlot): Deleted.
+ (JSC::JSObject::getNonIndexPropertySlot): Deleted.
+ * runtime/JSObjectInlines.h:
+ (JSC::JSObject::getPropertySlot):
+ (JSC::JSObject::getNonIndexPropertySlot):
+ * runtime/JSPromiseDeferred.cpp:
+ * runtime/JSTypedArrayViewPrototype.cpp:
+ * runtime/MapConstructor.cpp:
+ * runtime/SamplingProfiler.cpp:
+ * runtime/SetConstructor.cpp:
+ * runtime/WeakMapConstructor.cpp:
+ * runtime/WeakSetConstructor.cpp:
+
2016-09-01 JF Bastien <[email protected]>
GetByIdWithThis/GetByValWithThis should have ValueProfiles so that they can predict their result types
Modified: releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/bindings/ScriptValue.cpp (205627 => 205628)
--- releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/bindings/ScriptValue.cpp 2016-09-08 12:02:30 UTC (rev 205627)
+++ releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/bindings/ScriptValue.cpp 2016-09-08 12:19:11 UTC (rev 205628)
@@ -33,6 +33,7 @@
#include "APICast.h"
#include "InspectorValues.h"
#include "JSLock.h"
+#include "JSObjectInlines.h"
#include "StructureInlines.h"
using namespace JSC;
Modified: releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/interpreter/Interpreter.cpp (205627 => 205628)
--- releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/interpreter/Interpreter.cpp 2016-09-08 12:02:30 UTC (rev 205627)
+++ releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/interpreter/Interpreter.cpp 2016-09-08 12:19:11 UTC (rev 205628)
@@ -43,7 +43,7 @@
#include "Exception.h"
#include "ExceptionHelpers.h"
#include "GetterSetter.h"
-#include "JSArray.h"
+#include "JSArrayInlines.h"
#include "JSBoundFunction.h"
#include "JSCInlines.h"
#include "JSLexicalEnvironment.h"
Modified: releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/runtime/IntlDateTimeFormatPrototype.cpp (205627 => 205628)
--- releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/runtime/IntlDateTimeFormatPrototype.cpp 2016-09-08 12:02:30 UTC (rev 205627)
+++ releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/runtime/IntlDateTimeFormatPrototype.cpp 2016-09-08 12:19:11 UTC (rev 205628)
@@ -37,7 +37,7 @@
#include "JSBoundFunction.h"
#include "JSCJSValueInlines.h"
#include "JSCellInlines.h"
-#include "JSObject.h"
+#include "JSObjectInlines.h"
#include "StructureInlines.h"
namespace JSC {
Modified: releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/runtime/IntlNumberFormatPrototype.cpp (205627 => 205628)
--- releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/runtime/IntlNumberFormatPrototype.cpp 2016-09-08 12:02:30 UTC (rev 205627)
+++ releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/runtime/IntlNumberFormatPrototype.cpp 2016-09-08 12:19:11 UTC (rev 205628)
@@ -35,7 +35,7 @@
#include "JSBoundFunction.h"
#include "JSCJSValueInlines.h"
#include "JSCellInlines.h"
-#include "JSObject.h"
+#include "JSObjectInlines.h"
#include "StructureInlines.h"
namespace JSC {
Modified: releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/runtime/JSArray.cpp (205627 => 205628)
--- releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/runtime/JSArray.cpp 2016-09-08 12:02:30 UTC (rev 205627)
+++ releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/runtime/JSArray.cpp 2016-09-08 12:19:11 UTC (rev 205628)
@@ -31,6 +31,7 @@
#include "Executable.h"
#include "GetterSetter.h"
#include "IndexingHeaderInlines.h"
+#include "JSArrayInlines.h"
#include "JSCInlines.h"
#include "PropertyNameArray.h"
#include "Reject.h"
Modified: releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/runtime/JSArray.h (205627 => 205628)
--- releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/runtime/JSArray.h 2016-09-08 12:02:30 UTC (rev 205627)
+++ releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/runtime/JSArray.h 2016-09-08 12:19:11 UTC (rev 205628)
@@ -341,30 +341,6 @@
return array;
}
-ALWAYS_INLINE unsigned getLength(ExecState* exec, JSObject* obj)
-{
- if (isJSArray(obj))
- return jsCast<JSArray*>(obj)->length();
-
- VM& vm = exec->vm();
- JSValue lengthValue = obj->get(exec, vm.propertyNames->length);
- if (UNLIKELY(vm.exception()))
- return UINT_MAX;
- return lengthValue.toUInt32(exec);
-}
-
-ALWAYS_INLINE double toLength(ExecState* exec, JSObject* obj)
-{
- if (isJSArray(obj))
- return jsCast<JSArray*>(obj)->length();
-
- VM& vm = exec->vm();
- JSValue lengthValue = obj->get(exec, vm.propertyNames->length);
- if (UNLIKELY(vm.exception()))
- return PNaN;
- return lengthValue.toLength(exec);
-}
-
} // namespace JSC
#endif // JSArray_h
Modified: releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/runtime/JSArrayInlines.h (205627 => 205628)
--- releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/runtime/JSArrayInlines.h 2016-09-08 12:02:30 UTC (rev 205627)
+++ releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/runtime/JSArrayInlines.h 2016-09-08 12:19:11 UTC (rev 205628)
@@ -26,7 +26,7 @@
namespace JSC {
-IndexingType JSArray::mergeIndexingTypeForCopying(IndexingType other)
+inline IndexingType JSArray::mergeIndexingTypeForCopying(IndexingType other)
{
IndexingType type = indexingType();
if (!(type & IsArray && other & IsArray))
@@ -56,7 +56,7 @@
return type;
}
-bool JSArray::canFastCopy(VM& vm, JSArray* otherArray)
+inline bool JSArray::canFastCopy(VM& vm, JSArray* otherArray)
{
if (hasAnyArrayStorage(indexingType()) || hasAnyArrayStorage(otherArray->indexingType()))
return false;
@@ -68,6 +68,30 @@
return true;
}
+ALWAYS_INLINE unsigned getLength(ExecState* exec, JSObject* obj)
+{
+ if (isJSArray(obj))
+ return jsCast<JSArray*>(obj)->length();
+
+ VM& vm = exec->vm();
+ JSValue lengthValue = obj->get(exec, vm.propertyNames->length);
+ if (UNLIKELY(vm.exception()))
+ return UINT_MAX;
+ return lengthValue.toUInt32(exec);
+}
+
+ALWAYS_INLINE double toLength(ExecState* exec, JSObject* obj)
+{
+ if (isJSArray(obj))
+ return jsCast<JSArray*>(obj)->length();
+
+ VM& vm = exec->vm();
+ JSValue lengthValue = obj->get(exec, vm.propertyNames->length);
+ if (UNLIKELY(vm.exception()))
+ return PNaN;
+ return lengthValue.toLength(exec);
+}
+
} // namespace JSC
#endif /* JSArrayInlines_h */
Modified: releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/runtime/JSInternalPromise.cpp (205627 => 205628)
--- releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/runtime/JSInternalPromise.cpp 2016-09-08 12:02:30 UTC (rev 205627)
+++ releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/runtime/JSInternalPromise.cpp 2016-09-08 12:19:11 UTC (rev 205628)
@@ -29,6 +29,7 @@
#include "BuiltinNames.h"
#include "JSCJSValueInlines.h"
#include "JSCellInlines.h"
+#include "JSObjectInlines.h"
#include "StructureInlines.h"
namespace JSC {
Modified: releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/runtime/JSInternalPromiseDeferred.cpp (205627 => 205628)
--- releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/runtime/JSInternalPromiseDeferred.cpp 2016-09-08 12:02:30 UTC (rev 205627)
+++ releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/runtime/JSInternalPromiseDeferred.cpp 2016-09-08 12:19:11 UTC (rev 205628)
@@ -33,6 +33,7 @@
#include "JSCellInlines.h"
#include "JSInternalPromise.h"
#include "JSInternalPromiseConstructor.h"
+#include "JSObjectInlines.h"
#include "SlotVisitorInlines.h"
#include "StructureInlines.h"
Modified: releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/runtime/JSJob.cpp (205627 => 205628)
--- releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/runtime/JSJob.cpp 2016-09-08 12:02:30 UTC (rev 205627)
+++ releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/runtime/JSJob.cpp 2016-09-08 12:19:11 UTC (rev 205628)
@@ -31,6 +31,7 @@
#include "JSCJSValueInlines.h"
#include "JSCellInlines.h"
#include "JSGlobalObject.h"
+#include "JSObjectInlines.h"
#include "Microtask.h"
#include "SlotVisitorInlines.h"
#include "StrongInlines.h"
Modified: releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/runtime/JSModuleRecord.cpp (205627 => 205628)
--- releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/runtime/JSModuleRecord.cpp 2016-09-08 12:02:30 UTC (rev 205627)
+++ releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/runtime/JSModuleRecord.cpp 2016-09-08 12:19:11 UTC (rev 205628)
@@ -34,6 +34,7 @@
#include "JSMap.h"
#include "JSModuleEnvironment.h"
#include "JSModuleNamespaceObject.h"
+#include "JSObjectInlines.h"
#include "SlotVisitorInlines.h"
#include "StructureInlines.h"
Modified: releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/runtime/JSObject.h (205627 => 205628)
--- releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/runtime/JSObject.h 2016-09-08 12:02:30 UTC (rev 205627)
+++ releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/runtime/JSObject.h 2016-09-08 12:19:11 UTC (rev 205628)
@@ -1290,66 +1290,6 @@
return false;
}
-ALWAYS_INLINE bool JSObject::getPropertySlot(ExecState* exec, unsigned propertyName, PropertySlot& slot)
-{
- VM& vm = exec->vm();
- auto& structureIDTable = vm.heap.structureIDTable();
- JSObject* object = this;
- MethodTable::GetPrototypeFunctionPtr defaultGetPrototype = JSObject::getPrototype;
- while (true) {
- Structure& structure = *structureIDTable.get(object->structureID());
- if (structure.classInfo()->methodTable.getOwnPropertySlotByIndex(object, exec, propertyName, slot))
- return true;
- if (UNLIKELY(vm.exception()))
- return false;
- JSValue prototype;
- if (LIKELY(structure.classInfo()->methodTable.getPrototype == defaultGetPrototype || slot.internalMethodType() == PropertySlot::InternalMethodType::VMInquiry))
- prototype = structure.storedPrototype();
- else {
- prototype = object->getPrototype(vm, exec);
- if (vm.exception())
- return false;
- }
- if (!prototype.isObject())
- return false;
- object = asObject(prototype);
- }
-}
-
-ALWAYS_INLINE bool JSObject::getNonIndexPropertySlot(ExecState* exec, PropertyName propertyName, PropertySlot& slot)
-{
- // This method only supports non-index PropertyNames.
- ASSERT(!parseIndex(propertyName));
-
- VM& vm = exec->vm();
- auto& structureIDTable = vm.heap.structureIDTable();
- JSObject* object = this;
- MethodTable::GetPrototypeFunctionPtr defaultGetPrototype = JSObject::getPrototype;
- while (true) {
- Structure& structure = *structureIDTable.get(object->structureID());
- if (LIKELY(!TypeInfo::overridesGetOwnPropertySlot(object->inlineTypeFlags()))) {
- if (object->getOwnNonIndexPropertySlot(vm, structure, propertyName, slot))
- return true;
- } else {
- if (structure.classInfo()->methodTable.getOwnPropertySlot(object, exec, propertyName, slot))
- return true;
- if (UNLIKELY(vm.exception()))
- return false;
- }
- JSValue prototype;
- if (LIKELY(structure.classInfo()->methodTable.getPrototype == defaultGetPrototype || slot.internalMethodType() == PropertySlot::InternalMethodType::VMInquiry))
- prototype = structure.storedPrototype();
- else {
- prototype = object->getPrototype(vm, exec);
- if (vm.exception())
- return false;
- }
- if (!prototype.isObject())
- return false;
- object = asObject(prototype);
- }
-}
-
inline JSValue JSObject::get(ExecState* exec, PropertyName propertyName) const
{
PropertySlot slot(this, PropertySlot::InternalMethodType::Get);
@@ -1368,22 +1308,6 @@
return jsUndefined();
}
-template<typename CallbackWhenNoException>
-ALWAYS_INLINE typename std::result_of<CallbackWhenNoException(bool, PropertySlot&)>::type JSObject::getPropertySlot(ExecState* exec, PropertyName propertyName, CallbackWhenNoException callback) const
-{
- PropertySlot slot(this, PropertySlot::InternalMethodType::Get);
- return getPropertySlot(exec, propertyName, slot, callback);
-}
-
-template<typename CallbackWhenNoException>
-ALWAYS_INLINE typename std::result_of<CallbackWhenNoException(bool, PropertySlot&)>::type JSObject::getPropertySlot(ExecState* exec, PropertyName propertyName, PropertySlot& slot, CallbackWhenNoException callback) const
-{
- bool found = const_cast<JSObject*>(this)->getPropertySlot(exec, propertyName, slot);
- if (UNLIKELY(exec->hadException()))
- return { };
- return callback(found, slot);
-}
-
template<JSObject::PutMode mode>
ALWAYS_INLINE bool JSObject::putDirectInternal(VM& vm, PropertyName propertyName, JSValue value, unsigned attributes, PutPropertySlot& slot)
{
Modified: releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/runtime/JSObjectInlines.h (205627 => 205628)
--- releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/runtime/JSObjectInlines.h 2016-09-08 12:02:30 UTC (rev 205627)
+++ releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/runtime/JSObjectInlines.h 2016-09-08 12:19:11 UTC (rev 205628)
@@ -85,6 +85,82 @@
ASSERT_NOT_REACHED();
}
+template<typename CallbackWhenNoException>
+ALWAYS_INLINE typename std::result_of<CallbackWhenNoException(bool, PropertySlot&)>::type JSObject::getPropertySlot(ExecState* exec, PropertyName propertyName, CallbackWhenNoException callback) const
+{
+ PropertySlot slot(this, PropertySlot::InternalMethodType::Get);
+ return getPropertySlot(exec, propertyName, slot, callback);
+}
+
+template<typename CallbackWhenNoException>
+ALWAYS_INLINE typename std::result_of<CallbackWhenNoException(bool, PropertySlot&)>::type JSObject::getPropertySlot(ExecState* exec, PropertyName propertyName, PropertySlot& slot, CallbackWhenNoException callback) const
+{
+ bool found = const_cast<JSObject*>(this)->getPropertySlot(exec, propertyName, slot);
+ if (UNLIKELY(exec->hadException()))
+ return { };
+ return callback(found, slot);
+}
+
+ALWAYS_INLINE bool JSObject::getPropertySlot(ExecState* exec, unsigned propertyName, PropertySlot& slot)
+{
+ VM& vm = exec->vm();
+ auto& structureIDTable = vm.heap.structureIDTable();
+ JSObject* object = this;
+ MethodTable::GetPrototypeFunctionPtr defaultGetPrototype = JSObject::getPrototype;
+ while (true) {
+ Structure& structure = *structureIDTable.get(object->structureID());
+ if (structure.classInfo()->methodTable.getOwnPropertySlotByIndex(object, exec, propertyName, slot))
+ return true;
+ if (UNLIKELY(vm.exception()))
+ return false;
+ JSValue prototype;
+ if (LIKELY(structure.classInfo()->methodTable.getPrototype == defaultGetPrototype || slot.internalMethodType() == PropertySlot::InternalMethodType::VMInquiry))
+ prototype = structure.storedPrototype();
+ else {
+ prototype = object->getPrototype(vm, exec);
+ if (vm.exception())
+ return false;
+ }
+ if (!prototype.isObject())
+ return false;
+ object = asObject(prototype);
+ }
+}
+
+ALWAYS_INLINE bool JSObject::getNonIndexPropertySlot(ExecState* exec, PropertyName propertyName, PropertySlot& slot)
+{
+ // This method only supports non-index PropertyNames.
+ ASSERT(!parseIndex(propertyName));
+
+ VM& vm = exec->vm();
+ auto& structureIDTable = vm.heap.structureIDTable();
+ JSObject* object = this;
+ MethodTable::GetPrototypeFunctionPtr defaultGetPrototype = JSObject::getPrototype;
+ while (true) {
+ Structure& structure = *structureIDTable.get(object->structureID());
+ if (LIKELY(!TypeInfo::overridesGetOwnPropertySlot(object->inlineTypeFlags()))) {
+ if (object->getOwnNonIndexPropertySlot(vm, structure, propertyName, slot))
+ return true;
+ } else {
+ if (structure.classInfo()->methodTable.getOwnPropertySlot(object, exec, propertyName, slot))
+ return true;
+ if (UNLIKELY(vm.exception()))
+ return false;
+ }
+ JSValue prototype;
+ if (LIKELY(structure.classInfo()->methodTable.getPrototype == defaultGetPrototype || slot.internalMethodType() == PropertySlot::InternalMethodType::VMInquiry))
+ prototype = structure.storedPrototype();
+ else {
+ prototype = object->getPrototype(vm, exec);
+ if (vm.exception())
+ return false;
+ }
+ if (!prototype.isObject())
+ return false;
+ object = asObject(prototype);
+ }
+}
+
// ECMA 8.6.2.2
ALWAYS_INLINE bool JSObject::putInline(JSCell* cell, ExecState* exec, PropertyName propertyName, JSValue value, PutPropertySlot& slot)
{
Modified: releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/runtime/JSPromiseDeferred.cpp (205627 => 205628)
--- releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/runtime/JSPromiseDeferred.cpp 2016-09-08 12:02:30 UTC (rev 205627)
+++ releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/runtime/JSPromiseDeferred.cpp 2016-09-08 12:19:11 UTC (rev 205628)
@@ -31,6 +31,7 @@
#include "Exception.h"
#include "JSCJSValueInlines.h"
#include "JSCellInlines.h"
+#include "JSObjectInlines.h"
#include "JSPromise.h"
#include "JSPromiseConstructor.h"
#include "SlotVisitorInlines.h"
Modified: releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/runtime/JSTypedArrayViewPrototype.cpp (205627 => 205628)
--- releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/runtime/JSTypedArrayViewPrototype.cpp 2016-09-08 12:02:30 UTC (rev 205627)
+++ releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/runtime/JSTypedArrayViewPrototype.cpp 2016-09-08 12:19:11 UTC (rev 205628)
@@ -32,6 +32,7 @@
#include "JSCellInlines.h"
#include "JSFunction.h"
#include "JSGenericTypedArrayViewPrototypeFunctions.h"
+#include "JSObjectInlines.h"
#include "TypedArrayAdaptors.h"
namespace JSC {
Modified: releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/runtime/MapConstructor.cpp (205627 => 205628)
--- releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/runtime/MapConstructor.cpp 2016-09-08 12:02:30 UTC (rev 205627)
+++ releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/runtime/MapConstructor.cpp 2016-09-08 12:19:11 UTC (rev 205628)
@@ -33,6 +33,7 @@
#include "JSCellInlines.h"
#include "JSGlobalObject.h"
#include "JSMap.h"
+#include "JSObjectInlines.h"
#include "MapPrototype.h"
#include "StructureInlines.h"
Modified: releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/runtime/SamplingProfiler.cpp (205627 => 205628)
--- releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/runtime/SamplingProfiler.cpp 2016-09-08 12:02:30 UTC (rev 205627)
+++ releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/runtime/SamplingProfiler.cpp 2016-09-08 12:19:11 UTC (rev 205628)
@@ -37,6 +37,7 @@
#include "Interpreter.h"
#include "JSCJSValueInlines.h"
#include "JSFunction.h"
+#include "JSObjectInlines.h"
#include "LLIntPCRanges.h"
#include "MarkedBlock.h"
#include "MarkedBlockSet.h"
Modified: releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/runtime/SetConstructor.cpp (205627 => 205628)
--- releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/runtime/SetConstructor.cpp 2016-09-08 12:02:30 UTC (rev 205627)
+++ releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/runtime/SetConstructor.cpp 2016-09-08 12:19:11 UTC (rev 205628)
@@ -32,6 +32,7 @@
#include "JSCJSValueInlines.h"
#include "JSCellInlines.h"
#include "JSGlobalObject.h"
+#include "JSObjectInlines.h"
#include "JSSet.h"
#include "MapData.h"
#include "SetPrototype.h"
Modified: releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/runtime/WeakMapConstructor.cpp (205627 => 205628)
--- releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/runtime/WeakMapConstructor.cpp 2016-09-08 12:02:30 UTC (rev 205627)
+++ releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/runtime/WeakMapConstructor.cpp 2016-09-08 12:19:11 UTC (rev 205628)
@@ -31,6 +31,7 @@
#include "JSCJSValueInlines.h"
#include "JSCellInlines.h"
#include "JSGlobalObject.h"
+#include "JSObjectInlines.h"
#include "JSWeakMap.h"
#include "StructureInlines.h"
#include "WeakMapPrototype.h"
Modified: releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/runtime/WeakSetConstructor.cpp (205627 => 205628)
--- releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/runtime/WeakSetConstructor.cpp 2016-09-08 12:02:30 UTC (rev 205627)
+++ releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/runtime/WeakSetConstructor.cpp 2016-09-08 12:19:11 UTC (rev 205628)
@@ -31,6 +31,7 @@
#include "JSCJSValueInlines.h"
#include "JSCellInlines.h"
#include "JSGlobalObject.h"
+#include "JSObjectInlines.h"
#include "JSWeakSet.h"
#include "StructureInlines.h"
#include "WeakSetPrototype.h"
Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog (205627 => 205628)
--- releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-09-08 12:02:30 UTC (rev 205627)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-09-08 12:19:11 UTC (rev 205628)
@@ -1,3 +1,18 @@
+2016-09-01 Mark Lam <[email protected]>
+
+ Move some JSObject and JSArray inline functions to their respective Inlines.h files.
+ https://bugs.webkit.org/show_bug.cgi?id=161499
+
+ Reviewed by Saam Barati.
+
+ No new tests because there is no behavior change.
+
+ * ForwardingHeaders/runtime/JSObjectInlines.h: Added.
+ * bindings/js/JSDOMBinding.h:
+ * bindings/js/JSSQLTransactionCustom.cpp:
+ * bindings/js/JSWebGLRenderingContextBaseCustom.cpp:
+ * contentextensions/ContentExtensionParser.cpp:
+
2016-09-01 Michael Catanzaro <[email protected]>
Fix ENABLE(CSS_GRID_LAYOUT) guards harder after r205102/r205292
Added: releases/WebKitGTK/webkit-2.14/Source/WebCore/ForwardingHeaders/runtime/JSObjectInlines.h (0 => 205628)
--- releases/WebKitGTK/webkit-2.14/Source/WebCore/ForwardingHeaders/runtime/JSObjectInlines.h (rev 0)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/ForwardingHeaders/runtime/JSObjectInlines.h 2016-09-08 12:19:11 UTC (rev 205628)
@@ -0,0 +1,4 @@
+#ifndef WebCore_FWD_JSObjectInlines_h
+#define WebCore_FWD_JSObjectInlines_h
+#include <_javascript_Core/JSObjectInlines.h>
+#endif
Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/bindings/js/JSDOMBinding.h (205627 => 205628)
--- releases/WebKitGTK/webkit-2.14/Source/WebCore/bindings/js/JSDOMBinding.h 2016-09-08 12:02:30 UTC (rev 205627)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/bindings/js/JSDOMBinding.h 2016-09-08 12:19:11 UTC (rev 205628)
@@ -39,6 +39,7 @@
#include <runtime/JSArrayBuffer.h>
#include <runtime/JSCJSValueInlines.h>
#include <runtime/JSCellInlines.h>
+#include <runtime/JSObjectInlines.h>
#include <runtime/JSTypedArrays.h>
#include <runtime/Lookup.h>
#include <runtime/ObjectConstructor.h>
Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/bindings/js/JSSQLTransactionCustom.cpp (205627 => 205628)
--- releases/WebKitGTK/webkit-2.14/Source/WebCore/bindings/js/JSSQLTransactionCustom.cpp 2016-09-08 12:02:30 UTC (rev 205627)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/bindings/js/JSSQLTransactionCustom.cpp 2016-09-08 12:19:11 UTC (rev 205628)
@@ -36,6 +36,7 @@
#include "JSDOMWindowCustom.h"
#include "SQLTransaction.h"
#include "SQLValue.h"
+#include <runtime/JSObjectInlines.h>
using namespace JSC;
Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/bindings/js/JSWebGLRenderingContextBaseCustom.cpp (205627 => 205628)
--- releases/WebKitGTK/webkit-2.14/Source/WebCore/bindings/js/JSWebGLRenderingContextBaseCustom.cpp 2016-09-08 12:02:30 UTC (rev 205627)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/bindings/js/JSWebGLRenderingContextBaseCustom.cpp 2016-09-08 12:19:11 UTC (rev 205628)
@@ -96,6 +96,7 @@
#include "WebGLVertexArrayObject.h"
#include "WebGLVertexArrayObjectOES.h"
#include <runtime/Error.h>
+#include <runtime/JSObjectInlines.h>
#include <runtime/JSTypedArrays.h>
#include <runtime/TypedArrayInlines.h>
#include <runtime/TypedArrays.h>
Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/contentextensions/ContentExtensionParser.cpp (205627 => 205628)
--- releases/WebKitGTK/webkit-2.14/Source/WebCore/contentextensions/ContentExtensionParser.cpp 2016-09-08 12:02:30 UTC (rev 205627)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/contentextensions/ContentExtensionParser.cpp 2016-09-08 12:19:11 UTC (rev 205628)
@@ -39,6 +39,7 @@
#include <_javascript_Core/JSCJSValueInlines.h>
#include <_javascript_Core/JSGlobalObject.h>
#include <_javascript_Core/JSONObject.h>
+#include <_javascript_Core/JSObjectInlines.h>
#include <_javascript_Core/StructureInlines.h>
#include <_javascript_Core/VM.h>
#include <wtf/CurrentTime.h>
