Diff
Modified: trunk/Source/WebKit2/ChangeLog (206928 => 206929)
--- trunk/Source/WebKit2/ChangeLog 2016-10-07 19:56:25 UTC (rev 206928)
+++ trunk/Source/WebKit2/ChangeLog 2016-10-07 20:04:46 UTC (rev 206929)
@@ -1,3 +1,21 @@
+2016-10-07 Anders Carlsson <[email protected]>
+
+ Get rid of WKPageSetSession
+ https://bugs.webkit.org/show_bug.cgi?id=163129
+
+ Reviewed by Tim Horton.
+
+ This function is no longer used.
+
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageSetSession): Deleted.
+ * UIProcess/API/C/WKPage.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::setSessionID): Deleted.
+ * UIProcess/WebPageProxy.h:
+ (WebKit::WebPageProxy::sessionID):
+ * WebProcess/WebPage/WebPage.messages.in:
+
2016-10-07 Commit Queue <[email protected]>
Unreviewed, rolling out r206909.
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (206928 => 206929)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2016-10-07 19:56:25 UTC (rev 206928)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2016-10-07 20:04:46 UTC (rev 206929)
@@ -2388,11 +2388,6 @@
webPageProxy->setNavigationClient(WTFMove(navigationClient));
}
-void WKPageSetSession(WKPageRef pageRef, WKSessionRef session)
-{
- toImpl(pageRef)->setSessionID(toImpl(session)->getID());
-}
-
void WKPageRunJavaScriptInMainFrame(WKPageRef pageRef, WKStringRef scriptRef, void* context, WKPageRunJavaScriptFunction callback)
{
toImpl(pageRef)->runJavaScriptInMainFrame(toImpl(scriptRef)->string(), [context, callback](API::SerializedScriptValue* returnValue, bool, const WebCore::ExceptionDetails&, CallbackBase::Error error) {
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.h (206928 => 206929)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.h 2016-10-07 19:56:25 UTC (rev 206928)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.h 2016-10-07 20:04:46 UTC (rev 206929)
@@ -228,8 +228,6 @@
WK_EXPORT void WKPageSetPagePolicyClient(WKPageRef page, const WKPagePolicyClientBase* client);
WK_EXPORT void WKPageSetPageNavigationClient(WKPageRef page, const WKPageNavigationClientBase* client);
-WK_EXPORT void WKPageSetSession(WKPageRef page, WKSessionRef session);
-
typedef void (*WKPageRunJavaScriptFunction)(WKSerializedScriptValueRef, WKErrorRef, void*);
WK_EXPORT void WKPageRunJavaScriptInMainFrame(WKPageRef page, WKStringRef script, void* context, WKPageRunJavaScriptFunction function);
#ifdef __BLOCKS__
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (206928 => 206929)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-10-07 19:56:25 UTC (rev 206928)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-10-07 20:04:46 UTC (rev 206929)
@@ -776,18 +776,6 @@
return WTFMove(navigation);
}
-void WebPageProxy::setSessionID(SessionID sessionID)
-{
- if (!isValid())
- return;
-
- m_sessionID = sessionID;
- m_process->send(Messages::WebPage::SetSessionID(sessionID), m_pageID);
-
- if (sessionID.isEphemeral())
- m_process->processPool().sendToNetworkingProcess(Messages::NetworkProcess::EnsurePrivateBrowsingSession(sessionID));
-}
-
void WebPageProxy::initializeWebPage()
{
ASSERT(isValid());
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (206928 => 206929)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2016-10-07 19:56:25 UTC (rev 206928)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2016-10-07 20:04:46 UTC (rev 206929)
@@ -283,7 +283,6 @@
uint64_t pageID() const { return m_pageID; }
WebCore::SessionID sessionID() const { return m_sessionID; }
- void setSessionID(WebCore::SessionID);
WebFrameProxy* mainFrame() const { return m_mainFrame.get(); }
WebFrameProxy* focusedFrame() const { return m_focusedFrame.get(); }
@@ -1757,7 +1756,7 @@
#endif
const uint64_t m_pageID;
- WebCore::SessionID m_sessionID;
+ const WebCore::SessionID m_sessionID;
bool m_isPageSuspended;
bool m_addsVisitedLinks;
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (206928 => 206929)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2016-10-07 19:56:25 UTC (rev 206928)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2016-10-07 20:04:46 UTC (rev 206929)
@@ -25,8 +25,6 @@
SetViewState(unsigned viewState, bool wantsDidUpdateViewState, Vector<uint64_t> callbackIDs)
SetLayerHostingMode(enum WebKit::LayerHostingMode layerHostingMode)
- SetSessionID(WebCore::SessionID sessionID)
-
SetDrawsBackground(bool drawsBackground)
#if PLATFORM(COCOA)
Modified: trunk/Tools/ChangeLog (206928 => 206929)
--- trunk/Tools/ChangeLog 2016-10-07 19:56:25 UTC (rev 206928)
+++ trunk/Tools/ChangeLog 2016-10-07 20:04:46 UTC (rev 206929)
@@ -1,3 +1,15 @@
+2016-10-07 Anders Carlsson <[email protected]>
+
+ Get rid of WKPageSetSession
+ https://bugs.webkit.org/show_bug.cgi?id=163129
+
+ Reviewed by Tim Horton.
+
+ Rewrite this test to use WKPageConfigurationRef and WKWebsiteDataStoreRef.
+
+ * TestWebKitAPI/Tests/WebKit2/EphemeralSessionPushStateNoHistoryCallback.cpp:
+ (TestWebKitAPI::TEST):
+
2016-10-07 Andreas Kling <[email protected]>
[WK2] didRemoveFrameFromHierarchy callback doesn't fire for subframes when evicting from PageCache.
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/EphemeralSessionPushStateNoHistoryCallback.cpp (206928 => 206929)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/EphemeralSessionPushStateNoHistoryCallback.cpp 2016-10-07 19:56:25 UTC (rev 206928)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/EphemeralSessionPushStateNoHistoryCallback.cpp 2016-10-07 20:04:46 UTC (rev 206929)
@@ -31,6 +31,7 @@
#include "PlatformWebView.h"
#include "Test.h"
#include <WebKit/WKRetainPtr.h>
+#include <WebKit/WKWebsiteDataStoreRef.h>
namespace TestWebKitAPI {
@@ -49,8 +50,14 @@
TEST(WebKit2, EphemeralSessionPushStateNoHistoryCallback)
{
- WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
+ auto configuration = adoptWK(WKPageConfigurationCreate());
+ auto context = adoptWK(WKContextCreate());
+ WKPageConfigurationSetContext(configuration.get(), context.get());
+
+ auto websiteDataStore = adoptWK(WKWebsiteDataStoreCreateNonPersistentDataStore());
+ WKPageConfigurationSetWebsiteDataStore(configuration.get(), websiteDataStore.get());
+
WKContextHistoryClientV0 historyClient;
memset(&historyClient, 0, sizeof(historyClient));
@@ -59,7 +66,7 @@
WKContextSetHistoryClient(context.get(), &historyClient.base);
- PlatformWebView webView(context.get());
+ PlatformWebView webView(configuration.get());
WKPageLoaderClientV0 pageLoaderClient;
memset(&pageLoaderClient, 0, sizeof(pageLoaderClient));
@@ -69,9 +76,6 @@
WKPageSetPageLoaderClient(webView.page(), &pageLoaderClient.base);
- WKSessionRef session = WKSessionCreate(true);
- WKPageSetSession(webView.page(), session);
-
WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("push-state", "html"));
WKPageLoadURL(webView.page(), url.get());
