Title: [176868] branches/safari-600.3-branch/Source/WebCore
- Revision
- 176868
- Author
- [email protected]
- Date
- 2014-12-05 13:17:16 -0800 (Fri, 05 Dec 2014)
Log Message
Merged r176812. rdar://problems/19140827
Modified Paths
Diff
Modified: branches/safari-600.3-branch/Source/WebCore/ChangeLog (176867 => 176868)
--- branches/safari-600.3-branch/Source/WebCore/ChangeLog 2014-12-05 21:17:06 UTC (rev 176867)
+++ branches/safari-600.3-branch/Source/WebCore/ChangeLog 2014-12-05 21:17:16 UTC (rev 176868)
@@ -1,5 +1,17 @@
2014-12-05 Dana Burkart <[email protected]>
+ Merge r176812. <rdar://problem/19140827>
+
+ 2014-12-04 Timothy Horton <[email protected]>
+
+ Further fix the 32-bit build.
+
+ * page/mac/TextIndicatorWindow.mm:
+ (WebCore::TextIndicatorWindow::setTextIndicator):
+
+
+2014-12-05 Dana Burkart <[email protected]>
+
Merge r176811. <rdar://problem/19140827>
2014-12-04 Timothy Horton <[email protected]>
Modified: branches/safari-600.3-branch/Source/WebCore/page/mac/TextIndicatorWindow.mm (176867 => 176868)
--- branches/safari-600.3-branch/Source/WebCore/page/mac/TextIndicatorWindow.mm 2014-12-05 21:17:06 UTC (rev 176867)
+++ branches/safari-600.3-branch/Source/WebCore/page/mac/TextIndicatorWindow.mm 2014-12-05 21:17:16 UTC (rev 176868)
@@ -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
