<!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>[161477] 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/161477">161477</a></dd>
<dt>Author</dt> <dd>seokju@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-07 18:20:46 -0800 (Tue, 07 Jan 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Web Inspector: Remove leftover 'device metrics' code
https://bugs.webkit.org/show_bug.cgi?id=126607

Reviewed by Joseph Pecoraro.

Source/WebCore:

No new tests, No changes in behavior.

Removes unused code related to 'device metrics'.

* css/MediaQueryEvaluator.cpp:
(WebCore::device_heightMediaFeatureEval):
(WebCore::device_widthMediaFeatureEval):
* inspector/InspectorClient.h:
* inspector/InspectorInstrumentation.cpp:
* inspector/InspectorInstrumentation.h:
* inspector/InspectorPageAgent.cpp:
(WebCore::InspectorPageAgent::InspectorPageAgent):
(WebCore::InspectorPageAgent::disable):
(WebCore::InspectorPageAgent::didLayout):
* inspector/InspectorPageAgent.h:
* page/DOMWindow.cpp:
(WebCore::DOMWindow::innerHeight):
(WebCore::DOMWindow::innerWidth):
* page/Screen.cpp:
(WebCore::Screen::height):
(WebCore::Screen::width):
* rendering/TextAutosizer.cpp:
(WebCore::TextAutosizer::processSubtree):

Source/WebKit/blackberry:

Clean up after removing InspectorClient::overrideDeviceMetrics().

* WebCoreSupport/InspectorClientBlackBerry.cpp:
* WebCoreSupport/InspectorClientBlackBerry.h:

Source/WebKit/mac:

* WebKit.order: Update after removing InspectorClient::overrideDeviceMetrics().

Source/WebKit2:

* mac/WebKit2.order: Update after removing InspectorClient::overrideDeviceMetrics().

LayoutTests:

* inspector/styles/override-screen-size-expected.txt: Removed.
* inspector/styles/override-screen-size.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="#trunkSourceWebCorecssMediaQueryEvaluatorcpp">trunk/Source/WebCore/css/MediaQueryEvaluator.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorClienth">trunk/Source/WebCore/inspector/InspectorClient.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="#trunkSourceWebCorepageDOMWindowcpp">trunk/Source/WebCore/page/DOMWindow.cpp</a></li>
<li><a href="#trunkSourceWebCorepageScreencpp">trunk/Source/WebCore/page/Screen.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingTextAutosizercpp">trunk/Source/WebCore/rendering/TextAutosizer.cpp</a></li>
<li><a href="#trunkSourceWebKitblackberryChangeLog">trunk/Source/WebKit/blackberry/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitblackberryWebCoreSupportInspectorClientBlackBerrycpp">trunk/Source/WebKit/blackberry/WebCoreSupport/InspectorClientBlackBerry.cpp</a></li>
<li><a href="#trunkSourceWebKitblackberryWebCoreSupportInspectorClientBlackBerryh">trunk/Source/WebKit/blackberry/WebCoreSupport/InspectorClientBlackBerry.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebKitorder">trunk/Source/WebKit/mac/WebKit.order</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2macWebKit2order">trunk/Source/WebKit2/mac/WebKit2.order</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsinspectorstylesoverridescreensizeexpectedtxt">trunk/LayoutTests/inspector/styles/override-screen-size-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectorstylesoverridescreensizehtml">trunk/LayoutTests/inspector/styles/override-screen-size.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (161476 => 161477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2014-01-08 01:35:35 UTC (rev 161476)
+++ trunk/LayoutTests/ChangeLog        2014-01-08 02:20:46 UTC (rev 161477)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-01-07  Seokju Kwon  &lt;seokju@webkit.org&gt;
+
+        Web Inspector: Remove leftover 'device metrics' code
+        https://bugs.webkit.org/show_bug.cgi?id=126607
+
+        Reviewed by Joseph Pecoraro.
+
+        * inspector/styles/override-screen-size-expected.txt: Removed.
+        * inspector/styles/override-screen-size.html: Removed.
+
</ins><span class="cx"> 2014-01-07  Brent Fulgham  &lt;bfulgham@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Unreviewed test fix: Correct whitespace around ]
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorstylesoverridescreensizeexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/inspector/styles/override-screen-size-expected.txt (161476 => 161477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/styles/override-screen-size-expected.txt        2014-01-08 01:35:35 UTC (rev 161476)
+++ trunk/LayoutTests/inspector/styles/override-screen-size-expected.txt        2014-01-08 02:20:46 UTC (rev 161477)
</span><span class="lines">@@ -1,49 +0,0 @@
</span><del>-Tests that screen dimension overrides affect media rules, body dimensions, and window.screen.
-
-Override: 480x800
-Screen from page: 480x800
-Window from page: 480x800
-Body from page: 480x800
-Main style:
-[expanded] 
-element.style  { ()
-
-======== Matched CSS Rules ========
-[expanded] 
-media=&quot;screen&quot; (override-screen-size.html)
-@media (max-device-height: 960px) and (max-device-width: 480px) (override-screen-size.html:9)
-#main  { (override-screen-size.html:10)
-background: green;
-
-[expanded] 
-div  { (user agent stylesheet)
-display: block;
-
-
-Override: 800x480
-Screen from page: 800x480
-Window from page: 800x480
-Body from page: 800x480
-Main style:
-[expanded] 
-element.style  { ()
-
-======== Matched CSS Rules ========
-[expanded] 
-div  { (user agent stylesheet)
-display: block;
-
-
-Override: 10000001x800 =&gt; ERROR
-Override: -1x800 =&gt; ERROR
-Override: 480x10000001 =&gt; ERROR
-Override: 480x-1 =&gt; ERROR
-Current dimensions:
-Screen from page: 800x480
-Window from page: 800x480
-Body from page: 800x480
-Disable PageAgent:
-Screen size same as original - OK
-Enable PageAgent:
-Screen size same as original - OK
-
</del></span></pre></div>
<a id="trunkLayoutTestsinspectorstylesoverridescreensizehtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/inspector/styles/override-screen-size.html (161476 => 161477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/styles/override-screen-size.html        2014-01-08 01:35:35 UTC (rev 161476)
+++ trunk/LayoutTests/inspector/styles/override-screen-size.html        2014-01-08 02:20:46 UTC (rev 161477)
</span><span class="lines">@@ -1,219 +0,0 @@
</span><del>-&lt;html&gt;
-&lt;head&gt;
-
-&lt;style type=&quot;text/css&quot; media=&quot;screen&quot;&gt;
-@media (max-device-width: 478px) and (max-device-height: 959px) {
-    #main { background: red; }
-}
-
-@media (max-device-width: 480px) and (max-device-height: 960px) {
-    #main { background: green; }
-}
-
-@media (min-device-width: 481px) and (min-device-height: 961px) {
-    #main { background: yellow; }
-}
-
-body {
-    position: absolute;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    left: 0;
-    margin: 0;
-}
-
-&lt;/style&gt;
-
-&lt;script src=&quot;../../http/tests/inspector/inspector-test.js&quot;&gt;&lt;/script&gt;
-&lt;script src=&quot;../../http/tests/inspector/elements-test.js&quot;&gt;&lt;/script&gt;
-&lt;script&gt;
-
-function getSizes()
-{
-    return JSON.stringify({
-        screen: window.screen.width + &quot;x&quot; + window.screen.height,
-        inner: window.innerWidth + &quot;x&quot; + window.innerHeight,
-        body: document.body.offsetWidth + &quot;x&quot; + document.body.offsetHeight
-    });
-}
-
-function test()
-{
-    var exceededDimension = 10000001;
-    var originalScreenSize;
-
-    function saveSizeCallback(jsonResult)
-    {
-        var value = JSON.parse(jsonResult.value);
-        originalScreenSize = value.screen;
-        if (!originalScreenSize || originalScreenSize.indexOf(&quot;x&quot;) === -1)
-            InspectorTest.addResult(&quot;Invalid original screen size: &quot; + originalScreenSize + &quot;. Expect runtime failures later on.&quot;);
-
-        InspectorTest.selectNodeAndWaitForStyles(&quot;main&quot;, step0);
-    }
-
-    InspectorTest.evaluateInPage(&quot;getSizes()&quot;, saveSizeCallback);
-
-
-    function step0()
-    {
-        overrideAndDumpData(480, 800, step1);
-    }
-
-    function step1()
-    {
-        function compareSizeCallback(jsonResult)
-        {
-            // Check that the screen size reported is the same as the original one.
-            var result = JSON.parse(jsonResult.value);
-            if (result.screen !== originalScreenSize)
-                InspectorTest.addResult(&quot;Original size &quot; + originalScreenSize + &quot; not restored, found: &quot; + result.screen);
-            step2();
-        }
-
-        function overrideCallback()
-        {
-            InspectorTest.evaluateInPage(&quot;getSizes()&quot;, compareSizeCallback);
-        }
-
-        // Disable overrides.
-        PageAgent.setDeviceMetricsOverride(0, 0, 1, true, overrideCallback);
-    }
-
-    function step2()
-    {
-        overrideAndDumpData(800, 480, step3);
-    }
-
-    function step3()
-    {
-        applyOverride(exceededDimension, 800, step4);
-    }
-
-    function step4()
-    {
-        applyOverride(-1, 800, step5);
-    }
-
-    function step5()
-    {
-        applyOverride(480, exceededDimension, step6);
-    }
-
-    function step6()
-    {
-        function callback()
-        {
-            InspectorTest.addResult(&quot;Current dimensions:&quot;);
-            getAndDumpSizes(step7);
-        }
-        applyOverride(480, -1, callback);
-    }
-
-    function step7()
-    {
-        function callback(jsonResult)
-        {
-            var value = JSON.parse(jsonResult.value);
-            if (value.screen !== originalScreenSize)
-                InspectorTest.addResult(&quot;Screen size not restored, actual: &quot; + value.screen + &quot;, expected: &quot; + originalScreenSize);
-            else
-                InspectorTest.addResult(&quot;Screen size same as original - OK&quot;);
-            step8();
-        }
-
-        InspectorTest.addResult(&quot;Disable PageAgent:&quot;);
-        PageAgent.disable();
-        InspectorTest.evaluateInPage(&quot;getSizes()&quot;, callback);
-    }
-
-    function step8()
-    {
-        function callback(jsonResult)
-        {
-            var value = JSON.parse(jsonResult.value);
-            if (value.screen !== originalScreenSize)
-                InspectorTest.addResult(&quot;Screen size not restored, actual: &quot; + value.screen + &quot;, expected: &quot; + originalScreenSize);
-            else
-                InspectorTest.addResult(&quot;Screen size same as original - OK&quot;);
-            InspectorTest.completeTest();
-        }
-
-        InspectorTest.addResult(&quot;Enable PageAgent:&quot;);
-        PageAgent.enable();
-        InspectorTest.evaluateInPage(&quot;getSizes()&quot;, callback);
-    }
-
-    function applyOverride(width, height, userCallback)
-    {
-        function callback(error)
-        {
-            if (error)
-                InspectorTest.addResult(&quot;Override: &quot; + width + &quot;x&quot; + height + &quot; =&gt; ERROR&quot;);
-            userCallback();
-        }
-        PageAgent.setDeviceMetricsOverride(width, height, 1, true, callback);
-    }
-
-    function overrideAndDumpData(width, height, callback)
-    {
-        function finalCallback()
-        {
-            InspectorTest.addResult(&quot;Main style:&quot;);
-            InspectorTest.dumpSelectedElementStyles(true, false, true);
-            callback();
-        }
-
-        var gotSizes;
-        var gotStyles;
-        function stylesCallback()
-        {
-            if (gotSizes)
-                return finalCallback();
-            gotStyles = true;
-        }
-
-        function sizesCallback()
-        {
-            gotSizes = true;
-            if (gotStyles)
-                finalCallback();
-        }
-
-        function applyCallback()
-        {
-            getAndDumpSizes(sizesCallback);
-        }
-
-        InspectorTest.addResult(&quot;Override: &quot; + width + &quot;x&quot; + height);
-        InspectorTest.waitForStyles(&quot;main&quot;, stylesCallback);
-        applyOverride(width, height, applyCallback);
-    }
-
-    function getAndDumpSizes(callback)
-    {
-        function getSizesCallback(jsonResult)
-        {
-            var result = JSON.parse(jsonResult.value);
-            InspectorTest.addResult(&quot;Screen from page: &quot; + result.screen);
-            InspectorTest.addResult(&quot;Window from page: &quot; + result.inner);
-            InspectorTest.addResult(&quot;Body from page: &quot; + result.body);
-            if (callback)
-                callback();
-        }
-
-        InspectorTest.evaluateInPage(&quot;getSizes()&quot;, getSizesCallback);
-    }
-}
-&lt;/script&gt;
-&lt;/head&gt;
-
-&lt;body onload=&quot;runTest()&quot;&gt;
-&lt;p&gt;
-Tests that screen dimension overrides affect media rules, body dimensions, and window.screen.
-&lt;/p&gt;
-
-&lt;div id=&quot;main&quot;&gt;&lt;/div&gt;
-&lt;/body&gt;
-&lt;/html&gt;
</del></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161476 => 161477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-01-08 01:35:35 UTC (rev 161476)
+++ trunk/Source/WebCore/ChangeLog        2014-01-08 02:20:46 UTC (rev 161477)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2014-01-07  Seokju Kwon  &lt;seokju@webkit.org&gt;
+
+        Web Inspector: Remove leftover 'device metrics' code
+        https://bugs.webkit.org/show_bug.cgi?id=126607
+
+        Reviewed by Joseph Pecoraro.
+
+        No new tests, No changes in behavior.
+
+        Removes unused code related to 'device metrics'.
+
+        * css/MediaQueryEvaluator.cpp:
+        (WebCore::device_heightMediaFeatureEval):
+        (WebCore::device_widthMediaFeatureEval):
+        * inspector/InspectorClient.h:
+        * inspector/InspectorInstrumentation.cpp:
+        * inspector/InspectorInstrumentation.h:
+        * inspector/InspectorPageAgent.cpp:
+        (WebCore::InspectorPageAgent::InspectorPageAgent):
+        (WebCore::InspectorPageAgent::disable):
+        (WebCore::InspectorPageAgent::didLayout):
+        * inspector/InspectorPageAgent.h:
+        * page/DOMWindow.cpp:
+        (WebCore::DOMWindow::innerHeight):
+        (WebCore::DOMWindow::innerWidth):
+        * page/Screen.cpp:
+        (WebCore::Screen::height):
+        (WebCore::Screen::width):
+        * rendering/TextAutosizer.cpp:
+        (WebCore::TextAutosizer::processSubtree):
+
</ins><span class="cx"> 2014-01-02  Andy Estes  &lt;aestes@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [iOS] Upstream remainder of minimal-ui viewport changes
</span></span></pre></div>
<a id="trunkSourceWebCorecssMediaQueryEvaluatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/MediaQueryEvaluator.cpp (161476 => 161477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/MediaQueryEvaluator.cpp        2014-01-08 01:35:35 UTC (rev 161476)
+++ trunk/Source/WebCore/css/MediaQueryEvaluator.cpp        2014-01-08 02:20:46 UTC (rev 161477)
</span><span class="lines">@@ -368,7 +368,6 @@
</span><span class="cx">         RenderStyle* rootStyle = frame-&gt;document()-&gt;documentElement()-&gt;renderStyle();
</span><span class="cx">         int length;
</span><span class="cx">         long height = sg.height();
</span><del>-        InspectorInstrumentation::applyScreenHeightOverride(frame, &amp;height);
</del><span class="cx">         return computeLength(value, !frame-&gt;document()-&gt;inQuirksMode(), style, rootStyle, length) &amp;&amp; compareValue(static_cast&lt;int&gt;(height), length, op);
</span><span class="cx">     }
</span><span class="cx">     // ({,min-,max-}device-height)
</span><span class="lines">@@ -383,7 +382,6 @@
</span><span class="cx">         RenderStyle* rootStyle = frame-&gt;document()-&gt;documentElement()-&gt;renderStyle();
</span><span class="cx">         int length;
</span><span class="cx">         long width = sg.width();
</span><del>-        InspectorInstrumentation::applyScreenWidthOverride(frame, &amp;width);
</del><span class="cx">         return computeLength(value, !frame-&gt;document()-&gt;inQuirksMode(), style, rootStyle, length) &amp;&amp; compareValue(static_cast&lt;int&gt;(width), length, op);
</span><span class="cx">     }
</span><span class="cx">     // ({,min-,max-}device-width)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorClient.h (161476 => 161477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorClient.h        2014-01-08 01:35:35 UTC (rev 161476)
+++ trunk/Source/WebCore/inspector/InspectorClient.h        2014-01-08 02:20:46 UTC (rev 161477)
</span><span class="lines">@@ -61,15 +61,6 @@
</span><span class="cx">     virtual void clearBrowserCookies() { }
</span><span class="cx">     virtual bool canMonitorMainThread() { return false; }
</span><span class="cx"> 
</span><del>-    virtual void overrideDeviceMetrics(int /*width*/, int /*height*/, float /*fontScaleFactor*/, bool /*fitWindow*/)
-    {
-        // FIXME: Platforms may want to implement this (see https://bugs.webkit.org/show_bug.cgi?id=82886).
-    }
-    virtual void autoZoomPageToFitWidth()
-    {
-        // FIXME: Platforms may want to implement this (see https://bugs.webkit.org/show_bug.cgi?id=82886).
-    }
-
</del><span class="cx">     virtual bool overridesShowPaintRects() { return false; }
</span><span class="cx">     virtual void setShowPaintRects(bool) { }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorInstrumentationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp (161476 => 161477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp        2014-01-08 01:35:35 UTC (rev 161476)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp        2014-01-08 02:20:46 UTC (rev 161477)
</span><span class="lines">@@ -625,38 +625,6 @@
</span><span class="cx">         resourceAgent-&gt;applyUserAgentOverride(userAgent);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void InspectorInstrumentation::applyScreenWidthOverrideImpl(InstrumentingAgents* instrumentingAgents, long* width)
-{
-    if (InspectorPageAgent* pageAgent = instrumentingAgents-&gt;inspectorPageAgent())
-        pageAgent-&gt;applyScreenWidthOverride(width);
-}
-
-void InspectorInstrumentation::applyScreenHeightOverrideImpl(InstrumentingAgents* instrumentingAgents, long* height)
-{
-    if (InspectorPageAgent* pageAgent = instrumentingAgents-&gt;inspectorPageAgent())
-        pageAgent-&gt;applyScreenHeightOverride(height);
-}
-
-bool InspectorInstrumentation::shouldApplyScreenWidthOverrideImpl(InstrumentingAgents* instrumentingAgents)
-{
-    if (InspectorPageAgent* pageAgent = instrumentingAgents-&gt;inspectorPageAgent()) {
-        long width = 0;
-        pageAgent-&gt;applyScreenWidthOverride(&amp;width);
-        return !!width;
-    }
-    return false;
-}
-
-bool InspectorInstrumentation::shouldApplyScreenHeightOverrideImpl(InstrumentingAgents* instrumentingAgents)
-{
-    if (InspectorPageAgent* pageAgent = instrumentingAgents-&gt;inspectorPageAgent()) {
-        long height = 0;
-        pageAgent-&gt;applyScreenHeightOverride(&amp;height);
-        return !!height;
-    }
-    return false;
-}
-
</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></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorInstrumentationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.h (161476 => 161477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorInstrumentation.h        2014-01-08 01:35:35 UTC (rev 161476)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.h        2014-01-08 02:20:46 UTC (rev 161477)
</span><span class="lines">@@ -186,11 +186,7 @@
</span><span class="cx">     static void didProcessRule(const InspectorInstrumentationCookie&amp;);
</span><span class="cx"> 
</span><span class="cx">     static void applyUserAgentOverride(Frame*, String*);
</span><del>-    static void applyScreenWidthOverride(Frame*, long*);
-    static void applyScreenHeightOverride(Frame*, long*);
</del><span class="cx">     static void applyEmulatedMedia(Frame*, String*);
</span><del>-    static bool shouldApplyScreenWidthOverride(Frame*);
-    static bool shouldApplyScreenHeightOverride(Frame*);
</del><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="cx">     static void markResourceAsCached(Page*, unsigned long identifier);
</span><span class="lines">@@ -387,11 +383,7 @@
</span><span class="cx">     static void didProcessRuleImpl(const InspectorInstrumentationCookie&amp;);
</span><span class="cx"> 
</span><span class="cx">     static void applyUserAgentOverrideImpl(InstrumentingAgents*, String*);
</span><del>-    static void applyScreenWidthOverrideImpl(InstrumentingAgents*, long*);
-    static void applyScreenHeightOverrideImpl(InstrumentingAgents*, long*);
</del><span class="cx">     static void applyEmulatedMediaImpl(InstrumentingAgents*, String*);
</span><del>-    static bool shouldApplyScreenWidthOverrideImpl(InstrumentingAgents*);
-    static bool shouldApplyScreenHeightOverrideImpl(InstrumentingAgents*);
</del><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="cx">     static void markResourceAsCachedImpl(InstrumentingAgents*, unsigned long identifier);
</span><span class="lines">@@ -1281,42 +1273,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-inline void InspectorInstrumentation::applyScreenWidthOverride(Frame* frame, long* width)
-{
-#if ENABLE(INSPECTOR)
-    FAST_RETURN_IF_NO_FRONTENDS(void());
-    if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForFrame(frame))
-        applyScreenWidthOverrideImpl(instrumentingAgents, width);
-#else
-    UNUSED_PARAM(frame);
-    UNUSED_PARAM(width);
-#endif
-}
-
-inline void InspectorInstrumentation::applyScreenHeightOverride(Frame* frame, long* height)
-{
-#if ENABLE(INSPECTOR)
-    FAST_RETURN_IF_NO_FRONTENDS(void());
-    if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForFrame(frame))
-        applyScreenHeightOverrideImpl(instrumentingAgents, height);
-#else
-    UNUSED_PARAM(frame);
-    UNUSED_PARAM(height);
-#endif
-}
-
-inline bool InspectorInstrumentation::shouldApplyScreenWidthOverride(Frame* frame)
-{
-#if ENABLE(INSPECTOR)
-    FAST_RETURN_IF_NO_FRONTENDS(false);
-    if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForFrame(frame))
-        return shouldApplyScreenWidthOverrideImpl(instrumentingAgents);
-#else
-    UNUSED_PARAM(frame);
-#endif
-    return false;
-}
-
</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">@@ -1329,18 +1285,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-inline bool InspectorInstrumentation::shouldApplyScreenHeightOverride(Frame* frame)
-{
-#if ENABLE(INSPECTOR)
-    FAST_RETURN_IF_NO_FRONTENDS(false);
-    if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForFrame(frame))
-        return shouldApplyScreenHeightOverrideImpl(instrumentingAgents);
-#else
-    UNUSED_PARAM(frame);
-#endif
-    return false;
-}
-
</del><span class="cx"> inline void InspectorInstrumentation::willSendRequest(Frame* frame, unsigned long identifier, DocumentLoader* loader, ResourceRequest&amp; request, const ResourceResponse&amp; redirectResponse)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorPageAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.cpp (161476 => 161477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorPageAgent.cpp        2014-01-08 01:35:35 UTC (rev 161476)
+++ trunk/Source/WebCore/inspector/InspectorPageAgent.cpp        2014-01-08 02:20:46 UTC (rev 161477)
</span><span class="lines">@@ -360,8 +360,6 @@
</span><span class="cx">     , m_client(client)
</span><span class="cx">     , m_overlay(overlay)
</span><span class="cx">     , m_lastScriptIdentifier(0)
</span><del>-    , m_screenWidthOverride(0)
-    , m_screenHeightOverride(0)
</del><span class="cx">     , m_enabled(false)
</span><span class="cx">     , m_isFirstLayoutAfterOnLoad(false)
</span><span class="cx">     , m_originalScriptExecutionDisabled(false)
</span><span class="lines">@@ -410,10 +408,6 @@
</span><span class="cx">     setShowFPSCounter(0, false);
</span><span class="cx">     setEmulatedMedia(0, &quot;&quot;);
</span><span class="cx">     setContinuousPaintingEnabled(0, false);
</span><del>-
-    // When disabling the agent, reset the override values if necessary.
-    m_screenWidthOverride = 0;
-    m_screenHeightOverride = 0;
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void InspectorPageAgent::addScriptToEvaluateOnLoad(ErrorString*, const String&amp; source, String* identifier)
</span><span class="lines">@@ -924,18 +918,6 @@
</span><span class="cx">     m_frontendDispatcher-&gt;javascriptDialogClosed();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void InspectorPageAgent::applyScreenWidthOverride(long* width)
-{
-    if (m_screenWidthOverride)
-        *width = m_screenWidthOverride;
-}
-
-void InspectorPageAgent::applyScreenHeightOverride(long* height)
-{
-    if (m_screenHeightOverride)
-        *height = m_screenHeightOverride;
-}
-
</del><span class="cx"> void InspectorPageAgent::didPaint(GraphicsContext* context, const LayoutRect&amp; rect)
</span><span class="cx"> {
</span><span class="cx">     if (!m_enabled || m_client-&gt;overridesShowPaintRects() || !m_showPaintRects)
</span><span class="lines">@@ -962,10 +944,6 @@
</span><span class="cx">     if (!m_enabled)
</span><span class="cx">         return;
</span><span class="cx"> 
</span><del>-    if (isFirstLayout) {
-        if (m_screenWidthOverride &amp;&amp; m_screenHeightOverride)
-            m_client-&gt;autoZoomPageToFitWidth();
-    }
</del><span class="cx">     m_overlay-&gt;update();
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorPageAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.h (161476 => 161477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorPageAgent.h        2014-01-08 01:35:35 UTC (rev 161476)
+++ trunk/Source/WebCore/inspector/InspectorPageAgent.h        2014-01-08 02:20:46 UTC (rev 161477)
</span><span class="lines">@@ -155,8 +155,6 @@
</span><span class="cx">     void frameClearedScheduledNavigation(Frame*);
</span><span class="cx">     void willRunJavaScriptDialog(const String&amp; message);
</span><span class="cx">     void didRunJavaScriptDialog();
</span><del>-    void applyScreenWidthOverride(long*);
-    void applyScreenHeightOverride(long*);
</del><span class="cx">     void applyEmulatedMedia(String*);
</span><span class="cx">     void didPaint(GraphicsContext*, const LayoutRect&amp;);
</span><span class="cx">     void didLayout();
</span><span class="lines">@@ -207,8 +205,6 @@
</span><span class="cx">     HashMap&lt;Frame*, String&gt; m_frameToIdentifier;
</span><span class="cx">     HashMap&lt;String, Frame*&gt; m_identifierToFrame;
</span><span class="cx">     HashMap&lt;DocumentLoader*, String&gt; m_loaderToIdentifier;
</span><del>-    int m_screenWidthOverride;
-    int m_screenHeightOverride;
</del><span class="cx">     bool m_enabled;
</span><span class="cx">     bool m_isFirstLayoutAfterOnLoad;
</span><span class="cx">     bool m_originalScriptExecutionDisabled;
</span></span></pre></div>
<a id="trunkSourceWebCorepageDOMWindowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DOMWindow.cpp (161476 => 161477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DOMWindow.cpp        2014-01-08 01:35:35 UTC (rev 161476)
+++ trunk/Source/WebCore/page/DOMWindow.cpp        2014-01-08 02:20:46 UTC (rev 161477)
</span><span class="lines">@@ -1156,9 +1156,7 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx">     return view-&gt;mapFromLayoutToCSSUnits(static_cast&lt;int&gt;(view-&gt;actualVisibleContentRect().height()));
</span><span class="cx"> #else
</span><del>-    // If the device height is overridden, do not include the horizontal scrollbar into the innerHeight (since it is absent on the real device).
-    bool includeScrollbars = !InspectorInstrumentation::shouldApplyScreenHeightOverride(m_frame);
-    return view-&gt;mapFromLayoutToCSSUnits(static_cast&lt;int&gt;(view-&gt;visibleContentRect(includeScrollbars ? ScrollableArea::IncludeScrollbars : ScrollableArea::ExcludeScrollbars).height()));
</del><ins>+    return view-&gt;mapFromLayoutToCSSUnits(static_cast&lt;int&gt;(view-&gt;visibleContentRect(ScrollableArea::IncludeScrollbars).height()));
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -1174,9 +1172,7 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx">     return view-&gt;mapFromLayoutToCSSUnits(static_cast&lt;int&gt;(view-&gt;actualVisibleContentRect().width()));
</span><span class="cx"> #else
</span><del>-    // If the device width is overridden, do not include the vertical scrollbar into the innerWidth (since it is absent on the real device).
-    bool includeScrollbars = !InspectorInstrumentation::shouldApplyScreenWidthOverride(m_frame);
-    return view-&gt;mapFromLayoutToCSSUnits(static_cast&lt;int&gt;(view-&gt;visibleContentRect(includeScrollbars ? ScrollableArea::IncludeScrollbars : ScrollableArea::ExcludeScrollbars).width()));
</del><ins>+    return view-&gt;mapFromLayoutToCSSUnits(static_cast&lt;int&gt;(view-&gt;visibleContentRect(ScrollableArea::IncludeScrollbars).width()));
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorepageScreencpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Screen.cpp (161476 => 161477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Screen.cpp        2014-01-08 01:35:35 UTC (rev 161476)
+++ trunk/Source/WebCore/page/Screen.cpp        2014-01-08 02:20:46 UTC (rev 161477)
</span><span class="lines">@@ -50,7 +50,6 @@
</span><span class="cx">     if (!m_frame)
</span><span class="cx">         return 0;
</span><span class="cx">     long height = static_cast&lt;long&gt;(screenRect(m_frame-&gt;view()).height());
</span><del>-    InspectorInstrumentation::applyScreenHeightOverride(m_frame, &amp;height);
</del><span class="cx">     return static_cast&lt;unsigned&gt;(height);
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -59,7 +58,6 @@
</span><span class="cx">     if (!m_frame)
</span><span class="cx">         return 0;
</span><span class="cx">     long width = static_cast&lt;long&gt;(screenRect(m_frame-&gt;view()).width());
</span><del>-    InspectorInstrumentation::applyScreenWidthOverride(m_frame, &amp;width);
</del><span class="cx">     return static_cast&lt;unsigned&gt;(width);
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingTextAutosizercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/TextAutosizer.cpp (161476 => 161477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/TextAutosizer.cpp        2014-01-08 01:35:35 UTC (rev 161476)
+++ trunk/Source/WebCore/rendering/TextAutosizer.cpp        2014-01-08 02:20:46 UTC (rev 161477)
</span><span class="lines">@@ -114,10 +114,8 @@
</span><span class="cx"> 
</span><span class="cx">     // Window area, in logical (density-independent) pixels.
</span><span class="cx">     windowInfo.windowSize = m_document-&gt;settings()-&gt;textAutosizingWindowSizeOverride();
</span><del>-    if (windowInfo.windowSize.isEmpty()) {
-        bool includeScrollbars = !InspectorInstrumentation::shouldApplyScreenWidthOverride(&amp;mainFrame);
-        windowInfo.windowSize = mainFrame.view()-&gt;unscaledVisibleContentSize(includeScrollbars ? ScrollableArea::IncludeScrollbars : ScrollableArea::ExcludeScrollbars);
-    }
</del><ins>+    if (windowInfo.windowSize.isEmpty())
+        windowInfo.windowSize = mainFrame.view()-&gt;unscaledVisibleContentSize(ScrollableArea::IncludeScrollbars);
</ins><span class="cx"> 
</span><span class="cx">     // Largest area of block that can be visible at once (assuming the main
</span><span class="cx">     // frame doesn't get scaled to less than overview scale), in CSS pixels.
</span></span></pre></div>
<a id="trunkSourceWebKitblackberryChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/blackberry/ChangeLog (161476 => 161477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/blackberry/ChangeLog        2014-01-08 01:35:35 UTC (rev 161476)
+++ trunk/Source/WebKit/blackberry/ChangeLog        2014-01-08 02:20:46 UTC (rev 161477)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-01-07  Seokju Kwon  &lt;seokju@webkit.org&gt;
+
+        Web Inspector: Remove leftover 'device metrics' code
+        https://bugs.webkit.org/show_bug.cgi?id=126607
+
+        Reviewed by Joseph Pecoraro.
+
+        Clean up after removing InspectorClient::overrideDeviceMetrics().
+
+        * WebCoreSupport/InspectorClientBlackBerry.cpp:
+        * WebCoreSupport/InspectorClientBlackBerry.h:
+
</ins><span class="cx"> 2014-01-06  Seokju Kwon  &lt;seokju@webkit.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Web Inspector: Remove canOverrideDeviceMetrics and setDeviceMetricsOverride from protocol
</span></span></pre></div>
<a id="trunkSourceWebKitblackberryWebCoreSupportInspectorClientBlackBerrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/InspectorClientBlackBerry.cpp (161476 => 161477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/blackberry/WebCoreSupport/InspectorClientBlackBerry.cpp        2014-01-08 01:35:35 UTC (rev 161476)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/InspectorClientBlackBerry.cpp        2014-01-08 02:20:46 UTC (rev 161477)
</span><span class="lines">@@ -86,13 +86,6 @@
</span><span class="cx">     m_webPagePrivate-&gt;m_client-&gt;clearCookies();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void InspectorClientBlackBerry::overrideDeviceMetrics(int width, int height, float fontScaleFactor, bool)
-{
-    // Note: when width and height = 0, and fontScaleFactor = 1, this is the signal for restoring to default size.
-    m_webPagePrivate-&gt;applySizeOverride(width, height);
-    m_webPagePrivate-&gt;setTextZoomFactor(fontScaleFactor);
-}
-
</del><span class="cx"> bool InspectorClientBlackBerry::supportsFrameInstrumentation()
</span><span class="cx"> {
</span><span class="cx">     return true;
</span></span></pre></div>
<a id="trunkSourceWebKitblackberryWebCoreSupportInspectorClientBlackBerryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/InspectorClientBlackBerry.h (161476 => 161477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/blackberry/WebCoreSupport/InspectorClientBlackBerry.h        2014-01-08 01:35:35 UTC (rev 161476)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/InspectorClientBlackBerry.h        2014-01-08 02:20:46 UTC (rev 161477)
</span><span class="lines">@@ -55,7 +55,6 @@
</span><span class="cx">     virtual bool canClearBrowserCookies() { return true; }
</span><span class="cx">     virtual void paintInspectorOverlay(WebCore::GraphicsContext&amp;);
</span><span class="cx"> 
</span><del>-    virtual void overrideDeviceMetrics(int, int, float, bool);
</del><span class="cx">     virtual bool supportsFrameInstrumentation();
</span><span class="cx"> 
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (161476 => 161477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog        2014-01-08 01:35:35 UTC (rev 161476)
+++ trunk/Source/WebKit/mac/ChangeLog        2014-01-08 02:20:46 UTC (rev 161477)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-01-07  Seokju Kwon  &lt;seokju@webkit.org&gt;
+
+        Web Inspector: Remove leftover 'device metrics' code
+        https://bugs.webkit.org/show_bug.cgi?id=126607
+
+        Reviewed by Joseph Pecoraro.
+
+        * WebKit.order: Update after removing InspectorClient::overrideDeviceMetrics().
+
</ins><span class="cx"> 2014-01-02  Andy Estes  &lt;aestes@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [iOS] Upstream WebKit support for various features
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebKitorder"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebKit.order (161476 => 161477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebKit.order        2014-01-08 01:35:35 UTC (rev 161476)
+++ trunk/Source/WebKit/mac/WebKit.order        2014-01-08 02:20:46 UTC (rev 161477)
</span><span class="lines">@@ -1595,7 +1595,6 @@
</span><span class="cx"> __ZN7WebCore15InspectorClient19setShowDebugBordersEb
</span><span class="cx"> __ZN7WebCore15InspectorClient17setShowFPSCounterEb
</span><span class="cx"> __ZN7WebCore15InspectorClient28setContinuousPaintingEnabledEb
</span><del>-__ZN7WebCore15InspectorClient21overrideDeviceMetricsEiifb
</del><span class="cx"> __ZN26WebInspectorFrontendClient21disconnectFromBackendEv
</span><span class="cx"> -[WebInspectorWindowController destroyInspectorView:]
</span><span class="cx"> -[WebInspector releaseFrontend]
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (161476 => 161477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2014-01-08 01:35:35 UTC (rev 161476)
+++ trunk/Source/WebKit2/ChangeLog        2014-01-08 02:20:46 UTC (rev 161477)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-01-07  Seokju Kwon  &lt;seokju@webkit.org&gt;
+
+        Web Inspector: Remove leftover 'device metrics' code
+        https://bugs.webkit.org/show_bug.cgi?id=126607
+
+        Reviewed by Joseph Pecoraro.
+
+        * mac/WebKit2.order: Update after removing InspectorClient::overrideDeviceMetrics().
+
</ins><span class="cx"> 2014-01-07  Simon Fraser  &lt;simon.fraser@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Fix the build. The WebKit2 project copied all of WebKit2/Scripts/webkit2 into WebKit2.framework/PrivateHeaders,
</span></span></pre></div>
<a id="trunkSourceWebKit2macWebKit2order"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/mac/WebKit2.order (161476 => 161477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/mac/WebKit2.order        2014-01-08 01:35:35 UTC (rev 161476)
+++ trunk/Source/WebKit2/mac/WebKit2.order        2014-01-08 02:20:46 UTC (rev 161477)
</span><span class="lines">@@ -8512,7 +8512,6 @@
</span><span class="cx"> __ZN7WebCore15InspectorClient19setShowDebugBordersEb
</span><span class="cx"> __ZN7WebCore15InspectorClient17setShowFPSCounterEb
</span><span class="cx"> __ZN7WebCore15InspectorClient28setContinuousPaintingEnabledEb
</span><del>-__ZN7WebCore15InspectorClient21overrideDeviceMetricsEiifb
</del><span class="cx"> __ZN6WebKit12WebInspector8didCloseEv
</span><span class="cx"> __ZN7CoreIPC10Connection4sendIN8Messages17WebInspectorProxy8DidCloseEEEbRKT_yj
</span><span class="cx"> __ZN7WebCore15InspectorClient23overridesShowPaintRectsEv
</span></span></pre>
</div>
</div>

</body>
</html>