Diff
Modified: branches/safari-600.3-branch/Source/WebCore/ChangeLog (176866 => 176867)
--- branches/safari-600.3-branch/Source/WebCore/ChangeLog 2014-12-05 21:16:49 UTC (rev 176866)
+++ branches/safari-600.3-branch/Source/WebCore/ChangeLog 2014-12-05 21:17:06 UTC (rev 176867)
@@ -1,5 +1,18 @@
2014-12-05 Dana Burkart <[email protected]>
+ Merge r176811. <rdar://problem/19140827>
+
+ 2014-12-04 Timothy Horton <[email protected]>
+
+ Fix the 32-bit build.
+
+ * page/mac/TextIndicatorWindow.h:
+ * page/mac/TextIndicatorWindow.mm:
+ (WebCore::TextIndicatorWindow::setTextIndicator):
+
+
+2014-12-05 Dana Burkart <[email protected]>
+
Merge r176810. <rdar://problem/19140827>
2014-12-04 Tim Horton <[email protected]>
Modified: branches/safari-600.3-branch/Source/WebCore/page/mac/TextIndicatorWindow.h (176866 => 176867)
--- branches/safari-600.3-branch/Source/WebCore/page/mac/TextIndicatorWindow.h 2014-12-05 21:16:49 UTC (rev 176866)
+++ branches/safari-600.3-branch/Source/WebCore/page/mac/TextIndicatorWindow.h 2014-12-05 21:17:06 UTC (rev 176867)
@@ -48,7 +48,7 @@
explicit TextIndicatorWindow(NSView *);
~TextIndicatorWindow();
- void setTextIndicator(PassRefPtr<TextIndicator>, NSRect contentRect, bool fadeOut, std::function<void ()> animationCompletionHandler);
+ void setTextIndicator(PassRefPtr<TextIndicator>, CGRect contentRect, bool fadeOut, std::function<void ()> animationCompletionHandler);
private:
void closeWindow();
Modified: branches/safari-600.3-branch/Source/WebCore/page/mac/TextIndicatorWindow.mm (176866 => 176867)
--- branches/safari-600.3-branch/Source/WebCore/page/mac/TextIndicatorWindow.mm 2014-12-05 21:16:49 UTC (rev 176866)
+++ branches/safari-600.3-branch/Source/WebCore/page/mac/TextIndicatorWindow.mm 2014-12-05 21:17:06 UTC (rev 176867)
@@ -266,7 +266,7 @@
closeWindow();
}
-void TextIndicatorWindow::setTextIndicator(PassRefPtr<TextIndicator> textIndicator, NSRect contentRect, bool fadeOut, std::function<void ()> animationCompletionHandler)
+void TextIndicatorWindow::setTextIndicator(PassRefPtr<TextIndicator> textIndicator, CGRect contentRect, bool fadeOut, std::function<void ()> animationCompletionHandler)
{
if (m_textIndicator == textIndicator)
return;
@@ -282,7 +282,7 @@
CGFloat horizontalMargin = std::max(dropShadowBlurRadius * 2 + horizontalBorder, contentRect.size.width * 2);
CGFloat verticalMargin = std::max(dropShadowBlurRadius * 2 + verticalBorder, contentRect.size.height * 2);
- contentRect = NSInsetRect(contentRect, -horizontalMargin, -verticalMargin);
+ contentRect = NSInsetRect(NSRectFromCGRect(contentRect), -horizontalMargin, -verticalMargin);
NSRect windowContentRect = [NSWindow contentRectForFrameRect:NSIntegralRect(contentRect) styleMask:NSBorderlessWindowMask];
m_textIndicatorWindow = adoptNS([[NSWindow alloc] initWithContentRect:windowContentRect styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:NO]);
Modified: branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog (176866 => 176867)
--- branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog 2014-12-05 21:16:49 UTC (rev 176866)
+++ branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog 2014-12-05 21:17:06 UTC (rev 176867)
@@ -1,5 +1,17 @@
2014-12-05 Dana Burkart <[email protected]>
+ Merge r176811. <rdar://problem/19140827>
+
+ 2014-12-04 Timothy Horton <[email protected]>
+
+ Fix the 32-bit build.
+
+ * WebView/WebView.mm:
+ (-[WebView _setTextIndicator:fadeOut:animationCompletionHandler:]):
+
+
+2014-12-05 Dana Burkart <[email protected]>
+
Merge r176810. <rdar://problem/19140827>
2014-12-04 Tim Horton <[email protected]>
Modified: branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebView.mm (176866 => 176867)
--- branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebView.mm 2014-12-05 21:16:49 UTC (rev 176866)
+++ branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebView.mm 2014-12-05 21:17:06 UTC (rev 176867)
@@ -8605,7 +8605,7 @@
_private->textIndicatorWindow = std::make_unique<TextIndicatorWindow>(self);
NSRect contentRect = [self.window convertRectToScreen:textIndicator->textBoundingRectInWindowCoordinates()];
- _private->textIndicatorWindow->setTextIndicator(textIndicator, contentRect, fadeOut, WTF::move(completionHandler));
+ _private->textIndicatorWindow->setTextIndicator(textIndicator, NSRectToCGRect(contentRect), fadeOut, WTF::move(completionHandler));
}
- (void)_clearTextIndicator
Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (176866 => 176867)
--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-12-05 21:16:49 UTC (rev 176866)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-12-05 21:17:06 UTC (rev 176867)
@@ -1,5 +1,17 @@
2014-12-05 Dana Burkart <[email protected]>
+ Merge r176811. <rdar://problem/19140827>
+
+ 2014-12-04 Timothy Horton <[email protected]>
+
+ Fix the 32-bit build.
+
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView _setTextIndicator:fadeOut:animationCompletionHandler:]):
+
+
+2014-12-05 Dana Burkart <[email protected]>
+
Merge r176810. <rdar://problem/19140827>
2014-12-04 Tim Horton <[email protected]>
Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm (176866 => 176867)
--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-12-05 21:16:49 UTC (rev 176866)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-12-05 21:17:06 UTC (rev 176867)
@@ -3082,7 +3082,7 @@
_data->_textIndicatorWindow = std::make_unique<TextIndicatorWindow>(self);
NSRect contentRect = [self.window convertRectToScreen:[self convertRect:textIndicator->textBoundingRectInWindowCoordinates() toView:nil]];
- _data->_textIndicatorWindow->setTextIndicator(textIndicator, contentRect, fadeOut, WTF::move(completionHandler));
+ _data->_textIndicatorWindow->setTextIndicator(textIndicator, NSRectToCGRect(contentRect), fadeOut, WTF::move(completionHandler));
}
- (void)_setTextIndicator:(PassRefPtr<TextIndicator>)textIndicator fadeOut:(BOOL)fadeOut
