Title: [197812] trunk/Tools
- Revision
- 197812
- Author
- [email protected]
- Date
- 2016-03-08 15:56:37 -0800 (Tue, 08 Mar 2016)
Log Message
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:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (197811 => 197812)
--- trunk/Tools/ChangeLog 2016-03-08 23:52:39 UTC (rev 197811)
+++ trunk/Tools/ChangeLog 2016-03-08 23:56:37 UTC (rev 197812)
@@ -1,3 +1,16 @@
+2016-03-08 Anders Carlsson <[email protected]>
+
+ 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:
+
2016-03-08 Alexey Proskuryakov <[email protected]>
Add iOS simulator EWS that runs tests
Modified: trunk/Tools/MiniBrowser/mac/AppDelegate.m (197811 => 197812)
--- 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)
@@ -211,11 +211,11 @@
- (void)_updateNewWindowKeyEquivalents
{
if ([[SettingsController shared] useWebKit2ByDefault]) {
- [_newWebKit1WindowItem setKeyEquivalentModifierMask:NSCommandKeyMask | NSAlternateKeyMask];
- [_newWebKit2WindowItem setKeyEquivalentModifierMask:NSCommandKeyMask];
+ [_newWebKit1WindowItem setKeyEquivalentModifierMask:NSEventModifierFlagCommand | NSEventModifierFlagOption];
+ [_newWebKit2WindowItem setKeyEquivalentModifierMask:NSEventModifierFlagCommand];
} else {
- [_newWebKit1WindowItem setKeyEquivalentModifierMask:NSCommandKeyMask];
- [_newWebKit2WindowItem setKeyEquivalentModifierMask:NSCommandKeyMask | NSAlternateKeyMask];
+ [_newWebKit1WindowItem setKeyEquivalentModifierMask:NSEventModifierFlagCommand];
+ [_newWebKit2WindowItem setKeyEquivalentModifierMask:NSEventModifierFlagCommand | NSEventModifierFlagOption];
}
}
Modified: trunk/Tools/MiniBrowser/mac/BrowserWindowController.m (197811 => 197812)
--- 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)
@@ -39,7 +39,7 @@
- (void)windowDidLoad
{
- self.window.styleMask |= NSFullSizeContentViewWindowMask;
+ self.window.styleMask |= NSWindowStyleMaskFullSizeContentView;
[super windowDidLoad];
}
Modified: trunk/Tools/MiniBrowser/mac/MiniBrowser_Prefix.pch (197811 => 197812)
--- 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)
@@ -24,10 +24,17 @@
*/
#ifdef __OBJC__
- #import <Cocoa/Cocoa.h>
- #import <WebKit/WebKit.h>
+#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;
#endif
+#endif
+
#define ENABLE_LOGGING 0
#if ENABLE_LOGGING
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
