<!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>[198861] branches/safari-601-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/198861">198861</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2016-03-30 15:42:47 -0700 (Wed, 30 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/198687">r198687</a>. rdar://problem/25448871</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchChangeLog">branches/safari-601-branch/ChangeLog</a></li>
<li><a href="#branchessafari601branchLayoutTestsChangeLog">branches/safari-601-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebCoreChangeLog">branches/safari-601-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebCorepageHistorycpp">branches/safari-601-branch/Source/WebCore/page/History.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCorepageHistoryh">branches/safari-601-branch/Source/WebCore/page/History.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601branchManualTestsstateobjectstimelimithtml">branches/safari-601-branch/ManualTests/state-objects-time-limit.html</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestsfastloaderstateobjectspushstatefrequencywithusergestureexpectedtxt">branches/safari-601-branch/LayoutTests/fast/loader/stateobjects/pushstate-frequency-with-user-gesture-expected.txt</a></li>
<li><a href="#branchessafari601branchLayoutTestsfastloaderstateobjectspushstatefrequencywithusergesturehtml">branches/safari-601-branch/LayoutTests/fast/loader/stateobjects/pushstate-frequency-with-user-gesture.html</a></li>
<li><a href="#branchessafari601branchLayoutTestsfastloaderstateobjectsreplacestatefrequencywithusergestureexpectedtxt">branches/safari-601-branch/LayoutTests/fast/loader/stateobjects/replacestate-frequency-with-user-gesture-expected.txt</a></li>
<li><a href="#branchessafari601branchLayoutTestsfastloaderstateobjectsreplacestatefrequencywithusergesturehtml">branches/safari-601-branch/LayoutTests/fast/loader/stateobjects/replacestate-frequency-with-user-gesture.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/ChangeLog (198860 => 198861)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/ChangeLog 2016-03-30 22:34:56 UTC (rev 198860)
+++ branches/safari-601-branch/ChangeLog 2016-03-30 22:42:47 UTC (rev 198861)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-03-30 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r198687. rdar://problem/25448871
+
+ 2016-03-25 Brady Eidson <beidson@apple.com>
+
+ Soften push/replaceState frequency restrictions.
+ <rdar://problem/25228439> and https://bugs.webkit.org/show_bug.cgi?id=155901
+
+ Rubber-stamped by Timothy Hatcher.
+
+ * ManualTests/state-objects-time-limit.html: Added.
+
</ins><span class="cx"> 2015-10-14 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r191008. rdar://problem/23111794
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/ChangeLog (198860 => 198861)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/ChangeLog 2016-03-30 22:34:56 UTC (rev 198860)
+++ branches/safari-601-branch/LayoutTests/ChangeLog 2016-03-30 22:42:47 UTC (rev 198861)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-03-30 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r198687. rdar://problem/25448871
+
+ 2016-03-25 Brady Eidson <beidson@apple.com>
+
+ Soften push/replaceState frequency restrictions.
+ <rdar://problem/25228439> and https://bugs.webkit.org/show_bug.cgi?id=155901
+
+ Rubber-stamped by Timothy Hatcher.
+
+ * fast/loader/stateobjects/pushstate-frequency-with-user-gesture-expected.txt: Removed.
+ * fast/loader/stateobjects/pushstate-frequency-with-user-gesture.html: Removed.
+ * fast/loader/stateobjects/replacestate-frequency-with-user-gesture-expected.txt: Removed.
+ * fast/loader/stateobjects/replacestate-frequency-with-user-gesture.html: Removed.
+
</ins><span class="cx"> 2016-03-24 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r198592. rdar://problem/25332806
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsfastloaderstateobjectspushstatefrequencywithusergestureexpectedtxt"></a>
<div class="delfile"><h4>Deleted: branches/safari-601-branch/LayoutTests/fast/loader/stateobjects/pushstate-frequency-with-user-gesture-expected.txt (198860 => 198861)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/fast/loader/stateobjects/pushstate-frequency-with-user-gesture-expected.txt 2016-03-30 22:34:56 UTC (rev 198860)
+++ branches/safari-601-branch/LayoutTests/fast/loader/stateobjects/pushstate-frequency-with-user-gesture-expected.txt 2016-03-30 22:42:47 UTC (rev 198861)
</span><span class="lines">@@ -1,206 +0,0 @@
</span><del>-Test should complete quickly and not crash.
-Click to test pushState through a user gesture
-Successfully added item: 0
-Successfully added item: 1
-Successfully added item: 2
-Successfully added item: 3
-Successfully added item: 4
-Successfully added item: 5
-Successfully added item: 6
-Successfully added item: 7
-Successfully added item: 8
-Successfully added item: 9
-Successfully added item: 10
-Successfully added item: 11
-Successfully added item: 12
-Successfully added item: 13
-Successfully added item: 14
-Successfully added item: 15
-Successfully added item: 16
-Successfully added item: 17
-Successfully added item: 18
-Successfully added item: 19
-Successfully added item: 20
-Successfully added item: 21
-Successfully added item: 22
-Successfully added item: 23
-Successfully added item: 24
-Successfully added item: 25
-Successfully added item: 26
-Successfully added item: 27
-Successfully added item: 28
-Successfully added item: 29
-Successfully added item: 30
-Successfully added item: 31
-Successfully added item: 32
-Successfully added item: 33
-Successfully added item: 34
-Successfully added item: 35
-Successfully added item: 36
-Successfully added item: 37
-Successfully added item: 38
-Successfully added item: 39
-Successfully added item: 40
-Successfully added item: 41
-Successfully added item: 42
-Successfully added item: 43
-Successfully added item: 44
-Successfully added item: 45
-Successfully added item: 46
-Successfully added item: 47
-Successfully added item: 48
-Successfully added item: 49
-Successfully added item: 50
-Successfully added item: 51
-Successfully added item: 52
-Successfully added item: 53
-Successfully added item: 54
-Successfully added item: 55
-Successfully added item: 56
-Successfully added item: 57
-Successfully added item: 58
-Successfully added item: 59
-Successfully added item: 60
-Successfully added item: 61
-Successfully added item: 62
-Successfully added item: 63
-Successfully added item: 64
-Successfully added item: 65
-Successfully added item: 66
-Successfully added item: 67
-Successfully added item: 68
-Successfully added item: 69
-Successfully added item: 70
-Successfully added item: 71
-Successfully added item: 72
-Successfully added item: 73
-Successfully added item: 74
-Successfully added item: 75
-Successfully added item: 76
-Successfully added item: 77
-Successfully added item: 78
-Successfully added item: 79
-Successfully added item: 80
-Successfully added item: 81
-Successfully added item: 82
-Successfully added item: 83
-Successfully added item: 84
-Successfully added item: 85
-Successfully added item: 86
-Successfully added item: 87
-Successfully added item: 88
-Successfully added item: 89
-Successfully added item: 90
-Successfully added item: 91
-Successfully added item: 92
-Successfully added item: 93
-Successfully added item: 94
-Successfully added item: 95
-Successfully added item: 96
-Successfully added item: 97
-Successfully added item: 98
-Successfully added item: 99
-Error: SecurityError: DOM Exception 18
-Successfully added user gesture item: 0
-Successfully added user gesture item: 1
-Successfully added user gesture item: 2
-Successfully added user gesture item: 3
-Successfully added user gesture item: 4
-Successfully added user gesture item: 5
-Successfully added user gesture item: 6
-Successfully added user gesture item: 7
-Successfully added user gesture item: 8
-Successfully added user gesture item: 9
-Successfully added user gesture item: 10
-Successfully added user gesture item: 11
-Successfully added user gesture item: 12
-Successfully added user gesture item: 13
-Successfully added user gesture item: 14
-Successfully added user gesture item: 15
-Successfully added user gesture item: 16
-Successfully added user gesture item: 17
-Successfully added user gesture item: 18
-Successfully added user gesture item: 19
-Successfully added user gesture item: 20
-Successfully added user gesture item: 21
-Successfully added user gesture item: 22
-Successfully added user gesture item: 23
-Successfully added user gesture item: 24
-Successfully added user gesture item: 25
-Successfully added user gesture item: 26
-Successfully added user gesture item: 27
-Successfully added user gesture item: 28
-Successfully added user gesture item: 29
-Successfully added user gesture item: 30
-Successfully added user gesture item: 31
-Successfully added user gesture item: 32
-Successfully added user gesture item: 33
-Successfully added user gesture item: 34
-Successfully added user gesture item: 35
-Successfully added user gesture item: 36
-Successfully added user gesture item: 37
-Successfully added user gesture item: 38
-Successfully added user gesture item: 39
-Successfully added user gesture item: 40
-Successfully added user gesture item: 41
-Successfully added user gesture item: 42
-Successfully added user gesture item: 43
-Successfully added user gesture item: 44
-Successfully added user gesture item: 45
-Successfully added user gesture item: 46
-Successfully added user gesture item: 47
-Successfully added user gesture item: 48
-Successfully added user gesture item: 49
-Successfully added user gesture item: 50
-Successfully added user gesture item: 51
-Successfully added user gesture item: 52
-Successfully added user gesture item: 53
-Successfully added user gesture item: 54
-Successfully added user gesture item: 55
-Successfully added user gesture item: 56
-Successfully added user gesture item: 57
-Successfully added user gesture item: 58
-Successfully added user gesture item: 59
-Successfully added user gesture item: 60
-Successfully added user gesture item: 61
-Successfully added user gesture item: 62
-Successfully added user gesture item: 63
-Successfully added user gesture item: 64
-Successfully added user gesture item: 65
-Successfully added user gesture item: 66
-Successfully added user gesture item: 67
-Successfully added user gesture item: 68
-Successfully added user gesture item: 69
-Successfully added user gesture item: 70
-Successfully added user gesture item: 71
-Successfully added user gesture item: 72
-Successfully added user gesture item: 73
-Successfully added user gesture item: 74
-Successfully added user gesture item: 75
-Successfully added user gesture item: 76
-Successfully added user gesture item: 77
-Successfully added user gesture item: 78
-Successfully added user gesture item: 79
-Successfully added user gesture item: 80
-Successfully added user gesture item: 81
-Successfully added user gesture item: 82
-Successfully added user gesture item: 83
-Successfully added user gesture item: 84
-Successfully added user gesture item: 85
-Successfully added user gesture item: 86
-Successfully added user gesture item: 87
-Successfully added user gesture item: 88
-Successfully added user gesture item: 89
-Successfully added user gesture item: 90
-Successfully added user gesture item: 91
-Successfully added user gesture item: 92
-Successfully added user gesture item: 93
-Successfully added user gesture item: 94
-Successfully added user gesture item: 95
-Successfully added user gesture item: 96
-Successfully added user gesture item: 97
-Successfully added user gesture item: 98
-Successfully added user gesture item: 99
-User gesture: Error: SecurityError: DOM Exception 18
-Test complete
-
</del></span></pre></div>
<a id="branchessafari601branchLayoutTestsfastloaderstateobjectspushstatefrequencywithusergesturehtml"></a>
<div class="delfile"><h4>Deleted: branches/safari-601-branch/LayoutTests/fast/loader/stateobjects/pushstate-frequency-with-user-gesture.html (198860 => 198861)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/fast/loader/stateobjects/pushstate-frequency-with-user-gesture.html 2016-03-30 22:34:56 UTC (rev 198860)
+++ branches/safari-601-branch/LayoutTests/fast/loader/stateobjects/pushstate-frequency-with-user-gesture.html 2016-03-30 22:42:47 UTC (rev 198861)
</span><span class="lines">@@ -1,51 +0,0 @@
</span><del>-<script>
-
-if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
-}
-
-function log(msg) {
- document.getElementById("logger").innerHTML += msg + "<br>";
-}
-
-window.onload = function()
-{
- try {
- for( var i = 0; i < 100000; ++i ) {
- history.pushState(0, 0, i);
- log("Successfully added item: " + i);
- }
- } catch (e) {
- log(e);
- }
-
- var button = document.getElementById("button");
- eventSender.mouseMoveTo(button.offsetLeft + 5, button.offsetTop + 5);
- eventSender.mouseDown();
- eventSender.mouseUp();
-}
-
-function clicked()
-{
- try {
- for( var i = 0; i < 100000; ++i ) {
- history.pushState(0, 0, i);
- log("Successfully added user gesture item: " + i);
- }
- } catch (e) {
- log("User gesture: " + e);
- }
-
- if (window.testRunner)
- testRunner.notifyDone();
-
- log("Test complete");
-}
-
-</script>
-<body>
-Test should complete quickly and not crash.<br>
-<button id="button" onclick="clicked();">Click to test pushState through a user gesture</button>
-<div id="logger"></div>
-</body>
</del></span></pre></div>
<a id="branchessafari601branchLayoutTestsfastloaderstateobjectsreplacestatefrequencywithusergestureexpectedtxt"></a>
<div class="delfile"><h4>Deleted: branches/safari-601-branch/LayoutTests/fast/loader/stateobjects/replacestate-frequency-with-user-gesture-expected.txt (198860 => 198861)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/fast/loader/stateobjects/replacestate-frequency-with-user-gesture-expected.txt 2016-03-30 22:34:56 UTC (rev 198860)
+++ branches/safari-601-branch/LayoutTests/fast/loader/stateobjects/replacestate-frequency-with-user-gesture-expected.txt 2016-03-30 22:42:47 UTC (rev 198861)
</span><span class="lines">@@ -1,206 +0,0 @@
</span><del>-Test should complete quickly and not crash.
-Click to test replaceState through a user gesture
-Successfully added item: 0
-Successfully added item: 1
-Successfully added item: 2
-Successfully added item: 3
-Successfully added item: 4
-Successfully added item: 5
-Successfully added item: 6
-Successfully added item: 7
-Successfully added item: 8
-Successfully added item: 9
-Successfully added item: 10
-Successfully added item: 11
-Successfully added item: 12
-Successfully added item: 13
-Successfully added item: 14
-Successfully added item: 15
-Successfully added item: 16
-Successfully added item: 17
-Successfully added item: 18
-Successfully added item: 19
-Successfully added item: 20
-Successfully added item: 21
-Successfully added item: 22
-Successfully added item: 23
-Successfully added item: 24
-Successfully added item: 25
-Successfully added item: 26
-Successfully added item: 27
-Successfully added item: 28
-Successfully added item: 29
-Successfully added item: 30
-Successfully added item: 31
-Successfully added item: 32
-Successfully added item: 33
-Successfully added item: 34
-Successfully added item: 35
-Successfully added item: 36
-Successfully added item: 37
-Successfully added item: 38
-Successfully added item: 39
-Successfully added item: 40
-Successfully added item: 41
-Successfully added item: 42
-Successfully added item: 43
-Successfully added item: 44
-Successfully added item: 45
-Successfully added item: 46
-Successfully added item: 47
-Successfully added item: 48
-Successfully added item: 49
-Successfully added item: 50
-Successfully added item: 51
-Successfully added item: 52
-Successfully added item: 53
-Successfully added item: 54
-Successfully added item: 55
-Successfully added item: 56
-Successfully added item: 57
-Successfully added item: 58
-Successfully added item: 59
-Successfully added item: 60
-Successfully added item: 61
-Successfully added item: 62
-Successfully added item: 63
-Successfully added item: 64
-Successfully added item: 65
-Successfully added item: 66
-Successfully added item: 67
-Successfully added item: 68
-Successfully added item: 69
-Successfully added item: 70
-Successfully added item: 71
-Successfully added item: 72
-Successfully added item: 73
-Successfully added item: 74
-Successfully added item: 75
-Successfully added item: 76
-Successfully added item: 77
-Successfully added item: 78
-Successfully added item: 79
-Successfully added item: 80
-Successfully added item: 81
-Successfully added item: 82
-Successfully added item: 83
-Successfully added item: 84
-Successfully added item: 85
-Successfully added item: 86
-Successfully added item: 87
-Successfully added item: 88
-Successfully added item: 89
-Successfully added item: 90
-Successfully added item: 91
-Successfully added item: 92
-Successfully added item: 93
-Successfully added item: 94
-Successfully added item: 95
-Successfully added item: 96
-Successfully added item: 97
-Successfully added item: 98
-Successfully added item: 99
-Error: SecurityError: DOM Exception 18
-Successfully added user gesture item: 0
-Successfully added user gesture item: 1
-Successfully added user gesture item: 2
-Successfully added user gesture item: 3
-Successfully added user gesture item: 4
-Successfully added user gesture item: 5
-Successfully added user gesture item: 6
-Successfully added user gesture item: 7
-Successfully added user gesture item: 8
-Successfully added user gesture item: 9
-Successfully added user gesture item: 10
-Successfully added user gesture item: 11
-Successfully added user gesture item: 12
-Successfully added user gesture item: 13
-Successfully added user gesture item: 14
-Successfully added user gesture item: 15
-Successfully added user gesture item: 16
-Successfully added user gesture item: 17
-Successfully added user gesture item: 18
-Successfully added user gesture item: 19
-Successfully added user gesture item: 20
-Successfully added user gesture item: 21
-Successfully added user gesture item: 22
-Successfully added user gesture item: 23
-Successfully added user gesture item: 24
-Successfully added user gesture item: 25
-Successfully added user gesture item: 26
-Successfully added user gesture item: 27
-Successfully added user gesture item: 28
-Successfully added user gesture item: 29
-Successfully added user gesture item: 30
-Successfully added user gesture item: 31
-Successfully added user gesture item: 32
-Successfully added user gesture item: 33
-Successfully added user gesture item: 34
-Successfully added user gesture item: 35
-Successfully added user gesture item: 36
-Successfully added user gesture item: 37
-Successfully added user gesture item: 38
-Successfully added user gesture item: 39
-Successfully added user gesture item: 40
-Successfully added user gesture item: 41
-Successfully added user gesture item: 42
-Successfully added user gesture item: 43
-Successfully added user gesture item: 44
-Successfully added user gesture item: 45
-Successfully added user gesture item: 46
-Successfully added user gesture item: 47
-Successfully added user gesture item: 48
-Successfully added user gesture item: 49
-Successfully added user gesture item: 50
-Successfully added user gesture item: 51
-Successfully added user gesture item: 52
-Successfully added user gesture item: 53
-Successfully added user gesture item: 54
-Successfully added user gesture item: 55
-Successfully added user gesture item: 56
-Successfully added user gesture item: 57
-Successfully added user gesture item: 58
-Successfully added user gesture item: 59
-Successfully added user gesture item: 60
-Successfully added user gesture item: 61
-Successfully added user gesture item: 62
-Successfully added user gesture item: 63
-Successfully added user gesture item: 64
-Successfully added user gesture item: 65
-Successfully added user gesture item: 66
-Successfully added user gesture item: 67
-Successfully added user gesture item: 68
-Successfully added user gesture item: 69
-Successfully added user gesture item: 70
-Successfully added user gesture item: 71
-Successfully added user gesture item: 72
-Successfully added user gesture item: 73
-Successfully added user gesture item: 74
-Successfully added user gesture item: 75
-Successfully added user gesture item: 76
-Successfully added user gesture item: 77
-Successfully added user gesture item: 78
-Successfully added user gesture item: 79
-Successfully added user gesture item: 80
-Successfully added user gesture item: 81
-Successfully added user gesture item: 82
-Successfully added user gesture item: 83
-Successfully added user gesture item: 84
-Successfully added user gesture item: 85
-Successfully added user gesture item: 86
-Successfully added user gesture item: 87
-Successfully added user gesture item: 88
-Successfully added user gesture item: 89
-Successfully added user gesture item: 90
-Successfully added user gesture item: 91
-Successfully added user gesture item: 92
-Successfully added user gesture item: 93
-Successfully added user gesture item: 94
-Successfully added user gesture item: 95
-Successfully added user gesture item: 96
-Successfully added user gesture item: 97
-Successfully added user gesture item: 98
-Successfully added user gesture item: 99
-User gesture: Error: SecurityError: DOM Exception 18
-Test complete
-
</del></span></pre></div>
<a id="branchessafari601branchLayoutTestsfastloaderstateobjectsreplacestatefrequencywithusergesturehtml"></a>
<div class="delfile"><h4>Deleted: branches/safari-601-branch/LayoutTests/fast/loader/stateobjects/replacestate-frequency-with-user-gesture.html (198860 => 198861)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/fast/loader/stateobjects/replacestate-frequency-with-user-gesture.html 2016-03-30 22:34:56 UTC (rev 198860)
+++ branches/safari-601-branch/LayoutTests/fast/loader/stateobjects/replacestate-frequency-with-user-gesture.html 2016-03-30 22:42:47 UTC (rev 198861)
</span><span class="lines">@@ -1,51 +0,0 @@
</span><del>-<script>
-
-if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
-}
-
-function log(msg) {
- document.getElementById("logger").innerHTML += msg + "<br>";
-}
-
-window.onload = function()
-{
- try {
- for( var i = 0; i < 100000; ++i ) {
- history.replaceState(0, 0, i);
- log("Successfully added item: " + i);
- }
- } catch (e) {
- log(e);
- }
-
- var button = document.getElementById("button");
- eventSender.mouseMoveTo(button.offsetLeft + 5, button.offsetTop + 5);
- eventSender.mouseDown();
- eventSender.mouseUp();
-}
-
-function clicked()
-{
- try {
- for( var i = 0; i < 100000; ++i ) {
- history.replaceState(0, 0, i);
- log("Successfully added user gesture item: " + i);
- }
- } catch (e) {
- log("User gesture: " + e);
- }
-
- if (window.testRunner)
- testRunner.notifyDone();
-
- log("Test complete");
-}
-
-</script>
-<body>
-Test should complete quickly and not crash.<br>
-<button id="button" onclick="clicked();">Click to test replaceState through a user gesture</button>
-<div id="logger"></div>
-</body>
</del></span></pre></div>
<a id="branchessafari601branchManualTestsstateobjectstimelimithtml"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/ManualTests/state-objects-time-limit.html (0 => 198861)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/ManualTests/state-objects-time-limit.html (rev 0)
+++ branches/safari-601-branch/ManualTests/state-objects-time-limit.html 2016-03-30 22:42:47 UTC (rev 198861)
</span><span class="lines">@@ -0,0 +1,51 @@
</span><ins>+<script>
+
+function log(msg) {
+ document.getElementById("logger").innerHTML += msg + " -- ";
+}
+
+function startTest() {
+ try {
+ for (var i = 0; i < 101; ++i) {
+ history.pushState(0, 0, i.toString());
+ log("Successfully added item: " + i);
+ }
+ } catch(e) {
+ log(e);
+ }
+
+ setTimeout(continueTest, 30050);
+}
+
+function continueTest() {
+ alert(1);
+ history.pushState(0, 0, "101");
+ log("After 30+ second delay, successfully added the 101th item");
+
+ try {
+ for (var i = 0; i < 100; ++i) {
+ history.replaceState(0, 0, i.toString());
+ log("Successfully replaced with item: " + i);
+ }
+ } catch(e) {
+ alert(2);
+ log(e);
+ }
+
+ setTimeout(finishTest, 30050);
+}
+
+function finishTest() {
+ alert(3);
+ history.replaceState(0, 0, "100");
+ log("After 30+ second delay, successfully replaced the 100th item");
+}
+
+</script>
+This test will take over a minute to run.<br>
+100 items should successfully push, and the 101th should fail.<br>
+After 30+ seconds, 101th should successfully push.<br>
+Then 99 items should successfully replace, with the 100th failing.<br>
+After 30+ seconds, the 100th should successfully replace.<br>
+<button onclick="startTest();">Click to start test</button>
+<div id="logger"></div>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (198860 => 198861)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/ChangeLog 2016-03-30 22:34:56 UTC (rev 198860)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2016-03-30 22:42:47 UTC (rev 198861)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-03-30 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r198687. rdar://problem/25448871
+
+ 2016-03-25 Brady Eidson <beidson@apple.com>
+
+ Soften push/replaceState frequency restrictions.
+ <rdar://problem/25228439> and https://bugs.webkit.org/show_bug.cgi?id=155901
+
+ Rubber-stamped by Timothy Hatcher.
+
+ Covered by existing LayoutTests and a new Manual Test.
+
+ * page/History.cpp:
+ (WebCore::History::stateObjectAdded): Allow 100 state object operations every 30 seconds.
+ * page/History.h:
+
</ins><span class="cx"> 2016-03-18 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r192285.
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorepageHistorycpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/page/History.cpp (198860 => 198861)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/page/History.cpp 2016-03-30 22:34:56 UTC (rev 198860)
+++ branches/safari-601-branch/Source/WebCore/page/History.cpp 2016-03-30 22:42:47 UTC (rev 198861)
</span><span class="lines">@@ -143,7 +143,8 @@
</span><span class="cx"> {
</span><span class="cx"> // Each unique main-frame document is only allowed to send 64mb of state object payload to the UI client/process.
</span><span class="cx"> static uint32_t totalStateObjectPayloadLimit = 0x4000000;
</span><del>- static unsigned perUserGestureStateObjectLimit = 100;
</del><ins>+ static double stateObjectTimeSpan = 30.0;
+ static unsigned perStateObjectTimeSpanLimit = 100;
</ins><span class="cx">
</span><span class="cx"> if (!m_frame || !m_frame->page())
</span><span class="cx"> return;
</span><span class="lines">@@ -164,25 +165,17 @@
</span><span class="cx"> if (!mainHistory)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- bool processingUserGesture = ScriptController::processingUserGesture();
- if (!processingUserGesture && mainHistory->m_nonUserGestureObjectsAdded >= perUserGestureStateObjectLimit) {
</del><ins>+ double currentTimestamp = currentTime();
+ if (currentTimestamp - mainHistory->m_currentStateObjectTimeSpanStart > stateObjectTimeSpan) {
+ mainHistory->m_currentStateObjectTimeSpanStart = currentTimestamp;
+ mainHistory->m_currentStateObjectTimeSpanObjectsAdded = 0;
+ }
+
+ if (mainHistory->m_currentStateObjectTimeSpanObjectsAdded >= perStateObjectTimeSpanLimit) {
</ins><span class="cx"> ec = SECURITY_ERR;
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- double userGestureTimestamp = mainDocument->lastHandledUserGestureTimestamp();
- if (processingUserGesture) {
- if (mainHistory->m_currentUserGestureTimestamp < userGestureTimestamp) {
- mainHistory->m_currentUserGestureTimestamp = userGestureTimestamp;
- mainHistory->m_currentUserGestureObjectsAdded = 0;
- }
-
- if (mainHistory->m_currentUserGestureObjectsAdded >= perUserGestureStateObjectLimit) {
- ec = SECURITY_ERR;
- return;
- }
- }
-
</del><span class="cx"> Checked<unsigned> titleSize = title.length();
</span><span class="cx"> titleSize *= 2;
</span><span class="cx">
</span><span class="lines">@@ -207,10 +200,7 @@
</span><span class="cx"> m_mostRecentStateObjectUsage = payloadSize.unsafeGet();
</span><span class="cx">
</span><span class="cx"> mainHistory->m_totalStateObjectUsage = newTotalUsage.unsafeGet();
</span><del>- if (processingUserGesture)
- ++mainHistory->m_currentUserGestureObjectsAdded;
- else
- ++mainHistory->m_nonUserGestureObjectsAdded;
</del><ins>+ ++mainHistory->m_currentStateObjectTimeSpanObjectsAdded;
</ins><span class="cx">
</span><span class="cx"> if (!urlString.isEmpty())
</span><span class="cx"> m_frame->document()->updateURLForPushOrReplaceState(fullURL);
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorepageHistoryh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/page/History.h (198860 => 198861)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/page/History.h 2016-03-30 22:34:56 UTC (rev 198860)
+++ branches/safari-601-branch/Source/WebCore/page/History.h 2016-03-30 22:42:47 UTC (rev 198861)
</span><span class="lines">@@ -72,9 +72,8 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<SerializedScriptValue> m_lastStateObjectRequested;
</span><span class="cx">
</span><del>- unsigned m_nonUserGestureObjectsAdded { 0 };
- unsigned m_currentUserGestureObjectsAdded { 0 };
- double m_currentUserGestureTimestamp { 0 };
</del><ins>+ unsigned m_currentStateObjectTimeSpanObjectsAdded { 0 };
+ double m_currentStateObjectTimeSpanStart { 0.0 };
</ins><span class="cx">
</span><span class="cx"> // For the main frame's History object to keep track of all state object usage.
</span><span class="cx"> uint64_t m_totalStateObjectUsage { 0 };
</span></span></pre>
</div>
</div>
</body>
</html>