<!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>[164426] 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/164426">164426</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-20 05:52:24 -0800 (Thu, 20 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/164422">r164422</a>.
http://trac.webkit.org/changeset/164422
https://bugs.webkit.org/show_bug.cgi?id=129102
Causes assertions in
ScriptExecutionContext::canSuspendActiveDOMObjects()
(Requested by zdobersek on #webkit).
* dom/KeyboardEvent.cpp:
(WebCore::KeyboardEvent::KeyboardEvent):
* dom/KeyboardEvent.h:
* dom/ScriptExecutionContext.cpp:
(WebCore::ScriptExecutionContext::reportException):
(WebCore::ScriptExecutionContext::publicURLManager):
* dom/ScriptExecutionContext.h:
* dom/ScriptRunner.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomKeyboardEventcpp">trunk/Source/WebCore/dom/KeyboardEvent.cpp</a></li>
<li><a href="#trunkSourceWebCoredomKeyboardEventh">trunk/Source/WebCore/dom/KeyboardEvent.h</a></li>
<li><a href="#trunkSourceWebCoredomScriptExecutionContextcpp">trunk/Source/WebCore/dom/ScriptExecutionContext.cpp</a></li>
<li><a href="#trunkSourceWebCoredomScriptExecutionContexth">trunk/Source/WebCore/dom/ScriptExecutionContext.h</a></li>
<li><a href="#trunkSourceWebCoredomScriptRunnerh">trunk/Source/WebCore/dom/ScriptRunner.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164425 => 164426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-20 12:29:53 UTC (rev 164425)
+++ trunk/Source/WebCore/ChangeLog 2014-02-20 13:52:24 UTC (rev 164426)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-02-20 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r164422.
+ http://trac.webkit.org/changeset/164422
+ https://bugs.webkit.org/show_bug.cgi?id=129102
+
+ Causes assertions in
+ ScriptExecutionContext::canSuspendActiveDOMObjects()
+ (Requested by zdobersek on #webkit).
+
+ * dom/KeyboardEvent.cpp:
+ (WebCore::KeyboardEvent::KeyboardEvent):
+ * dom/KeyboardEvent.h:
+ * dom/ScriptExecutionContext.cpp:
+ (WebCore::ScriptExecutionContext::reportException):
+ (WebCore::ScriptExecutionContext::publicURLManager):
+ * dom/ScriptExecutionContext.h:
+ * dom/ScriptRunner.h:
+
</ins><span class="cx"> 2014-02-20 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> Move to using std::unique_ptr for VisitedLinkState, CheckedRadioButtons
</span></span></pre></div>
<a id="trunkSourceWebCoredomKeyboardEventcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/KeyboardEvent.cpp (164425 => 164426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/KeyboardEvent.cpp 2014-02-20 12:29:53 UTC (rev 164425)
+++ trunk/Source/WebCore/dom/KeyboardEvent.cpp 2014-02-20 13:52:24 UTC (rev 164426)
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> KeyboardEvent::KeyboardEvent(const PlatformKeyboardEvent& key, AbstractView* view)
</span><span class="cx"> : UIEventWithKeyState(eventTypeForKeyboardEventType(key.type()),
</span><span class="cx"> true, true, key.timestamp(), view, 0, key.ctrlKey(), key.altKey(), key.shiftKey(), key.metaKey())
</span><del>- , m_keyEvent(std::make_unique<PlatformKeyboardEvent>(key))
</del><ins>+ , m_keyEvent(adoptPtr(new PlatformKeyboardEvent(key)))
</ins><span class="cx"> , m_keyIdentifier(key.keyIdentifier())
</span><span class="cx"> , m_location(keyLocationCode(key))
</span><span class="cx"> , m_altGraphKey(false)
</span></span></pre></div>
<a id="trunkSourceWebCoredomKeyboardEventh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/KeyboardEvent.h (164425 => 164426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/KeyboardEvent.h 2014-02-20 12:29:53 UTC (rev 164425)
+++ trunk/Source/WebCore/dom/KeyboardEvent.h 2014-02-20 13:52:24 UTC (rev 164426)
</span><span class="lines">@@ -25,7 +25,6 @@
</span><span class="cx"> #define KeyboardEvent_h
</span><span class="cx">
</span><span class="cx"> #include "UIEventWithKeyState.h"
</span><del>-#include <memory>
</del><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -114,7 +113,7 @@
</span><span class="cx"> KeyboardEvent(const PlatformKeyboardEvent&, AbstractView*);
</span><span class="cx"> KeyboardEvent(const AtomicString&, const KeyboardEventInit&);
</span><span class="cx">
</span><del>- std::unique_ptr<PlatformKeyboardEvent> m_keyEvent;
</del><ins>+ OwnPtr<PlatformKeyboardEvent> m_keyEvent;
</ins><span class="cx"> String m_keyIdentifier;
</span><span class="cx"> unsigned m_location;
</span><span class="cx"> bool m_altGraphKey : 1;
</span></span></pre></div>
<a id="trunkSourceWebCoredomScriptExecutionContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScriptExecutionContext.cpp (164425 => 164426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScriptExecutionContext.cpp 2014-02-20 12:29:53 UTC (rev 164425)
+++ trunk/Source/WebCore/dom/ScriptExecutionContext.cpp 2014-02-20 13:52:24 UTC (rev 164426)
</span><span class="lines">@@ -299,8 +299,8 @@
</span><span class="cx"> {
</span><span class="cx"> if (m_inDispatchErrorEvent) {
</span><span class="cx"> if (!m_pendingExceptions)
</span><del>- m_pendingExceptions = std::make_unique<Vector<std::unique_ptr<PendingException>>>();
- m_pendingExceptions->append(std::make_unique<PendingException>(errorMessage, lineNumber, columnNumber, sourceURL, callStack));
</del><ins>+ m_pendingExceptions = adoptPtr(new Vector<OwnPtr<PendingException>>());
+ m_pendingExceptions->append(adoptPtr(new PendingException(errorMessage, lineNumber, columnNumber, sourceURL, callStack)));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -311,9 +311,11 @@
</span><span class="cx"> if (!m_pendingExceptions)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- for (auto& exception : *m_pendingExceptions)
- logExceptionToConsole(exception->m_errorMessage, exception->m_sourceURL, exception->m_lineNumber, exception->m_columnNumber, exception->m_callStack);
- m_pendingExceptions.reset();
</del><ins>+ for (size_t i = 0; i < m_pendingExceptions->size(); i++) {
+ PendingException* e = m_pendingExceptions->at(i).get();
+ logExceptionToConsole(e->m_errorMessage, e->m_sourceURL, e->m_lineNumber, e->m_columnNumber, e->m_callStack);
+ }
+ m_pendingExceptions.clear();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ScriptExecutionContext::addConsoleMessage(MessageSource source, MessageLevel level, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, JSC::ExecState* state, unsigned long requestIdentifier)
</span><span class="lines">@@ -361,7 +363,7 @@
</span><span class="cx"> PublicURLManager& ScriptExecutionContext::publicURLManager()
</span><span class="cx"> {
</span><span class="cx"> if (!m_publicURLManager)
</span><del>- m_publicURLManager = std::make_unique<PublicURLManager>(this);
</del><ins>+ m_publicURLManager = PublicURLManager::create(this);
</ins><span class="cx"> return *m_publicURLManager;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoredomScriptExecutionContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScriptExecutionContext.h (164425 => 164426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScriptExecutionContext.h 2014-02-20 12:29:53 UTC (rev 164425)
+++ trunk/Source/WebCore/dom/ScriptExecutionContext.h 2014-02-20 13:52:24 UTC (rev 164426)
</span><span class="lines">@@ -208,7 +208,7 @@
</span><span class="cx">
</span><span class="cx"> bool m_inDispatchErrorEvent;
</span><span class="cx"> class PendingException;
</span><del>- std::unique_ptr<Vector<std::unique_ptr<PendingException>>> m_pendingExceptions;
</del><ins>+ OwnPtr<Vector<OwnPtr<PendingException>>> m_pendingExceptions;
</ins><span class="cx">
</span><span class="cx"> bool m_activeDOMObjectsAreSuspended;
</span><span class="cx"> ActiveDOMObject::ReasonForSuspension m_reasonForSuspendingActiveDOMObjects;
</span></span></pre></div>
<a id="trunkSourceWebCoredomScriptRunnerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScriptRunner.h (164425 => 164426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScriptRunner.h 2014-02-20 12:29:53 UTC (rev 164425)
+++ trunk/Source/WebCore/dom/ScriptRunner.h 2014-02-20 13:52:24 UTC (rev 164426)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #include "Timer.h"
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><ins>+#include <wtf/PassOwnPtr.h>
</ins><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>