Blindly try to fix the 32-bit build.

* UIProcess/mac/WKActionMenuController.h:
* UIProcess/mac/WKActionMenuController.mm:

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

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 1fde491384337590f8773f4affcc5decc6909a59..d6893244f88ba335fe16a1184a29b88ab295d7f1 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,10 @@
+2014-10-24  Timothy Horton  <timothy_horton@apple.com>
+
+        Blindly try to fix the 32-bit build.
+
+        * UIProcess/mac/WKActionMenuController.h:
+        * UIProcess/mac/WKActionMenuController.mm:
+
 2014-10-24  Tim Horton  <timothy_horton@apple.com>
 
         [Mac][WebKit2] Move action menu code into its own file

diff --git a/Source/WebKit2/UIProcess/mac/WKActionMenuController.h b/Source/WebKit2/UIProcess/mac/WKActionMenuController.h
index 33115436bc3be3fd38bb6aa1f976a036116b4d18..2906bb7e354537c5e38d31e24ca24f67b70ec1d8 100644 (file)
--- a/Source/WebKit2/UIProcess/mac/WKActionMenuController.h
+++ b/Source/WebKit2/UIProcess/mac/WKActionMenuController.h
@@ -26,14 +26,26 @@
 #ifndef WKActionMenuController_h
 #define WKActionMenuController_h
 
+#import "WKActionMenuItemTypes.h"
+
 namespace WebKit {
 class WebPageProxy;
+class WKView;
 struct ActionMenuHitTestResult;
 }
 
+@class NSSharingServicePicker;
 @class WKView;
 
-@interface WKActionMenuController : NSObject
+@interface WKActionMenuController : NSObject {
+@private
+    WebPageProxy *_page;
+    WKView *_wkView;
+
+    ActionMenuState _state;
+    ActionMenuHitTestResult _hitTestResult;
+    RetainPtr<NSSharingServicePicker> _sharingServicePicker;
+}
 
 - (instancetype)initWithPage:(WebKit::WebPageProxy&)page view:(WKView *)wkView;
 - (void)willDestroyView:(WKView *)view;

diff --git a/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm b/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm
index 00d68e9bf9e137eb01fffe83b8ca77a42f26b2ea..e2ddb7e3c6c23d74f94ffd682055a29727488d1d 100644 (file)
--- a/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm
+++ b/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm
@@ -29,7 +29,6 @@
 #if PLATFORM(MAC)
 
 #import "ActionMenuHitTestResult.h"
-#import "WKActionMenuItemTypes.h"
 #import "WKNSURLExtras.h"
 #import "WKViewInternal.h"
 #import "WebContext.h"
@@ -71,14 +70,7 @@ enum class ActionMenuState {
 - (void)_updateActionMenuItems;
 @end
 
-@implementation WKActionMenuController {
-    WebPageProxy *_page;
-    WKView *_wkView;
-
-    ActionMenuState _state;
-    ActionMenuHitTestResult _hitTestResult;
-    RetainPtr<NSSharingServicePicker> _sharingServicePicker;
-}
+@implementation WKActionMenuController
 
 - (instancetype)initWithPage:(WebPageProxy&)page view:(WKView *)wkView
 {