<!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>[164297] 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/164297">164297</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2014-02-18 10:58:50 -0800 (Tue, 18 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simplify HTML tokenizer parameterization down to what is used
https://bugs.webkit.org/show_bug.cgi?id=128977
Reviewed by Alexey Proskuryakov.
../WebCore:
- Removes support for CustomHTMLTokenizerChunkSize.
- Consolidates CustomHTMLTokenizerTimeDelay down to one implementation, using Settings::maxParseDuration
* WebCore.exp.in:
* html/parser/HTMLParserScheduler.cpp:
(WebCore::HTMLParserScheduler::HTMLParserScheduler):
* page/Page.cpp:
(WebCore::Page::Page):
(WebCore::Page::hasCustomHTMLTokenizerTimeDelay):
(WebCore::Page::customHTMLTokenizerTimeDelay):
* page/Page.h:
../WebKit/mac:
Remove unused _setCustomHTMLTokenizerTimeDelay and _setCustomHTMLTokenizerChunkSize SPI.
* WebView/WebView.mm:
* WebView/WebViewPrivate.h:
../WebKit/win:
Remove unused SPI.
* WebView.cpp:
(WebView::setCustomHTMLTokenizerTimeDelay):
(WebView::setCustomHTMLTokenizerChunkSize):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCorehtmlparserHTMLParserSchedulercpp">trunk/Source/WebCore/html/parser/HTMLParserScheduler.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePagecpp">trunk/Source/WebCore/page/Page.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageh">trunk/Source/WebCore/page/Page.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewPrivateh">trunk/Source/WebKit/mac/WebView/WebViewPrivate.h</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebViewcpp">trunk/Source/WebKit/win/WebView.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164296 => 164297)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-18 18:43:49 UTC (rev 164296)
+++ trunk/Source/WebCore/ChangeLog 2014-02-18 18:58:50 UTC (rev 164297)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-02-18 Sam Weinig <sam@webkit.org>
+
+ Simplify HTML tokenizer parameterization down to what is used
+ https://bugs.webkit.org/show_bug.cgi?id=128977
+
+ Reviewed by Alexey Proskuryakov.
+
+ - Removes support for CustomHTMLTokenizerChunkSize.
+ - Consolidates CustomHTMLTokenizerTimeDelay down to one implementation, using Settings::maxParseDuration
+
+ * WebCore.exp.in:
+ * html/parser/HTMLParserScheduler.cpp:
+ (WebCore::HTMLParserScheduler::HTMLParserScheduler):
+ * page/Page.cpp:
+ (WebCore::Page::Page):
+ (WebCore::Page::hasCustomHTMLTokenizerTimeDelay):
+ (WebCore::Page::customHTMLTokenizerTimeDelay):
+ * page/Page.h:
+
</ins><span class="cx"> 2014-02-18 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> Do not cache media time until media engine returns a non-zero value
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (164296 => 164297)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-02-18 18:43:49 UTC (rev 164296)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-02-18 18:58:50 UTC (rev 164297)
</span><span class="lines">@@ -1030,8 +1030,6 @@
</span><span class="cx"> __ZN7WebCore4Page24resumeScriptedAnimationsEv
</span><span class="cx"> __ZN7WebCore4Page24scrollingStateTreeAsTextEv
</span><span class="cx"> __ZN7WebCore4Page25suspendScriptedAnimationsEv
</span><del>-__ZN7WebCore4Page31setCustomHTMLTokenizerChunkSizeEi
-__ZN7WebCore4Page31setCustomHTMLTokenizerTimeDelayEd
</del><span class="cx"> __ZN7WebCore4Page33synchronousScrollingReasonsAsTextEv
</span><span class="cx"> __ZN7WebCore4Page32setMemoryCacheClientCallsEnabledEb
</span><span class="cx"> __ZN7WebCore4Page35resumeActiveDOMObjectsAndAnimationsEv
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlparserHTMLParserSchedulercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/parser/HTMLParserScheduler.cpp (164296 => 164297)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/parser/HTMLParserScheduler.cpp 2014-02-18 18:43:49 UTC (rev 164296)
+++ trunk/Source/WebCore/html/parser/HTMLParserScheduler.cpp 2014-02-18 18:58:50 UTC (rev 164297)
</span><span class="lines">@@ -52,16 +52,6 @@
</span><span class="cx"> return defaultParserTimeLimit;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static int parserChunkSize(Page* page)
-{
- // FIXME: We may need to divide the value from customHTMLTokenizerChunkSize
- // by some constant to translate from the "character" based behavior of the
- // old LegacyHTMLDocumentParser to the token-based behavior of this parser.
- if (page && page->hasCustomHTMLTokenizerChunkSize())
- return page->customHTMLTokenizerChunkSize();
- return defaultParserChunkSize;
-}
-
</del><span class="cx"> ActiveParserSession::ActiveParserSession(Document* document)
</span><span class="cx"> : m_document(document)
</span><span class="cx"> {
</span><span class="lines">@@ -97,7 +87,7 @@
</span><span class="cx"> HTMLParserScheduler::HTMLParserScheduler(HTMLDocumentParser& parser)
</span><span class="cx"> : m_parser(parser)
</span><span class="cx"> , m_parserTimeLimit(parserTimeLimit(m_parser.document()->page()))
</span><del>- , m_parserChunkSize(parserChunkSize(m_parser.document()->page()))
</del><ins>+ , m_parserChunkSize(defaultParserChunkSize)
</ins><span class="cx"> , m_continueNextChunkTimer(this, &HTMLParserScheduler::continueNextChunkTimerFired)
</span><span class="cx"> , m_isSuspendedWithActiveTimer(false)
</span><span class="cx"> #if !ASSERT_DISABLED
</span></span></pre></div>
<a id="trunkSourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.cpp (164296 => 164297)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.cpp 2014-02-18 18:43:49 UTC (rev 164296)
+++ trunk/Source/WebCore/page/Page.cpp 2014-02-18 18:58:50 UTC (rev 164297)
</span><span class="lines">@@ -165,8 +165,6 @@
</span><span class="cx"> , m_userStyleSheetModificationTime(0)
</span><span class="cx"> , m_group(0)
</span><span class="cx"> , m_debugger(0)
</span><del>- , m_customHTMLTokenizerTimeDelay(-1)
- , m_customHTMLTokenizerChunkSize(-1)
</del><span class="cx"> , m_canStartMedia(true)
</span><span class="cx"> #if ENABLE(VIEW_MODE_CSS_MEDIA)
</span><span class="cx"> , m_viewMode(ViewModeWindowed)
</span><span class="lines">@@ -998,22 +996,15 @@
</span><span class="cx"> m_sessionStorage = newStorage;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Page::setCustomHTMLTokenizerTimeDelay(double customHTMLTokenizerTimeDelay)
</del><ins>+bool Page::hasCustomHTMLTokenizerTimeDelay() const
</ins><span class="cx"> {
</span><del>- if (customHTMLTokenizerTimeDelay < 0) {
- m_customHTMLTokenizerTimeDelay = -1;
- return;
- }
- m_customHTMLTokenizerTimeDelay = customHTMLTokenizerTimeDelay;
</del><ins>+ return m_settings->maxParseDuration() != -1;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void Page::setCustomHTMLTokenizerChunkSize(int customHTMLTokenizerChunkSize)
</del><ins>+double Page::customHTMLTokenizerTimeDelay() const
</ins><span class="cx"> {
</span><del>- if (customHTMLTokenizerChunkSize < 0) {
- m_customHTMLTokenizerChunkSize = -1;
- return;
- }
- m_customHTMLTokenizerChunkSize = customHTMLTokenizerChunkSize;
</del><ins>+ ASSERT(m_settings->maxParseDuration() != -1);
+ return m_settings->maxParseDuration();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Page::setMemoryCacheClientCallsEnabled(bool enabled)
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.h (164296 => 164297)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.h 2014-02-18 18:43:49 UTC (rev 164296)
+++ trunk/Source/WebCore/page/Page.h 2014-02-18 18:58:50 UTC (rev 164297)
</span><span class="lines">@@ -322,21 +322,9 @@
</span><span class="cx"> StorageNamespace* sessionStorage(bool optionalCreate = true);
</span><span class="cx"> void setSessionStorage(PassRefPtr<StorageNamespace>);
</span><span class="cx">
</span><del>- // FIXME: We should make Settings::maxParseDuration() platform-independent, remove {has, set}CustomHTMLTokenizerTimeDelay()
- // and customHTMLTokenizerTimeDelay() and modify theirs callers to update or query Settings::maxParseDuration().
- void setCustomHTMLTokenizerTimeDelay(double);
-#if PLATFORM(IOS)
- bool hasCustomHTMLTokenizerTimeDelay() const { return m_settings->maxParseDuration() != -1; }
- double customHTMLTokenizerTimeDelay() const { ASSERT(m_settings->maxParseDuration() != -1); return m_settings->maxParseDuration(); }
-#else
- bool hasCustomHTMLTokenizerTimeDelay() const { return m_customHTMLTokenizerTimeDelay != -1; }
- double customHTMLTokenizerTimeDelay() const { ASSERT(m_customHTMLTokenizerTimeDelay != -1); return m_customHTMLTokenizerTimeDelay; }
-#endif
</del><ins>+ bool hasCustomHTMLTokenizerTimeDelay() const;
+ double customHTMLTokenizerTimeDelay() const;
</ins><span class="cx">
</span><del>- void setCustomHTMLTokenizerChunkSize(int);
- bool hasCustomHTMLTokenizerChunkSize() const { return m_customHTMLTokenizerChunkSize != -1; }
- int customHTMLTokenizerChunkSize() const { ASSERT(m_customHTMLTokenizerChunkSize != -1); return m_customHTMLTokenizerChunkSize; }
-
</del><span class="cx"> void setMemoryCacheClientCallsEnabled(bool);
</span><span class="cx"> bool areMemoryCacheClientCallsEnabled() const { return m_areMemoryCacheClientCallsEnabled; }
</span><span class="cx">
</span><span class="lines">@@ -504,9 +492,6 @@
</span><span class="cx">
</span><span class="cx"> JSC::Debugger* m_debugger;
</span><span class="cx">
</span><del>- double m_customHTMLTokenizerTimeDelay;
- int m_customHTMLTokenizerChunkSize;
-
</del><span class="cx"> bool m_canStartMedia;
</span><span class="cx">
</span><span class="cx"> RefPtr<StorageNamespace> m_sessionStorage;
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (164296 => 164297)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-02-18 18:43:49 UTC (rev 164296)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-02-18 18:58:50 UTC (rev 164297)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-02-18 Sam Weinig <sam@webkit.org>
+
+ Simplify HTML tokenizer parameterization down to what is used
+ https://bugs.webkit.org/show_bug.cgi?id=128977
+
+ Reviewed by Alexey Proskuryakov.
+
+ Remove unused _setCustomHTMLTokenizerTimeDelay and _setCustomHTMLTokenizerChunkSize SPI.
+
+ * WebView/WebView.mm:
+ * WebView/WebViewPrivate.h:
+
</ins><span class="cx"> 2014-02-17 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove view source code
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (164296 => 164297)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2014-02-18 18:43:49 UTC (rev 164296)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2014-02-18 18:58:50 UTC (rev 164297)
</span><span class="lines">@@ -3808,20 +3808,6 @@
</span><span class="cx"> coreFrame->editor().command(name).execute(value);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)_setCustomHTMLTokenizerTimeDelay:(double)timeDelay
-{
- if (!_private->page)
- return;
- return _private->page->setCustomHTMLTokenizerTimeDelay(timeDelay);
-}
-
-- (void)_setCustomHTMLTokenizerChunkSize:(int)chunkSize
-{
- if (!_private->page)
- return;
- return _private->page->setCustomHTMLTokenizerChunkSize(chunkSize);
-}
-
</del><span class="cx"> - (void)_clearMainFrameName
</span><span class="cx"> {
</span><span class="cx"> _private->page->mainFrame().tree().clearName();
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebViewPrivate.h (164296 => 164297)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebViewPrivate.h 2014-02-18 18:43:49 UTC (rev 164296)
+++ trunk/Source/WebKit/mac/WebView/WebViewPrivate.h 2014-02-18 18:58:50 UTC (rev 164297)
</span><span class="lines">@@ -751,9 +751,6 @@
</span><span class="cx"> - (void)_executeCoreCommandByName:(NSString *)name value:(NSString *)value;
</span><span class="cx"> - (void)_clearMainFrameName;
</span><span class="cx">
</span><del>-- (void)_setCustomHTMLTokenizerTimeDelay:(double)timeDelay;
-- (void)_setCustomHTMLTokenizerChunkSize:(int)chunkSize;
-
</del><span class="cx"> - (void)setSelectTrailingWhitespaceEnabled:(BOOL)flag;
</span><span class="cx"> - (BOOL)isSelectTrailingWhitespaceEnabled;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (164296 => 164297)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2014-02-18 18:43:49 UTC (rev 164296)
+++ trunk/Source/WebKit/win/ChangeLog 2014-02-18 18:58:50 UTC (rev 164297)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-02-18 Sam Weinig <sam@webkit.org>
+
+ Simplify HTML tokenizer parameterization down to what is used
+ https://bugs.webkit.org/show_bug.cgi?id=128977
+
+ Reviewed by Alexey Proskuryakov.
+
+ Remove unused SPI.
+
+ * WebView.cpp:
+ (WebView::setCustomHTMLTokenizerTimeDelay):
+ (WebView::setCustomHTMLTokenizerChunkSize):
+
</ins><span class="cx"> 2014-02-17 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove view source code
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebView.cpp (164296 => 164297)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebView.cpp 2014-02-18 18:43:49 UTC (rev 164296)
+++ trunk/Source/WebKit/win/WebView.cpp 2014-02-18 18:58:50 UTC (rev 164297)
</span><span class="lines">@@ -5976,21 +5976,15 @@
</span><span class="cx"> HRESULT STDMETHODCALLTYPE WebView::setCustomHTMLTokenizerTimeDelay(
</span><span class="cx"> /* [in] */ double timeDelay)
</span><span class="cx"> {
</span><del>- if (!m_page)
- return E_FAIL;
-
- m_page->setCustomHTMLTokenizerTimeDelay(timeDelay);
- return S_OK;
</del><ins>+ ASSERT_NOT_REACHED();
+ return E_FAIL;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> HRESULT STDMETHODCALLTYPE WebView::setCustomHTMLTokenizerChunkSize(
</span><span class="cx"> /* [in] */ int chunkSize)
</span><span class="cx"> {
</span><del>- if (!m_page)
- return E_FAIL;
-
- m_page->setCustomHTMLTokenizerChunkSize(chunkSize);
- return S_OK;
</del><ins>+ ASSERT_NOT_REACHED();
+ return E_FAIL;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> HRESULT STDMETHODCALLTYPE WebView::backingStore(
</span></span></pre>
</div>
</div>
</body>
</html>