Title: [140402] trunk/Source
- Revision
- 140402
- Author
- [email protected]
- Date
- 2013-01-22 02:24:30 -0800 (Tue, 22 Jan 2013)
Log Message
Turn on ENABLE_THREADED_HTML_PARSER for Chromium (it's still disabled at runtime)
https://bugs.webkit.org/show_bug.cgi?id=107519
Reviewed by Adam Barth.
Source/WebCore:
Add some ASSERTs to be double-dog-sure that we're never using
any of the threading code when threading is not enabled.
I also removed an if-branch in the !ENABLE_THREADED_HTML_PARSER case
as it's not needed.
* html/parser/HTMLDocumentParser.cpp:
(WebCore::HTMLDocumentParser::prepareToStopParsing):
(WebCore::HTMLDocumentParser::startBackgroundParser):
(WebCore::HTMLDocumentParser::stopBackgroundParser):
Source/WebKit/chromium:
This makes our development lives easier, and makes it possible for the bots
to run threaded-parser-only tests by toggling the runtime enable
via window.internals.settings.
* features.gypi:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (140401 => 140402)
--- trunk/Source/WebCore/ChangeLog 2013-01-22 09:48:22 UTC (rev 140401)
+++ trunk/Source/WebCore/ChangeLog 2013-01-22 10:24:30 UTC (rev 140402)
@@ -1,3 +1,21 @@
+2013-01-22 Eric Seidel <[email protected]>
+
+ Turn on ENABLE_THREADED_HTML_PARSER for Chromium (it's still disabled at runtime)
+ https://bugs.webkit.org/show_bug.cgi?id=107519
+
+ Reviewed by Adam Barth.
+
+ Add some ASSERTs to be double-dog-sure that we're never using
+ any of the threading code when threading is not enabled.
+
+ I also removed an if-branch in the !ENABLE_THREADED_HTML_PARSER case
+ as it's not needed.
+
+ * html/parser/HTMLDocumentParser.cpp:
+ (WebCore::HTMLDocumentParser::prepareToStopParsing):
+ (WebCore::HTMLDocumentParser::startBackgroundParser):
+ (WebCore::HTMLDocumentParser::stopBackgroundParser):
+
2013-01-22 Kentaro Hara <[email protected]>
[V8] Make an Isolate parameter mandatory in toV8()
Modified: trunk/Source/WebCore/html/parser/HTMLDocumentParser.cpp (140401 => 140402)
--- trunk/Source/WebCore/html/parser/HTMLDocumentParser.cpp 2013-01-22 09:48:22 UTC (rev 140401)
+++ trunk/Source/WebCore/html/parser/HTMLDocumentParser.cpp 2013-01-22 10:24:30 UTC (rev 140402)
@@ -146,11 +146,13 @@
// but we need to ensure it isn't deleted yet.
RefPtr<HTMLDocumentParser> protect(this);
+#if ENABLE(THREADED_HTML_PARSER)
// NOTE: This pump should only ever emit buffered character tokens,
// so ForceSynchronous vs. AllowYield should be meaningless.
if (!shouldUseThreading())
+#endif
pumpTokenizerIfPossible(ForceSynchronous);
-
+
if (isStopped())
return;
@@ -454,6 +456,7 @@
void HTMLDocumentParser::startBackgroundParser()
{
+ ASSERT(shouldUseThreading());
ASSERT(!m_haveBackgroundParser);
m_haveBackgroundParser = true;
@@ -465,6 +468,7 @@
void HTMLDocumentParser::stopBackgroundParser()
{
+ ASSERT(shouldUseThreading());
ASSERT(m_haveBackgroundParser);
m_haveBackgroundParser = false;
Modified: trunk/Source/WebKit/chromium/ChangeLog (140401 => 140402)
--- trunk/Source/WebKit/chromium/ChangeLog 2013-01-22 09:48:22 UTC (rev 140401)
+++ trunk/Source/WebKit/chromium/ChangeLog 2013-01-22 10:24:30 UTC (rev 140402)
@@ -1,3 +1,16 @@
+2013-01-22 Eric Seidel <[email protected]>
+
+ Turn on ENABLE_THREADED_HTML_PARSER for Chromium (it's still disabled at runtime)
+ https://bugs.webkit.org/show_bug.cgi?id=107519
+
+ Reviewed by Adam Barth.
+
+ This makes our development lives easier, and makes it possible for the bots
+ to run threaded-parser-only tests by toggling the runtime enable
+ via window.internals.settings.
+
+ * features.gypi:
+
2013-01-22 Kentaro Hara <[email protected]>
[V8] Make an Isolate parameter mandatory in toV8()
Modified: trunk/Source/WebKit/chromium/features.gypi (140401 => 140402)
--- trunk/Source/WebKit/chromium/features.gypi 2013-01-22 09:48:22 UTC (rev 140401)
+++ trunk/Source/WebKit/chromium/features.gypi 2013-01-22 10:24:30 UTC (rev 140402)
@@ -117,7 +117,7 @@
'ENABLE_SVG_FONTS=<(enable_svg)',
'ENABLE_TEMPLATE_ELEMENT=1',
'ENABLE_TEXT_AUTOSIZING=1',
- 'ENABLE_THREADED_HTML_PARSER=0',
+ 'ENABLE_THREADED_HTML_PARSER=1',
'ENABLE_TOUCH_ADJUSTMENT=1',
'ENABLE_TOUCH_EVENTS=<(enable_touch_events)',
'ENABLE_TOUCH_EVENT_TRACKING=<(enable_touch_events)',
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
