Title: [176379] branches/safari-600.3-branch/Source/WebKit2
- Revision
- 176379
- Author
- [email protected]
- Date
- 2014-11-19 20:37:27 -0800 (Wed, 19 Nov 2014)
Log Message
Merge r176374. rdar://problem/18840128
Modified Paths
Diff
Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (176378 => 176379)
--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-11-20 04:28:37 UTC (rev 176378)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-11-20 04:37:27 UTC (rev 176379)
@@ -1,5 +1,16 @@
2014-11-19 Dana Burkart <[email protected]>
+ Merge r176374. rdar://problem/18840128
+
+ 2014-11-19 Timothy Horton <[email protected]>
+
+ Fix the 32-bit build
+
+ * UIProcess/mac/TextIndicatorWindow.mm:
+ (WebKit::TextIndicatorWindow::setTextIndicator):
+
+2014-11-19 Dana Burkart <[email protected]>
+
Merge r176363. rdar://problem/18840128
2014-11-19 Tim Horton <[email protected]>
Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/TextIndicatorWindow.mm (176378 => 176379)
--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/TextIndicatorWindow.mm 2014-11-20 04:28:37 UTC (rev 176378)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/TextIndicatorWindow.mm 2014-11-20 04:37:27 UTC (rev 176379)
@@ -296,7 +296,7 @@
[m_textIndicatorWindow setOpaque:NO];
[m_textIndicatorWindow setIgnoresMouseEvents:YES];
- m_textIndicatorView = adoptNS([[WKTextIndicatorView alloc] initWithFrame:NSMakeRect(0, 0, [m_textIndicatorWindow frame].size.width, [m_textIndicatorWindow frame].size.height) textIndicator:m_textIndicator margin:CGSizeMake(horizontalMargin, verticalMargin)]);
+ m_textIndicatorView = adoptNS([[WKTextIndicatorView alloc] initWithFrame:NSMakeRect(0, 0, [m_textIndicatorWindow frame].size.width, [m_textIndicatorWindow frame].size.height) textIndicator:m_textIndicator margin:NSMakeSize(horizontalMargin, verticalMargin)]);
[m_textIndicatorWindow setContentView:m_textIndicatorView.get()];
[[m_wkView window] addChildWindow:m_textIndicatorWindow.get() ordered:NSWindowAbove];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
