Index: Source/WebCore/loader/FrameLoader.cpp |
=================================================================== |
--- Source/WebCore/loader/FrameLoader.cpp (revision 96956) |
+++ Source/WebCore/loader/FrameLoader.cpp (working copy) |
@@ -1124,21 +1124,6 @@ |
detachChildren(); |
} |
-// This is a hack to allow keep navigation to http/https feeds working. To remove this |
-// we need to introduce new API akin to registerURLSchemeAsLocal, that registers a |
-// protocols navigation policy. |
-static bool isFeedWithNestedProtocolInHTTPFamily(const KURL& url) |
-{ |
- const String& urlString = url.string(); |
- if (!urlString.startsWith("feed", false)) |
- return false; |
- |
- return urlString.startsWith("feed://", false) |
- || urlString.startsWith("feed:http:", false) || urlString.startsWith("feed:https:", false) |
- || urlString.startsWith("feeds:http:", false) || urlString.startsWith("feeds:https:", false) |
- || urlString.startsWith("feedsearch:http:", false) || urlString.startsWith("feedsearch:https:", false); |
-} |
- |
void FrameLoader::loadFrameRequest(const FrameLoadRequest& request, bool lockHistory, bool lockBackForwardList, |
PassRefPtr<Event> event, PassRefPtr<FormState> formState, ReferrerPolicy referrerPolicy) |
{ |
@@ -1148,8 +1133,7 @@ |
KURL url = request.resourceRequest().url(); |
ASSERT(m_frame->document()); |
- // FIXME: Should we move the isFeedWithNestedProtocolInHTTPFamily logic inside SecurityOrigin::canDisplay? |
- if (!isFeedWithNestedProtocolInHTTPFamily(url) && !request.requester()->canDisplay(url)) { |
+ if (!request.requester()->canDisplay(url)) { |
reportLocalLoadFailed(m_frame, url.string()); |
return; |
} |