Title: [177142] branches/safari-600.3-branch/Source/WebKit2
- Revision
- 177142
- Author
- [email protected]
- Date
- 2014-12-11 01:18:47 -0800 (Thu, 11 Dec 2014)
Log Message
Merged r177106. rdar://problems/19135389
Modified Paths
Diff
Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (177141 => 177142)
--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-12-11 09:18:42 UTC (rev 177141)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-12-11 09:18:47 UTC (rev 177142)
@@ -1,5 +1,16 @@
2014-12-11 Matthew Hanson <[email protected]>
+ Merge r177106. rdar://problem/19135389
+
+ 2014-12-10 Timothy Horton <[email protected]>
+
+ Fix the build.
+
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView _targetWindowForMovePreparation]):
+
+2014-12-11 Matthew Hanson <[email protected]>
+
Merge r177104. rdar://problem/19135389
2014-12-10 Timothy Horton <[email protected]>
Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm (177141 => 177142)
--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-12-11 09:18:42 UTC (rev 177141)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-12-11 09:18:47 UTC (rev 177142)
@@ -3452,6 +3452,11 @@
[[super inputContext] discardMarkedText]; // Inform the input method that we won't have an inline input area despite having been asked to.
}
+- (NSWindow *)_targetWindowForMovePreparation
+{
+ return _data->_targetWindowForMovePreparation;
+}
+
#if ENABLE(FULLSCREEN_API)
- (BOOL)_hasFullScreenWindowController
{
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
