<!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>[201719] 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/201719">201719</a></dd>
<dt>Author</dt> <dd>barraclough@apple.com</dd>
<dt>Date</dt> <dd>2016-06-06 12:11:17 -0700 (Mon, 06 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Deprecate remaining uses of Lookup getStatic*, use HasStaticPropertyTable instead.
https://bugs.webkit.org/show_bug.cgi?id=158178
Reviewed by Darin Adler.
As of bug #158059 most JSC static table property access no longer requires getOwnPropertySlot to be
overridden. Port remaining calls to the getStatic* functions in Lookup.h over to the new mechanism.
Source/JavaScriptCore:
Deprecate getStatic* functions in Lookup.h
* runtime/Lookup.h:
(JSC::getStaticPropertySlot): Deleted.
(JSC::getStaticFunctionSlot): Deleted.
(JSC::getStaticValueSlot): Deleted.
- No longer required. Static table access now via JSObject.
Source/WebCore:
Switch WebCore DOM instance bindings to use HasStaticPropertyTable.
* bindings/js/JSPluginElementFunctions.h:
(WebCore::pluginElementCustomGetOwnPropertySlot):
- Switch call from getStaticValueSlot to Type::getOwnPropertySlot.
For any element where Type::hasStaticPropertyTable is true the HasStaticPropertyTable
structure flag will also be set, so Type::getOwnPropertySlot will do the same thing.
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateGetOwnPropertySlotBody):
- If we override getOwnPropertySlot, Base::getOwnPropertySlot will handle property storage & static property lookup.
(InstanceOverridesGetOwnPropertySlot):
- Instances only override getOwnPropertySlot if the really need to, not just for static property lookup.
(GenerateHeader):
- Set HasStaticPropertyTable in instance structureFlags, where appropriate.
(GenerateImplementation):
- GenerateGetOwnPropertySlotBody no longer needs to know if there are static properties.
* bindings/scripts/test/JS/JSTestActiveDOMObject.cpp:
* bindings/scripts/test/JS/JSTestActiveDOMObject.h:
* bindings/scripts/test/JS/JSTestException.cpp:
* bindings/scripts/test/JS/JSTestException.h:
* bindings/scripts/test/JS/JSTestObj.cpp:
* bindings/scripts/test/JS/JSTestObj.h:
* bindings/scripts/test/JS/JSTestTypedefs.cpp:
* bindings/scripts/test/JS/JSTestTypedefs.h:
* bindings/scripts/test/JS/JSattribute.cpp:
* bindings/scripts/test/JS/JSattribute.h:
- Updating bindings test results.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeLookuph">trunk/Source/JavaScriptCore/runtime/Lookup.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSPluginElementFunctionsh">trunk/Source/WebCore/bindings/js/JSPluginElementFunctions.h</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestActiveDOMObjectcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestActiveDOMObject.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestActiveDOMObjecth">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestActiveDOMObject.h</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestExceptioncpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestException.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestExceptionh">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestException.h</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestGlobalObjectcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestGlobalObject.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestGlobalObjecth">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestGlobalObject.h</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestObjh">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.h</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestTypedefscpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestTypedefsh">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.h</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSattributecpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSattribute.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSattributeh">trunk/Source/WebCore/bindings/scripts/test/JS/JSattribute.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (201718 => 201719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-06-06 18:51:23 UTC (rev 201718)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-06-06 19:11:17 UTC (rev 201719)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-06-05 Gavin & Ellie Barraclough <barraclough@apple.com>
+
+ Deprecate remaining uses of Lookup getStatic*, use HasStaticPropertyTable instead.
+ https://bugs.webkit.org/show_bug.cgi?id=158178
+
+ Reviewed by Darin Adler.
+
+ As of bug #158059 most JSC static table property access no longer requires getOwnPropertySlot to be
+ overridden. Port remaining calls to the getStatic* functions in Lookup.h over to the new mechanism.
+
+ Deprecate getStatic* functions in Lookup.h
+
+ * runtime/Lookup.h:
+ (JSC::getStaticPropertySlot): Deleted.
+ (JSC::getStaticFunctionSlot): Deleted.
+ (JSC::getStaticValueSlot): Deleted.
+ - No longer required. Static table access now via JSObject.
+
</ins><span class="cx"> 2016-06-06 Guillaume Emont <guijemont@igalia.com>
</span><span class="cx">
</span><span class="cx"> [jsc][mips] Implement absDouble()
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeLookuph"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Lookup.h (201718 => 201719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Lookup.h 2016-06-06 18:51:23 UTC (rev 201718)
+++ trunk/Source/JavaScriptCore/runtime/Lookup.h 2016-06-06 19:11:17 UTC (rev 201719)
</span><span class="lines">@@ -229,86 +229,6 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-/**
- * This method does it all (looking in the hashtable, checking for function
- * overrides, creating the function or retrieving from cache, calling
- * getValueProperty in case of a non-function property, forwarding to parent if
- * unknown property).
- */
-template <class ThisImp, class ParentImp>
-inline bool getStaticPropertySlot(ExecState* exec, const HashTable& table, ThisImp* thisObject, PropertyName propertyName, PropertySlot& slot)
-{
- if (ParentImp::getOwnPropertySlot(thisObject, exec, propertyName, slot))
- return true;
-
- if (thisObject->staticFunctionsReified())
- return false;
-
- auto* entry = table.entry(propertyName);
- if (!entry)
- return false;
-
- if (entry->attributes() & BuiltinOrFunctionOrAccessorOrLazyProperty)
- return setUpStaticFunctionSlot(exec->vm(), entry, thisObject, propertyName, slot);
-
- if (entry->attributes() & ConstantInteger) {
- slot.setValue(thisObject, attributesForStructure(entry->attributes()), jsNumber(entry->constantInteger()));
- return true;
- }
-
- slot.setCacheableCustom(thisObject, attributesForStructure(entry->attributes()), entry->propertyGetter());
- return true;
-}
-
-/**
- * Simplified version of getStaticPropertySlot in case there are only functions.
- * Using this instead of getStaticPropertySlot allows 'this' to avoid implementing
- * a dummy getValueProperty.
- */
-template <class ParentImp>
-inline bool getStaticFunctionSlot(ExecState* exec, const HashTable& table, JSObject* thisObject, PropertyName propertyName, PropertySlot& slot)
-{
- if (ParentImp::getOwnPropertySlot(thisObject, exec, propertyName, slot))
- return true;
-
- if (thisObject->staticFunctionsReified())
- return false;
-
- auto* entry = table.entry(propertyName);
- if (!entry)
- return false;
-
- return setUpStaticFunctionSlot(exec->vm(), entry, thisObject, propertyName, slot);
-}
-
-/**
- * Simplified version of getStaticPropertySlot in case there are no functions, only "values".
- * Using this instead of getStaticPropertySlot removes the need for a FuncImp class.
- */
-template <class ThisImp, class ParentImp>
-inline bool getStaticValueSlot(ExecState* exec, const HashTable& table, ThisImp* thisObject, PropertyName propertyName, PropertySlot& slot)
-{
- if (ParentImp::getOwnPropertySlot(thisObject, exec, propertyName, slot))
- return true;
-
- if (thisObject->staticFunctionsReified())
- return false;
-
- auto* entry = table.entry(propertyName);
- if (!entry)
- return false;
-
- ASSERT(!(entry->attributes() & BuiltinOrFunctionOrAccessorOrLazyProperty));
-
- if (entry->attributes() & ConstantInteger) {
- slot.setValue(thisObject, attributesForStructure(entry->attributes()), jsNumber(entry->constantInteger()));
- return true;
- }
-
- slot.setCacheableCustom(thisObject, attributesForStructure(entry->attributes()), entry->propertyGetter());
- return true;
-}
-
</del><span class="cx"> inline bool replaceStaticPropertySlot(VM& vm, JSObject* thisObject, PropertyName propertyName, JSValue value)
</span><span class="cx"> {
</span><span class="cx"> if (!thisObject->putDirect(vm, propertyName, value))
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (201718 => 201719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-06 18:51:23 UTC (rev 201718)
+++ trunk/Source/WebCore/ChangeLog 2016-06-06 19:11:17 UTC (rev 201719)
</span><span class="lines">@@ -1,3 +1,41 @@
</span><ins>+2016-06-05 Gavin & Ellie Barraclough <barraclough@apple.com>
+
+ Deprecate remaining uses of Lookup getStatic*, use HasStaticPropertyTable instead.
+ https://bugs.webkit.org/show_bug.cgi?id=158178
+
+ Reviewed by Darin Adler.
+
+ As of bug #158059 most JSC static table property access no longer requires getOwnPropertySlot to be
+ overridden. Port remaining calls to the getStatic* functions in Lookup.h over to the new mechanism.
+
+ Switch WebCore DOM instance bindings to use HasStaticPropertyTable.
+
+ * bindings/js/JSPluginElementFunctions.h:
+ (WebCore::pluginElementCustomGetOwnPropertySlot):
+ - Switch call from getStaticValueSlot to Type::getOwnPropertySlot.
+ For any element where Type::hasStaticPropertyTable is true the HasStaticPropertyTable
+ structure flag will also be set, so Type::getOwnPropertySlot will do the same thing.
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateGetOwnPropertySlotBody):
+ - If we override getOwnPropertySlot, Base::getOwnPropertySlot will handle property storage & static property lookup.
+ (InstanceOverridesGetOwnPropertySlot):
+ - Instances only override getOwnPropertySlot if the really need to, not just for static property lookup.
+ (GenerateHeader):
+ - Set HasStaticPropertyTable in instance structureFlags, where appropriate.
+ (GenerateImplementation):
+ - GenerateGetOwnPropertySlotBody no longer needs to know if there are static properties.
+ * bindings/scripts/test/JS/JSTestActiveDOMObject.cpp:
+ * bindings/scripts/test/JS/JSTestActiveDOMObject.h:
+ * bindings/scripts/test/JS/JSTestException.cpp:
+ * bindings/scripts/test/JS/JSTestException.h:
+ * bindings/scripts/test/JS/JSTestObj.cpp:
+ * bindings/scripts/test/JS/JSTestObj.h:
+ * bindings/scripts/test/JS/JSTestTypedefs.cpp:
+ * bindings/scripts/test/JS/JSTestTypedefs.h:
+ * bindings/scripts/test/JS/JSattribute.cpp:
+ * bindings/scripts/test/JS/JSattribute.h:
+ - Updating bindings test results.
+
</ins><span class="cx"> 2016-06-06 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Modern IDB: Crash seen in IDBConnectionProxy::putOrAdd on GuardMalloc bot
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSPluginElementFunctionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSPluginElementFunctions.h (201718 => 201719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSPluginElementFunctions.h 2016-06-06 18:51:23 UTC (rev 201718)
+++ trunk/Source/WebCore/bindings/js/JSPluginElementFunctions.h 2016-06-06 19:11:17 UTC (rev 201719)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> template <class Type, class Base> bool pluginElementCustomGetOwnPropertySlot(JSC::ExecState* exec, JSC::PropertyName propertyName, JSC::PropertySlot& slot, Type* element)
</span><span class="cx"> {
</span><span class="cx"> if (!element->globalObject()->world().isNormal()) {
</span><del>- if (Type::hasStaticPropertyTable && JSC::getStaticValueSlot<Type, Base>(exec, *Type::info()->staticPropHashTable, element, propertyName, slot))
</del><ins>+ if (Type::hasStaticPropertyTable && Type::getOwnPropertySlot(element, exec, propertyName, slot))
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> JSC::JSValue proto = element->getPrototypeDirect();
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (201718 => 201719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-06-06 18:51:23 UTC (rev 201718)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-06-06 19:11:17 UTC (rev 201719)
</span><span class="lines">@@ -272,7 +272,7 @@
</span><span class="cx">
</span><span class="cx"> sub GenerateGetOwnPropertySlotBody
</span><span class="cx"> {
</span><del>- my ($interface, $className, $hasInstanceProperties, $inlined) = @_;
</del><ins>+ my ($interface, $className, $inlined) = @_;
</ins><span class="cx">
</span><span class="cx"> my $namespaceMaybe = ($inlined ? "JSC::" : "");
</span><span class="cx"> my $namedGetterFunction = GetNamedGetterFunction($interface);
</span><span class="lines">@@ -281,15 +281,7 @@
</span><span class="cx"> my @getOwnPropertySlotImpl = ();
</span><span class="cx">
</span><span class="cx"> my $ownPropertyCheck = sub {
</span><del>- if ($hasInstanceProperties) {
- my $instanceFunctionCount = InstanceFunctionCount($interface);
- # If there are functions on the instance, then call getStaticPropertySlot() instead of getStaticValueSlot().
- my $staticPropertyGetFunction = $namespaceMaybe . ($instanceFunctionCount eq 0 ? "getStaticValueSlot" : "getStaticPropertySlot");
- my $staticPropertyTable = $inlined ? "*info()->staticPropHashTable" : "${className}Table";
- push(@getOwnPropertySlotImpl, " if ($staticPropertyGetFunction<$className, Base>(state, ${staticPropertyTable}, thisObject, propertyName, slot))\n");
- } else {
- push(@getOwnPropertySlotImpl, " if (Base::getOwnPropertySlot(thisObject, state, propertyName, slot))\n");
- }
</del><ins>+ push(@getOwnPropertySlotImpl, " if (Base::getOwnPropertySlot(thisObject, state, propertyName, slot))\n");
</ins><span class="cx"> push(@getOwnPropertySlotImpl, " return true;\n");
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -686,7 +678,6 @@
</span><span class="cx"> sub InstanceOverridesGetOwnPropertySlot
</span><span class="cx"> {
</span><span class="cx"> my $interface = shift;
</span><del>- my $numInstanceProperties = InstancePropertyCount($interface);
</del><span class="cx">
</span><span class="cx"> my $namedGetterFunction = GetNamedGetterFunction($interface);
</span><span class="cx"> my $indexedGetterFunction = GetIndexedGetterFunction($interface);
</span><span class="lines">@@ -699,7 +690,7 @@
</span><span class="cx"> || $interface->extendedAttributes->{"CustomGetOwnPropertySlot"}
</span><span class="cx"> || $hasNamedGetter;
</span><span class="cx">
</span><del>- return $numInstanceProperties > 0 || $hasComplexGetter;
</del><ins>+ return $hasComplexGetter;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub PrototypeHasStaticPropertyTable
</span><span class="lines">@@ -1147,8 +1138,12 @@
</span><span class="cx"> push(@headerContent, " static const bool needsDestruction = false;\n\n");
</span><span class="cx"> }
</span><span class="cx">
</span><del>- my $hasStaticPropertyTable = InstancePropertyCount($interface) > 0 ? "true" : "false";
- push(@headerContent, " static const bool hasStaticPropertyTable = $hasStaticPropertyTable;\n\n");
</del><ins>+ if (InstancePropertyCount($interface) > 0) {
+ $structureFlags{"JSC::HasStaticPropertyTable"} = 1;
+ push(@headerContent, " static const bool hasStaticPropertyTable = true;\n\n");
+ } else {
+ push(@headerContent, " static const bool hasStaticPropertyTable = false;\n\n");
+ }
</ins><span class="cx">
</span><span class="cx"> # Prototype
</span><span class="cx"> unless (IsDOMGlobalObject($interface)) {
</span><span class="lines">@@ -2435,7 +2430,7 @@
</span><span class="cx"> push(@implContent, "{\n");
</span><span class="cx"> push(@implContent, " auto* thisObject = jsCast<${className}*>(object);\n");
</span><span class="cx"> push(@implContent, " ASSERT_GC_OBJECT_INHERITS(thisObject, info());\n");
</span><del>- push(@implContent, GenerateGetOwnPropertySlotBody($interface, $className, $numInstanceProperties > 0, 0));
</del><ins>+ push(@implContent, GenerateGetOwnPropertySlotBody($interface, $className, 0));
</ins><span class="cx"> push(@implContent, "}\n\n");
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestActiveDOMObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestActiveDOMObject.cpp (201718 => 201719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestActiveDOMObject.cpp 2016-06-06 18:51:23 UTC (rev 201718)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestActiveDOMObject.cpp 2016-06-06 19:11:17 UTC (rev 201719)
</span><span class="lines">@@ -140,15 +140,6 @@
</span><span class="cx"> thisObject->JSTestActiveDOMObject::~JSTestActiveDOMObject();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool JSTestActiveDOMObject::getOwnPropertySlot(JSObject* object, ExecState* state, PropertyName propertyName, PropertySlot& slot)
-{
- auto* thisObject = jsCast<JSTestActiveDOMObject*>(object);
- ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- if (getStaticValueSlot<JSTestActiveDOMObject, Base>(state, JSTestActiveDOMObjectTable, thisObject, propertyName, slot))
- return true;
- return false;
-}
-
</del><span class="cx"> EncodedJSValue jsTestActiveDOMObjectExcitingAttr(ExecState* state, EncodedJSValue thisValue, PropertyName)
</span><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(state);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestActiveDOMObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestActiveDOMObject.h (201718 => 201719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestActiveDOMObject.h 2016-06-06 18:51:23 UTC (rev 201718)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestActiveDOMObject.h 2016-06-06 19:11:17 UTC (rev 201719)
</span><span class="lines">@@ -41,7 +41,6 @@
</span><span class="cx"> static JSC::JSObject* createPrototype(JSC::VM&, JSC::JSGlobalObject*);
</span><span class="cx"> static JSC::JSObject* prototype(JSC::VM&, JSC::JSGlobalObject*);
</span><span class="cx"> static TestActiveDOMObject* toWrapped(JSC::JSValue);
</span><del>- static bool getOwnPropertySlot(JSC::JSObject*, JSC::ExecState*, JSC::PropertyName, JSC::PropertySlot&);
</del><span class="cx"> static void destroy(JSC::JSCell*);
</span><span class="cx">
</span><span class="cx"> DECLARE_INFO;
</span><span class="lines">@@ -53,7 +52,7 @@
</span><span class="cx">
</span><span class="cx"> static JSC::JSValue getConstructor(JSC::VM&, const JSC::JSGlobalObject*);
</span><span class="cx"> public:
</span><del>- static const unsigned StructureFlags = JSC::OverridesGetOwnPropertySlot | Base::StructureFlags;
</del><ins>+ static const unsigned StructureFlags = JSC::HasStaticPropertyTable | Base::StructureFlags;
</ins><span class="cx"> protected:
</span><span class="cx"> JSTestActiveDOMObject(JSC::Structure*, JSDOMGlobalObject&, Ref<TestActiveDOMObject>&&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestExceptioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestException.cpp (201718 => 201719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestException.cpp 2016-06-06 18:51:23 UTC (rev 201718)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestException.cpp 2016-06-06 19:11:17 UTC (rev 201719)
</span><span class="lines">@@ -132,15 +132,6 @@
</span><span class="cx"> thisObject->JSTestException::~JSTestException();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool JSTestException::getOwnPropertySlot(JSObject* object, ExecState* state, PropertyName propertyName, PropertySlot& slot)
-{
- auto* thisObject = jsCast<JSTestException*>(object);
- ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- if (getStaticValueSlot<JSTestException, Base>(state, JSTestExceptionTable, thisObject, propertyName, slot))
- return true;
- return false;
-}
-
</del><span class="cx"> EncodedJSValue jsTestExceptionName(ExecState* state, EncodedJSValue thisValue, PropertyName)
</span><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(state);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestExceptionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestException.h (201718 => 201719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestException.h 2016-06-06 18:51:23 UTC (rev 201718)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestException.h 2016-06-06 19:11:17 UTC (rev 201719)
</span><span class="lines">@@ -42,7 +42,6 @@
</span><span class="cx"> static JSC::JSObject* createPrototype(JSC::VM&, JSC::JSGlobalObject*);
</span><span class="cx"> static JSC::JSObject* prototype(JSC::VM&, JSC::JSGlobalObject*);
</span><span class="cx"> static TestException* toWrapped(JSC::JSValue);
</span><del>- static bool getOwnPropertySlot(JSC::JSObject*, JSC::ExecState*, JSC::PropertyName, JSC::PropertySlot&);
</del><span class="cx"> static void destroy(JSC::JSCell*);
</span><span class="cx">
</span><span class="cx"> DECLARE_INFO;
</span><span class="lines">@@ -54,7 +53,7 @@
</span><span class="cx">
</span><span class="cx"> static JSC::JSValue getConstructor(JSC::VM&, const JSC::JSGlobalObject*);
</span><span class="cx"> public:
</span><del>- static const unsigned StructureFlags = JSC::OverridesGetOwnPropertySlot | Base::StructureFlags;
</del><ins>+ static const unsigned StructureFlags = JSC::HasStaticPropertyTable | Base::StructureFlags;
</ins><span class="cx"> protected:
</span><span class="cx"> JSTestException(JSC::Structure*, JSDOMGlobalObject&, Ref<TestException>&&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestGlobalObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestGlobalObject.cpp (201718 => 201719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestGlobalObject.cpp 2016-06-06 18:51:23 UTC (rev 201718)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestGlobalObject.cpp 2016-06-06 19:11:17 UTC (rev 201719)
</span><span class="lines">@@ -137,15 +137,6 @@
</span><span class="cx"> thisObject->JSTestGlobalObject::~JSTestGlobalObject();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool JSTestGlobalObject::getOwnPropertySlot(JSObject* object, ExecState* state, PropertyName propertyName, PropertySlot& slot)
-{
- auto* thisObject = jsCast<JSTestGlobalObject*>(object);
- ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- if (getStaticPropertySlot<JSTestGlobalObject, Base>(state, JSTestGlobalObjectTable, thisObject, propertyName, slot))
- return true;
- return false;
-}
-
</del><span class="cx"> EncodedJSValue jsTestGlobalObjectRegularAttribute(ExecState* state, EncodedJSValue thisValue, PropertyName)
</span><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(state);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestGlobalObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestGlobalObject.h (201718 => 201719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestGlobalObject.h 2016-06-06 18:51:23 UTC (rev 201718)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestGlobalObject.h 2016-06-06 19:11:17 UTC (rev 201719)
</span><span class="lines">@@ -43,7 +43,6 @@
</span><span class="cx"> static const bool hasStaticPropertyTable = true;
</span><span class="cx">
</span><span class="cx"> static TestGlobalObject* toWrapped(JSC::JSValue);
</span><del>- static bool getOwnPropertySlot(JSC::JSObject*, JSC::ExecState*, JSC::PropertyName, JSC::PropertySlot&);
</del><span class="cx"> static void destroy(JSC::JSCell*);
</span><span class="cx">
</span><span class="cx"> DECLARE_INFO;
</span><span class="lines">@@ -55,7 +54,7 @@
</span><span class="cx">
</span><span class="cx"> static JSC::JSValue getConstructor(JSC::VM&, const JSC::JSGlobalObject*);
</span><span class="cx"> public:
</span><del>- static const unsigned StructureFlags = JSC::OverridesGetOwnPropertySlot | Base::StructureFlags;
</del><ins>+ static const unsigned StructureFlags = JSC::HasStaticPropertyTable | Base::StructureFlags;
</ins><span class="cx"> protected:
</span><span class="cx"> JSTestGlobalObject(JSC::Structure*, JSDOMGlobalObject&, Ref<TestGlobalObject>&&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp (201718 => 201719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-06-06 18:51:23 UTC (rev 201718)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-06-06 19:11:17 UTC (rev 201719)
</span><span class="lines">@@ -1358,7 +1358,7 @@
</span><span class="cx"> slot.setValue(thisObject, attributes, jsStringOrUndefined(state, thisObject->wrapped().item(index)));
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><del>- if (getStaticPropertySlot<JSTestObj, Base>(state, JSTestObjTable, thisObject, propertyName, slot))
</del><ins>+ if (Base::getOwnPropertySlot(thisObject, state, propertyName, slot))
</ins><span class="cx"> return true;
</span><span class="cx"> return false;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestObjh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.h (201718 => 201719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.h 2016-06-06 18:51:23 UTC (rev 201718)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.h 2016-06-06 19:11:17 UTC (rev 201719)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> JSC::JSValue customMethodWithArgs(JSC::ExecState&);
</span><span class="cx"> static JSC::JSValue classMethod2(JSC::ExecState&);
</span><span class="cx"> public:
</span><del>- static const unsigned StructureFlags = JSC::InterceptsGetOwnPropertySlotByIndexEvenWhenLengthIsNotZero | JSC::OverridesGetOwnPropertySlot | JSC::OverridesGetPropertyNames | Base::StructureFlags;
</del><ins>+ static const unsigned StructureFlags = JSC::HasStaticPropertyTable | JSC::InterceptsGetOwnPropertySlotByIndexEvenWhenLengthIsNotZero | JSC::OverridesGetOwnPropertySlot | JSC::OverridesGetPropertyNames | Base::StructureFlags;
</ins><span class="cx"> protected:
</span><span class="cx"> JSTestObj(JSC::Structure*, JSDOMGlobalObject&, Ref<TestObj>&&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestTypedefscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp (201718 => 201719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp 2016-06-06 18:51:23 UTC (rev 201718)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp 2016-06-06 19:11:17 UTC (rev 201719)
</span><span class="lines">@@ -209,15 +209,6 @@
</span><span class="cx"> thisObject->JSTestTypedefs::~JSTestTypedefs();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool JSTestTypedefs::getOwnPropertySlot(JSObject* object, ExecState* state, PropertyName propertyName, PropertySlot& slot)
-{
- auto* thisObject = jsCast<JSTestTypedefs*>(object);
- ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- if (getStaticValueSlot<JSTestTypedefs, Base>(state, JSTestTypedefsTable, thisObject, propertyName, slot))
- return true;
- return false;
-}
-
</del><span class="cx"> EncodedJSValue jsTestTypedefsUnsignedLongLongAttr(ExecState* state, EncodedJSValue thisValue, PropertyName)
</span><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(state);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestTypedefsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.h (201718 => 201719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.h 2016-06-06 18:51:23 UTC (rev 201718)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.h 2016-06-06 19:11:17 UTC (rev 201719)
</span><span class="lines">@@ -41,7 +41,6 @@
</span><span class="cx"> static JSC::JSObject* createPrototype(JSC::VM&, JSC::JSGlobalObject*);
</span><span class="cx"> static JSC::JSObject* prototype(JSC::VM&, JSC::JSGlobalObject*);
</span><span class="cx"> static TestTypedefs* toWrapped(JSC::JSValue);
</span><del>- static bool getOwnPropertySlot(JSC::JSObject*, JSC::ExecState*, JSC::PropertyName, JSC::PropertySlot&);
</del><span class="cx"> static void destroy(JSC::JSCell*);
</span><span class="cx">
</span><span class="cx"> DECLARE_INFO;
</span><span class="lines">@@ -53,7 +52,7 @@
</span><span class="cx">
</span><span class="cx"> static JSC::JSValue getConstructor(JSC::VM&, const JSC::JSGlobalObject*);
</span><span class="cx"> public:
</span><del>- static const unsigned StructureFlags = JSC::OverridesGetOwnPropertySlot | Base::StructureFlags;
</del><ins>+ static const unsigned StructureFlags = JSC::HasStaticPropertyTable | Base::StructureFlags;
</ins><span class="cx"> protected:
</span><span class="cx"> JSTestTypedefs(JSC::Structure*, JSDOMGlobalObject&, Ref<TestTypedefs>&&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSattributecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSattribute.cpp (201718 => 201719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSattribute.cpp 2016-06-06 18:51:23 UTC (rev 201718)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSattribute.cpp 2016-06-06 19:11:17 UTC (rev 201719)
</span><span class="lines">@@ -132,15 +132,6 @@
</span><span class="cx"> thisObject->JSattribute::~JSattribute();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool JSattribute::getOwnPropertySlot(JSObject* object, ExecState* state, PropertyName propertyName, PropertySlot& slot)
-{
- auto* thisObject = jsCast<JSattribute*>(object);
- ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- if (getStaticValueSlot<JSattribute, Base>(state, JSattributeTable, thisObject, propertyName, slot))
- return true;
- return false;
-}
-
</del><span class="cx"> EncodedJSValue jsattributeReadonly(ExecState* state, EncodedJSValue thisValue, PropertyName)
</span><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(state);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSattributeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSattribute.h (201718 => 201719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSattribute.h 2016-06-06 18:51:23 UTC (rev 201718)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSattribute.h 2016-06-06 19:11:17 UTC (rev 201719)
</span><span class="lines">@@ -42,7 +42,6 @@
</span><span class="cx"> static JSC::JSObject* createPrototype(JSC::VM&, JSC::JSGlobalObject*);
</span><span class="cx"> static JSC::JSObject* prototype(JSC::VM&, JSC::JSGlobalObject*);
</span><span class="cx"> static attribute* toWrapped(JSC::JSValue);
</span><del>- static bool getOwnPropertySlot(JSC::JSObject*, JSC::ExecState*, JSC::PropertyName, JSC::PropertySlot&);
</del><span class="cx"> static void destroy(JSC::JSCell*);
</span><span class="cx">
</span><span class="cx"> DECLARE_INFO;
</span><span class="lines">@@ -54,7 +53,7 @@
</span><span class="cx">
</span><span class="cx"> static JSC::JSValue getConstructor(JSC::VM&, const JSC::JSGlobalObject*);
</span><span class="cx"> public:
</span><del>- static const unsigned StructureFlags = JSC::OverridesGetOwnPropertySlot | Base::StructureFlags;
</del><ins>+ static const unsigned StructureFlags = JSC::HasStaticPropertyTable | Base::StructureFlags;
</ins><span class="cx"> protected:
</span><span class="cx"> JSattribute(JSC::Structure*, JSDOMGlobalObject&, Ref<attribute>&&);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>