<!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>[166943] trunk/Source/WebCore</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/166943">166943</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2014-04-08 12:12:37 -0700 (Tue, 08 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Refactor to make JSMainThreadExecState's constructor and destructor private.
<https://webkit.org/b/131372>
Reviewed by Mark Hahnenberg.
This is in preparation for subsequent patches to ensure that we don't
exit the VM with an exception still pending.
No new tests required. This is only a refactor of existing behavior.
* bindings/js/JSDOMGlobalObjectTask.cpp:
* bindings/js/JSMainThreadExecState.h:
(WebCore::JSMainThreadExecState::runTask):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMGlobalObjectTaskcpp">trunk/Source/WebCore/bindings/js/JSDOMGlobalObjectTask.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSMainThreadExecStateh">trunk/Source/WebCore/bindings/js/JSMainThreadExecState.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166942 => 166943)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-08 19:07:06 UTC (rev 166942)
+++ trunk/Source/WebCore/ChangeLog 2014-04-08 19:12:37 UTC (rev 166943)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-04-08 Mark Lam <mark.lam@apple.com>
+
+ Refactor to make JSMainThreadExecState's constructor and destructor private.
+ <https://webkit.org/b/131372>
+
+ Reviewed by Mark Hahnenberg.
+
+ This is in preparation for subsequent patches to ensure that we don't
+ exit the VM with an exception still pending.
+
+ No new tests required. This is only a refactor of existing behavior.
+
+ * bindings/js/JSDOMGlobalObjectTask.cpp:
+ * bindings/js/JSMainThreadExecState.h:
+ (WebCore::JSMainThreadExecState::runTask):
+
</ins><span class="cx"> 2014-04-07 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> [WK2][iOS] Consecutive videos in full screen display only black
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMGlobalObjectTaskcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMGlobalObjectTask.cpp (166942 => 166943)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMGlobalObjectTask.cpp 2014-04-08 19:07:06 UTC (rev 166942)
+++ trunk/Source/WebCore/bindings/js/JSDOMGlobalObjectTask.cpp 2014-04-08 19:12:37 UTC (rev 166943)
</span><span class="lines">@@ -60,11 +60,10 @@
</span><span class="cx">
</span><span class="cx"> // When on the main thread (e.g. the document's thread), we need to make sure to
</span><span class="cx"> // push the current ExecState on to the JSMainThreadExecState stack.
</span><del>- if (context->isDocument()) {
- JSMainThreadExecState currentState(exec);
</del><ins>+ if (context->isDocument())
+ JSMainThreadExecState::runTask(exec, *m_task.get());
+ else
</ins><span class="cx"> m_task->run(exec);
</span><del>- } else
- m_task->run(exec);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSMainThreadExecStateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSMainThreadExecState.h (166942 => 166943)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSMainThreadExecState.h 2014-04-08 19:07:06 UTC (rev 166942)
+++ trunk/Source/WebCore/bindings/js/JSMainThreadExecState.h 2014-04-08 19:12:37 UTC (rev 166943)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "JSDOMBinding.h"
</span><span class="cx"> #include <runtime/Completion.h>
</span><ins>+#include <runtime/Microtask.h>
</ins><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="lines">@@ -62,8 +63,15 @@
</span><span class="cx"> return JSC::evaluate(exec, source, thisValue, exception);
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+ static void runTask(JSC::ExecState* exec, JSC::Microtask& task)
+ {
+ JSMainThreadExecState currentState(exec);
+ task.run(exec);
+ }
+
</ins><span class="cx"> static InspectorInstrumentationCookie instrumentFunctionCall(ScriptExecutionContext*, JSC::CallType, const JSC::CallData&);
</span><span class="cx">
</span><ins>+private:
</ins><span class="cx"> explicit JSMainThreadExecState(JSC::ExecState* exec)
</span><span class="cx"> : m_previousState(s_mainThreadState)
</span><span class="cx"> {
</span><span class="lines">@@ -83,7 +91,6 @@
</span><span class="cx"> didLeaveScriptContext();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-private:
</del><span class="cx"> static JSC::ExecState* s_mainThreadState;
</span><span class="cx"> JSC::ExecState* m_previousState;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>