Title: [177476] branches/safari-600.3-branch/Source/WebKit2
- Revision
- 177476
- Author
- matthew_han...@apple.com
- Date
- 2014-12-17 16:25:22 -0800 (Wed, 17 Dec 2014)
Log Message
Merged r177411. rdar://problems/19271854
Modified Paths
Diff
Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (177475 => 177476)
--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-12-18 00:25:19 UTC (rev 177475)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-12-18 00:25:22 UTC (rev 177476)
@@ -1,5 +1,16 @@
2014-12-17 Matthew Hanson <matthew_han...@apple.com>
+ Merge r177411. rdar://problem/19271854
+
+ 2014-12-16 Beth Dakin <bda...@apple.com>
+
+ Speculative build fix.
+
+ * UIProcess/mac/WKImmediateActionController.mm:
+ (-[WKImmediateActionController _animationControllerForCustomPreview]):
+
+2014-12-17 Matthew Hanson <matthew_han...@apple.com>
+
Merge r177409. rdar://problem/19271854
2014-12-16 Beth Dakin <bda...@apple.com>
Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm (177475 => 177476)
--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm 2014-12-18 00:25:19 UTC (rev 177475)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm 2014-12-18 00:25:22 UTC (rev 177476)
@@ -424,7 +424,7 @@
Class nsPopoverAnimationControllerClass = NSClassFromString(@"NSPopoverAnimationController");
if (!nsPopoverAnimationControllerClass)
return nil;
- NSPopoverAnimationController *popoverController = [NSPopoverAnimationController popoverAnimationControllerWithPopover:_previewPopover.get()];
+ NSPopoverAnimationController *popoverController = [nsPopoverAnimationControllerClass popoverAnimationControllerWithPopover:_previewPopover.get()];
popoverController.preferredEdge = NSMaxYEdge;
popoverController.anchorView = _wkView;
popoverController.positioningRect = _popoverOriginRect;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
