Title: [177562] branches/safari-600.3-branch/Source/WebKit2
- Revision
- 177562
- Author
- [email protected]
- Date
- 2014-12-18 20:16:50 -0800 (Thu, 18 Dec 2014)
Log Message
Build fix.
Unreviewed.
* UIProcess/mac/WKPreviewPopoverAnimationController.mm:
(-[WKPreviewPopoverAnimationController setPreviewOverrideImage:]):
Explicitly pass float into the std::min template.
Modified Paths
Diff
Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (177561 => 177562)
--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-12-19 03:43:41 UTC (rev 177561)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-12-19 04:16:50 UTC (rev 177562)
@@ -1,5 +1,15 @@
2014-12-18 Matthew Hanson <[email protected]>
+ Build fix.
+
+ Unreviewed.
+
+ * UIProcess/mac/WKPreviewPopoverAnimationController.mm:
+ (-[WKPreviewPopoverAnimationController setPreviewOverrideImage:]):
+ Explicitly pass float into the std::min template.
+
+2014-12-18 Matthew Hanson <[email protected]>
+
Merge r177528. rdar://problem/19299367
2014-12-18 Beth Dakin <[email protected]>
Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKPreviewPopoverAnimationController.mm (177561 => 177562)
--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKPreviewPopoverAnimationController.mm 2014-12-19 03:43:41 UTC (rev 177561)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKPreviewPopoverAnimationController.mm 2014-12-19 04:16:50 UTC (rev 177562)
@@ -93,7 +93,7 @@
NSSize scaledImageSize;
if ([_previewPopover isShown]) {
NSSize currentPopoverContentSize = [_previewPopover contentSize];
- float scale = std::min(std::min(currentPopoverContentSize.width / imageSize.width, 1.0), std::min(currentPopoverContentSize.height / imageSize.height, 1.0));
+ float scale = std::min<float>(std::min<float>(currentPopoverContentSize.width / imageSize.width, 1.0), std::min<float>(currentPopoverContentSize.height / imageSize.height, 1.0));
scaledImageSize = NSMakeSize(imageSize.width * scale, imageSize.height * scale);
} else
scaledImageSize = [self _preferredPopoverSizeWithPreviewPadding:[WKPagePreviewViewController previewPadding] forTargetSize:imageSize];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
