Title: [177560] trunk/Source/WebKit2
- Revision
- 177560
- Author
- [email protected]
- Date
- 2014-12-18 19:29:16 -0800 (Thu, 18 Dec 2014)
Log Message
Speculative build-fix after r177522.
* UIProcess/mac/WKPreviewPopoverAnimationController.mm:
(-[WKPreviewPopoverAnimationController setPreviewOverrideImage:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (177559 => 177560)
--- trunk/Source/WebKit2/ChangeLog 2014-12-19 03:11:36 UTC (rev 177559)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-19 03:29:16 UTC (rev 177560)
@@ -1,3 +1,10 @@
+2014-12-18 Jessie Berlin <[email protected]>
+
+ Speculative build-fix after r177522.
+
+ * UIProcess/mac/WKPreviewPopoverAnimationController.mm:
+ (-[WKPreviewPopoverAnimationController setPreviewOverrideImage:]):
+
2014-12-18 Andreas Kling <[email protected]>
Ref-ify various Document-related things.
Modified: trunk/Source/WebKit2/UIProcess/mac/WKPreviewPopoverAnimationController.mm (177559 => 177560)
--- trunk/Source/WebKit2/UIProcess/mac/WKPreviewPopoverAnimationController.mm 2014-12-19 03:11:36 UTC (rev 177559)
+++ trunk/Source/WebKit2/UIProcess/mac/WKPreviewPopoverAnimationController.mm 2014-12-19 03:29:16 UTC (rev 177560)
@@ -94,7 +94,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(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
