Title: [175318] branches/safari-600.3-branch/Source/WebKit2
- Revision
- 175318
- Author
- [email protected]
- Date
- 2014-10-29 01:40:18 -0700 (Wed, 29 Oct 2014)
Log Message
Merged r175181. rdar://problem/18758758
Modified Paths
Diff
Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (175317 => 175318)
--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-10-29 08:37:41 UTC (rev 175317)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-10-29 08:40:18 UTC (rev 175318)
@@ -1,5 +1,15 @@
2014-10-29 Lucas Forschler <[email protected]>
+ Merge r175181
+
+ 2014-10-24 Timothy Horton <[email protected]>
+
+ Blindly try to fix all the builds.
+
+ * UIProcess/mac/WKActionMenuController.h:
+
+2014-10-29 Lucas Forschler <[email protected]>
+
Merge r175180
2014-10-24 Timothy Horton <[email protected]>
Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.h (175317 => 175318)
--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.h 2014-10-29 08:37:41 UTC (rev 175317)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.h 2014-10-29 08:40:18 UTC (rev 175318)
@@ -39,11 +39,11 @@
@interface WKActionMenuController : NSObject {
@private
- WebPageProxy *_page;
+ WebKit::WebPageProxy *_page;
WKView *_wkView;
- ActionMenuState _state;
- ActionMenuHitTestResult _hitTestResult;
+ WebKit::ActionMenuState _state;
+ WebKit::ActionMenuHitTestResult _hitTestResult;
RetainPtr<NSSharingServicePicker> _sharingServicePicker;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
