Title: [198195] trunk/Source
- Revision
- 198195
- Author
- [email protected]
- Date
- 2016-03-14 21:59:39 -0700 (Mon, 14 Mar 2016)
Log Message
[WinCairo] Compile fix.
https://bugs.webkit.org/show_bug.cgi?id=155463
Patch by Per Arne Vollan <[email protected]> on 2016-03-14
Reviewed by Alex Christensen.
Get the NetworkStorageSession object from the document in the same way as other platforms do.
Source/WebCore:
* loader/CookieJar.cpp:
(WebCore::storageSession):
Source/WebKit/win:
* WebCoreSupport/WebFrameNetworkingContext.cpp:
(WebFrameNetworkingContext::storageSession):
* WebCoreSupport/WebFrameNetworkingContext.h:
(WebFrameNetworkingContext::storageSession):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (198194 => 198195)
--- trunk/Source/WebCore/ChangeLog 2016-03-15 04:39:01 UTC (rev 198194)
+++ trunk/Source/WebCore/ChangeLog 2016-03-15 04:59:39 UTC (rev 198195)
@@ -1,3 +1,15 @@
+2016-03-14 Per Arne Vollan <[email protected]>
+
+ [WinCairo] Compile fix.
+ https://bugs.webkit.org/show_bug.cgi?id=155463
+
+ Reviewed by Alex Christensen.
+
+ Get the NetworkStorageSession object from the document in the same way as other platforms do.
+
+ * loader/CookieJar.cpp:
+ (WebCore::storageSession):
+
2016-03-14 Tim Horton <[email protected]>
<attachment> on iOS should paint its progress indicator instead of a green square
Modified: trunk/Source/WebCore/loader/CookieJar.cpp (198194 => 198195)
--- trunk/Source/WebCore/loader/CookieJar.cpp 2016-03-15 04:39:01 UTC (rev 198194)
+++ trunk/Source/WebCore/loader/CookieJar.cpp 2016-03-15 04:59:39 UTC (rev 198195)
@@ -48,16 +48,12 @@
return frame->loader().networkingContext();
}
-#if PLATFORM(COCOA) || USE(CFNETWORK) || USE(SOUP)
inline NetworkStorageSession& storageSession(const Document* document)
{
NetworkingContext* context = networkingContext(document);
return context ? context->storageSession() : NetworkStorageSession::defaultStorageSession();
}
#define LOCAL_SESSION(document) NetworkStorageSession& session = storageSession(document);
-#else
-#define LOCAL_SESSION(document) NetworkStorageSession session(networkingContext(document));
-#endif
String cookies(const Document* document, const URL& url)
{
Modified: trunk/Source/WebKit/win/ChangeLog (198194 => 198195)
--- trunk/Source/WebKit/win/ChangeLog 2016-03-15 04:39:01 UTC (rev 198194)
+++ trunk/Source/WebKit/win/ChangeLog 2016-03-15 04:59:39 UTC (rev 198195)
@@ -1,3 +1,17 @@
+2016-03-14 Per Arne Vollan <[email protected]>
+
+ [WinCairo] Compile fix.
+ https://bugs.webkit.org/show_bug.cgi?id=155463
+
+ Reviewed by Alex Christensen.
+
+ Get the NetworkStorageSession object from the document in the same way as other platforms do.
+
+ * WebCoreSupport/WebFrameNetworkingContext.cpp:
+ (WebFrameNetworkingContext::storageSession):
+ * WebCoreSupport/WebFrameNetworkingContext.h:
+ (WebFrameNetworkingContext::storageSession):
+
2016-03-14 Joonghun Park <[email protected]>
Purge PassRefPtr from ArrayBuffer, ArchiveResource, Pasteboard, LegacyWebArchive and DataObjectGtk
Modified: trunk/Source/WebKit/win/WebCoreSupport/WebFrameNetworkingContext.cpp (198194 => 198195)
--- trunk/Source/WebKit/win/WebCoreSupport/WebFrameNetworkingContext.cpp 2016-03-15 04:39:01 UTC (rev 198194)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebFrameNetworkingContext.cpp 2016-03-15 04:59:39 UTC (rev 198195)
@@ -103,7 +103,6 @@
return frame()->loader().client().blockedError(request);
}
-#if USE(CFNETWORK)
NetworkStorageSession& WebFrameNetworkingContext::storageSession() const
{
ASSERT(isMainThread());
@@ -113,4 +112,3 @@
return NetworkStorageSession::defaultStorageSession();
}
-#endif
Modified: trunk/Source/WebKit/win/WebCoreSupport/WebFrameNetworkingContext.h (198194 => 198195)
--- trunk/Source/WebKit/win/WebCoreSupport/WebFrameNetworkingContext.h 2016-03-15 04:39:01 UTC (rev 198194)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebFrameNetworkingContext.h 2016-03-15 04:59:39 UTC (rev 198195)
@@ -48,9 +48,7 @@
}
WebCore::ResourceError blockedError(const WebCore::ResourceRequest&) const override;
-#if USE(CFNETWORK)
WebCore::NetworkStorageSession& storageSession() const override;
-#endif
};
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
