<!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>[197812] trunk/Tools</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/197812">197812</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2016-03-08 15:56:37 -0800 (Tue, 08 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix build.
We intentionally don't use AppKitCompatibilityDeclarations.h here, since we want
MiniBrowser to build without WTF.
* MiniBrowser/mac/AppDelegate.m:
(-[BrowserAppDelegate _updateNewWindowKeyEquivalents]):
* MiniBrowser/mac/BrowserWindowController.m:
(-[BrowserWindowController windowDidLoad]):
* MiniBrowser/mac/MiniBrowser_Prefix.pch:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsMiniBrowsermacAppDelegatem">trunk/Tools/MiniBrowser/mac/AppDelegate.m</a></li>
<li><a href="#trunkToolsMiniBrowsermacBrowserWindowControllerm">trunk/Tools/MiniBrowser/mac/BrowserWindowController.m</a></li>
<li><a href="#trunkToolsMiniBrowsermacMiniBrowser_Prefixpch">trunk/Tools/MiniBrowser/mac/MiniBrowser_Prefix.pch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (197811 => 197812)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-03-08 23:52:39 UTC (rev 197811)
+++ trunk/Tools/ChangeLog 2016-03-08 23:56:37 UTC (rev 197812)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-03-08 Anders Carlsson <andersca@apple.com>
+
+ Fix build.
+
+ We intentionally don't use AppKitCompatibilityDeclarations.h here, since we want
+ MiniBrowser to build without WTF.
+
+ * MiniBrowser/mac/AppDelegate.m:
+ (-[BrowserAppDelegate _updateNewWindowKeyEquivalents]):
+ * MiniBrowser/mac/BrowserWindowController.m:
+ (-[BrowserWindowController windowDidLoad]):
+ * MiniBrowser/mac/MiniBrowser_Prefix.pch:
+
</ins><span class="cx"> 2016-03-08 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Add iOS simulator EWS that runs tests
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacAppDelegatem"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/AppDelegate.m (197811 => 197812)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/AppDelegate.m 2016-03-08 23:52:39 UTC (rev 197811)
+++ trunk/Tools/MiniBrowser/mac/AppDelegate.m 2016-03-08 23:56:37 UTC (rev 197812)
</span><span class="lines">@@ -211,11 +211,11 @@
</span><span class="cx"> - (void)_updateNewWindowKeyEquivalents
</span><span class="cx"> {
</span><span class="cx"> if ([[SettingsController shared] useWebKit2ByDefault]) {
</span><del>- [_newWebKit1WindowItem setKeyEquivalentModifierMask:NSCommandKeyMask | NSAlternateKeyMask];
- [_newWebKit2WindowItem setKeyEquivalentModifierMask:NSCommandKeyMask];
</del><ins>+ [_newWebKit1WindowItem setKeyEquivalentModifierMask:NSEventModifierFlagCommand | NSEventModifierFlagOption];
+ [_newWebKit2WindowItem setKeyEquivalentModifierMask:NSEventModifierFlagCommand];
</ins><span class="cx"> } else {
</span><del>- [_newWebKit1WindowItem setKeyEquivalentModifierMask:NSCommandKeyMask];
- [_newWebKit2WindowItem setKeyEquivalentModifierMask:NSCommandKeyMask | NSAlternateKeyMask];
</del><ins>+ [_newWebKit1WindowItem setKeyEquivalentModifierMask:NSEventModifierFlagCommand];
+ [_newWebKit2WindowItem setKeyEquivalentModifierMask:NSEventModifierFlagCommand | NSEventModifierFlagOption];
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacBrowserWindowControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/BrowserWindowController.m (197811 => 197812)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/BrowserWindowController.m 2016-03-08 23:52:39 UTC (rev 197811)
+++ trunk/Tools/MiniBrowser/mac/BrowserWindowController.m 2016-03-08 23:56:37 UTC (rev 197812)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)windowDidLoad
</span><span class="cx"> {
</span><del>- self.window.styleMask |= NSFullSizeContentViewWindowMask;
</del><ins>+ self.window.styleMask |= NSWindowStyleMaskFullSizeContentView;
</ins><span class="cx">
</span><span class="cx"> [super windowDidLoad];
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacMiniBrowser_Prefixpch"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/MiniBrowser_Prefix.pch (197811 => 197812)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/MiniBrowser_Prefix.pch 2016-03-08 23:52:39 UTC (rev 197811)
+++ trunk/Tools/MiniBrowser/mac/MiniBrowser_Prefix.pch 2016-03-08 23:56:37 UTC (rev 197812)
</span><span class="lines">@@ -24,10 +24,17 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #ifdef __OBJC__
</span><del>- #import <Cocoa/Cocoa.h>
- #import <WebKit/WebKit.h>
</del><ins>+#import <Cocoa/Cocoa.h>
+#import <WebKit/WebKit.h>
+
+#if __MAC_OS_X_VERSION_MAX_ALLOWED < 101200
+static const NSEventModifierFlags NSEventModifierFlagCommand = NSCommandKeyMask;
+static const NSEventModifierFlags NSEventModifierFlagOption = NSAlternateKeyMask;
+static const NSWindowStyleMask NSWindowStyleMaskFullSizeContentView = NSFullSizeContentViewWindowMask;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#endif
+
</ins><span class="cx"> #define ENABLE_LOGGING 0
</span><span class="cx">
</span><span class="cx"> #if ENABLE_LOGGING
</span></span></pre>
</div>
</div>
</body>
</html>