Diff
Modified: trunk/Source/WebCore/ChangeLog (164296 => 164297)
--- 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)
@@ -1,3 +1,22 @@
+2014-02-18 Sam Weinig <s...@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:
+
2014-02-18 Eric Carlson <eric.carl...@apple.com>
Do not cache media time until media engine returns a non-zero value
Modified: trunk/Source/WebCore/WebCore.exp.in (164296 => 164297)
--- 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)
@@ -1030,8 +1030,6 @@
__ZN7WebCore4Page24resumeScriptedAnimationsEv
__ZN7WebCore4Page24scrollingStateTreeAsTextEv
__ZN7WebCore4Page25suspendScriptedAnimationsEv
-__ZN7WebCore4Page31setCustomHTMLTokenizerChunkSizeEi
-__ZN7WebCore4Page31setCustomHTMLTokenizerTimeDelayEd
__ZN7WebCore4Page33synchronousScrollingReasonsAsTextEv
__ZN7WebCore4Page32setMemoryCacheClientCallsEnabledEb
__ZN7WebCore4Page35resumeActiveDOMObjectsAndAnimationsEv
Modified: trunk/Source/WebCore/html/parser/HTMLParserScheduler.cpp (164296 => 164297)
--- 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)
@@ -52,16 +52,6 @@
return defaultParserTimeLimit;
}
-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;
-}
-
ActiveParserSession::ActiveParserSession(Document* document)
: m_document(document)
{
@@ -97,7 +87,7 @@
HTMLParserScheduler::HTMLParserScheduler(HTMLDocumentParser& parser)
: m_parser(parser)
, m_parserTimeLimit(parserTimeLimit(m_parser.document()->page()))
- , m_parserChunkSize(parserChunkSize(m_parser.document()->page()))
+ , m_parserChunkSize(defaultParserChunkSize)
, m_continueNextChunkTimer(this, &HTMLParserScheduler::continueNextChunkTimerFired)
, m_isSuspendedWithActiveTimer(false)
#if !ASSERT_DISABLED
Modified: trunk/Source/WebCore/page/Page.cpp (164296 => 164297)
--- 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)
@@ -165,8 +165,6 @@
, m_userStyleSheetModificationTime(0)
, m_group(0)
, m_debugger(0)
- , m_customHTMLTokenizerTimeDelay(-1)
- , m_customHTMLTokenizerChunkSize(-1)
, m_canStartMedia(true)
#if ENABLE(VIEW_MODE_CSS_MEDIA)
, m_viewMode(ViewModeWindowed)
@@ -998,22 +996,15 @@
m_sessionStorage = newStorage;
}
-void Page::setCustomHTMLTokenizerTimeDelay(double customHTMLTokenizerTimeDelay)
+bool Page::hasCustomHTMLTokenizerTimeDelay() const
{
- if (customHTMLTokenizerTimeDelay < 0) {
- m_customHTMLTokenizerTimeDelay = -1;
- return;
- }
- m_customHTMLTokenizerTimeDelay = customHTMLTokenizerTimeDelay;
+ return m_settings->maxParseDuration() != -1;
}
-void Page::setCustomHTMLTokenizerChunkSize(int customHTMLTokenizerChunkSize)
+double Page::customHTMLTokenizerTimeDelay() const
{
- if (customHTMLTokenizerChunkSize < 0) {
- m_customHTMLTokenizerChunkSize = -1;
- return;
- }
- m_customHTMLTokenizerChunkSize = customHTMLTokenizerChunkSize;
+ ASSERT(m_settings->maxParseDuration() != -1);
+ return m_settings->maxParseDuration();
}
void Page::setMemoryCacheClientCallsEnabled(bool enabled)
Modified: trunk/Source/WebCore/page/Page.h (164296 => 164297)
--- 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)
@@ -322,21 +322,9 @@
StorageNamespace* sessionStorage(bool optionalCreate = true);
void setSessionStorage(PassRefPtr<StorageNamespace>);
- // 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
+ bool hasCustomHTMLTokenizerTimeDelay() const;
+ double customHTMLTokenizerTimeDelay() const;
- void setCustomHTMLTokenizerChunkSize(int);
- bool hasCustomHTMLTokenizerChunkSize() const { return m_customHTMLTokenizerChunkSize != -1; }
- int customHTMLTokenizerChunkSize() const { ASSERT(m_customHTMLTokenizerChunkSize != -1); return m_customHTMLTokenizerChunkSize; }
-
void setMemoryCacheClientCallsEnabled(bool);
bool areMemoryCacheClientCallsEnabled() const { return m_areMemoryCacheClientCallsEnabled; }
@@ -504,9 +492,6 @@
JSC::Debugger* m_debugger;
- double m_customHTMLTokenizerTimeDelay;
- int m_customHTMLTokenizerChunkSize;
-
bool m_canStartMedia;
RefPtr<StorageNamespace> m_sessionStorage;
Modified: trunk/Source/WebKit/mac/ChangeLog (164296 => 164297)
--- 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)
@@ -1,3 +1,15 @@
+2014-02-18 Sam Weinig <s...@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:
+
2014-02-17 Anders Carlsson <ander...@apple.com>
Remove view source code
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (164296 => 164297)
--- 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)
@@ -3808,20 +3808,6 @@
coreFrame->editor().command(name).execute(value);
}
-- (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);
-}
-
- (void)_clearMainFrameName
{
_private->page->mainFrame().tree().clearName();
Modified: trunk/Source/WebKit/mac/WebView/WebViewPrivate.h (164296 => 164297)
--- 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)
@@ -751,9 +751,6 @@
- (void)_executeCoreCommandByName:(NSString *)name value:(NSString *)value;
- (void)_clearMainFrameName;
-- (void)_setCustomHTMLTokenizerTimeDelay:(double)timeDelay;
-- (void)_setCustomHTMLTokenizerChunkSize:(int)chunkSize;
-
- (void)setSelectTrailingWhitespaceEnabled:(BOOL)flag;
- (BOOL)isSelectTrailingWhitespaceEnabled;
Modified: trunk/Source/WebKit/win/ChangeLog (164296 => 164297)
--- 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)
@@ -1,3 +1,16 @@
+2014-02-18 Sam Weinig <s...@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):
+
2014-02-17 Anders Carlsson <ander...@apple.com>
Remove view source code
Modified: trunk/Source/WebKit/win/WebView.cpp (164296 => 164297)
--- 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)
@@ -5976,21 +5976,15 @@
HRESULT STDMETHODCALLTYPE WebView::setCustomHTMLTokenizerTimeDelay(
/* [in] */ double timeDelay)
{
- if (!m_page)
- return E_FAIL;
-
- m_page->setCustomHTMLTokenizerTimeDelay(timeDelay);
- return S_OK;
+ ASSERT_NOT_REACHED();
+ return E_FAIL;
}
HRESULT STDMETHODCALLTYPE WebView::setCustomHTMLTokenizerChunkSize(
/* [in] */ int chunkSize)
{
- if (!m_page)
- return E_FAIL;
-
- m_page->setCustomHTMLTokenizerChunkSize(chunkSize);
- return S_OK;
+ ASSERT_NOT_REACHED();
+ return E_FAIL;
}
HRESULT STDMETHODCALLTYPE WebView::backingStore(
