<!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>[175276] branches/safari-600.3-branch</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/175276">175276</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2014-10-28 15:36:36 -0700 (Tue, 28 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/174190">r174190</a>. <rdar://problem/18640846></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6003branchLayoutTestsChangeLog">branches/safari-600.3-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari6003branchLayoutTestshttptestscookiesresourcescookiestestprejs">branches/safari-600.3-branch/LayoutTests/http/tests/cookies/resources/cookies-test-pre.js</a></li>
<li><a href="#branchessafari6003branchSourceWebCoreChangeLog">branches/safari-600.3-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6003branchSourceWebCoredomDocumentcpp">branches/safari-600.3-branch/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#branchessafari6003branchSourceWebCoredomDocumenth">branches/safari-600.3-branch/Source/WebCore/dom/Document.h</a></li>
<li><a href="#branchessafari6003branchSourceWebCoredomScriptExecutionContextcpp">branches/safari-600.3-branch/Source/WebCore/dom/ScriptExecutionContext.cpp</a></li>
<li><a href="#branchessafari6003branchSourceWebCoredomScriptExecutionContexth">branches/safari-600.3-branch/Source/WebCore/dom/ScriptExecutionContext.h</a></li>
<li><a href="#branchessafari6003branchSourceWebCoreloaderThreadableLoadercpp">branches/safari-600.3-branch/Source/WebCore/loader/ThreadableLoader.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6003branchLayoutTestshttptestscookiessyncxhrsetcookieinvalidatescacheexpectedtxt">branches/safari-600.3-branch/LayoutTests/http/tests/cookies/sync-xhr-set-cookie-invalidates-cache-expected.txt</a></li>
<li><a href="#branchessafari6003branchLayoutTestshttptestscookiessyncxhrsetcookieinvalidatescachehtml">branches/safari-600.3-branch/LayoutTests/http/tests/cookies/sync-xhr-set-cookie-invalidates-cache.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6003branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/LayoutTests/ChangeLog (175275 => 175276)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/LayoutTests/ChangeLog 2014-10-28 22:15:16 UTC (rev 175275)
+++ branches/safari-600.3-branch/LayoutTests/ChangeLog 2014-10-28 22:36:36 UTC (rev 175276)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2014-10-28 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><ins>+ Merge r174190. <rdar://problem/18640846>
+
+ 2014-10-01 Chris Dumez <cdumez@apple.com>
+
+ Add basic caching for Document.cookie API
+ https://bugs.webkit.org/show_bug.cgi?id=137225
+
+ Reviewed by Alexey Proskuryakov.
+
+ Add a layout test to make sure that document.cookie returns updated
+ results after cookies are set via a sync XHR.
+
+ * http/tests/cookies/sync-xhr-set-cookie-invalidates-cache-expected.txt: Added.
+ * http/tests/cookies/sync-xhr-set-cookie-invalidates-cache.html: Added.
+
+2014-10-28 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merge r173184. <rdar://problem/18428699>
</span><span class="cx">
</span><span class="cx"> 2014-09-02 Simon Fraser <simon.fraser@apple.com>
</span></span></pre></div>
<a id="branchessafari6003branchLayoutTestshttptestscookiesresourcescookiestestprejs"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/LayoutTests/http/tests/cookies/resources/cookies-test-pre.js (175275 => 175276)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/LayoutTests/http/tests/cookies/resources/cookies-test-pre.js 2014-10-28 22:15:16 UTC (rev 175275)
+++ branches/safari-600.3-branch/LayoutTests/http/tests/cookies/resources/cookies-test-pre.js 2014-10-28 22:36:36 UTC (rev 175276)
</span><span class="lines">@@ -23,6 +23,11 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+function registerCookieForCleanup(cookie)
+{
+ cookies.push(cookie);
+}
+
</ins><span class="cx"> // Normalize a cookie string
</span><span class="cx"> function normalizeCookie(cookie)
</span><span class="cx"> {
</span></span></pre></div>
<a id="branchessafari6003branchLayoutTestshttptestscookiessyncxhrsetcookieinvalidatescacheexpectedtxtfromrev174190trunkLayoutTestshttptestscookiessyncxhrsetcookieinvalidatescacheexpectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-600.3-branch/LayoutTests/http/tests/cookies/sync-xhr-set-cookie-invalidates-cache-expected.txt (from rev 174190, trunk/LayoutTests/http/tests/cookies/sync-xhr-set-cookie-invalidates-cache-expected.txt) (0 => 175276)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/LayoutTests/http/tests/cookies/sync-xhr-set-cookie-invalidates-cache-expected.txt (rev 0)
+++ branches/safari-600.3-branch/LayoutTests/http/tests/cookies/sync-xhr-set-cookie-invalidates-cache-expected.txt 2014-10-28 22:36:36 UTC (rev 175276)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+Tests that document.cookie returns the right value after a sync XHR
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS normalizeCookie(document.cookie) is "testKey=testValue"
+PASS xhr.status is 200
+PASS normalizeCookie(document.cookie) is "testKey=testValue; xhrKey=xhrValue"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="branchessafari6003branchLayoutTestshttptestscookiessyncxhrsetcookieinvalidatescachehtmlfromrev174190trunkLayoutTestshttptestscookiessyncxhrsetcookieinvalidatescachehtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.3-branch/LayoutTests/http/tests/cookies/sync-xhr-set-cookie-invalidates-cache.html (from rev 174190, trunk/LayoutTests/http/tests/cookies/sync-xhr-set-cookie-invalidates-cache.html) (0 => 175276)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/LayoutTests/http/tests/cookies/sync-xhr-set-cookie-invalidates-cache.html (rev 0)
+++ branches/safari-600.3-branch/LayoutTests/http/tests/cookies/sync-xhr-set-cookie-invalidates-cache.html 2014-10-28 22:36:36 UTC (rev 175276)
</span><span class="lines">@@ -0,0 +1,22 @@
</span><ins>+<!DOCTYPE html>
+<script src='resources/cookies-test-pre.js'></script>
+
+<script>
+description('Tests that document.cookie returns the right value after a sync XHR');
+
+document.cookie = "testKey=testValue";
+shouldBeEqualToString('normalizeCookie(document.cookie)', 'testKey=testValue');
+var xhr = new XMLHttpRequest();
+xhr.open('GET', 'resources/setCookies.cgi', false);
+var cookie = 'xhrKey=xhrValue; path=/';
+xhr.setRequestHeader('SET-COOKIE', cookie);
+xhr.send();
+
+// This is so the cookie gets removed at the end of the test.
+registerCookieForCleanup(cookie);
+
+shouldBe('xhr.status', '200');
+shouldBeEqualToString('normalizeCookie(document.cookie)', 'testKey=testValue; xhrKey=xhrValue');
+
+</script>
+<script src='resources/cookies-test-post.js'></script>
</ins></span></pre></div>
<a id="branchessafari6003branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/ChangeLog (175275 => 175276)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/ChangeLog 2014-10-28 22:15:16 UTC (rev 175275)
+++ branches/safari-600.3-branch/Source/WebCore/ChangeLog 2014-10-28 22:36:36 UTC (rev 175276)
</span><span class="lines">@@ -1,5 +1,65 @@
</span><span class="cx"> 2014-10-28 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><ins>+ Merge r174190. <rdar://problem/18640846>
+
+ 2014-10-01 Chris Dumez <cdumez@apple.com>
+
+ Add basic caching for Document.cookie API
+ https://bugs.webkit.org/show_bug.cgi?id=137225
+
+ Reviewed by Alexey Proskuryakov.
+
+ While profiling the load of nytimes.com, I noticed that the site is
+ accessing ~250 times document.cookie, just during page load. Accessing
+ document.cookie is currently slow because we:
+ - Call WebPlatformStrategies::cookiesForDOM() virtual function
+ - Send a sync IPC message to the Network process to retrieve the
+ cookies
+ - The Network process gets the list of cookies from CFNetwork then
+ serializes the result to send it back to the WebProcess
+ - We unserialize the cookies into an NSList of cookies
+ - We filter-out the cookies that are 'httpOnly' and construct a new
+ NSList of cookies
+ - We create a WTF String out of the cookies NSList
+
+ In the case of nytimes.com, it turns out that up to 100 calls to
+ document.cookie() are made in the same event loop iteration. This patch
+ thus caches / freezes the cookies until we return to the event
+ loop so that consecutive calls to document.cookie() are extremely fast.
+ Doing so seems to be sufficient to achieve a ~87% cache hit for
+ nytimes.com page load.
+
+ The cookies cache is invalidated whenever:
+ - document.cookie is set
+ - we return to the event loop
+ - a network resource is loaded synchronously as it may cause cookies to
+ be set before we return to the event loop
+
+ Test: http/tests/cookies/sync-xhr-set-cookie-invalidates-cache.html
+
+ * dom/Document.cpp:
+ (WebCore::Document::Document):
+ (WebCore::Document::open):
+ (WebCore::Document::cookie):
+ (WebCore::Document::setCookie):
+ (WebCore::Document::setCookieURL):
+ (WebCore::Document::initSecurityContext):
+ (WebCore::Document::setDOMCookieCache):
+ (WebCore::Document::invalidateDOMCookieCache):
+ (WebCore::Document::domCookieCacheExpiryTimerFired):
+ (WebCore::Document::didLoadResourceSynchronously):
+ * dom/Document.h:
+ (WebCore::Document::domCookieCache):
+ (WebCore::Document::isDOMCookieCacheValid):
+ (WebCore::Document::setCookieURL): Deleted.
+ * dom/ScriptExecutionContext.cpp:
+ (WebCore::ScriptExecutionContext::didLoadResourceSynchronously):
+ * dom/ScriptExecutionContext.h:
+ * loader/ThreadableLoader.cpp:
+ (WebCore::ThreadableLoader::loadResourceSynchronously):
+
+2014-10-28 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merge r173184. <rdar://problem/18428699>
</span><span class="cx">
</span><span class="cx"> 2014-09-02 Simon Fraser <simon.fraser@apple.com>
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/dom/Document.cpp (175275 => 175276)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/dom/Document.cpp 2014-10-28 22:15:16 UTC (rev 175275)
+++ branches/safari-600.3-branch/Source/WebCore/dom/Document.cpp 2014-10-28 22:36:36 UTC (rev 175276)
</span><span class="lines">@@ -513,6 +513,7 @@
</span><span class="cx"> , m_inputCursor(EmptyInputCursor::create())
</span><span class="cx"> #endif
</span><span class="cx"> , m_didAssociateFormControlsTimer(this, &Document::didAssociateFormControlsTimerFired)
</span><ins>+ , m_cookieCacheExpiryTimer(this, &Document::domCookieCacheExpiryTimerFired)
</ins><span class="cx"> , m_disabledFieldsetElementsCount(0)
</span><span class="cx"> , m_hasInjectedPlugInsScript(false)
</span><span class="cx"> , m_renderTreeBeingDestroyed(false)
</span><span class="lines">@@ -2212,7 +2213,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (ownerDocument) {
</span><span class="cx"> setURL(ownerDocument->url());
</span><del>- m_cookieURL = ownerDocument->cookieURL();
</del><ins>+ setCookieURL(ownerDocument->cookieURL());
</ins><span class="cx"> setSecurityOrigin(ownerDocument->securityOrigin());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3796,7 +3797,7 @@
</span><span class="cx"> return frame()->ownerElement();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String Document::cookie(ExceptionCode& ec) const
</del><ins>+String Document::cookie(ExceptionCode& ec)
</ins><span class="cx"> {
</span><span class="cx"> if (page() && !page()->settings().cookieEnabled())
</span><span class="cx"> return String();
</span><span class="lines">@@ -3814,7 +3815,10 @@
</span><span class="cx"> if (cookieURL.isEmpty())
</span><span class="cx"> return String();
</span><span class="cx">
</span><del>- return cookies(this, cookieURL);
</del><ins>+ if (!isDOMCookieCacheValid())
+ setCachedDOMCookies(cookies(this, cookieURL));
+
+ return cachedDOMCookies();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Document::setCookie(const String& value, ExceptionCode& ec)
</span><span class="lines">@@ -3835,6 +3839,7 @@
</span><span class="cx"> if (cookieURL.isEmpty())
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ invalidateDOMCookieCache();
</ins><span class="cx"> setCookies(this, cookieURL, value);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3938,6 +3943,14 @@
</span><span class="cx"> return String::format("%02d/%02d/%04d %02d:%02d:%02d", date.month() + 1, date.monthDay(), date.fullYear(), date.hour(), date.minute(), date.second());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void Document::setCookieURL(const URL& url)
+{
+ if (m_cookieURL == url)
+ return;
+ m_cookieURL = url;
+ invalidateDOMCookieCache();
+}
+
</ins><span class="cx"> static bool isValidNameNonASCII(const LChar* characters, unsigned length)
</span><span class="cx"> {
</span><span class="cx"> if (!isValidNameStart(characters[0]))
</span><span class="lines">@@ -4645,7 +4658,7 @@
</span><span class="cx"> if (!m_frame) {
</span><span class="cx"> // No source for a security context.
</span><span class="cx"> // This can occur via document.implementation.createDocument().
</span><del>- m_cookieURL = URL(ParsedURLString, emptyString());
</del><ins>+ setCookieURL(URL(ParsedURLString, emptyString()));
</ins><span class="cx"> setSecurityOrigin(SecurityOrigin::createUnique());
</span><span class="cx"> setContentSecurityPolicy(std::make_unique<ContentSecurityPolicy>(this));
</span><span class="cx"> return;
</span><span class="lines">@@ -4653,7 +4666,7 @@
</span><span class="cx">
</span><span class="cx"> // In the common case, create the security context from the currently
</span><span class="cx"> // loading URL with a fresh content security policy.
</span><del>- m_cookieURL = m_url;
</del><ins>+ setCookieURL(m_url);
</ins><span class="cx"> enforceSandboxFlags(m_frame->loader().effectiveSandboxFlags());
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="lines">@@ -4719,7 +4732,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_cookieURL = ownerFrame->document()->cookieURL();
</del><ins>+ setCookieURL(ownerFrame->document()->cookieURL());
</ins><span class="cx"> // We alias the SecurityOrigins to match Firefox, see Bug 15313
</span><span class="cx"> // https://bugs.webkit.org/show_bug.cgi?id=15313
</span><span class="cx"> setSecurityOrigin(ownerFrame->document()->securityOrigin());
</span><span class="lines">@@ -6137,6 +6150,32 @@
</span><span class="cx"> m_associatedFormControls.clear();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void Document::setCachedDOMCookies(const String& cookies)
+{
+ ASSERT(!isDOMCookieCacheValid());
+ m_cachedDOMCookies = cookies;
+ // The cookie cache is valid at most until we go back to the event loop.
+ m_cookieCacheExpiryTimer.startOneShot(0);
+}
+
+void Document::invalidateDOMCookieCache()
+{
+ m_cookieCacheExpiryTimer.stop();
+ m_cachedDOMCookies = String();
+}
+
+void Document::domCookieCacheExpiryTimerFired(Timer<Document>&)
+{
+ invalidateDOMCookieCache();
+}
+
+void Document::didLoadResourceSynchronously(const ResourceRequest&)
+{
+ // Synchronous resources loading can set cookies so we invalidate the cookies cache
+ // in this case, to be safe.
+ invalidateDOMCookieCache();
+}
+
</ins><span class="cx"> void Document::ensurePlugInsInjectedScript(DOMWrapperWorld& world)
</span><span class="cx"> {
</span><span class="cx"> if (m_hasInjectedPlugInsScript)
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/dom/Document.h (175275 => 175276)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/dom/Document.h 2014-10-28 22:15:16 UTC (rev 175275)
+++ branches/safari-600.3-branch/Source/WebCore/dom/Document.h 2014-10-28 22:36:36 UTC (rev 175276)
</span><span class="lines">@@ -875,7 +875,7 @@
</span><span class="cx"> void setTitleElement(const StringWithDirection&, Element* titleElement);
</span><span class="cx"> void removeTitle(Element* titleElement);
</span><span class="cx">
</span><del>- String cookie(ExceptionCode&) const;
</del><ins>+ String cookie(ExceptionCode&);
</ins><span class="cx"> void setCookie(const String&, ExceptionCode&);
</span><span class="cx">
</span><span class="cx"> String referrer() const;
</span><span class="lines">@@ -898,7 +898,7 @@
</span><span class="cx"> // inherits its cookieURL but not its URL.
</span><span class="cx"> //
</span><span class="cx"> const URL& cookieURL() const { return m_cookieURL; }
</span><del>- void setCookieURL(const URL& url) { m_cookieURL = url; }
</del><ins>+ void setCookieURL(const URL&);
</ins><span class="cx">
</span><span class="cx"> // The firstPartyForCookies is used to compute whether this document
</span><span class="cx"> // appears in a "third-party" context for the purpose of third-party
</span><span class="lines">@@ -1358,6 +1358,14 @@
</span><span class="cx">
</span><span class="cx"> void didAssociateFormControlsTimerFired(Timer<Document>&);
</span><span class="cx">
</span><ins>+ // DOM Cookies caching.
+ const String& cachedDOMCookies() const { return m_cachedDOMCookies; }
+ void setCachedDOMCookies(const String&);
+ bool isDOMCookieCacheValid() const { return m_cookieCacheExpiryTimer.isActive(); }
+ void invalidateDOMCookieCache();
+ void domCookieCacheExpiryTimerFired(Timer<Document>&);
+ void didLoadResourceSynchronously(const ResourceRequest&) override final;
+
</ins><span class="cx"> unsigned m_referencingNodeCount;
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<StyleResolver> m_styleResolver;
</span><span class="lines">@@ -1690,6 +1698,8 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> Timer<Document> m_didAssociateFormControlsTimer;
</span><ins>+ Timer<Document> m_cookieCacheExpiryTimer;
+ String m_cachedDOMCookies;
</ins><span class="cx"> HashSet<RefPtr<Element>> m_associatedFormControls;
</span><span class="cx"> unsigned m_disabledFieldsetElementsCount;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebCoredomScriptExecutionContextcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/dom/ScriptExecutionContext.cpp (175275 => 175276)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/dom/ScriptExecutionContext.cpp 2014-10-28 22:15:16 UTC (rev 175275)
+++ branches/safari-600.3-branch/Source/WebCore/dom/ScriptExecutionContext.cpp 2014-10-28 22:36:36 UTC (rev 175276)
</span><span class="lines">@@ -172,6 +172,10 @@
</span><span class="cx"> m_messagePorts.remove(&messagePort);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void ScriptExecutionContext::didLoadResourceSynchronously(const ResourceRequest&)
+{
+}
+
</ins><span class="cx"> bool ScriptExecutionContext::canSuspendActiveDOMObjects()
</span><span class="cx"> {
</span><span class="cx"> checkConsistency();
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebCoredomScriptExecutionContexth"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/dom/ScriptExecutionContext.h (175275 => 175276)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/dom/ScriptExecutionContext.h 2014-10-28 22:15:16 UTC (rev 175275)
+++ branches/safari-600.3-branch/Source/WebCore/dom/ScriptExecutionContext.h 2014-10-28 22:36:36 UTC (rev 175276)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx">
</span><span class="cx"> #include "ActiveDOMObject.h"
</span><span class="cx"> #include "DOMTimer.h"
</span><ins>+#include "ResourceRequest.h"
</ins><span class="cx"> #include "ScheduledAction.h"
</span><span class="cx"> #include "SecurityContext.h"
</span><span class="cx"> #include "Supplementable.h"
</span><span class="lines">@@ -110,6 +111,8 @@
</span><span class="cx"> void createdMessagePort(MessagePort&);
</span><span class="cx"> void destroyedMessagePort(MessagePort&);
</span><span class="cx">
</span><ins>+ virtual void didLoadResourceSynchronously(const ResourceRequest&);
+
</ins><span class="cx"> void ref() { refScriptExecutionContext(); }
</span><span class="cx"> void deref() { derefScriptExecutionContext(); }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebCoreloaderThreadableLoadercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/loader/ThreadableLoader.cpp (175275 => 175276)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/loader/ThreadableLoader.cpp 2014-10-28 22:15:16 UTC (rev 175275)
+++ branches/safari-600.3-branch/Source/WebCore/loader/ThreadableLoader.cpp 2014-10-28 22:36:36 UTC (rev 175276)
</span><span class="lines">@@ -66,12 +66,12 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(context);
</span><span class="cx">
</span><del>- if (context->isWorkerGlobalScope()) {
</del><ins>+ if (context->isWorkerGlobalScope())
</ins><span class="cx"> WorkerThreadableLoader::loadResourceSynchronously(toWorkerGlobalScope(context), request, client, options);
</span><del>- return;
- }
</del><span class="cx">
</span><del>- DocumentThreadableLoader::loadResourceSynchronously(*toDocument(context), request, client, options);
</del><ins>+ else
+ DocumentThreadableLoader::loadResourceSynchronously(*toDocument(context), request, client, options);
+ context->didLoadResourceSynchronously(request);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>
</body>
</html>