<!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>[183907] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/183907">183907</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-05-06 20:04:32 -0700 (Wed, 06 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Docking Toolbar Buttons do not respect Docking Availability
https://bugs.webkit.org/show_bug.cgi?id=144714
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2015-05-06
Reviewed by Timothy Hatcher.
Source/WebInspectorUI:
* UserInterface/Base/Main.js:
(WebInspector.contentLoaded):
(WebInspector.updateDockingAvailability):
(WebInspector._updateDockNavigationItems):
Update the Toolbar UI based on docking availability.
Assume docking is unavailable by default.
* UserInterface/Protocol/InspectorFrontendAPI.js:
(InspectorFrontendAPI.setDockingUnavailable):
Add back this API as the backend may be calling it when
docking availability changes. This just calls out to
global WebInspector functions to update the Toolbar UI.
* UserInterface/Base/Test.js:
(WebInspector.updateDockedState):
(WebInspector.updateDockingAvailability):
Do nothing in tests.
Source/WebKit2:
* UIProcess/WebInspectorProxy.cpp:
(WebKit::WebInspectorProxy::createInspectorPage):
(WebKit::WebInspectorProxy::attachAvailabilityChanged):
* WebProcess/WebPage/WebInspectorUI.cpp:
(WebKit::WebInspectorUI::setDockingUnavailable):
* WebProcess/WebPage/WebInspectorUI.h:
* WebProcess/WebPage/WebInspectorUI.messages.in:
When docking availability changes, inform the inspector page
so it can respond by updating its UI.</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>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceBaseTestjs">trunk/Source/WebInspectorUI/UserInterface/Base/Test.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceProtocolInspectorFrontendAPIjs">trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorFrontendAPI.js</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebInspectorProxycpp">trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebInspectorUIcpp">trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorUI.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebInspectorUIh">trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorUI.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebInspectorUImessagesin">trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorUI.messages.in</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (183906 => 183907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-05-07 02:53:00 UTC (rev 183906)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-05-07 03:04:32 UTC (rev 183907)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2015-05-06 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Docking Toolbar Buttons do not respect Docking Availability
+ https://bugs.webkit.org/show_bug.cgi?id=144714
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Base/Main.js:
+ (WebInspector.contentLoaded):
+ (WebInspector.updateDockingAvailability):
+ (WebInspector._updateDockNavigationItems):
+ Update the Toolbar UI based on docking availability.
+ Assume docking is unavailable by default.
+
+ * UserInterface/Protocol/InspectorFrontendAPI.js:
+ (InspectorFrontendAPI.setDockingUnavailable):
+ Add back this API as the backend may be calling it when
+ docking availability changes. This just calls out to
+ global WebInspector functions to update the Toolbar UI.
+
+ * UserInterface/Base/Test.js:
+ (WebInspector.updateDockedState):
+ (WebInspector.updateDockingAvailability):
+ Do nothing in tests.
+
</ins><span class="cx"> 2015-05-06 Matt Baker <mattbaker@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: The text in the left pane overlaps the "Filter Time Events" field in the Timeline after the Web Inspector is resized
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceBaseMainjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Main.js (183906 => 183907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2015-05-07 02:53:00 UTC (rev 183906)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2015-05-07 03:04:32 UTC (rev 183907)
</span><span class="lines">@@ -324,6 +324,8 @@
</span><span class="cx"> this.toolbar.element.addEventListener("mousedown", this._toolbarMouseDown.bind(this));
</span><span class="cx"> document.getElementById("docked-resizer").addEventListener("mousedown", this._dockedResizerMouseDown.bind(this));
</span><span class="cx">
</span><ins>+ this._dockingAvailable = false;
+
</ins><span class="cx"> this._updateDockNavigationItems();
</span><span class="cx"> this._updateToolbarHeight();
</span><span class="cx">
</span><span class="lines">@@ -549,6 +551,13 @@
</span><span class="cx"> InspectorFrontendHost.inspectedURLChanged(title);
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+WebInspector.updateDockingAvailability = function(available)
+{
+ this._dockingAvailable = available;
+
+ this._updateDockNavigationItems();
+};
+
</ins><span class="cx"> WebInspector.updateDockedState = function(side)
</span><span class="cx"> {
</span><span class="cx"> if (this._dockSide === side)
</span><span class="lines">@@ -1228,10 +1237,17 @@
</span><span class="cx">
</span><span class="cx"> WebInspector._updateDockNavigationItems = function()
</span><span class="cx"> {
</span><del>- this._closeToolbarButton.hidden = !this.docked;
- this._undockToolbarButton.hidden = this._dockSide === "undocked";
- this._dockBottomToolbarButton.hidden = this._dockSide === "bottom";
- this._dockRightToolbarButton.hidden = this._dockSide === "right";
</del><ins>+ if (this._dockingAvailable || this.docked) {
+ this._closeToolbarButton.hidden = !this.docked;
+ this._undockToolbarButton.hidden = this._dockSide === "undocked";
+ this._dockBottomToolbarButton.hidden = this._dockSide === "bottom";
+ this._dockRightToolbarButton.hidden = this._dockSide === "right";
+ } else {
+ this._closeToolbarButton.hidden = true;
+ this._undockToolbarButton.hidden = true;
+ this._dockBottomToolbarButton.hidden = true;
+ this._dockRightToolbarButton.hidden = true;
+ }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebInspector._tabBrowserSizeDidChange = function()
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceBaseTestjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Test.js (183906 => 183907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Base/Test.js 2015-05-07 02:53:00 UTC (rev 183906)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Test.js 2015-05-07 03:04:32 UTC (rev 183907)
</span><span class="lines">@@ -91,9 +91,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Add stubs that are called by the frontend API.
</span><del>-WebInspector.updateDockedState = function()
-{
-}
</del><ins>+WebInspector.updateDockedState = function() {};
+WebInspector.updateDockingAvailability = function() {};
</ins><span class="cx">
</span><span class="cx"> // InspectorTest contains extra methods that are only available to test code running
</span><span class="cx"> // in the Web Inspector page. They rely on equivalents in the actual test page
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceProtocolInspectorFrontendAPIjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorFrontendAPI.js (183906 => 183907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorFrontendAPI.js 2015-05-07 02:53:00 UTC (rev 183906)
+++ trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorFrontendAPI.js 2015-05-07 03:04:32 UTC (rev 183907)
</span><span class="lines">@@ -55,6 +55,11 @@
</span><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ setDockingUnavailable: function(unavailable)
+ {
+ WebInspector.updateDockingAvailability(!unavailable);
+ },
+
</ins><span class="cx"> setDockSide: function(side)
</span><span class="cx"> {
</span><span class="cx"> WebInspector.updateDockedState(side);
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (183906 => 183907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-05-07 02:53:00 UTC (rev 183906)
+++ trunk/Source/WebKit2/ChangeLog 2015-05-07 03:04:32 UTC (rev 183907)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-05-06 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Docking Toolbar Buttons do not respect Docking Availability
+ https://bugs.webkit.org/show_bug.cgi?id=144714
+
+ Reviewed by Timothy Hatcher.
+
+ * UIProcess/WebInspectorProxy.cpp:
+ (WebKit::WebInspectorProxy::createInspectorPage):
+ (WebKit::WebInspectorProxy::attachAvailabilityChanged):
+ * WebProcess/WebPage/WebInspectorUI.cpp:
+ (WebKit::WebInspectorUI::setDockingUnavailable):
+ * WebProcess/WebPage/WebInspectorUI.h:
+ * WebProcess/WebPage/WebInspectorUI.messages.in:
+ When docking availability changes, inform the inspector page
+ so it can respond by updating its UI.
+
</ins><span class="cx"> 2015-05-06 Joonghun Park <jh718.park@samsung.com>
</span><span class="cx">
</span><span class="cx"> [WK2] Simplify AsyncRequestImpl::ArgumentType parameters
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebInspectorProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp (183906 => 183907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp 2015-05-07 02:53:00 UTC (rev 183906)
+++ trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp 2015-05-07 03:04:32 UTC (rev 183907)
</span><span class="lines">@@ -509,6 +509,8 @@
</span><span class="cx"> }
</span><span class="cx"> } else
</span><span class="cx"> m_inspectorPage->process().send(Messages::WebInspectorUI::Detached(), m_inspectorPage->pageID());
</span><ins>+
+ m_inspectorPage->process().send(Messages::WebInspectorUI::SetDockingUnavailable(!m_canAttach), m_inspectorPage->pageID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_inspectorPage->loadRequest(URL(URL(), m_underTest ? inspectorTestPageURL() : inspectorPageURL()));
</span><span class="lines">@@ -572,6 +574,9 @@
</span><span class="cx"> if (previousCanAttach == m_canAttach)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ if (!m_underTest)
+ m_inspectorPage->process().send(Messages::WebInspectorUI::SetDockingUnavailable(!m_canAttach), m_inspectorPage->pageID());
+
</ins><span class="cx"> platformAttachAvailabilityChanged(m_canAttach);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebInspectorUIcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorUI.cpp (183906 => 183907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorUI.cpp 2015-05-07 02:53:00 UTC (rev 183906)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorUI.cpp 2015-05-07 03:04:32 UTC (rev 183907)
</span><span class="lines">@@ -164,6 +164,11 @@
</span><span class="cx"> evaluateCommandOnLoad(ASCIILiteral("setDockSide"), ASCIILiteral(sideString));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebInspectorUI::setDockingUnavailable(bool unavailable)
+{
+ evaluateCommandOnLoad(ASCIILiteral("setDockingUnavailable"), unavailable);
+}
+
</ins><span class="cx"> void WebInspectorUI::changeAttachedWindowHeight(unsigned height)
</span><span class="cx"> {
</span><span class="cx"> WebProcess::singleton().parentProcessConnection()->send(Messages::WebInspectorProxy::SetAttachedWindowHeight(height), m_inspectedPageIdentifier);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebInspectorUIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorUI.h (183906 => 183907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorUI.h 2015-05-07 02:53:00 UTC (rev 183906)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorUI.h 2015-05-07 03:04:32 UTC (rev 183907)
</span><span class="lines">@@ -67,6 +67,7 @@
</span><span class="cx"> void detached() { setDockSide(DockSide::Undocked); }
</span><span class="cx">
</span><span class="cx"> void setDockSide(DockSide);
</span><ins>+ void setDockingUnavailable(bool);
</ins><span class="cx">
</span><span class="cx"> void didSave(const String& url);
</span><span class="cx"> void didAppend(const String& url);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebInspectorUImessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorUI.messages.in (183906 => 183907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorUI.messages.in 2015-05-07 02:53:00 UTC (rev 183906)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorUI.messages.in 2015-05-07 03:04:32 UTC (rev 183907)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> AttachedBottom()
</span><span class="cx"> AttachedRight()
</span><span class="cx"> Detached()
</span><ins>+ SetDockingUnavailable(bool unavailable)
</ins><span class="cx">
</span><span class="cx"> ShowConsole()
</span><span class="cx"> ShowResources()
</span></span></pre>
</div>
</div>
</body>
</html>