Diff
Modified: trunk/Source/WebCore/ChangeLog (237101 => 237102)
--- trunk/Source/WebCore/ChangeLog 2018-10-15 14:28:13 UTC (rev 237101)
+++ trunk/Source/WebCore/ChangeLog 2018-10-15 14:29:53 UTC (rev 237102)
@@ -1,3 +1,18 @@
+2018-10-15 Alex Christensen <[email protected]>
+
+ Remove InjectedBundle processing of back/forward lists
+ https://bugs.webkit.org/show_bug.cgi?id=190459
+
+ Reviewed by Chris Dumez.
+
+ The uses of these functions are dead code I removed in rdar://problem/45180545
+ Removing these functions is a step towards fixing the PSON history bugs.
+
+ * loader/EmptyFrameLoaderClient.h:
+ * loader/FrameLoaderClient.h:
+ * loader/HistoryController.cpp:
+ (WebCore::HistoryController::goToItem):
+
2018-10-14 Yusuke Suzuki <[email protected]>
[JSC] Remove Option::useAsyncIterator
Modified: trunk/Source/WebCore/loader/EmptyFrameLoaderClient.h (237101 => 237102)
--- trunk/Source/WebCore/loader/EmptyFrameLoaderClient.h 2018-10-15 14:28:13 UTC (rev 237101)
+++ trunk/Source/WebCore/loader/EmptyFrameLoaderClient.h 2018-10-15 14:29:53 UTC (rev 237102)
@@ -165,7 +165,7 @@
void updateGlobalHistory() final { }
void updateGlobalHistoryRedirectLinks() final { }
- bool shouldGoToHistoryItem(HistoryItem*) const final { return false; }
+ bool shouldGoToHistoryItem(HistoryItem&) const final { return false; }
void updateGlobalHistoryItemForPage() final { }
void saveViewStateToItem(HistoryItem&) final { }
bool canCachePage() const final { return false; }
Modified: trunk/Source/WebCore/loader/FrameLoaderClient.h (237101 => 237102)
--- trunk/Source/WebCore/loader/FrameLoaderClient.h 2018-10-15 14:28:13 UTC (rev 237101)
+++ trunk/Source/WebCore/loader/FrameLoaderClient.h 2018-10-15 14:29:53 UTC (rev 237102)
@@ -220,7 +220,7 @@
virtual void updateGlobalHistory() = 0;
virtual void updateGlobalHistoryRedirectLinks() = 0;
- virtual bool shouldGoToHistoryItem(HistoryItem*) const = 0;
+ virtual bool shouldGoToHistoryItem(HistoryItem&) const = 0;
virtual void updateGlobalHistoryItemForPage() { }
// This frame has set its opener to null, disowning it for the lifetime of the frame.
Modified: trunk/Source/WebCore/loader/HistoryController.cpp (237101 => 237102)
--- trunk/Source/WebCore/loader/HistoryController.cpp 2018-10-15 14:28:13 UTC (rev 237101)
+++ trunk/Source/WebCore/loader/HistoryController.cpp 2018-10-15 14:29:53 UTC (rev 237102)
@@ -304,7 +304,7 @@
Page* page = m_frame.page();
if (!page)
return;
- if (!m_frame.loader().client().shouldGoToHistoryItem(&targetItem))
+ if (!m_frame.loader().client().shouldGoToHistoryItem(targetItem))
return;
if (m_defersLoading) {
m_deferredItem = &targetItem;
Modified: trunk/Source/WebKit/ChangeLog (237101 => 237102)
--- trunk/Source/WebKit/ChangeLog 2018-10-15 14:28:13 UTC (rev 237101)
+++ trunk/Source/WebKit/ChangeLog 2018-10-15 14:29:53 UTC (rev 237102)
@@ -1,5 +1,41 @@
2018-10-15 Alex Christensen <[email protected]>
+ Remove InjectedBundle processing of back/forward lists
+ https://bugs.webkit.org/show_bug.cgi?id=190459
+
+ Reviewed by Chris Dumez.
+
+ * Shared/API/c/WKDeprecated.h:
+ * UIProcess/API/APINavigationClient.h:
+ (API::NavigationClient::willGoToBackForwardListItem):
+ * UIProcess/Cocoa/NavigationState.h:
+ * UIProcess/Cocoa/NavigationState.mm:
+ (WebKit::NavigationState::NavigationClient::willGoToBackForwardListItem):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::willGoToBackForwardListItem):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebPageProxy.messages.in:
+ * WebProcess/InjectedBundle/API/APIInjectedBundlePageLoaderClient.h:
+ (API::InjectedBundle::PageLoaderClient::shouldGoToBackForwardListItem): Deleted.
+ * WebProcess/InjectedBundle/API/c/WKBundleBackForwardListItem.cpp:
+ (WKBundleBackForwardListItemCopyOriginalURL):
+ (WKBundleBackForwardListItemCopyTitle):
+ (WKBundleBackForwardListItemIsTargetItem):
+ (WKBundleBackForwardListItemIsInPageCache):
+ (WKBundleBackForwardListItemHasCachedPageExpired):
+ * WebProcess/InjectedBundle/API/c/WKBundleBackForwardListItem.h:
+ * WebProcess/InjectedBundle/API/c/WKBundleFileHandleRef.h:
+ * WebProcess/InjectedBundle/API/c/WKBundleFrame.h:
+ * WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp:
+ (WebKit::InjectedBundlePageLoaderClient::InjectedBundlePageLoaderClient):
+ (WebKit::InjectedBundlePageLoaderClient::shouldGoToBackForwardListItem): Deleted.
+ * WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h:
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::shouldGoToHistoryItem const):
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
+
+2018-10-15 Alex Christensen <[email protected]>
+
WebPageProxy should always have a HistoryClient
https://bugs.webkit.org/show_bug.cgi?id=190450
Modified: trunk/Source/WebKit/Shared/API/c/WKDeprecated.h (237101 => 237102)
--- trunk/Source/WebKit/Shared/API/c/WKDeprecated.h 2018-10-15 14:28:13 UTC (rev 237101)
+++ trunk/Source/WebKit/Shared/API/c/WKDeprecated.h 2018-10-15 14:29:53 UTC (rev 237102)
@@ -26,9 +26,9 @@
#pragma once
#ifdef _MSC_VER
-#define WK_C_API_DEPRECATED(...)
+#define WK_C_API_DEPRECATED
#define WK_C_API_DEPRECATED_WITH_REPLACEMENT(...)
#else
-#define WK_C_API_DEPRECATED(_message, ...) __attribute__((deprecated(_message)))
+#define WK_C_API_DEPRECATED __attribute__((deprecated("No longer supported")))
#define WK_C_API_DEPRECATED_WITH_REPLACEMENT(_replacement, ...) __attribute__((deprecated("use " #_replacement)))
#endif
Modified: trunk/Source/WebKit/UIProcess/API/APINavigationClient.h (237101 => 237102)
--- trunk/Source/WebKit/UIProcess/API/APINavigationClient.h 2018-10-15 14:28:13 UTC (rev 237101)
+++ trunk/Source/WebKit/UIProcess/API/APINavigationClient.h 2018-10-15 14:29:53 UTC (rev 237102)
@@ -130,7 +130,7 @@
virtual void resolveWebGLLoadPolicy(WebKit::WebPageProxy&, const WebCore::URL&, CompletionHandler<void(WebCore::WebGLLoadPolicy)>&& completionHandler) const { completionHandler(WebCore::WebGLLoadPolicy::WebGLAllowCreation); }
#endif
- virtual bool willGoToBackForwardListItem(WebKit::WebPageProxy&, WebKit::WebBackForwardListItem&, bool inPageCache, Object*) { return false; }
+ virtual bool willGoToBackForwardListItem(WebKit::WebPageProxy&, WebKit::WebBackForwardListItem&, bool inPageCache) { return false; }
virtual void didBeginNavigationGesture(WebKit::WebPageProxy&) { }
virtual void willEndNavigationGesture(WebKit::WebPageProxy&, bool willNavigate, WebKit::WebBackForwardListItem&) { }
Modified: trunk/Source/WebKit/UIProcess/Cocoa/NavigationState.h (237101 => 237102)
--- trunk/Source/WebKit/UIProcess/Cocoa/NavigationState.h 2018-10-15 14:28:13 UTC (rev 237101)
+++ trunk/Source/WebKit/UIProcess/Cocoa/NavigationState.h 2018-10-15 14:29:53 UTC (rev 237102)
@@ -126,7 +126,7 @@
#if PLATFORM(MAC)
void webGLLoadPolicy(WebPageProxy&, const WebCore::URL&, CompletionHandler<void(WebCore::WebGLLoadPolicy)>&&) const final;
void resolveWebGLLoadPolicy(WebPageProxy&, const WebCore::URL&, CompletionHandler<void(WebCore::WebGLLoadPolicy)>&&) const final;
- bool willGoToBackForwardListItem(WebPageProxy&, WebBackForwardListItem&, bool inPageCache, API::Object*) final;
+ bool willGoToBackForwardListItem(WebPageProxy&, WebBackForwardListItem&, bool inPageCache) final;
bool didFailToInitializePlugIn(WebPageProxy&, API::Dictionary&) final;
bool didBlockInsecurePluginVersion(WebPageProxy&, API::Dictionary&) final;
void decidePolicyForPluginLoad(WebKit::WebPageProxy&, WebKit::PluginModuleLoadPolicy, API::Dictionary&, CompletionHandler<void(WebKit::PluginModuleLoadPolicy, const WTF::String&)>&&) final;
Modified: trunk/Source/WebKit/UIProcess/Cocoa/NavigationState.mm (237101 => 237102)
--- trunk/Source/WebKit/UIProcess/Cocoa/NavigationState.mm 2018-10-15 14:28:13 UTC (rev 237101)
+++ trunk/Source/WebKit/UIProcess/Cocoa/NavigationState.mm 2018-10-15 14:29:53 UTC (rev 237102)
@@ -445,7 +445,7 @@
return true;
}
-bool NavigationState::NavigationClient::willGoToBackForwardListItem(WebPageProxy&, WebBackForwardListItem& item, bool inPageCache, API::Object*)
+bool NavigationState::NavigationClient::willGoToBackForwardListItem(WebPageProxy&, WebBackForwardListItem& item, bool inPageCache)
{
if (!m_navigationState.m_navigationDelegateMethods.webViewWillGoToBackForwardListItemInPageCache)
return false;
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (237101 => 237102)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2018-10-15 14:28:13 UTC (rev 237101)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2018-10-15 14:29:53 UTC (rev 237102)
@@ -1294,12 +1294,12 @@
m_pageLoadState.setCanGoForward(transaction, m_backForwardList->forwardItem());
}
-void WebPageProxy::willGoToBackForwardListItem(const BackForwardItemIdentifier& itemID, bool inPageCache, const UserData& userData)
+void WebPageProxy::willGoToBackForwardListItem(const BackForwardItemIdentifier& itemID, bool inPageCache)
{
PageClientProtector protector(pageClient());
if (auto* item = m_backForwardList->itemForID(itemID))
- m_navigationClient->willGoToBackForwardListItem(*this, *item, inPageCache, m_process->transformHandlesToObjects(userData.object()).get());
+ m_navigationClient->willGoToBackForwardListItem(*this, *item, inPageCache);
}
bool WebPageProxy::shouldKeepCurrentBackForwardListItemInList(WebBackForwardListItem& item)
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.h (237101 => 237102)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.h 2018-10-15 14:28:13 UTC (rev 237101)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.h 2018-10-15 14:29:53 UTC (rev 237102)
@@ -478,7 +478,7 @@
RefPtr<API::Navigation> goToBackForwardItem(WebBackForwardListItem&);
void tryRestoreScrollPosition();
void didChangeBackForwardList(WebBackForwardListItem* addedItem, Vector<Ref<WebBackForwardListItem>>&& removed);
- void willGoToBackForwardListItem(const WebCore::BackForwardItemIdentifier&, bool inPageCache, const UserData&);
+ void willGoToBackForwardListItem(const WebCore::BackForwardItemIdentifier&, bool inPageCache);
bool shouldKeepCurrentBackForwardListItemInList(WebBackForwardListItem&);
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in (237101 => 237102)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in 2018-10-15 14:28:13 UTC (rev 237101)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in 2018-10-15 14:29:53 UTC (rev 237102)
@@ -233,7 +233,7 @@
BackForwardBackListCount() -> (int32_t count)
BackForwardForwardListCount() -> (int32_t count)
BackForwardClear()
- WillGoToBackForwardListItem(struct WebCore::BackForwardItemIdentifier itemID, bool inPageCache, WebKit::UserData userData)
+ WillGoToBackForwardListItem(struct WebCore::BackForwardItemIdentifier itemID, bool inPageCache)
# Undo/Redo messages
RegisterEditCommandForUndo(uint64_t commandID, uint32_t editAction)
Modified: trunk/Source/WebKit/WebProcess/InjectedBundle/API/APIInjectedBundlePageLoaderClient.h (237101 => 237102)
--- trunk/Source/WebKit/WebProcess/InjectedBundle/API/APIInjectedBundlePageLoaderClient.h 2018-10-15 14:28:13 UTC (rev 237101)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/API/APIInjectedBundlePageLoaderClient.h 2018-10-15 14:29:53 UTC (rev 237102)
@@ -58,7 +58,6 @@
virtual void willLoadURLRequest(WebKit::WebPage&, const WebCore::ResourceRequest&, API::Object*) { }
virtual void willLoadDataRequest(WebKit::WebPage&, const WebCore::ResourceRequest&, WebCore::SharedBuffer*, const WTF::String&, const WTF::String&, const WebCore::URL&, API::Object*) { }
- virtual bool shouldGoToBackForwardListItem(WebKit::WebPage&, WebKit::InjectedBundleBackForwardListItem&, RefPtr<API::Object>&) { return true; }
virtual void didStartProvisionalLoadForFrame(WebKit::WebPage&, WebKit::WebFrame&, RefPtr<API::Object>&) { }
virtual void didReceiveServerRedirectForProvisionalLoadForFrame(WebKit::WebPage&, WebKit::WebFrame&, RefPtr<API::Object>&) { }
virtual void didFailProvisionalLoadWithErrorForFrame(WebKit::WebPage&, WebKit::WebFrame&, const WebCore::ResourceError&, RefPtr<API::Object>&) { }
Modified: trunk/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleBackForwardListItem.cpp (237101 => 237102)
--- trunk/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleBackForwardListItem.cpp 2018-10-15 14:28:13 UTC (rev 237101)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleBackForwardListItem.cpp 2018-10-15 14:29:53 UTC (rev 237102)
@@ -44,7 +44,7 @@
WKURLRef WKBundleBackForwardListItemCopyOriginalURL(WKBundleBackForwardListItemRef itemRef)
{
- return toCopiedURLAPI(toImpl(itemRef)->originalURL());
+ return nullptr;
}
WKURLRef WKBundleBackForwardListItemCopyURL(WKBundleBackForwardListItemRef itemRef)
@@ -54,7 +54,7 @@
WKStringRef WKBundleBackForwardListItemCopyTitle(WKBundleBackForwardListItemRef itemRef)
{
- return toCopiedAPI(toImpl(itemRef)->title());
+ return nullptr;
}
WKStringRef WKBundleBackForwardListItemCopyTarget(WKBundleBackForwardListItemRef itemRef)
@@ -69,12 +69,12 @@
bool WKBundleBackForwardListItemIsInPageCache(WKBundleBackForwardListItemRef itemRef)
{
- return toImpl(itemRef)->isInPageCache();
+ return false;
}
bool WKBundleBackForwardListItemHasCachedPageExpired(WKBundleBackForwardListItemRef itemRef)
{
- return toImpl(itemRef)->hasCachedPageExpired();
+ return false;
}
WKArrayRef WKBundleBackForwardListItemCopyChildren(WKBundleBackForwardListItemRef itemRef)
Modified: trunk/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleBackForwardListItem.h (237101 => 237102)
--- trunk/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleBackForwardListItem.h 2018-10-15 14:28:13 UTC (rev 237101)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleBackForwardListItem.h 2018-10-15 14:29:53 UTC (rev 237102)
@@ -27,6 +27,7 @@
#define WKBundleBackForwardListItem_h
#include <WebKit/WKBase.h>
+#include <WebKit/WKDeprecated.h>
#ifdef __cplusplus
extern "C" {
@@ -36,15 +37,15 @@
WK_EXPORT bool WKBundleBackForwardListItemIsSame(WKBundleBackForwardListItemRef item1, WKBundleBackForwardListItemRef item2);
-WK_EXPORT WKURLRef WKBundleBackForwardListItemCopyOriginalURL(WKBundleBackForwardListItemRef item);
+WK_EXPORT WKURLRef WKBundleBackForwardListItemCopyOriginalURL(WKBundleBackForwardListItemRef item) WK_C_API_DEPRECATED;
WK_EXPORT WKURLRef WKBundleBackForwardListItemCopyURL(WKBundleBackForwardListItemRef item);
-WK_EXPORT WKStringRef WKBundleBackForwardListItemCopyTitle(WKBundleBackForwardListItemRef item);
+WK_EXPORT WKStringRef WKBundleBackForwardListItemCopyTitle(WKBundleBackForwardListItemRef item) WK_C_API_DEPRECATED;
WK_EXPORT WKStringRef WKBundleBackForwardListItemCopyTarget(WKBundleBackForwardListItemRef item);
WK_EXPORT bool WKBundleBackForwardListItemIsTargetItem(WKBundleBackForwardListItemRef item);
-WK_EXPORT bool WKBundleBackForwardListItemIsInPageCache(WKBundleBackForwardListItemRef item);
-WK_EXPORT bool WKBundleBackForwardListItemHasCachedPageExpired(WKBundleBackForwardListItemRef item);
+WK_EXPORT bool WKBundleBackForwardListItemIsInPageCache(WKBundleBackForwardListItemRef item) WK_C_API_DEPRECATED;
+WK_EXPORT bool WKBundleBackForwardListItemHasCachedPageExpired(WKBundleBackForwardListItemRef item) WK_C_API_DEPRECATED;
WK_EXPORT WKArrayRef WKBundleBackForwardListItemCopyChildren(WKBundleBackForwardListItemRef item);
Modified: trunk/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleFileHandleRef.h (237101 => 237102)
--- trunk/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleFileHandleRef.h 2018-10-15 14:28:13 UTC (rev 237101)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleFileHandleRef.h 2018-10-15 14:29:53 UTC (rev 237102)
@@ -33,7 +33,7 @@
extern "C" {
#endif
-WK_EXPORT WKBundleFileHandleRef WKBundleFileHandleCreateWithPath(WKStringRef path) WK_C_API_DEPRECATED("No longer supported");
+WK_EXPORT WKBundleFileHandleRef WKBundleFileHandleCreateWithPath(WKStringRef path) WK_C_API_DEPRECATED;
#ifdef __cplusplus
}
Modified: trunk/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleFrame.h (237101 => 237102)
--- trunk/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleFrame.h 2018-10-15 14:28:13 UTC (rev 237101)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleFrame.h 2018-10-15 14:29:53 UTC (rev 237102)
@@ -56,7 +56,7 @@
WK_EXPORT JSValueRef WKBundleFrameGetJavaScriptWrapperForNodeForWorld(WKBundleFrameRef frame, WKBundleNodeHandleRef nodeHandle, WKBundleScriptWorldRef world);
WK_EXPORT JSValueRef WKBundleFrameGetJavaScriptWrapperForRangeForWorld(WKBundleFrameRef frame, WKBundleRangeHandleRef rangeHandle, WKBundleScriptWorldRef world);
-WK_EXPORT JSValueRef WKBundleFrameGetJavaScriptWrapperForFileForWorld(WKBundleFrameRef frame, WKBundleFileHandleRef fileHandle, WKBundleScriptWorldRef world) WK_C_API_DEPRECATED("No longer supported");
+WK_EXPORT JSValueRef WKBundleFrameGetJavaScriptWrapperForFileForWorld(WKBundleFrameRef frame, WKBundleFileHandleRef fileHandle, WKBundleScriptWorldRef world) WK_C_API_DEPRECATED;
WK_EXPORT WKBundlePageRef WKBundleFrameGetPage(WKBundleFrameRef frame);
Modified: trunk/Source/WebKit/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp (237101 => 237102)
--- trunk/Source/WebKit/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp 2018-10-15 14:28:13 UTC (rev 237101)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp 2018-10-15 14:29:53 UTC (rev 237102)
@@ -48,6 +48,7 @@
InjectedBundlePageLoaderClient::InjectedBundlePageLoaderClient(const WKBundlePageLoaderClientBase* client)
{
initialize(client);
+ ASSERT(!m_client.shouldGoToBackForwardListItem);
}
void InjectedBundlePageLoaderClient::willLoadURLRequest(WebPage& page, const ResourceRequest& request, API::Object* userData)
@@ -78,18 +79,6 @@
m_client.willLoadDataRequest(toAPI(&page), toAPI(request), toAPI(data.get()), toAPI(MIMEType.impl()), toAPI(encodingName.impl()), toURLRef(unreachableURL.string().impl()), toAPI(userData), m_client.base.clientInfo);
}
-bool InjectedBundlePageLoaderClient::shouldGoToBackForwardListItem(WebPage& page, InjectedBundleBackForwardListItem& item, RefPtr<API::Object>& userData)
-{
- if (!m_client.shouldGoToBackForwardListItem)
- return true;
-
- WKTypeRef userDataToPass = nullptr;
- bool result = m_client.shouldGoToBackForwardListItem(toAPI(&page), toAPI(&item), &userDataToPass, m_client.base.clientInfo);
- userData = adoptRef(toImpl(userDataToPass));
-
- return result;
-}
-
void InjectedBundlePageLoaderClient::didStartProvisionalLoadForFrame(WebPage& page, WebFrame& frame, RefPtr<API::Object>& userData)
{
if (!m_client.didStartProvisionalLoadForFrame)
Modified: trunk/Source/WebKit/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h (237101 => 237102)
--- trunk/Source/WebKit/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h 2018-10-15 14:28:13 UTC (rev 237101)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h 2018-10-15 14:29:53 UTC (rev 237102)
@@ -50,7 +50,6 @@
void willLoadURLRequest(WebPage&, const WebCore::ResourceRequest&, API::Object*) override;
void willLoadDataRequest(WebPage&, const WebCore::ResourceRequest&, WebCore::SharedBuffer*, const WTF::String&, const WTF::String&, const WebCore::URL&, API::Object*) override;
- bool shouldGoToBackForwardListItem(WebPage&, InjectedBundleBackForwardListItem&, RefPtr<API::Object>&) override;
void didStartProvisionalLoadForFrame(WebPage&, WebFrame&, RefPtr<API::Object>&) override;
void didReceiveServerRedirectForProvisionalLoadForFrame(WebPage&, WebFrame&, RefPtr<API::Object>&) override;
void didFailProvisionalLoadWithErrorForFrame(WebPage&, WebFrame&, const WebCore::ResourceError&, RefPtr<API::Object>&) override;
Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (237101 => 237102)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2018-10-15 14:28:13 UTC (rev 237101)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2018-10-15 14:29:53 UTC (rev 237102)
@@ -1116,21 +1116,12 @@
}
}
-bool WebFrameLoaderClient::shouldGoToHistoryItem(HistoryItem* item) const
+bool WebFrameLoaderClient::shouldGoToHistoryItem(HistoryItem& item) const
{
WebPage* webPage = m_frame->page();
if (!webPage)
return false;
-
- RefPtr<InjectedBundleBackForwardListItem> bundleItem = InjectedBundleBackForwardListItem::create(item);
- RefPtr<API::Object> userData;
-
- // Ask the bundle client first
- bool shouldGoToBackForwardListItem = webPage->injectedBundleLoaderClient().shouldGoToBackForwardListItem(*webPage, *bundleItem, userData);
- if (!shouldGoToBackForwardListItem)
- return false;
-
- webPage->send(Messages::WebPageProxy::WillGoToBackForwardListItem(item->identifier(), bundleItem->isInPageCache(), UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
+ webPage->send(Messages::WebPageProxy::WillGoToBackForwardListItem(item.identifier(), item.isInPageCache()));
return true;
}
Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.h (237101 => 237102)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.h 2018-10-15 14:28:13 UTC (rev 237101)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.h 2018-10-15 14:29:53 UTC (rev 237102)
@@ -152,7 +152,7 @@
void updateGlobalHistory() final;
void updateGlobalHistoryRedirectLinks() final;
- bool shouldGoToHistoryItem(WebCore::HistoryItem*) const final;
+ bool shouldGoToHistoryItem(WebCore::HistoryItem&) const final;
void didDisplayInsecureContent() final;
void didRunInsecureContent(WebCore::SecurityOrigin&, const WebCore::URL&) final;
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (237101 => 237102)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2018-10-15 14:28:13 UTC (rev 237101)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2018-10-15 14:29:53 UTC (rev 237102)
@@ -1,3 +1,14 @@
+2018-10-15 Alex Christensen <[email protected]>
+
+ Remove InjectedBundle processing of back/forward lists
+ https://bugs.webkit.org/show_bug.cgi?id=190459
+
+ Reviewed by Chris Dumez.
+
+ * WebCoreSupport/WebFrameLoaderClient.h:
+ * WebCoreSupport/WebFrameLoaderClient.mm:
+ (WebFrameLoaderClient::shouldGoToHistoryItem const):
+
2018-10-14 Yusuke Suzuki <[email protected]>
[JSC] Remove Option::useAsyncIterator
Modified: trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.h (237101 => 237102)
--- trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.h 2018-10-15 14:28:13 UTC (rev 237101)
+++ trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.h 2018-10-15 14:29:53 UTC (rev 237102)
@@ -155,7 +155,7 @@
void updateGlobalHistory() final;
void updateGlobalHistoryRedirectLinks() final;
- bool shouldGoToHistoryItem(WebCore::HistoryItem*) const final;
+ bool shouldGoToHistoryItem(WebCore::HistoryItem&) const final;
void updateGlobalHistoryItemForPage() final;
void didDisplayInsecureContent() final;
Modified: trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm (237101 => 237102)
--- trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm 2018-10-15 14:28:13 UTC (rev 237101)
+++ trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm 2018-10-15 14:29:53 UTC (rev 237102)
@@ -1097,12 +1097,10 @@
}
}
-bool WebFrameLoaderClient::shouldGoToHistoryItem(HistoryItem* item) const
+bool WebFrameLoaderClient::shouldGoToHistoryItem(HistoryItem& item) const
{
WebView* view = getWebView(m_webFrame.get());
- WebHistoryItem *webItem = kit(item);
-
- return [[view _policyDelegateForwarder] webView:view shouldGoToHistoryItem:webItem];
+ return [[view _policyDelegateForwarder] webView:view shouldGoToHistoryItem:kit(&item)];
}
void WebFrameLoaderClient::updateGlobalHistoryItemForPage()
Modified: trunk/Source/WebKitLegacy/win/ChangeLog (237101 => 237102)
--- trunk/Source/WebKitLegacy/win/ChangeLog 2018-10-15 14:28:13 UTC (rev 237101)
+++ trunk/Source/WebKitLegacy/win/ChangeLog 2018-10-15 14:29:53 UTC (rev 237102)
@@ -1,3 +1,14 @@
+2018-10-15 Alex Christensen <[email protected]>
+
+ Remove InjectedBundle processing of back/forward lists
+ https://bugs.webkit.org/show_bug.cgi?id=190459
+
+ Reviewed by Chris Dumez.
+
+ * WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebFrameLoaderClient::shouldGoToHistoryItem const):
+ * WebCoreSupport/WebFrameLoaderClient.h:
+
2018-10-02 Alex Christensen <[email protected]>
Remove ParsedURLString
Modified: trunk/Source/WebKitLegacy/win/WebCoreSupport/WebFrameLoaderClient.cpp (237101 => 237102)
--- trunk/Source/WebKitLegacy/win/WebCoreSupport/WebFrameLoaderClient.cpp 2018-10-15 14:28:13 UTC (rev 237101)
+++ trunk/Source/WebKitLegacy/win/WebCoreSupport/WebFrameLoaderClient.cpp 2018-10-15 14:29:53 UTC (rev 237102)
@@ -765,7 +765,7 @@
}
}
-bool WebFrameLoaderClient::shouldGoToHistoryItem(HistoryItem*) const
+bool WebFrameLoaderClient::shouldGoToHistoryItem(HistoryItem&) const
{
return true;
}
Modified: trunk/Source/WebKitLegacy/win/WebCoreSupport/WebFrameLoaderClient.h (237101 => 237102)
--- trunk/Source/WebKitLegacy/win/WebCoreSupport/WebFrameLoaderClient.h 2018-10-15 14:28:13 UTC (rev 237101)
+++ trunk/Source/WebKitLegacy/win/WebCoreSupport/WebFrameLoaderClient.h 2018-10-15 14:29:53 UTC (rev 237102)
@@ -136,7 +136,7 @@
void updateGlobalHistory() override;
void updateGlobalHistoryRedirectLinks() override;
- bool shouldGoToHistoryItem(WebCore::HistoryItem*) const override;
+ bool shouldGoToHistoryItem(WebCore::HistoryItem&) const override;
void updateGlobalHistoryItemForPage() override;
void didDisplayInsecureContent() override;
