<!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>[175706] 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/175706">175706</a></dd>
<dt>Author</dt> <dd>msaboff@apple.com</dd>
<dt>Date</dt> <dd>2014-11-06 11:47:17 -0800 (Thu, 06 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/174985">r174985</a>-174986): Site display disappears
https://bugs.webkit.org/show_bug.cgi?id=138082
Reviewed by Geoffrey Garen.
Source/JavaScriptCore:
In support of the change in WebCore, this adds a new functor class to unwind to our
caller's frame possibly skipping of intermediate C++ frames.
* interpreter/StackVisitor.h:
(JSC::CallerFunctor::CallerFunctor):
(JSC::CallerFunctor::callerFrame):
(JSC::CallerFunctor::operator()):
Source/WebCore:
This effectively reverts to the behavior before <a href="http://trac.webkit.org/projects/webkit/changeset/174985">r174985</a> by using the
lexical global object of the caller's frame to find the active document.
Before <a href="http://trac.webkit.org/projects/webkit/changeset/174985">r174985</a>, native functions are invoked with the ScopeShain of their
caller. The lexical global object is accessed from the ScopeChain.
* bindings/js/JSHTMLDocumentCustom.cpp:
(WebCore::JSHTMLDocument::getOwnPropertySlot):
(WebCore::findOwningDocument):
(WebCore::documentWrite):
(WebCore::JSHTMLDocument::write):
(WebCore::JSHTMLDocument::writeln):
* html/HTMLDocument.idl:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinterpreterStackVisitorh">trunk/Source/JavaScriptCore/interpreter/StackVisitor.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSHTMLDocumentCustomcpp">trunk/Source/WebCore/bindings/js/JSHTMLDocumentCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLDocumentidl">trunk/Source/WebCore/html/HTMLDocument.idl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (175705 => 175706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-11-06 19:38:51 UTC (rev 175705)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-11-06 19:47:17 UTC (rev 175706)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-11-06 Michael Saboff <msaboff@apple.com>
+
+ REGRESSION (r174985-174986): Site display disappears
+ https://bugs.webkit.org/show_bug.cgi?id=138082
+
+ Reviewed by Geoffrey Garen.
+
+ In support of the change in WebCore, this adds a new functor class to unwind to our
+ caller's frame possibly skipping of intermediate C++ frames.
+
+ * interpreter/StackVisitor.h:
+ (JSC::CallerFunctor::CallerFunctor):
+ (JSC::CallerFunctor::callerFrame):
+ (JSC::CallerFunctor::operator()):
+
</ins><span class="cx"> 2014-11-06 Gyuyoung Kim <gyuyoung.kim@samsung.com>
</span><span class="cx">
</span><span class="cx"> Use std::unique_ptr in CodeBlock class
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinterpreterStackVisitorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/interpreter/StackVisitor.h (175705 => 175706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/interpreter/StackVisitor.h 2014-11-06 19:38:51 UTC (rev 175705)
+++ trunk/Source/JavaScriptCore/interpreter/StackVisitor.h 2014-11-06 19:47:17 UTC (rev 175706)
</span><span class="lines">@@ -150,6 +150,32 @@
</span><span class="cx"> Frame m_frame;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+class CallerFunctor {
+public:
+ CallerFunctor()
+ : m_hasSkippedFirstFrame(false)
+ , m_callerFrame(0)
+ {
+ }
+
+ CallFrame* callerFrame() const { return m_callerFrame; }
+
+ StackVisitor::Status operator()(StackVisitor& visitor)
+ {
+ if (!m_hasSkippedFirstFrame) {
+ m_hasSkippedFirstFrame = true;
+ return StackVisitor::Continue;
+ }
+
+ m_callerFrame = visitor->callFrame();
+ return StackVisitor::Done;
+ }
+
+private:
+ bool m_hasSkippedFirstFrame;
+ CallFrame* m_callerFrame;
+};
+
</ins><span class="cx"> } // namespace JSC
</span><span class="cx">
</span><span class="cx"> #endif // StackVisitor_h
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (175705 => 175706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-11-06 19:38:51 UTC (rev 175705)
+++ trunk/Source/WebCore/ChangeLog 2014-11-06 19:47:17 UTC (rev 175706)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-11-06 Michael Saboff <msaboff@apple.com>
+
+ REGRESSION (r174985-174986): Site display disappears
+ https://bugs.webkit.org/show_bug.cgi?id=138082
+
+ Reviewed by Geoffrey Garen.
+
+ This effectively reverts to the behavior before r174985 by using the
+ lexical global object of the caller's frame to find the active document.
+ Before r174985, native functions are invoked with the ScopeShain of their
+ caller. The lexical global object is accessed from the ScopeChain.
+
+ * bindings/js/JSHTMLDocumentCustom.cpp:
+ (WebCore::JSHTMLDocument::getOwnPropertySlot):
+ (WebCore::findOwningDocument):
+ (WebCore::documentWrite):
+ (WebCore::JSHTMLDocument::write):
+ (WebCore::JSHTMLDocument::writeln):
+ * html/HTMLDocument.idl:
+
</ins><span class="cx"> 2014-11-05 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Use std::unique_ptr for TileController
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSHTMLDocumentCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSHTMLDocumentCustom.cpp (175705 => 175706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSHTMLDocumentCustom.cpp 2014-11-06 19:38:51 UTC (rev 175705)
+++ trunk/Source/WebCore/bindings/js/JSHTMLDocumentCustom.cpp 2014-11-06 19:47:17 UTC (rev 175706)
</span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx"> #include "JSMainThreadExecState.h"
</span><span class="cx"> #include "SegmentedString.h"
</span><span class="cx"> #include "DocumentParser.h"
</span><ins>+#include <interpreter/StackVisitor.h>
</ins><span class="cx"> #include <runtime/Error.h>
</span><span class="cx"> #include <runtime/JSCell.h>
</span><span class="cx"> #include <wtf/unicode/CharacterNames.h>
</span><span class="lines">@@ -66,14 +67,6 @@
</span><span class="cx"> slot.setCustom(thisObject, ReadOnly | DontDelete | DontEnum, nonCachingStaticFunctionGetter<jsHTMLDocumentPrototypeFunctionOpen, 2>);
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><del>- if (propertyName == "write") {
- slot.setCustom(thisObject, ReadOnly | DontDelete | DontEnum, nonCachingStaticFunctionGetter<jsHTMLDocumentPrototypeFunctionWrite, 1>);
- return true;
- }
- if (propertyName == "writeln") {
- slot.setCustom(thisObject, ReadOnly | DontDelete | DontEnum, nonCachingStaticFunctionGetter<jsHTMLDocumentPrototypeFunctionWriteln, 1>);
- return true;
- }
</del><span class="cx">
</span><span class="cx"> if (canGetItemsForName(exec, &thisObject->impl(), propertyName)) {
</span><span class="cx"> slot.setCustom(thisObject, ReadOnly | DontDelete | DontEnum, thisObject->nameGetter);
</span><span class="lines">@@ -130,6 +123,17 @@
</span><span class="cx"> putDirect(exec->vm(), Identifier(exec, "all"), value);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static Document* findCallingDocument(ExecState* exec)
+{
+ CallerFunctor functor;
+ exec->iterate(functor);
+ CallFrame* callerFrame = functor.callerFrame();
+ if (!callerFrame)
+ return nullptr;
+
+ return asJSDOMWindow(functor.callerFrame()->lexicalGlobalObject())->impl().document();
+}
+
</ins><span class="cx"> // Custom functions
</span><span class="cx">
</span><span class="cx"> JSValue JSHTMLDocument::open(ExecState* exec)
</span><span class="lines">@@ -161,8 +165,9 @@
</span><span class="cx">
</span><span class="cx"> enum NewlineRequirement { DoNotAddNewline, DoAddNewline };
</span><span class="cx">
</span><del>-static inline void documentWrite(ExecState* exec, HTMLDocument* document, NewlineRequirement addNewline)
</del><ins>+static inline void documentWrite(ExecState* exec, JSHTMLDocument* thisDocument, NewlineRequirement addNewline)
</ins><span class="cx"> {
</span><ins>+ HTMLDocument* document = &thisDocument->impl();
</ins><span class="cx"> // DOM only specifies single string argument, but browsers allow multiple or no arguments.
</span><span class="cx">
</span><span class="cx"> size_t size = exec->argumentCount();
</span><span class="lines">@@ -182,19 +187,19 @@
</span><span class="cx"> if (addNewline)
</span><span class="cx"> segmentedString.append(SegmentedString(String(&newlineCharacter, 1)));
</span><span class="cx">
</span><del>- Document* activeDocument = asJSDOMWindow(exec->lexicalGlobalObject())->impl().document();
</del><ins>+ Document* activeDocument = findCallingDocument(exec);
</ins><span class="cx"> document->write(segmentedString, activeDocument);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSValue JSHTMLDocument::write(ExecState* exec)
</span><span class="cx"> {
</span><del>- documentWrite(exec, &impl(), DoNotAddNewline);
</del><ins>+ documentWrite(exec, this, DoNotAddNewline);
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSValue JSHTMLDocument::writeln(ExecState* exec)
</span><span class="cx"> {
</span><del>- documentWrite(exec, &impl(), DoAddNewline);
</del><ins>+ documentWrite(exec, this, DoAddNewline);
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLDocumentidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLDocument.idl (175705 => 175706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLDocument.idl 2014-11-06 19:38:51 UTC (rev 175705)
+++ trunk/Source/WebCore/html/HTMLDocument.idl 2014-11-06 19:47:17 UTC (rev 175706)
</span><span class="lines">@@ -25,8 +25,8 @@
</span><span class="cx"> ] interface HTMLDocument : Document {
</span><span class="cx"> [Custom, ForwardDeclareInHeader] void open();
</span><span class="cx"> void close();
</span><del>- [Custom, ForwardDeclareInHeader] void write([Default=Undefined] optional DOMString text);
- [Custom, ForwardDeclareInHeader] void writeln([Default=Undefined] optional DOMString text);
</del><ins>+ [Custom] void write([Default=Undefined] optional DOMString text);
+ [Custom] void writeln([Default=Undefined] optional DOMString text);
</ins><span class="cx">
</span><span class="cx"> readonly attribute HTMLCollection embeds;
</span><span class="cx"> readonly attribute HTMLCollection plugins;
</span></span></pre>
</div>
</div>
</body>
</html>