Title: [164958] trunk/Source/WebKit2
- Revision
- 164958
- Author
- m...@apple.com
- Date
- 2014-03-02 17:16:59 -0800 (Sun, 02 Mar 2014)
Log Message
Try to fix the 32-bit build.
* UIProcess/ios/forms/WKFormSelectPopover.mm:
(adjustedFontSize):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (164957 => 164958)
--- trunk/Source/WebKit2/ChangeLog 2014-03-03 01:02:36 UTC (rev 164957)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-03 01:16:59 UTC (rev 164958)
@@ -1,3 +1,10 @@
+2014-03-02 Dan Bernstein <m...@apple.com>
+
+ Try to fix the 32-bit build.
+
+ * UIProcess/ios/forms/WKFormSelectPopover.mm:
+ (adjustedFontSize):
+
2014-03-02 Sam Weinig <s...@webkit.org>
Page Cache is not enabled when using the modern WebKit2 API
Modified: trunk/Source/WebKit2/UIProcess/ios/forms/WKFormSelectPopover.mm (164957 => 164958)
--- trunk/Source/WebKit2/UIProcess/ios/forms/WKFormSelectPopover.mm 2014-03-03 01:02:36 UTC (rev 164957)
+++ trunk/Source/WebKit2/UIProcess/ios/forms/WKFormSelectPopover.mm 2014-03-03 01:16:59 UTC (rev 164958)
@@ -48,7 +48,7 @@
using namespace WebKit;
static NSString* WKPopoverTableViewCellReuseIdentifier = @"WKPopoverTableViewCellReuseIdentifier";
-static const double MinimumOptionFontSize = 12;
+static const CGFloat minimumOptionFontSize = 12;
@interface UITableViewCell (Internal)
- (CGRect)textRectForContentRect:(CGRect)contentRect;
@@ -82,16 +82,16 @@
return [NSString stringWithFormat:@"%C%@%C", directionalFormattingCharacter, string, popDirectionalFormatting];
}
-static float adjustedFontSize(double textWidth, UIFont *font, double initialFontSize, const Vector<WKOptionItem>& items)
+static CGFloat adjustedFontSize(CGFloat textWidth, UIFont *font, CGFloat initialFontSize, const Vector<WKOptionItem>& items)
{
- double adjustedSize = initialFontSize;
+ CGFloat adjustedSize = initialFontSize;
for (size_t i = 0; i < items.size(); ++i) {
const WKOptionItem& item = items[i];
if (item.text.isEmpty())
continue;
- double actualFontSize = initialFontSize;
- [(NSString *)item.text _legacy_sizeWithFont:font minFontSize:MinimumOptionFontSize actualFontSize:&actualFontSize forWidth:textWidth lineBreakMode:NSLineBreakByWordWrapping];
+ CGFloat actualFontSize = initialFontSize;
+ [(NSString *)item.text _legacy_sizeWithFont:font minFontSize:minimumOptionFontSize actualFontSize:&actualFontSize forWidth:textWidth lineBreakMode:NSLineBreakByWordWrapping];
if (actualFontSize > 0 && actualFontSize < adjustedSize)
adjustedSize = actualFontSize;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
