Changeset 164669 in webkit


Ignore:
Timestamp:
Feb 25, 2014, 1:29:14 PM (11 years ago)
Author:
ap@apple.com
Message:

Rolling out ​http://trac.webkit.org/changeset/164611, because it broke
WebKit2.PrivateBrowsingPushStateNoHistoryCallback API test

The change was for:

Source/WebCore:

​https://bugs.webkit.org/show_bug.cgi?id=129141
Create SessionID class

Source/WebKit2:

​https://bugs.webkit.org/show_bug.cgi?id=129141
Create SessionID class

Location:
trunk/Source
Files:
2 deleted
42 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r164667 r164669  
     12014-02-25  Alexey Proskuryakov  <ap@apple.com>
     2
     3        Rolling out http://trac.webkit.org/changeset/164611, because it broke
     4        WebKit2.PrivateBrowsingPushStateNoHistoryCallback API test
     5
     6        The change was for:
     7
     8        https://bugs.webkit.org/show_bug.cgi?id=129141
     9        Create SessionID class
     10
    1112014-02-25  Commit Queue  <commit-queue@webkit.org>
    212

  • trunk/Source/WebCore/GNUmakefile.list.am

    r164637 r164669  
    41764176        Source/WebCore/page/SecurityPolicy.cpp \
    41774177        Source/WebCore/page/SecurityPolicy.h \
    4178         Source/WebCore/page/SessionID.h \
    41794178        Source/WebCore/page/Settings.cpp \
    41804179        Source/WebCore/page/Settings.h \

  • trunk/Source/WebCore/WebCore.exp.in

    r164652 r164669  
    10051005__ZN7WebCore4Page12setGroupNameERKN3WTF6StringE
    10061006__ZN7WebCore4Page12setIsVisibleEb
    1007 __ZN7WebCore4Page12setSessionIDENS_9SessionIDE
    10081007__ZN7WebCore4Page12setViewStateEj
    10091008__ZN7WebCore4Page13rangeOfStringERKN3WTF6StringEPNS_5RangeEj
    … …  
    17451744__ZNK7WebCore4Page9groupNameEv
    17461745__ZNK7WebCore4Page9pageCountEv
    1747 __ZNK7WebCore4Page9sessionIDEv
    17481746__ZNK7WebCore5Color10serializedEv
    17491747__ZNK7WebCore5Color7getRGBAERdS1_S1_S1_

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r164652 r164669  
    22182218                7553CFE8108F473F00EA281E /* TimelineRecordFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 7553CFE6108F473F00EA281E /* TimelineRecordFactory.h */; };
    22192219                7553CFE9108F473F00EA281E /* TimelineRecordFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7553CFE7108F473F00EA281E /* TimelineRecordFactory.cpp */; };
    2220                 756B2CE118B7101600FECFAA /* SessionID.h in Headers */ = {isa = PBXBuildFile; fileRef = 756B2CE018B7101600FECFAA /* SessionID.h */; settings = {ATTRIBUTES = (Private, ); }; };
    22212220                7578F90C11DDF26900D933C5 /* SpeechInput.h in Headers */ = {isa = PBXBuildFile; fileRef = 7578F90911DDF26900D933C5 /* SpeechInput.h */; };
    22222221                7578F90D11DDF26900D933C5 /* SpeechInputClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 7578F90A11DDF26900D933C5 /* SpeechInputClient.h */; };
    … …  
    22292228                75793ED40D0CE85B007FC0AC /* DOMMessageEvent.mm in Sources */ = {isa = PBXBuildFile; fileRef = 75793ED10D0CE85B007FC0AC /* DOMMessageEvent.mm */; };
    22302229                75793ED50D0CE85B007FC0AC /* DOMMessageEventInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 75793ED20D0CE85B007FC0AC /* DOMMessageEventInternal.h */; };
    2231                 75DCC7B818B81C8800A57128 /* SessionIDHash.h in Headers */ = {isa = PBXBuildFile; fileRef = 75DCC7B718B81C8800A57128 /* SessionIDHash.h */; settings = {ATTRIBUTES = (Private, ); }; };
    22322230                7633A72613D8B33A008501B6 /* LocaleToScriptMapping.h in Headers */ = {isa = PBXBuildFile; fileRef = 7633A72413D8B33A008501B6 /* LocaleToScriptMapping.h */; };
    22332231                7633A72713D8B33A008501B6 /* LocaleToScriptMappingDefault.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7633A72513D8B33A008501B6 /* LocaleToScriptMappingDefault.cpp */; };
    … …  
    91549152                7553CFE6108F473F00EA281E /* TimelineRecordFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TimelineRecordFactory.h; sourceTree = "<group>"; };
    91559153                7553CFE7108F473F00EA281E /* TimelineRecordFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TimelineRecordFactory.cpp; sourceTree = "<group>"; };
    9156                 756B2CE018B7101600FECFAA /* SessionID.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SessionID.h; sourceTree = "<group>"; };
    91579154                7578F90911DDF26900D933C5 /* SpeechInput.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SpeechInput.h; sourceTree = "<group>"; };
    91589155                7578F90A11DDF26900D933C5 /* SpeechInputClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SpeechInputClient.h; sourceTree = "<group>"; };
    … …  
    91679164                75793ED20D0CE85B007FC0AC /* DOMMessageEventInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMMessageEventInternal.h; sourceTree = "<group>"; };
    91689165                758978EB127090D60076D5A9 /* SpeechInputResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SpeechInputResult.h; sourceTree = "<group>"; };
    9169                 75DCC7B718B81C8800A57128 /* SessionIDHash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SessionIDHash.h; sourceTree = "<group>"; };
    91709166                7633A72413D8B33A008501B6 /* LocaleToScriptMapping.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LocaleToScriptMapping.h; sourceTree = "<group>"; };
    91719167                7633A72513D8B33A008501B6 /* LocaleToScriptMappingDefault.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LocaleToScriptMappingDefault.cpp; sourceTree = "<group>"; };
    … …  
    1617216168                                974D2DA2146A535D00D51F8B /* SecurityPolicy.cpp */,
    1617316169                                974D2DA3146A535D00D51F8B /* SecurityPolicy.h */,
    16174                                 756B2CE018B7101600FECFAA /* SessionID.h */,
    16175                                 75DCC7B718B81C8800A57128 /* SessionIDHash.h */,
    1617616170                                14C9A5E90B3D105F005A0232 /* Settings.cpp */,
    1617716171                                F587863A02DE3A1401EA4122 /* Settings.h */,
    … …  
    2271822712                                FD359190138DB22000E1EBEC /* AudioParamTimeline.h in Headers */,
    2271922713                                FD31602012B0267600C1A359 /* AudioProcessingEvent.h in Headers */,
    22720                                 75DCC7B818B81C8800A57128 /* SessionIDHash.h in Headers */,
    2272122714                                FD31608412B026F700C1A359 /* AudioProcessor.h in Headers */,
    2272222715                                FD31608612B026F700C1A359 /* AudioResampler.h in Headers */,
    … …  
    2392023913                                7A24587C1021EAF4000A00AA /* InspectorDOMAgent.h in Headers */,
    2392123914                                F3D4C47912E07663003DA150 /* InspectorDOMDebuggerAgent.h in Headers */,
    23922                                 756B2CE118B7101600FECFAA /* SessionID.h in Headers */,
    2392323915                                7A74ECBB101839A600BF939E /* InspectorDOMStorageAgent.h in Headers */,
    2392423916                                227777601345DEA9008EA455 /* InspectorForwarding.h in Headers */,

  • trunk/Source/WebCore/page/Page.cpp

    r164652 r164669  
    184184    , m_framesHandlingBeforeUnloadEvent(0)
    185185    , m_visitedLinkProvider(std::move(pageClients.visitedLinkProvider))
    186     , m_sessionID(SessionID::emptySessionID())
    187186{
    188187    ASSERT(m_editorClient);
    … …  
    14971496}
    14981497
    1499 SessionID Page::sessionID() const
    1500 {
    1501     if (m_sessionID.isValid())
    1502         return m_sessionID;
    1503 
    1504     if (settings().privateBrowsingEnabled())
    1505         return SessionID::legacyPrivateSessionID();
    1506 
    1507     return SessionID::defaultSessionID();
    1508 }
    1509 
    1510 void Page::setSessionID(SessionID sessionID)
    1511 {
    1512     ASSERT(sessionID.isValid());
    1513     m_sessionID = sessionID;
    1514 }
    1515 
    15161498VisitedLinkProvider& Page::visitedLinkProvider()
    15171499{

  • trunk/Source/WebCore/page/Page.h

    r164652 r164669  
    3232#include "PlatformScreen.h"
    3333#include "Region.h"
    34 #include "SessionID.h"
    3534#include "Supplementable.h"
    3635#include "ViewState.h"
    … …  
    405404    VisitedLinkProvider& visitedLinkProvider();
    406405
    407     SessionID sessionID() const;
    408     void setSessionID(SessionID);
    409 
    410406private:
    411407    void initGroup();
    … …  
    548544    RefPtr<UserContentController> m_userContentController;
    549545    RefPtr<VisitedLinkProvider> m_visitedLinkProvider;
    550 
    551     SessionID m_sessionID;
    552546};
    553547

  • trunk/Source/WebKit2/ChangeLog

    r164666 r164669  
     12014-02-25  Alexey Proskuryakov  <ap@apple.com>
     2
     3        Rolling out http://trac.webkit.org/changeset/164611, because it broke
     4        WebKit2.PrivateBrowsingPushStateNoHistoryCallback API test
     5
     6        The change was for:
     7
     8        https://bugs.webkit.org/show_bug.cgi?id=129141
     9        Create SessionID class
     10
    1112014-02-25  Dan Bernstein  <mitz@apple.com>
    212

  • trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp

    r164611 r164669  
    4343#include <WebCore/ResourceLoaderOptions.h>
    4444#include <WebCore/ResourceRequest.h>
    45 #include <WebCore/SessionID.h>
    4645#include <wtf/RunLoop.h>
    4746
    … …  
    150149}
    151150
    152 static NetworkStorageSession& storageSession(SessionID sessionID)
    153 {
    154     if (sessionID.isEphemeral()) {
     151static NetworkStorageSession& storageSession(uint64_t sessionID)
     152{
     153    if (SessionTracker::isEphemeralID(sessionID)) {
    155154        NetworkStorageSession* privateSession = SessionTracker::session(sessionID);
    156155        if (privateSession)
    … …  
    163162}
    164163
    165 void NetworkConnectionToWebProcess::startDownload(SessionID sessionID, uint64_t downloadID, const ResourceRequest& request)
     164void NetworkConnectionToWebProcess::startDownload(uint64_t sessionID, uint64_t downloadID, const ResourceRequest& request)
    166165{
    167166    // FIXME: Do something with the session ID.
    … …  
    185184}
    186185
    187 void NetworkConnectionToWebProcess::cookiesForDOM(SessionID sessionID, const URL& firstParty, const URL& url, String& result)
     186void NetworkConnectionToWebProcess::cookiesForDOM(uint64_t sessionID, const URL& firstParty, const URL& url, String& result)
    188187{
    189188    result = WebCore::cookiesForDOM(storageSession(sessionID), firstParty, url);
    190189}
    191190
    192 void NetworkConnectionToWebProcess::setCookiesFromDOM(SessionID sessionID, const URL& firstParty, const URL& url, const String& cookieString)
     191void NetworkConnectionToWebProcess::setCookiesFromDOM(uint64_t sessionID, const URL& firstParty, const URL& url, const String& cookieString)
    193192{
    194193    WebCore::setCookiesFromDOM(storageSession(sessionID), firstParty, url, cookieString);
    195194}
    196195
    197 void NetworkConnectionToWebProcess::cookiesEnabled(SessionID sessionID, const URL& firstParty, const URL& url, bool& result)
     196void NetworkConnectionToWebProcess::cookiesEnabled(uint64_t sessionID, const URL& firstParty, const URL& url, bool& result)
    198197{
    199198    result = WebCore::cookiesEnabled(storageSession(sessionID), firstParty, url);
    200199}
    201200
    202 void NetworkConnectionToWebProcess::cookieRequestHeaderFieldValue(SessionID sessionID, const URL& firstParty, const URL& url, String& result)
     201void NetworkConnectionToWebProcess::cookieRequestHeaderFieldValue(uint64_t sessionID, const URL& firstParty, const URL& url, String& result)
    203202{
    204203    result = WebCore::cookieRequestHeaderFieldValue(storageSession(sessionID), firstParty, url);
    205204}
    206205
    207 void NetworkConnectionToWebProcess::getRawCookies(SessionID sessionID, const URL& firstParty, const URL& url, Vector<Cookie>& result)
     206void NetworkConnectionToWebProcess::getRawCookies(uint64_t sessionID, const URL& firstParty, const URL& url, Vector<Cookie>& result)
    208207{
    209208    WebCore::getRawCookies(storageSession(sessionID), firstParty, url, result);
    210209}
    211210
    212 void NetworkConnectionToWebProcess::deleteCookie(SessionID sessionID, const URL& url, const String& cookieName)
     211void NetworkConnectionToWebProcess::deleteCookie(uint64_t sessionID, const URL& url, const String& cookieName)
    213212{
    214213    WebCore::deleteCookie(storageSession(sessionID), url, cookieName);

  • trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h

    r164611 r164669  
    7777    void servePendingRequests(uint32_t resourceLoadPriority);
    7878    void setSerialLoadingEnabled(bool);
    79     void startDownload(WebCore::SessionID, uint64_t downloadID, const WebCore::ResourceRequest&);
     79    void startDownload(uint64_t sessionID, uint64_t downloadID, const WebCore::ResourceRequest&);
    8080    void convertMainResourceLoadToDownload(uint64_t mainResourceLoadIdentifier, uint64_t downloadID, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&);
    8181
    82     void cookiesForDOM(WebCore::SessionID, const WebCore::URL& firstParty, const WebCore::URL&, String& result);
    83     void setCookiesFromDOM(WebCore::SessionID, const WebCore::URL& firstParty, const WebCore::URL&, const String&);
    84     void cookiesEnabled(WebCore::SessionID, const WebCore::URL& firstParty, const WebCore::URL&, bool& result);
    85     void cookieRequestHeaderFieldValue(WebCore::SessionID, const WebCore::URL& firstParty, const WebCore::URL&, String& result);
    86     void getRawCookies(WebCore::SessionID, const WebCore::URL& firstParty, const WebCore::URL&, Vector<WebCore::Cookie>&);
    87     void deleteCookie(WebCore::SessionID, const WebCore::URL&, const String& cookieName);
     82    void cookiesForDOM(uint64_t sessionID, const WebCore::URL& firstParty, const WebCore::URL&, String& result);
     83    void setCookiesFromDOM(uint64_t sessionID, const WebCore::URL& firstParty, const WebCore::URL&, const String&);
     84    void cookiesEnabled(uint64_t sessionID, const WebCore::URL& firstParty, const WebCore::URL&, bool& result);
     85    void cookieRequestHeaderFieldValue(uint64_t sessionID, const WebCore::URL& firstParty, const WebCore::URL&, String& result);
     86    void getRawCookies(uint64_t sessionID, const WebCore::URL& firstParty, const WebCore::URL&, Vector<WebCore::Cookie>&);
     87    void deleteCookie(uint64_t sessionID, const WebCore::URL&, const String& cookieName);
    8888
    8989    void registerBlobURL(const WebCore::URL&, const BlobRegistrationData&);

  • trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.messages.in

    r164611 r164669  
    3333    SetSerialLoadingEnabled(bool enabled) -> ()
    3434
    35     StartDownload(WebCore::SessionID sessionID, uint64_t downloadID, WebCore::ResourceRequest request)
     35    StartDownload(uint64_t sessionID, uint64_t downloadID, WebCore::ResourceRequest request)
    3636    ConvertMainResourceLoadToDownload(uint64_t mainResourceLoadIdentifier, uint64_t downloadID, WebCore::ResourceRequest request, WebCore::ResourceResponse response)
    3737
    38     CookiesForDOM(WebCore::SessionID sessionID, WebCore::URL firstParty, WebCore::URL url) -> (String result)
    39     SetCookiesFromDOM(WebCore::SessionID sessionID, WebCore::URL firstParty, WebCore::URL url, String cookieString)
    40     CookiesEnabled(WebCore::SessionID sessionID, WebCore::URL firstParty, WebCore::URL url) -> (bool enabled)
    41     CookieRequestHeaderFieldValue(WebCore::SessionID sessionID, WebCore::URL firstParty, WebCore::URL url) -> (String result)
    42     GetRawCookies(WebCore::SessionID sessionID, WebCore::URL firstParty, WebCore::URL url) -> (Vector<WebCore::Cookie> cookies)
    43     DeleteCookie(WebCore::SessionID sessionID, WebCore::URL url, String cookieName)
     38    CookiesForDOM(uint64_t sessionID, WebCore::URL firstParty, WebCore::URL url) -> (String result)
     39    SetCookiesFromDOM(uint64_t sessionID, WebCore::URL firstParty, WebCore::URL url, String cookieString)
     40    CookiesEnabled(uint64_t sessionID, WebCore::URL firstParty, WebCore::URL url) -> (bool enabled)
     41    CookieRequestHeaderFieldValue(uint64_t sessionID, WebCore::URL firstParty, WebCore::URL url) -> (String result)
     42    GetRawCookies(uint64_t sessionID, WebCore::URL firstParty, WebCore::URL url) -> (Vector<WebCore::Cookie> cookies)
     43    DeleteCookie(uint64_t sessionID, WebCore::URL url, String cookieName)
    4444
    4545    RegisterBlobURL(WebCore::URL url, WebKit::BlobRegistrationData data)

  • trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp

    r164611 r164669  
    4646#include <WebCore/Logging.h>
    4747#include <WebCore/ResourceRequest.h>
    48 #include <WebCore/SessionID.h>
    4948#include <wtf/RunLoop.h>
    5049#include <wtf/text/CString.h>
    … …  
    165164    // FIXME: instead of handling this here, a message should be sent later (scales to multiple sessions)
    166165    if (parameters.privateBrowsingEnabled)
    167         RemoteNetworkingContext::ensurePrivateBrowsingSession(SessionID::legacyPrivateSessionID());
     166        RemoteNetworkingContext::ensurePrivateBrowsingSession(SessionTracker::legacyPrivateSessionID);
    168167
    169168    if (parameters.shouldUseTestingNetworkSession)
    … …  
    216215}
    217216
    218 void NetworkProcess::ensurePrivateBrowsingSession(SessionID sessionID)
     217void NetworkProcess::ensurePrivateBrowsingSession(uint64_t sessionID)
    219218{
    220219    RemoteNetworkingContext::ensurePrivateBrowsingSession(sessionID);
    221220}
    222221
    223 void NetworkProcess::destroyPrivateBrowsingSession(SessionID sessionID)
     222void NetworkProcess::destroyPrivateBrowsingSession(uint64_t sessionID)
    224223{
    225224    SessionTracker::destroySession(sessionID);

  • trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h

    r164611 r164669  
    3434#include "MessageReceiverMap.h"
    3535#include "NetworkResourceLoadScheduler.h"
    36 #include <WebCore/SessionID.h>
    3736#include <wtf/Forward.h>
    3837#include <wtf/NeverDestroyed.h>
    … …  
    106105    void initializeNetworkProcess(const NetworkProcessCreationParameters&);
    107106    void createNetworkConnectionToWebProcess();
    108     void ensurePrivateBrowsingSession(WebCore::SessionID);
    109     void destroyPrivateBrowsingSession(WebCore::SessionID);
     107    void ensurePrivateBrowsingSession(uint64_t sessionID);
     108    void destroyPrivateBrowsingSession(uint64_t sessionID);
    110109    void downloadRequest(uint64_t downloadID, const WebCore::ResourceRequest&);
    111110    void cancelDownload(uint64_t downloadID);

  • trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in

    r164611 r164669  
    3535#endif
    3636
    37     EnsurePrivateBrowsingSession(WebCore::SessionID sessionID)
    38     DestroyPrivateBrowsingSession(WebCore::SessionID sessionID)
     37    EnsurePrivateBrowsingSession(uint64_t sessionID)
     38    DestroyPrivateBrowsingSession(uint64_t sessionID)
    3939
    4040    DownloadRequest(uint64_t downloadID, WebCore::ResourceRequest request)

  • trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h

    r164611 r164669  
    3636#include <WebCore/ResourceLoaderOptions.h>
    3737#include <WebCore/ResourceRequest.h>
    38 #include <WebCore/SessionID.h>
    3938#include <wtf/MainThread.h>
    4039#include <wtf/RunLoop.h>
    … …  
    175174    uint64_t m_webPageID;
    176175    uint64_t m_webFrameID;
    177     WebCore::SessionID m_sessionID;
     176    uint64_t m_sessionID;
    178177    WebCore::ResourceRequest m_request;
    179178    WebCore::ResourceLoadPriority m_priority;

  • trunk/Source/WebKit2/NetworkProcess/RemoteNetworkingContext.h

    r164611 r164669  
    2929
    3030#include <WebCore/NetworkingContext.h>
    31 #include <WebCore/SessionID.h>
    3231
    3332namespace WebKit {
    … …  
    3534class RemoteNetworkingContext final : public WebCore::NetworkingContext {
    3635public:
    37     static PassRefPtr<RemoteNetworkingContext> create(WebCore::SessionID sessionID, bool shouldClearReferrerOnHTTPSToHTTPRedirect)
     36    static PassRefPtr<RemoteNetworkingContext> create(uint64_t sessionID, bool shouldClearReferrerOnHTTPSToHTTPRedirect)
    3837    {
    3938        return adoptRef(new RemoteNetworkingContext(sessionID, shouldClearReferrerOnHTTPSToHTTPRedirect));
    … …  
    4241
    4342    // FIXME: Remove platform-specific code and use SessionTracker.
    44     static void ensurePrivateBrowsingSession(WebCore::SessionID);
     43    static void ensurePrivateBrowsingSession(uint64_t sessionID);
    4544
    4645    virtual bool shouldClearReferrerOnHTTPSToHTTPRedirect() const override { return m_shouldClearReferrerOnHTTPSToHTTPRedirect; }
    4746
    4847private:
    49     RemoteNetworkingContext(WebCore::SessionID sessionID, bool shouldClearReferrerOnHTTPSToHTTPRedirect)
     48    RemoteNetworkingContext(uint64_t sessionID, bool shouldClearReferrerOnHTTPSToHTTPRedirect)
    5049        : m_sessionID(sessionID)
    5150        , m_shouldClearReferrerOnHTTPSToHTTPRedirect(shouldClearReferrerOnHTTPSToHTTPRedirect)
    … …  
    6867#endif
    6968
    70     WebCore::SessionID m_sessionID;
     69    uint64_t m_sessionID;
    7170    bool m_shouldClearReferrerOnHTTPSToHTTPRedirect;
    7271

  • trunk/Source/WebKit2/NetworkProcess/mac/RemoteNetworkingContext.mm

    r164611 r164669  
    7878}
    7979
    80 void RemoteNetworkingContext::ensurePrivateBrowsingSession(SessionID sessionID)
     80void RemoteNetworkingContext::ensurePrivateBrowsingSession(uint64_t sessionID)
    8181{
    82     ASSERT(sessionID.isEphemeral());
     82    ASSERT(SessionTracker::isEphemeralID(sessionID));
    8383
    8484    if (SessionTracker::session(sessionID))
    … …  
    8686
    8787    ASSERT(!SessionTracker::getIdentifierBase().isNull());
    88     SessionTracker::setSession(sessionID, NetworkStorageSession::createPrivateBrowsingSession(SessionTracker::getIdentifierBase() + '.' + String::number(sessionID.sessionID())));
     88    SessionTracker::setSession(sessionID, NetworkStorageSession::createPrivateBrowsingSession(SessionTracker::getIdentifierBase() + '.' + String::number(sessionID)));
    8989}
    9090

  • trunk/Source/WebKit2/NetworkProcess/soup/RemoteNetworkingContextSoup.cpp

    r164611 r164669  
    4747}
    4848
    49 void RemoteNetworkingContext::ensurePrivateBrowsingSession(SessionID sessionID)
     49void RemoteNetworkingContext::ensurePrivateBrowsingSession(uint64_t sessionID)
    5050{
    5151    notImplemented();

  • trunk/Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.cpp

    r164611 r164669  
    4242    , webPageID(0)
    4343    , webFrameID(0)
    44     , sessionID(SessionID::emptySessionID())
     44    , sessionID(0)
    4545    , priority(ResourceLoadPriorityVeryLow)
    4646    , contentSniffingPolicy(SniffContent)

  • trunk/Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.h

    r164611 r164669  
    3131#include <WebCore/ResourceLoaderOptions.h>
    3232#include <WebCore/ResourceRequest.h>
    33 #include <WebCore/SessionID.h>
    3433
    3534#if ENABLE(NETWORK_PROCESS)
    … …  
    5453    uint64_t webPageID;
    5554    uint64_t webFrameID;
    56     WebCore::SessionID sessionID;
     55    uint64_t sessionID;
    5756    WebCore::ResourceRequest request;
    5857    SandboxExtension::HandleArray requestBodySandboxExtensions; // Created automatically for the sender.

  • trunk/Source/WebKit2/Shared/SessionTracker.cpp

    r164611 r164669  
    3434namespace WebKit {
    3535
    36 static HashMap<SessionID, std::unique_ptr<NetworkStorageSession>>& staticSessionMap()
     36const uint64_t SessionTracker::defaultSessionID;
     37const uint64_t SessionTracker::legacyPrivateSessionID;
     38
     39static HashMap<uint64_t, std::unique_ptr<NetworkStorageSession>>& staticSessionMap()
    3740{
    3841    ASSERT(RunLoop::isMain());
    3942
    40     static NeverDestroyed<HashMap<SessionID, std::unique_ptr<NetworkStorageSession>>> map;
     43    static NeverDestroyed<HashMap<uint64_t, std::unique_ptr<NetworkStorageSession>>> map;
    4144    return map.get();
    4245}
    4346
    44 static HashMap<const NetworkStorageSession*, SessionID>& storageSessionToID()
     47static HashMap<const NetworkStorageSession*, uint64_t>& storageSessionToID()
    4548{
    4649    ASSERT(RunLoop::isMain());
    4750
    48     static NeverDestroyed<HashMap<const NetworkStorageSession*, SessionID>> map;
     51    static NeverDestroyed<HashMap<const NetworkStorageSession*, uint64_t>> map;
    4952    return map.get();
    5053}
    … …  
    5861}
    5962
    60 const HashMap<SessionID, std::unique_ptr<NetworkStorageSession>>& SessionTracker::sessionMap()
     63const HashMap<uint64_t, std::unique_ptr<NetworkStorageSession>>& SessionTracker::sessionMap()
    6164{
    6265    return staticSessionMap();
    … …  
    6871}
    6972
    70 NetworkStorageSession* SessionTracker::session(SessionID sessionID)
     73NetworkStorageSession* SessionTracker::session(uint64_t sessionID)
    7174{
    72     if (sessionID == SessionID::defaultSessionID())
     75    if (sessionID == defaultSessionID)
    7376        return &NetworkStorageSession::defaultStorageSession();
    7477    return staticSessionMap().get(sessionID);
    7578}
    7679
    77 SessionID SessionTracker::sessionID(const NetworkStorageSession& session)
     80uint64_t SessionTracker::sessionID(const NetworkStorageSession& session)
    7881{
    7982    if (&session == &NetworkStorageSession::defaultStorageSession())
    80         return SessionID::defaultSessionID();
     83        return defaultSessionID;
    8184    return storageSessionToID().get(&session);
    8285}
    8386
    84 void SessionTracker::setSession(SessionID sessionID, std::unique_ptr<NetworkStorageSession> session)
     87void SessionTracker::setSession(uint64_t sessionID, std::unique_ptr<NetworkStorageSession> session)
    8588{
    86     ASSERT(sessionID != SessionID::defaultSessionID());
     89    ASSERT(sessionID != defaultSessionID);
    8790    storageSessionToID().set(session.get(), sessionID);
    8891    staticSessionMap().set(sessionID, std::move(session));
    8992}
    9093
    91 void SessionTracker::destroySession(SessionID sessionID)
     94void SessionTracker::destroySession(uint64_t sessionID)
    9295{
    9396    ASSERT(RunLoop::isMain());

  • trunk/Source/WebKit2/Shared/SessionTracker.h

    r164611 r164669  
    2828
    2929#include <WebCore/NetworkStorageSession.h>
    30 #include <WebCore/SessionIDHash.h>
    3130#include <wtf/HashMap.h>
    3231#include <wtf/Noncopyable.h>
    … …  
    3837    WTF_MAKE_NONCOPYABLE(SessionTracker);
    3938public:
     39    static const uint64_t defaultSessionID = 1;
     40    static const uint64_t legacyPrivateSessionID = 2;
     41    static bool isEphemeralID(uint64_t sessionID) { return sessionID != SessionTracker::defaultSessionID; }
    4042    // FIXME: sessionMap()'s returned map does not include default session.
    41     static const HashMap<WebCore::SessionID, std::unique_ptr<WebCore::NetworkStorageSession>>& sessionMap();
     43    static const HashMap<uint64_t, std::unique_ptr<WebCore::NetworkStorageSession>>& sessionMap();
    4244    static const String& getIdentifierBase();
    43     static WebCore::NetworkStorageSession* session(WebCore::SessionID);
    44     static WebCore::SessionID sessionID(const WebCore::NetworkStorageSession&);
    45     static void setSession(WebCore::SessionID, std::unique_ptr<WebCore::NetworkStorageSession>);
    46     static void destroySession(WebCore::SessionID);
     45    static WebCore::NetworkStorageSession* session(uint64_t sessionID);
     46    static uint64_t sessionID(const WebCore::NetworkStorageSession&);
     47    static void setSession(uint64_t sessionID, std::unique_ptr<WebCore::NetworkStorageSession>);
     48    static void destroySession(uint64_t sessionID);
    4749    static void setIdentifierBase(const String&);
    4850};

  • trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp

    r164611 r164669  
    5858#include <WebCore/ScrollingConstraints.h>
    5959#include <WebCore/ScrollingCoordinator.h>
    60 #include <WebCore/SessionID.h>
    6160#include <WebCore/TextCheckerClient.h>
    6261#include <WebCore/TransformationMatrix.h>
    … …  
    18821881    return true;
    18831882}
    1884 
    1885 #endif // ENABLE(INDEXED_DATABASE)
    1886 
    1887 void ArgumentCoder<SessionID>::encode(ArgumentEncoder& encoder, const SessionID& sessionID)
    1888 {
    1889     encoder << sessionID.sessionID();
    1890 }
    1891 
    1892 bool ArgumentCoder<SessionID>::decode(ArgumentDecoder& decoder, SessionID& sessionID)
    1893 {
    1894     uint64_t session;
    1895     if (!decoder.decode(session))
    1896         return false;
    1897 
    1898     sessionID = SessionID(session);
    1899 
    1900     return true;
    1901 }
     1883#endif
    19021884
    19031885} // namespace IPC

  • trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h

    r164611 r164669  
    5656class ResourceRequest;
    5757class ResourceResponse;
    58 class SessionID;
    5958class StickyPositionViewportConstraints;
    6059class TextCheckingRequestData;
    … …  
    399398    static bool decode(ArgumentDecoder&, WebCore::IDBObjectStoreMetadata&);
    400399};
    401 
    402 #endif // ENABLE(INDEXED_DATABASE)
    403 
    404 template<> struct ArgumentCoder<WebCore::SessionID> {
    405     static void encode(ArgumentEncoder&, const WebCore::SessionID&);
    406     static bool decode(ArgumentDecoder&, WebCore::SessionID&);
    407 };
     400#endif
    408401
    409402} // namespace IPC

  • trunk/Source/WebKit2/Shared/mac/CookieStorageShim.mm

    r164611 r164669  
    3232#include "NetworkConnectionToWebProcess.h"
    3333#include "NetworkProcessConnection.h"
    34 #include <WebCore/SessionID.h>
     34#include "SessionTracker.h"
    3535#include "WebCoreArgumentCoders.h"
    3636#include "WebProcess.h"
    … …  
    5959    String cookies;
    6060    URL firstPartyForCookiesURL;
    61     if (!WebProcess::shared().networkConnection()->connection()->sendSync(Messages::NetworkConnectionToWebProcess::CookieRequestHeaderFieldValue(SessionID::defaultSessionID(), firstPartyForCookiesURL, inRequestURL), Messages::NetworkConnectionToWebProcess::CookiesForDOM::Reply(cookies), 0))
     61    if (!WebProcess::shared().networkConnection()->connection()->sendSync(Messages::NetworkConnectionToWebProcess::CookieRequestHeaderFieldValue(SessionTracker::defaultSessionID, firstPartyForCookiesURL, inRequestURL), Messages::NetworkConnectionToWebProcess::CookiesForDOM::Reply(cookies), 0))
    6262        return 0;
    6363

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

    r164611 r164669  
    3535    ASSERT(RunLoop::isMain());
    3636
    37     static uint64_t uniqueSessionID = WebCore::SessionID::legacyPrivateSessionID().sessionID();
     37    static uint64_t uniqueSessionID = WebKit::SessionTracker::legacyPrivateSessionID;
    3838    ASSERT(isEphemeral);
    3939    return ++uniqueSessionID;
    … …  
    4444    ASSERT(RunLoop::isMain());
    4545
    46     static Session* defaultSession = new Session(WebCore::SessionID::defaultSessionID());
     46    static Session* defaultSession = new Session(false, WebKit::SessionTracker::defaultSessionID);
    4747    return *defaultSession;
    4848}
    … …  
    5252    ASSERT(RunLoop::isMain());
    5353
    54     static Session* legacyPrivateSession = new Session(WebCore::SessionID::legacyPrivateSessionID());
     54    static Session* legacyPrivateSession = new Session(true, WebKit::SessionTracker::legacyPrivateSessionID);
    5555    return *legacyPrivateSession;
    5656}
    5757
    5858Session::Session(bool isEphemeral)
    59     : m_sessionID(generateID(isEphemeral))
     59    : m_isEphemeral(isEphemeral)
     60    , m_sessionID(generateID(isEphemeral))
    6061{
    6162}
    6263
    63 Session::Session(WebCore::SessionID sessionID)
    64     : m_sessionID(sessionID)
     64Session::Session(bool isEphemeral, uint64_t sessionID)
     65    : m_isEphemeral(isEphemeral)
     66    , m_sessionID(sessionID)
    6567{
    6668}
    … …  
    7476bool Session::isEphemeral() const
    7577{
    76     return m_sessionID.isEphemeral();
     78    return m_isEphemeral;
    7779}
    7880
    79 WebCore::SessionID Session::getID() const
     81uint64_t Session::getID() const
    8082{
    8183    return m_sessionID;

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

    r164611 r164669  
    2828
    2929#include "APIObject.h"
    30 #include <WebCore/SessionID.h>
     30#include "SessionTracker.h"
    3131#include <wtf/PassRefPtr.h>
    3232
    … …  
    4040    static Session& legacyPrivateSession();
    4141    bool isEphemeral() const;
    42     WebCore::SessionID getID() const;
     42    uint64_t getID() const;
    4343    virtual ~Session();
    4444
    4545private:
    4646    explicit Session(bool isEphemeral);
    47     explicit Session(WebCore::SessionID);
    48     WebCore::SessionID m_sessionID;
     47    Session(bool isEphemeral, uint64_t sessionID);
     48    bool m_isEphemeral;
     49    uint64_t m_sessionID;
    4950};
    5051

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

    r164611 r164669  
    3434#include "MutableDictionary.h"
    3535#include "SandboxExtension.h"
     36#include "SessionTracker.h"
    3637#include "StatisticsData.h"
    3738#include "TextChecker.h"
    … …  
    6364#include <WebCore/Logging.h>
    6465#include <WebCore/ResourceRequest.h>
    65 #include <WebCore/SessionID.h>
    6666#include <runtime/JSCInlines.h>
    6767#include <wtf/CurrentTime.h>
    … …  
    487487    if (usesNetworkProcess() && networkProcess()) {
    488488        if (privateBrowsingEnabled)
    489             networkProcess()->send(Messages::NetworkProcess::EnsurePrivateBrowsingSession(SessionID::legacyPrivateSessionID()), 0);
     489            networkProcess()->send(Messages::NetworkProcess::EnsurePrivateBrowsingSession(SessionTracker::legacyPrivateSessionID), 0);
    490490        else
    491             networkProcess()->send(Messages::NetworkProcess::DestroyPrivateBrowsingSession(SessionID::legacyPrivateSessionID()), 0);
     491            networkProcess()->send(Messages::NetworkProcess::DestroyPrivateBrowsingSession(SessionTracker::legacyPrivateSessionID), 0);
    492492    }
    493493#endif // ENABLED(NETWORK_PROCESS)
    494494
    495495    if (privateBrowsingEnabled)
    496         sendToAllProcesses(Messages::WebProcess::EnsurePrivateBrowsingSession(SessionID::legacyPrivateSessionID()));
     496        sendToAllProcesses(Messages::WebProcess::EnsurePrivateBrowsingSession(SessionTracker::legacyPrivateSessionID));
    497497    else
    498         sendToAllProcesses(Messages::WebProcess::DestroyPrivateBrowsingSession(SessionID::legacyPrivateSessionID()));
     498        sendToAllProcesses(Messages::WebProcess::DestroyPrivateBrowsingSession(SessionTracker::legacyPrivateSessionID));
    499499}
    500500
    … …  
    626626
    627627    if (WebPreferences::anyPagesAreUsingPrivateBrowsing())
    628         process->send(Messages::WebProcess::EnsurePrivateBrowsingSession(SessionID::legacyPrivateSessionID()), 0);
     628        process->send(Messages::WebProcess::EnsurePrivateBrowsingSession(SessionTracker::legacyPrivateSessionID), 0);
    629629
    630630    m_processes.append(process);

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

    r164611 r164669  
    4545#include "WebProcessProxy.h"
    4646#include <WebCore/LinkHash.h>
    47 #include <WebCore/SessionID.h>
    4847#include <wtf/Forward.h>
    4948#include <wtf/HashMap.h>
    … …  
    308307    static void willStopUsingPrivateBrowsing();
    309308
    310     static bool isEphemeralSession(WebCore::SessionID);
     309    static bool isEphemeralSession(uint64_t sessionID);
    311310
    312311#if USE(SOUP)

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

    r164611 r164669  
    338338
    339339    uint64_t pageID() const { return m_pageID; }
    340     WebCore::SessionID sessionID() const { return m_session->getID(); }
     340    uint64_t sessionID() const { return m_session->getID(); }
    341341
    342342    WebFrameProxy* mainFrame() const { return m_mainFrame.get(); }

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp

    r164611 r164669  
    6868#include <WebCore/SecurityOrigin.h>
    6969#include <WebCore/SecurityPolicy.h>
    70 #include <WebCore/SessionID.h>
    7170#include <WebCore/Settings.h>
    7271#include <WebCore/UserGestureIndicator.h>
    … …  
    310309#if PLATFORM(COCOA) || USE(CFNETWORK) || USE(SOUP)
    311310    if (enabled)
    312         WebFrameNetworkingContext::ensurePrivateBrowsingSession(SessionID::legacyPrivateSessionID());
     311        WebFrameNetworkingContext::ensurePrivateBrowsingSession(SessionTracker::legacyPrivateSessionID);
    313312    else
    314         SessionTracker::destroySession(SessionID::legacyPrivateSessionID());
     313        SessionTracker::destroySession(SessionTracker::legacyPrivateSessionID);
    315314#endif
    316315    const HashSet<Page*>& pages = PageGroup::pageGroup(pageGroup->identifier())->pages();

  • trunk/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp

    r164611 r164669  
    4848#include <WebCore/ResourceBuffer.h>
    4949#include <WebCore/ResourceLoader.h>
    50 #include <WebCore/SessionID.h>
    5150#include <WebCore/Settings.h>
    5251#include <WebCore/SubresourceLoader.h>
    … …  
    120119    loadParameters.webPageID = webPage ? webPage->pageID() : 0;
    121120    loadParameters.webFrameID = webFrame ? webFrame->frameID() : 0;
    122     loadParameters.sessionID = webPage ? webPage->sessionID() : SessionID::defaultSessionID();
     121    loadParameters.sessionID = webPage ? webPage->sessionID() : SessionTracker::defaultSessionID;
    123122    loadParameters.request = resourceLoader->request();
    124123    loadParameters.priority = priority;

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp

    r164611 r164669  
    5555#include <WebCore/PlatformPasteboard.h>
    5656#include <WebCore/ResourceError.h>
    57 #include <WebCore/SessionID.h>
    5857#include <WebCore/StorageNamespace.h>
    5958#include <WebCore/SubframeLoader.h>
    … …  
    265264    loadParameters.webPageID = webPage ? webPage->pageID() : 0;
    266265    loadParameters.webFrameID = webFrame ? webFrame->frameID() : 0;
    267     loadParameters.sessionID = webPage ? webPage->sessionID() : SessionID::defaultSessionID();
     266    loadParameters.sessionID = webPage ? webPage->sessionID() : SessionTracker::defaultSessionID;
    268267    loadParameters.request = request;
    269268    loadParameters.priority = ResourceLoadPriorityHighest;

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.h

    r164611 r164669  
    3030#include "WebFrame.h"
    3131#include <WebCore/FrameNetworkingContext.h>
    32 #include <WebCore/SessionID.h>
    3332
    3433namespace WebKit {
    … …  
    4241
    4342    // FIXME: remove platform-specific code and use SessionTracker
    44     static void ensurePrivateBrowsingSession(WebCore::SessionID);
     43    static void ensurePrivateBrowsingSession(uint64_t sessionID);
    4544
    4645    static void setCookieAcceptPolicyForAllContexts(HTTPCookieAcceptPolicy);

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm

    r164611 r164669  
    4343namespace WebKit {
    4444   
    45 void WebFrameNetworkingContext::ensurePrivateBrowsingSession(SessionID sessionID)
     45void WebFrameNetworkingContext::ensurePrivateBrowsingSession(uint64_t sessionID)
    4646{
    47     ASSERT(sessionID.isEphemeral());
     47    ASSERT(SessionTracker::isEphemeralID(sessionID));
    4848
    4949    if (SessionTracker::session(sessionID))
    … …  
    5656        base = SessionTracker::getIdentifierBase();
    5757
    58     SessionTracker::setSession(sessionID, NetworkStorageSession::createPrivateBrowsingSession(base + '.' + String::number(sessionID.sessionID())));
     58    SessionTracker::setSession(sessionID, NetworkStorageSession::createPrivateBrowsingSession(base + '.' + String::number(sessionID)));
    5959}
    6060
    … …  
    102102{
    103103    ASSERT(RunLoop::isMain());
    104     return *SessionTracker::session(frame() ? frame()->page()->sessionID() : SessionID::defaultSessionID());
     104
     105    if (frame())
     106        return *SessionTracker::session(webFrameLoaderClient()->webFrame()->page()->sessionID());
     107    return NetworkStorageSession::defaultStorageSession();
    105108}
    106109

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.cpp

    r164611 r164669  
    3131#include "WebFrame.h"
    3232#include "WebPage.h"
    33 #include <WebCore/SessionID.h>
    3433#include <WebCore/Settings.h>
    3534#include <wtf/NeverDestroyed.h>
    … …  
    3938namespace WebKit {
    4039
    41 void WebFrameNetworkingContext::ensurePrivateBrowsingSession(SessionID sessionID)
     40void WebFrameNetworkingContext::ensurePrivateBrowsingSession(uint64_t sessionID)
    4241{
    4342    ASSERT(isMainThread());
    … …  
    4645        return;
    4746
    48     SessionTracker::setSession(sessionID, NetworkStorageSession::createPrivateBrowsingSession(String::number(sessionID.sessionID())));
     47    SessionTracker::setSession(sessionID, NetworkStorageSession::createPrivateBrowsingSession(String::number(sessionID)));
    4948}
    5049
    … …  
    5756{
    5857    if (frame() && frame()->settings().privateBrowsingEnabled())
    59         return *SessionTracker::session(SessionID::legacyPrivateSessionID());
     58        return *SessionTracker::session(SessionTracker::legacyPrivateSessionID);
    6059
    6160    return NetworkStorageSession::defaultStorageSession();

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.h

    r164611 r164669  
    3030
    3131#include <WebCore/FrameNetworkingContext.h>
    32 #include <WebCore/SessionID.h>
    3332
    3433namespace WebKit {
    … …  
    4443    }
    4544
    46     static void ensurePrivateBrowsingSession(WebCore::SessionID);
     45    static void ensurePrivateBrowsingSession(uint64_t sessionID);
    4746
    4847    WebFrameLoaderClient* webFrameLoaderClient() const;

  • trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

    r164659 r164669  
    135135#include <WebCore/ScriptController.h>
    136136#include <WebCore/SerializedScriptValue.h>
    137 #include <WebCore/SessionID.h>
    138137#include <WebCore/Settings.h>
    139138#include <WebCore/ShadowRoot.h>
    … …  
    230229WebPage::WebPage(uint64_t pageID, const WebPageCreationParameters& parameters)
    231230    : m_pageID(pageID)
     231    , m_sessionID(0)
    232232    , m_viewSize(parameters.viewSize)
    233233    , m_hasSeenPlugin(false)
    … …  
    21112111}
    21122112
    2113 SessionID WebPage::sessionID() const
    2114 {
    2115     if (m_page->sessionID().isValid())
    2116         return m_page->sessionID();
    2117 
    2118     return m_page->settings().privateBrowsingEnabled() ? SessionID::legacyPrivateSessionID() : SessionID::defaultSessionID();
     2113uint64_t WebPage::sessionID() const
     2114{
     2115    if (m_sessionID)
     2116        return m_sessionID;
     2117
     2118    return m_page->settings().privateBrowsingEnabled() ? SessionTracker::legacyPrivateSessionID : SessionTracker::defaultSessionID;
    21192119}
    21202120
    21212121bool WebPage::isUsingEphemeralSession() const
    21222122{
    2123     return sessionID().isEphemeral();
    2124 }
    2125 
    2126 void WebPage::setSessionID(SessionID sessionID)
    2127 {
    2128     m_page->setSessionID(sessionID);
    2129     if (sessionID.isEphemeral())
     2123    return SessionTracker::isEphemeralID(sessionID());
     2124}
     2125
     2126void WebPage::setSessionID(uint64_t sessionID)
     2127{
     2128    m_sessionID = sessionID;
     2129    if (SessionTracker::isEphemeralID(sessionID))
    21302130        WebProcess::shared().ensurePrivateBrowsingSession(sessionID);
    21312131}
    … …  
    24332433    settings.setXSSAuditorEnabled(store.getBoolValueForKey(WebPreferencesKey::xssAuditorEnabledKey()));
    24342434    settings.setFrameFlatteningEnabled(store.getBoolValueForKey(WebPreferencesKey::frameFlatteningEnabledKey()));
    2435     if (m_page->sessionID().isValid())
    2436         settings.setPrivateBrowsingEnabled(m_page->sessionID().isEphemeral());
     2435    if (m_sessionID)
     2436        settings.setPrivateBrowsingEnabled(SessionTracker::isEphemeralID(m_sessionID));
    24372437    else
    24382438        settings.setPrivateBrowsingEnabled(store.getBoolValueForKey(WebPreferencesKey::privateBrowsingEnabledKey()));

  • trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h

    r164617 r164669  
    191191    WebCore::Page* corePage() const { return m_page.get(); }
    192192    uint64_t pageID() const { return m_pageID; }
    193     WebCore::SessionID sessionID() const;
     193    uint64_t sessionID() const;
    194194    bool isUsingEphemeralSession() const;
    195     void setSessionID(WebCore::SessionID);
     195    void setSessionID(uint64_t);
    196196
    197197    void setSize(const WebCore::IntSize&);
    … …  
    917917
    918918    uint64_t m_pageID;
     919    uint64_t m_sessionID;
    919920
    920921    OwnPtr<WebCore::Page> m_page;

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

    r164611 r164669  
    2626    SetLayerHostingMode(unsigned layerHostingMode)
    2727
    28     SetSessionID(WebCore::SessionID sessionID)
     28    SetSessionID(uint64_t sessionID)
    2929
    3030    SetDrawsBackground(bool drawsBackground)

  • trunk/Source/WebKit2/WebProcess/WebProcess.cpp

    r164611 r164669  
    466466}
    467467
    468 void WebProcess::ensurePrivateBrowsingSession(SessionID sessionID)
     468void WebProcess::ensurePrivateBrowsingSession(uint64_t sessionID)
    469469{
    470470#if PLATFORM(COCOA) || USE(CFNETWORK) || USE(SOUP)
    … …  
    473473}
    474474
    475 void WebProcess::destroyPrivateBrowsingSession(SessionID sessionID)
     475void WebProcess::destroyPrivateBrowsingSession(uint64_t sessionID)
    476476{
    477477#if PLATFORM(COCOA) || USE(CFNETWORK) || USE(SOUP)

  • trunk/Source/WebKit2/WebProcess/WebProcess.h

    r164611 r164669  
    3737#include "VisitedLinkTable.h"
    3838#include <WebCore/LinkHash.h>
    39 #include <WebCore/SessionID.h>
    4039#include <WebCore/Timer.h>
    4140#include <wtf/Forward.h>
    … …  
    165164    void setCacheModel(uint32_t);
    166165
    167     void ensurePrivateBrowsingSession(WebCore::SessionID);
    168     void destroyPrivateBrowsingSession(WebCore::SessionID);
     166    void ensurePrivateBrowsingSession(uint64_t sessionID);
     167    void destroyPrivateBrowsingSession(uint64_t sessionID);
    169168
    170169    void pageDidEnterWindow(uint64_t pageID);

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

    r164611 r164669  
    5656
    5757    // Legacy private browsing session is per process. Individual pages or page groups may use the private session or the default one as appropriate.
    58     EnsurePrivateBrowsingSession(WebCore::SessionID sessionID)
    59     DestroyPrivateBrowsingSession(WebCore::SessionID sessionID)
     58    EnsurePrivateBrowsingSession(uint64_t sessionID)
     59    DestroyPrivateBrowsingSession(uint64_t sessionID)
    6060
    6161    # Plug-ins.
Note: See TracChangeset for help on using the changeset viewer.