<!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>[166337] trunk/Source/WebCore</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/166337">166337</a></dd>
<dt>Author</dt> <dd>bburg@apple.com</dd>
<dt>Date</dt> <dd>2014-03-26 20:45:38 -0700 (Wed, 26 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Replay: disable page cache during capture/replay
https://bugs.webkit.org/show_bug.cgi?id=130672
Reviewed by Timothy Hatcher.
Save, set, and restore page cache settings at the correct times.
No new tests. If this code fails, then the tests for network replay will fail.
* replay/ReplayController.cpp:
(WebCore::ReplayController::setForceDeterministicSettings): Added.
(WebCore::ReplayController::startCapturing):
(WebCore::ReplayController::stopCapturing):
(WebCore::ReplayController::cancelPlayback):
(WebCore::ReplayController::replayToPosition):
* replay/ReplayController.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorereplayReplayControllercpp">trunk/Source/WebCore/replay/ReplayController.cpp</a></li>
<li><a href="#trunkSourceWebCorereplayReplayControllerh">trunk/Source/WebCore/replay/ReplayController.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166336 => 166337)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-27 03:41:40 UTC (rev 166336)
+++ trunk/Source/WebCore/ChangeLog 2014-03-27 03:45:38 UTC (rev 166337)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-03-26 Brian Burg <bburg@apple.com>
+
+ Web Replay: disable page cache during capture/replay
+ https://bugs.webkit.org/show_bug.cgi?id=130672
+
+ Reviewed by Timothy Hatcher.
+
+ Save, set, and restore page cache settings at the correct times.
+
+ No new tests. If this code fails, then the tests for network replay will fail.
+
+ * replay/ReplayController.cpp:
+ (WebCore::ReplayController::setForceDeterministicSettings): Added.
+ (WebCore::ReplayController::startCapturing):
+ (WebCore::ReplayController::stopCapturing):
+ (WebCore::ReplayController::cancelPlayback):
+ (WebCore::ReplayController::replayToPosition):
+ * replay/ReplayController.h:
+
</ins><span class="cx"> 2014-03-26 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Convert more of HTMLConverter to C++
</span></span></pre></div>
<a id="trunkSourceWebCorereplayReplayControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/replay/ReplayController.cpp (166336 => 166337)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/replay/ReplayController.cpp 2014-03-27 03:41:40 UTC (rev 166336)
+++ trunk/Source/WebCore/replay/ReplayController.cpp 2014-03-27 03:45:38 UTC (rev 166337)
</span><span class="lines">@@ -44,6 +44,7 @@
</span><span class="cx"> #include "ReplaySessionSegment.h"
</span><span class="cx"> #include "ReplayingInputCursor.h"
</span><span class="cx"> #include "ScriptController.h"
</span><ins>+#include "Settings.h"
</ins><span class="cx"> #include "UserInputBridge.h"
</span><span class="cx"> #include "WebReplayInputs.h"
</span><span class="cx"> #include <replay/EmptyInputCursor.h>
</span><span class="lines">@@ -65,6 +66,19 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void ReplayController::setForceDeterministicSettings(bool shouldForce)
+{
+ ASSERT(shouldForce ^ (m_sessionState == SessionState::Inactive));
+
+ if (shouldForce) {
+ m_savedSettings.usesPageCache = m_page.settings().usesPageCache();
+
+ m_page.settings().setUsesPageCache(false);
+ } else {
+ m_page.settings().setUsesPageCache(m_savedSettings.usesPageCache);
+ }
+}
+
</ins><span class="cx"> void ReplayController::setSessionState(SessionState state)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(state != m_sessionState);
</span><span class="lines">@@ -199,6 +213,7 @@
</span><span class="cx"> ASSERT(m_segmentState == SegmentState::Unloaded);
</span><span class="cx">
</span><span class="cx"> setSessionState(SessionState::Capturing);
</span><ins>+ setForceDeterministicSettings(true);
</ins><span class="cx">
</span><span class="cx"> LOG(WebReplay, "%-20s Starting capture.\n", "ReplayController");
</span><span class="cx"> InspectorInstrumentation::captureStarted(&m_page);
</span><span class="lines">@@ -216,6 +231,7 @@
</span><span class="cx"> completeSegment();
</span><span class="cx">
</span><span class="cx"> setSessionState(SessionState::Inactive);
</span><ins>+ setForceDeterministicSettings(false);
</ins><span class="cx">
</span><span class="cx"> LOG(WebReplay, "%-20s Stopping capture.\n", "ReplayController");
</span><span class="cx"> InspectorInstrumentation::captureStopped(&m_page);
</span><span class="lines">@@ -263,6 +279,7 @@
</span><span class="cx"> ASSERT(m_segmentState == SegmentState::Loaded);
</span><span class="cx"> unloadSegment();
</span><span class="cx"> m_sessionState = SessionState::Inactive;
</span><ins>+ setForceDeterministicSettings(false);
</ins><span class="cx"> InspectorInstrumentation::playbackFinished(&m_page);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -274,8 +291,10 @@
</span><span class="cx">
</span><span class="cx"> m_dispatchSpeed = speed;
</span><span class="cx">
</span><del>- if (m_sessionState != SessionState::Replaying)
</del><ins>+ if (m_sessionState != SessionState::Replaying) {
</ins><span class="cx"> setSessionState(SessionState::Replaying);
</span><ins>+ setForceDeterministicSettings(true);
+ }
</ins><span class="cx">
</span><span class="cx"> if (m_segmentState == SegmentState::Unloaded)
</span><span class="cx"> loadSegmentAtIndex(position.segmentOffset);
</span></span></pre></div>
<a id="trunkSourceWebCorereplayReplayControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/replay/ReplayController.h (166336 => 166337)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/replay/ReplayController.h 2014-03-27 03:41:40 UTC (rev 166336)
+++ trunk/Source/WebCore/replay/ReplayController.h 2014-03-27 03:45:38 UTC (rev 166337)
</span><span class="lines">@@ -151,7 +151,16 @@
</span><span class="cx"> EventLoopInputDispatcher& dispatcher() const;
</span><span class="cx">
</span><span class="cx"> void setSessionState(SessionState);
</span><ins>+ void setForceDeterministicSettings(bool);
</ins><span class="cx">
</span><ins>+ struct SavedSettings {
+ bool usesPageCache;
+
+ SavedSettings()
+ : usesPageCache(false)
+ { }
+ };
+
</ins><span class="cx"> Page& m_page;
</span><span class="cx">
</span><span class="cx"> RefPtr<ReplaySessionSegment> m_loadedSegment;
</span><span class="lines">@@ -170,6 +179,7 @@
</span><span class="cx"> SessionState m_sessionState;
</span><span class="cx">
</span><span class="cx"> DispatchSpeed m_dispatchSpeed;
</span><ins>+ SavedSettings m_savedSettings;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>
</body>
</html>