<!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>[199742] trunk</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/199742">199742</a></dd>
<dt>Author</dt> <dd>keith_miller@apple.com</dd>
<dt>Date</dt> <dd>2016-04-19 14:02:15 -0700 (Tue, 19 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>ObjcInstance::stringValue should not call NSObject's description method
https://bugs.webkit.org/show_bug.cgi?id=156758
Reviewed by Geoffrey Garen.
Source/WebCore:
This patch makes it so that we no longer call NSObject's description method without first
swizzling the implementation for WebScriptObjects. We restore the incomming NSObject's
description method once we have finished generating the string.
Test: platform/mac/fast/objc/webScriptObject-does-not-call-description-on-nsobject.html
* bridge/objc/objc_instance.mm:
(swizzleNSObjectDescription):
(ObjcInstance::stringValue):
Tools:
Add new methods to ObjCController that expose two Types of WebScriptObjects. The first is
an NSObject and the second is an NSArray of NSObjects. These are used to test that we don't
call the NSObjects description method without first swizzling it.
* DumpRenderTree/mac/ObjCController.m:
(+[ObjCController isSelectorExcludedFromWebScript:]):
(+[ObjCController webScriptNameForSelector:]):
(-[ObjCController testArrayOfObjects]):
(-[ObjCController testObject]):
LayoutTests:
Test that we don't use the NSObject's description method when stringifying a WebScriptObject.
* platform/mac/fast/objc/webScriptObject-does-not-call-description-on-nsobject-expected.txt: Added.
* platform/mac/fast/objc/webScriptObject-does-not-call-description-on-nsobject.html: Added.
* platform/wk2/TestExpectations:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformwk2TestExpectations">trunk/LayoutTests/platform/wk2/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebridgeobjcobjc_instancemm">trunk/Source/WebCore/bridge/objc/objc_instance.mm</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreemacObjCControllerm">trunk/Tools/DumpRenderTree/mac/ObjCController.m</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsplatformmacfastobjcwebScriptObjectdoesnotcalldescriptiononnsobjectexpectedtxt">trunk/LayoutTests/platform/mac/fast/objc/webScriptObject-does-not-call-description-on-nsobject-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastobjcwebScriptObjectdoesnotcalldescriptiononnsobjecthtml">trunk/LayoutTests/platform/mac/fast/objc/webScriptObject-does-not-call-description-on-nsobject.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (199741 => 199742)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-04-19 20:25:36 UTC (rev 199741)
+++ trunk/LayoutTests/ChangeLog 2016-04-19 21:02:15 UTC (rev 199742)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-04-19 Keith Miller <keith_miller@apple.com>
+
+ ObjcInstance::stringValue should not call NSObject's description method
+ https://bugs.webkit.org/show_bug.cgi?id=156758
+
+ Reviewed by Geoffrey Garen.
+
+ Test that we don't use the NSObject's description method when stringifying a WebScriptObject.
+
+ * platform/mac/fast/objc/webScriptObject-does-not-call-description-on-nsobject-expected.txt: Added.
+ * platform/mac/fast/objc/webScriptObject-does-not-call-description-on-nsobject.html: Added.
+ * platform/wk2/TestExpectations:
+
</ins><span class="cx"> 2016-04-19 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Update ANGLE
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastobjcwebScriptObjectdoesnotcalldescriptiononnsobjectexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/fast/objc/webScriptObject-does-not-call-description-on-nsobject-expected.txt (0 => 199742)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/objc/webScriptObject-does-not-call-description-on-nsobject-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac/fast/objc/webScriptObject-does-not-call-description-on-nsobject-expected.txt 2016-04-19 21:02:15 UTC (rev 199742)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastobjcwebScriptObjectdoesnotcalldescriptiononnsobjecthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/fast/objc/webScriptObject-does-not-call-description-on-nsobject.html (0 => 199742)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/objc/webScriptObject-does-not-call-description-on-nsobject.html (rev 0)
+++ trunk/LayoutTests/platform/mac/fast/objc/webScriptObject-does-not-call-description-on-nsobject.html 2016-04-19 21:02:15 UTC (rev 199742)
</span><span class="lines">@@ -0,0 +1,22 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../../../../resources/js-test-pre.js"></script>
+</head>
+<body>
+<p id="description"></p>
+<div id="console"></div>
+<script>
+
+var obj = objCController.testObject();
+if (/: 0x[0-9|a-f]*/.test(obj + ""))
+ throw "bad";
+
+var array = objCController.testArrayOfObjects();
+if (/: 0x[0-9|a-f]*/.test(obj + ""))
+ throw "bad";
+
+</script>
+<script src="../../../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformwk2TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/wk2/TestExpectations (199741 => 199742)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/wk2/TestExpectations 2016-04-19 20:25:36 UTC (rev 199741)
+++ trunk/LayoutTests/platform/wk2/TestExpectations 2016-04-19 21:02:15 UTC (rev 199742)
</span><span class="lines">@@ -597,6 +597,7 @@
</span><span class="cx"> platform/mac/fast/objc/dom-html-select-live-pseudo-selectors.html
</span><span class="cx"> platform/mac/fast/objc/longlongTest.html
</span><span class="cx"> platform/mac/fast/objc/webScriptObject-hasWebScriptKey.html
</span><ins>+platform/mac/fast/objc/webScriptObject-does-not-call-description-on-nsobject.html
</ins><span class="cx"> platform/mac/plugins/bindings-array-apply-crash.html
</span><span class="cx"> platform/mac/plugins/bindings-objc-long-method-name.html
</span><span class="cx"> platform/mac/plugins/bindings-objc-method-name-conversion.html
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (199741 => 199742)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-19 20:25:36 UTC (rev 199741)
+++ trunk/Source/WebCore/ChangeLog 2016-04-19 21:02:15 UTC (rev 199742)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-04-19 Keith Miller <keith_miller@apple.com>
+
+ ObjcInstance::stringValue should not call NSObject's description method
+ https://bugs.webkit.org/show_bug.cgi?id=156758
+
+ Reviewed by Geoffrey Garen.
+
+ This patch makes it so that we no longer call NSObject's description method without first
+ swizzling the implementation for WebScriptObjects. We restore the incomming NSObject's
+ description method once we have finished generating the string.
+
+ Test: platform/mac/fast/objc/webScriptObject-does-not-call-description-on-nsobject.html
+
+ * bridge/objc/objc_instance.mm:
+ (swizzleNSObjectDescription):
+ (ObjcInstance::stringValue):
+
</ins><span class="cx"> 2016-04-19 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Update ANGLE
</span></span></pre></div>
<a id="trunkSourceWebCorebridgeobjcobjc_instancemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bridge/objc/objc_instance.mm (199741 => 199742)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bridge/objc/objc_instance.mm 2016-04-19 20:25:36 UTC (rev 199741)
+++ trunk/Source/WebCore/bridge/objc/objc_instance.mm 2016-04-19 21:02:15 UTC (rev 199742)
</span><span class="lines">@@ -459,9 +459,18 @@
</span><span class="cx"> return valueOf(exec);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static NSString* swizzleNSObjectDescription(id self, SEL)
+{
+ return [NSString stringWithFormat:@"%@%@%@", @"<", NSStringFromClass([self class]), @">"];
+}
+
</ins><span class="cx"> JSC::JSValue ObjcInstance::stringValue(ExecState* exec) const
</span><span class="cx"> {
</span><del>- return convertNSStringToString(exec, [getObject() description]);
</del><ins>+ auto method = class_getInstanceMethod([NSObject class], @selector(description));
+ IMP originalNSObjectDescription = method_setImplementation(method, (IMP)swizzleNSObjectDescription);
+ JSC::JSValue result = convertNSStringToString(exec, [getObject() description]);
+ method_setImplementation(method, originalNSObjectDescription);
+ return result;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSC::JSValue ObjcInstance::numberValue(ExecState*) const
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (199741 => 199742)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-04-19 20:25:36 UTC (rev 199741)
+++ trunk/Tools/ChangeLog 2016-04-19 21:02:15 UTC (rev 199742)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-04-19 Keith Miller <keith_miller@apple.com>
+
+ ObjcInstance::stringValue should not call NSObject's description method
+ https://bugs.webkit.org/show_bug.cgi?id=156758
+
+ Reviewed by Geoffrey Garen.
+
+ Add new methods to ObjCController that expose two Types of WebScriptObjects. The first is
+ an NSObject and the second is an NSArray of NSObjects. These are used to test that we don't
+ call the NSObjects description method without first swizzling it.
+
+ * DumpRenderTree/mac/ObjCController.m:
+ (+[ObjCController isSelectorExcludedFromWebScript:]):
+ (+[ObjCController webScriptNameForSelector:]):
+ (-[ObjCController testArrayOfObjects]):
+ (-[ObjCController testObject]):
+
</ins><span class="cx"> 2016-04-18 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> Fixed building with old Xcode.
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacObjCControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/ObjCController.m (199741 => 199742)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/ObjCController.m 2016-04-19 20:25:36 UTC (rev 199741)
+++ trunk/Tools/DumpRenderTree/mac/ObjCController.m 2016-04-19 21:02:15 UTC (rev 199742)
</span><span class="lines">@@ -78,6 +78,8 @@
</span><span class="cx"> || aSelector == @selector(testValueForKey)
</span><span class="cx"> || aSelector == @selector(testHasWebScriptKey:)
</span><span class="cx"> || aSelector == @selector(testArray)
</span><ins>+ || aSelector == @selector(testArrayOfObjects)
+ || aSelector == @selector(testObject)
</ins><span class="cx"> || aSelector == @selector(setSelectElement:selectedIndex:allowingMultiple:)
</span><span class="cx"> )
</span><span class="cx"> return NO;
</span><span class="lines">@@ -110,6 +112,10 @@
</span><span class="cx"> return @"testHasWebScriptKey";
</span><span class="cx"> if (aSelector == @selector(testArray))
</span><span class="cx"> return @"testArray";
</span><ins>+ if (aSelector == @selector(testArrayOfObjects))
+ return @"testArrayOfObjects";
+ if (aSelector == @selector(testObject))
+ return @"testObject";
</ins><span class="cx"> if (aSelector == @selector(setSelectElement:selectedIndex:allowingMultiple:))
</span><span class="cx"> return @"setSelectElementSelectedIndexAllowingMultiple";
</span><span class="cx">
</span><span class="lines">@@ -269,6 +275,16 @@
</span><span class="cx"> return [NSArray array];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (NSArray *)testArrayOfObjects
+{
+ return @[ [[[NSObject alloc] init] autorelease], [[[NSObject alloc] init] autorelease], [[[NSObject alloc] init] autorelease]];
+}
+
+- (NSObject *)testObject
+{
+ return [[[NSObject alloc] init] autorelease];
+}
+
</ins><span class="cx"> - (void)dealloc
</span><span class="cx"> {
</span><span class="cx"> [storedWebScriptObject release];
</span></span></pre>
</div>
</div>
</body>
</html>