<!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>[165545] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/165545">165545</a></dd>
<dt>Author</dt> <dd>bburg@apple.com</dd>
<dt>Date</dt> <dd>2014-03-13 10:47:53 -0700 (Thu, 13 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Remove unused callId parameter from evaluateInWebInspector
https://bugs.webkit.org/show_bug.cgi?id=129744
Reviewed by Timothy Hatcher.
Source/JavaScriptCore:
* inspector/agents/InspectorAgent.cpp:
(Inspector::InspectorAgent::enable):
(Inspector::InspectorAgent::evaluateForTestInFrontend):
* inspector/agents/InspectorAgent.h:
* inspector/protocol/InspectorDomain.json:
Source/WebCore:
* WebCore.exp.in:
* inspector/InspectorController.cpp:
(WebCore::InspectorController::evaluateForTestInFrontend):
* inspector/InspectorController.h:
Source/WebInspectorUI:
* UserInterface/Protocol/InspectorJSBackendCommands.js:
* UserInterface/Protocol/InspectorObserver.js:
(WebInspector.InspectorObserver.prototype.evaluateForTestInFrontend):
Source/WebKit/efl:
* WebCoreSupport/DumpRenderTreeSupportEfl.cpp:
(DumpRenderTreeSupportEfl::evaluateInWebInspector):
* WebCoreSupport/DumpRenderTreeSupportEfl.h:
Source/WebKit/gtk:
* webkit/webkitwebinspector.cpp:
(webkit_web_inspector_execute_script):
* webkit/webkitwebinspectorprivate.h:
Source/WebKit/mac:
* WebInspector/WebInspector.mm:
(-[WebInspector evaluateInFrontend:script:]):
* WebInspector/WebInspectorPrivate.h:
Source/WebKit/win:
* WebInspector.cpp:
(WebInspector::evaluateInFrontend):
* WebInspector.h:
Source/WebKit2:
* WebProcess/InjectedBundle/API/c/WKBundleInspector.cpp:
(WKBundleInspectorEvaluateScriptForTest):
* WebProcess/InjectedBundle/API/c/WKBundleInspector.h:
* WebProcess/WebPage/WebInspector.cpp:
(WebKit::WebInspector::evaluateScriptForTest):
* WebProcess/WebPage/WebInspector.h:
Tools:
* DumpRenderTree/TestRunner.cpp:
(evaluateInWebInspectorCallback):
* DumpRenderTree/TestRunner.h:
* DumpRenderTree/efl/TestRunnerEfl.cpp:
(TestRunner::evaluateInWebInspector):
* DumpRenderTree/gtk/TestRunnerGtk.cpp:
(TestRunner::evaluateInWebInspector):
* DumpRenderTree/mac/TestRunnerMac.mm:
(TestRunner::evaluateInWebInspector):
* DumpRenderTree/win/TestRunnerWin.cpp:
(TestRunner::evaluateInWebInspector):
* WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl:
* WebKitTestRunner/InjectedBundle/TestRunner.cpp:
(WTR::TestRunner::evaluateInWebInspector):
* WebKitTestRunner/InjectedBundle/TestRunner.h:
LayoutTests:
* inspector/inspector-test.js:
(runTest): Stop passing a dummy argument to TestRunner.evaluateInWebInspector.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsinspectorinspectortestjs">trunk/LayoutTests/inspector/inspector-test.js</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorAgentcpp">trunk/Source/JavaScriptCore/inspector/agents/InspectorAgent.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorAgenth">trunk/Source/JavaScriptCore/inspector/agents/InspectorAgent.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorprotocolInspectorDomainjson">trunk/Source/JavaScriptCore/inspector/protocol/InspectorDomain.json</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="#trunkSourceWebCoreinspectorInspectorControllercpp">trunk/Source/WebCore/inspector/InspectorController.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorControllerh">trunk/Source/WebCore/inspector/InspectorController.h</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceProtocolInspectorJSBackendCommandsjs">trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorJSBackendCommands.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceProtocolInspectorObserverjs">trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorObserver.js</a></li>
<li><a href="#trunkSourceWebKiteflChangeLog">trunk/Source/WebKit/efl/ChangeLog</a></li>
<li><a href="#trunkSourceWebKiteflWebCoreSupportDumpRenderTreeSupportEflcpp">trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp</a></li>
<li><a href="#trunkSourceWebKiteflWebCoreSupportDumpRenderTreeSupportEflh">trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.h</a></li>
<li><a href="#trunkSourceWebKitgtkChangeLog">trunk/Source/WebKit/gtk/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitgtkwebkitwebkitwebinspectorcpp">trunk/Source/WebKit/gtk/webkit/webkitwebinspector.cpp</a></li>
<li><a href="#trunkSourceWebKitgtkwebkitwebkitwebinspectorprivateh">trunk/Source/WebKit/gtk/webkit/webkitwebinspectorprivate.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebInspectorWebInspectormm">trunk/Source/WebKit/mac/WebInspector/WebInspector.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebInspectorWebInspectorPrivateh">trunk/Source/WebKit/mac/WebInspector/WebInspectorPrivate.h</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebInspectorcpp">trunk/Source/WebKit/win/WebInspector.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebInspectorh">trunk/Source/WebKit/win/WebInspector.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundleInspectorcpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleInspector.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundleInspectorh">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleInspector.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebInspectorcpp">trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebInspectorh">trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreeTestRunnercpp">trunk/Tools/DumpRenderTree/TestRunner.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreeTestRunnerh">trunk/Tools/DumpRenderTree/TestRunner.h</a></li>
<li><a href="#trunkToolsDumpRenderTreeeflTestRunnerEflcpp">trunk/Tools/DumpRenderTree/efl/TestRunnerEfl.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreegtkTestRunnerGtkcpp">trunk/Tools/DumpRenderTree/gtk/TestRunnerGtk.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreemacTestRunnerMacmm">trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm</a></li>
<li><a href="#trunkToolsDumpRenderTreewinTestRunnerWincpp">trunk/Tools/DumpRenderTree/win/TestRunnerWin.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleBindingsTestRunneridl">trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleTestRunnercpp">trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleTestRunnerh">trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (165544 => 165545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-03-13 17:45:38 UTC (rev 165544)
+++ trunk/LayoutTests/ChangeLog 2014-03-13 17:47:53 UTC (rev 165545)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-03-13 Brian Burg <bburg@apple.com>
+
+ Web Inspector: Remove unused callId parameter from evaluateInWebInspector
+ https://bugs.webkit.org/show_bug.cgi?id=129744
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/inspector-test.js:
+ (runTest): Stop passing a dummy argument to TestRunner.evaluateInWebInspector.
+
</ins><span class="cx"> 2014-03-13 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Subpixel rendering: Nested layers with subpixel accumulation paint to wrong position.
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorinspectortestjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/inspector-test.js (165544 => 165545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/inspector-test.js 2014-03-13 17:45:38 UTC (rev 165544)
+++ trunk/LayoutTests/inspector/inspector-test.js 2014-03-13 17:47:53 UTC (rev 165545)
</span><span class="lines">@@ -88,11 +88,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> var codeStringToEvaluate = "(" + runInitializationMethodsInFrontend.toString() + ")([" + InspectorTestProxy._initializers + "]);";
</span><del>- testRunner.evaluateInWebInspector(0, codeStringToEvaluate);
</del><ins>+ testRunner.evaluateInWebInspector(codeStringToEvaluate);
</ins><span class="cx">
</span><span class="cx"> // `test` refers to a function defined in global scope in the test HTML page.
</span><span class="cx"> codeStringToEvaluate = "(" + runTestMethodInFrontend.toString() + ")(" + test.toString() + ");";
</span><del>- testRunner.evaluateInWebInspector(0, codeStringToEvaluate);
</del><ins>+ testRunner.evaluateInWebInspector(codeStringToEvaluate);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> InspectorTestProxy.completeTest = function()
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (165544 => 165545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-03-13 17:45:38 UTC (rev 165544)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-03-13 17:47:53 UTC (rev 165545)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-03-13 Brian Burg <bburg@apple.com>
+
+ Web Inspector: Remove unused callId parameter from evaluateInWebInspector
+ https://bugs.webkit.org/show_bug.cgi?id=129744
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/agents/InspectorAgent.cpp:
+ (Inspector::InspectorAgent::enable):
+ (Inspector::InspectorAgent::evaluateForTestInFrontend):
+ * inspector/agents/InspectorAgent.h:
+ * inspector/protocol/InspectorDomain.json:
+
</ins><span class="cx"> 2014-03-11 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> ASSERTION FAILED: node->op() == Phi || node->op() == SetArgument
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorAgent.cpp (165544 => 165545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorAgent.cpp 2014-03-13 17:45:38 UTC (rev 165544)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorAgent.cpp 2014-03-13 17:47:53 UTC (rev 165545)
</span><span class="lines">@@ -35,8 +35,6 @@
</span><span class="cx">
</span><span class="cx"> #include "InspectorValues.h"
</span><span class="cx"> #include "ScriptValue.h"
</span><del>-#include <wtf/PassRefPtr.h>
-#include <wtf/RefPtr.h>
</del><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><span class="lines">@@ -74,8 +72,13 @@
</span><span class="cx"> if (m_pendingInspectData.first)
</span><span class="cx"> inspect(m_pendingInspectData.first, m_pendingInspectData.second);
</span><span class="cx">
</span><del>- for (Vector<std::pair<long, String>>::iterator it = m_pendingEvaluateTestCommands.begin(); m_frontendDispatcher && it != m_pendingEvaluateTestCommands.end(); ++it)
- m_frontendDispatcher->evaluateForTestInFrontend(static_cast<int>((*it).first), (*it).second);
</del><ins>+ for (auto& testCommand : m_pendingEvaluateTestCommands) {
+ if (!m_frontendDispatcher)
+ break;
+
+ m_frontendDispatcher->evaluateForTestInFrontend(testCommand);
+ }
+
</ins><span class="cx"> m_pendingEvaluateTestCommands.clear();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -97,12 +100,12 @@
</span><span class="cx"> m_pendingInspectData.second = hints;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorAgent::evaluateForTestInFrontend(long callId, const String& script)
</del><ins>+void InspectorAgent::evaluateForTestInFrontend(const String& script)
</ins><span class="cx"> {
</span><span class="cx"> if (m_enabled && m_frontendDispatcher)
</span><del>- m_frontendDispatcher->evaluateForTestInFrontend(static_cast<int>(callId), script);
</del><ins>+ m_frontendDispatcher->evaluateForTestInFrontend(script);
</ins><span class="cx"> else
</span><del>- m_pendingEvaluateTestCommands.append(std::pair<long, String>(callId, script));
</del><ins>+ m_pendingEvaluateTestCommands.append(script);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorAgent.h (165544 => 165545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorAgent.h 2014-03-13 17:45:38 UTC (rev 165544)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorAgent.h 2014-03-13 17:47:53 UTC (rev 165545)
</span><span class="lines">@@ -36,7 +36,6 @@
</span><span class="cx"> #include "InspectorJSFrontendDispatchers.h"
</span><span class="cx"> #include "inspector/InspectorAgentBase.h"
</span><span class="cx"> #include <wtf/Forward.h>
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -61,12 +60,12 @@
</span><span class="cx"> virtual void disable(ErrorString*) override;
</span><span class="cx">
</span><span class="cx"> void inspect(PassRefPtr<TypeBuilder::Runtime::RemoteObject> objectToInspect, PassRefPtr<InspectorObject> hints);
</span><del>- void evaluateForTestInFrontend(long testCallId, const String& script);
</del><ins>+ void evaluateForTestInFrontend(const String& script);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> std::unique_ptr<InspectorInspectorFrontendDispatcher> m_frontendDispatcher;
</span><span class="cx"> RefPtr<InspectorInspectorBackendDispatcher> m_backendDispatcher;
</span><del>- Vector<std::pair<long, String>> m_pendingEvaluateTestCommands;
</del><ins>+ Vector<String> m_pendingEvaluateTestCommands;
</ins><span class="cx"> std::pair<RefPtr<TypeBuilder::Runtime::RemoteObject>, RefPtr<InspectorObject>> m_pendingInspectData;
</span><span class="cx"> bool m_enabled;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorprotocolInspectorDomainjson"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/protocol/InspectorDomain.json (165544 => 165545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/protocol/InspectorDomain.json 2014-03-13 17:45:38 UTC (rev 165544)
+++ trunk/Source/JavaScriptCore/inspector/protocol/InspectorDomain.json 2014-03-13 17:47:53 UTC (rev 165545)
</span><span class="lines">@@ -15,7 +15,6 @@
</span><span class="cx"> {
</span><span class="cx"> "name": "evaluateForTestInFrontend",
</span><span class="cx"> "parameters": [
</span><del>- { "name": "testCallId", "type": "integer" },
</del><span class="cx"> { "name": "script", "type": "string" }
</span><span class="cx"> ]
</span><span class="cx"> },
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (165544 => 165545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-13 17:45:38 UTC (rev 165544)
+++ trunk/Source/WebCore/ChangeLog 2014-03-13 17:47:53 UTC (rev 165545)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-03-13 Brian Burg <bburg@apple.com>
+
+ Web Inspector: Remove unused callId parameter from evaluateInWebInspector
+ https://bugs.webkit.org/show_bug.cgi?id=129744
+
+ Reviewed by Timothy Hatcher.
+
+ * WebCore.exp.in:
+ * inspector/InspectorController.cpp:
+ (WebCore::InspectorController::evaluateForTestInFrontend):
+ * inspector/InspectorController.h:
+
</ins><span class="cx"> 2014-03-13 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Optimize hasTagName when called on an HTMLElement
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (165544 => 165545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-03-13 17:45:38 UTC (rev 165544)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-03-13 17:47:53 UTC (rev 165545)
</span><span class="lines">@@ -2986,7 +2986,7 @@
</span><span class="cx"> __ZN7WebCore19InspectorController15connectFrontendEPN9Inspector24InspectorFrontendChannelE
</span><span class="cx"> __ZN7WebCore19InspectorController18disconnectFrontendEN9Inspector25InspectorDisconnectReasonE
</span><span class="cx"> __ZN7WebCore19InspectorController18setProfilerEnabledEb
</span><del>-__ZN7WebCore19InspectorController25evaluateForTestInFrontendElRKN3WTF6StringE
</del><ins>+__ZN7WebCore19InspectorController25evaluateForTestInFrontendERKN3WTF6StringE
</ins><span class="cx"> __ZN7WebCore19InspectorController26setInspectorFrontendClientENSt3__110unique_ptrINS_23InspectorFrontendClientENS1_14default_deleteIS3_EEEE
</span><span class="cx"> __ZN7WebCore19InspectorController39setResourcesDataSizeLimitsFromInternalsEii
</span><span class="cx"> __ZN7WebCore19InspectorController4showEv
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorController.cpp (165544 => 165545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorController.cpp 2014-03-13 17:45:38 UTC (rev 165544)
+++ trunk/Source/WebCore/inspector/InspectorController.cpp 2014-03-13 17:47:53 UTC (rev 165545)
</span><span class="lines">@@ -310,9 +310,9 @@
</span><span class="cx"> IdentifiersFactory::setProcessId(processId);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorController::evaluateForTestInFrontend(long callId, const String& script)
</del><ins>+void InspectorController::evaluateForTestInFrontend(const String& script)
</ins><span class="cx"> {
</span><del>- m_inspectorAgent->evaluateForTestInFrontend(callId, script);
</del><ins>+ m_inspectorAgent->evaluateForTestInFrontend(script);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorController::drawHighlight(GraphicsContext& context) const
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorController.h (165544 => 165545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorController.h 2014-03-13 17:45:38 UTC (rev 165544)
+++ trunk/Source/WebCore/inspector/InspectorController.h 2014-03-13 17:47:53 UTC (rev 165545)
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx">
</span><span class="cx"> bool isUnderTest() const { return m_isUnderTest; }
</span><span class="cx"> void setIsUnderTest(bool isUnderTest) { m_isUnderTest = isUnderTest; }
</span><del>- void evaluateForTestInFrontend(long callId, const String& script);
</del><ins>+ void evaluateForTestInFrontend(const String& script);
</ins><span class="cx">
</span><span class="cx"> bool profilerEnabled() const;
</span><span class="cx"> void setProfilerEnabled(bool);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (165544 => 165545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2014-03-13 17:45:38 UTC (rev 165544)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-03-13 17:47:53 UTC (rev 165545)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-03-12 Brian Burg <bburg@apple.com>
+
+ Web Inspector: Remove unused callId parameter from evaluateInWebInspector
+ https://bugs.webkit.org/show_bug.cgi?id=129744
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Protocol/InspectorJSBackendCommands.js:
+ * UserInterface/Protocol/InspectorObserver.js:
+ (WebInspector.InspectorObserver.prototype.evaluateForTestInFrontend):
+
</ins><span class="cx"> 2014-03-12 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: [iOS 6] uncaught exception attempting to use CSSAgent.getNamedFlowCollection
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceProtocolInspectorJSBackendCommandsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorJSBackendCommands.js (165544 => 165545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorJSBackendCommands.js 2014-03-13 17:45:38 UTC (rev 165544)
+++ trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorJSBackendCommands.js 2014-03-13 17:47:53 UTC (rev 165545)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx">
</span><span class="cx"> // Inspector.
</span><span class="cx"> InspectorBackend.registerInspectorDispatcher = InspectorBackend.registerDomainDispatcher.bind(InspectorBackend, "Inspector");
</span><del>-InspectorBackend.registerEvent("Inspector.evaluateForTestInFrontend", ["testCallId", "script"]);
</del><ins>+InspectorBackend.registerEvent("Inspector.evaluateForTestInFrontend", ["script"]);
</ins><span class="cx"> InspectorBackend.registerEvent("Inspector.inspect", ["object", "hints"]);
</span><span class="cx"> InspectorBackend.registerEvent("Inspector.detached", ["reason"]);
</span><span class="cx"> InspectorBackend.registerEvent("Inspector.targetCrashed", []);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceProtocolInspectorObserverjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorObserver.js (165544 => 165545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorObserver.js 2014-03-13 17:45:38 UTC (rev 165544)
+++ trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorObserver.js 2014-03-13 17:47:53 UTC (rev 165545)
</span><span class="lines">@@ -33,8 +33,7 @@
</span><span class="cx">
</span><span class="cx"> // Events defined by the "Inspector" domain.
</span><span class="cx">
</span><del>- // FIXME: Remove plumbing for callIdentifier parameter from backend, as it's not used.
- evaluateForTestInFrontend: function(callIdentifier, script)
</del><ins>+ evaluateForTestInFrontend: function(script)
</ins><span class="cx"> {
</span><span class="cx"> if (!InspectorFrontendHost.isUnderTest())
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebKiteflChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/efl/ChangeLog (165544 => 165545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/efl/ChangeLog 2014-03-13 17:45:38 UTC (rev 165544)
+++ trunk/Source/WebKit/efl/ChangeLog 2014-03-13 17:47:53 UTC (rev 165545)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-03-12 Brian Burg <bburg@apple.com>
+
+ Web Inspector: Remove unused callId parameter from evaluateInWebInspector
+ https://bugs.webkit.org/show_bug.cgi?id=129744
+
+ Reviewed by Timothy Hatcher.
+
+ * WebCoreSupport/DumpRenderTreeSupportEfl.cpp:
+ (DumpRenderTreeSupportEfl::evaluateInWebInspector):
+ * WebCoreSupport/DumpRenderTreeSupportEfl.h:
+
</ins><span class="cx"> 2014-03-12 Hyowon Kim <hw1008.kim@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL] Revise AcceleratedCompositingEfl implementation.
</span></span></pre></div>
<a id="trunkSourceWebKiteflWebCoreSupportDumpRenderTreeSupportEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp (165544 => 165545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp 2014-03-13 17:45:38 UTC (rev 165544)
+++ trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp 2014-03-13 17:47:53 UTC (rev 165545)
</span><span class="lines">@@ -453,15 +453,14 @@
</span><span class="cx"> return historyItem->isTargetItem();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DumpRenderTreeSupportEfl::evaluateInWebInspector(const Evas_Object* ewkView, long callId, const String& script)
</del><ins>+void DumpRenderTreeSupportEfl::evaluateInWebInspector(const Evas_Object* ewkView, const String& script)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx"> DRT_SUPPRT_PAGE_GET_OR_RETURN(ewkView, page);
</span><span class="cx">
</span><del>- page->inspectorController().evaluateForTestInFrontend(callId, script);
</del><ins>+ page->inspectorController().evaluateForTestInFrontend(script);
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(ewkView);
</span><del>- UNUSED_PARAM(callId);
</del><span class="cx"> UNUSED_PARAM(script);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKiteflWebCoreSupportDumpRenderTreeSupportEflh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.h (165544 => 165545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.h 2014-03-13 17:45:38 UTC (rev 165544)
+++ trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.h 2014-03-13 17:47:53 UTC (rev 165545)
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx"> static HistoryItemChildrenVector childHistoryItems(const Ewk_History_Item*);
</span><span class="cx"> static String historyItemTarget(const Ewk_History_Item*);
</span><span class="cx"> static bool isTargetItem(const Ewk_History_Item*);
</span><del>- static void evaluateInWebInspector(const Evas_Object* ewkView, long callId, const String& script);
</del><ins>+ static void evaluateInWebInspector(const Evas_Object* ewkView, const String& script);
</ins><span class="cx"> static void evaluateScriptInIsolatedWorld(const Evas_Object* ewkFrame, int worldID, JSObjectRef globalObject, const String& script);
</span><span class="cx"> static JSGlobalContextRef globalContextRefForFrame(const Evas_Object* ewkFrame);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitgtkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/ChangeLog (165544 => 165545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/ChangeLog 2014-03-13 17:45:38 UTC (rev 165544)
+++ trunk/Source/WebKit/gtk/ChangeLog 2014-03-13 17:47:53 UTC (rev 165545)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-03-12 Brian Burg <bburg@apple.com>
+
+ Web Inspector: Remove unused callId parameter from evaluateInWebInspector
+ https://bugs.webkit.org/show_bug.cgi?id=129744
+
+ Reviewed by Timothy Hatcher.
+
+ * webkit/webkitwebinspector.cpp:
+ (webkit_web_inspector_execute_script):
+ * webkit/webkitwebinspectorprivate.h:
+
</ins><span class="cx"> 2014-03-12 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] [Stable] deadlock in gobject introspection
</span></span></pre></div>
<a id="trunkSourceWebKitgtkwebkitwebkitwebinspectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/webkit/webkitwebinspector.cpp (165544 => 165545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/webkit/webkitwebinspector.cpp 2014-03-13 17:45:38 UTC (rev 165544)
+++ trunk/Source/WebKit/gtk/webkit/webkitwebinspector.cpp 2014-03-13 17:47:53 UTC (rev 165545)
</span><span class="lines">@@ -556,11 +556,11 @@
</span><span class="cx"> priv->page->inspectorController().close();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void webkit_web_inspector_execute_script(WebKitWebInspector* webInspector, long callId, const gchar* script)
</del><ins>+void webkit_web_inspector_execute_script(WebKitWebInspector* webInspector, const gchar* script)
</ins><span class="cx"> {
</span><span class="cx"> g_return_if_fail(WEBKIT_IS_WEB_INSPECTOR(webInspector));
</span><span class="cx"> g_return_if_fail(script);
</span><span class="cx">
</span><span class="cx"> WebKitWebInspectorPrivate* priv = webInspector->priv;
</span><del>- priv->page->inspectorController().evaluateForTestInFrontend(callId, script);
</del><ins>+ priv->page->inspectorController().evaluateForTestInFrontend(script);
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitgtkwebkitwebkitwebinspectorprivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/webkit/webkitwebinspectorprivate.h (165544 => 165545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/webkit/webkitwebinspectorprivate.h 2014-03-13 17:45:38 UTC (rev 165544)
+++ trunk/Source/WebKit/gtk/webkit/webkitwebinspectorprivate.h 2014-03-13 17:47:53 UTC (rev 165545)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx">
</span><span class="cx"> void webkit_web_inspector_set_inspected_uri(WebKitWebInspector*, const gchar*);
</span><span class="cx">
</span><del>-WEBKIT_API void webkit_web_inspector_execute_script(WebKitWebInspector*, long callId, const gchar* script);
</del><ins>+WEBKIT_API void webkit_web_inspector_execute_script(WebKitWebInspector*, const gchar* script);
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (165544 => 165545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-03-13 17:45:38 UTC (rev 165544)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-03-13 17:47:53 UTC (rev 165545)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-03-12 Brian Burg <bburg@apple.com>
+
+ Web Inspector: Remove unused callId parameter from evaluateInWebInspector
+ https://bugs.webkit.org/show_bug.cgi?id=129744
+
+ Reviewed by Timothy Hatcher.
+
+ * WebInspector/WebInspector.mm:
+ (-[WebInspector evaluateInFrontend:script:]):
+ * WebInspector/WebInspectorPrivate.h:
+
</ins><span class="cx"> 2014-03-12 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> [WebGL] WebKit1 + WebKit2 iOS clients should check load policy
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebInspectorWebInspectormm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebInspector/WebInspector.mm (165544 => 165545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebInspector/WebInspector.mm 2014-03-13 17:45:38 UTC (rev 165544)
+++ trunk/Source/WebKit/mac/WebInspector/WebInspector.mm 2014-03-13 17:47:53 UTC (rev 165545)
</span><span class="lines">@@ -182,10 +182,10 @@
</span><span class="cx"> [_frontend detach];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)evaluateInFrontend:(id)sender callId:(long)callId script:(NSString *)script
</del><ins>+- (void)evaluateInFrontend:(id)sender script:(NSString *)script
</ins><span class="cx"> {
</span><span class="cx"> if (Page* page = core(_webView))
</span><del>- page->inspectorController().evaluateForTestInFrontend(callId, script);
</del><ins>+ page->inspectorController().evaluateForTestInFrontend(script);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)setFrontend:(WebInspectorFrontend *)frontend
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebInspectorWebInspectorPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebInspector/WebInspectorPrivate.h (165544 => 165545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebInspector/WebInspectorPrivate.h 2014-03-13 17:45:38 UTC (rev 165544)
+++ trunk/Source/WebKit/mac/WebInspector/WebInspectorPrivate.h 2014-03-13 17:47:53 UTC (rev 165545)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> @class WebInspectorFrontend;
</span><span class="cx">
</span><span class="cx"> @interface WebInspector (WebPrivate)
</span><del>-- (void)evaluateInFrontend:(id)sender callId:(long)callId script:(NSString *)script;
</del><ins>+- (void)evaluateInFrontend:(id)sender script:(NSString *)script;
</ins><span class="cx"> - (void)showWindow;
</span><span class="cx"> - (void)setFrontend:(WebInspectorFrontend *)frontend;
</span><span class="cx"> - (void)releaseFrontend;
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (165544 => 165545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2014-03-13 17:45:38 UTC (rev 165544)
+++ trunk/Source/WebKit/win/ChangeLog 2014-03-13 17:47:53 UTC (rev 165545)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-03-12 Brian Burg <bburg@apple.com>
+
+ Web Inspector: Remove unused callId parameter from evaluateInWebInspector
+ https://bugs.webkit.org/show_bug.cgi?id=129744
+
+ Reviewed by Timothy Hatcher.
+
+ * WebInspector.cpp:
+ (WebInspector::evaluateInFrontend):
+ * WebInspector.h:
+
</ins><span class="cx"> 2014-03-06 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Expose the console object in JSContexts to interact with Web Inspector
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebInspectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebInspector.cpp (165544 => 165545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebInspector.cpp 2014-03-13 17:45:38 UTC (rev 165544)
+++ trunk/Source/WebKit/win/WebInspector.cpp 2014-03-13 17:47:53 UTC (rev 165545)
</span><span class="lines">@@ -237,7 +237,7 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE WebInspector::evaluateInFrontend(ULONG callId, BSTR bScript)
</del><ins>+HRESULT STDMETHODCALLTYPE WebInspector::evaluateInFrontend(BSTR bScript)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_webView)
</span><span class="cx"> return S_OK;
</span><span class="lines">@@ -247,7 +247,7 @@
</span><span class="cx"> return S_OK;
</span><span class="cx">
</span><span class="cx"> String script(bScript, SysStringLen(bScript));
</span><del>- page->inspectorController().evaluateForTestInFrontend(callId, script);
</del><ins>+ page->inspectorController().evaluateForTestInFrontend(script);
</ins><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebInspectorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebInspector.h (165544 => 165545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebInspector.h 2014-03-13 17:45:38 UTC (rev 165544)
+++ trunk/Source/WebKit/win/WebInspector.h 2014-03-13 17:47:53 UTC (rev 165545)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE isJavaScriptProfilingEnabled(BOOL* isProfilingEnabled);
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE setJavaScriptProfilingEnabled(BOOL);
</span><span class="cx">
</span><del>- virtual HRESULT STDMETHODCALLTYPE evaluateInFrontend(ULONG callId, BSTR script);
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE evaluateInFrontend(BSTR script);
</ins><span class="cx">
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE isTimelineProfilingEnabled(BOOL* isEnabled);
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE setTimelineProfilingEnabled(BOOL);
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (165544 => 165545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-03-13 17:45:38 UTC (rev 165544)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-13 17:47:53 UTC (rev 165545)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-03-12 Brian Burg <bburg@apple.com>
+
+ Web Inspector: Remove unused callId parameter from evaluateInWebInspector
+ https://bugs.webkit.org/show_bug.cgi?id=129744
+
+ Reviewed by Timothy Hatcher.
+
+ * WebProcess/InjectedBundle/API/c/WKBundleInspector.cpp:
+ (WKBundleInspectorEvaluateScriptForTest):
+ * WebProcess/InjectedBundle/API/c/WKBundleInspector.h:
+ * WebProcess/WebPage/WebInspector.cpp:
+ (WebKit::WebInspector::evaluateScriptForTest):
+ * WebProcess/WebPage/WebInspector.h:
+
</ins><span class="cx"> 2014-03-13 Laszlo Vidacs <lvidacs.u-szeged@partner.samsung.com>
</span><span class="cx">
</span><span class="cx"> Fix the !ENABLE(SQL_DATABASE) build
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundleInspectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleInspector.cpp (165544 => 165545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleInspector.cpp 2014-03-13 17:45:38 UTC (rev 165544)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleInspector.cpp 2014-03-13 17:47:53 UTC (rev 165545)
</span><span class="lines">@@ -56,10 +56,10 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WKBundleInspectorEvaluateScriptForTest(WKBundleInspectorRef inspectorRef, long callID, WKStringRef script)
</del><ins>+void WKBundleInspectorEvaluateScriptForTest(WKBundleInspectorRef inspectorRef, WKStringRef script)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><del>- toImpl(inspectorRef)->evaluateScriptForTest(callID, toWTFString(script));
</del><ins>+ toImpl(inspectorRef)->evaluateScriptForTest(toWTFString(script));
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundleInspectorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleInspector.h (165544 => 165545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleInspector.h 2014-03-13 17:45:38 UTC (rev 165544)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleInspector.h 2014-03-13 17:47:53 UTC (rev 165545)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> WK_EXPORT void WKBundleInspectorShow(WKBundleInspectorRef inspector);
</span><span class="cx"> WK_EXPORT void WKBundleInspectorClose(WKBundleInspectorRef inspector);
</span><span class="cx">
</span><del>-WK_EXPORT void WKBundleInspectorEvaluateScriptForTest(WKBundleInspectorRef inspector, long callID, WKStringRef script);
</del><ins>+WK_EXPORT void WKBundleInspectorEvaluateScriptForTest(WKBundleInspectorRef inspector, WKStringRef script);
</ins><span class="cx"> WK_EXPORT void WKBundleInspectorSetPageProfilingEnabled(WKBundleInspectorRef inspector, bool enabled);
</span><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebInspectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp (165544 => 165545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp 2014-03-13 17:45:38 UTC (rev 165544)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp 2014-03-13 17:47:53 UTC (rev 165545)
</span><span class="lines">@@ -231,9 +231,9 @@
</span><span class="cx"> m_frontendClient->setAttachedWindow(InspectorFrontendClient::UNDOCKED);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebInspector::evaluateScriptForTest(long callID, const String& script)
</del><ins>+void WebInspector::evaluateScriptForTest(const String& script)
</ins><span class="cx"> {
</span><del>- m_page->corePage()->inspectorController().evaluateForTestInFrontend(callID, script);
</del><ins>+ m_page->corePage()->inspectorController().evaluateForTestInFrontend(script);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebInspector::showConsole()
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebInspectorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.h (165544 => 165545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.h 2014-03-13 17:45:38 UTC (rev 165544)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.h 2014-03-13 17:47:53 UTC (rev 165545)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> void attachedRight();
</span><span class="cx"> void detached();
</span><span class="cx">
</span><del>- void evaluateScriptForTest(long callID, const String& script);
</del><ins>+ void evaluateScriptForTest(const String& script);
</ins><span class="cx">
</span><span class="cx"> void setJavaScriptProfilingEnabled(bool);
</span><span class="cx"> void startPageProfiling();
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (165544 => 165545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-03-13 17:45:38 UTC (rev 165544)
+++ trunk/Tools/ChangeLog 2014-03-13 17:47:53 UTC (rev 165545)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-03-12 Brian Burg <bburg@apple.com>
+
+ Web Inspector: Remove unused callId parameter from evaluateInWebInspector
+ https://bugs.webkit.org/show_bug.cgi?id=129744
+
+ Reviewed by Timothy Hatcher.
+
+ * DumpRenderTree/TestRunner.cpp:
+ (evaluateInWebInspectorCallback):
+ * DumpRenderTree/TestRunner.h:
+ * DumpRenderTree/efl/TestRunnerEfl.cpp:
+ (TestRunner::evaluateInWebInspector):
+ * DumpRenderTree/gtk/TestRunnerGtk.cpp:
+ (TestRunner::evaluateInWebInspector):
+ * DumpRenderTree/mac/TestRunnerMac.mm:
+ (TestRunner::evaluateInWebInspector):
+ * DumpRenderTree/win/TestRunnerWin.cpp:
+ (TestRunner::evaluateInWebInspector):
+ * WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl:
+ * WebKitTestRunner/InjectedBundle/TestRunner.cpp:
+ (WTR::TestRunner::evaluateInWebInspector):
+ * WebKitTestRunner/InjectedBundle/TestRunner.h:
+
</ins><span class="cx"> 2014-03-13 Jozsef Berta <jberta.u-szeged@partner.samsung.com>
</span><span class="cx">
</span><span class="cx"> [GTK] build-webkit shouldn't show error message when ninja isn't installed
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeTestRunnercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/TestRunner.cpp (165544 => 165545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/TestRunner.cpp 2014-03-13 17:45:38 UTC (rev 165544)
+++ trunk/Tools/DumpRenderTree/TestRunner.cpp 2014-03-13 17:47:53 UTC (rev 165545)
</span><span class="lines">@@ -1579,12 +1579,10 @@
</span><span class="cx"> static JSValueRef evaluateInWebInspectorCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
</span><span class="cx"> {
</span><span class="cx"> TestRunner* controller = static_cast<TestRunner*>(JSObjectGetPrivate(thisObject));
</span><del>- double callId = JSValueToNumber(context, arguments[0], exception);
</del><ins>+ JSRetainPtr<JSStringRef> script(Adopt, JSValueToStringCopy(context, arguments[0], exception));
</ins><span class="cx"> ASSERT(!*exception);
</span><del>- JSRetainPtr<JSStringRef> script(Adopt, JSValueToStringCopy(context, arguments[1], exception));
- ASSERT(!*exception);
</del><span class="cx">
</span><del>- controller->evaluateInWebInspector(static_cast<long>(callId), script.get());
</del><ins>+ controller->evaluateInWebInspector(script.get());
</ins><span class="cx"> return JSValueMakeUndefined(context);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeTestRunnerh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/TestRunner.h (165544 => 165545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/TestRunner.h 2014-03-13 17:45:38 UTC (rev 165544)
+++ trunk/Tools/DumpRenderTree/TestRunner.h 2014-03-13 17:47:53 UTC (rev 165545)
</span><span class="lines">@@ -307,7 +307,7 @@
</span><span class="cx"> void setDeveloperExtrasEnabled(bool);
</span><span class="cx"> void showWebInspector();
</span><span class="cx"> void closeWebInspector();
</span><del>- void evaluateInWebInspector(long callId, JSStringRef script);
</del><ins>+ void evaluateInWebInspector(JSStringRef script);
</ins><span class="cx"> void evaluateScriptInIsolatedWorld(unsigned worldID, JSObjectRef globalObject, JSStringRef script);
</span><span class="cx"> void evaluateScriptInIsolatedWorldAndReturnValue(unsigned worldID, JSObjectRef globalObject, JSStringRef script);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeeflTestRunnerEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/efl/TestRunnerEfl.cpp (165544 => 165545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/efl/TestRunnerEfl.cpp 2014-03-13 17:45:38 UTC (rev 165544)
+++ trunk/Tools/DumpRenderTree/efl/TestRunnerEfl.cpp 2014-03-13 17:47:53 UTC (rev 165545)
</span><span class="lines">@@ -687,9 +687,9 @@
</span><span class="cx"> ewk_view_inspector_close(browser->mainView());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void TestRunner::evaluateInWebInspector(long callId, JSStringRef script)
</del><ins>+void TestRunner::evaluateInWebInspector(JSStringRef script)
</ins><span class="cx"> {
</span><del>- DumpRenderTreeSupportEfl::evaluateInWebInspector(browser->mainView(), callId, script->string());
</del><ins>+ DumpRenderTreeSupportEfl::evaluateInWebInspector(browser->mainView(), script->string());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::evaluateScriptInIsolatedWorldAndReturnValue(unsigned, JSObjectRef, JSStringRef)
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreegtkTestRunnerGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/gtk/TestRunnerGtk.cpp (165544 => 165545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/gtk/TestRunnerGtk.cpp 2014-03-13 17:45:38 UTC (rev 165544)
+++ trunk/Tools/DumpRenderTree/gtk/TestRunnerGtk.cpp 2014-03-13 17:47:53 UTC (rev 165545)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> extern "C" {
</span><del>-void webkit_web_inspector_execute_script(WebKitWebInspector* inspector, long callId, const gchar* script);
</del><ins>+void webkit_web_inspector_execute_script(WebKitWebInspector* inspector, const gchar* script);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TestRunner::~TestRunner()
</span><span class="lines">@@ -767,13 +767,13 @@
</span><span class="cx"> webkit_web_inspector_close(inspector);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void TestRunner::evaluateInWebInspector(long callId, JSStringRef script)
</del><ins>+void TestRunner::evaluateInWebInspector(JSStringRef script)
</ins><span class="cx"> {
</span><span class="cx"> WebKitWebView* webView = webkit_web_frame_get_web_view(mainFrame);
</span><span class="cx"> WebKitWebInspector* inspector = webkit_web_view_get_inspector(webView);
</span><span class="cx"> char* scriptString = JSStringCopyUTF8CString(script);
</span><span class="cx">
</span><del>- webkit_web_inspector_execute_script(inspector, callId, scriptString);
</del><ins>+ webkit_web_inspector_execute_script(inspector, scriptString);
</ins><span class="cx"> g_free(scriptString);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacTestRunnerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm (165544 => 165545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm 2014-03-13 17:45:38 UTC (rev 165544)
+++ trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm 2014-03-13 17:47:53 UTC (rev 165545)
</span><span class="lines">@@ -829,12 +829,12 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void TestRunner::evaluateInWebInspector(long callId, JSStringRef script)
</del><ins>+void TestRunner::evaluateInWebInspector(JSStringRef script)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx"> RetainPtr<CFStringRef> scriptCF = adoptCF(JSStringCopyCFString(kCFAllocatorDefault, script));
</span><span class="cx"> NSString *scriptNS = (NSString *)scriptCF.get();
</span><del>- [[[mainFrame webView] inspector] evaluateInFrontend:nil callId:callId script:scriptNS];
</del><ins>+ [[[mainFrame webView] inspector] evaluateInFrontend:nil script:scriptNS];
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreewinTestRunnerWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/win/TestRunnerWin.cpp (165544 => 165545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/win/TestRunnerWin.cpp 2014-03-13 17:45:38 UTC (rev 165544)
+++ trunk/Tools/DumpRenderTree/win/TestRunnerWin.cpp 2014-03-13 17:47:53 UTC (rev 165545)
</span><span class="lines">@@ -973,7 +973,7 @@
</span><span class="cx"> inspector->close();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void TestRunner::evaluateInWebInspector(long callId, JSStringRef script)
</del><ins>+void TestRunner::evaluateInWebInspector(JSStringRef script)
</ins><span class="cx"> {
</span><span class="cx"> COMPtr<IWebView> webView;
</span><span class="cx"> if (FAILED(frame->webView(&webView)))
</span><span class="lines">@@ -991,7 +991,7 @@
</span><span class="cx"> if (!inspectorPrivate)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- inspectorPrivate->evaluateInFrontend(callId, bstrT(script).GetBSTR());
</del><ins>+ inspectorPrivate->evaluateInFrontend(bstrT(script).GetBSTR());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> typedef HashMap<unsigned, COMPtr<IWebScriptWorld> > WorldMap;
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleBindingsTestRunneridl"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl (165544 => 165545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl 2014-03-13 17:45:38 UTC (rev 165544)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl 2014-03-13 17:47:53 UTC (rev 165545)
</span><span class="lines">@@ -123,7 +123,7 @@
</span><span class="cx"> // For Web Inspector tests
</span><span class="cx"> void showWebInspector();
</span><span class="cx"> void closeWebInspector();
</span><del>- void evaluateInWebInspector(long callID, DOMString script);
</del><ins>+ void evaluateInWebInspector(DOMString script);
</ins><span class="cx">
</span><span class="cx"> void setPOSIXLocale(DOMString locale);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleTestRunnercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp (165544 => 165545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp 2014-03-13 17:45:38 UTC (rev 165544)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp 2014-03-13 17:47:53 UTC (rev 165545)
</span><span class="lines">@@ -412,11 +412,11 @@
</span><span class="cx"> #endif // ENABLE(INSPECTOR)
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void TestRunner::evaluateInWebInspector(long callID, JSStringRef script)
</del><ins>+void TestRunner::evaluateInWebInspector(JSStringRef script)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx"> WKRetainPtr<WKStringRef> scriptWK = toWK(script);
</span><del>- WKBundleInspectorEvaluateScriptForTest(WKBundlePageGetInspector(InjectedBundle::shared().page()->page()), callID, scriptWK.get());
</del><ins>+ WKBundleInspectorEvaluateScriptForTest(WKBundlePageGetInspector(InjectedBundle::shared().page()->page()), scriptWK.get());
</ins><span class="cx"> #endif // ENABLE(INSPECTOR)
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleTestRunnerh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h (165544 => 165545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h 2014-03-13 17:45:38 UTC (rev 165544)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h 2014-03-13 17:47:53 UTC (rev 165545)
</span><span class="lines">@@ -198,7 +198,7 @@
</span><span class="cx">
</span><span class="cx"> void showWebInspector();
</span><span class="cx"> void closeWebInspector();
</span><del>- void evaluateInWebInspector(long callId, JSStringRef script);
</del><ins>+ void evaluateInWebInspector(JSStringRef script);
</ins><span class="cx">
</span><span class="cx"> void setPOSIXLocale(JSStringRef);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>