Title: [175317] branches/safari-600.3-branch/Source/WebKit2
- Revision
- 175317
- Author
- [email protected]
- Date
- 2014-10-29 01:37:41 -0700 (Wed, 29 Oct 2014)
Log Message
Merged r175180. rdar://problem/18758758
Modified Paths
Diff
Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (175316 => 175317)
--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-10-29 08:33:49 UTC (rev 175316)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-10-29 08:37:41 UTC (rev 175317)
@@ -1,5 +1,16 @@
2014-10-29 Lucas Forschler <[email protected]>
+ Merge r175180
+
+ 2014-10-24 Timothy Horton <[email protected]>
+
+ Blindly try to fix the 32-bit build.
+
+ * UIProcess/mac/WKActionMenuController.h:
+ * UIProcess/mac/WKActionMenuController.mm:
+
+2014-10-29 Lucas Forschler <[email protected]>
+
Merge r175179
2014-10-24 Tim Horton <[email protected]>
Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.h (175316 => 175317)
--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.h 2014-10-29 08:33:49 UTC (rev 175316)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.h 2014-10-29 08:37:41 UTC (rev 175317)
@@ -26,15 +26,27 @@
#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;
Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm (175316 => 175317)
--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-10-29 08:33:49 UTC (rev 175316)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-10-29 08:37:41 UTC (rev 175317)
@@ -29,7 +29,6 @@
#if PLATFORM(MAC)
#import "ActionMenuHitTestResult.h"
-#import "WKActionMenuItemTypes.h"
#import "WKNSURLExtras.h"
#import "WKViewInternal.h"
#import "WebContext.h"
@@ -71,15 +70,8 @@
- (void)_updateActionMenuItems;
@end
-@implementation WKActionMenuController {
- WebPageProxy *_page;
- WKView *_wkView;
+@implementation WKActionMenuController
- ActionMenuState _state;
- ActionMenuHitTestResult _hitTestResult;
- RetainPtr<NSSharingServicePicker> _sharingServicePicker;
-}
-
- (instancetype)initWithPage:(WebPageProxy&)page view:(WKView *)wkView
{
self = [super init];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
