Title: [175320] branches/safari-600.3-branch/Source/WebKit2
- Revision
- 175320
- Author
- [email protected]
- Date
- 2014-10-29 01:44:25 -0700 (Wed, 29 Oct 2014)
Log Message
Merged r175185. rdar://problem/18758758
Modified Paths
Diff
Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (175319 => 175320)
--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-10-29 08:42:23 UTC (rev 175319)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-10-29 08:44:25 UTC (rev 175320)
@@ -1,5 +1,16 @@
2014-10-29 Lucas Forschler <[email protected]>
+ Merge r175185
+
+ 2014-10-24 Beth Dakin <[email protected]>
+
+ Build fix.
+
+ * UIProcess/mac/WKActionMenuController.h:
+ * UIProcess/mac/WKActionMenuController.mm:
+
+2014-10-29 Lucas Forschler <[email protected]>
+
Merge r175184
2014-10-24 Tim Horton <[email protected]>
Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.h (175319 => 175320)
--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.h 2014-10-29 08:42:23 UTC (rev 175319)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.h 2014-10-29 08:44:25 UTC (rev 175320)
@@ -26,19 +26,18 @@
#ifndef WKActionMenuController_h
#define WKActionMenuController_h
+#import "ActionMenuHitTestResult.h"
#import "WKActionMenuItemTypes.h"
+#import <wtf/RetainPtr.h>
namespace WebKit {
class WebPageProxy;
-class WKView;
enum class ActionMenuState {
None = 0,
Pending,
Ready
};
-
-struct ActionMenuHitTestResult;
}
@class NSSharingServicePicker;
Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm (175319 => 175320)
--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-10-29 08:42:23 UTC (rev 175319)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-10-29 08:44:25 UTC (rev 175320)
@@ -28,7 +28,6 @@
#if PLATFORM(MAC)
-#import "ActionMenuHitTestResult.h"
#import "WKNSURLExtras.h"
#import "WKViewInternal.h"
#import "WebContext.h"
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
