Title: [198365] trunk/Tools
- Revision
- 198365
- Author
- [email protected]
- Date
- 2016-03-17 17:55:12 -0700 (Thu, 17 Mar 2016)
Log Message
Fix some deprecation warnings in WebEditingTester
https://bugs.webkit.org/show_bug.cgi?id=155601
Reviewed by Simon Fraser.
* WebEditingTester/AppDelegate.m:
(-[WebEditingAppDelegate showOperations:]):
(-[WebEditingAppDelegate _updateNewWindowKeyEquivalents]):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (198364 => 198365)
--- trunk/Tools/ChangeLog 2016-03-18 00:53:24 UTC (rev 198364)
+++ trunk/Tools/ChangeLog 2016-03-18 00:55:12 UTC (rev 198365)
@@ -1,5 +1,16 @@
2016-03-17 Tim Horton <[email protected]>
+ Fix some deprecation warnings in WebEditingTester
+ https://bugs.webkit.org/show_bug.cgi?id=155601
+
+ Reviewed by Simon Fraser.
+
+ * WebEditingTester/AppDelegate.m:
+ (-[WebEditingAppDelegate showOperations:]):
+ (-[WebEditingAppDelegate _updateNewWindowKeyEquivalents]):
+
+2016-03-17 Tim Horton <[email protected]>
+
Find-in-page indicator in Mail viewer is the wrong scale and cut off
https://bugs.webkit.org/show_bug.cgi?id=155605
<rdar://problem/23948165>
Modified: trunk/Tools/WebEditingTester/AppDelegate.m (198364 => 198365)
--- trunk/Tools/WebEditingTester/AppDelegate.m 2016-03-18 00:53:24 UTC (rev 198364)
+++ trunk/Tools/WebEditingTester/AppDelegate.m 2016-03-18 00:55:12 UTC (rev 198365)
@@ -77,7 +77,7 @@
static BOOL initialized = NO;
if (!initialized) {
- NSFont *font = [NSFont systemFontOfSize:[NSFont systemFontSizeForControlSize:NSMiniControlSize]];
+ NSFont *font = [NSFont systemFontOfSize:[NSFont systemFontSizeForControlSize:NSControlSizeMini]];
NSDictionary *attributes = [NSDictionary dictionaryWithObject:font forKey:NSFontAttributeName];
NSArray *operations = editingOperations();
@@ -104,7 +104,7 @@
}
NSButton *button = [[NSButton alloc] initWithFrame:NSMakeRect(x, y, maxWidth, 16)];
[button setBezelStyle:NSRoundedBezelStyle];
- [button.cell setControlSize:NSMiniControlSize];
+ [button.cell setControlSize:NSControlSizeMini];
[button setFont:font];
[button setTitle:operationName];
[button setAction:NSSelectorFromString(operationName)];
@@ -202,11 +202,11 @@
- (void)_updateNewWindowKeyEquivalents
{
if (self.useWebKit2ByDefault) {
- [_newWebKit1EditorItem setKeyEquivalentModifierMask:NSCommandKeyMask | NSAlternateKeyMask];
- [_newWebKit2EditorItem setKeyEquivalentModifierMask:NSCommandKeyMask];
+ [_newWebKit1EditorItem setKeyEquivalentModifierMask:NSEventModifierFlagCommand | NSEventModifierFlagOption];
+ [_newWebKit2EditorItem setKeyEquivalentModifierMask:NSEventModifierFlagCommand];
} else {
- [_newWebKit1EditorItem setKeyEquivalentModifierMask:NSCommandKeyMask];
- [_newWebKit2EditorItem setKeyEquivalentModifierMask:NSCommandKeyMask | NSAlternateKeyMask];
+ [_newWebKit1EditorItem setKeyEquivalentModifierMask:NSEventModifierFlagCommand];
+ [_newWebKit2EditorItem setKeyEquivalentModifierMask:NSEventModifierFlagCommand | NSEventModifierFlagOption];
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
