<!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>[172526] 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/172526">172526</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2014-08-13 11:58:23 -0700 (Wed, 13 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Workaround a NSWindow change to the title bar.
https://bugs.webkit.org/show_bug.cgi?id=135880
Reviewed by Joseph Pecoraro.
Source/WebInspectorUI:
* UserInterface/Base/Main.js:
(WebInspector._updateToolbarHeight): Don't call in legacy mode.
* UserInterface/Views/DashboardContainerView.css:
(.toolbar .dashboard-container):
(.toolbar .dashboard):
Drive-by fix some errant drop-shadows. The transparent border was pushing the inset top
drop shadow down when it shouldn't. Remove duplicate background and shadow.
* UserInterface/Views/Main.css:
(body): Set the background white, never needs to be transparent now.
(body.mac-platform.legacy:not(.docked)): Set background to transparent when not docked in legacy.
(body.docked.bottom): Update border color.
(body.docked.right): Ditto.
(body.docked.bottom.mac-platform.legacy): Keep old border color.
(body.docked.right.mac-platform.legacy): Ditto.
* UserInterface/Views/Toolbar.css:
(.toolbar): Set a default border and background gradient.
(body.window-inactive .toolbar): No gradient but use a solid color when inactive.
(body.mac-platform:not(.legacy):not(.docked) .toolbar): Padding on the top for the title bar.
(body.mac-platform:not(.legacy):not(.docked) .toolbar.icon-and-label-vertical): Account for title bar height.
(body.mac-platform:not(.legacy):not(.docked) .toolbar.icon-and-label-vertical.small-size): Ditto.
(body.mac-platform:not(.legacy):not(.docked) .toolbar.icon-only): Ditto.
(body.mac-platform:not(.legacy):not(.docked) .toolbar.label-only): Ditto.
(body.mac-platform.legacy .toolbar): No inset shadow in legacy when not docked.
(body.mac-platform.legacy.docked .toolbar): Restore legacy border color.
(body.mac-platform.legacy:not(.docked) .toolbar .item.button > .label): Only disable sub-pixel antialiasing on legacy!
(body.mac-platform.legacy.window-inactive .toolbar): Restore legacy border color.
Source/WebKit/mac:
* WebCoreSupport/WebInspectorClient.mm:
(WebInspectorFrontendClient::setToolbarHeight): Only call setContentBorderThickness: on 10.9 and earlier.
(-[WebInspectorWindowController init]): Only call setDrawsBackground: on 10.9 and earlier.
(-[WebInspectorWindowController window]): Set titlebarAppearsTransparent on 10.10.
Only call border thickness APIs on 10.9 and earlier.
Source/WebKit2:
* UIProcess/mac/WebInspectorProxyMac.mm:
(WebKit::WebInspectorProxy::createInspectorWindow): Set titlebarAppearsTransparent on 10.10.
Only call border thickness APIs on 10.9 and earlier.
(WebKit::WebInspectorProxy::platformCreateInspectorPage): Only call setDrawsBackground: on 10.9 and earlier.
(WebKit::WebInspectorProxy::platformSetToolbarHeight): Only call setContentBorderThickness: on 10.9 and earlier.</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="#trunkSourceWebInspectorUIUserInterfaceViewsDashboardContainerViewcss">trunk/Source/WebInspectorUI/UserInterface/Views/DashboardContainerView.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsMaincss">trunk/Source/WebInspectorUI/UserInterface/Views/Main.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsToolbarcss">trunk/Source/WebInspectorUI/UserInterface/Views/Toolbar.css</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</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="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (172525 => 172526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2014-08-13 18:51:54 UTC (rev 172525)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-08-13 18:58:23 UTC (rev 172526)
</span><span class="lines">@@ -1,5 +1,42 @@
</span><span class="cx"> 2014-08-13 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: Workaround a NSWindow change to the title bar.
+ https://bugs.webkit.org/show_bug.cgi?id=135880
+
+ Reviewed by Joseph Pecoraro.
+
+ * UserInterface/Base/Main.js:
+ (WebInspector._updateToolbarHeight): Don't call in legacy mode.
+
+ * UserInterface/Views/DashboardContainerView.css:
+ (.toolbar .dashboard-container):
+ (.toolbar .dashboard):
+ Drive-by fix some errant drop-shadows. The transparent border was pushing the inset top
+ drop shadow down when it shouldn't. Remove duplicate background and shadow.
+
+ * UserInterface/Views/Main.css:
+ (body): Set the background white, never needs to be transparent now.
+ (body.mac-platform.legacy:not(.docked)): Set background to transparent when not docked in legacy.
+ (body.docked.bottom): Update border color.
+ (body.docked.right): Ditto.
+ (body.docked.bottom.mac-platform.legacy): Keep old border color.
+ (body.docked.right.mac-platform.legacy): Ditto.
+
+ * UserInterface/Views/Toolbar.css:
+ (.toolbar): Set a default border and background gradient.
+ (body.window-inactive .toolbar): No gradient but use a solid color when inactive.
+ (body.mac-platform:not(.legacy):not(.docked) .toolbar): Padding on the top for the title bar.
+ (body.mac-platform:not(.legacy):not(.docked) .toolbar.icon-and-label-vertical): Account for title bar height.
+ (body.mac-platform:not(.legacy):not(.docked) .toolbar.icon-and-label-vertical.small-size): Ditto.
+ (body.mac-platform:not(.legacy):not(.docked) .toolbar.icon-only): Ditto.
+ (body.mac-platform:not(.legacy):not(.docked) .toolbar.label-only): Ditto.
+ (body.mac-platform.legacy .toolbar): No inset shadow in legacy when not docked.
+ (body.mac-platform.legacy.docked .toolbar): Restore legacy border color.
+ (body.mac-platform.legacy:not(.docked) .toolbar .item.button > .label): Only disable sub-pixel antialiasing on legacy!
+ (body.mac-platform.legacy.window-inactive .toolbar): Restore legacy border color.
+
+2014-08-13 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Web Inspector: Restore Helvetica as the dashboard font in legacy mode
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=135886
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceBaseMainjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Main.js (172525 => 172526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2014-08-13 18:51:54 UTC (rev 172525)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2014-08-13 18:58:23 UTC (rev 172526)
</span><span class="lines">@@ -998,7 +998,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector._updateToolbarHeight = function()
</span><span class="cx"> {
</span><del>- InspectorFrontendHost.setToolbarHeight(this.toolbar.element.offsetHeight);
</del><ins>+ if (WebInspector.Platform.isLegacyMacOS)
+ InspectorFrontendHost.setToolbarHeight(this.toolbar.element.offsetHeight);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebInspector._toolbarDisplayModeDidChange = function(event)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDashboardContainerViewcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DashboardContainerView.css (172525 => 172526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DashboardContainerView.css 2014-08-13 18:51:54 UTC (rev 172525)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DashboardContainerView.css 2014-08-13 18:58:23 UTC (rev 172526)
</span><span class="lines">@@ -32,8 +32,10 @@
</span><span class="cx"> background-color: rgb(252, 252, 252);
</span><span class="cx">
</span><span class="cx"> border: 1px solid transparent;
</span><del>- box-shadow: rgba(0, 0, 0, 0.15) 0 1px 0, inset white 0 1px 0;
</del><ins>+ border-top-color: white;
</ins><span class="cx">
</span><ins>+ box-shadow: rgba(0, 0, 0, 0.15) 0 1px 0;
+
</ins><span class="cx"> margin: 4px 10px;
</span><span class="cx"> overflow: hidden;
</span><span class="cx"> }
</span><span class="lines">@@ -94,9 +96,6 @@
</span><span class="cx">
</span><span class="cx"> padding: 0 10px 0 5px;
</span><span class="cx">
</span><del>- background-color: rgb(252, 252, 252);
- box-shadow: inset white 0 1px 0;
-
</del><span class="cx"> -webkit-animation-duration: 0.4s;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsMaincss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/Main.css (172525 => 172526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/Main.css 2014-08-13 18:51:54 UTC (rev 172525)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/Main.css 2014-08-13 18:58:23 UTC (rev 172526)
</span><span class="lines">@@ -34,6 +34,8 @@
</span><span class="cx"> font-family: -webkit-system-font, sans-serif;
</span><span class="cx"> font-size: 11px;
</span><span class="cx">
</span><ins>+ background-color: white;
+
</ins><span class="cx"> position: absolute;
</span><span class="cx"> top: 0;
</span><span class="cx"> left: 0;
</span><span class="lines">@@ -55,18 +57,26 @@
</span><span class="cx"> tab-size: 4; /* FIXME: This should be controlled by a setting. <rdar://problem/10593948> */
</span><span class="cx"> }
</span><span class="cx">
</span><del>-body.docked {
- background-color: white;
</del><ins>+body.mac-platform.legacy:not(.docked) {
+ background-color: transparent;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> body.docked.bottom {
</span><del>- border-top: 1px solid rgb(85, 85, 85);
</del><ins>+ border-top: 1px solid rgb(179, 179, 179);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> body.docked.right {
</span><del>- border-left: 1px solid rgb(85, 85, 85);
</del><ins>+ border-left: 1px solid rgb(179, 179, 179);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+body.docked.bottom.mac-platform.legacy {
+ border-top-color: rgb(85, 85, 85);
+}
+
+body.docked.right.mac-platform.legacy {
+ border-left-color: rgb(85, 85, 85);
+}
+
</ins><span class="cx"> #docked-resizer {
</span><span class="cx"> display: none;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsToolbarcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/Toolbar.css (172525 => 172526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/Toolbar.css 2014-08-13 18:51:54 UTC (rev 172525)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/Toolbar.css 2014-08-13 18:58:23 UTC (rev 172526)
</span><span class="lines">@@ -29,11 +29,18 @@
</span><span class="cx"> white-space: nowrap;
</span><span class="cx"> overflow: hidden;
</span><span class="cx">
</span><del>- border-bottom: 1px solid rgb(85, 85, 85);
</del><ins>+ border-bottom: 1px solid rgb(179, 179, 179);
+ background-image: linear-gradient(to bottom, rgb(232, 232, 232), rgb(209, 209, 209));
+ box-shadow: inset rgba(255, 255, 255, 0.5) 0 1px 1px;
</ins><span class="cx">
</span><span class="cx"> outline: none;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+body.window-inactive .toolbar {
+ background-image: none;
+ background-color: rgb(246, 246, 246);
+}
+
</ins><span class="cx"> .toolbar.icon-and-label-vertical {
</span><span class="cx"> height: 56px;
</span><span class="cx"> }
</span><span class="lines">@@ -53,18 +60,40 @@
</span><span class="cx"> height: 32px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-body.docked .toolbar,
-body:not(.mac-platform) .toolbar {
- background-image: linear-gradient(to bottom, rgb(233, 233, 233), rgb(229, 229, 229));
- box-shadow: inset rgb(252, 252, 252) 0 1px 0;
</del><ins>+body.mac-platform:not(.legacy):not(.docked) .toolbar {
+ padding-top: 22px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-body.docked.mac-platform.legacy .toolbar {
</del><ins>+body.mac-platform:not(.legacy):not(.docked) .toolbar.icon-and-label-vertical {
+ height: 78px;
+}
+
+body.mac-platform:not(.legacy):not(.docked) .toolbar.icon-and-label-vertical.small-size {
+ height: 70px;
+}
+
+body.mac-platform:not(.legacy):not(.docked) .toolbar.icon-and-label-horizontal,
+body.mac-platform:not(.legacy):not(.docked) .toolbar.icon-only {
+ height: 62px;
+}
+
+body.mac-platform:not(.legacy):not(.docked) .toolbar.icon-and-label-horizontal.small-size,
+body.mac-platform:not(.legacy):not(.docked) .toolbar.icon-only.small-size,
+body.mac-platform:not(.legacy):not(.docked) .toolbar.label-only {
+ height: 54px;
+}
+
+body.mac-platform.legacy .toolbar {
+ box-shadow: none;
+}
+
+body.mac-platform.legacy.docked .toolbar {
+ border-bottom-color: rgb(85, 85, 85);
</ins><span class="cx"> background-image: linear-gradient(to bottom, rgb(216, 216, 216), rgb(190, 190, 190));
</span><span class="cx"> box-shadow: inset rgba(255, 255, 255, 0.1) 0 1px 0, inset rgba(0, 0, 0, 0.02) 0 -1px 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-body.mac-platform:not(.docked) .toolbar .item.button > .label {
</del><ins>+body.mac-platform.legacy:not(.docked) .toolbar .item.button > .label {
</ins><span class="cx"> /* We need to disable sub-pixel antialiasing in the toolbar when not docked because the
</span><span class="cx"> toolbar is transparent and so is the WebView. */
</span><span class="cx"> -webkit-font-smoothing: antialiased;
</span><span class="lines">@@ -73,8 +102,8 @@
</span><span class="cx"> -webkit-text-stroke: 0.2px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-body.window-inactive .toolbar {
- border-bottom: 1px solid rgb(128, 128, 128);
</del><ins>+body.mac-platform.legacy.window-inactive .toolbar {
+ border-bottom-color: rgb(128, 128, 128);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .toolbar .control-section {
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (172525 => 172526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-08-13 18:51:54 UTC (rev 172525)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-08-13 18:58:23 UTC (rev 172526)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-08-13 Timothy Hatcher <timothy@apple.com>
+
+ Web Inspector: Workaround a NSWindow change to the title bar.
+ https://bugs.webkit.org/show_bug.cgi?id=135880
+
+ Reviewed by Joseph Pecoraro.
+
+ * WebCoreSupport/WebInspectorClient.mm:
+ (WebInspectorFrontendClient::setToolbarHeight): Only call setContentBorderThickness: on 10.9 and earlier.
+ (-[WebInspectorWindowController init]): Only call setDrawsBackground: on 10.9 and earlier.
+ (-[WebInspectorWindowController window]): Set titlebarAppearsTransparent on 10.10.
+ Only call border thickness APIs on 10.9 and earlier.
+
</ins><span class="cx"> 2014-08-12 Peyton Randolph <prandolph@apple.com>
</span><span class="cx">
</span><span class="cx"> Runtime switch for long mouse press gesture. Part of 135257 - Add long mouse press gesture.
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebInspectorClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm (172525 => 172526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm 2014-08-13 18:51:54 UTC (rev 172525)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm 2014-08-13 18:58:23 UTC (rev 172526)
</span><span class="lines">@@ -295,7 +295,9 @@
</span><span class="cx">
</span><span class="cx"> void WebInspectorFrontendClient::setToolbarHeight(unsigned height)
</span><span class="cx"> {
</span><ins>+#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 1090
</ins><span class="cx"> [[m_windowController window] setContentBorderThickness:height forEdge:NSMaxYEdge];
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebInspectorFrontendClient::inspectedURLChanged(const String& newURL)
</span><span class="lines">@@ -408,11 +410,14 @@
</span><span class="cx">
</span><span class="cx"> _webView = [[WebView alloc] init];
</span><span class="cx"> [_webView setPreferences:preferences];
</span><del>- [_webView setDrawsBackground:NO];
</del><span class="cx"> [_webView setProhibitsMainFrameScrolling:YES];
</span><span class="cx"> [_webView setUIDelegate:self];
</span><span class="cx"> [_webView setPolicyDelegate:self];
</span><span class="cx">
</span><ins>+#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 1090
+ [_webView setDrawsBackground:NO];
+#endif
+
</ins><span class="cx"> [preferences release];
</span><span class="cx">
</span><span class="cx"> [self setWindowFrameAutosaveName:@"Web Inspector 2"];
</span><span class="lines">@@ -479,12 +484,22 @@
</span><span class="cx"> if (window)
</span><span class="cx"> return window;
</span><span class="cx">
</span><del>- NSUInteger styleMask = (NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask | NSTexturedBackgroundWindowMask);
</del><ins>+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
+ NSUInteger styleMask = NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask | NSFullSizeContentViewWindowMask;
+#else
+ NSUInteger styleMask = NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask | NSTexturedBackgroundWindowMask;
+#endif
+
</ins><span class="cx"> window = [[WebInspectorWindow alloc] initWithContentRect:NSMakeRect(60.0, 200.0, 750.0, 650.0) styleMask:styleMask backing:NSBackingStoreBuffered defer:NO];
</span><span class="cx"> [window setDelegate:self];
</span><span class="cx"> [window setMinSize:NSMakeSize(400.0, 400.0)];
</span><ins>+
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
+ window.titlebarAppearsTransparent = YES;
+#else
</ins><span class="cx"> [window setAutorecalculatesContentBorderThickness:NO forEdge:NSMaxYEdge];
</span><span class="cx"> [window setContentBorderThickness:55. forEdge:NSMaxYEdge];
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> // Create a full screen button so we can turn it into a dock button.
</span><span class="cx"> _dockButton = [NSWindow standardWindowButton:NSWindowFullScreenButton forStyleMask:styleMask];
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (172525 => 172526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-08-13 18:51:54 UTC (rev 172525)
+++ trunk/Source/WebKit2/ChangeLog 2014-08-13 18:58:23 UTC (rev 172526)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-08-13 Timothy Hatcher <timothy@apple.com>
+
+ Web Inspector: Workaround a NSWindow change to the title bar.
+ https://bugs.webkit.org/show_bug.cgi?id=135880
+
+ Reviewed by Joseph Pecoraro.
+
+ * UIProcess/mac/WebInspectorProxyMac.mm:
+ (WebKit::WebInspectorProxy::createInspectorWindow): Set titlebarAppearsTransparent on 10.10.
+ Only call border thickness APIs on 10.9 and earlier.
+ (WebKit::WebInspectorProxy::platformCreateInspectorPage): Only call setDrawsBackground: on 10.9 and earlier.
+ (WebKit::WebInspectorProxy::platformSetToolbarHeight): Only call setContentBorderThickness: on 10.9 and earlier.
+
</ins><span class="cx"> 2014-08-13 Ryuan Choi <ryuan.choi@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL] Add API to set application name for the user agent
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebInspectorProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm (172525 => 172526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm 2014-08-13 18:51:54 UTC (rev 172525)
+++ trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm 2014-08-13 18:58:23 UTC (rev 172526)
</span><span class="lines">@@ -56,8 +56,10 @@
</span><span class="cx"> using namespace WebCore;
</span><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><ins>+#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 1090
</ins><span class="cx"> // The height needed to match a typical NSToolbar.
</span><span class="cx"> static const CGFloat windowContentBorderThickness = 55;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> // The margin from the top and right of the dock button (same as the full screen button).
</span><span class="cx"> static const CGFloat dockButtonMargin = 3;
</span><span class="lines">@@ -65,12 +67,12 @@
</span><span class="cx"> // The spacing between the dock buttons.
</span><span class="cx"> #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</span><span class="cx"> static const CGFloat dockButtonSpacing = 1;
</span><ins>+static const NSUInteger windowStyleMask = NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask | NSFullSizeContentViewWindowMask;
</ins><span class="cx"> #else
</span><span class="cx"> static const CGFloat dockButtonSpacing = dockButtonMargin * 2;
</span><ins>+static const NSUInteger windowStyleMask = NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask | NSTexturedBackgroundWindowMask;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>-static const NSUInteger windowStyleMask = NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask | NSTexturedBackgroundWindowMask;
-
</del><span class="cx"> // WKWebInspectorProxyObjCAdapter is a helper ObjC object used as a delegate or notification observer
</span><span class="cx"> // for the sole purpose of getting back into the C++ code from an ObjC caller.
</span><span class="cx">
</span><span class="lines">@@ -302,8 +304,13 @@
</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>+
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
+ window.titlebarAppearsTransparent = YES;
+#else
</ins><span class="cx"> [window setAutorecalculatesContentBorderThickness:NO forEdge:NSMaxYEdge];
</span><span class="cx"> [window setContentBorderThickness:windowContentBorderThickness forEdge:NSMaxYEdge];
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> m_inspectorWindow = adoptNS(window);
</span><span class="cx">
</span><span class="lines">@@ -414,7 +421,9 @@
</span><span class="cx"> m_inspectorView = adoptNS([[WKWebInspectorWKView alloc] initWithFrame:initialRect contextRef:toAPI(&page()->process().context()) pageGroupRef:toAPI(inspectorPageGroup()) relatedToPage:toAPI(m_page)]);
</span><span class="cx"> ASSERT(m_inspectorView);
</span><span class="cx">
</span><ins>+#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 1090
</ins><span class="cx"> [m_inspectorView setDrawsBackground:NO];
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> m_inspectorProxyObjCAdapter = adoptNS([[WKWebInspectorProxyObjCAdapter alloc] initWithWebInspectorProxy:this]);
</span><span class="cx">
</span><span class="lines">@@ -764,7 +773,9 @@
</span><span class="cx">
</span><span class="cx"> void WebInspectorProxy::platformSetToolbarHeight(unsigned height)
</span><span class="cx"> {
</span><ins>+#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 1090
</ins><span class="cx"> [m_inspectorWindow setContentBorderThickness:height forEdge:NSMaxYEdge];
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String WebInspectorProxy::inspectorPageURL() const
</span></span></pre>
</div>
</div>
</body>
</html>