Changeset 206929 in webkit


Ignore:
Timestamp:
Oct 7, 2016 1:04:46 PM (8 years ago)
Author:
andersca@apple.com
Message:

Get rid of WKPageSetSession
​https://bugs.webkit.org/show_bug.cgi?id=163129

Reviewed by Tim Horton.

Source/WebKit2:

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:

Tools:

Rewrite this test to use WKPageConfigurationRef and WKWebsiteDataStoreRef.

  • TestWebKitAPI/Tests/WebKit2/EphemeralSessionPushStateNoHistoryCallback.cpp:

(TestWebKitAPI::TEST):

Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r206915 r206929  
     12016-10-07  Anders Carlsson  <andersca@apple.com>
     2
     3        Get rid of WKPageSetSession
     4        https://bugs.webkit.org/show_bug.cgi?id=163129
     5
     6        Reviewed by Tim Horton.
     7
     8        This function is no longer used.
     9
     10        * UIProcess/API/C/WKPage.cpp:
     11        (WKPageSetSession): Deleted.
     12        * UIProcess/API/C/WKPage.h:
     13        * UIProcess/WebPageProxy.cpp:
     14        (WebKit::WebPageProxy::setSessionID): Deleted.
     15        * UIProcess/WebPageProxy.h:
     16        (WebKit::WebPageProxy::sessionID):
     17        * WebProcess/WebPage/WebPage.messages.in:
     18
    1192016-10-07  Commit Queue  <commit-queue@webkit.org>
    220

  • trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp

    r206768 r206929  
    23892389}
    23902390
    2391 void WKPageSetSession(WKPageRef pageRef, WKSessionRef session)
    2392 {
    2393     toImpl(pageRef)->setSessionID(toImpl(session)->getID());
    2394 }
    2395 
    23962391void WKPageRunJavaScriptInMainFrame(WKPageRef pageRef, WKStringRef scriptRef, void* context, WKPageRunJavaScriptFunction callback)
    23972392{

  • trunk/Source/WebKit2/UIProcess/API/C/WKPage.h

    r191408 r206929  
    229229WK_EXPORT void WKPageSetPageNavigationClient(WKPageRef page, const WKPageNavigationClientBase* client);
    230230
    231 WK_EXPORT void WKPageSetSession(WKPageRef page, WKSessionRef session);
    232 
    233231typedef void (*WKPageRunJavaScriptFunction)(WKSerializedScriptValueRef, WKErrorRef, void*);
    234232WK_EXPORT void WKPageRunJavaScriptInMainFrame(WKPageRef page, WKStringRef script, void* context, WKPageRunJavaScriptFunction function);

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

    r206833 r206929  
    777777}
    778778
    779 void WebPageProxy::setSessionID(SessionID sessionID)
    780 {
    781     if (!isValid())
    782         return;
    783 
    784     m_sessionID = sessionID;
    785     m_process->send(Messages::WebPage::SetSessionID(sessionID), m_pageID);
    786 
    787     if (sessionID.isEphemeral())
    788         m_process->processPool().sendToNetworkingProcess(Messages::NetworkProcess::EnsurePrivateBrowsingSession(sessionID));
    789 }
    790 
    791779void WebPageProxy::initializeWebPage()
    792780{

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.h

    r206833 r206929  
    284284    uint64_t pageID() const { return m_pageID; }
    285285    WebCore::SessionID sessionID() const { return m_sessionID; }
    286     void setSessionID(WebCore::SessionID);
    287286
    288287    WebFrameProxy* mainFrame() const { return m_mainFrame.get(); }
    … …  
    17581757
    17591758    const uint64_t m_pageID;
    1760     WebCore::SessionID m_sessionID;
     1759    const WebCore::SessionID m_sessionID;
    17611760
    17621761    bool m_isPageSuspended;

  • trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in

    r206527 r206929  
    2525    SetViewState(unsigned viewState, bool wantsDidUpdateViewState, Vector<uint64_t> callbackIDs)
    2626    SetLayerHostingMode(enum WebKit::LayerHostingMode layerHostingMode)
    27 
    28     SetSessionID(WebCore::SessionID sessionID)
    2927
    3028    SetDrawsBackground(bool drawsBackground)

  • trunk/Tools/ChangeLog

    r206922 r206929  
     12016-10-07  Anders Carlsson  <andersca@apple.com>
     2
     3        Get rid of WKPageSetSession
     4        https://bugs.webkit.org/show_bug.cgi?id=163129
     5
     6        Reviewed by Tim Horton.
     7
     8        Rewrite this test to use WKPageConfigurationRef and WKWebsiteDataStoreRef.
     9
     10        * TestWebKitAPI/Tests/WebKit2/EphemeralSessionPushStateNoHistoryCallback.cpp:
     11        (TestWebKitAPI::TEST):
     12
    1132016-10-07  Andreas Kling  <akling@apple.com>
    214

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/EphemeralSessionPushStateNoHistoryCallback.cpp

    r177506 r206929  
    3232#include "Test.h"
    3333#include <WebKit/WKRetainPtr.h>
     34#include <WebKit/WKWebsiteDataStoreRef.h>
    3435
    3536namespace TestWebKitAPI {
    … …  
    5051TEST(WebKit2, EphemeralSessionPushStateNoHistoryCallback)
    5152{
    52     WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
     53    auto configuration = adoptWK(WKPageConfigurationCreate());
     54
     55    auto context = adoptWK(WKContextCreate());
     56    WKPageConfigurationSetContext(configuration.get(), context.get());
     57
     58    auto websiteDataStore = adoptWK(WKWebsiteDataStoreCreateNonPersistentDataStore());
     59    WKPageConfigurationSetWebsiteDataStore(configuration.get(), websiteDataStore.get());
    5360
    5461    WKContextHistoryClientV0 historyClient;
    … …  
    6067    WKContextSetHistoryClient(context.get(), &historyClient.base);
    6168
    62     PlatformWebView webView(context.get());
     69    PlatformWebView webView(configuration.get());
    6370
    6471    WKPageLoaderClientV0 pageLoaderClient;
    … …  
    6976
    7077    WKPageSetPageLoaderClient(webView.page(), &pageLoaderClient.base);
    71 
    72     WKSessionRef session = WKSessionCreate(true);
    73     WKPageSetSession(webView.page(), session);
    7478
    7579    WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("push-state", "html"));
Note: See TracChangeset for help on using the changeset viewer.