<!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>[170364] 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/170364">170364</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-06-24 09:18:52 -0700 (Tue, 24 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix unused parameter warnings if inspector is disabled
https://bugs.webkit.org/show_bug.cgi?id=134244
Patch by Eva Balazsfalvi <evab.u-szeged@partner.samsung.com> on 2014-06-24
Reviewed by Zalan Bujtas.
Source/WebCore:
No new tests, no behavior change.
* inspector/InspectorConsoleInstrumentation.h:
(WebCore::InspectorInstrumentation::startProfiling):
(WebCore::InspectorInstrumentation::stopProfiling):
* inspector/InspectorInstrumentation.h:
(WebCore::InspectorInstrumentation::didFinishXHRLoading):
* loader/cache/CachedResourceLoader.cpp:
(WebCore::CachedResourceLoader::shouldContinueAfterNotifyingLoadedFromMemoryCache):
Source/WebKit2:
* WebProcess/InjectedBundle/API/c/WKBundleInspector.cpp:
(WKBundleInspectorShow):
(WKBundleInspectorClose):
(WKBundleInspectorEvaluateScriptForTest):
(WKBundleInspectorSetPageProfilingEnabled):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorConsoleInstrumentationh">trunk/Source/WebCore/inspector/InspectorConsoleInstrumentation.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorInstrumentationh">trunk/Source/WebCore/inspector/InspectorInstrumentation.h</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourceLoadercpp">trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170363 => 170364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-24 16:14:34 UTC (rev 170363)
+++ trunk/Source/WebCore/ChangeLog 2014-06-24 16:18:52 UTC (rev 170364)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-06-24 Eva Balazsfalvi <evab.u-szeged@partner.samsung.com>
+
+ Fix unused parameter warnings if inspector is disabled
+ https://bugs.webkit.org/show_bug.cgi?id=134244
+
+ Reviewed by Zalan Bujtas.
+
+ No new tests, no behavior change.
+
+ * inspector/InspectorConsoleInstrumentation.h:
+ (WebCore::InspectorInstrumentation::startProfiling):
+ (WebCore::InspectorInstrumentation::stopProfiling):
+ * inspector/InspectorInstrumentation.h:
+ (WebCore::InspectorInstrumentation::didFinishXHRLoading):
+ * loader/cache/CachedResourceLoader.cpp:
+ (WebCore::CachedResourceLoader::shouldContinueAfterNotifyingLoadedFromMemoryCache):
+
</ins><span class="cx"> 2014-06-24 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> [MSE] Add null-check in sourceBufferPrivateAppendComplete().
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorConsoleInstrumentationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorConsoleInstrumentation.h (170363 => 170364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorConsoleInstrumentation.h 2014-06-24 16:14:34 UTC (rev 170363)
+++ trunk/Source/WebCore/inspector/InspectorConsoleInstrumentation.h 2014-06-24 16:18:52 UTC (rev 170364)
</span><span class="lines">@@ -180,6 +180,7 @@
</span><span class="cx"> startProfilingImpl(instrumentingAgents, exec, title);
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(page);
</span><ins>+ UNUSED_PARAM(exec);
</ins><span class="cx"> UNUSED_PARAM(title);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="lines">@@ -191,6 +192,7 @@
</span><span class="cx"> return stopProfilingImpl(instrumentingAgents, exec, title);
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(page);
</span><ins>+ UNUSED_PARAM(exec);
</ins><span class="cx"> UNUSED_PARAM(title);
</span><span class="cx"> #endif
</span><span class="cx"> return nullptr;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorInstrumentationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.h (170363 => 170364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2014-06-24 16:14:34 UTC (rev 170363)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2014-06-24 16:18:52 UTC (rev 170364)
</span><span class="lines">@@ -1439,6 +1439,7 @@
</span><span class="cx"> UNUSED_PARAM(url);
</span><span class="cx"> UNUSED_PARAM(sendURL);
</span><span class="cx"> UNUSED_PARAM(sendLineNumber);
</span><ins>+ UNUSED_PARAM(sendColumnNumber);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp (170363 => 170364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2014-06-24 16:14:34 UTC (rev 170363)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2014-06-24 16:18:52 UTC (rev 170364)
</span><span class="lines">@@ -401,6 +401,8 @@
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx"> if (request.resourceRequest().hiddenFromInspector())
</span><span class="cx"> newRequest.setHiddenFromInspector(true);
</span><ins>+#else
+ UNUSED_PARAM(request);
</ins><span class="cx"> #endif
</span><span class="cx"> frame()->loader().loadedResourceFromMemoryCache(resource, newRequest);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (170363 => 170364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-06-24 16:14:34 UTC (rev 170363)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-24 16:18:52 UTC (rev 170364)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-06-24 Eva Balazsfalvi <evab.u-szeged@partner.samsung.com>
+
+ Fix unused parameter warnings if inspector is disabled
+ https://bugs.webkit.org/show_bug.cgi?id=134244
+
+ Reviewed by Zalan Bujtas.
+
+ * WebProcess/InjectedBundle/API/c/WKBundleInspector.cpp:
+ (WKBundleInspectorShow):
+ (WKBundleInspectorClose):
+ (WKBundleInspectorEvaluateScriptForTest):
+ (WKBundleInspectorSetPageProfilingEnabled):
+
</ins><span class="cx"> 2014-06-24 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> WKWebView doesn't respect -[UIScrollView contentInset]
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundleInspectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleInspector.cpp (170363 => 170364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleInspector.cpp 2014-06-24 16:14:34 UTC (rev 170363)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleInspector.cpp 2014-06-24 16:18:52 UTC (rev 170364)
</span><span class="lines">@@ -46,6 +46,8 @@
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx"> toImpl(inspectorRef)->show();
</span><ins>+#else
+ UNUSED_PARAM(inspectorRef);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -53,6 +55,8 @@
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx"> toImpl(inspectorRef)->close();
</span><ins>+#else
+ UNUSED_PARAM(inspectorRef);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -60,6 +64,9 @@
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx"> toImpl(inspectorRef)->evaluateScriptForTest(toWTFString(script));
</span><ins>+#else
+ UNUSED_PARAM(script);
+ UNUSED_PARAM(inspectorRef);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -70,5 +77,8 @@
</span><span class="cx"> toImpl(inspectorRef)->startPageProfiling();
</span><span class="cx"> else
</span><span class="cx"> toImpl(inspectorRef)->stopPageProfiling();
</span><ins>+#else
+ UNUSED_PARAM(enabled);
+ UNUSED_PARAM(inspectorRef);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>