Title: [175319] branches/safari-600.3-branch/Source/WebKit2
- Revision
- 175319
- Author
- [email protected]
- Date
- 2014-10-29 01:42:23 -0700 (Wed, 29 Oct 2014)
Log Message
Merged r175184. rdar://problem/18758758
Modified Paths
Diff
Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (175318 => 175319)
--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-10-29 08:40:18 UTC (rev 175318)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-10-29 08:42:23 UTC (rev 175319)
@@ -1,5 +1,16 @@
2014-10-29 Lucas Forschler <[email protected]>
+ Merge r175184
+
+ 2014-10-24 Tim Horton <[email protected]>
+
+ Blindly try to fix all the builds.
+
+ * UIProcess/mac/WKActionMenuController.h:
+ * UIProcess/mac/WKActionMenuController.mm:
+
+2014-10-29 Lucas Forschler <[email protected]>
+
Merge r175181
2014-10-24 Timothy Horton <[email protected]>
Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.h (175318 => 175319)
--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.h 2014-10-29 08:40:18 UTC (rev 175318)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.h 2014-10-29 08:42:23 UTC (rev 175319)
@@ -31,6 +31,13 @@
namespace WebKit {
class WebPageProxy;
class WKView;
+
+enum class ActionMenuState {
+ None = 0,
+ Pending,
+ Ready
+};
+
struct ActionMenuHitTestResult;
}
Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm (175318 => 175319)
--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-10-29 08:40:18 UTC (rev 175318)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-10-29 08:42:23 UTC (rev 175319)
@@ -60,12 +60,6 @@
using namespace WebCore;
using namespace WebKit;
-enum class ActionMenuState {
- None = 0,
- Pending,
- Ready
-};
-
@interface WKActionMenuController ()
- (void)_updateActionMenuItems;
@end
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
