<!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>[193238] branches/safari-601-branch/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/193238">193238</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-12-03 11:00:48 -0800 (Thu, 03 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/190416">r190416</a>. rdar://problem/23221163</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchSourceWebCoreChangeLog">branches/safari-601-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebCoreinspectorInspectorFrontendHostcpp">branches/safari-601-branch/Source/WebCore/inspector/InspectorFrontendHost.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCoreinspectorInspectorFrontendHosth">branches/safari-601-branch/Source/WebCore/inspector/InspectorFrontendHost.h</a></li>
<li><a href="#branchessafari601branchSourceWebCoreinspectorInspectorFrontendHostidl">branches/safari-601-branch/Source/WebCore/inspector/InspectorFrontendHost.idl</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIChangeLog">branches/safari-601-branch/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceBaseMainjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Base/Main.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (193237 => 193238)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-03 19:00:42 UTC (rev 193237)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-03 19:00:48 UTC (rev 193238)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2015-12-02 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Merge r190416. rdar://problem/23221163
+
+ 2015-09-30 João Oliveira <hello@jxs.pt>
+
+ Web Inspector: Adjust font size of Developer Tools using Command,+ or Command,-
+ https://bugs.webkit.org/show_bug.cgi?id=149590
+
+ Reviewed by Joseph Pecoraro.
+
+ Patch by João Oliveira and Brian Burg.
+
+ Expose the frontend page's zoom factor so we can implement relative zoom.
+
+ * inspector/InspectorFrontendHost.cpp:
+ (WebCore::InspectorFrontendHost::zoomFactor): Added.
+ * inspector/InspectorFrontendHost.h:
+ * inspector/InspectorFrontendHost.idl:
+ * page/Frame.h:
+ (WebCore::Frame::pageZoomFactor):
+
+2015-12-02 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Merge r189883. rdar://problem/23221163
</span><span class="cx">
</span><span class="cx"> 2015-09-16 Joseph Pecoraro <pecoraro@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreinspectorInspectorFrontendHostcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/inspector/InspectorFrontendHost.cpp (193237 => 193238)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/inspector/InspectorFrontendHost.cpp 2015-12-03 19:00:42 UTC (rev 193237)
+++ branches/safari-601-branch/Source/WebCore/inspector/InspectorFrontendHost.cpp 2015-12-03 19:00:48 UTC (rev 193238)
</span><span class="lines">@@ -174,15 +174,20 @@
</span><span class="cx"> m_client->bringToFront();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void InspectorFrontendHost::inspectedURLChanged(const String& newURL)
+{
+ if (m_client)
+ m_client->inspectedURLChanged(newURL);
+}
+
</ins><span class="cx"> void InspectorFrontendHost::setZoomFactor(float zoom)
</span><span class="cx"> {
</span><span class="cx"> m_frontendPage->mainFrame().setPageAndTextZoomFactors(zoom, 1);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorFrontendHost::inspectedURLChanged(const String& newURL)
</del><ins>+float InspectorFrontendHost::zoomFactor()
</ins><span class="cx"> {
</span><del>- if (m_client)
- m_client->inspectedURLChanged(newURL);
</del><ins>+ return m_frontendPage->mainFrame().pageZoomFactor();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorFrontendHost::setAttachedWindowHeight(unsigned height)
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreinspectorInspectorFrontendHosth"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/inspector/InspectorFrontendHost.h (193237 => 193238)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/inspector/InspectorFrontendHost.h 2015-12-03 19:00:42 UTC (rev 193237)
+++ branches/safari-601-branch/Source/WebCore/inspector/InspectorFrontendHost.h 2015-12-03 19:00:48 UTC (rev 193238)
</span><span class="lines">@@ -57,9 +57,11 @@
</span><span class="cx"> void requestSetDockSide(const String&);
</span><span class="cx"> void closeWindow();
</span><span class="cx"> void bringToFront();
</span><del>- void setZoomFactor(float);
</del><span class="cx"> void inspectedURLChanged(const String&);
</span><span class="cx">
</span><ins>+ void setZoomFactor(float);
+ float zoomFactor();
+
</ins><span class="cx"> void setAttachedWindowHeight(unsigned);
</span><span class="cx"> void setAttachedWindowWidth(unsigned);
</span><span class="cx"> void setToolbarHeight(unsigned);
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreinspectorInspectorFrontendHostidl"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/inspector/InspectorFrontendHost.idl (193237 => 193238)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/inspector/InspectorFrontendHost.idl 2015-12-03 19:00:42 UTC (rev 193237)
+++ branches/safari-601-branch/Source/WebCore/inspector/InspectorFrontendHost.idl 2015-12-03 19:00:48 UTC (rev 193238)
</span><span class="lines">@@ -37,9 +37,11 @@
</span><span class="cx"> void loaded();
</span><span class="cx"> void closeWindow();
</span><span class="cx"> void bringToFront();
</span><del>- void setZoomFactor(unrestricted float zoom);
</del><span class="cx"> void inspectedURLChanged(DOMString newURL);
</span><span class="cx">
</span><ins>+ void setZoomFactor(unrestricted float zoom);
+ float zoomFactor();
+
</ins><span class="cx"> void requestSetDockSide(DOMString side);
</span><span class="cx">
</span><span class="cx"> void setAttachedWindowHeight(unsigned long height);
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (193237 => 193238)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 19:00:42 UTC (rev 193237)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 19:00:48 UTC (rev 193238)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2015-12-02 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Merge r190416. rdar://problem/23221163
+
+ 2015-09-30 João Oliveira <hello@jxs.pt>
+
+ Web Inspector: Adjust font size of Developer Tools using Command,+ or Command,-
+ https://bugs.webkit.org/show_bug.cgi?id=149590
+
+ Reviewed by Joseph Pecoraro.
+
+ Patch by João Oliveira and Brian Burg.
+
+ * UserInterface/Base/Main.js:
+ (WebInspector.contentLoaded): Add global keyboard shortcuts for zoom in and zoom out.
+
+2015-12-02 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Merge r190381. rdar://problem/23221163
</span><span class="cx">
</span><span class="cx"> 2015-09-30 Joseph Pecoraro <pecoraro@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceBaseMainjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Base/Main.js (193237 => 193238)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Base/Main.js 2015-12-03 19:00:42 UTC (rev 193237)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Base/Main.js 2015-12-03 19:00:48 UTC (rev 193238)
</span><span class="lines">@@ -245,6 +245,9 @@
</span><span class="cx"> this.navigationSidebarKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl, "0", this.toggleNavigationSidebar.bind(this));
</span><span class="cx"> this.detailsSidebarKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl | WebInspector.KeyboardShortcut.Modifier.Option, "0", this.toggleDetailsSidebar.bind(this));
</span><span class="cx">
</span><ins>+ this._increaseZoomKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl, WebInspector.KeyboardShortcut.Key.Plus, this._increaseZoom.bind(this));
+ this._decreaseZoomKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl, WebInspector.KeyboardShortcut.Key.Minus, this._decreaseZoom.bind(this));
+
</ins><span class="cx"> this.tabBrowser = new WebInspector.TabBrowser(document.getElementById("tab-browser"), this.tabBar, this.navigationSidebar, this.detailsSidebar);
</span><span class="cx"> this.tabBrowser.addEventListener(WebInspector.TabBrowser.Event.SelectedTabContentViewDidChange, this._tabBrowserSelectedTabContentViewDidChange, this);
</span><span class="cx">
</span><span class="lines">@@ -1808,6 +1811,18 @@
</span><span class="cx"> event.preventDefault();
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+WebInspector._increaseZoom = function(event) {
+ var currentZoom = InspectorFrontendHost.zoomFactor();
+ InspectorFrontendHost.setZoomFactor(currentZoom * 1.2);
+ event.preventDefault();
+};
+
+WebInspector._decreaseZoom = function(event) {
+ var currentZoom = InspectorFrontendHost.zoomFactor();
+ InspectorFrontendHost.setZoomFactor(currentZoom * 0.8);
+ event.preventDefault();
+};
+
</ins><span class="cx"> WebInspector._generateDisclosureTriangleImages = function()
</span><span class="cx"> {
</span><span class="cx"> var specifications = {};
</span></span></pre>
</div>
</div>
</body>
</html>