<!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>[161556] 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/161556">161556</a></dd>
<dt>Author</dt> <dd>seokju@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-09 09:19:34 -0800 (Thu, 09 Jan 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Web Inspector: Remove unused overriding protocols.
https://bugs.webkit.org/show_bug.cgi?id=126630

Reviewed by Timothy Hatcher.

Source/WebCore:

No new tests, No change in behavior.

Remove unused overriding protocols as these are not used anymore in Frontned.
-Page.setGeolocationOverride
-Page.clearGeolocationOverride
-Page.canOverrideGeolocation
-Page.setDeviceOrientationOverride
-Page.clearDeviceOrientationOverride
-Page.canOverrideGeolocation
-Network.setUserAgentOverride

* Modules/geolocation/GeolocationController.cpp:
(WebCore::GeolocationController::GeolocationController):
(WebCore::GeolocationController::create):
(WebCore::GeolocationController::positionChanged):
(WebCore::provideGeolocationTo):
* Modules/geolocation/GeolocationController.h:
* dom/DeviceOrientationController.cpp:
(WebCore::DeviceOrientationController::DeviceOrientationController):
(WebCore::DeviceOrientationController::create):
(WebCore::DeviceOrientationController::didChangeDeviceOrientation):
(WebCore::provideDeviceOrientationTo):
* dom/DeviceOrientationController.h:
* inspector/InspectorInstrumentation.cpp:
* inspector/InspectorInstrumentation.h:
* inspector/InspectorPageAgent.cpp:
(WebCore::InspectorPageAgent::InspectorPageAgent):
* inspector/InspectorPageAgent.h:
* inspector/InspectorResourceAgent.cpp:
(WebCore::InspectorResourceAgent::disable):
* inspector/InspectorResourceAgent.h:
* inspector/protocol/Network.json:
* inspector/protocol/Page.json:
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::userAgent):

Source/WebInspectorUI:

Update InspectorWebBackendCommands.js after removing unused overriding protocols.

* UserInterface/InspectorWebBackendCommands.js:
* UserInterface/Legacy/6.0/InspectorWebBackendCommands.js:
* UserInterface/Legacy/7.0/InspectorWebBackendCommands.js:
* Versions/Inspector-iOS-6.0.json:
* Versions/Inspector-iOS-7.0.json:

LayoutTests:

* http/tests/inspector/extensions-useragent-expected.txt: Removed.
* http/tests/inspector/extensions-useragent.html: Removed.
* inspector/device-orientation-success-expected.txt: Removed.
* inspector/device-orientation-success.html: Removed.
* inspector/geolocation-error-expected.txt: Removed.
* inspector/geolocation-error.html: Removed.
* inspector/geolocation-success-expected.txt: Removed.
* inspector/geolocation-success.html: Removed.
* inspector/geolocation-watchPosition-expected.txt: Removed.
* inspector/geolocation-watchPosition.html: Removed.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesgeolocationGeolocationControllercpp">trunk/Source/WebCore/Modules/geolocation/GeolocationController.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesgeolocationGeolocationControllerh">trunk/Source/WebCore/Modules/geolocation/GeolocationController.h</a></li>
<li><a href="#trunkSourceWebCoredomDeviceOrientationControllercpp">trunk/Source/WebCore/dom/DeviceOrientationController.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDeviceOrientationControllerh">trunk/Source/WebCore/dom/DeviceOrientationController.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorInstrumentationcpp">trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorInstrumentationh">trunk/Source/WebCore/inspector/InspectorInstrumentation.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorPageAgentcpp">trunk/Source/WebCore/inspector/InspectorPageAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorPageAgenth">trunk/Source/WebCore/inspector/InspectorPageAgent.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="#trunkSourceWebCoreinspectorprotocolNetworkjson">trunk/Source/WebCore/inspector/protocol/Network.json</a></li>
<li><a href="#trunkSourceWebCoreinspectorprotocolPagejson">trunk/Source/WebCore/inspector/protocol/Page.json</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoadercpp">trunk/Source/WebCore/loader/FrameLoader.cpp</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceInspectorWebBackendCommandsjs">trunk/Source/WebInspectorUI/UserInterface/InspectorWebBackendCommands.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceLegacy60InspectorWebBackendCommandsjs">trunk/Source/WebInspectorUI/UserInterface/Legacy/6.0/InspectorWebBackendCommands.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceLegacy70InspectorWebBackendCommandsjs">trunk/Source/WebInspectorUI/UserInterface/Legacy/7.0/InspectorWebBackendCommands.js</a></li>
<li><a href="#trunkSourceWebInspectorUIVersionsInspectoriOS60json">trunk/Source/WebInspectorUI/Versions/Inspector-iOS-6.0.json</a></li>
<li><a href="#trunkSourceWebInspectorUIVersionsInspectoriOS70json">trunk/Source/WebInspectorUI/Versions/Inspector-iOS-7.0.json</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestsinspectorextensionsuseragentexpectedtxt">trunk/LayoutTests/http/tests/inspector/extensions-useragent-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsinspectorextensionsuseragenthtml">trunk/LayoutTests/http/tests/inspector/extensions-useragent.html</a></li>
<li><a href="#trunkLayoutTestsinspectordeviceorientationsuccessexpectedtxt">trunk/LayoutTests/inspector/device-orientation-success-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectordeviceorientationsuccesshtml">trunk/LayoutTests/inspector/device-orientation-success.html</a></li>
<li><a href="#trunkLayoutTestsinspectorgeolocationerrorexpectedtxt">trunk/LayoutTests/inspector/geolocation-error-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectorgeolocationerrorhtml">trunk/LayoutTests/inspector/geolocation-error.html</a></li>
<li><a href="#trunkLayoutTestsinspectorgeolocationsuccessexpectedtxt">trunk/LayoutTests/inspector/geolocation-success-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectorgeolocationsuccesshtml">trunk/LayoutTests/inspector/geolocation-success.html</a></li>
<li><a href="#trunkLayoutTestsinspectorgeolocationwatchPositionexpectedtxt">trunk/LayoutTests/inspector/geolocation-watchPosition-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectorgeolocationwatchPositionhtml">trunk/LayoutTests/inspector/geolocation-watchPosition.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (161555 => 161556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2014-01-09 16:08:48 UTC (rev 161555)
+++ trunk/LayoutTests/ChangeLog        2014-01-09 17:19:34 UTC (rev 161556)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-01-09  Seokju Kwon  &lt;seokju@webkit.org&gt;
+
+        Web Inspector: Remove unused overriding protocols.
+        https://bugs.webkit.org/show_bug.cgi?id=126630
+
+        Reviewed by Timothy Hatcher.
+
+        * http/tests/inspector/extensions-useragent-expected.txt: Removed.
+        * http/tests/inspector/extensions-useragent.html: Removed.
+        * inspector/device-orientation-success-expected.txt: Removed.
+        * inspector/device-orientation-success.html: Removed.
+        * inspector/geolocation-error-expected.txt: Removed.
+        * inspector/geolocation-error.html: Removed.
+        * inspector/geolocation-success-expected.txt: Removed.
+        * inspector/geolocation-success.html: Removed.
+        * inspector/geolocation-watchPosition-expected.txt: Removed.
+        * inspector/geolocation-watchPosition.html: Removed.
+
</ins><span class="cx"> 2014-01-09  Zan Dobersek  &lt;zdobersek@igalia.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Unreviewed GTK gardening. Rebaselining after r161521.
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsinspectorextensionsuseragentexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/http/tests/inspector/extensions-useragent-expected.txt (161555 => 161556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/inspector/extensions-useragent-expected.txt        2014-01-09 16:08:48 UTC (rev 161555)
+++ trunk/LayoutTests/http/tests/inspector/extensions-useragent-expected.txt        2014-01-09 17:19:34 UTC (rev 161556)
</span><span class="lines">@@ -1,12 +0,0 @@
</span><del>-Tests overriding user agent via WebInspector extension API
-
-Started extension.
-Running tests...
-RUNNING TEST: extension_testUserAgent
-Page reloaded.
-Page reloaded.
-user-agent header for extensions-useragent.html: Mozilla/4.0 (compatible; WebInspector Extension User-Agent override; RSX-11M)
-user-agent header for xhr-exists.html: Mozilla/4.0 (compatible; WebInspector Extension User-Agent override; RSX-11M)
-navigator.userAgent: Mozilla/4.0 (compatible; WebInspector Extension User-Agent override; RSX-11M)
-All tests done.
-
</del></span></pre></div>
<a id="trunkLayoutTestshttptestsinspectorextensionsuseragenthtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/http/tests/inspector/extensions-useragent.html (161555 => 161556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/inspector/extensions-useragent.html        2014-01-09 16:08:48 UTC (rev 161555)
+++ trunk/LayoutTests/http/tests/inspector/extensions-useragent.html        2014-01-09 17:19:34 UTC (rev 161556)
</span><span class="lines">@@ -1,68 +0,0 @@
</span><del>-&lt;html&gt;
-&lt;head&gt;
-&lt;script src=&quot;inspector-test.js&quot;&gt;&lt;/script&gt;
-&lt;script src=&quot;extensions-test.js&quot;&gt;&lt;/script&gt;
-&lt;script type=&quot;text/javascript&quot;&gt;
-
-function extension_testUserAgent(nextTest)
-{
-    const requestsToCheck = [
-        &quot;extensions-useragent.html&quot;,
-        &quot;xhr-exists.html&quot;
-    ];
-    var requestCount = 0;
-    var queuedOutput = [];
-
-    function onRequestFinished(request)
-    {
-        var url = request.request.url.replace(/^.*[/]/, &quot;&quot;);
-        if (requestsToCheck.indexOf(url) &lt; 0)
-            return;
-
-        queuedOutput.push(&quot;user-agent header for &quot; + url + &quot;: &quot; + getHeader(request.request.headers, &quot;user-agent&quot;));
-        if (++requestCount &lt; requestsToCheck.length)
-            return;
-        webInspector.network.onRequestFinished.removeListener(onRequestFinished);
-        webInspector.inspectedWindow.eval(&quot;navigator.userAgent&quot;, onEval);
-    }
-    function getHeader(headers, name)
-    {
-        for (var i = 0; i &lt; headers.length; ++i) {
-            if (headers[i].name.toLowerCase() === name)
-                return headers[i].value;
-        }
-    }
-    function onEval(result)
-    {
-        queuedOutput.push(&quot;navigator.userAgent: &quot; + result);
-        webInspector.inspectedWindow.eval(&quot;&quot;, cleanUp);
-    }
-    function cleanUp()
-    {
-        evaluateOnFrontend(&quot;InspectorTest.runWhenPageLoads(reply)&quot;, onPageLoaded);
-        webInspector.inspectedWindow.reload(&quot;&quot;);
-    }
-    function onPageLoaded()
-    {
-        for (var i = 0; i &lt; queuedOutput.length; ++i)
-            output(queuedOutput[i]);
-        nextTest();
-    }
-
-    webInspector.network.onRequestFinished.addListener(onRequestFinished);
-    webInspector.inspectedWindow.reload(&quot;Mozilla/4.0 (compatible; WebInspector Extension User-Agent override; RSX-11M)&quot;);
-}
-
-(function()
-{
-    var xhr = new XMLHttpRequest();
-    xhr.open(&quot;GET&quot;, &quot;resources/xhr-exists.html&quot;, false);
-    xhr.send(null);
-})();
-
-&lt;/script&gt;
-&lt;/head&gt;
-&lt;body onload=&quot;runTest()&quot;&gt;
-&lt;p&gt;Tests overriding user agent via WebInspector extension API&lt;/p&gt;
-&lt;/body&gt;
-&lt;/html&gt;
</del></span></pre></div>
<a id="trunkLayoutTestsinspectordeviceorientationsuccessexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/inspector/device-orientation-success-expected.txt (161555 => 161556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/device-orientation-success-expected.txt        2014-01-09 16:08:48 UTC (rev 161555)
+++ trunk/LayoutTests/inspector/device-orientation-success-expected.txt        2014-01-09 17:19:34 UTC (rev 161556)
</span><span class="lines">@@ -1,3 +0,0 @@
</span><del>-CONSOLE MESSAGE: line 17: alpha: 20 beta: 30 gamma: 40
-CONSOLE MESSAGE: line 17: alpha: 1.1 beta: 2.2 gamma: 3.3
-
</del></span></pre></div>
<a id="trunkLayoutTestsinspectordeviceorientationsuccesshtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/inspector/device-orientation-success.html (161555 => 161556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/device-orientation-success.html        2014-01-09 16:08:48 UTC (rev 161555)
+++ trunk/LayoutTests/inspector/device-orientation-success.html        2014-01-09 17:19:34 UTC (rev 161556)
</span><span class="lines">@@ -1,37 +0,0 @@
</span><del>-&lt;html&gt;
-&lt;head&gt;
-&lt;script src=&quot;../http/tests/inspector/inspector-test.js&quot;&gt;&lt;/script&gt;
-&lt;script&gt;
-
-var mockAlpha = 1.1;
-var mockBeta = 2.2;
-var mockGamma = 3.3;
-
-if (window.testRunner)
-    testRunner.setMockDeviceOrientation(true, mockAlpha, true, mockBeta, true, mockGamma);
-else
-    debug('This test can not be run without the LayoutTestController');
-
-function handler(evt)
-{
-        console.log('alpha: ' + evt.alpha + ' beta: ' + evt.beta + ' gamma: ' + evt.gamma);
-}
-
-function test()
-{
-    function callback()
-    {
-        PageAgent.clearDeviceOrientationOverride();
-        InspectorTest.completeTest();
-    }
-
-    InspectorTest.evaluateInPage(&quot;window.addEventListener('deviceorientation', handler, false);&quot;, callback);
-    PageAgent.setDeviceOrientationOverride(20, 30, 40);
-}
-&lt;/script&gt;
-&lt;/head&gt;
-&lt;body onload=&quot;runTest()&quot;&gt;
-&lt;p&gt;
-&lt;/p&gt;
-&lt;/body&gt;
-&lt;/html&gt;
</del></span></pre></div>
<a id="trunkLayoutTestsinspectorgeolocationerrorexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/inspector/geolocation-error-expected.txt (161555 => 161556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/geolocation-error-expected.txt        2014-01-09 16:08:48 UTC (rev 161555)
+++ trunk/LayoutTests/inspector/geolocation-error-expected.txt        2014-01-09 17:19:34 UTC (rev 161556)
</span><span class="lines">@@ -1,3 +0,0 @@
</span><del>-CONSOLE MESSAGE: line 26: Error: 2
-CONSOLE MESSAGE: line 22: lat: 51.478, long: -0.166
-
</del></span></pre></div>
<a id="trunkLayoutTestsinspectorgeolocationerrorhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/inspector/geolocation-error.html (161555 => 161556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/geolocation-error.html        2014-01-09 16:08:48 UTC (rev 161555)
+++ trunk/LayoutTests/inspector/geolocation-error.html        2014-01-09 17:19:34 UTC (rev 161556)
</span><span class="lines">@@ -1,55 +0,0 @@
</span><del>-&lt;html&gt;
-&lt;head&gt;
-&lt;script src=&quot;../http/tests/inspector/inspector-test.js&quot;&gt;&lt;/script&gt;
-&lt;script&gt;
-
-var mockLatitude = 51.478;
-var mockLongitude = -0.166;
-var mockAccuracy = 100;
-
-if (window.testRunner) {
-    testRunner.setGeolocationPermission(true);
-    testRunner.setMockGeolocationPosition(mockLatitude,
-                                          mockLongitude,
-                                          mockAccuracy);
-} else
-    debug('This test can not be run without the LayoutTestController');
-
-function getGeolocation()
-{
-    function printLocation(pos)
-    {
-        console.log('lat: ' + pos.coords.latitude + ', long: ' + pos.coords.longitude);
-    }
-    function printError(err)
-    {
-        console.log('Error: ' + err.code);
-    }
-    navigator.geolocation.getCurrentPosition(printLocation, printError, [])
-}
-
-function test()
-{
-    function callbackComplete()
-    {
-        InspectorTest.completeTest();
-    }
-    function callback()
-    {
-        PageAgent.clearGeolocationOverride();
-        InspectorTest.evaluateInPage(&quot;getGeolocation()&quot;, callbackComplete);
-    }
-    PageAgent.setGeolocationOverride();
-    InspectorTest.evaluateInPage(&quot;getGeolocation()&quot;, callback);
-}
-
-
-&lt;/script&gt;
-&lt;/head&gt;
-
-&lt;body onload=&quot;runTest()&quot;&gt;
-&lt;p&gt;
-&lt;/p&gt;
-
-&lt;/body&gt;
-&lt;/html&gt;
</del></span></pre></div>
<a id="trunkLayoutTestsinspectorgeolocationsuccessexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/inspector/geolocation-success-expected.txt (161555 => 161556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/geolocation-success-expected.txt        2014-01-09 16:08:48 UTC (rev 161555)
+++ trunk/LayoutTests/inspector/geolocation-success-expected.txt        2014-01-09 17:19:34 UTC (rev 161556)
</span><span class="lines">@@ -1,3 +0,0 @@
</span><del>-CONSOLE MESSAGE: line 22: lat: 43.476093, long: -80.540299
-CONSOLE MESSAGE: line 22: lat: 51.478, long: -0.166
-
</del></span></pre></div>
<a id="trunkLayoutTestsinspectorgeolocationsuccesshtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/inspector/geolocation-success.html (161555 => 161556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/geolocation-success.html        2014-01-09 16:08:48 UTC (rev 161555)
+++ trunk/LayoutTests/inspector/geolocation-success.html        2014-01-09 17:19:34 UTC (rev 161556)
</span><span class="lines">@@ -1,58 +0,0 @@
</span><del>-&lt;html&gt;
-&lt;head&gt;
-&lt;script src=&quot;../http/tests/inspector/inspector-test.js&quot;&gt;&lt;/script&gt;
-&lt;script&gt;
-
-var mockLatitude = 51.478;
-var mockLongitude = -0.166;
-var mockAccuracy = 100;
-
-if (window.testRunner) {
-    testRunner.setGeolocationPermission(true);
-    testRunner.setMockGeolocationPosition(mockLatitude,
-                                          mockLongitude,
-                                          mockAccuracy);
-} else
-    debug('This test can not be run without the LayoutTestController');
-
-function getGeolocation(webInspectorCallbackString)
-{
-    function printLocation(pos)
-    {
-        console.log('lat: ' + pos.coords.latitude + ', long: ' + pos.coords.longitude);
-        finishTest();
-    }
-    function printError(err)
-    {
-        console.log('Error: ' + err.code);
-        finishTest();
-    }
-    function finishTest()
-    {
-        testRunner.evaluateInWebInspector(0, webInspectorCallbackString);
-    }
-    navigator.geolocation.getCurrentPosition(printLocation, printError, [])
-}
-
-function test()
-{
-    window.testStep2 = function()
-    {
-        PageAgent.clearGeolocationOverride();
-        InspectorTest.evaluateInPage(&quot;getGeolocation('InspectorTest.completeTest()')&quot;);
-    }
-
-    PageAgent.setGeolocationOverride(43.476093, -80.540299, 150);
-    InspectorTest.evaluateInPage(&quot;getGeolocation('window.testStep2()')&quot;);
-}
-
-
-&lt;/script&gt;
-&lt;/head&gt;
-
-&lt;body onload=&quot;runTest()&quot;&gt;
-&lt;p&gt;
-&lt;/p&gt;
-
-&lt;/body&gt;
-&lt;/html&gt;
</del></span></pre></div>
<a id="trunkLayoutTestsinspectorgeolocationwatchPositionexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/inspector/geolocation-watchPosition-expected.txt (161555 => 161556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/geolocation-watchPosition-expected.txt        2014-01-09 16:08:48 UTC (rev 161555)
+++ trunk/LayoutTests/inspector/geolocation-watchPosition-expected.txt        2014-01-09 17:19:34 UTC (rev 161556)
</span><span class="lines">@@ -1,5 +0,0 @@
</span><del>-CONSOLE MESSAGE: line 23: lat: 51.478, long: -0.166
-CONSOLE MESSAGE: line 23: lat: 43.476093, long: -80.540299
-CONSOLE MESSAGE: line 27: Error: 2
-CONSOLE MESSAGE: line 23: lat: 51.478, long: -0.166
-
</del></span></pre></div>
<a id="trunkLayoutTestsinspectorgeolocationwatchPositionhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/inspector/geolocation-watchPosition.html (161555 => 161556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/geolocation-watchPosition.html        2014-01-09 16:08:48 UTC (rev 161555)
+++ trunk/LayoutTests/inspector/geolocation-watchPosition.html        2014-01-09 17:19:34 UTC (rev 161556)
</span><span class="lines">@@ -1,69 +0,0 @@
</span><del>-&lt;html&gt;
-&lt;head&gt;
-&lt;script src=&quot;../http/tests/inspector/inspector-test.js&quot;&gt;&lt;/script&gt;
-&lt;script&gt;
-
-var mockLatitude = 51.478;
-var mockLongitude = -0.166;
-var mockAccuracy = 100;
-
-if (window.testRunner) {
-    testRunner.setGeolocationPermission(true);
-    testRunner.setMockGeolocationPosition(mockLatitude,
-                                          mockLongitude,
-                                          mockAccuracy);
-} else
-    debug('This test can not be run without the LayoutTestController');
-
-var watch = 0;
-function getGeolocation()
-{
-    function printLocation(pos)
-    {
-        console.log('lat: ' + pos.coords.latitude + ', long: ' + pos.coords.longitude);
-    }
-    function printError(err)
-    {
-        console.log('Error: ' + err.code);
-    }
-    watch = navigator.geolocation.watchPosition(printLocation, printError, [])
-}
-function clearWatch()
-{
-    navigator.geolocation.clearWatch(watch);
-}
-
-function test()
-{
-    function callbackComplete()
-    {
-        InspectorTest.completeTest();
-    }
-    function callback()
-    {
-        InspectorTest.evaluateInPage(&quot;clearWatch()&quot;, callbackComplete);
-    }
-    function clearData()
-    {
-        PageAgent.clearGeolocationOverride();
-        setTimeout(callback, 1);
-    }
-    function setError()
-    {
-        PageAgent.setGeolocationOverride();
-        setTimeout(clearData, 1);
-    }
-    function setPosition()
-    {
-        PageAgent.setGeolocationOverride(43.476093, -80.540299, 150);
-        setTimeout(setError, 1);
-    }
-    InspectorTest.evaluateInPage(&quot;getGeolocation()&quot;, setPosition);
-}
-&lt;/script&gt;
-&lt;/head&gt;
-&lt;body onload=&quot;runTest()&quot;&gt;
-&lt;p&gt;
-&lt;/p&gt;
-&lt;/body&gt;
-&lt;/html&gt;
</del></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161555 => 161556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-01-09 16:08:48 UTC (rev 161555)
+++ trunk/Source/WebCore/ChangeLog        2014-01-09 17:19:34 UTC (rev 161556)
</span><span class="lines">@@ -1,3 +1,46 @@
</span><ins>+2014-01-09  Seokju Kwon  &lt;seokju@webkit.org&gt;
+
+        Web Inspector: Remove unused overriding protocols.
+        https://bugs.webkit.org/show_bug.cgi?id=126630
+
+        Reviewed by Timothy Hatcher.
+
+        No new tests, No change in behavior.
+
+        Remove unused overriding protocols as these are not used anymore in Frontned.
+        -Page.setGeolocationOverride
+        -Page.clearGeolocationOverride
+        -Page.canOverrideGeolocation
+        -Page.setDeviceOrientationOverride
+        -Page.clearDeviceOrientationOverride
+        -Page.canOverrideGeolocation
+        -Network.setUserAgentOverride
+
+        * Modules/geolocation/GeolocationController.cpp:
+        (WebCore::GeolocationController::GeolocationController):
+        (WebCore::GeolocationController::create):
+        (WebCore::GeolocationController::positionChanged):
+        (WebCore::provideGeolocationTo):
+        * Modules/geolocation/GeolocationController.h:
+        * dom/DeviceOrientationController.cpp:
+        (WebCore::DeviceOrientationController::DeviceOrientationController):
+        (WebCore::DeviceOrientationController::create):
+        (WebCore::DeviceOrientationController::didChangeDeviceOrientation):
+        (WebCore::provideDeviceOrientationTo):
+        * dom/DeviceOrientationController.h:
+        * inspector/InspectorInstrumentation.cpp:
+        * inspector/InspectorInstrumentation.h:
+        * inspector/InspectorPageAgent.cpp:
+        (WebCore::InspectorPageAgent::InspectorPageAgent):
+        * inspector/InspectorPageAgent.h:
+        * inspector/InspectorResourceAgent.cpp:
+        (WebCore::InspectorResourceAgent::disable):
+        * inspector/InspectorResourceAgent.h:
+        * inspector/protocol/Network.json:
+        * inspector/protocol/Page.json:
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::userAgent):
+
</ins><span class="cx"> 2014-01-09  Andrei Bucur  &lt;abucur@adobe.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [CSSRegions] Move regions auto-size code into RenderNamedFlowFragment
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesgeolocationGeolocationControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/geolocation/GeolocationController.cpp (161555 => 161556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/geolocation/GeolocationController.cpp        2014-01-09 16:08:48 UTC (rev 161555)
+++ trunk/Source/WebCore/Modules/geolocation/GeolocationController.cpp        2014-01-09 17:19:34 UTC (rev 161556)
</span><span class="lines">@@ -31,13 +31,11 @@
</span><span class="cx"> #include &quot;GeolocationClient.h&quot;
</span><span class="cx"> #include &quot;GeolocationError.h&quot;
</span><span class="cx"> #include &quot;GeolocationPosition.h&quot;
</span><del>-#include &quot;InspectorInstrumentation.h&quot;
</del><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><del>-GeolocationController::GeolocationController(Page* page, GeolocationClient* client)
</del><ins>+GeolocationController::GeolocationController(GeolocationClient* client)
</ins><span class="cx">     : m_client(client)
</span><del>-    , m_page(page)
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -49,9 +47,9 @@
</span><span class="cx">         m_client-&gt;geolocationDestroyed();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-PassOwnPtr&lt;GeolocationController&gt; GeolocationController::create(Page* page, GeolocationClient* client)
</del><ins>+PassOwnPtr&lt;GeolocationController&gt; GeolocationController::create(GeolocationClient* client)
</ins><span class="cx"> {
</span><del>-    return adoptPtr(new GeolocationController(page, client));
</del><ins>+    return adoptPtr(new GeolocationController(client));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void GeolocationController::addObserver(Geolocation* observer, bool enableHighAccuracy)
</span><span class="lines">@@ -101,11 +99,6 @@
</span><span class="cx"> 
</span><span class="cx"> void GeolocationController::positionChanged(GeolocationPosition* position)
</span><span class="cx"> {
</span><del>-    position = InspectorInstrumentation::overrideGeolocationPosition(m_page, position);
-    if (!position) {
-        errorOccurred(GeolocationError::create(GeolocationError::PositionUnavailable, ASCIILiteral(&quot;PositionUnavailable&quot;)).get());
-        return;
-    }
</del><span class="cx">     m_lastPosition = position;
</span><span class="cx">     Vector&lt;RefPtr&lt;Geolocation&gt;&gt; observersVector;
</span><span class="cx">     copyToVector(m_observers, observersVector);
</span><span class="lines">@@ -139,7 +132,7 @@
</span><span class="cx"> 
</span><span class="cx"> void provideGeolocationTo(Page* page, GeolocationClient* client)
</span><span class="cx"> {
</span><del>-    Supplement&lt;Page&gt;::provideTo(page, GeolocationController::supplementName(), GeolocationController::create(page, client));
</del><ins>+    Supplement&lt;Page&gt;::provideTo(page, GeolocationController::supplementName(), GeolocationController::create(client));
</ins><span class="cx"> }
</span><span class="cx">     
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesgeolocationGeolocationControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/geolocation/GeolocationController.h (161555 => 161556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/geolocation/GeolocationController.h        2014-01-09 16:08:48 UTC (rev 161555)
+++ trunk/Source/WebCore/Modules/geolocation/GeolocationController.h        2014-01-09 17:19:34 UTC (rev 161556)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> public:
</span><span class="cx">     ~GeolocationController();
</span><span class="cx"> 
</span><del>-    static PassOwnPtr&lt;GeolocationController&gt; create(Page*, GeolocationClient*);
</del><ins>+    static PassOwnPtr&lt;GeolocationController&gt; create(GeolocationClient*);
</ins><span class="cx"> 
</span><span class="cx">     void addObserver(Geolocation*, bool enableHighAccuracy);
</span><span class="cx">     void removeObserver(Geolocation*);
</span><span class="lines">@@ -65,10 +65,9 @@
</span><span class="cx">     static GeolocationController* from(Page* page) { return static_cast&lt;GeolocationController*&gt;(Supplement&lt;Page&gt;::from(page, supplementName())); }
</span><span class="cx"> 
</span><span class="cx"> private:
</span><del>-    GeolocationController(Page*, GeolocationClient*);
</del><ins>+    GeolocationController(GeolocationClient*);
</ins><span class="cx"> 
</span><span class="cx">     GeolocationClient* m_client;
</span><del>-    Page* m_page;
</del><span class="cx"> 
</span><span class="cx">     RefPtr&lt;GeolocationPosition&gt; m_lastPosition;
</span><span class="cx">     typedef HashSet&lt;RefPtr&lt;Geolocation&gt;&gt; ObserversSet;
</span></span></pre></div>
<a id="trunkSourceWebCoredomDeviceOrientationControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DeviceOrientationController.cpp (161555 => 161556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DeviceOrientationController.cpp        2014-01-09 16:08:48 UTC (rev 161555)
+++ trunk/Source/WebCore/dom/DeviceOrientationController.cpp        2014-01-09 17:19:34 UTC (rev 161556)
</span><span class="lines">@@ -30,13 +30,12 @@
</span><span class="cx"> #include &quot;DeviceOrientationClient.h&quot;
</span><span class="cx"> #include &quot;DeviceOrientationData.h&quot;
</span><span class="cx"> #include &quot;DeviceOrientationEvent.h&quot;
</span><del>-#include &quot;InspectorInstrumentation.h&quot;
</del><ins>+#include &quot;Page.h&quot;
</ins><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><del>-DeviceOrientationController::DeviceOrientationController(Page* page, DeviceOrientationClient* client)
</del><ins>+DeviceOrientationController::DeviceOrientationController(DeviceOrientationClient* client)
</ins><span class="cx">     : DeviceController(client)
</span><del>-    , m_page(page)
</del><span class="cx"> {
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx">     // FIXME: Temporarily avoid asserting while OpenSource is using a different design.
</span><span class="lines">@@ -50,14 +49,13 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-PassOwnPtr&lt;DeviceOrientationController&gt; DeviceOrientationController::create(Page* page, DeviceOrientationClient* client)
</del><ins>+PassOwnPtr&lt;DeviceOrientationController&gt; DeviceOrientationController::create(DeviceOrientationClient* client)
</ins><span class="cx"> {
</span><del>-    return adoptPtr(new DeviceOrientationController(page, client));
</del><ins>+    return adoptPtr(new DeviceOrientationController(client));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void DeviceOrientationController::didChangeDeviceOrientation(DeviceOrientationData* orientation)
</span><span class="cx"> {
</span><del>-    orientation = InspectorInstrumentation::overrideDeviceOrientation(m_page, orientation);
</del><span class="cx">     dispatchDeviceEvent(DeviceOrientationEvent::create(eventNames().deviceorientationEvent, orientation));
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -111,7 +109,7 @@
</span><span class="cx"> 
</span><span class="cx"> void provideDeviceOrientationTo(Page* page, DeviceOrientationClient* client)
</span><span class="cx"> {
</span><del>-    DeviceOrientationController::provideTo(page, DeviceOrientationController::supplementName(), DeviceOrientationController::create(page, client));
</del><ins>+    DeviceOrientationController::provideTo(page, DeviceOrientationController::supplementName(), DeviceOrientationController::create(client));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoredomDeviceOrientationControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DeviceOrientationController.h (161555 => 161556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DeviceOrientationController.h        2014-01-09 16:08:48 UTC (rev 161555)
+++ trunk/Source/WebCore/dom/DeviceOrientationController.h        2014-01-09 17:19:34 UTC (rev 161556)
</span><span class="lines">@@ -35,13 +35,14 @@
</span><span class="cx"> 
</span><span class="cx"> class DeviceOrientationClient;
</span><span class="cx"> class DeviceOrientationData;
</span><ins>+class Page;
</ins><span class="cx"> 
</span><span class="cx"> class DeviceOrientationController : public DeviceController {
</span><span class="cx">     WTF_MAKE_NONCOPYABLE(DeviceOrientationController);
</span><span class="cx"> public:
</span><span class="cx">     ~DeviceOrientationController() { };
</span><span class="cx"> 
</span><del>-    static PassOwnPtr&lt;DeviceOrientationController&gt; create(Page*, DeviceOrientationClient*);
</del><ins>+    static PassOwnPtr&lt;DeviceOrientationController&gt; create(DeviceOrientationClient*);
</ins><span class="cx"> 
</span><span class="cx">     void didChangeDeviceOrientation(DeviceOrientationData*);
</span><span class="cx">     DeviceOrientationClient* deviceOrientationClient();
</span><span class="lines">@@ -61,9 +62,7 @@
</span><span class="cx">     static bool isActiveAt(Page*);
</span><span class="cx"> 
</span><span class="cx"> private:
</span><del>-    DeviceOrientationController(Page*, DeviceOrientationClient*);
-
-    Page* m_page;
</del><ins>+    DeviceOrientationController(DeviceOrientationClient*);
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorInstrumentationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp (161555 => 161556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp        2014-01-09 16:08:48 UTC (rev 161555)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp        2014-01-09 17:19:34 UTC (rev 161556)
</span><span class="lines">@@ -41,7 +41,6 @@
</span><span class="cx"> #include &quot;DOMWindow.h&quot;
</span><span class="cx"> #include &quot;DOMWrapperWorld.h&quot;
</span><span class="cx"> #include &quot;Database.h&quot;
</span><del>-#include &quot;DeviceOrientationData.h&quot;
</del><span class="cx"> #include &quot;DocumentLoader.h&quot;
</span><span class="cx"> #include &quot;Event.h&quot;
</span><span class="cx"> #include &quot;EventDispatcher.h&quot;
</span><span class="lines">@@ -619,12 +618,6 @@
</span><span class="cx">         cssAgent-&gt;didProcessRule();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void InspectorInstrumentation::applyUserAgentOverrideImpl(InstrumentingAgents* instrumentingAgents, String* userAgent)
-{
-    if (InspectorResourceAgent* resourceAgent = instrumentingAgents-&gt;inspectorResourceAgent())
-        resourceAgent-&gt;applyUserAgentOverride(userAgent);
-}
-
</del><span class="cx"> void InspectorInstrumentation::applyEmulatedMediaImpl(InstrumentingAgents* instrumentingAgents, String* media)
</span><span class="cx"> {
</span><span class="cx">     if (InspectorPageAgent* pageAgent = instrumentingAgents-&gt;inspectorPageAgent())
</span><span class="lines">@@ -1298,22 +1291,6 @@
</span><span class="cx">     return 0;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#if ENABLE(GEOLOCATION)
-GeolocationPosition* InspectorInstrumentation::overrideGeolocationPositionImpl(InstrumentingAgents* instrumentingAgents, GeolocationPosition* position)
-{
-    if (InspectorPageAgent* pageAgent = instrumentingAgents-&gt;inspectorPageAgent())
-        position = pageAgent-&gt;overrideGeolocationPosition(position);
-    return position;
-}
-#endif
-
-DeviceOrientationData* InspectorInstrumentation::overrideDeviceOrientationImpl(InstrumentingAgents* instrumentingAgents, DeviceOrientationData* deviceOrientation)
-{
-    if (InspectorPageAgent* pageAgent = instrumentingAgents-&gt;inspectorPageAgent())
-        deviceOrientation = pageAgent-&gt;overrideDeviceOrientation(deviceOrientation);
-    return deviceOrientation;
-}
-
</del><span class="cx"> #if USE(ACCELERATED_COMPOSITING)
</span><span class="cx"> void InspectorInstrumentation::layerTreeDidChangeImpl(InstrumentingAgents* instrumentingAgents)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorInstrumentationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.h (161555 => 161556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorInstrumentation.h        2014-01-09 16:08:48 UTC (rev 161555)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.h        2014-01-09 17:19:34 UTC (rev 161556)
</span><span class="lines">@@ -61,8 +61,6 @@
</span><span class="cx"> class Element;
</span><span class="cx"> class DocumentLoader;
</span><span class="cx"> class DocumentStyleSheetCollection;
</span><del>-class DeviceOrientationData;
-class GeolocationPosition;
</del><span class="cx"> class GraphicsContext;
</span><span class="cx"> class HTTPHeaderMap;
</span><span class="cx"> class InspectorCSSAgent;
</span><span class="lines">@@ -185,7 +183,6 @@
</span><span class="cx">     static InspectorInstrumentationCookie willProcessRule(Document*, StyleRule*, StyleResolver&amp;);
</span><span class="cx">     static void didProcessRule(const InspectorInstrumentationCookie&amp;);
</span><span class="cx"> 
</span><del>-    static void applyUserAgentOverride(Frame*, String*);
</del><span class="cx">     static void applyEmulatedMedia(Frame*, String*);
</span><span class="cx">     static void willSendRequest(Frame*, unsigned long identifier, DocumentLoader*, ResourceRequest&amp;, const ResourceResponse&amp; redirectResponse);
</span><span class="cx">     static void continueAfterPingLoader(Frame*, unsigned long identifier, DocumentLoader*, ResourceRequest&amp;, const ResourceResponse&amp;);
</span><span class="lines">@@ -298,15 +295,9 @@
</span><span class="cx">     static bool timelineAgentEnabled(ScriptExecutionContext*) { return false; }
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#if ENABLE(GEOLOCATION)
-    static GeolocationPosition* overrideGeolocationPosition(Page*, GeolocationPosition*);
-#endif
-
</del><span class="cx">     static void registerInstrumentingAgents(InstrumentingAgents*);
</span><span class="cx">     static void unregisterInstrumentingAgents(InstrumentingAgents*);
</span><span class="cx"> 
</span><del>-    static DeviceOrientationData* overrideDeviceOrientation(Page*, DeviceOrientationData*);
-
</del><span class="cx"> #if USE(ACCELERATED_COMPOSITING)
</span><span class="cx">     static void layerTreeDidChange(Page*);
</span><span class="cx">     static void renderLayerDestroyed(Page*, const RenderLayer*);
</span><span class="lines">@@ -382,7 +373,6 @@
</span><span class="cx">     static InspectorInstrumentationCookie willProcessRuleImpl(InstrumentingAgents*, StyleRule*, StyleResolver&amp;);
</span><span class="cx">     static void didProcessRuleImpl(const InspectorInstrumentationCookie&amp;);
</span><span class="cx"> 
</span><del>-    static void applyUserAgentOverrideImpl(InstrumentingAgents*, String*);
</del><span class="cx">     static void applyEmulatedMediaImpl(InstrumentingAgents*, String*);
</span><span class="cx">     static void willSendRequestImpl(InstrumentingAgents*, unsigned long identifier, DocumentLoader*, ResourceRequest&amp;, const ResourceResponse&amp; redirectResponse);
</span><span class="cx">     static void continueAfterPingLoaderImpl(InstrumentingAgents*, unsigned long identifier, DocumentLoader*, ResourceRequest&amp;, const ResourceResponse&amp;);
</span><span class="lines">@@ -485,12 +475,6 @@
</span><span class="cx">     static void cancelPauseOnNativeEvent(InstrumentingAgents*);
</span><span class="cx">     static InspectorTimelineAgent* retrieveTimelineAgent(const InspectorInstrumentationCookie&amp;);
</span><span class="cx"> 
</span><del>-#if ENABLE(GEOLOCATION)
-    static GeolocationPosition* overrideGeolocationPositionImpl(InstrumentingAgents*, GeolocationPosition*);
-#endif
-
-    static DeviceOrientationData* overrideDeviceOrientationImpl(InstrumentingAgents*, DeviceOrientationData*);
-
</del><span class="cx"> #if USE(ACCELERATED_COMPOSITING)
</span><span class="cx">     static void layerTreeDidChangeImpl(InstrumentingAgents*);
</span><span class="cx">     static void renderLayerDestroyedImpl(InstrumentingAgents*, const RenderLayer*);
</span><span class="lines">@@ -1261,18 +1245,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-inline void InspectorInstrumentation::applyUserAgentOverride(Frame* frame, String* userAgent)
-{
-#if ENABLE(INSPECTOR)
-    FAST_RETURN_IF_NO_FRONTENDS(void());
-    if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForFrame(frame))
-        applyUserAgentOverrideImpl(instrumentingAgents, userAgent);
-#else
-    UNUSED_PARAM(frame);
-    UNUSED_PARAM(userAgent);
-#endif
-}
-
</del><span class="cx"> inline void InspectorInstrumentation::applyEmulatedMedia(Frame* frame, String* media)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="lines">@@ -1955,32 +1927,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#if ENABLE(GEOLOCATION)
-inline GeolocationPosition* InspectorInstrumentation::overrideGeolocationPosition(Page* page, GeolocationPosition* position)
-{
-#if ENABLE(INSPECTOR)
-    FAST_RETURN_IF_NO_FRONTENDS(position);
-    if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
-        return overrideGeolocationPositionImpl(instrumentingAgents, position);
-#else
-    UNUSED_PARAM(page);
-#endif
-    return position;
-}
-#endif
-
-inline DeviceOrientationData* InspectorInstrumentation::overrideDeviceOrientation(Page* page, DeviceOrientationData* deviceOrientation)
-{
-#if ENABLE(INSPECTOR)
-    FAST_RETURN_IF_NO_FRONTENDS(deviceOrientation);
-    if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
-        return overrideDeviceOrientationImpl(instrumentingAgents, deviceOrientation);
-#else
-    UNUSED_PARAM(page);
-#endif
-    return deviceOrientation;
-}
-
</del><span class="cx"> #if USE(ACCELERATED_COMPOSITING)
</span><span class="cx"> inline void InspectorInstrumentation::layerTreeDidChange(Page* page)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorPageAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.cpp (161555 => 161556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorPageAgent.cpp        2014-01-09 16:08:48 UTC (rev 161555)
+++ trunk/Source/WebCore/inspector/InspectorPageAgent.cpp        2014-01-09 17:19:34 UTC (rev 161556)
</span><span class="lines">@@ -46,15 +46,12 @@
</span><span class="cx"> #include &quot;DOMImplementation.h&quot;
</span><span class="cx"> #include &quot;DOMPatchSupport.h&quot;
</span><span class="cx"> #include &quot;DOMWrapperWorld.h&quot;
</span><del>-#include &quot;DeviceOrientationController.h&quot;
</del><span class="cx"> #include &quot;Document.h&quot;
</span><span class="cx"> #include &quot;DocumentLoader.h&quot;
</span><span class="cx"> #include &quot;Frame.h&quot;
</span><span class="cx"> #include &quot;FrameLoader.h&quot;
</span><span class="cx"> #include &quot;FrameSnapshotting.h&quot;
</span><span class="cx"> #include &quot;FrameView.h&quot;
</span><del>-#include &quot;GeolocationController.h&quot;
-#include &quot;GeolocationError.h&quot;
</del><span class="cx"> #include &quot;HTMLFrameOwnerElement.h&quot;
</span><span class="cx"> #include &quot;HTMLNames.h&quot;
</span><span class="cx"> #include &quot;IdentifiersFactory.h&quot;
</span><span class="lines">@@ -363,7 +360,6 @@
</span><span class="cx">     , m_enabled(false)
</span><span class="cx">     , m_isFirstLayoutAfterOnLoad(false)
</span><span class="cx">     , m_originalScriptExecutionDisabled(false)
</span><del>-    , m_geolocationOverridden(false)
</del><span class="cx">     , m_ignoreScriptsEnabledNotification(false)
</span><span class="cx">     , m_showPaintRects(false)
</span><span class="cx"> {
</span><span class="lines">@@ -1032,106 +1028,6 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-void InspectorPageAgent::setGeolocationOverride(ErrorString* error, const double* latitude, const double* longitude, const double* accuracy)
-{
-#if ENABLE (GEOLOCATION)
-    GeolocationController* controller = GeolocationController::from(m_page);
-    GeolocationPosition* position = 0;
-    if (!controller) {
-        *error = &quot;Internal error: unable to override geolocation&quot;;
-        return;
-    }
-    position = controller-&gt;lastPosition();
-    if (!m_geolocationOverridden &amp;&amp; position)
-        m_platformGeolocationPosition = position;
-
-    m_geolocationOverridden = true;
-    if (latitude &amp;&amp; longitude &amp;&amp; accuracy)
-        m_geolocationPosition = GeolocationPosition::create(currentTimeMS(), *latitude, *longitude, *accuracy);
-    else
-        m_geolocationPosition.clear();
-
-    controller-&gt;positionChanged(0); // Kick location update.
-#else
-    *error = &quot;Geolocation is not available&quot;;
-    UNUSED_PARAM(latitude);
-    UNUSED_PARAM(longitude);
-    UNUSED_PARAM(accuracy);
-#endif
-}
-
-void InspectorPageAgent::clearGeolocationOverride(ErrorString* error)
-{
-    if (!m_geolocationOverridden)
-        return;
-#if ENABLE(GEOLOCATION)
-    UNUSED_PARAM(error);
-    m_geolocationOverridden = false;
-    m_geolocationPosition.clear();
-
-    GeolocationController* controller = GeolocationController::from(m_page);
-    if (controller &amp;&amp; m_platformGeolocationPosition.get())
-        controller-&gt;positionChanged(m_platformGeolocationPosition.get());
-#else
-    *error = &quot;Geolocation is not available&quot;;
-#endif
-}
-
-void InspectorPageAgent::canOverrideGeolocation(ErrorString*, bool* out_param)
-{
-#if ENABLE(GEOLOCATION)
-    *out_param = true;
-#else
-    *out_param = false;
-#endif
-}
-
-GeolocationPosition* InspectorPageAgent::overrideGeolocationPosition(GeolocationPosition* position)
-{
-    if (m_geolocationOverridden) {
-        if (position)
-            m_platformGeolocationPosition = position;
-        return m_geolocationPosition.get();
-    }
-    return position;
-}
-
-void InspectorPageAgent::setDeviceOrientationOverride(ErrorString* error, double alpha, double beta, double gamma)
-{
-    DeviceOrientationController* controller = DeviceOrientationController::from(m_page);
-    if (!controller) {
-        *error = &quot;Internal error: unable to override device orientation&quot;;
-        return;
-    }
-
-    ErrorString clearError;
-    clearDeviceOrientationOverride(&amp;clearError);
-
-    m_deviceOrientation = DeviceOrientationData::create(true, alpha, true, beta, true, gamma);
-    controller-&gt;didChangeDeviceOrientation(m_deviceOrientation.get());
-}
-
-void InspectorPageAgent::clearDeviceOrientationOverride(ErrorString*)
-{
-    m_deviceOrientation.clear();
-}
-
-void InspectorPageAgent::canOverrideDeviceOrientation(ErrorString*, bool* outParam)
-{
-#if ENABLE(DEVICE_ORIENTATION)
-    *outParam = true;
-#else
-    *outParam = false;
-#endif
-}
-
-DeviceOrientationData* InspectorPageAgent::overrideDeviceOrientation(DeviceOrientationData* deviceOrientation)
-{
-    if (m_deviceOrientation)
-        deviceOrientation = m_deviceOrientation.get();
-    return deviceOrientation;
-}
-
</del><span class="cx"> void InspectorPageAgent::setTouchEmulationEnabled(ErrorString* error, bool enabled)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorPageAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.h (161555 => 161556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorPageAgent.h        2014-01-09 16:08:48 UTC (rev 161555)
+++ trunk/Source/WebCore/inspector/InspectorPageAgent.h        2014-01-09 17:19:34 UTC (rev 161556)
</span><span class="lines">@@ -33,8 +33,6 @@
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx"> 
</span><del>-#include &quot;DeviceOrientationData.h&quot;
-#include &quot;GeolocationPosition.h&quot;
</del><span class="cx"> #include &quot;InspectorWebAgentBase.h&quot;
</span><span class="cx"> #include &quot;InspectorWebBackendDispatchers.h&quot;
</span><span class="cx"> #include &quot;InspectorWebFrontendDispatchers.h&quot;
</span><span class="lines">@@ -121,12 +119,6 @@
</span><span class="cx">     virtual void setContinuousPaintingEnabled(ErrorString*, bool enabled);
</span><span class="cx">     virtual void getScriptExecutionStatus(ErrorString*, Inspector::InspectorPageBackendDispatcherHandler::Result::Enum*);
</span><span class="cx">     virtual void setScriptExecutionDisabled(ErrorString*, bool);
</span><del>-    virtual void setGeolocationOverride(ErrorString*, const double*, const double*, const double*);
-    virtual void clearGeolocationOverride(ErrorString*);
-    virtual void canOverrideGeolocation(ErrorString*, bool* out_param);
-    virtual void setDeviceOrientationOverride(ErrorString*, double, double, double);
-    virtual void clearDeviceOrientationOverride(ErrorString*);
-    virtual void canOverrideDeviceOrientation(ErrorString*, bool*);
</del><span class="cx">     virtual void setTouchEmulationEnabled(ErrorString*, bool);
</span><span class="cx">     virtual void setEmulatedMedia(ErrorString*, const String&amp;);
</span><span class="cx">     virtual void getCompositingBordersVisible(ErrorString*, bool* out_param);
</span><span class="lines">@@ -136,12 +128,6 @@
</span><span class="cx">     virtual void handleJavaScriptDialog(ErrorString*, bool accept, const String* promptText);
</span><span class="cx">     virtual void archive(ErrorString*, String* data);
</span><span class="cx"> 
</span><del>-    // Geolocation override helpers.
-    GeolocationPosition* overrideGeolocationPosition(GeolocationPosition*);
-
-    // DeviceOrientation helper
-    DeviceOrientationData* overrideDeviceOrientation(DeviceOrientationData*);
-
</del><span class="cx">     // InspectorInstrumentation API
</span><span class="cx">     void didClearWindowObjectInWorld(Frame*, DOMWrapperWorld&amp;);
</span><span class="cx">     void domContentEventFired();
</span><span class="lines">@@ -208,14 +194,10 @@
</span><span class="cx">     bool m_enabled;
</span><span class="cx">     bool m_isFirstLayoutAfterOnLoad;
</span><span class="cx">     bool m_originalScriptExecutionDisabled;
</span><del>-    bool m_geolocationOverridden;
</del><span class="cx">     bool m_ignoreScriptsEnabledNotification;
</span><span class="cx">     bool m_showPaintRects;
</span><span class="cx">     String m_emulatedMedia;
</span><span class="cx">     RefPtr&lt;Inspector::InspectorObject&gt; m_scriptsToEvaluateOnLoad;
</span><del>-    RefPtr&lt;GeolocationPosition&gt; m_geolocationPosition;
-    RefPtr&lt;GeolocationPosition&gt; m_platformGeolocationPosition;
-    RefPtr&lt;DeviceOrientationData&gt; m_deviceOrientation;
</del><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorResourceAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp (161555 => 161556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp        2014-01-09 16:08:48 UTC (rev 161555)
+++ trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp        2014-01-09 17:19:34 UTC (rev 161556)
</span><span class="lines">@@ -418,12 +418,6 @@
</span><span class="cx">         m_resourcesData-&gt;setResourceContent(*it, content, base64Encoded);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void InspectorResourceAgent::applyUserAgentOverride(String* userAgent)
-{
-    if (!m_userAgentOverride.isNull())
-        *userAgent = m_userAgentOverride;
-}
-
</del><span class="cx"> void InspectorResourceAgent::willRecalculateStyle()
</span><span class="cx"> {
</span><span class="cx">     m_isRecalculatingStyle = true;
</span><span class="lines">@@ -542,17 +536,11 @@
</span><span class="cx"> void InspectorResourceAgent::disable(ErrorString*)
</span><span class="cx"> {
</span><span class="cx">     m_enabled = false;
</span><del>-    m_userAgentOverride = String();
</del><span class="cx">     m_instrumentingAgents-&gt;setInspectorResourceAgent(0);
</span><span class="cx">     m_resourcesData-&gt;clear();
</span><span class="cx">     m_extraRequestHeaders.clear();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void InspectorResourceAgent::setUserAgentOverride(ErrorString*, const String&amp; userAgent)
-{
-    m_userAgentOverride = userAgent;
-}
-
</del><span class="cx"> void InspectorResourceAgent::setExtraHTTPHeaders(ErrorString*, const RefPtr&lt;InspectorObject&gt;&amp; headers)
</span><span class="cx"> {
</span><span class="cx">     m_extraRequestHeaders = headers;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorResourceAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorResourceAgent.h (161555 => 161556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorResourceAgent.h        2014-01-09 16:08:48 UTC (rev 161555)
+++ trunk/Source/WebCore/inspector/InspectorResourceAgent.h        2014-01-09 17:19:34 UTC (rev 161556)
</span><span class="lines">@@ -108,8 +108,6 @@
</span><span class="cx"> 
</span><span class="cx">     void willDestroyCachedResource(CachedResource*);
</span><span class="cx"> 
</span><del>-    void applyUserAgentOverride(String* userAgent);
-
</del><span class="cx">     // FIXME: InspectorResourceAgent should now be aware of style recalculation.
</span><span class="cx">     void willRecalculateStyle();
</span><span class="cx">     void didRecalculateStyle();
</span><span class="lines">@@ -133,7 +131,6 @@
</span><span class="cx">     // Called from frontend
</span><span class="cx">     virtual void enable(ErrorString*);
</span><span class="cx">     virtual void disable(ErrorString*);
</span><del>-    virtual void setUserAgentOverride(ErrorString*, const String&amp; userAgent);
</del><span class="cx">     virtual void setExtraHTTPHeaders(ErrorString*, const RefPtr&lt;Inspector::InspectorObject&gt;&amp;);
</span><span class="cx">     virtual void getResponseBody(ErrorString*, const String&amp; requestId, String* content, bool* base64Encoded);
</span><span class="cx"> 
</span><span class="lines">@@ -154,7 +151,6 @@
</span><span class="cx">     InspectorClient* m_client;
</span><span class="cx">     std::unique_ptr&lt;Inspector::InspectorNetworkFrontendDispatcher&gt; m_frontendDispatcher;
</span><span class="cx">     RefPtr&lt;Inspector::InspectorNetworkBackendDispatcher&gt; m_backendDispatcher;
</span><del>-    String m_userAgentOverride;
</del><span class="cx">     OwnPtr&lt;NetworkResourcesData&gt; m_resourcesData;
</span><span class="cx">     bool m_enabled;
</span><span class="cx">     bool m_cacheDisabled;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorprotocolNetworkjson"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/protocol/Network.json (161555 => 161556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/protocol/Network.json        2014-01-09 16:08:48 UTC (rev 161555)
+++ trunk/Source/WebCore/inspector/protocol/Network.json        2014-01-09 17:19:34 UTC (rev 161556)
</span><span class="lines">@@ -138,13 +138,6 @@
</span><span class="cx">             &quot;description&quot;: &quot;Disables network tracking, prevents network events from being sent to the client.&quot;
</span><span class="cx">         },
</span><span class="cx">         {
</span><del>-            &quot;name&quot;: &quot;setUserAgentOverride&quot;,
-            &quot;description&quot;: &quot;Allows overriding user agent with the given string.&quot;,
-            &quot;parameters&quot;: [
-                { &quot;name&quot;: &quot;userAgent&quot;, &quot;type&quot;: &quot;string&quot;, &quot;description&quot;: &quot;User agent to use.&quot; }
-            ]
-        },
-        {
</del><span class="cx">             &quot;name&quot;: &quot;setExtraHTTPHeaders&quot;,
</span><span class="cx">             &quot;description&quot;: &quot;Specifies whether to always send extra HTTP headers with the requests from this page.&quot;,
</span><span class="cx">             &quot;parameters&quot;: [
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorprotocolPagejson"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/protocol/Page.json (161555 => 161556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/protocol/Page.json        2014-01-09 16:08:48 UTC (rev 161555)
+++ trunk/Source/WebCore/inspector/protocol/Page.json        2014-01-09 17:19:34 UTC (rev 161556)
</span><span class="lines">@@ -255,46 +255,6 @@
</span><span class="cx">             ]
</span><span class="cx">         },
</span><span class="cx">         {
</span><del>-            &quot;name&quot;: &quot;setGeolocationOverride&quot;,
-            &quot;description&quot;: &quot;Overrides the Geolocation Position or Error.&quot;,
-            &quot;parameters&quot;: [
-                { &quot;name&quot;: &quot;latitude&quot;, &quot;type&quot;: &quot;number&quot;, &quot;optional&quot;: true, &quot;description&quot;: &quot;Mock latitude&quot;},
-                { &quot;name&quot;: &quot;longitude&quot;, &quot;type&quot;: &quot;number&quot;, &quot;optional&quot;: true, &quot;description&quot;: &quot;Mock longitude&quot;},
-                { &quot;name&quot;: &quot;accuracy&quot;, &quot;type&quot;: &quot;number&quot;, &quot;optional&quot;: true, &quot;description&quot;: &quot;Mock accuracy&quot;}
-            ]
-        },
-        {
-            &quot;name&quot;: &quot;clearGeolocationOverride&quot;,
-            &quot;description&quot;: &quot;Clears the overriden Geolocation Position and Error.&quot;
-        },
-        {
-            &quot;name&quot;: &quot;canOverrideGeolocation&quot;,
-            &quot;description&quot;: &quot;Checks if Geolocation can be overridden.&quot;,
-            &quot;returns&quot;: [
-                { &quot;name&quot;: &quot;result&quot;, &quot;type&quot;: &quot;boolean&quot;, &quot;description&quot;: &quot;True if browser can ovrride Geolocation.&quot; }
-            ]
-        },
-        {
-            &quot;name&quot;: &quot;setDeviceOrientationOverride&quot;,
-            &quot;description&quot;: &quot;Overrides the Device Orientation.&quot;,
-            &quot;parameters&quot;: [
-                { &quot;name&quot;: &quot;alpha&quot;, &quot;type&quot;: &quot;number&quot;, &quot;description&quot;: &quot;Mock alpha&quot;},
-                { &quot;name&quot;: &quot;beta&quot;, &quot;type&quot;: &quot;number&quot;, &quot;description&quot;: &quot;Mock beta&quot;},
-                { &quot;name&quot;: &quot;gamma&quot;, &quot;type&quot;: &quot;number&quot;, &quot;description&quot;: &quot;Mock gamma&quot;}
-            ]
-        },
-        {
-            &quot;name&quot;: &quot;clearDeviceOrientationOverride&quot;,
-            &quot;description&quot;: &quot;Clears the overridden Device Orientation.&quot;
-        },
-        {
-            &quot;name&quot;: &quot;canOverrideDeviceOrientation&quot;,
-            &quot;description&quot;: &quot;Check the backend if Web Inspector can override the device orientation.&quot;,
-            &quot;returns&quot;: [
-                { &quot;name&quot;: &quot;result&quot;, &quot;type&quot;: &quot;boolean&quot;, &quot;description&quot;: &quot;If true, &lt;code&gt;setDeviceOrientationOverride&lt;/code&gt; can safely be invoked on the agent.&quot; }
-            ]
-        },
-        {
</del><span class="cx">             &quot;name&quot;: &quot;setTouchEmulationEnabled&quot;,
</span><span class="cx">             &quot;parameters&quot;: [
</span><span class="cx">                 { &quot;name&quot;: &quot;enabled&quot;, &quot;type&quot;: &quot;boolean&quot;, &quot;description&quot;: &quot;Whether the touch event emulation should be enabled.&quot; }
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (161555 => 161556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.cpp        2014-01-09 16:08:48 UTC (rev 161555)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp        2014-01-09 17:19:34 UTC (rev 161556)
</span><span class="lines">@@ -2487,9 +2487,7 @@
</span><span class="cx"> 
</span><span class="cx"> String FrameLoader::userAgent(const URL&amp; url) const
</span><span class="cx"> {
</span><del>-    String userAgent = m_client.userAgent(url);
-    InspectorInstrumentation::applyUserAgentOverride(&amp;m_frame, &amp;userAgent);
-    return userAgent;
</del><ins>+    return m_client.userAgent(url);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void FrameLoader::handledOnloadEvents()
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (161555 => 161556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog        2014-01-09 16:08:48 UTC (rev 161555)
+++ trunk/Source/WebInspectorUI/ChangeLog        2014-01-09 17:19:34 UTC (rev 161556)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-01-09  Seokju Kwon  &lt;seokju@webkit.org&gt;
+
+        Web Inspector: Remove unused overriding protocols.
+        https://bugs.webkit.org/show_bug.cgi?id=126630
+
+        Reviewed by Timothy Hatcher.
+
+        Update InspectorWebBackendCommands.js after removing unused overriding protocols.
+
+        * UserInterface/InspectorWebBackendCommands.js:
+        * UserInterface/Legacy/6.0/InspectorWebBackendCommands.js:
+        * UserInterface/Legacy/7.0/InspectorWebBackendCommands.js:
+        * Versions/Inspector-iOS-6.0.json:
+        * Versions/Inspector-iOS-7.0.json:
+
</ins><span class="cx"> 2014-01-07  Joseph Pecoraro  &lt;pecoraro@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Web Inspector: Typo &quot;clipboarPrefixString&quot;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceInspectorWebBackendCommandsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/InspectorWebBackendCommands.js (161555 => 161556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/InspectorWebBackendCommands.js        2014-01-09 16:08:48 UTC (rev 161555)
+++ trunk/Source/WebInspectorUI/UserInterface/InspectorWebBackendCommands.js        2014-01-09 17:19:34 UTC (rev 161556)
</span><span class="lines">@@ -222,7 +222,6 @@
</span><span class="cx"> InspectorBackend.registerEvent(&quot;Network.webSocketFrameSent&quot;, [&quot;requestId&quot;, &quot;timestamp&quot;, &quot;response&quot;]);
</span><span class="cx"> InspectorBackend.registerCommand(&quot;Network.enable&quot;, [], []);
</span><span class="cx"> InspectorBackend.registerCommand(&quot;Network.disable&quot;, [], []);
</span><del>-InspectorBackend.registerCommand(&quot;Network.setUserAgentOverride&quot;, [{&quot;name&quot;: &quot;userAgent&quot;, &quot;type&quot;: &quot;string&quot;, &quot;optional&quot;: false}], []);
</del><span class="cx"> InspectorBackend.registerCommand(&quot;Network.setExtraHTTPHeaders&quot;, [{&quot;name&quot;: &quot;headers&quot;, &quot;type&quot;: &quot;object&quot;, &quot;optional&quot;: false}], []);
</span><span class="cx"> InspectorBackend.registerCommand(&quot;Network.getResponseBody&quot;, [{&quot;name&quot;: &quot;requestId&quot;, &quot;type&quot;: &quot;string&quot;, &quot;optional&quot;: false}], [&quot;body&quot;, &quot;base64Encoded&quot;]);
</span><span class="cx"> InspectorBackend.registerCommand(&quot;Network.replayXHR&quot;, [{&quot;name&quot;: &quot;requestId&quot;, &quot;type&quot;: &quot;string&quot;, &quot;optional&quot;: false}], []);
</span><span class="lines">@@ -269,12 +268,6 @@
</span><span class="cx"> InspectorBackend.registerCommand(&quot;Page.setContinuousPaintingEnabled&quot;, [{&quot;name&quot;: &quot;enabled&quot;, &quot;type&quot;: &quot;boolean&quot;, &quot;optional&quot;: false}], []);
</span><span class="cx"> InspectorBackend.registerCommand(&quot;Page.getScriptExecutionStatus&quot;, [], [&quot;result&quot;]);
</span><span class="cx"> InspectorBackend.registerCommand(&quot;Page.setScriptExecutionDisabled&quot;, [{&quot;name&quot;: &quot;value&quot;, &quot;type&quot;: &quot;boolean&quot;, &quot;optional&quot;: false}], []);
</span><del>-InspectorBackend.registerCommand(&quot;Page.setGeolocationOverride&quot;, [{&quot;name&quot;: &quot;latitude&quot;, &quot;type&quot;: &quot;number&quot;, &quot;optional&quot;: true}, {&quot;name&quot;: &quot;longitude&quot;, &quot;type&quot;: &quot;number&quot;, &quot;optional&quot;: true}, {&quot;name&quot;: &quot;accuracy&quot;, &quot;type&quot;: &quot;number&quot;, &quot;optional&quot;: true}], []);
-InspectorBackend.registerCommand(&quot;Page.clearGeolocationOverride&quot;, [], []);
-InspectorBackend.registerCommand(&quot;Page.canOverrideGeolocation&quot;, [], [&quot;result&quot;]);
-InspectorBackend.registerCommand(&quot;Page.setDeviceOrientationOverride&quot;, [{&quot;name&quot;: &quot;alpha&quot;, &quot;type&quot;: &quot;number&quot;, &quot;optional&quot;: false}, {&quot;name&quot;: &quot;beta&quot;, &quot;type&quot;: &quot;number&quot;, &quot;optional&quot;: false}, {&quot;name&quot;: &quot;gamma&quot;, &quot;type&quot;: &quot;number&quot;, &quot;optional&quot;: false}], []);
-InspectorBackend.registerCommand(&quot;Page.clearDeviceOrientationOverride&quot;, [], []);
-InspectorBackend.registerCommand(&quot;Page.canOverrideDeviceOrientation&quot;, [], [&quot;result&quot;]);
</del><span class="cx"> InspectorBackend.registerCommand(&quot;Page.setTouchEmulationEnabled&quot;, [{&quot;name&quot;: &quot;enabled&quot;, &quot;type&quot;: &quot;boolean&quot;, &quot;optional&quot;: false}], []);
</span><span class="cx"> InspectorBackend.registerCommand(&quot;Page.setEmulatedMedia&quot;, [{&quot;name&quot;: &quot;media&quot;, &quot;type&quot;: &quot;string&quot;, &quot;optional&quot;: false}], []);
</span><span class="cx"> InspectorBackend.registerCommand(&quot;Page.getCompositingBordersVisible&quot;, [], [&quot;result&quot;]);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceLegacy60InspectorWebBackendCommandsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Legacy/6.0/InspectorWebBackendCommands.js (161555 => 161556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Legacy/6.0/InspectorWebBackendCommands.js        2014-01-09 16:08:48 UTC (rev 161555)
+++ trunk/Source/WebInspectorUI/UserInterface/Legacy/6.0/InspectorWebBackendCommands.js        2014-01-09 17:19:34 UTC (rev 161556)
</span><span class="lines">@@ -88,7 +88,6 @@
</span><span class="cx"> InspectorBackend.registerEvent(&quot;Network.webSocketFrameSent&quot;, [&quot;requestId&quot;, &quot;timestamp&quot;, &quot;response&quot;]);
</span><span class="cx"> InspectorBackend.registerCommand(&quot;Network.enable&quot;, [], []);
</span><span class="cx"> InspectorBackend.registerCommand(&quot;Network.disable&quot;, [], []);
</span><del>-InspectorBackend.registerCommand(&quot;Network.setUserAgentOverride&quot;, [{&quot;name&quot;: &quot;userAgent&quot;, &quot;type&quot;: &quot;string&quot;, &quot;optional&quot;: false}], []);
</del><span class="cx"> InspectorBackend.registerCommand(&quot;Network.setExtraHTTPHeaders&quot;, [{&quot;name&quot;: &quot;headers&quot;, &quot;type&quot;: &quot;object&quot;, &quot;optional&quot;: false}], []);
</span><span class="cx"> InspectorBackend.registerCommand(&quot;Network.getResponseBody&quot;, [{&quot;name&quot;: &quot;requestId&quot;, &quot;type&quot;: &quot;string&quot;, &quot;optional&quot;: false}], [&quot;body&quot;, &quot;base64Encoded&quot;]);
</span><span class="cx"> InspectorBackend.registerCommand(&quot;Network.canClearBrowserCache&quot;, [], [&quot;result&quot;]);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceLegacy70InspectorWebBackendCommandsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Legacy/7.0/InspectorWebBackendCommands.js (161555 => 161556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Legacy/7.0/InspectorWebBackendCommands.js        2014-01-09 16:08:48 UTC (rev 161555)
+++ trunk/Source/WebInspectorUI/UserInterface/Legacy/7.0/InspectorWebBackendCommands.js        2014-01-09 17:19:34 UTC (rev 161556)
</span><span class="lines">@@ -55,12 +55,6 @@
</span><span class="cx"> InspectorBackend.registerCommand(&quot;Page.setContinuousPaintingEnabled&quot;, [{&quot;name&quot;: &quot;enabled&quot;, &quot;type&quot;: &quot;boolean&quot;, &quot;optional&quot;: false}], []);
</span><span class="cx"> InspectorBackend.registerCommand(&quot;Page.getScriptExecutionStatus&quot;, [], [&quot;result&quot;]);
</span><span class="cx"> InspectorBackend.registerCommand(&quot;Page.setScriptExecutionDisabled&quot;, [{&quot;name&quot;: &quot;value&quot;, &quot;type&quot;: &quot;boolean&quot;, &quot;optional&quot;: false}], []);
</span><del>-InspectorBackend.registerCommand(&quot;Page.setGeolocationOverride&quot;, [{&quot;name&quot;: &quot;latitude&quot;, &quot;type&quot;: &quot;number&quot;, &quot;optional&quot;: true}, {&quot;name&quot;: &quot;longitude&quot;, &quot;type&quot;: &quot;number&quot;, &quot;optional&quot;: true}, {&quot;name&quot;: &quot;accuracy&quot;, &quot;type&quot;: &quot;number&quot;, &quot;optional&quot;: true}], []);
-InspectorBackend.registerCommand(&quot;Page.clearGeolocationOverride&quot;, [], []);
-InspectorBackend.registerCommand(&quot;Page.canOverrideGeolocation&quot;, [], [&quot;result&quot;]);
-InspectorBackend.registerCommand(&quot;Page.setDeviceOrientationOverride&quot;, [{&quot;name&quot;: &quot;alpha&quot;, &quot;type&quot;: &quot;number&quot;, &quot;optional&quot;: false}, {&quot;name&quot;: &quot;beta&quot;, &quot;type&quot;: &quot;number&quot;, &quot;optional&quot;: false}, {&quot;name&quot;: &quot;gamma&quot;, &quot;type&quot;: &quot;number&quot;, &quot;optional&quot;: false}], []);
-InspectorBackend.registerCommand(&quot;Page.clearDeviceOrientationOverride&quot;, [], []);
-InspectorBackend.registerCommand(&quot;Page.canOverrideDeviceOrientation&quot;, [], [&quot;result&quot;]);
</del><span class="cx"> InspectorBackend.registerCommand(&quot;Page.setTouchEmulationEnabled&quot;, [{&quot;name&quot;: &quot;enabled&quot;, &quot;type&quot;: &quot;boolean&quot;, &quot;optional&quot;: false}], []);
</span><span class="cx"> InspectorBackend.registerCommand(&quot;Page.setEmulatedMedia&quot;, [{&quot;name&quot;: &quot;media&quot;, &quot;type&quot;: &quot;string&quot;, &quot;optional&quot;: false}], []);
</span><span class="cx"> InspectorBackend.registerCommand(&quot;Page.getCompositingBordersVisible&quot;, [], [&quot;result&quot;]);
</span><span class="lines">@@ -119,7 +113,6 @@
</span><span class="cx"> InspectorBackend.registerEvent(&quot;Network.webSocketFrameSent&quot;, [&quot;requestId&quot;, &quot;timestamp&quot;, &quot;response&quot;]);
</span><span class="cx"> InspectorBackend.registerCommand(&quot;Network.enable&quot;, [], []);
</span><span class="cx"> InspectorBackend.registerCommand(&quot;Network.disable&quot;, [], []);
</span><del>-InspectorBackend.registerCommand(&quot;Network.setUserAgentOverride&quot;, [{&quot;name&quot;: &quot;userAgent&quot;, &quot;type&quot;: &quot;string&quot;, &quot;optional&quot;: false}], []);
</del><span class="cx"> InspectorBackend.registerCommand(&quot;Network.setExtraHTTPHeaders&quot;, [{&quot;name&quot;: &quot;headers&quot;, &quot;type&quot;: &quot;object&quot;, &quot;optional&quot;: false}], []);
</span><span class="cx"> InspectorBackend.registerCommand(&quot;Network.getResponseBody&quot;, [{&quot;name&quot;: &quot;requestId&quot;, &quot;type&quot;: &quot;string&quot;, &quot;optional&quot;: false}], [&quot;body&quot;, &quot;base64Encoded&quot;]);
</span><span class="cx"> InspectorBackend.registerCommand(&quot;Network.replayXHR&quot;, [{&quot;name&quot;: &quot;requestId&quot;, &quot;type&quot;: &quot;string&quot;, &quot;optional&quot;: false}], []);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIVersionsInspectoriOS60json"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Versions/Inspector-iOS-6.0.json (161555 => 161556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Versions/Inspector-iOS-6.0.json        2014-01-09 16:08:48 UTC (rev 161555)
+++ trunk/Source/WebInspectorUI/Versions/Inspector-iOS-6.0.json        2014-01-09 17:19:34 UTC (rev 161556)
</span><span class="lines">@@ -715,13 +715,6 @@
</span><span class="cx">                 &quot;description&quot;: &quot;Disables network tracking, prevents network events from being sent to the client.&quot;
</span><span class="cx">             },
</span><span class="cx">             {
</span><del>-                &quot;name&quot;: &quot;setUserAgentOverride&quot;,
-                &quot;description&quot;: &quot;Allows overriding user agent with the given string.&quot;,
-                &quot;parameters&quot;: [
-                    { &quot;name&quot;: &quot;userAgent&quot;, &quot;type&quot;: &quot;string&quot;, &quot;description&quot;: &quot;User agent to use.&quot; }
-                ]
-            },
-            {
</del><span class="cx">                 &quot;name&quot;: &quot;setExtraHTTPHeaders&quot;,
</span><span class="cx">                 &quot;description&quot;: &quot;Specifies whether to always send extra HTTP headers with the requests from this page.&quot;,
</span><span class="cx">                 &quot;parameters&quot;: [
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIVersionsInspectoriOS70json"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Versions/Inspector-iOS-7.0.json (161555 => 161556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Versions/Inspector-iOS-7.0.json        2014-01-09 16:08:48 UTC (rev 161555)
+++ trunk/Source/WebInspectorUI/Versions/Inspector-iOS-7.0.json        2014-01-09 17:19:34 UTC (rev 161556)
</span><span class="lines">@@ -326,46 +326,6 @@
</span><span class="cx">                 ]
</span><span class="cx">             },
</span><span class="cx">             {
</span><del>-                &quot;name&quot;: &quot;setGeolocationOverride&quot;,
-                &quot;description&quot;: &quot;Overrides the Geolocation Position or Error.&quot;,
-                &quot;parameters&quot;: [
-                    { &quot;name&quot;: &quot;latitude&quot;, &quot;type&quot;: &quot;number&quot;, &quot;optional&quot;: true, &quot;description&quot;: &quot;Mock longitude&quot;},
-                    { &quot;name&quot;: &quot;longitude&quot;, &quot;type&quot;: &quot;number&quot;, &quot;optional&quot;: true, &quot;description&quot;: &quot;Mock latitude&quot;},
-                    { &quot;name&quot;: &quot;accuracy&quot;, &quot;type&quot;: &quot;number&quot;, &quot;optional&quot;: true, &quot;description&quot;: &quot;Mock accuracy&quot;}
-                ]
-            },
-            {
-                &quot;name&quot;: &quot;clearGeolocationOverride&quot;,
-                &quot;description&quot;: &quot;Clears the overriden Geolocation Position and Error.&quot;
-            },
-            {
-                &quot;name&quot;: &quot;canOverrideGeolocation&quot;,
-                &quot;description&quot;: &quot;Checks if Geolocation can be overridden.&quot;,
-                &quot;returns&quot;: [
-                    { &quot;name&quot;: &quot;result&quot;, &quot;type&quot;: &quot;boolean&quot;, &quot;description&quot;: &quot;True if browser can ovrride Geolocation.&quot; }
-                ]
-            },
-            {
-                &quot;name&quot;: &quot;setDeviceOrientationOverride&quot;,
-                &quot;description&quot;: &quot;Overrides the Device Orientation.&quot;,
-                &quot;parameters&quot;: [
-                    { &quot;name&quot;: &quot;alpha&quot;, &quot;type&quot;: &quot;number&quot;, &quot;description&quot;: &quot;Mock alpha&quot;},
-                    { &quot;name&quot;: &quot;beta&quot;, &quot;type&quot;: &quot;number&quot;, &quot;description&quot;: &quot;Mock beta&quot;},
-                    { &quot;name&quot;: &quot;gamma&quot;, &quot;type&quot;: &quot;number&quot;, &quot;description&quot;: &quot;Mock gamma&quot;}
-                ]
-            },
-            {
-                &quot;name&quot;: &quot;clearDeviceOrientationOverride&quot;,
-                &quot;description&quot;: &quot;Clears the overridden Device Orientation.&quot;
-            },
-            {
-                &quot;name&quot;: &quot;canOverrideDeviceOrientation&quot;,
-                &quot;description&quot;: &quot;Check the backend if Web Inspector can override the device orientation.&quot;,
-                &quot;returns&quot;: [
-                    { &quot;name&quot;: &quot;result&quot;, &quot;type&quot;: &quot;boolean&quot;, &quot;description&quot;: &quot;If true, &lt;code&gt;setDeviceOrientationOverride&lt;/code&gt; can safely be invoked on the agent.&quot; }
-                ]
-            },
-            {
</del><span class="cx">                 &quot;name&quot;: &quot;setTouchEmulationEnabled&quot;,
</span><span class="cx">                 &quot;parameters&quot;: [
</span><span class="cx">                     { &quot;name&quot;: &quot;enabled&quot;, &quot;type&quot;: &quot;boolean&quot;, &quot;description&quot;: &quot;Whether the touch event emulation should be enabled.&quot; }
</span><span class="lines">@@ -918,13 +878,6 @@
</span><span class="cx">                 &quot;description&quot;: &quot;Disables network tracking, prevents network events from being sent to the client.&quot;
</span><span class="cx">             },
</span><span class="cx">             {
</span><del>-                &quot;name&quot;: &quot;setUserAgentOverride&quot;,
-                &quot;description&quot;: &quot;Allows overriding user agent with the given string.&quot;,
-                &quot;parameters&quot;: [
-                    { &quot;name&quot;: &quot;userAgent&quot;, &quot;type&quot;: &quot;string&quot;, &quot;description&quot;: &quot;User agent to use.&quot; }
-                ]
-            },
-            {
</del><span class="cx">                 &quot;name&quot;: &quot;setExtraHTTPHeaders&quot;,
</span><span class="cx">                 &quot;description&quot;: &quot;Specifies whether to always send extra HTTP headers with the requests from this page.&quot;,
</span><span class="cx">                 &quot;parameters&quot;: [
</span></span></pre>
</div>
</div>

</body>
</html>