<!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>[164245] 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/164245">164245</a></dd>
<dt>Author</dt> <dd>sergio.correia@openbossa.org</dd>
<dt>Date</dt> <dd>2014-02-17 12:35:05 -0800 (Mon, 17 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Replace uses of PassOwnPtr/OwnPtr with std::unique_ptr in WebCore/inspector
https://bugs.webkit.org/show_bug.cgi?id=128681
Reviewed by Timothy Hatcher.
Another step towards getting rid of PassOwnPtr/OwnPtr, now targeting
WebCore/inspector/*. Besides files in there, a few other files in
JavaScriptCore/inspector, WebKit/, WebKit2/WebProcess/WebCoreSupport/
and WebCore/testing were touched.
Source/JavaScriptCore:
* inspector/ContentSearchUtilities.cpp:
* inspector/ContentSearchUtilities.h:
* inspector/agents/InspectorConsoleAgent.cpp:
* inspector/agents/InspectorConsoleAgent.h:
Source/WebCore:
No new tests; no new behavior.
* WebCore.exp.in:
* inspector/CommandLineAPIHost.cpp:
* inspector/CommandLineAPIHost.h:
* inspector/DOMEditor.cpp:
* inspector/DOMPatchSupport.cpp:
* inspector/DOMPatchSupport.h:
* inspector/InspectorApplicationCacheAgent.h:
* inspector/InspectorCSSAgent.cpp:
* inspector/InspectorCSSAgent.h:
* inspector/InspectorCanvasAgent.h:
* inspector/InspectorDOMAgent.cpp:
* inspector/InspectorDOMAgent.h:
* inspector/InspectorDOMDebuggerAgent.h:
* inspector/InspectorDOMStorageAgent.h:
* inspector/InspectorDatabaseAgent.h:
* inspector/InspectorFrontendClientLocal.cpp:
* inspector/InspectorFrontendClientLocal.h:
* inspector/InspectorHeapProfilerAgent.h:
* inspector/InspectorHistory.cpp:
* inspector/InspectorHistory.h:
* inspector/InspectorIndexedDBAgent.h:
* inspector/InspectorInputAgent.h:
* inspector/InspectorLayerTreeAgent.h:
* inspector/InspectorMemoryAgent.cpp:
* inspector/InspectorMemoryAgent.h:
* inspector/InspectorOverlay.cpp:
* inspector/InspectorOverlay.h:
* inspector/InspectorProfilerAgent.cpp:
* inspector/InspectorProfilerAgent.h:
* inspector/InspectorResourceAgent.cpp:
* inspector/InspectorResourceAgent.h:
* inspector/InspectorStyleSheet.cpp:
* inspector/InspectorStyleSheet.h:
* inspector/InspectorTimelineAgent.h:
* inspector/InspectorWorkerAgent.cpp:
* inspector/PageConsoleAgent.cpp:
* inspector/PageRuntimeAgent.h:
* inspector/WebConsoleAgent.cpp:
* inspector/WorkerRuntimeAgent.h:
* testing/Internals.cpp:
Source/WebKit:
* WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in:
Source/WebKit/cf:
* WebCoreSupport/WebInspectorClientCF.cpp:
Source/WebKit/efl:
* WebCoreSupport/InspectorClientEfl.cpp:
Source/WebKit/gtk:
* WebCoreSupport/InspectorClientGtk.cpp:
Source/WebKit/ios:
* WebCoreSupport/WebInspectorClientIOS.mm:
Source/WebKit/mac:
* WebCoreSupport/WebInspectorClient.h:
* WebCoreSupport/WebInspectorClient.mm:
Source/WebKit/win:
* WebCoreSupport/WebInspectorClient.cpp:
* WebCoreSupport/WebInspectorClient.h:
Source/WebKit2:
* WebProcess/WebCoreSupport/WebInspectorFrontendClient.cpp:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorContentSearchUtilitiescpp">trunk/Source/JavaScriptCore/inspector/ContentSearchUtilities.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorContentSearchUtilitiesh">trunk/Source/JavaScriptCore/inspector/ContentSearchUtilities.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorConsoleAgentcpp">trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorConsoleAgenth">trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCoreinspectorCommandLineAPIHostcpp">trunk/Source/WebCore/inspector/CommandLineAPIHost.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorCommandLineAPIHosth">trunk/Source/WebCore/inspector/CommandLineAPIHost.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorDOMEditorcpp">trunk/Source/WebCore/inspector/DOMEditor.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorDOMPatchSupportcpp">trunk/Source/WebCore/inspector/DOMPatchSupport.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorDOMPatchSupporth">trunk/Source/WebCore/inspector/DOMPatchSupport.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorApplicationCacheAgenth">trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorCSSAgentcpp">trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorCSSAgenth">trunk/Source/WebCore/inspector/InspectorCSSAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorCanvasAgenth">trunk/Source/WebCore/inspector/InspectorCanvasAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDOMAgentcpp">trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDOMAgenth">trunk/Source/WebCore/inspector/InspectorDOMAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDOMDebuggerAgenth">trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDOMStorageAgenth">trunk/Source/WebCore/inspector/InspectorDOMStorageAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDatabaseAgenth">trunk/Source/WebCore/inspector/InspectorDatabaseAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorFrontendClientLocalcpp">trunk/Source/WebCore/inspector/InspectorFrontendClientLocal.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorFrontendClientLocalh">trunk/Source/WebCore/inspector/InspectorFrontendClientLocal.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorHeapProfilerAgenth">trunk/Source/WebCore/inspector/InspectorHeapProfilerAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorHistorycpp">trunk/Source/WebCore/inspector/InspectorHistory.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorHistoryh">trunk/Source/WebCore/inspector/InspectorHistory.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorIndexedDBAgenth">trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorInputAgenth">trunk/Source/WebCore/inspector/InspectorInputAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorLayerTreeAgenth">trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorMemoryAgentcpp">trunk/Source/WebCore/inspector/InspectorMemoryAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorMemoryAgenth">trunk/Source/WebCore/inspector/InspectorMemoryAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorOverlaycpp">trunk/Source/WebCore/inspector/InspectorOverlay.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorOverlayh">trunk/Source/WebCore/inspector/InspectorOverlay.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorProfilerAgentcpp">trunk/Source/WebCore/inspector/InspectorProfilerAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorProfilerAgenth">trunk/Source/WebCore/inspector/InspectorProfilerAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorResourceAgentcpp">trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorResourceAgenth">trunk/Source/WebCore/inspector/InspectorResourceAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorStyleSheetcpp">trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorStyleSheeth">trunk/Source/WebCore/inspector/InspectorStyleSheet.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorTimelineAgenth">trunk/Source/WebCore/inspector/InspectorTimelineAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorWorkerAgentcpp">trunk/Source/WebCore/inspector/InspectorWorkerAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorPageConsoleAgentcpp">trunk/Source/WebCore/inspector/PageConsoleAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorPageRuntimeAgenth">trunk/Source/WebCore/inspector/PageRuntimeAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorWebConsoleAgentcpp">trunk/Source/WebCore/inspector/WebConsoleAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorWorkerRuntimeAgenth">trunk/Source/WebCore/inspector/WorkerRuntimeAgent.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitWebKitvcxprojWebKitExportGeneratorWebKitExportsdefin">trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in</a></li>
<li><a href="#trunkSourceWebKitcfChangeLog">trunk/Source/WebKit/cf/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitcfWebCoreSupportWebInspectorClientCFcpp">trunk/Source/WebKit/cf/WebCoreSupport/WebInspectorClientCF.cpp</a></li>
<li><a href="#trunkSourceWebKiteflChangeLog">trunk/Source/WebKit/efl/ChangeLog</a></li>
<li><a href="#trunkSourceWebKiteflWebCoreSupportInspectorClientEflcpp">trunk/Source/WebKit/efl/WebCoreSupport/InspectorClientEfl.cpp</a></li>
<li><a href="#trunkSourceWebKitgtkChangeLog">trunk/Source/WebKit/gtk/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitgtkWebCoreSupportInspectorClientGtkcpp">trunk/Source/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp</a></li>
<li><a href="#trunkSourceWebKitiosChangeLog">trunk/Source/WebKit/ios/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitiosWebCoreSupportWebInspectorClientIOSmm">trunk/Source/WebKit/ios/WebCoreSupport/WebInspectorClientIOS.mm</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebInspectorClienth">trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.h</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebInspectorClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebInspectorClientcpp">trunk/Source/WebKit/win/WebCoreSupport/WebInspectorClient.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebInspectorClienth">trunk/Source/WebKit/win/WebCoreSupport/WebInspectorClient.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebInspectorFrontendClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebInspectorFrontendClient.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-02-17 Sergio Correia <sergio.correia@openbossa.org>
+
+ Replace uses of PassOwnPtr/OwnPtr with std::unique_ptr in WebCore/inspector
+ https://bugs.webkit.org/show_bug.cgi?id=128681
+
+ Reviewed by Timothy Hatcher.
+
+ Another step towards getting rid of PassOwnPtr/OwnPtr, now targeting
+ WebCore/inspector/*. Besides files in there, a few other files in
+ JavaScriptCore/inspector, WebKit/, WebKit2/WebProcess/WebCoreSupport/
+ and WebCore/testing were touched.
+
+
+ * inspector/ContentSearchUtilities.cpp:
+ * inspector/ContentSearchUtilities.h:
+ * inspector/agents/InspectorConsoleAgent.cpp:
+ * inspector/agents/InspectorConsoleAgent.h:
+
</ins><span class="cx"> 2014-02-17 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> FTL should support ToPrimitive and the DFG should fold it correctly
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorContentSearchUtilitiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/ContentSearchUtilities.cpp (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/ContentSearchUtilities.cpp 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/JavaScriptCore/inspector/ContentSearchUtilities.cpp 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> if (text.isEmpty())
</span><span class="cx"> return result;
</span><span class="cx">
</span><del>- OwnPtr<Vector<size_t>> endings(lineEndings(text));
</del><ins>+ std::unique_ptr<Vector<size_t>> endings(lineEndings(text));
</ins><span class="cx"> size_t size = endings->size();
</span><span class="cx"> unsigned start = 0;
</span><span class="cx"> for (size_t lineNumber = 0; lineNumber < size; ++lineNumber) {
</span><span class="lines">@@ -100,9 +100,9 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassOwnPtr<Vector<size_t>> lineEndings(const String& text)
</del><ins>+std::unique_ptr<Vector<size_t>> lineEndings(const String& text)
</ins><span class="cx"> {
</span><del>- OwnPtr<Vector<size_t>> result(adoptPtr(new Vector<size_t>()));
</del><ins>+ auto result = std::make_unique<Vector<size_t>>();
</ins><span class="cx">
</span><span class="cx"> unsigned start = 0;
</span><span class="cx"> while (start < text.length()) {
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx"> }
</span><span class="cx"> result->append(text.length());
</span><span class="cx">
</span><del>- return result.release();
</del><ins>+ return result;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static PassRefPtr<Inspector::TypeBuilder::GenericTypes::SearchMatch> buildObjectForSearchMatch(int lineNumber, const String& lineContent)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorContentSearchUtilitiesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/ContentSearchUtilities.h (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/ContentSearchUtilities.h 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/JavaScriptCore/inspector/ContentSearchUtilities.h 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> JS_EXPORT_PRIVATE int countRegularExpressionMatches(const JSC::Yarr::RegularExpression&, const String&);
</span><span class="cx"> JS_EXPORT_PRIVATE PassRefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::GenericTypes::SearchMatch>> searchInTextByLines(const String& text, const String& query, const bool caseSensitive, const bool isRegex);
</span><span class="cx"> JS_EXPORT_PRIVATE TextPosition textPositionFromOffset(size_t offset, const Vector<size_t>& lineEndings);
</span><del>-JS_EXPORT_PRIVATE PassOwnPtr<Vector<size_t>> lineEndings(const String&);
</del><ins>+JS_EXPORT_PRIVATE std::unique_ptr<Vector<size_t>> lineEndings(const String&);
</ins><span class="cx">
</span><span class="cx"> JS_EXPORT_PRIVATE String findScriptSourceURL(const String& content);
</span><span class="cx"> JS_EXPORT_PRIVATE String findScriptSourceMapURL(const String& content);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorConsoleAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.cpp (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.cpp 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.cpp 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -36,8 +36,6 @@
</span><span class="cx"> #include "ScriptCallStackFactory.h"
</span><span class="cx"> #include "ScriptObject.h"
</span><span class="cx"> #include <wtf/CurrentTime.h>
</span><del>-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="lines">@@ -130,7 +128,7 @@
</span><span class="cx"> clearMessages(&error);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- addConsoleMessage(adoptPtr(new ConsoleMessage(!isWorkerAgent(), source, type, level, message, callStack, requestIdentifier)));
</del><ins>+ addConsoleMessage(std::make_unique<ConsoleMessage>(!isWorkerAgent(), source, type, level, message, callStack, requestIdentifier));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorConsoleAgent::addMessageToConsole(MessageSource source, MessageType type, MessageLevel level, const String& message, JSC::ExecState* state, PassRefPtr<ScriptArguments> arguments, unsigned long requestIdentifier)
</span><span class="lines">@@ -143,7 +141,7 @@
</span><span class="cx"> clearMessages(&error);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- addConsoleMessage(adoptPtr(new ConsoleMessage(!isWorkerAgent(), source, type, level, message, arguments, state, requestIdentifier)));
</del><ins>+ addConsoleMessage(std::make_unique<ConsoleMessage>(!isWorkerAgent(), source, type, level, message, arguments, state, requestIdentifier));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorConsoleAgent::addMessageToConsole(MessageSource source, MessageType type, MessageLevel level, const String& message, const String& scriptID, unsigned lineNumber, unsigned columnNumber, JSC::ExecState* state, unsigned long requestIdentifier)
</span><span class="lines">@@ -157,7 +155,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool canGenerateCallStack = !isWorkerAgent() && m_frontendDispatcher;
</span><del>- addConsoleMessage(adoptPtr(new ConsoleMessage(canGenerateCallStack, source, type, level, message, scriptID, lineNumber, columnNumber, state, requestIdentifier)));
</del><ins>+ addConsoleMessage(std::make_unique<ConsoleMessage>(canGenerateCallStack, source, type, level, message, scriptID, lineNumber, columnNumber, state, requestIdentifier));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Vector<unsigned> InspectorConsoleAgent::consoleMessageArgumentCounts() const
</span><span class="lines">@@ -229,7 +227,7 @@
</span><span class="cx"> || type == MessageType::EndGroup;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorConsoleAgent::addConsoleMessage(PassOwnPtr<ConsoleMessage> consoleMessage)
</del><ins>+void InspectorConsoleAgent::addConsoleMessage(std::unique_ptr<ConsoleMessage> consoleMessage)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_injectedScriptManager->inspectorEnvironment().developerExtrasEnabled());
</span><span class="cx"> ASSERT_ARG(consoleMessage, consoleMessage);
</span><span class="lines">@@ -240,7 +238,7 @@
</span><span class="cx"> m_previousMessage->updateRepeatCountInConsole(m_frontendDispatcher.get());
</span><span class="cx"> } else {
</span><span class="cx"> m_previousMessage = consoleMessage.get();
</span><del>- m_consoleMessages.append(consoleMessage);
</del><ins>+ m_consoleMessages.append(std::move(consoleMessage));
</ins><span class="cx"> if (m_frontendDispatcher && m_enabled)
</span><span class="cx"> m_previousMessage->addToFrontend(m_frontendDispatcher.get(), m_injectedScriptManager, true);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorConsoleAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.h (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.h 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.h 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -83,13 +83,13 @@
</span><span class="cx"> void count(JSC::ExecState*, PassRefPtr<ScriptArguments>);
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- void addConsoleMessage(PassOwnPtr<ConsoleMessage>);
</del><ins>+ void addConsoleMessage(std::unique_ptr<ConsoleMessage>);
</ins><span class="cx">
</span><span class="cx"> InjectedScriptManager* m_injectedScriptManager;
</span><span class="cx"> std::unique_ptr<InspectorConsoleFrontendDispatcher> m_frontendDispatcher;
</span><span class="cx"> RefPtr<InspectorConsoleBackendDispatcher> m_backendDispatcher;
</span><span class="cx"> ConsoleMessage* m_previousMessage;
</span><del>- Vector<OwnPtr<ConsoleMessage>> m_consoleMessages;
</del><ins>+ Vector<std::unique_ptr<ConsoleMessage>> m_consoleMessages;
</ins><span class="cx"> int m_expiredConsoleMessageCount;
</span><span class="cx"> HashMap<String, unsigned> m_counts;
</span><span class="cx"> HashMap<String, double> m_times;
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/WebCore/ChangeLog 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -1,3 +1,58 @@
</span><ins>+2014-02-17 Sergio Correia <sergio.correia@openbossa.org>
+
+ Replace uses of PassOwnPtr/OwnPtr with std::unique_ptr in WebCore/inspector
+ https://bugs.webkit.org/show_bug.cgi?id=128681
+
+ Reviewed by Timothy Hatcher.
+
+ Another step towards getting rid of PassOwnPtr/OwnPtr, now targeting
+ WebCore/inspector/*. Besides files in there, a few other files in
+ JavaScriptCore/inspector, WebKit/, WebKit2/WebProcess/WebCoreSupport/
+ and WebCore/testing were touched.
+
+ No new tests; no new behavior.
+
+ * WebCore.exp.in:
+ * inspector/CommandLineAPIHost.cpp:
+ * inspector/CommandLineAPIHost.h:
+ * inspector/DOMEditor.cpp:
+ * inspector/DOMPatchSupport.cpp:
+ * inspector/DOMPatchSupport.h:
+ * inspector/InspectorApplicationCacheAgent.h:
+ * inspector/InspectorCSSAgent.cpp:
+ * inspector/InspectorCSSAgent.h:
+ * inspector/InspectorCanvasAgent.h:
+ * inspector/InspectorDOMAgent.cpp:
+ * inspector/InspectorDOMAgent.h:
+ * inspector/InspectorDOMDebuggerAgent.h:
+ * inspector/InspectorDOMStorageAgent.h:
+ * inspector/InspectorDatabaseAgent.h:
+ * inspector/InspectorFrontendClientLocal.cpp:
+ * inspector/InspectorFrontendClientLocal.h:
+ * inspector/InspectorHeapProfilerAgent.h:
+ * inspector/InspectorHistory.cpp:
+ * inspector/InspectorHistory.h:
+ * inspector/InspectorIndexedDBAgent.h:
+ * inspector/InspectorInputAgent.h:
+ * inspector/InspectorLayerTreeAgent.h:
+ * inspector/InspectorMemoryAgent.cpp:
+ * inspector/InspectorMemoryAgent.h:
+ * inspector/InspectorOverlay.cpp:
+ * inspector/InspectorOverlay.h:
+ * inspector/InspectorProfilerAgent.cpp:
+ * inspector/InspectorProfilerAgent.h:
+ * inspector/InspectorResourceAgent.cpp:
+ * inspector/InspectorResourceAgent.h:
+ * inspector/InspectorStyleSheet.cpp:
+ * inspector/InspectorStyleSheet.h:
+ * inspector/InspectorTimelineAgent.h:
+ * inspector/InspectorWorkerAgent.cpp:
+ * inspector/PageConsoleAgent.cpp:
+ * inspector/PageRuntimeAgent.h:
+ * inspector/WebConsoleAgent.cpp:
+ * inspector/WorkerRuntimeAgent.h:
+ * testing/Internals.cpp:
+
</ins><span class="cx"> 2014-02-17 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Rename Document::m_selfOnlyRefCount to m_referencingNodeCount
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -2833,7 +2833,7 @@
</span><span class="cx"> __ZN7WebCore28InspectorFrontendClientLocal27setTimelineProfilingEnabledEb
</span><span class="cx"> __ZN7WebCore28InspectorFrontendClientLocal30constrainedAttachedWindowWidthEjj
</span><span class="cx"> __ZN7WebCore28InspectorFrontendClientLocal31constrainedAttachedWindowHeightEjj
</span><del>-__ZN7WebCore28InspectorFrontendClientLocalC2EPNS_19InspectorControllerEPNS_4PageEN3WTF10PassOwnPtrINS0_8SettingsEEE
</del><ins>+__ZN7WebCore28InspectorFrontendClientLocalC2EPNS_19InspectorControllerEPNS_4PageENSt3__110unique_ptrINS0_8SettingsENS5_14default_deleteIS7_EEEE
</ins><span class="cx"> __ZN7WebCore28InspectorFrontendClientLocalD2Ev
</span><span class="cx"> __ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_9DOMWindowE
</span><span class="cx"> __ZN7WebCore9DOMWindow4openERKN3WTF6StringERKNS1_12AtomicStringES4_RS0_S8_
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorCommandLineAPIHostcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/CommandLineAPIHost.cpp (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/CommandLineAPIHost.cpp 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/WebCore/inspector/CommandLineAPIHost.cpp 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> , m_databaseAgent(nullptr)
</span><span class="cx"> #endif
</span><span class="cx"> {
</span><del>- m_defaultInspectableObject = adoptPtr(new InspectableObject);
</del><ins>+ m_defaultInspectableObject = std::make_unique<InspectableObject>();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CommandLineAPIHost::~CommandLineAPIHost()
</span><span class="lines">@@ -124,9 +124,9 @@
</span><span class="cx"> return Deprecated::ScriptValue();
</span><span class="cx"> };
</span><span class="cx">
</span><del>-void CommandLineAPIHost::addInspectedObject(PassOwnPtr<CommandLineAPIHost::InspectableObject> object)
</del><ins>+void CommandLineAPIHost::addInspectedObject(std::unique_ptr<CommandLineAPIHost::InspectableObject> object)
</ins><span class="cx"> {
</span><del>- m_inspectedObjects.insert(0, object);
</del><ins>+ m_inspectedObjects.insert(0, std::move(object));
</ins><span class="cx"> while (m_inspectedObjects.size() > 5)
</span><span class="cx"> m_inspectedObjects.removeLast();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorCommandLineAPIHosth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/CommandLineAPIHost.h (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/CommandLineAPIHost.h 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/WebCore/inspector/CommandLineAPIHost.h 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> virtual Deprecated::ScriptValue get(JSC::ExecState*);
</span><span class="cx"> virtual ~InspectableObject() { }
</span><span class="cx"> };
</span><del>- void addInspectedObject(PassOwnPtr<InspectableObject>);
</del><ins>+ void addInspectedObject(std::unique_ptr<InspectableObject>);
</ins><span class="cx"> void clearInspectedObjects();
</span><span class="cx"> InspectableObject* inspectedObject(unsigned index);
</span><span class="cx"> void inspectImpl(PassRefPtr<Inspector::InspectorValue> objectToInspect, PassRefPtr<Inspector::InspectorValue> hints);
</span><span class="lines">@@ -115,8 +115,8 @@
</span><span class="cx"> InspectorDatabaseAgent* m_databaseAgent;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- Vector<OwnPtr<InspectableObject>> m_inspectedObjects;
- OwnPtr<InspectableObject> m_defaultInspectableObject;
</del><ins>+ Vector<std::unique_ptr<InspectableObject>> m_inspectedObjects;
+ std::unique_ptr<InspectableObject> m_defaultInspectableObject;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorDOMEditorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/DOMEditor.cpp (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/DOMEditor.cpp 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/WebCore/inspector/DOMEditor.cpp 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> virtual bool perform(ExceptionCode& ec) override
</span><span class="cx"> {
</span><span class="cx"> if (m_node->parentNode()) {
</span><del>- m_removeChildAction = adoptPtr(new RemoveChildAction(m_node->parentNode(), m_node.get()));
</del><ins>+ m_removeChildAction = std::make_unique<RemoveChildAction>(m_node->parentNode(), m_node.get());
</ins><span class="cx"> if (!m_removeChildAction->perform(ec))
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx"> RefPtr<Node> m_parentNode;
</span><span class="cx"> RefPtr<Node> m_node;
</span><span class="cx"> RefPtr<Node> m_anchorNode;
</span><del>- OwnPtr<RemoveChildAction> m_removeChildAction;
</del><ins>+ std::unique_ptr<RemoveChildAction> m_removeChildAction;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class DOMEditor::RemoveAttributeAction : public InspectorHistory::Action {
</span><span class="lines">@@ -208,8 +208,8 @@
</span><span class="cx"> , m_nextSibling(node.nextSibling())
</span><span class="cx"> , m_html(html)
</span><span class="cx"> , m_newNode(nullptr)
</span><del>- , m_history(adoptPtr(new InspectorHistory()))
- , m_domEditor(adoptPtr(new DOMEditor(m_history.get())))
</del><ins>+ , m_history(std::make_unique<InspectorHistory>())
+ , m_domEditor(std::make_unique<DOMEditor>(m_history.get()))
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -242,8 +242,8 @@
</span><span class="cx"> String m_html;
</span><span class="cx"> String m_oldHTML;
</span><span class="cx"> Node* m_newNode;
</span><del>- OwnPtr<InspectorHistory> m_history;
- OwnPtr<DOMEditor> m_domEditor;
</del><ins>+ std::unique_ptr<InspectorHistory> m_history;
+ std::unique_ptr<DOMEditor> m_domEditor;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class DOMEditor::ReplaceWholeTextAction : public InspectorHistory::Action {
</span><span class="lines">@@ -352,29 +352,29 @@
</span><span class="cx">
</span><span class="cx"> bool DOMEditor::insertBefore(Node* parentNode, PassRefPtr<Node> node, Node* anchorNode, ExceptionCode& ec)
</span><span class="cx"> {
</span><del>- return m_history->perform(adoptPtr(new InsertBeforeAction(parentNode, node, anchorNode)), ec);
</del><ins>+ return m_history->perform(std::make_unique<InsertBeforeAction>(parentNode, node, anchorNode), ec);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool DOMEditor::removeChild(Node* parentNode, Node* node, ExceptionCode& ec)
</span><span class="cx"> {
</span><del>- return m_history->perform(adoptPtr(new RemoveChildAction(parentNode, node)), ec);
</del><ins>+ return m_history->perform(std::make_unique<RemoveChildAction>(parentNode, node), ec);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool DOMEditor::setAttribute(Element* element, const String& name, const String& value, ExceptionCode& ec)
</span><span class="cx"> {
</span><del>- return m_history->perform(adoptPtr(new SetAttributeAction(element, name, value)), ec);
</del><ins>+ return m_history->perform(std::make_unique<SetAttributeAction>(element, name, value), ec);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool DOMEditor::removeAttribute(Element* element, const String& name, ExceptionCode& ec)
</span><span class="cx"> {
</span><del>- return m_history->perform(adoptPtr(new RemoveAttributeAction(element, name)), ec);
</del><ins>+ return m_history->perform(std::make_unique<RemoveAttributeAction>(element, name), ec);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool DOMEditor::setOuterHTML(Node& node, const String& html, Node** newNode, ExceptionCode& ec)
</span><span class="cx"> {
</span><del>- OwnPtr<SetOuterHTMLAction> action = adoptPtr(new SetOuterHTMLAction(node, html));
</del><ins>+ auto action = std::make_unique<SetOuterHTMLAction>(node, html);
</ins><span class="cx"> SetOuterHTMLAction* rawAction = action.get();
</span><del>- bool result = m_history->perform(action.release(), ec);
</del><ins>+ bool result = m_history->perform(std::move(action), ec);
</ins><span class="cx"> if (result)
</span><span class="cx"> *newNode = rawAction->newNode();
</span><span class="cx"> return result;
</span><span class="lines">@@ -382,17 +382,17 @@
</span><span class="cx">
</span><span class="cx"> bool DOMEditor::replaceWholeText(Text* textNode, const String& text, ExceptionCode& ec)
</span><span class="cx"> {
</span><del>- return m_history->perform(adoptPtr(new ReplaceWholeTextAction(textNode, text)), ec);
</del><ins>+ return m_history->perform(std::make_unique<ReplaceWholeTextAction>(textNode, text), ec);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool DOMEditor::replaceChild(Node* parentNode, PassRefPtr<Node> newNode, Node* oldNode, ExceptionCode& ec)
</span><span class="cx"> {
</span><del>- return m_history->perform(adoptPtr(new ReplaceChildNodeAction(parentNode, newNode, oldNode)), ec);
</del><ins>+ return m_history->perform(std::make_unique<ReplaceChildNodeAction>(parentNode, newNode, oldNode), ec);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool DOMEditor::setNodeValue(Node* node, const String& value, ExceptionCode& ec)
</span><span class="cx"> {
</span><del>- return m_history->perform(adoptPtr(new SetNodeValueAction(node, value)), ec);
</del><ins>+ return m_history->perform(std::make_unique<SetNodeValueAction>(node, value), ec);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void populateErrorString(const ExceptionCode& ec, ErrorString* errorString)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorDOMPatchSupportcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/DOMPatchSupport.cpp (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/DOMPatchSupport.cpp 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/WebCore/inspector/DOMPatchSupport.cpp 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> String m_sha1;
</span><span class="cx"> String m_attrsSHA1;
</span><span class="cx"> Node* m_node;
</span><del>- Vector<OwnPtr<Digest>> m_children;
</del><ins>+ Vector<std::unique_ptr<Digest>> m_children;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> void DOMPatchSupport::patchDocument(Document* document, const String& markup)
</span><span class="lines">@@ -105,8 +105,8 @@
</span><span class="cx"> parser->finish();
</span><span class="cx"> parser->detach();
</span><span class="cx">
</span><del>- OwnPtr<Digest> oldInfo = createDigest(m_document->documentElement(), nullptr);
- OwnPtr<Digest> newInfo = createDigest(newDocument->documentElement(), &m_unusedNodesMap);
</del><ins>+ std::unique_ptr<Digest> oldInfo = createDigest(m_document->documentElement(), nullptr);
+ std::unique_ptr<Digest> newInfo = createDigest(newDocument->documentElement(), &m_unusedNodesMap);
</ins><span class="cx">
</span><span class="cx"> if (!innerPatchNode(oldInfo.get(), newInfo.get(), IGNORE_EXCEPTION)) {
</span><span class="cx"> // Fall back to rewrite.
</span><span class="lines">@@ -133,13 +133,13 @@
</span><span class="cx">
</span><span class="cx"> // Compose the old list.
</span><span class="cx"> ContainerNode* parentNode = node.parentNode();
</span><del>- Vector<OwnPtr<Digest>> oldList;
</del><ins>+ Vector<std::unique_ptr<Digest>> oldList;
</ins><span class="cx"> for (Node* child = parentNode->firstChild(); child; child = child->nextSibling())
</span><span class="cx"> oldList.append(createDigest(child, nullptr));
</span><span class="cx">
</span><span class="cx"> // Compose the new list.
</span><span class="cx"> String markupCopy = markup.lower();
</span><del>- Vector<OwnPtr<Digest>> newList;
</del><ins>+ Vector<std::unique_ptr<Digest>> newList;
</ins><span class="cx"> for (Node* child = parentNode->firstChild(); child != &node; child = child->nextSibling())
</span><span class="cx"> newList.append(createDigest(child, nullptr));
</span><span class="cx"> for (Node* child = fragment->firstChild(); child; child = child->nextSibling()) {
</span><span class="lines">@@ -208,7 +208,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> std::pair<DOMPatchSupport::ResultMap, DOMPatchSupport::ResultMap>
</span><del>-DOMPatchSupport::diff(const Vector<OwnPtr<Digest>>& oldList, const Vector<OwnPtr<Digest>>& newList)
</del><ins>+DOMPatchSupport::diff(const Vector<std::unique_ptr<Digest>>& oldList, const Vector<std::unique_ptr<Digest>>& newList)
</ins><span class="cx"> {
</span><span class="cx"> ResultMap newMap(newList.size());
</span><span class="cx"> ResultMap oldMap(oldList.size());
</span><span class="lines">@@ -295,7 +295,7 @@
</span><span class="cx"> return std::make_pair(oldMap, newMap);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool DOMPatchSupport::innerPatchChildren(ContainerNode* parentNode, const Vector<OwnPtr<Digest>>& oldList, const Vector<OwnPtr<Digest>>& newList, ExceptionCode& ec)
</del><ins>+bool DOMPatchSupport::innerPatchChildren(ContainerNode* parentNode, const Vector<std::unique_ptr<Digest>>& oldList, const Vector<std::unique_ptr<Digest>>& newList, ExceptionCode& ec)
</ins><span class="cx"> {
</span><span class="cx"> std::pair<ResultMap, ResultMap> resultMaps = diff(oldList, newList);
</span><span class="cx"> ResultMap& oldMap = resultMaps.first;
</span><span class="lines">@@ -407,10 +407,9 @@
</span><span class="cx"> sha1.addBytes(reinterpret_cast<const uint8_t*>(cString.data()), cString.length());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassOwnPtr<DOMPatchSupport::Digest> DOMPatchSupport::createDigest(Node* node, UnusedNodesMap* unusedNodesMap)
</del><ins>+std::unique_ptr<DOMPatchSupport::Digest> DOMPatchSupport::createDigest(Node* node, UnusedNodesMap* unusedNodesMap)
</ins><span class="cx"> {
</span><del>- Digest* digest = new Digest(node);
-
</del><ins>+ auto digest = std::make_unique<Digest>(node);
</ins><span class="cx"> SHA1 sha1;
</span><span class="cx">
</span><span class="cx"> Node::NodeType nodeType = node->nodeType();
</span><span class="lines">@@ -421,10 +420,10 @@
</span><span class="cx"> if (node->nodeType() == Node::ELEMENT_NODE) {
</span><span class="cx"> Node* child = node->firstChild();
</span><span class="cx"> while (child) {
</span><del>- OwnPtr<Digest> childInfo = createDigest(child, unusedNodesMap);
</del><ins>+ std::unique_ptr<Digest> childInfo = createDigest(child, unusedNodesMap);
</ins><span class="cx"> addStringToSHA1(sha1, childInfo->m_sha1);
</span><span class="cx"> child = child->nextSibling();
</span><del>- digest->m_children.append(childInfo.release());
</del><ins>+ digest->m_children.append(std::move(childInfo));
</ins><span class="cx"> }
</span><span class="cx"> Element* element = toElement(node);
</span><span class="cx">
</span><span class="lines">@@ -445,8 +444,9 @@
</span><span class="cx"> sha1.computeHash(hash);
</span><span class="cx"> digest->m_sha1 = base64Encode(hash.data(), 10);
</span><span class="cx"> if (unusedNodesMap)
</span><del>- unusedNodesMap->add(digest->m_sha1, digest);
- return adoptPtr(digest);
</del><ins>+ unusedNodesMap->add(digest->m_sha1, digest.get());
+
+ return digest;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool DOMPatchSupport::insertBeforeAndMarkAsUsed(ContainerNode* parentNode, Digest* digest, Node* anchor, ExceptionCode& ec)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorDOMPatchSupporth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/DOMPatchSupport.h (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/DOMPatchSupport.h 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/WebCore/inspector/DOMPatchSupport.h 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -34,8 +34,6 @@
</span><span class="cx"> #include "ExceptionCode.h"
</span><span class="cx">
</span><span class="cx"> #include <wtf/HashMap.h>
</span><del>-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="lines">@@ -65,9 +63,9 @@
</span><span class="cx"> typedef HashMap<String, Digest*> UnusedNodesMap;
</span><span class="cx">
</span><span class="cx"> bool innerPatchNode(Digest* oldNode, Digest* newNode, ExceptionCode&);
</span><del>- std::pair<ResultMap, ResultMap> diff(const Vector<OwnPtr<Digest>>& oldChildren, const Vector<OwnPtr<Digest>>& newChildren);
- bool innerPatchChildren(ContainerNode*, const Vector<OwnPtr<Digest>>& oldChildren, const Vector<OwnPtr<Digest>>& newChildren, ExceptionCode&);
- PassOwnPtr<Digest> createDigest(Node*, UnusedNodesMap*);
</del><ins>+ std::pair<ResultMap, ResultMap> diff(const Vector<std::unique_ptr<Digest>>& oldChildren, const Vector<std::unique_ptr<Digest>>& newChildren);
+ bool innerPatchChildren(ContainerNode*, const Vector<std::unique_ptr<Digest>>& oldChildren, const Vector<std::unique_ptr<Digest>>& newChildren, ExceptionCode&);
+ std::unique_ptr<Digest> createDigest(Node*, UnusedNodesMap*);
</ins><span class="cx"> bool insertBeforeAndMarkAsUsed(ContainerNode*, Digest*, Node* anchor, ExceptionCode&);
</span><span class="cx"> bool removeChildAndMoveToNew(Digest*, ExceptionCode&);
</span><span class="cx"> void markNodeAsUsed(Digest*);
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorApplicationCacheAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.h (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.h 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.h 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -32,7 +32,6 @@
</span><span class="cx"> #include "InspectorWebBackendDispatchers.h"
</span><span class="cx"> #include "InspectorWebFrontendDispatchers.h"
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx"> class InspectorApplicationCacheFrontendDispatcher;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorCSSAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx"> if (!m_namedFlows.isEmpty() && !m_timer.isActive())
</span><span class="cx"> m_timer.startOneShot(0);
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> class ChangeRegionOversetTask {
</span><span class="cx"> public:
</span><span class="cx"> ChangeRegionOversetTask(InspectorCSSAgent*);
</span><span class="lines">@@ -173,7 +173,7 @@
</span><span class="cx"> void unschedule(WebKitNamedFlow*);
</span><span class="cx"> void reset();
</span><span class="cx"> void timerFired(Timer<ChangeRegionOversetTask>&);
</span><del>-
</del><ins>+
</ins><span class="cx"> private:
</span><span class="cx"> InspectorCSSAgent* m_cssAgent;
</span><span class="cx"> Timer<ChangeRegionOversetTask> m_timer;
</span><span class="lines">@@ -189,7 +189,7 @@
</span><span class="cx"> void ChangeRegionOversetTask::scheduleFor(WebKitNamedFlow* namedFlow, int documentNodeId)
</span><span class="cx"> {
</span><span class="cx"> m_namedFlows.add(namedFlow, documentNodeId);
</span><del>-
</del><ins>+
</ins><span class="cx"> if (!m_timer.isActive())
</span><span class="cx"> m_timer.startOneShot(0);
</span><span class="cx"> }
</span><span class="lines">@@ -266,7 +266,7 @@
</span><span class="cx"> return String::format("SetStyleSheetText %s", m_styleSheet->id().utf8().data());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual void merge(PassOwnPtr<Action> action) override
</del><ins>+ virtual void merge(std::unique_ptr<Action> action) override
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(action->mergeId() == mergeId());
</span><span class="cx">
</span><span class="lines">@@ -310,7 +310,7 @@
</span><span class="cx"> return String::format("SetStyleText %s:%u", m_styleSheet->id().utf8().data(), m_cssId.ordinal());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual void merge(PassOwnPtr<Action> action) override
</del><ins>+ virtual void merge(std::unique_ptr<Action> action) override
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(action->mergeId() == mergeId());
</span><span class="cx">
</span><span class="lines">@@ -369,7 +369,7 @@
</span><span class="cx"> return String::format("SetPropertyText %s:%u:%s", m_styleSheet->id().utf8().data(), m_propertyIndex, m_overwrite ? "true" : "false");
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual void merge(PassOwnPtr<Action> action) override
</del><ins>+ virtual void merge(std::unique_ptr<Action> action) override
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(action->mergeId() == mergeId());
</span><span class="cx">
</span><span class="lines">@@ -582,7 +582,7 @@
</span><span class="cx">
</span><span class="cx"> if (m_updateRegionLayoutTask)
</span><span class="cx"> m_updateRegionLayoutTask->unschedule(namedFlow);
</span><del>-
</del><ins>+
</ins><span class="cx"> if (m_changeRegionOversetTask)
</span><span class="cx"> m_changeRegionOversetTask->unschedule(namedFlow);
</span><span class="cx">
</span><span class="lines">@@ -596,7 +596,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (!m_updateRegionLayoutTask)
</span><del>- m_updateRegionLayoutTask = adoptPtr(new UpdateRegionLayoutTask(this));
</del><ins>+ m_updateRegionLayoutTask = std::make_unique<UpdateRegionLayoutTask>(this);
</ins><span class="cx"> m_updateRegionLayoutTask->scheduleFor(namedFlow, documentNodeId);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -616,9 +616,9 @@
</span><span class="cx"> int documentNodeId = documentNodeWithRequestedFlowsId(document);
</span><span class="cx"> if (!documentNodeId)
</span><span class="cx"> return;
</span><del>-
</del><ins>+
</ins><span class="cx"> if (!m_changeRegionOversetTask)
</span><del>- m_changeRegionOversetTask = adoptPtr(new ChangeRegionOversetTask(this));
</del><ins>+ m_changeRegionOversetTask = std::make_unique<ChangeRegionOversetTask>(this);
</ins><span class="cx"> m_changeRegionOversetTask->scheduleFor(namedFlow, documentNodeId);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -626,10 +626,10 @@
</span><span class="cx"> {
</span><span class="cx"> if (namedFlow->flowState() == WebKitNamedFlow::FlowStateNull)
</span><span class="cx"> return;
</span><del>-
</del><ins>+
</ins><span class="cx"> ErrorString errorString;
</span><span class="cx"> Ref<WebKitNamedFlow> protect(*namedFlow);
</span><del>-
</del><ins>+
</ins><span class="cx"> m_frontendDispatcher->regionOversetChanged(buildObjectForNamedFlow(&errorString, namedFlow, documentNodeId));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -803,7 +803,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> ExceptionCode ec = 0;
</span><del>- m_domAgent->history()->perform(adoptPtr(new SetStyleSheetTextAction(inspectorStyleSheet, text)), ec);
</del><ins>+ m_domAgent->history()->perform(std::make_unique<SetStyleSheetTextAction>(inspectorStyleSheet, text), ec);
</ins><span class="cx"> *errorString = InspectorDOMAgent::toErrorString(ec);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -817,7 +817,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> ExceptionCode ec = 0;
</span><del>- bool success = m_domAgent->history()->perform(adoptPtr(new SetStyleTextAction(inspectorStyleSheet, compoundId, text)), ec);
</del><ins>+ bool success = m_domAgent->history()->perform(std::make_unique<SetStyleTextAction>(inspectorStyleSheet, compoundId, text), ec);
</ins><span class="cx"> if (success)
</span><span class="cx"> result = inspectorStyleSheet->buildObjectForStyle(inspectorStyleSheet->styleForId(compoundId));
</span><span class="cx"> *errorString = InspectorDOMAgent::toErrorString(ec);
</span><span class="lines">@@ -833,7 +833,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> ExceptionCode ec = 0;
</span><del>- bool success = m_domAgent->history()->perform(adoptPtr(new SetPropertyTextAction(inspectorStyleSheet, compoundId, propertyIndex, text, overwrite)), ec);
</del><ins>+ bool success = m_domAgent->history()->perform(std::make_unique<SetPropertyTextAction>(inspectorStyleSheet, compoundId, propertyIndex, text, overwrite), ec);
</ins><span class="cx"> if (success)
</span><span class="cx"> result = inspectorStyleSheet->buildObjectForStyle(inspectorStyleSheet->styleForId(compoundId));
</span><span class="cx"> *errorString = InspectorDOMAgent::toErrorString(ec);
</span><span class="lines">@@ -849,7 +849,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> ExceptionCode ec = 0;
</span><del>- bool success = m_domAgent->history()->perform(adoptPtr(new TogglePropertyAction(inspectorStyleSheet, compoundId, propertyIndex, disable)), ec);
</del><ins>+ bool success = m_domAgent->history()->perform(std::make_unique<TogglePropertyAction>(inspectorStyleSheet, compoundId, propertyIndex, disable), ec);
</ins><span class="cx"> if (success)
</span><span class="cx"> result = inspectorStyleSheet->buildObjectForStyle(inspectorStyleSheet->styleForId(compoundId));
</span><span class="cx"> *errorString = InspectorDOMAgent::toErrorString(ec);
</span><span class="lines">@@ -865,7 +865,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> ExceptionCode ec = 0;
</span><del>- bool success = m_domAgent->history()->perform(adoptPtr(new SetRuleSelectorAction(inspectorStyleSheet, compoundId, selector)), ec);
</del><ins>+ bool success = m_domAgent->history()->perform(std::make_unique<SetRuleSelectorAction>(inspectorStyleSheet, compoundId, selector), ec);
</ins><span class="cx">
</span><span class="cx"> if (success)
</span><span class="cx"> result = inspectorStyleSheet->buildObjectForRule(inspectorStyleSheet->ruleForId(compoundId));
</span><span class="lines">@@ -885,9 +885,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ExceptionCode ec = 0;
</span><del>- OwnPtr<AddRuleAction> action = adoptPtr(new AddRuleAction(inspectorStyleSheet, selector));
</del><ins>+ auto action = std::make_unique<AddRuleAction>(inspectorStyleSheet, selector);
</ins><span class="cx"> AddRuleAction* rawAction = action.get();
</span><del>- bool success = m_domAgent->history()->perform(action.release(), ec);
</del><ins>+ bool success = m_domAgent->history()->perform(std::move(action), ec);
</ins><span class="cx"> if (!success) {
</span><span class="cx"> *errorString = InspectorDOMAgent::toErrorString(ec);
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorCSSAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorCSSAgent.h (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorCSSAgent.h 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/WebCore/inspector/InspectorCSSAgent.h 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -181,8 +181,8 @@
</span><span class="cx"> DocumentToViaInspectorStyleSheet m_documentToInspectorStyleSheet;
</span><span class="cx"> NodeIdToForcedPseudoState m_nodeIdToForcedPseudoState;
</span><span class="cx"> HashSet<int> m_namedFlowCollectionsRequested;
</span><del>- OwnPtr<UpdateRegionLayoutTask> m_updateRegionLayoutTask;
- OwnPtr<ChangeRegionOversetTask> m_changeRegionOversetTask;
</del><ins>+ std::unique_ptr<UpdateRegionLayoutTask> m_updateRegionLayoutTask;
+ std::unique_ptr<ChangeRegionOversetTask> m_changeRegionOversetTask;
</ins><span class="cx">
</span><span class="cx"> int m_lastStyleSheetId;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorCanvasAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorCanvasAgent.h (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorCanvasAgent.h 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/WebCore/inspector/InspectorCanvasAgent.h 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -39,7 +39,6 @@
</span><span class="cx"> #include "InspectorWebTypeBuilders.h"
</span><span class="cx"> #include "ScriptState.h"
</span><span class="cx"> #include <wtf/HashMap.h>
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -96,7 +96,6 @@
</span><span class="cx"> #include <inspector/InjectedScriptManager.h>
</span><span class="cx"> #include <runtime/JSCInlines.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><del>-#include <wtf/OwnPtr.h>
</del><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -236,8 +235,8 @@
</span><span class="cx"> m_frontendDispatcher = std::make_unique<InspectorDOMFrontendDispatcher>(frontendChannel);
</span><span class="cx"> m_backendDispatcher = InspectorDOMBackendDispatcher::create(backendDispatcher, this);
</span><span class="cx">
</span><del>- m_history = adoptPtr(new InspectorHistory());
- m_domEditor = adoptPtr(new DOMEditor(m_history.get()));
</del><ins>+ m_history = std::make_unique<InspectorHistory>();
+ m_domEditor = std::make_unique<DOMEditor>(m_history.get());
</ins><span class="cx">
</span><span class="cx"> m_instrumentingAgents->setInspectorDOMAgent(this);
</span><span class="cx"> m_document = m_pageAgent->mainFrame()->document();
</span><span class="lines">@@ -251,8 +250,8 @@
</span><span class="cx"> m_frontendDispatcher = nullptr;
</span><span class="cx"> m_backendDispatcher.clear();
</span><span class="cx">
</span><del>- m_history.clear();
- m_domEditor.clear();
</del><ins>+ m_history.reset();
+ m_domEditor.reset();
</ins><span class="cx">
</span><span class="cx"> ErrorString error;
</span><span class="cx"> setSearchingForNode(&error, false, 0);
</span><span class="lines">@@ -584,7 +583,7 @@
</span><span class="cx"> Node* parent = innerParentNode(node);
</span><span class="cx"> if (!parent) {
</span><span class="cx"> // Node being pushed is detached -> push subtree root.
</span><del>- OwnPtr<NodeToIdMap> newMap = adoptPtr(new NodeToIdMap);
</del><ins>+ auto newMap = std::make_unique<NodeToIdMap>();
</ins><span class="cx"> danglingMap = newMap.get();
</span><span class="cx"> m_danglingNodeToIdMaps.append(newMap.release());
</span><span class="cx"> RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::DOM::Node>> children = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::DOM::Node>::create();
</span><span class="lines">@@ -1032,14 +1031,14 @@
</span><span class="cx"> m_overlay->didSetSearchingForNode(m_searchingForNode);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassOwnPtr<HighlightConfig> InspectorDOMAgent::highlightConfigFromInspectorObject(ErrorString* errorString, InspectorObject* highlightInspectorObject)
</del><ins>+std::unique_ptr<HighlightConfig> InspectorDOMAgent::highlightConfigFromInspectorObject(ErrorString* errorString, InspectorObject* highlightInspectorObject)
</ins><span class="cx"> {
</span><span class="cx"> if (!highlightInspectorObject) {
</span><span class="cx"> *errorString = "Internal error: highlight configuration parameter is missing";
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- OwnPtr<HighlightConfig> highlightConfig = adoptPtr(new HighlightConfig());
</del><ins>+ auto highlightConfig = std::make_unique<HighlightConfig>();
</ins><span class="cx"> bool showInfo = false; // Default: false (do not show a tooltip).
</span><span class="cx"> highlightInspectorObject->getBoolean("showInfo", &showInfo);
</span><span class="cx"> highlightConfig->showInfo = showInfo;
</span><span class="lines">@@ -1051,7 +1050,7 @@
</span><span class="cx"> highlightConfig->padding = parseConfigColor("paddingColor", highlightInspectorObject);
</span><span class="cx"> highlightConfig->border = parseConfigColor("borderColor", highlightInspectorObject);
</span><span class="cx"> highlightConfig->margin = parseConfigColor("marginColor", highlightInspectorObject);
</span><del>- return highlightConfig.release();
</del><ins>+ return highlightConfig;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorDOMAgent::setInspectModeEnabled(ErrorString* errorString, bool enabled, const RefPtr<InspectorObject>* highlightConfig)
</span><span class="lines">@@ -1061,27 +1060,27 @@
</span><span class="cx">
</span><span class="cx"> void InspectorDOMAgent::highlightRect(ErrorString*, int x, int y, int width, int height, const RefPtr<InspectorObject>* color, const RefPtr<InspectorObject>* outlineColor, const bool* usePageCoordinates)
</span><span class="cx"> {
</span><del>- OwnPtr<FloatQuad> quad = adoptPtr(new FloatQuad(FloatRect(x, y, width, height)));
- innerHighlightQuad(quad.release(), color, outlineColor, usePageCoordinates);
</del><ins>+ auto quad = std::make_unique<FloatQuad>(FloatRect(x, y, width, height));
+ innerHighlightQuad(std::move(quad), color, outlineColor, usePageCoordinates);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorDOMAgent::highlightQuad(ErrorString* errorString, const RefPtr<InspectorArray>& quadArray, const RefPtr<InspectorObject>* color, const RefPtr<InspectorObject>* outlineColor, const bool* usePageCoordinates)
</span><span class="cx"> {
</span><del>- OwnPtr<FloatQuad> quad = adoptPtr(new FloatQuad());
</del><ins>+ auto quad = std::make_unique<FloatQuad>();
</ins><span class="cx"> if (!parseQuad(quadArray, quad.get())) {
</span><span class="cx"> *errorString = "Invalid Quad format";
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- innerHighlightQuad(quad.release(), color, outlineColor, usePageCoordinates);
</del><ins>+ innerHighlightQuad(std::move(quad), color, outlineColor, usePageCoordinates);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMAgent::innerHighlightQuad(PassOwnPtr<FloatQuad> quad, const RefPtr<InspectorObject>* color, const RefPtr<InspectorObject>* outlineColor, const bool* usePageCoordinates)
</del><ins>+void InspectorDOMAgent::innerHighlightQuad(std::unique_ptr<FloatQuad> quad, const RefPtr<InspectorObject>* color, const RefPtr<InspectorObject>* outlineColor, const bool* usePageCoordinates)
</ins><span class="cx"> {
</span><del>- OwnPtr<HighlightConfig> highlightConfig = adoptPtr(new HighlightConfig());
</del><ins>+ auto highlightConfig = std::make_unique<HighlightConfig>();
</ins><span class="cx"> highlightConfig->content = parseColor(color);
</span><span class="cx"> highlightConfig->contentOutline = parseColor(outlineColor);
</span><span class="cx"> highlightConfig->usePageCoordinates = usePageCoordinates ? *usePageCoordinates : false;
</span><del>- m_overlay->highlightQuad(quad, *highlightConfig);
</del><ins>+ m_overlay->highlightQuad(std::move(quad), *highlightConfig);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorDOMAgent::highlightNode(ErrorString* errorString, const RefPtr<InspectorObject>& highlightInspectorObject, const int* nodeId, const String* objectId)
</span><span class="lines">@@ -1099,7 +1098,7 @@
</span><span class="cx"> if (!node)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- OwnPtr<HighlightConfig> highlightConfig = highlightConfigFromInspectorObject(errorString, highlightInspectorObject.get());
</del><ins>+ std::unique_ptr<HighlightConfig> highlightConfig = highlightConfigFromInspectorObject(errorString, highlightInspectorObject.get());
</ins><span class="cx"> if (!highlightConfig)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -1114,7 +1113,7 @@
</span><span class="cx"> {
</span><span class="cx"> Frame* frame = m_pageAgent->frameForId(frameId);
</span><span class="cx"> if (frame && frame->ownerElement()) {
</span><del>- OwnPtr<HighlightConfig> highlightConfig = adoptPtr(new HighlightConfig());
</del><ins>+ auto highlightConfig = std::make_unique<HighlightConfig>();
</ins><span class="cx"> highlightConfig->showInfo = true; // Always show tooltips for frames.
</span><span class="cx"> highlightConfig->content = parseColor(color);
</span><span class="cx"> highlightConfig->contentOutline = parseColor(outlineColor);
</span><span class="lines">@@ -1642,7 +1641,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (!m_revalidateStyleAttrTask)
</span><del>- m_revalidateStyleAttrTask = adoptPtr(new RevalidateStyleAttributeTask(this));
</del><ins>+ m_revalidateStyleAttrTask = std::make_unique<RevalidateStyleAttributeTask>(this);
</ins><span class="cx"> m_revalidateStyleAttrTask->scheduleFor(toElement(node));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMAgent.h (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDOMAgent.h 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/WebCore/inspector/InspectorDOMAgent.h 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -41,8 +41,6 @@
</span><span class="cx"> #include <wtf/Deque.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><del>-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/text/AtomicString.h>
</span><span class="lines">@@ -213,7 +211,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void setSearchingForNode(ErrorString*, bool enabled, Inspector::InspectorObject* highlightConfig);
</span><del>- PassOwnPtr<HighlightConfig> highlightConfigFromInspectorObject(ErrorString*, Inspector::InspectorObject* highlightInspectorObject);
</del><ins>+ std::unique_ptr<HighlightConfig> highlightConfigFromInspectorObject(ErrorString*, Inspector::InspectorObject* highlightInspectorObject);
</ins><span class="cx">
</span><span class="cx"> // Node-related methods.
</span><span class="cx"> typedef HashMap<RefPtr<Node>, int> NodeToIdMap;
</span><span class="lines">@@ -241,7 +239,7 @@
</span><span class="cx">
</span><span class="cx"> void discardBindings();
</span><span class="cx">
</span><del>- void innerHighlightQuad(PassOwnPtr<FloatQuad>, const RefPtr<Inspector::InspectorObject>* color, const RefPtr<Inspector::InspectorObject>* outlineColor, const bool* usePageCoordinates);
</del><ins>+ void innerHighlightQuad(std::unique_ptr<FloatQuad>, const RefPtr<Inspector::InspectorObject>* color, const RefPtr<Inspector::InspectorObject>* outlineColor, const bool* usePageCoordinates);
</ins><span class="cx">
</span><span class="cx"> InspectorPageAgent* m_pageAgent;
</span><span class="cx"> Inspector::InjectedScriptManager* m_injectedScriptManager;
</span><span class="lines">@@ -253,7 +251,7 @@
</span><span class="cx"> typedef HashMap<RefPtr<Node>, BackendNodeId> NodeToBackendIdMap;
</span><span class="cx"> HashMap<String, NodeToBackendIdMap> m_nodeGroupToBackendIdMap;
</span><span class="cx"> // Owns node mappings for dangling nodes.
</span><del>- Vector<OwnPtr<NodeToIdMap>> m_danglingNodeToIdMaps;
</del><ins>+ Vector<std::unique_ptr<NodeToIdMap>> m_danglingNodeToIdMaps;
</ins><span class="cx"> HashMap<int, Node*> m_idToNode;
</span><span class="cx"> HashMap<int, NodeToIdMap*> m_idToNodesMap;
</span><span class="cx"> HashSet<int> m_childrenRequested;
</span><span class="lines">@@ -263,12 +261,12 @@
</span><span class="cx"> RefPtr<Document> m_document;
</span><span class="cx"> typedef HashMap<String, Vector<RefPtr<Node>>> SearchResults;
</span><span class="cx"> SearchResults m_searchResults;
</span><del>- OwnPtr<RevalidateStyleAttributeTask> m_revalidateStyleAttrTask;
</del><ins>+ std::unique_ptr<RevalidateStyleAttributeTask> m_revalidateStyleAttrTask;
</ins><span class="cx"> RefPtr<Node> m_nodeToFocus;
</span><span class="cx"> bool m_searchingForNode;
</span><del>- OwnPtr<HighlightConfig> m_inspectModeHighlightConfig;
- OwnPtr<InspectorHistory> m_history;
- OwnPtr<DOMEditor> m_domEditor;
</del><ins>+ std::unique_ptr<HighlightConfig> m_inspectModeHighlightConfig;
+ std::unique_ptr<InspectorHistory> m_history;
+ std::unique_ptr<DOMEditor> m_domEditor;
</ins><span class="cx"> bool m_suppressAttributeModifiedEvent;
</span><span class="cx"> bool m_documentRequested;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMDebuggerAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.h (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.h 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.h 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -37,7 +37,6 @@
</span><span class="cx"> #include "InspectorWebBackendDispatchers.h"
</span><span class="cx"> #include <inspector/agents/InspectorDebuggerAgent.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMStorageAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMStorageAgent.h (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDOMStorageAgent.h 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/WebCore/inspector/InspectorDOMStorageAgent.h 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -33,7 +33,6 @@
</span><span class="cx"> #include "InspectorWebBackendDispatchers.h"
</span><span class="cx"> #include "StorageArea.h"
</span><span class="cx"> #include <wtf/HashMap.h>
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDatabaseAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDatabaseAgent.h (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDatabaseAgent.h 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/WebCore/inspector/InspectorDatabaseAgent.h 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -35,7 +35,6 @@
</span><span class="cx"> #include "InspectorWebBackendDispatchers.h"
</span><span class="cx"> #include "InspectorWebFrontendDispatchers.h"
</span><span class="cx"> #include <wtf/HashMap.h>
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorFrontendClientLocalcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorFrontendClientLocal.cpp (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorFrontendClientLocal.cpp 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/WebCore/inspector/InspectorFrontendClientLocal.cpp 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -116,15 +116,15 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-InspectorFrontendClientLocal::InspectorFrontendClientLocal(InspectorController* inspectorController, Page* frontendPage, PassOwnPtr<Settings> settings)
</del><ins>+InspectorFrontendClientLocal::InspectorFrontendClientLocal(InspectorController* inspectorController, Page* frontendPage, std::unique_ptr<Settings> settings)
</ins><span class="cx"> : m_inspectorController(inspectorController)
</span><span class="cx"> , m_frontendPage(frontendPage)
</span><del>- , m_settings(settings)
</del><ins>+ , m_settings(std::move(settings))
</ins><span class="cx"> , m_frontendLoaded(false)
</span><span class="cx"> , m_dockSide(UNDOCKED)
</span><span class="cx"> {
</span><span class="cx"> m_frontendPage->settings().setAllowFileAccessFromFileURLs(true);
</span><del>- m_dispatchTask = adoptPtr(new InspectorBackendDispatchTask(inspectorController));
</del><ins>+ m_dispatchTask = std::make_unique<InspectorBackendDispatchTask>(inspectorController);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> InspectorFrontendClientLocal::~InspectorFrontendClientLocal()
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorFrontendClientLocalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorFrontendClientLocal.h (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorFrontendClientLocal.h 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/WebCore/inspector/InspectorFrontendClientLocal.h 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -55,9 +55,9 @@
</span><span class="cx"> virtual void setProperty(const String& name, const String& value);
</span><span class="cx"> };
</span><span class="cx">
</span><del>- InspectorFrontendClientLocal(InspectorController*, Page*, PassOwnPtr<Settings>);
</del><ins>+ InspectorFrontendClientLocal(InspectorController*, Page*, std::unique_ptr<Settings>);
</ins><span class="cx"> virtual ~InspectorFrontendClientLocal();
</span><del>-
</del><ins>+
</ins><span class="cx"> virtual void windowObjectCleared() override;
</span><span class="cx"> virtual void frontendLoaded() override;
</span><span class="cx">
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> void showConsole();
</span><span class="cx">
</span><span class="cx"> void showMainResourceForFrame(Frame*);
</span><del>-
</del><ins>+
</ins><span class="cx"> void showResources();
</span><span class="cx">
</span><span class="cx"> void setAttachedWindow(DockSide);
</span><span class="lines">@@ -117,11 +117,11 @@
</span><span class="cx"> Page* m_frontendPage;
</span><span class="cx"> // TODO(yurys): this ref shouldn't be needed.
</span><span class="cx"> RefPtr<InspectorFrontendHost> m_frontendHost;
</span><del>- OwnPtr<InspectorFrontendClientLocal::Settings> m_settings;
</del><ins>+ std::unique_ptr<InspectorFrontendClientLocal::Settings> m_settings;
</ins><span class="cx"> bool m_frontendLoaded;
</span><span class="cx"> DockSide m_dockSide;
</span><span class="cx"> Vector<String> m_evaluateOnLoad;
</span><del>- OwnPtr<InspectorBackendDispatchTask> m_dispatchTask;
</del><ins>+ std::unique_ptr<InspectorBackendDispatchTask> m_dispatchTask;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorHeapProfilerAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorHeapProfilerAgent.h (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorHeapProfilerAgent.h 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/WebCore/inspector/InspectorHeapProfilerAgent.h 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -39,7 +39,6 @@
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorHistorycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorHistory.cpp (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorHistory.cpp 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/WebCore/inspector/InspectorHistory.cpp 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> return "";
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorHistory::Action::merge(PassOwnPtr<Action>)
</del><ins>+void InspectorHistory::Action::merge(std::unique_ptr<Action>)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -87,16 +87,16 @@
</span><span class="cx">
</span><span class="cx"> InspectorHistory::~InspectorHistory() { }
</span><span class="cx">
</span><del>-bool InspectorHistory::perform(PassOwnPtr<Action> action, ExceptionCode& ec)
</del><ins>+bool InspectorHistory::perform(std::unique_ptr<Action> action, ExceptionCode& ec)
</ins><span class="cx"> {
</span><span class="cx"> if (!action->perform(ec))
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (!action->mergeId().isEmpty() && m_afterLastActionIndex > 0 && action->mergeId() == m_history[m_afterLastActionIndex - 1]->mergeId())
</span><del>- m_history[m_afterLastActionIndex - 1]->merge(action);
</del><ins>+ m_history[m_afterLastActionIndex - 1]->merge(std::move(action));
</ins><span class="cx"> else {
</span><span class="cx"> m_history.resize(m_afterLastActionIndex);
</span><del>- m_history.append(action);
</del><ins>+ m_history.append(std::move(action));
</ins><span class="cx"> ++m_afterLastActionIndex;
</span><span class="cx"> }
</span><span class="cx"> return true;
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx">
</span><span class="cx"> void InspectorHistory::markUndoableState()
</span><span class="cx"> {
</span><del>- perform(adoptPtr(new UndoableStateMark()), IGNORE_EXCEPTION);
</del><ins>+ perform(std::make_unique<UndoableStateMark>(), IGNORE_EXCEPTION);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool InspectorHistory::undo(ExceptionCode& ec)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorHistoryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorHistory.h (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorHistory.h 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/WebCore/inspector/InspectorHistory.h 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -33,7 +33,6 @@
</span><span class="cx">
</span><span class="cx"> #include "ExceptionCode.h"
</span><span class="cx">
</span><del>-#include <wtf/OwnPtr.h>
</del><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="lines">@@ -56,7 +55,7 @@
</span><span class="cx"> virtual String toString();
</span><span class="cx">
</span><span class="cx"> virtual String mergeId();
</span><del>- virtual void merge(PassOwnPtr<Action>);
</del><ins>+ virtual void merge(std::unique_ptr<Action>);
</ins><span class="cx">
</span><span class="cx"> virtual bool perform(ExceptionCode&) = 0;
</span><span class="cx">
</span><span class="lines">@@ -71,7 +70,7 @@
</span><span class="cx"> InspectorHistory();
</span><span class="cx"> virtual ~InspectorHistory();
</span><span class="cx">
</span><del>- bool perform(PassOwnPtr<Action>, ExceptionCode&);
</del><ins>+ bool perform(std::unique_ptr<Action>, ExceptionCode&);
</ins><span class="cx"> void markUndoableState();
</span><span class="cx">
</span><span class="cx"> bool undo(ExceptionCode&);
</span><span class="lines">@@ -79,7 +78,7 @@
</span><span class="cx"> void reset();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- Vector<OwnPtr<Action>> m_history;
</del><ins>+ Vector<std::unique_ptr<Action>> m_history;
</ins><span class="cx"> size_t m_afterLastActionIndex;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorIndexedDBAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.h (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.h 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.h 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -35,7 +35,6 @@
</span><span class="cx">
</span><span class="cx"> #include "InspectorWebAgentBase.h"
</span><span class="cx"> #include "InspectorWebBackendDispatchers.h"
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorInputAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorInputAgent.h (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorInputAgent.h 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/WebCore/inspector/InspectorInputAgent.h 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -36,7 +36,6 @@
</span><span class="cx"> #include "InspectorWebAgentBase.h"
</span><span class="cx"> #include "InspectorWebBackendDispatchers.h"
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorLayerTreeAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.h (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.h 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.h 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -36,7 +36,6 @@
</span><span class="cx"> #include "InspectorWebFrontendDispatchers.h"
</span><span class="cx"> #include "InspectorWebTypeBuilders.h"
</span><span class="cx"> #include "RenderLayer.h"
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorMemoryAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorMemoryAgent.cpp (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorMemoryAgent.cpp 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/WebCore/inspector/InspectorMemoryAgent.cpp 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -49,8 +49,6 @@
</span><span class="cx"> #include <inspector/InspectorValues.h>
</span><span class="cx"> #include <runtime/ArrayBufferView.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><del>-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx"> #include <wtf/text/StringImpl.h>
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorMemoryAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorMemoryAgent.h (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorMemoryAgent.h 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/WebCore/inspector/InspectorMemoryAgent.h 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -35,7 +35,6 @@
</span><span class="cx">
</span><span class="cx"> #include "InspectorWebAgentBase.h"
</span><span class="cx"> #include "InspectorWebBackendDispatchers.h"
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorOverlaycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorOverlay.cpp (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorOverlay.cpp 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/WebCore/inspector/InspectorOverlay.cpp 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -280,7 +280,7 @@
</span><span class="cx"> void InspectorOverlay::hideHighlight()
</span><span class="cx"> {
</span><span class="cx"> m_highlightNode.clear();
</span><del>- m_highlightQuad.clear();
</del><ins>+ m_highlightQuad.reset();
</ins><span class="cx"> update();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -291,13 +291,13 @@
</span><span class="cx"> update();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorOverlay::highlightQuad(PassOwnPtr<FloatQuad> quad, const HighlightConfig& highlightConfig)
</del><ins>+void InspectorOverlay::highlightQuad(std::unique_ptr<FloatQuad> quad, const HighlightConfig& highlightConfig)
</ins><span class="cx"> {
</span><span class="cx"> if (m_quadHighlightConfig.usePageCoordinates)
</span><span class="cx"> *quad -= m_page.mainFrame().view()->scrollOffset();
</span><span class="cx">
</span><span class="cx"> m_quadHighlightConfig = highlightConfig;
</span><del>- m_highlightQuad = quad;
</del><ins>+ m_highlightQuad = std::move(quad);
</ins><span class="cx"> update();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -748,7 +748,7 @@
</span><span class="cx">
</span><span class="cx"> Page::PageClients pageClients;
</span><span class="cx"> fillWithEmptyClients(pageClients);
</span><del>- m_overlayPage = adoptPtr(new Page(pageClients));
</del><ins>+ m_overlayPage = std::make_unique<Page>(pageClients);
</ins><span class="cx">
</span><span class="cx"> Settings& settings = m_page.settings();
</span><span class="cx"> Settings& overlaySettings = m_overlayPage->settings();
</span><span class="lines">@@ -815,7 +815,7 @@
</span><span class="cx">
</span><span class="cx"> void InspectorOverlay::freePage()
</span><span class="cx"> {
</span><del>- m_overlayPage.clear();
</del><ins>+ m_overlayPage.reset();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorOverlayh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorOverlay.h (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorOverlay.h 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/WebCore/inspector/InspectorOverlay.h 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -32,8 +32,6 @@
</span><span class="cx"> #include "Color.h"
</span><span class="cx"> #include "FloatQuad.h"
</span><span class="cx"> #include "LayoutRect.h"
</span><del>-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -117,7 +115,7 @@
</span><span class="cx">
</span><span class="cx"> void hideHighlight();
</span><span class="cx"> void highlightNode(Node*, const HighlightConfig&);
</span><del>- void highlightQuad(PassOwnPtr<FloatQuad>, const HighlightConfig&);
</del><ins>+ void highlightQuad(std::unique_ptr<FloatQuad>, const HighlightConfig&);
</ins><span class="cx">
</span><span class="cx"> Node* highlightedNode() const;
</span><span class="cx">
</span><span class="lines">@@ -141,8 +139,8 @@
</span><span class="cx"> String m_pausedInDebuggerMessage;
</span><span class="cx"> RefPtr<Node> m_highlightNode;
</span><span class="cx"> HighlightConfig m_nodeHighlightConfig;
</span><del>- OwnPtr<FloatQuad> m_highlightQuad;
- OwnPtr<Page> m_overlayPage;
</del><ins>+ std::unique_ptr<FloatQuad> m_highlightQuad;
+ std::unique_ptr<Page> m_overlayPage;
</ins><span class="cx"> HighlightConfig m_quadHighlightConfig;
</span><span class="cx"> IntSize m_size;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorProfilerAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorProfilerAgent.cpp (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorProfilerAgent.cpp 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/WebCore/inspector/InspectorProfilerAgent.cpp 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -50,7 +50,6 @@
</span><span class="cx"> #include <inspector/InspectorValues.h>
</span><span class="cx"> #include <inspector/agents/InspectorConsoleAgent.h>
</span><span class="cx"> #include <wtf/CurrentTime.h>
</span><del>-#include <wtf/OwnPtr.h>
</del><span class="cx"> #include <wtf/text/StringConcatenate.h>
</span><span class="cx">
</span><span class="cx"> using namespace Inspector;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorProfilerAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorProfilerAgent.h (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorProfilerAgent.h 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/WebCore/inspector/InspectorProfilerAgent.h 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -38,7 +38,6 @@
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorResourceAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -643,7 +643,7 @@
</span><span class="cx"> : InspectorAgentBase(ASCIILiteral("Network"), instrumentingAgents)
</span><span class="cx"> , m_pageAgent(pageAgent)
</span><span class="cx"> , m_client(client)
</span><del>- , m_resourcesData(adoptPtr(new NetworkResourcesData()))
</del><ins>+ , m_resourcesData(std::make_unique<NetworkResourcesData>())
</ins><span class="cx"> , m_enabled(false)
</span><span class="cx"> , m_cacheDisabled(false)
</span><span class="cx"> , m_loadingXHRSynchronously(false)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorResourceAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorResourceAgent.h (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorResourceAgent.h 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/WebCore/inspector/InspectorResourceAgent.h 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -34,7 +34,6 @@
</span><span class="cx"> #include "InspectorWebAgentBase.h"
</span><span class="cx"> #include "InspectorWebBackendDispatchers.h"
</span><span class="cx"> #include "InspectorWebFrontendDispatchers.h"
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -145,7 +144,7 @@
</span><span class="cx"> InspectorClient* m_client;
</span><span class="cx"> std::unique_ptr<Inspector::InspectorNetworkFrontendDispatcher> m_frontendDispatcher;
</span><span class="cx"> RefPtr<Inspector::InspectorNetworkBackendDispatcher> m_backendDispatcher;
</span><del>- OwnPtr<NetworkResourcesData> m_resourcesData;
</del><ins>+ std::unique_ptr<NetworkResourcesData> m_resourcesData;
</ins><span class="cx"> bool m_enabled;
</span><span class="cx"> bool m_cacheDisabled;
</span><span class="cx"> bool m_loadingXHRSynchronously;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorStyleSheetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -58,8 +58,6 @@
</span><span class="cx"> #include "WebKitCSSKeyframesRule.h"
</span><span class="cx"> #include <inspector/ContentSearchUtilities.h>
</span><span class="cx"> #include <inspector/InspectorValues.h>
</span><del>-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx"> #include <yarr/RegularExpression.h>
</span><span class="lines">@@ -77,15 +75,15 @@
</span><span class="cx"> void setText(const String& text);
</span><span class="cx"> bool hasText() const { return m_hasText; }
</span><span class="cx"> RuleSourceDataList* sourceData() const { return m_sourceData.get(); }
</span><del>- void setSourceData(PassOwnPtr<RuleSourceDataList>);
- bool hasSourceData() const { return m_sourceData; }
</del><ins>+ void setSourceData(std::unique_ptr<RuleSourceDataList>);
+ bool hasSourceData() const { return m_sourceData != nullptr; }
</ins><span class="cx"> PassRefPtr<WebCore::CSSRuleSourceData> ruleSourceDataAt(unsigned) const;
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx">
</span><span class="cx"> String m_text;
</span><span class="cx"> bool m_hasText;
</span><del>- OwnPtr<RuleSourceDataList> m_sourceData;
</del><ins>+ std::unique_ptr<RuleSourceDataList> m_sourceData;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> ParsedStyleSheet::ParsedStyleSheet()
</span><span class="lines">@@ -115,14 +113,14 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ParsedStyleSheet::setSourceData(PassOwnPtr<RuleSourceDataList> sourceData)
</del><ins>+void ParsedStyleSheet::setSourceData(std::unique_ptr<RuleSourceDataList> sourceData)
</ins><span class="cx"> {
</span><span class="cx"> if (!sourceData) {
</span><del>- m_sourceData.clear();
</del><ins>+ m_sourceData.reset();
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_sourceData = adoptPtr(new RuleSourceDataList());
</del><ins>+ m_sourceData = std::make_unique<RuleSourceDataList>();
</ins><span class="cx">
</span><span class="cx"> // FIXME: This is a temporary solution to retain the original flat sourceData structure
</span><span class="cx"> // containing only style rules, even though CSSParser now provides the full rule source data tree.
</span><span class="lines">@@ -284,9 +282,9 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static PassOwnPtr<CSSParser> createCSSParser(Document* document)
</del><ins>+static std::unique_ptr<CSSParser> createCSSParser(Document* document)
</ins><span class="cx"> {
</span><del>- return adoptPtr(new CSSParser(document ? CSSParserContext(*document) : strictCSSParserContext()));
</del><ins>+ return std::make_unique<CSSParser>(document ? CSSParserContext(*document) : strictCSSParserContext());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<InspectorStyle> InspectorStyle::create(const InspectorCSSId& styleId, PassRefPtr<CSSStyleDeclaration> style, InspectorStyleSheet* parentStyleSheet)
</span><span class="lines">@@ -521,7 +519,7 @@
</span><span class="cx"> HashSet<String> foundShorthands;
</span><span class="cx"> String previousPriority;
</span><span class="cx"> String previousStatus;
</span><del>- OwnPtr<Vector<size_t>> lineEndings(m_parentStyleSheet ? m_parentStyleSheet->lineEndings() : PassOwnPtr<Vector<size_t>>());
</del><ins>+ std::unique_ptr<Vector<size_t>> lineEndings(m_parentStyleSheet ? m_parentStyleSheet->lineEndings() : nullptr);
</ins><span class="cx"> RefPtr<CSSRuleSourceData> sourceData = extractSourceData();
</span><span class="cx"> unsigned ruleBodyRangeStart = sourceData ? sourceData->ruleBodyRange.start : 0;
</span><span class="cx">
</span><span class="lines">@@ -1211,10 +1209,10 @@
</span><span class="cx"> return m_parsedStyleSheet->ruleSourceDataAt(ruleIndexByStyle(style));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassOwnPtr<Vector<size_t>> InspectorStyleSheet::lineEndings() const
</del><ins>+std::unique_ptr<Vector<size_t>> InspectorStyleSheet::lineEndings() const
</ins><span class="cx"> {
</span><span class="cx"> if (!m_parsedStyleSheet->hasText())
</span><del>- return PassOwnPtr<Vector<size_t>>();
</del><ins>+ return nullptr;
</ins><span class="cx"> return ContentSearchUtilities::lineEndings(m_parsedStyleSheet->text());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1270,9 +1268,9 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> RefPtr<StyleSheetContents> newStyleSheet = StyleSheetContents::create();
</span><del>- OwnPtr<RuleSourceDataList> ruleSourceDataResult = adoptPtr(new RuleSourceDataList());
</del><ins>+ auto ruleSourceDataResult = std::make_unique<RuleSourceDataList>();
</ins><span class="cx"> createCSSParser(m_pageStyleSheet->ownerDocument())->parseSheet(newStyleSheet.get(), m_parsedStyleSheet->text(), 0, ruleSourceDataResult.get());
</span><del>- m_parsedStyleSheet->setSourceData(ruleSourceDataResult.release());
</del><ins>+ m_parsedStyleSheet->setSourceData(std::move(ruleSourceDataResult));
</ins><span class="cx"> return m_parsedStyleSheet->hasSourceData();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1476,7 +1474,7 @@
</span><span class="cx"> return !ec;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassOwnPtr<Vector<size_t>> InspectorStyleSheetForInlineStyle::lineEndings() const
</del><ins>+std::unique_ptr<Vector<size_t>> InspectorStyleSheetForInlineStyle::lineEndings() const
</ins><span class="cx"> {
</span><span class="cx"> return ContentSearchUtilities::lineEndings(elementStyleText());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorStyleSheeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorStyleSheet.h (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorStyleSheet.h 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/WebCore/inspector/InspectorStyleSheet.h 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -226,7 +226,7 @@
</span><span class="cx">
</span><span class="cx"> // Also accessed by friend class InspectorStyle.
</span><span class="cx"> virtual bool setStyleText(CSSStyleDeclaration*, const String&, ExceptionCode&);
</span><del>- virtual PassOwnPtr<Vector<size_t>> lineEndings() const;
</del><ins>+ virtual std::unique_ptr<Vector<size_t>> lineEndings() const;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> typedef Vector<RefPtr<CSSStyleRule>> CSSStyleRuleVector;
</span><span class="lines">@@ -278,7 +278,7 @@
</span><span class="cx">
</span><span class="cx"> // Also accessed by friend class InspectorStyle.
</span><span class="cx"> virtual bool setStyleText(CSSStyleDeclaration*, const String&, ExceptionCode&) override;
</span><del>- virtual PassOwnPtr<Vector<size_t>> lineEndings() const override;
</del><ins>+ virtual std::unique_ptr<Vector<size_t>> lineEndings() const override;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> CSSStyleDeclaration* inlineStyle() const;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorTimelineAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.h (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.h 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.h 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -38,7 +38,6 @@
</span><span class="cx"> #include "InspectorWebFrontendDispatchers.h"
</span><span class="cx"> #include "LayoutRect.h"
</span><span class="cx"> #include <inspector/InspectorValues.h>
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/WeakPtr.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorWorkerAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorWorkerAgent.cpp (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorWorkerAgent.cpp 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/WebCore/inspector/InspectorWorkerAgent.cpp 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -40,7 +40,6 @@
</span><span class="cx"> #include "URL.h"
</span><span class="cx"> #include "WorkerGlobalScopeProxy.h"
</span><span class="cx"> #include <inspector/InspectorValues.h>
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx">
</span><span class="cx"> using namespace Inspector;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorPageConsoleAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/PageConsoleAgent.cpp (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/PageConsoleAgent.cpp 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/WebCore/inspector/PageConsoleAgent.cpp 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (CommandLineAPIHost* commandLineAPIHost = static_cast<WebInjectedScriptManager*>(m_injectedScriptManager)->commandLineAPIHost())
</span><del>- commandLineAPIHost->addInspectedObject(adoptPtr(new InspectableNode(node)));
</del><ins>+ commandLineAPIHost->addInspectedObject(std::make_unique<InspectableNode>(node));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorPageRuntimeAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/PageRuntimeAgent.h (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/PageRuntimeAgent.h 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/WebCore/inspector/PageRuntimeAgent.h 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -35,7 +35,6 @@
</span><span class="cx">
</span><span class="cx"> #include <inspector/InspectorJSFrontendDispatchers.h>
</span><span class="cx"> #include <inspector/agents/InspectorRuntimeAgent.h>
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx"> class ExecState;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWebConsoleAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WebConsoleAgent.cpp (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WebConsoleAgent.cpp 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/WebCore/inspector/WebConsoleAgent.cpp 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -131,7 +131,7 @@
</span><span class="cx"> void WebConsoleAgent::addInspectedHeapObject(ErrorString*, int inspectedHeapObjectId)
</span><span class="cx"> {
</span><span class="cx"> if (CommandLineAPIHost* commandLineAPIHost = static_cast<WebInjectedScriptManager*>(m_injectedScriptManager)->commandLineAPIHost())
</span><del>- commandLineAPIHost->addInspectedObject(adoptPtr(new InspectableHeapObject(inspectedHeapObjectId)));
</del><ins>+ commandLineAPIHost->addInspectedObject(std::make_unique<InspectableHeapObject>(inspectedHeapObjectId));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWorkerRuntimeAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WorkerRuntimeAgent.h (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerRuntimeAgent.h 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/WebCore/inspector/WorkerRuntimeAgent.h 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -34,7 +34,6 @@
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">
</span><span class="cx"> #include <inspector/agents/InspectorRuntimeAgent.h>
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/WebCore/testing/Internals.cpp 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -194,7 +194,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> InspectorFrontendClientDummy::InspectorFrontendClientDummy(InspectorController* controller, Page* page)
</span><del>- : InspectorFrontendClientLocal(controller, page, adoptPtr(new InspectorFrontendClientLocal::Settings()))
</del><ins>+ : InspectorFrontendClientLocal(controller, page, std::make_unique<InspectorFrontendClientLocal::Settings>())
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/WebKit/ChangeLog 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-02-17 Sergio Correia <sergio.correia@openbossa.org>
+
+ Replace uses of PassOwnPtr/OwnPtr with std::unique_ptr in WebCore/inspector
+ https://bugs.webkit.org/show_bug.cgi?id=128681
+
+ Reviewed by Timothy Hatcher.
+
+ Another step towards getting rid of PassOwnPtr/OwnPtr, now targeting
+ WebCore/inspector/*. Besides files in there, a few other files in
+ JavaScriptCore/inspector, WebKit/, WebKit2/WebProcess/WebCoreSupport/
+ and WebCore/testing were touched.
+
+ * WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in:
+
</ins><span class="cx"> 2014-02-15 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] Remove WebSerializedJSValue SPI
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitvcxprojWebKitExportGeneratorWebKitExportsdefin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -216,7 +216,7 @@
</span><span class="cx"> symbolWithPointer(?instrumentingAgentsForPage@InspectorInstrumentation@WebCore@@CAPAVInstrumentingAgents@2@PAVPage@2@@Z, ?instrumentingAgentsForPage@InspectorInstrumentation@WebCore@@CAPEAVInstrumentingAgents@2@PEAVPage@2@@Z)
</span><span class="cx"> ?s_frontendCounter@InspectorInstrumentation@WebCore@@0HA
</span><span class="cx"> symbolWithPointer(?isUnderTest@InspectorFrontendClientLocal@WebCore@@UAE_NXZ, ?isUnderTest@InspectorFrontendClientLocal@WebCore@@UEAA_NXZ)
</span><del>- symbolWithPointer(??0InspectorFrontendClientLocal@WebCore@@QAE@PAVInspectorController@1@PAVPage@1@V?$PassOwnPtr@VSettings@InspectorFrontendClientLocal@WebCore@@@WTF@@@Z, ??0InspectorFrontendClientLocal@WebCore@@QEAA@PEAVInspectorController@1@PEAVPage@1@V?$PassOwnPtr@VSettings@InspectorFrontendClientLocal@WebCore@@@WTF@@@Z)
</del><ins>+ symbolWithPointer(??0InspectorFrontendClientLocal@WebCore@@QAE@PAVInspectorController@1@PAVPage@1@V?$unique_ptr@VSettings@InspectorFrontendClientLocal@WebCore@@U?$default_delete@VSettings@InspectorFrontendClientLocal@WebCore@@@std@@@std@@@Z, ??0InspectorFrontendClientLocal@WebCore@@QEAA@PEAVInspectorController@1@PEAVPage@1@V?$unique_ptr@VSettings@InspectorFrontendClientLocal@WebCore@@U?$default_delete@VSettings@InspectorFrontendClientLocal@WebCore@@@std@@@std@@@Z)
</ins><span class="cx"> symbolWithPointer(??1InspectorFrontendClientLocal@WebCore@@UAE@XZ, ??1InspectorFrontendClientLocal@WebCore@@UEAA@XZ)
</span><span class="cx"> symbolWithPointer(?changeAttachedWindowHeight@InspectorFrontendClientLocal@WebCore@@UAEXI@Z, ?changeAttachedWindowHeight@InspectorFrontendClientLocal@WebCore@@UEAAXI@Z)
</span><span class="cx"> symbolWithPointer(?changeAttachedWindowWidth@InspectorFrontendClientLocal@WebCore@@UAEXI@Z, ?changeAttachedWindowWidth@InspectorFrontendClientLocal@WebCore@@UEAAXI@Z)
</span></span></pre></div>
<a id="trunkSourceWebKitcfChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/cf/ChangeLog (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/cf/ChangeLog 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/WebKit/cf/ChangeLog 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-02-17 Sergio Correia <sergio.correia@openbossa.org>
+
+ Replace uses of PassOwnPtr/OwnPtr with std::unique_ptr in WebCore/inspector
+ https://bugs.webkit.org/show_bug.cgi?id=128681
+
+ Reviewed by Timothy Hatcher.
+
+ Another step towards getting rid of PassOwnPtr/OwnPtr, now targeting
+ WebCore/inspector/*. Besides files in there, a few other files in
+ JavaScriptCore/inspector, WebKit/, WebKit2/WebProcess/WebCoreSupport/
+ and WebCore/testing were touched.
+
+ * WebCoreSupport/WebInspectorClientCF.cpp:
+
</ins><span class="cx"> 2013-12-03 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Push Remote Inspector debugging connection management into JavaScriptCore
</span></span></pre></div>
<a id="trunkSourceWebKitcfWebCoreSupportWebInspectorClientCFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/cf/WebCoreSupport/WebInspectorClientCF.cpp (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/cf/WebCoreSupport/WebInspectorClientCF.cpp 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/WebKit/cf/WebCoreSupport/WebInspectorClientCF.cpp 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -25,8 +25,8 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: On Windows, we require all WebKit source files to include config.h
</span><span class="cx"> // before including any other files. Failing to include config.h will leave
</span><del>-// WTF_USE_CF undefined, causing build failures in this
-// file. But Mac doesn't have a config.h for WebKit, so we can't include the
</del><ins>+// WTF_USE_CF undefined, causing build failures in this
+// file. But Mac doesn't have a config.h for WebKit, so we can't include the
</ins><span class="cx"> // Windows one here. For now we can just define WTF_USE_CF and
</span><span class="cx"> // WTF_USE_CFNETWORK manually, but we need a better long-term solution.
</span><span class="cx"> #ifndef WTF_USE_CF
</span><span class="lines">@@ -124,7 +124,7 @@
</span><span class="cx"> storeSetting(inspectorStartsAttachedSetting, attached ? "true" : "false");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassOwnPtr<WebCore::InspectorFrontendClientLocal::Settings> WebInspectorClient::createFrontendSettings()
</del><ins>+std::unique_ptr<WebCore::InspectorFrontendClientLocal::Settings> WebInspectorClient::createFrontendSettings()
</ins><span class="cx"> {
</span><span class="cx"> class InspectorFrontendSettingsCF : public WebCore::InspectorFrontendClientLocal::Settings {
</span><span class="cx"> public:
</span><span class="lines">@@ -141,5 +141,5 @@
</span><span class="cx"> storeSetting(name, value);
</span><span class="cx"> }
</span><span class="cx"> };
</span><del>- return adoptPtr<WebCore::InspectorFrontendClientLocal::Settings>(new InspectorFrontendSettingsCF());
</del><ins>+ return std::make_unique<InspectorFrontendSettingsCF>();
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKiteflChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/efl/ChangeLog (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/efl/ChangeLog 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/WebKit/efl/ChangeLog 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-02-17 Sergio Correia <sergio.correia@openbossa.org>
+
+ Replace uses of PassOwnPtr/OwnPtr with std::unique_ptr in WebCore/inspector
+ https://bugs.webkit.org/show_bug.cgi?id=128681
+
+ Reviewed by Timothy Hatcher.
+
+ Another step towards getting rid of PassOwnPtr/OwnPtr, now targeting
+ WebCore/inspector/*. Besides files in there, a few other files in
+ JavaScriptCore/inspector, WebKit/, WebKit2/WebProcess/WebCoreSupport/
+ and WebCore/testing were touched.
+
+ * WebCoreSupport/InspectorClientEfl.cpp:
+
</ins><span class="cx"> 2014-02-15 Ryuan Choi <ryuan.choi@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL][WK1] Do not include cairo header in the public headers
</span></span></pre></div>
<a id="trunkSourceWebKiteflWebCoreSupportInspectorClientEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/efl/WebCoreSupport/InspectorClientEfl.cpp (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/efl/WebCoreSupport/InspectorClientEfl.cpp 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/WebKit/efl/WebCoreSupport/InspectorClientEfl.cpp 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -148,7 +148,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> InspectorFrontendClientEfl::InspectorFrontendClientEfl(Evas_Object* inspectedView, Evas_Object* inspectorView, InspectorClientEfl* inspectorClient)
</span><del>- : InspectorFrontendClientLocal(&EWKPrivate::corePage(inspectedView)->inspectorController(), EWKPrivate::corePage(inspectorView), adoptPtr(new InspectorFrontendSettingsEfl()))
</del><ins>+ : InspectorFrontendClientLocal(&EWKPrivate::corePage(inspectedView)->inspectorController(), EWKPrivate::corePage(inspectorView), std::make_unique<InspectorFrontendSettingsEfl>())
</ins><span class="cx"> , m_inspectedView(inspectedView)
</span><span class="cx"> , m_inspectorView(inspectorView)
</span><span class="cx"> , m_inspectorClient(inspectorClient)
</span></span></pre></div>
<a id="trunkSourceWebKitgtkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/ChangeLog (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/ChangeLog 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/WebKit/gtk/ChangeLog 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-02-17 Sergio Correia <sergio.correia@openbossa.org>
+
+ Replace uses of PassOwnPtr/OwnPtr with std::unique_ptr in WebCore/inspector
+ https://bugs.webkit.org/show_bug.cgi?id=128681
+
+ Reviewed by Timothy Hatcher.
+
+ Another step towards getting rid of PassOwnPtr/OwnPtr, now targeting
+ WebCore/inspector/*. Besides files in there, a few other files in
+ JavaScriptCore/inspector, WebKit/, WebKit2/WebProcess/WebCoreSupport/
+ and WebCore/testing were touched.
+
+ * WebCoreSupport/InspectorClientGtk.cpp:
+
</ins><span class="cx"> 2014-02-17 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> WebKitGTK+ should stop calling functions to set the view source mode
</span></span></pre></div>
<a id="trunkSourceWebKitgtkWebCoreSupportInspectorClientGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -157,7 +157,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> InspectorFrontendClient::InspectorFrontendClient(WebKitWebView* inspectedWebView, WebKitWebView* inspectorWebView, WebKitWebInspector* webInspector, Page* inspectorPage, InspectorClient* inspectorClient)
</span><del>- : InspectorFrontendClientLocal(&core(inspectedWebView)->inspectorController(), inspectorPage, adoptPtr(new InspectorFrontendSettingsGtk()))
</del><ins>+ : InspectorFrontendClientLocal(&core(inspectedWebView)->inspectorController(), inspectorPage, std::make_unique<InspectorFrontendSettingsGtk>())
</ins><span class="cx"> , m_inspectorWebView(inspectorWebView)
</span><span class="cx"> , m_inspectedWebView(inspectedWebView)
</span><span class="cx"> , m_webInspector(webInspector)
</span></span></pre></div>
<a id="trunkSourceWebKitiosChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/ChangeLog (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/ChangeLog 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/WebKit/ios/ChangeLog 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-02-17 Sergio Correia <sergio.correia@openbossa.org>
+
+ Replace uses of PassOwnPtr/OwnPtr with std::unique_ptr in WebCore/inspector
+ https://bugs.webkit.org/show_bug.cgi?id=128681
+
+ Reviewed by Timothy Hatcher.
+
+ Another step towards getting rid of PassOwnPtr/OwnPtr, now targeting
+ WebCore/inspector/*. Besides files in there, a few other files in
+ JavaScriptCore/inspector, WebKit/, WebKit2/WebProcess/WebCoreSupport/
+ and WebCore/testing were touched.
+
+ * WebCoreSupport/WebInspectorClientIOS.mm:
+
</ins><span class="cx"> 2014-02-12 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> [WK2][iOS] Add back the special viewport for the old xhtml mobile doctype
</span></span></pre></div>
<a id="trunkSourceWebKitiosWebCoreSupportWebInspectorClientIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/WebCoreSupport/WebInspectorClientIOS.mm (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/WebCoreSupport/WebInspectorClientIOS.mm 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/WebKit/ios/WebCoreSupport/WebInspectorClientIOS.mm 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -39,7 +39,6 @@
</span><span class="cx"> #import <WebCore/Page.h>
</span><span class="cx"> #import <WebCore/Settings.h>
</span><span class="cx"> #import <WebCore/WebCoreThread.h>
</span><del>-#import <wtf/PassOwnPtr.h>
</del><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="lines">@@ -110,8 +109,8 @@
</span><span class="cx"> #pragma mark -
</span><span class="cx"> #pragma mark WebInspectorFrontendClient Implementation
</span><span class="cx">
</span><del>-WebInspectorFrontendClient::WebInspectorFrontendClient(WebView* inspectedWebView, WebInspectorWindowController* windowController, InspectorController* inspectorController, Page* frontendPage, WTF::PassOwnPtr<Settings> settings)
- : InspectorFrontendClientLocal(inspectorController, frontendPage, settings)
</del><ins>+WebInspectorFrontendClient::WebInspectorFrontendClient(WebView* inspectedWebView, WebInspectorWindowController* windowController, InspectorController* inspectorController, Page* frontendPage, std::unique_ptr<Settings> settings)
+ : InspectorFrontendClientLocal(inspectorController, frontendPage, std::move(settings))
</ins><span class="cx"> {
</span><span class="cx"> // iOS does not have a local inspector, this should not be reached.
</span><span class="cx"> notImplemented();
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-02-17 Sergio Correia <sergio.correia@openbossa.org>
+
+ Replace uses of PassOwnPtr/OwnPtr with std::unique_ptr in WebCore/inspector
+ https://bugs.webkit.org/show_bug.cgi?id=128681
+
+ Reviewed by Timothy Hatcher.
+
+ Another step towards getting rid of PassOwnPtr/OwnPtr, now targeting
+ WebCore/inspector/*. Besides files in there, a few other files in
+ JavaScriptCore/inspector, WebKit/, WebKit2/WebProcess/WebCoreSupport/
+ and WebCore/testing were touched.
+
+ * WebCoreSupport/WebInspectorClient.h:
+ * WebCoreSupport/WebInspectorClient.mm:
+
</ins><span class="cx"> 2014-02-15 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] Remove WebSerializedJSValue SPI
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebInspectorClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.h (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.h 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.h 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -6,13 +6,13 @@
</span><span class="cx"> * are met:
</span><span class="cx"> *
</span><span class="cx"> * 1. Redistributions of source code must retain the above copyright
</span><del>- * notice, this list of conditions and the following disclaimer.
</del><ins>+ * notice, this list of conditions and the following disclaimer.
</ins><span class="cx"> * 2. Redistributions in binary form must reproduce the above copyright
</span><span class="cx"> * notice, this list of conditions and the following disclaimer in the
</span><del>- * documentation and/or other materials provided with the distribution.
</del><ins>+ * documentation and/or other materials provided with the distribution.
</ins><span class="cx"> * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
</span><span class="cx"> * its contributors may be used to endorse or promote products derived
</span><del>- * from this software without specific prior written permission.
</del><ins>+ * from this software without specific prior written permission.
</ins><span class="cx"> *
</span><span class="cx"> * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
</span><span class="cx"> * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> void releaseFrontend();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- PassOwnPtr<WebCore::InspectorFrontendClientLocal::Settings> createFrontendSettings();
</del><ins>+ std::unique_ptr<WebCore::InspectorFrontendClientLocal::Settings> createFrontendSettings();
</ins><span class="cx">
</span><span class="cx"> WebView *m_webView;
</span><span class="cx"> RetainPtr<WebNodeHighlighter> m_highlighter;
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx">
</span><span class="cx"> class WebInspectorFrontendClient : public WebCore::InspectorFrontendClientLocal {
</span><span class="cx"> public:
</span><del>- WebInspectorFrontendClient(WebView*, WebInspectorWindowController*, WebCore::InspectorController*, WebCore::Page*, PassOwnPtr<Settings>);
</del><ins>+ WebInspectorFrontendClient(WebView*, WebInspectorWindowController*, WebCore::InspectorController*, WebCore::Page*, std::unique_ptr<Settings>);
</ins><span class="cx">
</span><span class="cx"> void attachAvailabilityChanged(bool);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebInspectorClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -6,13 +6,13 @@
</span><span class="cx"> * are met:
</span><span class="cx"> *
</span><span class="cx"> * 1. Redistributions of source code must retain the above copyright
</span><del>- * notice, this list of conditions and the following disclaimer.
</del><ins>+ * notice, this list of conditions and the following disclaimer.
</ins><span class="cx"> * 2. Redistributions in binary form must reproduce the above copyright
</span><span class="cx"> * notice, this list of conditions and the following disclaimer in the
</span><del>- * documentation and/or other materials provided with the distribution.
</del><ins>+ * documentation and/or other materials provided with the distribution.
</ins><span class="cx"> * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
</span><span class="cx"> * its contributors may be used to endorse or promote products derived
</span><del>- * from this software without specific prior written permission.
</del><ins>+ * from this software without specific prior written permission.
</ins><span class="cx"> *
</span><span class="cx"> * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
</span><span class="cx"> * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
</span><span class="lines">@@ -53,7 +53,6 @@
</span><span class="cx"> #import <WebCore/SoftLinking.h>
</span><span class="cx"> #import <WebKit/DOMExtensions.h>
</span><span class="cx"> #import <WebKitSystemInterface.h>
</span><del>-#import <wtf/PassOwnPtr.h>
</del><span class="cx"> #import <wtf/text/Base64.h>
</span><span class="cx">
</span><span class="cx"> SOFT_LINK_STAGED_FRAMEWORK(WebInspectorUI, PrivateFrameworks, A)
</span><span class="lines">@@ -210,8 +209,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-WebInspectorFrontendClient::WebInspectorFrontendClient(WebView* inspectedWebView, WebInspectorWindowController* windowController, InspectorController* inspectorController, Page* frontendPage, WTF::PassOwnPtr<Settings> settings)
- : InspectorFrontendClientLocal(inspectorController, frontendPage, settings)
</del><ins>+WebInspectorFrontendClient::WebInspectorFrontendClient(WebView* inspectedWebView, WebInspectorWindowController* windowController, InspectorController* inspectorController, Page* frontendPage, std::unique_ptr<Settings> settings)
+ : InspectorFrontendClientLocal(inspectorController, frontendPage, std::move(settings))
</ins><span class="cx"> , m_inspectedWebView(inspectedWebView)
</span><span class="cx"> , m_windowController(windowController)
</span><span class="cx"> {
</span><span class="lines">@@ -233,7 +232,7 @@
</span><span class="cx"> InspectorFrontendClientLocal::frontendLoaded();
</span><span class="cx">
</span><span class="cx"> WebFrame *frame = [m_inspectedWebView mainFrame];
</span><del>-
</del><ins>+
</ins><span class="cx"> WebFrameLoadDelegateImplementationCache* implementations = WebViewGetFrameLoadDelegateImplementations(m_inspectedWebView);
</span><span class="cx"> if (implementations->didClearInspectorWindowObjectForFrameFunc)
</span><span class="cx"> CallFrameLoadDelegate(implementations->didClearInspectorWindowObjectForFrameFunc, m_inspectedWebView,
</span><span class="lines">@@ -319,14 +318,14 @@
</span><span class="cx"> void WebInspectorFrontendClient::save(const String& suggestedURL, const String& content, bool base64Encoded, bool forceSaveDialog)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!suggestedURL.isEmpty());
</span><del>-
</del><ins>+
</ins><span class="cx"> NSURL *platformURL = m_suggestedToActualURLMap.get(suggestedURL).get();
</span><span class="cx"> if (!platformURL) {
</span><span class="cx"> platformURL = [NSURL URLWithString:suggestedURL];
</span><span class="cx"> // The user must confirm new filenames before we can save to them.
</span><span class="cx"> forceSaveDialog = true;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> ASSERT(platformURL);
</span><span class="cx"> if (!platformURL)
</span><span class="cx"> return;
</span><span class="lines">@@ -337,7 +336,7 @@
</span><span class="cx">
</span><span class="cx"> auto saveToURL = ^(NSURL *actualURL) {
</span><span class="cx"> ASSERT(actualURL);
</span><del>-
</del><ins>+
</ins><span class="cx"> m_suggestedToActualURLMap.set(suggestedURLCopy, actualURL);
</span><span class="cx">
</span><span class="cx"> if (base64Encoded) {
</span><span class="lines">@@ -356,7 +355,7 @@
</span><span class="cx"> saveToURL(platformURL);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> NSSavePanel *panel = [NSSavePanel savePanel];
</span><span class="cx"> panel.nameFieldStringValue = platformURL.lastPathComponent;
</span><span class="cx"> panel.directoryURL = [platformURL URLByDeletingLastPathComponent];
</span><span class="lines">@@ -372,7 +371,7 @@
</span><span class="cx"> void WebInspectorFrontendClient::append(const String& suggestedURL, const String& content)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!suggestedURL.isEmpty());
</span><del>-
</del><ins>+
</ins><span class="cx"> RetainPtr<NSURL> actualURL = m_suggestedToActualURLMap.get(suggestedURL);
</span><span class="cx"> // do not append unless the user has already confirmed this filename in save().
</span><span class="cx"> if (!actualURL)
</span><span class="lines">@@ -582,7 +581,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _visible = YES;
</span><del>-
</del><ins>+
</ins><span class="cx"> _shouldAttach = _inspectorClient->inspectorStartsAttached() && _frontendClient->canAttachWindow() && !_inspectorClient->inspectorAttachDisabled();
</span><span class="cx">
</span><span class="cx"> if (_shouldAttach) {
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/WebKit/win/ChangeLog 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-02-17 Sergio Correia <sergio.correia@openbossa.org>
+
+ Replace uses of PassOwnPtr/OwnPtr with std::unique_ptr in WebCore/inspector
+ https://bugs.webkit.org/show_bug.cgi?id=128681
+
+ Reviewed by Timothy Hatcher.
+
+ Another step towards getting rid of PassOwnPtr/OwnPtr, now targeting
+ WebCore/inspector/*. Besides files in there, a few other files in
+ JavaScriptCore/inspector, WebKit/, WebKit2/WebProcess/WebCoreSupport/
+ and WebCore/testing were touched.
+
+ * WebCoreSupport/WebInspectorClient.cpp:
+ * WebCoreSupport/WebInspectorClient.h:
+
</ins><span class="cx"> 2014-02-14 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Make tests more consistent with Mac platform
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebInspectorClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebInspectorClient.cpp (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebInspectorClient.cpp 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebInspectorClient.cpp 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -6,13 +6,13 @@
</span><span class="cx"> * are met:
</span><span class="cx"> *
</span><span class="cx"> * 1. Redistributions of source code must retain the above copyright
</span><del>- * notice, this list of conditions and the following disclaimer.
</del><ins>+ * notice, this list of conditions and the following disclaimer.
</ins><span class="cx"> * 2. Redistributions in binary form must reproduce the above copyright
</span><span class="cx"> * notice, this list of conditions and the following disclaimer in the
</span><del>- * documentation and/or other materials provided with the distribution.
</del><ins>+ * documentation and/or other materials provided with the distribution.
</ins><span class="cx"> * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
</span><span class="cx"> * its contributors may be used to endorse or promote products derived
</span><del>- * from this software without specific prior written permission.
</del><ins>+ * from this software without specific prior written permission.
</ins><span class="cx"> *
</span><span class="cx"> * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
</span><span class="cx"> * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
</span><span class="lines">@@ -224,8 +224,8 @@
</span><span class="cx"> m_frontendHandle = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebInspectorFrontendClient::WebInspectorFrontendClient(WebView* inspectedWebView, HWND inspectedWebViewHwnd, HWND frontendHwnd, const COMPtr<WebView>& frontendWebView, HWND frontendWebViewHwnd, WebInspectorClient* inspectorClient, PassOwnPtr<Settings> settings)
- : InspectorFrontendClientLocal(&inspectedWebView->page()->inspectorController(), core(frontendWebView.get()), settings)
</del><ins>+WebInspectorFrontendClient::WebInspectorFrontendClient(WebView* inspectedWebView, HWND inspectedWebViewHwnd, HWND frontendHwnd, const COMPtr<WebView>& frontendWebView, HWND frontendWebViewHwnd, WebInspectorClient* inspectorClient, std::unique_ptr<Settings> settings)
+ : InspectorFrontendClientLocal(&inspectedWebView->page()->inspectorController(), core(frontendWebView.get()), std::move(settings))
</ins><span class="cx"> , m_inspectedWebView(inspectedWebView)
</span><span class="cx"> , m_inspectedWebViewHwnd(inspectedWebViewHwnd)
</span><span class="cx"> , m_inspectorClient(inspectorClient)
</span><span class="lines">@@ -288,7 +288,7 @@
</span><span class="cx">
</span><span class="cx"> closeWindowWithoutNotifications();
</span><span class="cx"> // We need to set the attached window's height before we actually attach the window.
</span><del>- // Make sure that m_attached is true so that calling setAttachedWindowHeight from restoreAttachedWindowHeight doesn't return early.
</del><ins>+ // Make sure that m_attached is true so that calling setAttachedWindowHeight from restoreAttachedWindowHeight doesn't return early.
</ins><span class="cx"> m_attached = true;
</span><span class="cx"> // Immediately after calling showWindowWithoutNotifications(), the parent frameview's visibleHeight incorrectly returns 0 always (Windows only).
</span><span class="cx"> // We are expecting this value to be just the height of the parent window when we call restoreAttachedWindowHeight, which it is before
</span><span class="lines">@@ -332,7 +332,7 @@
</span><span class="cx"> // of the inspected web view happens in onWebViewWindowPosChanging, not here.
</span><span class="cx"> SetWindowPos(m_inspectedWebViewHwnd, 0, 0, 0, webViewWidth, totalHeight, SWP_NOZORDER);
</span><span class="cx">
</span><del>- RedrawWindow(m_frontendWebViewHwnd, 0, 0, RDW_INVALIDATE | RDW_ALLCHILDREN | RDW_UPDATENOW);
</del><ins>+ RedrawWindow(m_frontendWebViewHwnd, 0, 0, RDW_INVALIDATE | RDW_ALLCHILDREN | RDW_UPDATENOW);
</ins><span class="cx"> RedrawWindow(m_inspectedWebViewHwnd, 0, 0, RDW_INVALIDATE | RDW_ALLCHILDREN | RDW_UPDATENOW);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebInspectorClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebInspectorClient.h (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebInspectorClient.h 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebInspectorClient.h 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -6,13 +6,13 @@
</span><span class="cx"> * are met:
</span><span class="cx"> *
</span><span class="cx"> * 1. Redistributions of source code must retain the above copyright
</span><del>- * notice, this list of conditions and the following disclaimer.
</del><ins>+ * notice, this list of conditions and the following disclaimer.
</ins><span class="cx"> * 2. Redistributions in binary form must reproduce the above copyright
</span><span class="cx"> * notice, this list of conditions and the following disclaimer in the
</span><del>- * documentation and/or other materials provided with the distribution.
</del><ins>+ * documentation and/or other materials provided with the distribution.
</ins><span class="cx"> * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
</span><span class="cx"> * its contributors may be used to endorse or promote products derived
</span><del>- * from this software without specific prior written permission.
</del><ins>+ * from this software without specific prior written permission.
</ins><span class="cx"> *
</span><span class="cx"> * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
</span><span class="cx"> * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> virtual ~WebInspectorClient();
</span><del>- WTF::PassOwnPtr<WebCore::InspectorFrontendClientLocal::Settings> createFrontendSettings();
</del><ins>+ std::unique_ptr<WebCore::InspectorFrontendClientLocal::Settings> createFrontendSettings();
</ins><span class="cx">
</span><span class="cx"> WebView* m_inspectedWebView;
</span><span class="cx"> WebCore::Page* m_frontendPage;
</span><span class="lines">@@ -94,19 +94,19 @@
</span><span class="cx">
</span><span class="cx"> class WebInspectorFrontendClient : public WebCore::InspectorFrontendClientLocal, WebCore::WindowMessageListener {
</span><span class="cx"> public:
</span><del>- WebInspectorFrontendClient(WebView* inspectedWebView, HWND inspectedWebViewHwnd, HWND frontendHwnd, const COMPtr<WebView>& frotnendWebView, HWND frontendWebViewHwnd, WebInspectorClient*, WTF::PassOwnPtr<Settings>);
</del><ins>+ WebInspectorFrontendClient(WebView* inspectedWebView, HWND inspectedWebViewHwnd, HWND frontendHwnd, const COMPtr<WebView>& frotnendWebView, HWND frontendWebViewHwnd, WebInspectorClient*, std::unique_ptr<Settings>);
</ins><span class="cx"> virtual ~WebInspectorFrontendClient();
</span><span class="cx">
</span><span class="cx"> virtual void frontendLoaded();
</span><del>-
</del><ins>+
</ins><span class="cx"> virtual WTF::String localizedStringsURL();
</span><del>-
</del><ins>+
</ins><span class="cx"> virtual void bringToFront();
</span><span class="cx"> virtual void closeWindow();
</span><del>-
</del><ins>+
</ins><span class="cx"> virtual void attachWindow(DockSide);
</span><span class="cx"> virtual void detachWindow();
</span><del>-
</del><ins>+
</ins><span class="cx"> virtual void setAttachedWindowHeight(unsigned height);
</span><span class="cx"> virtual void setAttachedWindowWidth(unsigned);
</span><span class="cx"> virtual void setToolbarHeight(unsigned) override;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-02-17 Sergio Correia <sergio.correia@openbossa.org>
+
+ Replace uses of PassOwnPtr/OwnPtr with std::unique_ptr in WebCore/inspector
+ https://bugs.webkit.org/show_bug.cgi?id=128681
+
+ Reviewed by Timothy Hatcher.
+
+ Another step towards getting rid of PassOwnPtr/OwnPtr, now targeting
+ WebCore/inspector/*. Besides files in there, a few other files in
+ JavaScriptCore/inspector, WebKit/, WebKit2/WebProcess/WebCoreSupport/
+ and WebCore/testing were touched.
+
+ * WebProcess/WebCoreSupport/WebInspectorFrontendClient.cpp:
+
</ins><span class="cx"> 2014-02-17 Michał Pakuła vel Rutka <m.pakula@samsung.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed EFL build fix attempt
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebInspectorFrontendClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebInspectorFrontendClient.cpp (164244 => 164245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebInspectorFrontendClient.cpp 2014-02-17 20:25:04 UTC (rev 164244)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebInspectorFrontendClient.cpp 2014-02-17 20:35:05 UTC (rev 164245)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> WebInspectorFrontendClient::WebInspectorFrontendClient(WebPage* page, WebPage* inspectorPage)
</span><del>- : InspectorFrontendClientLocal(&page->corePage()->inspectorController(), inspectorPage->corePage(), adoptPtr(new Settings()))
</del><ins>+ : InspectorFrontendClientLocal(&page->corePage()->inspectorController(), inspectorPage->corePage(), std::make_unique<Settings>())
</ins><span class="cx"> , m_page(page)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>