<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[198195] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/198195">198195</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2016-03-14 21:59:39 -0700 (Mon, 14 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WinCairo] Compile fix.
https://bugs.webkit.org/show_bug.cgi?id=155463
Patch by Per Arne Vollan <peavo@outlook.com> 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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderCookieJarcpp">trunk/Source/WebCore/loader/CookieJar.cpp</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebFrameNetworkingContextcpp">trunk/Source/WebKit/win/WebCoreSupport/WebFrameNetworkingContext.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebFrameNetworkingContexth">trunk/Source/WebKit/win/WebCoreSupport/WebFrameNetworkingContext.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (198194 => 198195)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-03-14 Per Arne Vollan <peavo@outlook.com>
+
+ [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):
+
</ins><span class="cx"> 2016-03-14 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> <attachment> on iOS should paint its progress indicator instead of a green square
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderCookieJarcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/CookieJar.cpp (198194 => 198195)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -48,16 +48,12 @@
</span><span class="cx"> return frame->loader().networkingContext();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(COCOA) || USE(CFNETWORK) || USE(SOUP)
</del><span class="cx"> inline NetworkStorageSession& storageSession(const Document* document)
</span><span class="cx"> {
</span><span class="cx"> NetworkingContext* context = networkingContext(document);
</span><span class="cx"> return context ? context->storageSession() : NetworkStorageSession::defaultStorageSession();
</span><span class="cx"> }
</span><span class="cx"> #define LOCAL_SESSION(document) NetworkStorageSession& session = storageSession(document);
</span><del>-#else
-#define LOCAL_SESSION(document) NetworkStorageSession session(networkingContext(document));
-#endif
</del><span class="cx">
</span><span class="cx"> String cookies(const Document* document, const URL& url)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (198194 => 198195)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-03-14 Per Arne Vollan <peavo@outlook.com>
+
+ [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):
+
</ins><span class="cx"> 2016-03-14 Joonghun Park <jh718.park@samsung.com>
</span><span class="cx">
</span><span class="cx"> Purge PassRefPtr from ArrayBuffer, ArchiveResource, Pasteboard, LegacyWebArchive and DataObjectGtk
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebFrameNetworkingContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebFrameNetworkingContext.cpp (198194 => 198195)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -103,7 +103,6 @@
</span><span class="cx"> return frame()->loader().client().blockedError(request);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if USE(CFNETWORK)
</del><span class="cx"> NetworkStorageSession& WebFrameNetworkingContext::storageSession() const
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="lines">@@ -113,4 +112,3 @@
</span><span class="cx">
</span><span class="cx"> return NetworkStorageSession::defaultStorageSession();
</span><span class="cx"> }
</span><del>-#endif
</del></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebFrameNetworkingContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebFrameNetworkingContext.h (198194 => 198195)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -48,9 +48,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebCore::ResourceError blockedError(const WebCore::ResourceRequest&) const override;
</span><del>-#if USE(CFNETWORK)
</del><span class="cx"> WebCore::NetworkStorageSession& storageSession() const override;
</span><del>-#endif
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>