<!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>[199396] trunk/Source/WebInspectorUI</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/199396">199396</a></dd>
<dt>Author</dt> <dd>bburg@apple.com</dd>
<dt>Date</dt> <dd>2016-04-12 16:57:35 -0700 (Tue, 12 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: save inspector's zoom factor as a persistent setting across sessions
https://bugs.webkit.org/show_bug.cgi?id=156522
<rdar://problem/25635774>
Reviewed by Timothy Hatcher.
* UserInterface/Base/Main.js:
(WebInspector.loaded):
Initialize the setting and immediately set the zoom before the frontend page loads.
(WebInspector._increaseZoom):
(WebInspector._decreaseZoom):
(WebInspector._resetZoom):
Use the internal get/set method which updates the WebInspector.Setting.
(WebInspector._setZoomFactor):
Added. Round-trip through the frontend host method in case it further clamps the value.
(WebInspector._zoomFactor):
Added. Just return the setting, since there's no other way for zoom to have changed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceBaseMainjs">trunk/Source/WebInspectorUI/UserInterface/Base/Main.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (199395 => 199396)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-04-12 22:48:43 UTC (rev 199395)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-04-12 23:57:35 UTC (rev 199396)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2016-04-12 Brian Burg <bburg@apple.com>
+
+ Web Inspector: save inspector's zoom factor as a persistent setting across sessions
+ https://bugs.webkit.org/show_bug.cgi?id=156522
+ <rdar://problem/25635774>
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Base/Main.js:
+ (WebInspector.loaded):
+ Initialize the setting and immediately set the zoom before the frontend page loads.
+
+ (WebInspector._increaseZoom):
+ (WebInspector._decreaseZoom):
+ (WebInspector._resetZoom):
+ Use the internal get/set method which updates the WebInspector.Setting.
+
+ (WebInspector._setZoomFactor):
+ Added. Round-trip through the frontend host method in case it further clamps the value.
+
+ (WebInspector._zoomFactor):
+ Added. Just return the setting, since there's no other way for zoom to have changed.
+
</ins><span class="cx"> 2016-04-12 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Show the normal Native icon for all Internal objects in Heap Snapshots
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceBaseMainjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Main.js (199395 => 199396)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2016-04-12 22:48:43 UTC (rev 199395)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2016-04-12 23:57:35 UTC (rev 199396)
</span><span class="lines">@@ -170,6 +170,9 @@
</span><span class="cx"> if (this.showPaintRectsSetting.value && window.PageAgent && PageAgent.setShowPaintRects)
</span><span class="cx"> PageAgent.setShowPaintRects(true);
</span><span class="cx">
</span><ins>+ this._zoomFactorSetting = new WebInspector.Setting("zoom-factor", 1);
+ this._setZoomFactor(this._zoomFactorSetting.value);
+
</ins><span class="cx"> this.mouseCoords = {
</span><span class="cx"> x: 0,
</span><span class="cx"> y: 0
</span><span class="lines">@@ -1638,7 +1641,7 @@
</span><span class="cx"> let dimension = Math.max(0, window[windowProperty] - delta);
</span><span class="cx"> // If zoomed in/out, there be greater/fewer document pixels shown, but the inspector's
</span><span class="cx"> // width or height should be the same in device pixels regardless of the document zoom.
</span><del>- dimension *= InspectorFrontendHost.zoomFactor();
</del><ins>+ dimension *= this._zoomFactor();
</ins><span class="cx">
</span><span class="cx"> if (this._dockSide === "bottom")
</span><span class="cx"> InspectorFrontendHost.setAttachedWindowHeight(dimension);
</span><span class="lines">@@ -1958,12 +1961,12 @@
</span><span class="cx"> {
</span><span class="cx"> const epsilon = 0.0001;
</span><span class="cx"> const maximumZoom = 2.4;
</span><del>- let currentZoom = InspectorFrontendHost.zoomFactor();
</del><ins>+ let currentZoom = this._zoomFactor();
</ins><span class="cx"> if (currentZoom + epsilon >= maximumZoom)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> let newZoom = Math.min(maximumZoom, currentZoom + 0.2);
</span><del>- InspectorFrontendHost.setZoomFactor(newZoom);
</del><ins>+ this._setZoomFactor(newZoom);
</ins><span class="cx"> event.preventDefault();
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -1971,20 +1974,32 @@
</span><span class="cx"> {
</span><span class="cx"> const epsilon = 0.0001;
</span><span class="cx"> const minimumZoom = 0.6;
</span><del>- let currentZoom = InspectorFrontendHost.zoomFactor();
</del><ins>+ let currentZoom = this._zoomFactor();
</ins><span class="cx"> if (currentZoom - epsilon <= minimumZoom)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> let newZoom = Math.max(minimumZoom, currentZoom - 0.2);
</span><del>- InspectorFrontendHost.setZoomFactor(newZoom);
</del><ins>+ this._setZoomFactor(newZoom);
</ins><span class="cx"> event.preventDefault();
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebInspector._resetZoom = function(event)
</span><span class="cx"> {
</span><del>- InspectorFrontendHost.setZoomFactor(1);
</del><ins>+ this._setZoomFactor(1);
</ins><span class="cx"> };
</span><span class="cx">
</span><ins>+WebInspector._zoomFactor = function()
+{
+ return this._zoomFactorSetting.value;
+}
+
+WebInspector._setZoomFactor = function(factor)
+{
+ InspectorFrontendHost.setZoomFactor(factor);
+ // Round-trip through the frontend host API in case the requested factor is not used.
+ this._zoomFactorSetting.value = InspectorFrontendHost.zoomFactor();
+}
+
</ins><span class="cx"> WebInspector._showTabAtIndex = function(i, event)
</span><span class="cx"> {
</span><span class="cx"> if (i <= WebInspector.tabBar.tabBarItems.length)
</span></span></pre>
</div>
</div>
</body>
</html>