<!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>[196320] tags/Safari-602.1.18.6</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/196320">196320</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-02-09 10:33:35 -0800 (Tue, 09 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/196004">r196004</a>. rdar://problem/24439699</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari6021186LayoutTestsChangeLog">tags/Safari-602.1.18.6/LayoutTests/ChangeLog</a></li>
<li><a href="#tagsSafari6021186SourceJavaScriptCoreChangeLog">tags/Safari-602.1.18.6/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#tagsSafari6021186SourceJavaScriptCoreruntimeObjectPrototypecpp">tags/Safari-602.1.18.6/Source/JavaScriptCore/runtime/ObjectPrototype.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#tagsSafari6021186LayoutTestsjslookupGetterGetternativebindingsexpectedtxt">tags/Safari-602.1.18.6/LayoutTests/js/lookupGetterGetter-native-bindings-expected.txt</a></li>
<li><a href="#tagsSafari6021186LayoutTestsjslookupGetterGetternativebindingshtml">tags/Safari-602.1.18.6/LayoutTests/js/lookupGetterGetter-native-bindings.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari6021186LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.18.6/LayoutTests/ChangeLog (196319 => 196320)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.18.6/LayoutTests/ChangeLog 2016-02-09 18:32:22 UTC (rev 196319)
+++ tags/Safari-602.1.18.6/LayoutTests/ChangeLog 2016-02-09 18:33:35 UTC (rev 196320)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2016-02-09 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r196004.
+
+ 2016-02-01 Chris Dumez <cdumez@apple.com>
+
+ object.__lookupGetter__() / object.__lookupSetter__() does not work for native bindings
+ https://bugs.webkit.org/show_bug.cgi?id=153765
+ <rdar://problem/24439699>
+
+ Reviewed by Oliver Hunt.
+
+ Add layout tests to test that object.__lookupGetter__() / object.__lookupSetter__()
+ works for native bindings.
+
+ * js/lookupGetterGetter-native-bindings-expected.txt: Added.
+ * js/lookupGetterGetter-native-bindings.html: Added.
+
+2016-02-09 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r196002.
</span><span class="cx">
</span><span class="cx"> 2016-02-01 Chris Dumez <cdumez@apple.com>
</span></span></pre></div>
<a id="tagsSafari6021186LayoutTestsjslookupGetterGetternativebindingsexpectedtxtfromrev196004trunkLayoutTestsjslookupGetterGetternativebindingsexpectedtxt"></a>
<div class="copfile"><h4>Copied: tags/Safari-602.1.18.6/LayoutTests/js/lookupGetterGetter-native-bindings-expected.txt (from rev 196004, trunk/LayoutTests/js/lookupGetterGetter-native-bindings-expected.txt) (0 => 196320)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.18.6/LayoutTests/js/lookupGetterGetter-native-bindings-expected.txt (rev 0)
+++ tags/Safari-602.1.18.6/LayoutTests/js/lookupGetterGetter-native-bindings-expected.txt 2016-02-09 18:33:35 UTC (rev 196320)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+Checks that __lookupGetter__ / __lookupSetter__() works for native bindings.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS Element.prototype.__lookupGetter__('tagName') is an instance of Function
+PASS Element.prototype.__lookupSetter__('tagName') is undefined.
+PASS Element.prototype.__lookupGetter__('tagName') is Object.getOwnPropertyDescriptor(Element.prototype, 'tagName').get
+PASS Element.prototype.__lookupSetter__('tagName') is Object.getOwnPropertyDescriptor(Element.prototype, 'tagName').set
+PASS testDiv.tagName is "DIV"
+PASS Element.prototype.__lookupGetter__('tagName').call(testDiv) is "DIV"
+
+PASS Element.prototype.__lookupGetter__('nodeName') is an instance of Function
+PASS Element.prototype.__lookupSetter__('nodeName') is undefined.
+PASS Element.prototype.__lookupGetter__('nodeName') is Object.getOwnPropertyDescriptor(Node.prototype, 'nodeName').get
+PASS Element.prototype.__lookupSetter__('nodeName') is Object.getOwnPropertyDescriptor(Node.prototype, 'nodeName').set
+PASS testDiv.nodeName is "DIV"
+PASS Element.prototype.__lookupGetter__('nodeName').call(testDiv) is "DIV"
+
+PASS HTMLElement.prototype.__lookupGetter__('innerText') is an instance of Function
+PASS HTMLElement.prototype.__lookupSetter__('innerText') is an instance of Function
+PASS HTMLDivElement.prototype.__lookupGetter__('innerText') is an instance of Function
+PASS HTMLDivElement.prototype.__lookupSetter__('innerText') is an instance of Function
+PASS testDiv.__proto__.__lookupGetter__('innerText') is an instance of Function
+PASS testDiv.__proto__.__lookupSetter__('innerText') is an instance of Function
+PASS testDiv.__proto__.__proto__.__lookupGetter__('innerText') is an instance of Function
+PASS testDiv.__proto__.__proto__.__lookupSetter__('innerText') is an instance of Function
+PASS HTMLElement.prototype.__lookupGetter__('innerText') is Object.getOwnPropertyDescriptor(HTMLElement.prototype, 'innerText').get
+PASS HTMLElement.prototype.__lookupSetter__('innerText') is Object.getOwnPropertyDescriptor(HTMLElement.prototype, 'innerText').set
+PASS testDiv.innerText is ""
+PASS HTMLElement.prototype.__lookupGetter__('innerText').call(testDiv) is ""
+testDiv.innerText = 'TEST1'
+PASS testDiv.innerText is "TEST1"
+PASS HTMLElement.prototype.__lookupGetter__('innerText').call(testDiv) is "TEST1"
+HTMLElement.prototype.__lookupSetter__('innerText').call(testDiv, '')
+PASS testDiv.innerText is ""
+PASS HTMLElement.prototype.__lookupGetter__('innerText').call(testDiv) is ""
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="tagsSafari6021186LayoutTestsjslookupGetterGetternativebindingshtmlfromrev196004trunkLayoutTestsjslookupGetterGetternativebindingshtml"></a>
<div class="copfile"><h4>Copied: tags/Safari-602.1.18.6/LayoutTests/js/lookupGetterGetter-native-bindings.html (from rev 196004, trunk/LayoutTests/js/lookupGetterGetter-native-bindings.html) (0 => 196320)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.18.6/LayoutTests/js/lookupGetterGetter-native-bindings.html (rev 0)
+++ tags/Safari-602.1.18.6/LayoutTests/js/lookupGetterGetter-native-bindings.html 2016-02-09 18:33:35 UTC (rev 196320)
</span><span class="lines">@@ -0,0 +1,50 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../resources/js-test-pre.js"></script>
+</head>
+<body>
+<div id="testDiv"></div>
+<script>
+description("Checks that __lookupGetter__ / __lookupSetter__() works for native bindings.");
+
+var testDiv = document.getElementById("testDiv");
+
+shouldBeType("Element.prototype.__lookupGetter__('tagName')", "Function");
+shouldBeUndefined("Element.prototype.__lookupSetter__('tagName')");
+shouldBe("Element.prototype.__lookupGetter__('tagName')", "Object.getOwnPropertyDescriptor(Element.prototype, 'tagName').get");
+shouldBe("Element.prototype.__lookupSetter__('tagName')", "Object.getOwnPropertyDescriptor(Element.prototype, 'tagName').set");
+shouldBeEqualToString("testDiv.tagName", "DIV");
+shouldBeEqualToString("Element.prototype.__lookupGetter__('tagName').call(testDiv)", "DIV");
+
+debug("");
+shouldBeType("Element.prototype.__lookupGetter__('nodeName')", "Function");
+shouldBeUndefined("Element.prototype.__lookupSetter__('nodeName')");
+shouldBe("Element.prototype.__lookupGetter__('nodeName')", "Object.getOwnPropertyDescriptor(Node.prototype, 'nodeName').get");
+shouldBe("Element.prototype.__lookupSetter__('nodeName')", "Object.getOwnPropertyDescriptor(Node.prototype, 'nodeName').set");
+shouldBeEqualToString("testDiv.nodeName", "DIV");
+shouldBeEqualToString("Element.prototype.__lookupGetter__('nodeName').call(testDiv)", "DIV");
+
+debug("");
+shouldBeType("HTMLElement.prototype.__lookupGetter__('innerText')", "Function");
+shouldBeType("HTMLElement.prototype.__lookupSetter__('innerText')", "Function");
+shouldBeType("HTMLDivElement.prototype.__lookupGetter__('innerText')", "Function");
+shouldBeType("HTMLDivElement.prototype.__lookupSetter__('innerText')", "Function");
+shouldBeType("testDiv.__proto__.__lookupGetter__('innerText')", "Function");
+shouldBeType("testDiv.__proto__.__lookupSetter__('innerText')", "Function");
+shouldBeType("testDiv.__proto__.__proto__.__lookupGetter__('innerText')", "Function");
+shouldBeType("testDiv.__proto__.__proto__.__lookupSetter__('innerText')", "Function");
+shouldBe("HTMLElement.prototype.__lookupGetter__('innerText')", "Object.getOwnPropertyDescriptor(HTMLElement.prototype, 'innerText').get");
+shouldBe("HTMLElement.prototype.__lookupSetter__('innerText')", "Object.getOwnPropertyDescriptor(HTMLElement.prototype, 'innerText').set");
+shouldBeEqualToString("testDiv.innerText", "");
+shouldBeEqualToString("HTMLElement.prototype.__lookupGetter__('innerText').call(testDiv)", "");
+evalAndLog("testDiv.innerText = 'TEST1'");
+shouldBeEqualToString("testDiv.innerText", "TEST1");
+shouldBeEqualToString("HTMLElement.prototype.__lookupGetter__('innerText').call(testDiv)", "TEST1");
+evalAndLog("HTMLElement.prototype.__lookupSetter__('innerText').call(testDiv, '')");
+shouldBeEqualToString("testDiv.innerText", "");
+shouldBeEqualToString("HTMLElement.prototype.__lookupGetter__('innerText').call(testDiv)", "");
+</script>
+<script src="../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="tagsSafari6021186SourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.18.6/Source/JavaScriptCore/ChangeLog (196319 => 196320)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.18.6/Source/JavaScriptCore/ChangeLog 2016-02-09 18:32:22 UTC (rev 196319)
+++ tags/Safari-602.1.18.6/Source/JavaScriptCore/ChangeLog 2016-02-09 18:33:35 UTC (rev 196320)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2016-02-09 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r196004.
+
+ 2016-02-01 Chris Dumez <cdumez@apple.com>
+
+ object.__lookupGetter__() / object.__lookupSetter__() does not work for native bindings
+ https://bugs.webkit.org/show_bug.cgi?id=153765
+ <rdar://problem/24439699>
+
+ Reviewed by Oliver Hunt.
+
+ Add support for CustomAccessor slots to objectProtoFuncLookupGetter() and
+ objectProtoFuncLookupSetter() by return getOwnPropertyDescriptor().get / set.
+ getOwnPropertyDescriptor() now correctly deals with CustomAccessors since
+ r196001.
+
+ * runtime/ObjectPrototype.cpp:
+ (JSC::objectProtoFuncLookupGetter):
+ (JSC::objectProtoFuncLookupSetter):
+
+2016-02-09 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r196001.
</span><span class="cx">
</span><span class="cx"> 2016-02-01 Chris Dumez <cdumez@apple.com>
</span></span></pre></div>
<a id="tagsSafari6021186SourceJavaScriptCoreruntimeObjectPrototypecpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.18.6/Source/JavaScriptCore/runtime/ObjectPrototype.cpp (196319 => 196320)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.18.6/Source/JavaScriptCore/runtime/ObjectPrototype.cpp 2016-02-09 18:32:22 UTC (rev 196319)
+++ tags/Safari-602.1.18.6/Source/JavaScriptCore/runtime/ObjectPrototype.cpp 2016-02-09 18:33:35 UTC (rev 196320)
</span><span class="lines">@@ -175,9 +175,17 @@
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> PropertySlot slot(thisObject);
</span><del>- if (thisObject->getPropertySlot(exec, propertyName, slot) && slot.isAccessor()) {
- GetterSetter* getterSetter = slot.getterSetter();
- return getterSetter->isGetterNull() ? JSValue::encode(jsUndefined()) : JSValue::encode(getterSetter->getter());
</del><ins>+ if (thisObject->getPropertySlot(exec, propertyName, slot)) {
+ if (slot.isAccessor()) {
+ GetterSetter* getterSetter = slot.getterSetter();
+ return getterSetter->isGetterNull() ? JSValue::encode(jsUndefined()) : JSValue::encode(getterSetter->getter());
+ }
+ if (slot.attributes() & CustomAccessor) {
+ PropertyDescriptor descriptor;
+ ASSERT(slot.slotBase());
+ if (slot.slotBase()->getOwnPropertyDescriptor(exec, propertyName, descriptor))
+ return descriptor.getterPresent() ? JSValue::encode(descriptor.getter()) : JSValue::encode(jsUndefined());
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -194,9 +202,17 @@
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> PropertySlot slot(thisObject);
</span><del>- if (thisObject->getPropertySlot(exec, propertyName, slot) && slot.isAccessor()) {
- GetterSetter* getterSetter = slot.getterSetter();
- return getterSetter->isSetterNull() ? JSValue::encode(jsUndefined()) : JSValue::encode(getterSetter->setter());
</del><ins>+ if (thisObject->getPropertySlot(exec, propertyName, slot)) {
+ if (slot.isAccessor()) {
+ GetterSetter* getterSetter = slot.getterSetter();
+ return getterSetter->isSetterNull() ? JSValue::encode(jsUndefined()) : JSValue::encode(getterSetter->setter());
+ }
+ if (slot.attributes() & CustomAccessor) {
+ PropertyDescriptor descriptor;
+ ASSERT(slot.slotBase());
+ if (slot.slotBase()->getOwnPropertyDescriptor(exec, propertyName, descriptor))
+ return descriptor.setterPresent() ? JSValue::encode(descriptor.setter()) : JSValue::encode(jsUndefined());
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span></span></pre>
</div>
</div>
</body>
</html>