<!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>[185978] 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/185978">185978</a></dd>
<dt>Author</dt> <dd>joepeck@webkit.org</dd>
<dt>Date</dt> <dd>2015-06-25 18:45:58 -0700 (Thu, 25 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Add Support for OS X Full Screen Mode
https://bugs.webkit.org/show_bug.cgi?id=123510
Reviewed by Timothy Hatcher.
Source/WebKit/mac:
* WebCoreSupport/WebInspectorClient.h:
* WebCoreSupport/WebInspectorClient.mm:
(WebInspectorClient::didResizeMainFrame):
(WebInspectorClient::windowFullScreenDidChange):
(WebInspectorClient::canAttach):
(WebInspectorFrontendClient::canAttach):
(-[WebInspectorWindowController showWindow:]):
Consolidate canAttach logic into canAttach functions.
(-[WebInspectorWindowController window:]):
Share the same full screen behavior as WebKit2.
(-[WebInspectorWindowController windowDidEnterFullScreen:]):
(-[WebInspectorWindowController windowDidExitFullScreen:]):
Attach availability may have changed.
Source/WebKit2:
* UIProcess/mac/WebInspectorProxyMac.mm:
(WebKit::WebInspectorProxy::createInspectorWindow):
Allow full screen.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebInspectorClienth">trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.h</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebInspectorClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</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="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (185977 => 185978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-06-26 01:34:42 UTC (rev 185977)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-06-26 01:45:58 UTC (rev 185978)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2015-06-25 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: Add Support for OS X Full Screen Mode
+ https://bugs.webkit.org/show_bug.cgi?id=123510
+
+ Reviewed by Timothy Hatcher.
+
+ * WebCoreSupport/WebInspectorClient.h:
+ * WebCoreSupport/WebInspectorClient.mm:
+ (WebInspectorClient::didResizeMainFrame):
+ (WebInspectorClient::windowFullScreenDidChange):
+ (WebInspectorClient::canAttach):
+ (WebInspectorFrontendClient::canAttach):
+ (-[WebInspectorWindowController showWindow:]):
+ Consolidate canAttach logic into canAttach functions.
+
+ (-[WebInspectorWindowController window:]):
+ Share the same full screen behavior as WebKit2.
+
+ (-[WebInspectorWindowController windowDidEnterFullScreen:]):
+ (-[WebInspectorWindowController windowDidExitFullScreen:]):
+ Attach availability may have changed.
+
+2015-06-25 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> [Mac] Web Inspector: Window dragging on toolbar should behave more like native window dragging
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=146324
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebInspectorClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.h (185977 => 185978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.h 2015-06-26 01:34:42 UTC (rev 185977)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.h 2015-06-26 01:45:58 UTC (rev 185978)
</span><span class="lines">@@ -92,6 +92,10 @@
</span><span class="cx"> bool inspectorAttachDisabled();
</span><span class="cx"> void setInspectorAttachDisabled(bool);
</span><span class="cx">
</span><ins>+ void windowFullScreenDidChange();
+
+ bool canAttach();
+
</ins><span class="cx"> void releaseFrontend();
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="lines">@@ -109,6 +113,7 @@
</span><span class="cx"> WebInspectorFrontendClient(WebView*, WebInspectorWindowController*, WebCore::InspectorController*, WebCore::Page*, std::unique_ptr<Settings>);
</span><span class="cx">
</span><span class="cx"> void attachAvailabilityChanged(bool);
</span><ins>+ bool canAttach();
</ins><span class="cx">
</span><span class="cx"> virtual void frontendLoaded() override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebInspectorClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm (185977 => 185978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm 2015-06-26 01:34:42 UTC (rev 185977)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm 2015-06-26 01:45:58 UTC (rev 185978)
</span><span class="lines">@@ -59,6 +59,11 @@
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><ins>+static const CGFloat minimumWindowWidth = 750;
+static const CGFloat minimumWindowHeight = 400;
+static const CGFloat initialWindowWidth = 1000;
+static const CGFloat initialWindowHeight = 650;
+
</ins><span class="cx"> @interface WebInspectorWindowController : NSWindowController <NSWindowDelegate, WebPolicyDelegate, WebUIDelegate> {
</span><span class="cx"> @private
</span><span class="cx"> RetainPtr<WebView> _inspectedWebView;
</span><span class="lines">@@ -131,9 +136,20 @@
</span><span class="cx"> void WebInspectorClient::didResizeMainFrame(Frame*)
</span><span class="cx"> {
</span><span class="cx"> if (m_frontendClient)
</span><del>- m_frontendClient->attachAvailabilityChanged(m_frontendClient->canAttachWindow() && !inspectorAttachDisabled());
</del><ins>+ m_frontendClient->attachAvailabilityChanged(canAttach());
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebInspectorClient::windowFullScreenDidChange()
+{
+ if (m_frontendClient)
+ m_frontendClient->attachAvailabilityChanged(canAttach());
+}
+
+bool WebInspectorClient::canAttach()
+{
+ return m_frontendClient->canAttach() && !inspectorAttachDisabled();
+}
+
</ins><span class="cx"> void WebInspectorClient::highlight()
</span><span class="cx"> {
</span><span class="cx"> [m_highlighter.get() highlight];
</span><span class="lines">@@ -177,6 +193,14 @@
</span><span class="cx"> [m_windowController.get() setDockingUnavailable:!available];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool WebInspectorFrontendClient::canAttach()
+{
+ if ([[m_windowController window] styleMask] & NSFullScreenWindowMask)
+ return false;
+
+ return canAttachWindow();
+}
+
</ins><span class="cx"> void WebInspectorFrontendClient::frontendLoaded()
</span><span class="cx"> {
</span><span class="cx"> [m_windowController.get() showWindow:nil];
</span><span class="lines">@@ -455,10 +479,18 @@
</span><span class="cx"> NSUInteger styleMask = NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask | NSTexturedBackgroundWindowMask;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- window = [[NSWindow alloc] initWithContentRect:NSMakeRect(60.0, 200.0, 750.0, 650.0) styleMask:styleMask backing:NSBackingStoreBuffered defer:NO];
</del><ins>+ window = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, initialWindowWidth, initialWindowHeight) styleMask:styleMask backing:NSBackingStoreBuffered defer:NO];
</ins><span class="cx"> [window setDelegate:self];
</span><del>- [window setMinSize:NSMakeSize(400.0, 400.0)];
</del><ins>+ [window setMinSize:NSMakeSize(minimumWindowWidth, minimumWindowHeight)];
+ [window setCollectionBehavior:([window collectionBehavior] | NSWindowCollectionBehaviorFullScreenPrimary)];
</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">@@ -489,6 +521,16 @@
</span><span class="cx"> return YES;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)windowDidEnterFullScreen:(NSNotification *)notification
+{
+ _inspectorClient->windowFullScreenDidChange();
+}
+
+- (void)windowDidExitFullScreen:(NSNotification *)notification
+{
+ _inspectorClient->windowFullScreenDidChange();
+}
+
</ins><span class="cx"> - (void)close
</span><span class="cx"> {
</span><span class="cx"> if (!_visible)
</span><span class="lines">@@ -533,7 +575,7 @@
</span><span class="cx">
</span><span class="cx"> _visible = YES;
</span><span class="cx">
</span><del>- _shouldAttach = _inspectorClient->inspectorStartsAttached() && _frontendClient->canAttachWindow() && !_inspectorClient->inspectorAttachDisabled();
</del><ins>+ _shouldAttach = _inspectorClient->inspectorStartsAttached() && _frontendClient->canAttach();
</ins><span class="cx">
</span><span class="cx"> if (_shouldAttach) {
</span><span class="cx"> WebFrameView *frameView = [[_inspectedWebView.get() mainFrame] frameView];
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (185977 => 185978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-06-26 01:34:42 UTC (rev 185977)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-26 01:45:58 UTC (rev 185978)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-06-25 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Add Support for OS X Full Screen Mode
+ https://bugs.webkit.org/show_bug.cgi?id=123510
+
+ Reviewed by Timothy Hatcher.
+
+ * UIProcess/mac/WebInspectorProxyMac.mm:
+ (WebKit::WebInspectorProxy::createInspectorWindow):
+ Allow full screen.
+
</ins><span class="cx"> 2015-06-25 Hyungwook Lee <hyungwook.lee@navercorp.com>
</span><span class="cx">
</span><span class="cx"> [EFL] Make send / receive messages to communicate the Web and UI Processes using Injected Bundle.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebInspectorProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm (185977 => 185978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm 2015-06-26 01:34:42 UTC (rev 185977)
+++ trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm 2015-06-26 01:45:58 UTC (rev 185978)
</span><span class="lines">@@ -314,7 +314,7 @@
</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><del>- [window setCollectionBehavior:([window collectionBehavior] | NSWindowCollectionBehaviorFullScreenAuxiliary)];
</del><ins>+ [window setCollectionBehavior:([window collectionBehavior] | NSWindowCollectionBehaviorFullScreenPrimary)];
</ins><span class="cx">
</span><span class="cx"> #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
</span><span class="cx"> CGFloat approximatelyHalfScreenSize = (window.screen.frame.size.width / 2) - 4;
</span></span></pre>
</div>
</div>
</body>
</html>