Title: [205710] branches/safari-602-branch/Source/WebKit2
- Revision
- 205710
- Author
- [email protected]
- Date
- 2016-09-09 01:42:20 -0700 (Fri, 09 Sep 2016)
Log Message
Merge r205371. rdar://problem/28020157
Modified Paths
Diff
Modified: branches/safari-602-branch/Source/WebKit2/ChangeLog (205709 => 205710)
--- branches/safari-602-branch/Source/WebKit2/ChangeLog 2016-09-09 08:42:16 UTC (rev 205709)
+++ branches/safari-602-branch/Source/WebKit2/ChangeLog 2016-09-09 08:42:20 UTC (rev 205710)
@@ -1,5 +1,16 @@
2016-09-09 Babak Shafiei <[email protected]>
+ Merge r205371. rdar://problem/28020157
+
+ 2016-09-02 Jer Noble <[email protected]>
+
+ Unreviewed build fix; partial roll out of r205365 to remove unintentional change in WKWebView.mm.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _initializeWithConfiguration:]):
+
+2016-09-09 Babak Shafiei <[email protected]>
+
Merge r205365. rdar://problem/28020157
2016-07-08 Jer Noble <[email protected]>
Modified: branches/safari-602-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (205709 => 205710)
--- branches/safari-602-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-09-09 08:42:16 UTC (rev 205709)
+++ branches/safari-602-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-09-09 08:42:20 UTC (rev 205710)
@@ -543,6 +543,8 @@
_page->setApplicationNameForUserAgent(applicationNameForUserAgent);
_navigationState = std::make_unique<WebKit::NavigationState>(self);
+ _page->setNavigationClient(_navigationState->createNavigationClient());
+
_uiDelegate = std::make_unique<WebKit::UIDelegate>(self);
_page->setFindClient(std::make_unique<WebKit::FindClient>(self));
_page->setDiagnosticLoggingClient(std::make_unique<WebKit::DiagnosticLoggingClient>(self));
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
