Title: [182079] tags/Safari-601.1.23.4/Source/WebKit2
- Revision
- 182079
- Author
- [email protected]
- Date
- 2015-03-27 14:08:26 -0700 (Fri, 27 Mar 2015)
Log Message
Merged r182044. rdar://problem/20233711
Modified Paths
Diff
Modified: tags/Safari-601.1.23.4/Source/WebKit2/ChangeLog (182078 => 182079)
--- tags/Safari-601.1.23.4/Source/WebKit2/ChangeLog 2015-03-27 21:07:17 UTC (rev 182078)
+++ tags/Safari-601.1.23.4/Source/WebKit2/ChangeLog 2015-03-27 21:08:26 UTC (rev 182079)
@@ -1,5 +1,18 @@
2015-03-27 Babak Shafiei <[email protected]>
+ Merge r182044.
+
+ 2015-03-26 Enrica Casucci <[email protected]>
+
+ iOS build fix after r182037.
+
+ Unreviewed.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _setEditable:]):
+
+2015-03-27 Babak Shafiei <[email protected]>
+
Merge r182037.
2015-03-26 Enrica Casucci <[email protected]>
Modified: tags/Safari-601.1.23.4/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (182078 => 182079)
--- tags/Safari-601.1.23.4/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-03-27 21:07:17 UTC (rev 182078)
+++ tags/Safari-601.1.23.4/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-03-27 21:08:26 UTC (rev 182079)
@@ -1657,7 +1657,9 @@
- (void)_setEditable:(BOOL)editable
{
_page->setEditable(editable);
+#if !PLATFORM(IOS)
[_wkView _addFontPanelObserver];
+#endif
}
- (_WKRemoteObjectRegistry *)_remoteObjectRegistry
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
