Title: [176643] branches/safari-600.3-branch/Source/WebKit2
- Revision
- 176643
- Author
- [email protected]
- Date
- 2014-12-02 06:55:09 -0800 (Tue, 02 Dec 2014)
Log Message
Merged r176430. rdar://problems/18904651
Modified Paths
Diff
Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (176642 => 176643)
--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-12-02 14:55:00 UTC (rev 176642)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-12-02 14:55:09 UTC (rev 176643)
@@ -1,5 +1,23 @@
2014-12-02 Dana Burkart <[email protected]>
+ Merge r176430. <rdar://problem/18904651>
+
+ 2014-11-20 Beth Dakin <[email protected]>
+
+ Preview popover needs minimum and maximum sizes
+ https://bugs.webkit.org/show_bug.cgi?id=138943
+ -and corresponding-
+ rdar://problem/18904651
+
+ Reviewed by Tim Horton.
+
+ Quick follow-up to get the right screen.
+ * UIProcess/mac/WKActionMenuController.mm:
+ (-[WKActionMenuController largestPopoverSize]):
+
+
+2014-12-02 Dana Burkart <[email protected]>
+
Merge r176429. <rdar://problem/18904651>
2014-11-20 Beth Dakin <[email protected]>
Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm (176642 => 176643)
--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-12-02 14:55:00 UTC (rev 176642)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-12-02 14:55:09 UTC (rev 176643)
@@ -360,7 +360,7 @@
- (NSSize)largestPopoverSize
{
- NSSize screenSize = [[NSScreen mainScreen] frame].size;
+ NSSize screenSize = _wkView.window.screen.frame.size;
if (screenSize.width == 1280 && screenSize.height == 800)
return NSMakeSize(1240, 674);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
