<!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>[166302] trunk</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/166302">166302</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-03-26 11:31:58 -0700 (Wed, 26 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/166264">r166264</a>.
https://bugs.webkit.org/show_bug.cgi?id=130785
Broke some window.opener tests for WK2 Mavericks (Requested by
brrian__ on #webkit).
Reverted changeset:
Source/WebCore:
"Web Replay: resource unique identifiers should be unique-per-
frame, not globally"
https://bugs.webkit.org/show_bug.cgi?id=130632
http://trac.webkit.org/changeset/166264
Tools:
"Web Replay: resource unique identifiers should be unique-per-
frame, not globally"
https://bugs.webkit.org/show_bug.cgi?id=130632
http://trac.webkit.org/changeset/166264</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderProgressTrackercpp">trunk/Source/WebCore/loader/ProgressTracker.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderProgressTrackerh">trunk/Source/WebCore/loader/ProgressTracker.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleInjectedBundlePagecpp">trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166301 => 166302)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-26 18:20:15 UTC (rev 166301)
+++ trunk/Source/WebCore/ChangeLog 2014-03-26 18:31:58 UTC (rev 166302)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-03-26 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r166264.
+ https://bugs.webkit.org/show_bug.cgi?id=130785
+
+ Broke some window.opener tests for WK2 Mavericks (Requested by
+ brrian__ on #webkit).
+
+ Reverted changeset:
+
+ "Web Replay: resource unique identifiers should be unique-per-
+ frame, not globally"
+ https://bugs.webkit.org/show_bug.cgi?id=130632
+ http://trac.webkit.org/changeset/166264
+
</ins><span class="cx"> 2014-03-26 Zoltan Horvath <zoltan@webkit.org>
</span><span class="cx">
</span><span class="cx"> [CSS Shapes] Remove shape-inside support
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderProgressTrackercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ProgressTracker.cpp (166301 => 166302)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ProgressTracker.cpp 2014-03-26 18:20:15 UTC (rev 166301)
+++ trunk/Source/WebCore/loader/ProgressTracker.cpp 2014-03-26 18:31:58 UTC (rev 166302)
</span><span class="lines">@@ -73,6 +73,8 @@
</span><span class="cx"> long long estimatedLength;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+unsigned long ProgressTracker::s_uniqueIdentifier = 0;
+
</ins><span class="cx"> ProgressTracker::ProgressTracker(ProgressTrackerClient& client)
</span><span class="cx"> : m_client(client)
</span><span class="cx"> , m_totalPageAndResourceBytesToLoad(0)
</span><span class="lines">@@ -82,7 +84,6 @@
</span><span class="cx"> , m_progressNotificationTimeInterval(std::chrono::milliseconds(100))
</span><span class="cx"> , m_finalProgressChangedSent(false)
</span><span class="cx"> , m_progressValue(0)
</span><del>- , m_nextUniqueIdentifier(1)
</del><span class="cx"> , m_numProgressTrackedFrames(0)
</span><span class="cx"> , m_progressHeartbeatTimer(this, &ProgressTracker::progressHeartbeatTimerFired)
</span><span class="cx"> , m_heartbeatsWithNoProgress(0)
</span><span class="lines">@@ -113,7 +114,6 @@
</span><span class="cx"> m_finalProgressChangedSent = false;
</span><span class="cx"> m_numProgressTrackedFrames = 0;
</span><span class="cx"> m_originatingProgressFrame = 0;
</span><del>- // Don't reset m_nextUniqueIdentifier. More loads could start after reset() is called.
</del><span class="cx">
</span><span class="cx"> m_heartbeatsWithNoProgress = 0;
</span><span class="cx"> m_totalBytesReceivedBeforePreviousHeartbeat = 0;
</span><span class="lines">@@ -294,7 +294,7 @@
</span><span class="cx">
</span><span class="cx"> unsigned long ProgressTracker::createUniqueIdentifier()
</span><span class="cx"> {
</span><del>- return m_nextUniqueIdentifier++;
</del><ins>+ return ++s_uniqueIdentifier;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool ProgressTracker::isMainLoadProgressing() const
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderProgressTrackerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ProgressTracker.h (166301 => 166302)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ProgressTracker.h 2014-03-26 18:20:15 UTC (rev 166301)
+++ trunk/Source/WebCore/loader/ProgressTracker.h 2014-03-26 18:31:58 UTC (rev 166302)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> explicit ProgressTracker(ProgressTrackerClient&);
</span><span class="cx"> ~ProgressTracker();
</span><span class="cx">
</span><del>- unsigned long createUniqueIdentifier();
</del><ins>+ static unsigned long createUniqueIdentifier();
</ins><span class="cx">
</span><span class="cx"> double estimatedProgress() const;
</span><span class="cx">
</span><span class="lines">@@ -68,6 +68,8 @@
</span><span class="cx">
</span><span class="cx"> void progressHeartbeatTimerFired(Timer<ProgressTracker>&);
</span><span class="cx">
</span><ins>+ static unsigned long s_uniqueIdentifier;
+
</ins><span class="cx"> ProgressTrackerClient& m_client;
</span><span class="cx"> long long m_totalPageAndResourceBytesToLoad;
</span><span class="cx"> long long m_totalBytesReceived;
</span><span class="lines">@@ -78,7 +80,6 @@
</span><span class="cx"> bool m_finalProgressChangedSent;
</span><span class="cx"> double m_progressValue;
</span><span class="cx"> RefPtr<Frame> m_originatingProgressFrame;
</span><del>- unsigned long m_nextUniqueIdentifier;
</del><span class="cx">
</span><span class="cx"> int m_numProgressTrackedFrames;
</span><span class="cx"> HashMap<unsigned long, std::unique_ptr<ProgressItem>> m_progressItems;
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (166301 => 166302)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-03-26 18:20:15 UTC (rev 166301)
+++ trunk/Tools/ChangeLog 2014-03-26 18:31:58 UTC (rev 166302)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-03-26 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r166264.
+ https://bugs.webkit.org/show_bug.cgi?id=130785
+
+ Broke some window.opener tests for WK2 Mavericks (Requested by
+ brrian__ on #webkit).
+
+ Reverted changeset:
+
+ "Web Replay: resource unique identifiers should be unique-per-
+ frame, not globally"
+ https://bugs.webkit.org/show_bug.cgi?id=130632
+ http://trac.webkit.org/changeset/166264
+
</ins><span class="cx"> 2014-03-26 Zoltan Horvath <zoltan@webkit.org>
</span><span class="cx">
</span><span class="cx"> [CSS Shapes] Remove shape-inside support
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleInjectedBundlePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp (166301 => 166302)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2014-03-26 18:20:15 UTC (rev 166301)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2014-03-26 18:31:58 UTC (rev 166302)
</span><span class="lines">@@ -254,13 +254,12 @@
</span><span class="cx"> return toWTFString(adoptWK(WKURLCopyLastPathComponent(fileUrl))); // We lose some information here, but it's better than exposing a full path, which is always machine specific.
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static HashMap<std::pair<WKBundleFrameRef, uint64_t>, String> assignedUrlsCache;
</del><ins>+static HashMap<uint64_t, String> assignedUrlsCache;
</ins><span class="cx">
</span><del>-static inline void dumpResourceURL(WKBundleFrameRef frame, uint64_t identifier, StringBuilder& stringBuilder)
</del><ins>+static inline void dumpResourceURL(uint64_t identifier, StringBuilder& stringBuilder)
</ins><span class="cx"> {
</span><del>- std::pair<WKBundleFrameRef, uint64_t> key = std::make_pair(frame, identifier);
- if (assignedUrlsCache.contains(key))
- stringBuilder.append(assignedUrlsCache.get(key));
</del><ins>+ if (assignedUrlsCache.contains(identifier))
+ stringBuilder.append(assignedUrlsCache.get(identifier));
</ins><span class="cx"> else
</span><span class="cx"> stringBuilder.appendLiteral("<unknown>");
</span><span class="cx"> }
</span><span class="lines">@@ -1028,15 +1027,13 @@
</span><span class="cx"> InjectedBundle::shared().outputText("didDetectXSS\n");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InjectedBundlePage::didInitiateLoadForResource(WKBundlePageRef page, WKBundleFrameRef frame, uint64_t identifier, WKURLRequestRef request, bool)
</del><ins>+void InjectedBundlePage::didInitiateLoadForResource(WKBundlePageRef page, WKBundleFrameRef, uint64_t identifier, WKURLRequestRef request, bool)
</ins><span class="cx"> {
</span><span class="cx"> if (!InjectedBundle::shared().isTestRunning())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> WKRetainPtr<WKURLRef> url = adoptWK(WKURLRequestCopyURL(request));
</span><del>- auto result = assignedUrlsCache.add(std::make_pair(frame, identifier), pathSuitableForTestResult(url.get()));
- // It is a bug in WebCore if multiple resources had the same frame/identifier pair.
- ASSERT_UNUSED(result, result.isNewEntry);
</del><ins>+ assignedUrlsCache.add(identifier, pathSuitableForTestResult(url.get()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Resource Load Client Callbacks
</span><span class="lines">@@ -1056,7 +1053,7 @@
</span><span class="cx"> if (InjectedBundle::shared().isTestRunning()
</span><span class="cx"> && InjectedBundle::shared().testRunner()->shouldDumpResourceLoadCallbacks()) {
</span><span class="cx"> StringBuilder stringBuilder;
</span><del>- dumpResourceURL(frame, identifier, stringBuilder);
</del><ins>+ dumpResourceURL(identifier, stringBuilder);
</ins><span class="cx"> stringBuilder.appendLiteral(" - willSendRequest ");
</span><span class="cx"> dumpRequestDescriptionSuitableForTestResult(request, stringBuilder);
</span><span class="cx"> stringBuilder.appendLiteral(" redirectResponse ");
</span><span class="lines">@@ -1107,14 +1104,14 @@
</span><span class="cx"> return request;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InjectedBundlePage::didReceiveResponseForResource(WKBundlePageRef page, WKBundleFrameRef frame, uint64_t identifier, WKURLResponseRef response)
</del><ins>+void InjectedBundlePage::didReceiveResponseForResource(WKBundlePageRef page, WKBundleFrameRef, uint64_t identifier, WKURLResponseRef response)
</ins><span class="cx"> {
</span><span class="cx"> if (!InjectedBundle::shared().isTestRunning())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (InjectedBundle::shared().testRunner()->shouldDumpResourceLoadCallbacks()) {
</span><span class="cx"> StringBuilder stringBuilder;
</span><del>- dumpResourceURL(frame, identifier, stringBuilder);
</del><ins>+ dumpResourceURL(identifier, stringBuilder);
</ins><span class="cx"> stringBuilder.appendLiteral(" - didReceiveResponse ");
</span><span class="cx"> dumpResponseDescriptionSuitableForTestResult(response, stringBuilder);
</span><span class="cx"> stringBuilder.append('\n');
</span><span class="lines">@@ -1141,7 +1138,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InjectedBundlePage::didFinishLoadForResource(WKBundlePageRef, WKBundleFrameRef frame, uint64_t identifier)
</del><ins>+void InjectedBundlePage::didFinishLoadForResource(WKBundlePageRef, WKBundleFrameRef, uint64_t identifier)
</ins><span class="cx"> {
</span><span class="cx"> if (!InjectedBundle::shared().isTestRunning())
</span><span class="cx"> return;
</span><span class="lines">@@ -1150,12 +1147,12 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> StringBuilder stringBuilder;
</span><del>- dumpResourceURL(frame, identifier, stringBuilder);
</del><ins>+ dumpResourceURL(identifier, stringBuilder);
</ins><span class="cx"> stringBuilder.appendLiteral(" - didFinishLoading\n");
</span><span class="cx"> InjectedBundle::shared().outputText(stringBuilder.toString());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InjectedBundlePage::didFailLoadForResource(WKBundlePageRef, WKBundleFrameRef frame, uint64_t identifier, WKErrorRef error)
</del><ins>+void InjectedBundlePage::didFailLoadForResource(WKBundlePageRef, WKBundleFrameRef, uint64_t identifier, WKErrorRef error)
</ins><span class="cx"> {
</span><span class="cx"> if (!InjectedBundle::shared().isTestRunning())
</span><span class="cx"> return;
</span><span class="lines">@@ -1164,7 +1161,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> StringBuilder stringBuilder;
</span><del>- dumpResourceURL(frame, identifier, stringBuilder);
</del><ins>+ dumpResourceURL(identifier, stringBuilder);
</ins><span class="cx"> stringBuilder.appendLiteral(" - didFailLoadingWithError: ");
</span><span class="cx">
</span><span class="cx"> dumpErrorDescriptionSuitableForTestResult(error, stringBuilder);
</span></span></pre>
</div>
</div>
</body>
</html>