<!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>[185672] trunk/Source/WebKit2</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/185672">185672</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-06-17 14:38:24 -0700 (Wed, 17 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Improve Full Screen support for Web Inspector windows
https://bugs.webkit.org/show_bug.cgi?id=146036
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2015-06-17
Reviewed by Timothy Hatcher.
* UIProcess/WebInspectorProxy.h:
* UIProcess/mac/WebInspectorProxyMac.mm:
(-[WKWebInspectorProxyObjCAdapter windowDidEnterFullScreen:]):
(-[WKWebInspectorProxyObjCAdapter windowDidExitFullScreen:]):
(WebKit::WebInspectorProxy::platformCanAttach):
(WebKit::WebInspectorProxy::windowFullScreenDidChange):
When entering / leaving full screen update attach availability to
potentially show / hide the frontend's docking buttons.
(WebKit::WebInspectorProxy::createInspectorWindow):
Allow a Web Inspector window to be a full screen auxillary window,
so that if the application with a WebView opens a detached inspector
window it can be shown on the same desktop as the full screen app.
Also, reduce the minimum window size requirements for full screen tiling.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebInspectorProxyh">trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebInspectorProxyMacmm">trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (185671 => 185672)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-06-17 21:34:22 UTC (rev 185671)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-17 21:38:24 UTC (rev 185672)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-06-17 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Improve Full Screen support for Web Inspector windows
+ https://bugs.webkit.org/show_bug.cgi?id=146036
+
+ Reviewed by Timothy Hatcher.
+
+ * UIProcess/WebInspectorProxy.h:
+ * UIProcess/mac/WebInspectorProxyMac.mm:
+ (-[WKWebInspectorProxyObjCAdapter windowDidEnterFullScreen:]):
+ (-[WKWebInspectorProxyObjCAdapter windowDidExitFullScreen:]):
+ (WebKit::WebInspectorProxy::platformCanAttach):
+ (WebKit::WebInspectorProxy::windowFullScreenDidChange):
+ When entering / leaving full screen update attach availability to
+ potentially show / hide the frontend's docking buttons.
+
+ (WebKit::WebInspectorProxy::createInspectorWindow):
+ Allow a Web Inspector window to be a full screen auxillary window,
+ so that if the application with a WebView opens a detached inspector
+ window it can be shown on the same desktop as the full screen app.
+ Also, reduce the minimum window size requirements for full screen tiling.
+
</ins><span class="cx"> 2015-06-17 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Safari tabs still have shrunken content after coming out of fullscreen
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebInspectorProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h (185671 => 185672)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h 2015-06-17 21:34:22 UTC (rev 185671)
+++ trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h 2015-06-17 21:38:24 UTC (rev 185672)
</span><span class="lines">@@ -101,6 +101,7 @@
</span><span class="cx"> void updateInspectorWindowTitle() const;
</span><span class="cx"> void inspectedViewFrameDidChange(CGFloat = 0);
</span><span class="cx"> void windowFrameDidChange();
</span><ins>+ void windowFullScreenDidChange();
</ins><span class="cx"> NSWindow* inspectorWindow() const { return m_inspectorWindow.get(); }
</span><span class="cx">
</span><span class="cx"> void setInspectorWindowFrame(WKRect&);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebInspectorProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm (185671 => 185672)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm 2015-06-17 21:34:22 UTC (rev 185671)
+++ trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm 2015-06-17 21:38:24 UTC (rev 185672)
</span><span class="lines">@@ -141,6 +141,16 @@
</span><span class="cx"> static_cast<WebInspectorProxy*>(_inspectorProxy)->close();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)windowDidEnterFullScreen:(NSNotification *)notification
+{
+ static_cast<WebInspectorProxy*>(_inspectorProxy)->windowFullScreenDidChange();
+}
+
+- (void)windowDidExitFullScreen:(NSNotification *)notification
+{
+ static_cast<WebInspectorProxy*>(_inspectorProxy)->windowFullScreenDidChange();
+}
+
</ins><span class="cx"> - (void)ignoreNextInspectedViewFrameDidChange
</span><span class="cx"> {
</span><span class="cx"> _ignoreNextInspectedViewFrameDidChange = YES;
</span><span class="lines">@@ -304,7 +314,15 @@
</span><span class="cx"> [window setDelegate:m_inspectorProxyObjCAdapter.get()];
</span><span class="cx"> [window setMinSize:NSMakeSize(minimumWindowWidth, minimumWindowHeight)];
</span><span class="cx"> [window setReleasedWhenClosed:NO];
</span><ins>+ [window setCollectionBehavior:([window collectionBehavior] | NSWindowCollectionBehaviorFullScreenAuxiliary)];
</ins><span class="cx">
</span><ins>+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
+ CGFloat approximatelyHalfScreenSize = (window.screen.frame.size.width / 2) - 4;
+ CGFloat minimumFullScreenWidth = std::max<CGFloat>(636, approximatelyHalfScreenSize);
+ [window setMinFullScreenContentSize:NSMakeSize(minimumFullScreenWidth, minimumWindowHeight)];
+ [window setCollectionBehavior:([window collectionBehavior] | NSWindowCollectionBehaviorFullScreenAllowsTiling)];
+#endif
+
</ins><span class="cx"> #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</span><span class="cx"> window.titlebarAppearsTransparent = YES;
</span><span class="cx"> #else
</span><span class="lines">@@ -463,6 +481,9 @@
</span><span class="cx">
</span><span class="cx"> bool WebInspectorProxy::platformCanAttach(bool webProcessCanAttach)
</span><span class="cx"> {
</span><ins>+ if ([m_inspectorWindow styleMask] & NSFullScreenWindowMask)
+ return false;
+
</ins><span class="cx"> NSView *inspectedView = inspectedPage()->wkView()._inspectorAttachmentView;
</span><span class="cx"> if ([inspectedView isKindOfClass:[WKView class]])
</span><span class="cx"> return webProcessCanAttach;
</span><span class="lines">@@ -635,13 +656,25 @@
</span><span class="cx"> inspectedPage()->pageGroup().preferences().setInspectorWindowFrame(frameString);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebInspectorProxy::windowFullScreenDidChange()
+{
+ ASSERT(!m_isAttached);
+ ASSERT(m_isVisible);
+ ASSERT(m_inspectorWindow);
+
+ if (m_isAttached || !m_isVisible || !m_inspectorWindow)
+ return;
+
+ attachAvailabilityChanged(platformCanAttach(canAttach()));
+}
+
</ins><span class="cx"> void WebInspectorProxy::inspectedViewFrameDidChange(CGFloat currentDimension)
</span><span class="cx"> {
</span><span class="cx"> if (!m_isVisible)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (!m_isAttached) {
</span><del>- // Check if the attach avaibility changed. We need to do this here in case
</del><ins>+ // Check if the attach availability changed. We need to do this here in case
</ins><span class="cx"> // the attachment view is not the WKView.
</span><span class="cx"> attachAvailabilityChanged(platformCanAttach(canAttach()));
</span><span class="cx"> return;
</span></span></pre>
</div>
</div>
</body>
</html>