Title: [176812] trunk/Source/WebCore
Revision
176812
Author
[email protected]
Date
2014-12-04 13:32:21 -0800 (Thu, 04 Dec 2014)

Log Message

Further fix the 32-bit build.

* page/mac/TextIndicatorWindow.mm:
(WebCore::TextIndicatorWindow::setTextIndicator):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (176811 => 176812)


--- trunk/Source/WebCore/ChangeLog	2014-12-04 21:10:49 UTC (rev 176811)
+++ trunk/Source/WebCore/ChangeLog	2014-12-04 21:32:21 UTC (rev 176812)
@@ -1,5 +1,12 @@
 2014-12-04  Timothy Horton  <[email protected]>
 
+        Further fix the 32-bit build.
+
+        * page/mac/TextIndicatorWindow.mm:
+        (WebCore::TextIndicatorWindow::setTextIndicator):
+
+2014-12-04  Timothy Horton  <[email protected]>
+
         Fix the 32-bit build.
 
         * page/mac/TextIndicatorWindow.h:

Modified: trunk/Source/WebCore/page/mac/TextIndicatorWindow.mm (176811 => 176812)


--- trunk/Source/WebCore/page/mac/TextIndicatorWindow.mm	2014-12-04 21:10:49 UTC (rev 176811)
+++ trunk/Source/WebCore/page/mac/TextIndicatorWindow.mm	2014-12-04 21:32:21 UTC (rev 176812)
@@ -282,8 +282,8 @@
     CGFloat horizontalMargin = std::max(dropShadowBlurRadius * 2 + horizontalBorder, contentRect.size.width * 2);
     CGFloat verticalMargin = std::max(dropShadowBlurRadius * 2 + verticalBorder, contentRect.size.height * 2);
 
-    contentRect = NSInsetRect(NSRectFromCGRect(contentRect), -horizontalMargin, -verticalMargin);
-    NSRect windowContentRect = [NSWindow contentRectForFrameRect:NSIntegralRect(contentRect) styleMask:NSBorderlessWindowMask];
+    contentRect = CGRectInset(contentRect, -horizontalMargin, -verticalMargin);
+    NSRect windowContentRect = [NSWindow contentRectForFrameRect:NSIntegralRect(NSRectFromCGRect(contentRect)) styleMask:NSBorderlessWindowMask];
     m_textIndicatorWindow = adoptNS([[NSWindow alloc] initWithContentRect:windowContentRect styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:NO]);
 
     [m_textIndicatorWindow setBackgroundColor:[NSColor clearColor]];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to