<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[205324] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/205324">205324</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2016-09-01 15:34:27 -0700 (Thu, 01 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.
Source/JavaScriptCore:
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:
Source/WebCore:
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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebindingsScriptValuecpp">trunk/Source/JavaScriptCore/bindings/ScriptValue.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinterpreterInterpretercpp">trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeIntlDateTimeFormatPrototypecpp">trunk/Source/JavaScriptCore/runtime/IntlDateTimeFormatPrototype.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeIntlNumberFormatPrototypecpp">trunk/Source/JavaScriptCore/runtime/IntlNumberFormatPrototype.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSArraycpp">trunk/Source/JavaScriptCore/runtime/JSArray.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSArrayh">trunk/Source/JavaScriptCore/runtime/JSArray.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSArrayInlinesh">trunk/Source/JavaScriptCore/runtime/JSArrayInlines.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSInternalPromisecpp">trunk/Source/JavaScriptCore/runtime/JSInternalPromise.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSInternalPromiseDeferredcpp">trunk/Source/JavaScriptCore/runtime/JSInternalPromiseDeferred.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSJobcpp">trunk/Source/JavaScriptCore/runtime/JSJob.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSModuleRecordcpp">trunk/Source/JavaScriptCore/runtime/JSModuleRecord.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSObjecth">trunk/Source/JavaScriptCore/runtime/JSObject.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSObjectInlinesh">trunk/Source/JavaScriptCore/runtime/JSObjectInlines.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSPromiseDeferredcpp">trunk/Source/JavaScriptCore/runtime/JSPromiseDeferred.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSTypedArrayViewPrototypecpp">trunk/Source/JavaScriptCore/runtime/JSTypedArrayViewPrototype.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeMapConstructorcpp">trunk/Source/JavaScriptCore/runtime/MapConstructor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeSamplingProfilercpp">trunk/Source/JavaScriptCore/runtime/SamplingProfiler.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeSetConstructorcpp">trunk/Source/JavaScriptCore/runtime/SetConstructor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeWeakMapConstructorcpp">trunk/Source/JavaScriptCore/runtime/WeakMapConstructor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeWeakSetConstructorcpp">trunk/Source/JavaScriptCore/runtime/WeakSetConstructor.cpp</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMBindingh">trunk/Source/WebCore/bindings/js/JSDOMBinding.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSSQLTransactionCustomcpp">trunk/Source/WebCore/bindings/js/JSSQLTransactionCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSWebGLRenderingContextBaseCustomcpp">trunk/Source/WebCore/bindings/js/JSWebGLRenderingContextBaseCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorecontentextensionsContentExtensionParsercpp">trunk/Source/WebCore/contentextensions/ContentExtensionParser.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreForwardingHeadersruntimeJSObjectInlinesh">trunk/Source/WebCore/ForwardingHeaders/runtime/JSObjectInlines.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (205323 => 205324)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-09-01 22:13:58 UTC (rev 205323)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-09-01 22:34:27 UTC (rev 205324)
</span><span class="lines">@@ -1,3 +1,45 @@
</span><ins>+2016-09-01 Mark Lam <mark.lam@apple.com>
+
+ 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:
+
</ins><span class="cx"> 2016-09-01 JF Bastien <jfbastien@apple.com>
</span><span class="cx">
</span><span class="cx"> GetByIdWithThis/GetByValWithThis should have ValueProfiles so that they can predict their result types
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebindingsScriptValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bindings/ScriptValue.cpp (205323 => 205324)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bindings/ScriptValue.cpp 2016-09-01 22:13:58 UTC (rev 205323)
+++ trunk/Source/JavaScriptCore/bindings/ScriptValue.cpp 2016-09-01 22:34:27 UTC (rev 205324)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #include "APICast.h"
</span><span class="cx"> #include "InspectorValues.h"
</span><span class="cx"> #include "JSLock.h"
</span><ins>+#include "JSObjectInlines.h"
</ins><span class="cx"> #include "StructureInlines.h"
</span><span class="cx">
</span><span class="cx"> using namespace JSC;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinterpreterInterpretercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp (205323 => 205324)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp 2016-09-01 22:13:58 UTC (rev 205323)
+++ trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp 2016-09-01 22:34:27 UTC (rev 205324)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> #include "Exception.h"
</span><span class="cx"> #include "ExceptionHelpers.h"
</span><span class="cx"> #include "GetterSetter.h"
</span><del>-#include "JSArray.h"
</del><ins>+#include "JSArrayInlines.h"
</ins><span class="cx"> #include "JSBoundFunction.h"
</span><span class="cx"> #include "JSCInlines.h"
</span><span class="cx"> #include "JSLexicalEnvironment.h"
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeIntlDateTimeFormatPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/IntlDateTimeFormatPrototype.cpp (205323 => 205324)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/IntlDateTimeFormatPrototype.cpp 2016-09-01 22:13:58 UTC (rev 205323)
+++ trunk/Source/JavaScriptCore/runtime/IntlDateTimeFormatPrototype.cpp 2016-09-01 22:34:27 UTC (rev 205324)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> #include "JSBoundFunction.h"
</span><span class="cx"> #include "JSCJSValueInlines.h"
</span><span class="cx"> #include "JSCellInlines.h"
</span><del>-#include "JSObject.h"
</del><ins>+#include "JSObjectInlines.h"
</ins><span class="cx"> #include "StructureInlines.h"
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeIntlNumberFormatPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/IntlNumberFormatPrototype.cpp (205323 => 205324)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/IntlNumberFormatPrototype.cpp 2016-09-01 22:13:58 UTC (rev 205323)
+++ trunk/Source/JavaScriptCore/runtime/IntlNumberFormatPrototype.cpp 2016-09-01 22:34:27 UTC (rev 205324)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> #include "JSBoundFunction.h"
</span><span class="cx"> #include "JSCJSValueInlines.h"
</span><span class="cx"> #include "JSCellInlines.h"
</span><del>-#include "JSObject.h"
</del><ins>+#include "JSObjectInlines.h"
</ins><span class="cx"> #include "StructureInlines.h"
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSArraycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSArray.cpp (205323 => 205324)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSArray.cpp 2016-09-01 22:13:58 UTC (rev 205323)
+++ trunk/Source/JavaScriptCore/runtime/JSArray.cpp 2016-09-01 22:34:27 UTC (rev 205324)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "Executable.h"
</span><span class="cx"> #include "GetterSetter.h"
</span><span class="cx"> #include "IndexingHeaderInlines.h"
</span><ins>+#include "JSArrayInlines.h"
</ins><span class="cx"> #include "JSCInlines.h"
</span><span class="cx"> #include "PropertyNameArray.h"
</span><span class="cx"> #include "Reject.h"
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSArrayh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSArray.h (205323 => 205324)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSArray.h 2016-09-01 22:13:58 UTC (rev 205323)
+++ trunk/Source/JavaScriptCore/runtime/JSArray.h 2016-09-01 22:34:27 UTC (rev 205324)
</span><span class="lines">@@ -341,30 +341,6 @@
</span><span class="cx"> return array;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-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);
-}
-
</del><span class="cx"> } // namespace JSC
</span><span class="cx">
</span><span class="cx"> #endif // JSArray_h
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSArrayInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSArrayInlines.h (205323 => 205324)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSArrayInlines.h 2016-09-01 22:13:58 UTC (rev 205323)
+++ trunk/Source/JavaScriptCore/runtime/JSArrayInlines.h 2016-09-01 22:34:27 UTC (rev 205324)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><del>-IndexingType JSArray::mergeIndexingTypeForCopying(IndexingType other)
</del><ins>+inline IndexingType JSArray::mergeIndexingTypeForCopying(IndexingType other)
</ins><span class="cx"> {
</span><span class="cx"> IndexingType type = indexingType();
</span><span class="cx"> if (!(type & IsArray && other & IsArray))
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> return type;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool JSArray::canFastCopy(VM& vm, JSArray* otherArray)
</del><ins>+inline bool JSArray::canFastCopy(VM& vm, JSArray* otherArray)
</ins><span class="cx"> {
</span><span class="cx"> if (hasAnyArrayStorage(indexingType()) || hasAnyArrayStorage(otherArray->indexingType()))
</span><span class="cx"> return false;
</span><span class="lines">@@ -68,6 +68,30 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+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);
+}
+
</ins><span class="cx"> } // namespace JSC
</span><span class="cx">
</span><span class="cx"> #endif /* JSArrayInlines_h */
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSInternalPromisecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSInternalPromise.cpp (205323 => 205324)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSInternalPromise.cpp 2016-09-01 22:13:58 UTC (rev 205323)
+++ trunk/Source/JavaScriptCore/runtime/JSInternalPromise.cpp 2016-09-01 22:34:27 UTC (rev 205324)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #include "BuiltinNames.h"
</span><span class="cx"> #include "JSCJSValueInlines.h"
</span><span class="cx"> #include "JSCellInlines.h"
</span><ins>+#include "JSObjectInlines.h"
</ins><span class="cx"> #include "StructureInlines.h"
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSInternalPromiseDeferredcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSInternalPromiseDeferred.cpp (205323 => 205324)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSInternalPromiseDeferred.cpp 2016-09-01 22:13:58 UTC (rev 205323)
+++ trunk/Source/JavaScriptCore/runtime/JSInternalPromiseDeferred.cpp 2016-09-01 22:34:27 UTC (rev 205324)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #include "JSCellInlines.h"
</span><span class="cx"> #include "JSInternalPromise.h"
</span><span class="cx"> #include "JSInternalPromiseConstructor.h"
</span><ins>+#include "JSObjectInlines.h"
</ins><span class="cx"> #include "SlotVisitorInlines.h"
</span><span class="cx"> #include "StructureInlines.h"
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSJobcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSJob.cpp (205323 => 205324)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSJob.cpp 2016-09-01 22:13:58 UTC (rev 205323)
+++ trunk/Source/JavaScriptCore/runtime/JSJob.cpp 2016-09-01 22:34:27 UTC (rev 205324)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "JSCJSValueInlines.h"
</span><span class="cx"> #include "JSCellInlines.h"
</span><span class="cx"> #include "JSGlobalObject.h"
</span><ins>+#include "JSObjectInlines.h"
</ins><span class="cx"> #include "Microtask.h"
</span><span class="cx"> #include "SlotVisitorInlines.h"
</span><span class="cx"> #include "StrongInlines.h"
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSModuleRecordcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSModuleRecord.cpp (205323 => 205324)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSModuleRecord.cpp 2016-09-01 22:13:58 UTC (rev 205323)
+++ trunk/Source/JavaScriptCore/runtime/JSModuleRecord.cpp 2016-09-01 22:34:27 UTC (rev 205324)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> #include "JSMap.h"
</span><span class="cx"> #include "JSModuleEnvironment.h"
</span><span class="cx"> #include "JSModuleNamespaceObject.h"
</span><ins>+#include "JSObjectInlines.h"
</ins><span class="cx"> #include "SlotVisitorInlines.h"
</span><span class="cx"> #include "StructureInlines.h"
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSObject.h (205323 => 205324)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSObject.h 2016-09-01 22:13:58 UTC (rev 205323)
+++ trunk/Source/JavaScriptCore/runtime/JSObject.h 2016-09-01 22:34:27 UTC (rev 205324)
</span><span class="lines">@@ -1290,66 +1290,6 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-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);
- }
-}
-
</del><span class="cx"> inline JSValue JSObject::get(ExecState* exec, PropertyName propertyName) const
</span><span class="cx"> {
</span><span class="cx"> PropertySlot slot(this, PropertySlot::InternalMethodType::Get);
</span><span class="lines">@@ -1368,22 +1308,6 @@
</span><span class="cx"> return jsUndefined();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-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);
-}
-
</del><span class="cx"> template<JSObject::PutMode mode>
</span><span class="cx"> ALWAYS_INLINE bool JSObject::putDirectInternal(VM& vm, PropertyName propertyName, JSValue value, unsigned attributes, PutPropertySlot& slot)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSObjectInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSObjectInlines.h (205323 => 205324)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSObjectInlines.h 2016-09-01 22:13:58 UTC (rev 205323)
+++ trunk/Source/JavaScriptCore/runtime/JSObjectInlines.h 2016-09-01 22:34:27 UTC (rev 205324)
</span><span class="lines">@@ -85,6 +85,82 @@
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+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);
+ }
+}
+
</ins><span class="cx"> // ECMA 8.6.2.2
</span><span class="cx"> ALWAYS_INLINE bool JSObject::putInline(JSCell* cell, ExecState* exec, PropertyName propertyName, JSValue value, PutPropertySlot& slot)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSPromiseDeferredcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSPromiseDeferred.cpp (205323 => 205324)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSPromiseDeferred.cpp 2016-09-01 22:13:58 UTC (rev 205323)
+++ trunk/Source/JavaScriptCore/runtime/JSPromiseDeferred.cpp 2016-09-01 22:34:27 UTC (rev 205324)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "Exception.h"
</span><span class="cx"> #include "JSCJSValueInlines.h"
</span><span class="cx"> #include "JSCellInlines.h"
</span><ins>+#include "JSObjectInlines.h"
</ins><span class="cx"> #include "JSPromise.h"
</span><span class="cx"> #include "JSPromiseConstructor.h"
</span><span class="cx"> #include "SlotVisitorInlines.h"
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSTypedArrayViewPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSTypedArrayViewPrototype.cpp (205323 => 205324)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSTypedArrayViewPrototype.cpp 2016-09-01 22:13:58 UTC (rev 205323)
+++ trunk/Source/JavaScriptCore/runtime/JSTypedArrayViewPrototype.cpp 2016-09-01 22:34:27 UTC (rev 205324)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include "JSCellInlines.h"
</span><span class="cx"> #include "JSFunction.h"
</span><span class="cx"> #include "JSGenericTypedArrayViewPrototypeFunctions.h"
</span><ins>+#include "JSObjectInlines.h"
</ins><span class="cx"> #include "TypedArrayAdaptors.h"
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeMapConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/MapConstructor.cpp (205323 => 205324)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/MapConstructor.cpp 2016-09-01 22:13:58 UTC (rev 205323)
+++ trunk/Source/JavaScriptCore/runtime/MapConstructor.cpp 2016-09-01 22:34:27 UTC (rev 205324)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #include "JSCellInlines.h"
</span><span class="cx"> #include "JSGlobalObject.h"
</span><span class="cx"> #include "JSMap.h"
</span><ins>+#include "JSObjectInlines.h"
</ins><span class="cx"> #include "MapPrototype.h"
</span><span class="cx"> #include "StructureInlines.h"
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeSamplingProfilercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/SamplingProfiler.cpp (205323 => 205324)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/SamplingProfiler.cpp 2016-09-01 22:13:58 UTC (rev 205323)
+++ trunk/Source/JavaScriptCore/runtime/SamplingProfiler.cpp 2016-09-01 22:34:27 UTC (rev 205324)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> #include "Interpreter.h"
</span><span class="cx"> #include "JSCJSValueInlines.h"
</span><span class="cx"> #include "JSFunction.h"
</span><ins>+#include "JSObjectInlines.h"
</ins><span class="cx"> #include "LLIntPCRanges.h"
</span><span class="cx"> #include "MarkedBlock.h"
</span><span class="cx"> #include "MarkedBlockSet.h"
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeSetConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/SetConstructor.cpp (205323 => 205324)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/SetConstructor.cpp 2016-09-01 22:13:58 UTC (rev 205323)
+++ trunk/Source/JavaScriptCore/runtime/SetConstructor.cpp 2016-09-01 22:34:27 UTC (rev 205324)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include "JSCJSValueInlines.h"
</span><span class="cx"> #include "JSCellInlines.h"
</span><span class="cx"> #include "JSGlobalObject.h"
</span><ins>+#include "JSObjectInlines.h"
</ins><span class="cx"> #include "JSSet.h"
</span><span class="cx"> #include "MapData.h"
</span><span class="cx"> #include "SetPrototype.h"
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeWeakMapConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/WeakMapConstructor.cpp (205323 => 205324)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/WeakMapConstructor.cpp 2016-09-01 22:13:58 UTC (rev 205323)
+++ trunk/Source/JavaScriptCore/runtime/WeakMapConstructor.cpp 2016-09-01 22:34:27 UTC (rev 205324)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "JSCJSValueInlines.h"
</span><span class="cx"> #include "JSCellInlines.h"
</span><span class="cx"> #include "JSGlobalObject.h"
</span><ins>+#include "JSObjectInlines.h"
</ins><span class="cx"> #include "JSWeakMap.h"
</span><span class="cx"> #include "StructureInlines.h"
</span><span class="cx"> #include "WeakMapPrototype.h"
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeWeakSetConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/WeakSetConstructor.cpp (205323 => 205324)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/WeakSetConstructor.cpp 2016-09-01 22:13:58 UTC (rev 205323)
+++ trunk/Source/JavaScriptCore/runtime/WeakSetConstructor.cpp 2016-09-01 22:34:27 UTC (rev 205324)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "JSCJSValueInlines.h"
</span><span class="cx"> #include "JSCellInlines.h"
</span><span class="cx"> #include "JSGlobalObject.h"
</span><ins>+#include "JSObjectInlines.h"
</ins><span class="cx"> #include "JSWeakSet.h"
</span><span class="cx"> #include "StructureInlines.h"
</span><span class="cx"> #include "WeakSetPrototype.h"
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (205323 => 205324)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-09-01 22:13:58 UTC (rev 205323)
+++ trunk/Source/WebCore/ChangeLog 2016-09-01 22:34:27 UTC (rev 205324)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-09-01 Mark Lam <mark.lam@apple.com>
+
+ 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:
+
</ins><span class="cx"> 2016-09-01 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> Fix ENABLE(CSS_GRID_LAYOUT) guards harder after r205102/r205292
</span></span></pre></div>
<a id="trunkSourceWebCoreForwardingHeadersruntimeJSObjectInlinesh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/ForwardingHeaders/runtime/JSObjectInlines.h (0 => 205324)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ForwardingHeaders/runtime/JSObjectInlines.h (rev 0)
+++ trunk/Source/WebCore/ForwardingHeaders/runtime/JSObjectInlines.h 2016-09-01 22:34:27 UTC (rev 205324)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+#ifndef WebCore_FWD_JSObjectInlines_h
+#define WebCore_FWD_JSObjectInlines_h
+#include <JavaScriptCore/JSObjectInlines.h>
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMBindingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMBinding.h (205323 => 205324)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMBinding.h 2016-09-01 22:13:58 UTC (rev 205323)
+++ trunk/Source/WebCore/bindings/js/JSDOMBinding.h 2016-09-01 22:34:27 UTC (rev 205324)
</span><span class="lines">@@ -39,6 +39,7 @@
</span><span class="cx"> #include <runtime/JSArrayBuffer.h>
</span><span class="cx"> #include <runtime/JSCJSValueInlines.h>
</span><span class="cx"> #include <runtime/JSCellInlines.h>
</span><ins>+#include <runtime/JSObjectInlines.h>
</ins><span class="cx"> #include <runtime/JSTypedArrays.h>
</span><span class="cx"> #include <runtime/Lookup.h>
</span><span class="cx"> #include <runtime/ObjectConstructor.h>
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSSQLTransactionCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSSQLTransactionCustom.cpp (205323 => 205324)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSSQLTransactionCustom.cpp 2016-09-01 22:13:58 UTC (rev 205323)
+++ trunk/Source/WebCore/bindings/js/JSSQLTransactionCustom.cpp 2016-09-01 22:34:27 UTC (rev 205324)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> #include "JSDOMWindowCustom.h"
</span><span class="cx"> #include "SQLTransaction.h"
</span><span class="cx"> #include "SQLValue.h"
</span><ins>+#include <runtime/JSObjectInlines.h>
</ins><span class="cx">
</span><span class="cx"> using namespace JSC;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSWebGLRenderingContextBaseCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSWebGLRenderingContextBaseCustom.cpp (205323 => 205324)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSWebGLRenderingContextBaseCustom.cpp 2016-09-01 22:13:58 UTC (rev 205323)
+++ trunk/Source/WebCore/bindings/js/JSWebGLRenderingContextBaseCustom.cpp 2016-09-01 22:34:27 UTC (rev 205324)
</span><span class="lines">@@ -96,6 +96,7 @@
</span><span class="cx"> #include "WebGLVertexArrayObject.h"
</span><span class="cx"> #include "WebGLVertexArrayObjectOES.h"
</span><span class="cx"> #include <runtime/Error.h>
</span><ins>+#include <runtime/JSObjectInlines.h>
</ins><span class="cx"> #include <runtime/JSTypedArrays.h>
</span><span class="cx"> #include <runtime/TypedArrayInlines.h>
</span><span class="cx"> #include <runtime/TypedArrays.h>
</span></span></pre></div>
<a id="trunkSourceWebCorecontentextensionsContentExtensionParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/ContentExtensionParser.cpp (205323 => 205324)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/contentextensions/ContentExtensionParser.cpp 2016-09-01 22:13:58 UTC (rev 205323)
+++ trunk/Source/WebCore/contentextensions/ContentExtensionParser.cpp 2016-09-01 22:34:27 UTC (rev 205324)
</span><span class="lines">@@ -39,6 +39,7 @@
</span><span class="cx"> #include <JavaScriptCore/JSCJSValueInlines.h>
</span><span class="cx"> #include <JavaScriptCore/JSGlobalObject.h>
</span><span class="cx"> #include <JavaScriptCore/JSONObject.h>
</span><ins>+#include <JavaScriptCore/JSObjectInlines.h>
</ins><span class="cx"> #include <JavaScriptCore/StructureInlines.h>
</span><span class="cx"> #include <JavaScriptCore/VM.h>
</span><span class="cx"> #include <wtf/CurrentTime.h>
</span></span></pre>
</div>
</div>
</body>
</html>