Skip to content
Permalink
Browse files
Unreviewed, rolling out r202296.
Broke basic browsing in Safari

Reverted changeset:

"WKWebView with no WKNavigationDelegate does not follow
universal links"
https://bugs.webkit.org/show_bug.cgi?id=158997
http://trac.webkit.org/changeset/202296

Canonical link: https://commits.webkit.org/177083@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@202316 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
cdumez committed Jun 22, 2016
1 parent 2cd76c1 commit 30119cd70f51116448953fbd1a30dc4ef4d839c6
@@ -1,3 +1,16 @@
2016-06-21 Chris Dumez <cdumez@apple.com>

Unreviewed, rolling out r202296.

Broke basic browsing in Safari

Reverted changeset:

"WKWebView with no WKNavigationDelegate does not follow
universal links"
https://bugs.webkit.org/show_bug.cgi?id=158997
http://trac.webkit.org/changeset/202296

2016-06-21 Anders Carlsson <andersca@apple.com>

Fix build.
@@ -542,8 +542,6 @@ - (void)_initializeWithConfiguration:(WKWebViewConfiguration *)configuration
_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));
@@ -569,9 +569,6 @@ void WebPageProxy::setNavigationClient(std::unique_ptr<API::NavigationClient> na

void WebPageProxy::setLoaderClient(std::unique_ptr<API::LoaderClient> loaderClient)
{
if (m_navigationClient && loaderClient)
m_navigationClient = nullptr;

if (!loaderClient) {
m_loaderClient = std::make_unique<API::LoaderClient>();
return;
@@ -1,3 +1,16 @@
2016-06-21 Chris Dumez <cdumez@apple.com>

Unreviewed, rolling out r202296.

Broke basic browsing in Safari

Reverted changeset:

"WKWebView with no WKNavigationDelegate does not follow
universal links"
https://bugs.webkit.org/show_bug.cgi?id=158997
http://trac.webkit.org/changeset/202296

2016-06-21 Anders Carlsson <andersca@apple.com>

Fix build.
@@ -100,7 +100,6 @@
7AE9E5091AE5AE8B00CF874B /* test.pdf in Copy Resources */ = {isa = PBXBuildFile; fileRef = 7AE9E5081AE5AE8B00CF874B /* test.pdf */; };
7C3965061CDD74F90094DBB8 /* Color.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C3965051CDD74F90094DBB8 /* Color.cpp */; };
7C3DB8E41D12129B00AE8CC3 /* CommandBackForward.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7C3DB8E21D12129B00AE8CC3 /* CommandBackForward.mm */; };
7C417F331D19E14800B8EF53 /* WKWebViewDefaultNavigationDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7C417F311D19E14800B8EF53 /* WKWebViewDefaultNavigationDelegate.mm */; };
7C486BA11AA12567003F6F9B /* bundle-file.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 7C486BA01AA1254B003F6F9B /* bundle-file.html */; };
7C54A4BE1AA11CCA00380F78 /* WKBundleFileHandle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C54A4BC1AA11CCA00380F78 /* WKBundleFileHandle.cpp */; };
7C54A4C11AA11CE400380F78 /* WKBundleFileHandle_Bundle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C54A4BF1AA11CE400380F78 /* WKBundleFileHandle_Bundle.cpp */; };
@@ -753,7 +752,6 @@
7AE9E5081AE5AE8B00CF874B /* test.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = test.pdf; sourceTree = "<group>"; };
7C3965051CDD74F90094DBB8 /* Color.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Color.cpp; sourceTree = "<group>"; };
7C3DB8E21D12129B00AE8CC3 /* CommandBackForward.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CommandBackForward.mm; sourceTree = "<group>"; };
7C417F311D19E14800B8EF53 /* WKWebViewDefaultNavigationDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKWebViewDefaultNavigationDelegate.mm; sourceTree = "<group>"; };
7C486BA01AA1254B003F6F9B /* bundle-file.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = "bundle-file.html"; sourceTree = "<group>"; };
7C54A4BC1AA11CCA00380F78 /* WKBundleFileHandle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKBundleFileHandle.cpp; sourceTree = "<group>"; };
7C54A4BF1AA11CE400380F78 /* WKBundleFileHandle_Bundle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKBundleFileHandle_Bundle.cpp; sourceTree = "<group>"; };
@@ -1168,7 +1166,6 @@
7C882E051C80C624006BF731 /* UserContentWorldProtocol.h */,
93E943F11CD3E87E00AC08C2 /* VideoControlsManager.mm */,
2D00065D1C1F58940088E6A7 /* WKPDFViewResizeCrash.mm */,
7C417F311D19E14800B8EF53 /* WKWebViewDefaultNavigationDelegate.mm */,
0F3B94A51A77266C00DE3272 /* WKWebViewEvaluateJavaScript.mm */,
9984FACA1CFFAEEE008D198C /* WKWebViewTextInput.mm */,
51714EB61CF8C7A4004723C4 /* WebProcessKillIDBCleanup.mm */,
@@ -2102,7 +2099,6 @@
7C83E0BB1D0A650000FEBCF3 /* FindInPage.mm in Sources */,
7CCE7EAF1A411A3800447C4C /* PlatformUtilities.cpp in Sources */,
0F139E781A423A6B00F590F5 /* PlatformUtilitiesCocoa.mm in Sources */,
7C417F331D19E14800B8EF53 /* WKWebViewDefaultNavigationDelegate.mm in Sources */,
7CCE7EA61A411A0F00447C4C /* PlatformUtilitiesMac.mm in Sources */,
7CCE7EA71A411A1300447C4C /* PlatformWebViewMac.mm in Sources */,
7CCE7F261A411AF600447C4C /* Preferences.mm in Sources */,

This file was deleted.

0 comments on commit 30119cd

Please sign in to comment.