Modified: trunk/Source/WebCore/ChangeLog (186824 => 186825)
--- trunk/Source/WebCore/ChangeLog 2015-07-14 23:38:02 UTC (rev 186824)
+++ trunk/Source/WebCore/ChangeLog 2015-07-14 23:50:16 UTC (rev 186825)
@@ -1,3 +1,15 @@
+2015-07-14 Wenson Hsieh <[email protected]>
+
+ Fix the 32 bit build after r186817
+ https://bugs.webkit.org/show_bug.cgi?id=146947
+
+ Changed CGRect to NSRect.
+
+ Reviewed by Simon Fraser.
+
+ * platform/mac/ThemeMac.mm:
+ (WebCore::paintButton):
+
2015-07-14 Anders Carlsson <[email protected]>
Remove wkPopupMenu from WebCoreSystemInterface; it's not called from WebCore
Modified: trunk/Source/WebCore/platform/mac/ThemeMac.mm (186824 => 186825)
--- trunk/Source/WebCore/platform/mac/ThemeMac.mm 2015-07-14 23:38:02 UTC (rev 186824)
+++ trunk/Source/WebCore/platform/mac/ThemeMac.mm 2015-07-14 23:50:16 UTC (rev 186825)
@@ -592,19 +592,20 @@
} else if ([previousDefaultButtonCell isEqual:buttonCell])
[window setDefaultButtonCell:nil];
+ FloatRect drawFromImageBufferRect(focusThickness, focusThickness, inflatedRect.width(), inflatedRect.height());
if (shouldUseImageBuffer) {
- [buttonCell drawWithFrame:CGRectMake(focusThickness, focusThickness, inflatedRect.width(), inflatedRect.height()) inView:view];
+ [buttonCell drawWithFrame:NSRect(drawFromImageBufferRect) inView:view];
if (!(states & ControlStates::FocusState))
context->drawImageBuffer(imageBuffer.get(), ColorSpaceDeviceRGB, inflatedRect.location() - FloatSize(focusThickness, focusThickness));
} else
- [buttonCell drawWithFrame:CGRect(inflatedRect) inView:view];
+ [buttonCell drawWithFrame:NSRect(inflatedRect) inView:view];
if (states & ControlStates::FocusState) {
if (shouldUseImageBuffer) {
- drawCellFocusRing(buttonCell, CGRectMake(focusThickness, focusThickness, inflatedRect.width(), inflatedRect.height()), view);
+ drawCellFocusRing(buttonCell, NSRect(drawFromImageBufferRect), view);
context->drawImageBuffer(imageBuffer.get(), ColorSpaceDeviceRGB, inflatedRect.location() - FloatSize(focusThickness, focusThickness));
} else
- drawCellFocusRing(buttonCell, inflatedRect, view);
+ drawCellFocusRing(buttonCell, NSRect(inflatedRect), view);
}
controlStates->setNeedsRepaint(false);
