Confusing build fix after r171926.

* MiniBrowser/mac/AppDelegate.h:
* MiniBrowser/mac/AppDelegate.m:
* MiniBrowser/mac/SettingsController.m:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@171935 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 55e595c09e4efc720b5ca39b46f0335baca773b9..525c5f8240f94297b95c740de037a46fd257b64d 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,11 @@
+2014-08-01  Tim Horton  <timothy_horton@apple.com>
+
+        Confusing build fix after r171926.
+
+        * MiniBrowser/mac/AppDelegate.h:
+        * MiniBrowser/mac/AppDelegate.m:
+        * MiniBrowser/mac/SettingsController.m:
+
 2014-08-01  Tim Horton  <timothy_horton@apple.com>
 
         Make it easer to add switches to MiniBrowser

diff --git a/Tools/MiniBrowser/mac/AppDelegate.h b/Tools/MiniBrowser/mac/AppDelegate.h
index 382c090fe92277da20d137875413e81445f0ee34..e071e491fafb256d63d29b0242a18264549bb6e6 100644 (file)
--- a/Tools/MiniBrowser/mac/AppDelegate.h
+++ b/Tools/MiniBrowser/mac/AppDelegate.h
@@ -24,6 +24,8 @@
  */
 
 @interface BrowserAppDelegate : NSObject <NSApplicationDelegate> {
+    NSMutableSet *_browserWindowControllers;
+
     IBOutlet NSMenuItem *_newWebKit1WindowItem;
     IBOutlet NSMenuItem *_newWebKit2WindowItem;
 }

diff --git a/Tools/MiniBrowser/mac/AppDelegate.m b/Tools/MiniBrowser/mac/AppDelegate.m
index cf4b4747cd93907e4e7c756aefdb51253d7672ee..97f793ef8fd1d4d46505938379557b99b06ed82b 100644 (file)
--- a/Tools/MiniBrowser/mac/AppDelegate.m
+++ b/Tools/MiniBrowser/mac/AppDelegate.m
@@ -36,9 +36,7 @@ enum {
     WebKit2NewWindowTag = 2
 };
 
-@implementation BrowserAppDelegate {
-    NSMutableSet *_browserWindowControllers;
-}
+@implementation BrowserAppDelegate
 
 - (id)init
 {

diff --git a/Tools/MiniBrowser/mac/SettingsController.m b/Tools/MiniBrowser/mac/SettingsController.m
index dbe955b9dd086cbff779dfeb1af75dec94b1a3bc..cedbfa762ff18436db47a7052e1473025796083f 100644 (file)
--- a/Tools/MiniBrowser/mac/SettingsController.m
+++ b/Tools/MiniBrowser/mac/SettingsController.m
@@ -42,7 +42,9 @@ static NSString * const EnableSubPixelCSSOMMetricsPreferenceKey = @"EnableSubPix
 // This default name intentionally overlaps with the key that WebKit2 checks when creating a view.
 static NSString * const UseRemoteLayerTreeDrawingAreaPreferenceKey = @"WebKit2UseRemoteLayerTreeDrawingArea";
 
-@implementation SettingsController
+@implementation SettingsController {
+    NSMenu *_menu;
+}
 
 @synthesize menu=_menu;