<!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>[170194] 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/170194">170194</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2014-06-20 11:32:59 -0700 (Fri, 20 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make WebKit2 more accessible in MiniBrowser
https://bugs.webkit.org/show_bug.cgi?id=134099
Reviewed by Anders Carlsson.
* MiniBrowser/mac/AppDelegate.h:
* MiniBrowser/mac/AppDelegate.m:
(-[BrowserAppDelegate newWindow:]):
(-[BrowserAppDelegate applicationDidFinishLaunching:]):
(-[BrowserAppDelegate toggleUseWebKit2ByDefault:]):
(-[BrowserAppDelegate _useWebKit2ByDefault]):
(-[BrowserAppDelegate _updateNewWindowKeyEquivalents]):
(-[BrowserAppDelegate validateMenuItem:]):
* MiniBrowser/mac/MainMenu.xib:
Add a "Use WebKit2 By Default" menu item to the top of the Debug menu.
When switched on, Cmd-N will make WebKit2 windows (and the default window will be WebKit2).
Make the non-default new-window menu item always show up, because people often don't find it
when you have to press option to have it show up.
* MiniBrowser/mac/BrowserWindowController.h:
* MiniBrowser/mac/BrowserWindowController.m:
(-[BrowserWindowController initWithWindow:]):
* MiniBrowser/mac/WK1BrowserWindowController.m:
(-[WK1BrowserWindowController validateMenuItem:]):
* MiniBrowser/mac/WK2BrowserWindowController.m:
(-[WK2BrowserWindowController validateMenuItem:]):
Use the cached [menuItem action] like the earlier cases do.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsMiniBrowsermacAppDelegateh">trunk/Tools/MiniBrowser/mac/AppDelegate.h</a></li>
<li><a href="#trunkToolsMiniBrowsermacAppDelegatem">trunk/Tools/MiniBrowser/mac/AppDelegate.m</a></li>
<li><a href="#trunkToolsMiniBrowsermacBrowserWindowControllerh">trunk/Tools/MiniBrowser/mac/BrowserWindowController.h</a></li>
<li><a href="#trunkToolsMiniBrowsermacBrowserWindowControllerm">trunk/Tools/MiniBrowser/mac/BrowserWindowController.m</a></li>
<li><a href="#trunkToolsMiniBrowsermacMainMenuxib">trunk/Tools/MiniBrowser/mac/MainMenu.xib</a></li>
<li><a href="#trunkToolsMiniBrowsermacWK1BrowserWindowControllerm">trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m</a></li>
<li><a href="#trunkToolsMiniBrowsermacWK2BrowserWindowControllerm">trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (170193 => 170194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-06-20 18:29:20 UTC (rev 170193)
+++ trunk/Tools/ChangeLog 2014-06-20 18:32:59 UTC (rev 170194)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2014-06-20 Tim Horton <timothy_horton@apple.com>
+
+ Make WebKit2 more accessible in MiniBrowser
+ https://bugs.webkit.org/show_bug.cgi?id=134099
+
+ Reviewed by Anders Carlsson.
+
+ * MiniBrowser/mac/AppDelegate.h:
+ * MiniBrowser/mac/AppDelegate.m:
+ (-[BrowserAppDelegate newWindow:]):
+ (-[BrowserAppDelegate applicationDidFinishLaunching:]):
+ (-[BrowserAppDelegate toggleUseWebKit2ByDefault:]):
+ (-[BrowserAppDelegate _useWebKit2ByDefault]):
+ (-[BrowserAppDelegate _updateNewWindowKeyEquivalents]):
+ (-[BrowserAppDelegate validateMenuItem:]):
+ * MiniBrowser/mac/MainMenu.xib:
+ Add a "Use WebKit2 By Default" menu item to the top of the Debug menu.
+ When switched on, Cmd-N will make WebKit2 windows (and the default window will be WebKit2).
+ Make the non-default new-window menu item always show up, because people often don't find it
+ when you have to press option to have it show up.
+
+ * MiniBrowser/mac/BrowserWindowController.h:
+ * MiniBrowser/mac/BrowserWindowController.m:
+ (-[BrowserWindowController initWithWindow:]):
+
+ * MiniBrowser/mac/WK1BrowserWindowController.m:
+ (-[WK1BrowserWindowController validateMenuItem:]):
+ * MiniBrowser/mac/WK2BrowserWindowController.m:
+ (-[WK2BrowserWindowController validateMenuItem:]):
+ Use the cached [menuItem action] like the earlier cases do.
+
</ins><span class="cx"> 2014-06-20 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> Teach run-{safari, webkit-app} about iOS Simulator
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacAppDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/AppDelegate.h (170193 => 170194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/AppDelegate.h 2014-06-20 18:29:20 UTC (rev 170193)
+++ trunk/Tools/MiniBrowser/mac/AppDelegate.h 2014-06-20 18:32:59 UTC (rev 170194)
</span><span class="lines">@@ -25,8 +25,13 @@
</span><span class="cx">
</span><span class="cx"> @interface BrowserAppDelegate : NSObject <NSApplicationDelegate> {
</span><span class="cx"> NSMutableSet *_browserWindowControllers;
</span><ins>+
+ IBOutlet NSMenuItem *_newWebKit1WindowItem;
+ IBOutlet NSMenuItem *_newWebKit2WindowItem;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)browserWindowWillClose:(NSWindow *)window;
</span><span class="cx">
</span><ins>+- (IBAction)toggleUseWebKit2ByDefault:(id)sender;
+
</ins><span class="cx"> @end
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacAppDelegatem"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/AppDelegate.m (170193 => 170194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/AppDelegate.m 2014-06-20 18:29:20 UTC (rev 170193)
+++ trunk/Tools/MiniBrowser/mac/AppDelegate.m 2014-06-20 18:32:59 UTC (rev 170194)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #import <WebKit/WebKit2.h>
</span><span class="cx">
</span><span class="cx"> static NSString *defaultURL = @"http://www.webkit.org/";
</span><ins>+static NSString *useWebKit2ByDefaultPreferenceKey = @"UseWebKit2ByDefault";
</ins><span class="cx">
</span><span class="cx"> enum {
</span><span class="cx"> WebKit1NewWindowTag = 1,
</span><span class="lines">@@ -52,11 +53,18 @@
</span><span class="cx"> - (IBAction)newWindow:(id)sender
</span><span class="cx"> {
</span><span class="cx"> BrowserWindowController *controller = nil;
</span><ins>+
+ BOOL useWebKit2 = NO;
+
+ if (![sender respondsToSelector:@selector(tag)])
+ useWebKit2 = [self _useWebKit2ByDefault];
+ else
+ useWebKit2 = [sender tag] == WebKit2NewWindowTag;
</ins><span class="cx">
</span><del>- if (![sender respondsToSelector:@selector(tag)] || [sender tag] == WebKit1NewWindowTag)
</del><ins>+ if (!useWebKit2)
</ins><span class="cx"> controller = [[WK1BrowserWindowController alloc] initWithWindowNibName:@"BrowserWindow"];
</span><span class="cx"> #if WK_API_ENABLED
</span><del>- else if ([sender tag] == WebKit2NewWindowTag)
</del><ins>+ else
</ins><span class="cx"> controller = [[WK2BrowserWindowController alloc] initWithWindowNibName:@"BrowserWindow"];
</span><span class="cx"> #endif
</span><span class="cx"> if (!controller)
</span><span class="lines">@@ -79,6 +87,7 @@
</span><span class="cx"> [WebHistory setOptionalSharedHistory:webHistory];
</span><span class="cx"> [webHistory release];
</span><span class="cx">
</span><ins>+ [self _updateNewWindowKeyEquivalents];
</ins><span class="cx"> [self newWindow:self];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -133,4 +142,38 @@
</span><span class="cx"> }];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (IBAction)toggleUseWebKit2ByDefault:(id)sender
+{
+ BOOL newUseWebKit2ByDefault = ![self _useWebKit2ByDefault];
+ if (!newUseWebKit2ByDefault)
+ [[NSUserDefaults standardUserDefaults] removeObjectForKey:useWebKit2ByDefaultPreferenceKey];
+ else
+ [[NSUserDefaults standardUserDefaults] setBool:newUseWebKit2ByDefault forKey:useWebKit2ByDefaultPreferenceKey];
+ [self _updateNewWindowKeyEquivalents];
+}
+
+- (BOOL)_useWebKit2ByDefault
+{
+ return [[NSUserDefaults standardUserDefaults] boolForKey:useWebKit2ByDefaultPreferenceKey];
+}
+
+- (void)_updateNewWindowKeyEquivalents
+{
+ if ([self _useWebKit2ByDefault]) {
+ [_newWebKit1WindowItem setKeyEquivalentModifierMask:NSCommandKeyMask | NSAlternateKeyMask];
+ [_newWebKit2WindowItem setKeyEquivalentModifierMask:NSCommandKeyMask];
+ } else {
+ [_newWebKit1WindowItem setKeyEquivalentModifierMask:NSCommandKeyMask];
+ [_newWebKit2WindowItem setKeyEquivalentModifierMask:NSCommandKeyMask | NSAlternateKeyMask];
+ }
+}
+
+- (BOOL)validateMenuItem:(NSMenuItem *)menuItem
+{
+ if ([menuItem action] == @selector(toggleUseWebKit2ByDefault:))
+ [menuItem setState:[self _useWebKit2ByDefault] ? NSOnState : NSOffState];
+
+ return YES;
+}
+
</ins><span class="cx"> @end
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacBrowserWindowControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/BrowserWindowController.h (170193 => 170194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/BrowserWindowController.h 2014-06-20 18:29:20 UTC (rev 170193)
+++ trunk/Tools/MiniBrowser/mac/BrowserWindowController.h 2014-06-20 18:32:59 UTC (rev 170194)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> IBOutlet NSView *containerView;
</span><span class="cx">
</span><span class="cx"> IBOutlet NSWindow *findPanelWindow;
</span><del>-
</del><ins>+
</ins><span class="cx"> BOOL _zoomTextOnly;
</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 (170193 => 170194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/BrowserWindowController.m 2014-06-20 18:29:20 UTC (rev 170193)
+++ trunk/Tools/MiniBrowser/mac/BrowserWindowController.m 2014-06-20 18:32:59 UTC (rev 170194)
</span><span class="lines">@@ -34,9 +34,6 @@
</span><span class="cx"> - (id)initWithWindow:(NSWindow *)window
</span><span class="cx"> {
</span><span class="cx"> self = [super initWithWindow:window];
</span><del>- if (self) {
- }
-
</del><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacMainMenuxib"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/MainMenu.xib (170193 => 170194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/MainMenu.xib 2014-06-20 18:29:20 UTC (rev 170193)
+++ trunk/Tools/MiniBrowser/mac/MainMenu.xib 2014-06-20 18:32:59 UTC (rev 170194)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
</span><del>-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6119.2" systemVersion="13C64" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
</del><ins>+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5056" systemVersion="13D65" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
</ins><span class="cx"> <dependencies>
</span><del>- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6119.2"/>
</del><ins>+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="5056"/>
</ins><span class="cx"> </dependencies>
</span><span class="cx"> <objects>
</span><span class="cx"> <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> <action selector="newWindow:" target="-1" id="574"/>
</span><span class="cx"> </connections>
</span><span class="cx"> </menuItem>
</span><del>- <menuItem title="New WebKit2 Window" tag="2" alternate="YES" keyEquivalent="n" id="571">
</del><ins>+ <menuItem title="New WebKit2 Window" tag="2" keyEquivalent="n" id="571">
</ins><span class="cx"> <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
</span><span class="cx"> <connections>
</span><span class="cx"> <action selector="newWindow:" target="-1" id="572"/>
</span><span class="lines">@@ -425,6 +425,13 @@
</span><span class="cx"> <modifierMask key="keyEquivalentModifierMask"/>
</span><span class="cx"> <menu key="submenu" title="Debug" id="535">
</span><span class="cx"> <items>
</span><ins>+ <menuItem title="Use WebKit2 By Default" id="GmH-08-ZX9">
+ <modifierMask key="keyEquivalentModifierMask"/>
+ <connections>
+ <action selector="toggleUseWebKit2ByDefault:" target="494" id="xgA-9P-zY6"/>
+ </connections>
+ </menuItem>
+ <menuItem isSeparatorItem="YES" id="kgf-Bs-8S1"/>
</ins><span class="cx"> <menuItem title="Force Repaint" keyEquivalent="r" id="545">
</span><span class="cx"> <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
</span><span class="cx"> <connections>
</span><span class="lines">@@ -480,7 +487,12 @@
</span><span class="cx"> </menuItem>
</span><span class="cx"> </items>
</span><span class="cx"> </menu>
</span><del>- <customObject id="494" customClass="BrowserAppDelegate"/>
</del><ins>+ <customObject id="494" customClass="BrowserAppDelegate">
+ <connections>
+ <outlet property="_newWebKit1WindowItem" destination="573" id="ZCj-u2-PU7"/>
+ <outlet property="_newWebKit2WindowItem" destination="571" id="1Gv-mK-aul"/>
+ </connections>
+ </customObject>
</ins><span class="cx"> <customObject id="420" customClass="NSFontManager"/>
</span><span class="cx"> </objects>
</span><span class="cx"> </document>
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacWK1BrowserWindowControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m (170193 => 170194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m 2014-06-20 18:29:20 UTC (rev 170193)
+++ trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m 2014-06-20 18:32:59 UTC (rev 170194)
</span><span class="lines">@@ -130,11 +130,11 @@
</span><span class="cx"> [menuItem setTitle:[_webView window] ? @"Remove Web View" : @"Insert Web View"];
</span><span class="cx"> else if (action == @selector(toggleZoomMode:))
</span><span class="cx"> [menuItem setState:_zoomTextOnly ? NSOnState : NSOffState];
</span><del>- else if ([menuItem action] == @selector(togglePaginationMode:))
</del><ins>+ else if (action == @selector(togglePaginationMode:))
</ins><span class="cx"> [menuItem setState:[self isPaginated] ? NSOnState : NSOffState];
</span><del>- else if ([menuItem action] == @selector(toggleTransparentWindow:))
</del><ins>+ else if (action == @selector(toggleTransparentWindow:))
</ins><span class="cx"> [menuItem setState:[[self window] isOpaque] ? NSOffState : NSOnState];
</span><del>- else if ([menuItem action] == @selector(toggleSubpixelCSSOMElementMetricsEnabled:))
</del><ins>+ else if (action == @selector(toggleSubpixelCSSOMElementMetricsEnabled:))
</ins><span class="cx"> [menuItem setState:[self isSubpixelCSSOMElementMetricsEnabled] ? NSOnState : NSOffState];
</span><span class="cx">
</span><span class="cx"> return YES;
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacWK2BrowserWindowControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m (170193 => 170194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2014-06-20 18:29:20 UTC (rev 170193)
+++ trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2014-06-20 18:32:59 UTC (rev 170194)
</span><span class="lines">@@ -132,13 +132,13 @@
</span><span class="cx"> [menuItem setTitle:[_webView window] ? @"Remove Web View" : @"Insert Web View"];
</span><span class="cx"> else if (action == @selector(toggleZoomMode:))
</span><span class="cx"> [menuItem setState:_zoomTextOnly ? NSOnState : NSOffState];
</span><del>- else if ([menuItem action] == @selector(togglePaginationMode:))
</del><ins>+ else if (action == @selector(togglePaginationMode:))
</ins><span class="cx"> [menuItem setState:[self isPaginated] ? NSOnState : NSOffState];
</span><del>- else if ([menuItem action] == @selector(toggleTransparentWindow:))
</del><ins>+ else if (action == @selector(toggleTransparentWindow:))
</ins><span class="cx"> [menuItem setState:[[self window] isOpaque] ? NSOffState : NSOnState];
</span><del>- else if ([menuItem action] == @selector(toggleUISideCompositing:))
</del><ins>+ else if (action == @selector(toggleUISideCompositing:))
</ins><span class="cx"> [menuItem setState:[self isUISideCompositingEnabled] ? NSOnState : NSOffState];
</span><del>- else if ([menuItem action] == @selector(toggleSubpixelCSSOMElementMetricsEnabled:))
</del><ins>+ else if (action == @selector(toggleSubpixelCSSOMElementMetricsEnabled:))
</ins><span class="cx"> [menuItem setState:[self isSubpixelCSSOMElementMetricsEnabled] ? NSOnState : NSOffState];
</span><span class="cx">
</span><span class="cx"> return YES;
</span></span></pre>
</div>
</div>
</body>
</html>