WebKit Bugzilla
Attachment 358949 Details for
Bug 193368
: Reduce use of NetworkStorageSession::defaultStorageSession in WebCore
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
bug-193368-20190111145008.patch (text/plain), 5.61 KB, created by
Alex Christensen
on 2019-01-11 14:50:09 PST
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Alex Christensen
Created:
2019-01-11 14:50:09 PST
Size:
5.61 KB
patch
obsolete
>Index: Source/WebCore/ChangeLog >=================================================================== >--- Source/WebCore/ChangeLog (revision 239878) >+++ Source/WebCore/ChangeLog (working copy) >@@ -1,3 +1,19 @@ >+2019-01-11 Alex Christensen <achristensen@webkit.org> >+ >+ Reduce use of NetworkStorageSession::defaultStorageSession in WebCore >+ https://bugs.webkit.org/show_bug.cgi?id=193368 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ NetworkStorageSession ownership needs to be handled by the WebKitLegacy/WebKit layer. >+ >+ * loader/EmptyClients.cpp: >+ * platform/network/NetworkStorageSession.h: >+ * platform/network/cf/NetworkStorageSessionCFNet.cpp: >+ (WebCore::NetworkStorageSession::switchToNewTestingSession): >+ * platform/network/cf/NetworkStorageSessionCFNetWin.cpp: >+ (WebCore::createPrivateStorageSession): >+ > 2019-01-11 Antti Koivisto <antti@apple.com> > > Release assert when removing element with a map element in the shadow tree >Index: Source/WebCore/loader/EmptyClients.cpp >=================================================================== >--- Source/WebCore/loader/EmptyClients.cpp (revision 239862) >+++ Source/WebCore/loader/EmptyClients.cpp (working copy) >@@ -287,7 +287,7 @@ private: > EmptyFrameNetworkingContext(); > > bool shouldClearReferrerOnHTTPSToHTTPRedirect() const { return true; } >- NetworkStorageSession* storageSession() const final { return &NetworkStorageSession::defaultStorageSession(); } >+ NetworkStorageSession* storageSession() const final { return nullptr; } > > #if PLATFORM(COCOA) > bool localFileContentSniffingEnabled() const { return false; } >Index: Source/WebCore/platform/network/NetworkStorageSession.h >=================================================================== >--- Source/WebCore/platform/network/NetworkStorageSession.h (revision 239862) >+++ Source/WebCore/platform/network/NetworkStorageSession.h (working copy) >@@ -208,10 +208,8 @@ private: > static bool m_processMayUseCookieAPI; > }; > >-#if PLATFORM(COCOA) >+#if PLATFORM(COCOA) || USE(CFURLCONNECTION) > WEBCORE_EXPORT CFURLStorageSessionRef createPrivateStorageSession(CFStringRef identifier); >-#elif USE(CFURLCONNECTION) >-CFURLStorageSessionRef createPrivateStorageSession(CFStringRef identifier, CFURLStorageSessionRef defaultStorageSession); > #endif > > } >Index: Source/WebCore/platform/network/cf/NetworkStorageSessionCFNet.cpp >=================================================================== >--- Source/WebCore/platform/network/cf/NetworkStorageSessionCFNet.cpp (revision 239862) >+++ Source/WebCore/platform/network/cf/NetworkStorageSessionCFNet.cpp (working copy) >@@ -98,12 +98,7 @@ void NetworkStorageSession::switchToNewT > // Session name should be short enough for shared memory region name to be under the limit, otehrwise sandbox rules won't work (see <rdar://problem/13642852>). > String sessionName = String::format("WebKit Test-%u", static_cast<uint32_t>(getCurrentProcessID())); > >- RetainPtr<CFURLStorageSessionRef> session; >-#if PLATFORM(COCOA) >- session = adoptCF(createPrivateStorageSession(sessionName.createCFString().get())); >-#else >- session = adoptCF(createPrivateStorageSession(sessionName.createCFString().get(), defaultStorageSession().platformSession())); >-#endif >+ auto session = adoptCF(createPrivateStorageSession(sessionName.createCFString().get())); > > RetainPtr<CFHTTPCookieStorageRef> cookieStorage; > if (NetworkStorageSession::processMayUseCookieAPI()) { >Index: Source/WebCore/platform/network/cf/NetworkStorageSessionCFNetWin.cpp >=================================================================== >--- Source/WebCore/platform/network/cf/NetworkStorageSessionCFNetWin.cpp (revision 239862) >+++ Source/WebCore/platform/network/cf/NetworkStorageSessionCFNetWin.cpp (working copy) >@@ -62,7 +62,7 @@ DECLARE_CF_TYPE_TRAIT(CFHTTPCookie); > > namespace WebCore { > >-CFURLStorageSessionRef createPrivateStorageSession(CFStringRef identifier, CFURLStorageSessionRef defaultStorageSession) >+CFURLStorageSessionRef createPrivateStorageSession(CFStringRef identifier) > { > const void* sessionPropertyKeys[] = { _kCFURLStorageSessionIsPrivate }; > const void* sessionPropertyValues[] = { kCFBooleanTrue }; >@@ -73,24 +73,14 @@ CFURLStorageSessionRef createPrivateStor > // with the exception that it should be in-memory only storage. > CFURLCacheRef cache = _CFURLStorageSessionCopyCache(kCFAllocatorDefault, storageSession); > CFURLCacheSetDiskCapacity(cache, 0); >- CFURLCacheRef defaultCache; >- if (defaultStorageSession) >- defaultCache = _CFURLStorageSessionCopyCache(kCFAllocatorDefault, defaultStorageSession); >- else >- defaultCache = CFURLCacheCopySharedURLCache(); >+ CFURLCacheRef defaultCache = CFURLCacheCopySharedURLCache(); > CFURLCacheSetMemoryCapacity(cache, CFURLCacheMemoryCapacity(defaultCache)); > CFRelease(defaultCache); > CFRelease(cache); > > CFHTTPCookieStorageRef cookieStorage = _CFURLStorageSessionCopyCookieStorage(kCFAllocatorDefault, storageSession); >- CFHTTPCookieStorageRef defaultCookieStorage; >- if (defaultStorageSession) >- defaultCookieStorage = _CFURLStorageSessionCopyCookieStorage(kCFAllocatorDefault, defaultStorageSession); >- else >- defaultCookieStorage = _CFHTTPCookieStorageGetDefault(kCFAllocatorDefault); >+ CFHTTPCookieStorageRef defaultCookieStorage = _CFHTTPCookieStorageGetDefault(kCFAllocatorDefault); > CFHTTPCookieStorageSetCookieAcceptPolicy(cookieStorage, CFHTTPCookieStorageGetCookieAcceptPolicy(defaultCookieStorage)); >- if (defaultStorageSession) >- CFRelease(defaultCookieStorage); > CFRelease(cookieStorage); > > return storageSession;
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 193368
:
358949
|
358951
|
358963
|
358964
|
359055
|
359066
|
359072
|
359221