Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (141925 => 141926)
--- trunk/Source/WebKit/chromium/ChangeLog 2013-02-05 21:41:53 UTC (rev 141925)
+++ trunk/Source/WebKit/chromium/ChangeLog 2013-02-05 21:44:55 UTC (rev 141926)
@@ -1,3 +1,17 @@
+2013-02-05 Adam Barth <[email protected]>
+
+ DumpRenderTree should be able to enable the threaded parser
+ https://bugs.webkit.org/show_bug.cgi?id=108970
+
+ Reviewed by Eric Seidel.
+
+ * public/WebSettings.h:
+ * src/WebSettingsImpl.cpp:
+ (WebKit::WebSettingsImpl::setThreadedHTMLParser):
+ (WebKit):
+ * src/WebSettingsImpl.h:
+ (WebSettingsImpl):
+
2013-02-05 Sami Kyostila <[email protected]>
[chromium] Make overlay layers slow-scrolling
Modified: trunk/Source/WebKit/chromium/public/WebSettings.h (141925 => 141926)
--- trunk/Source/WebKit/chromium/public/WebSettings.h 2013-02-05 21:41:53 UTC (rev 141925)
+++ trunk/Source/WebKit/chromium/public/WebSettings.h 2013-02-05 21:44:55 UTC (rev 141926)
@@ -161,6 +161,7 @@
virtual void setTextAutosizingEnabled(bool) = 0;
virtual void setTextAutosizingFontScaleFactor(float) = 0;
virtual void setTextDirectionSubmenuInclusionBehaviorNeverIncluded() = 0;
+ virtual void setThreadedHTMLParser(bool) = 0;
virtual void setTouchDragDropEnabled(bool) = 0;
virtual void setUnifiedTextCheckerEnabled(bool) = 0;
virtual void setUnsafePluginPastingEnabled(bool) = 0;
Modified: trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp (141925 => 141926)
--- trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp 2013-02-05 21:41:53 UTC (rev 141925)
+++ trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp 2013-02-05 21:44:55 UTC (rev 141926)
@@ -356,6 +356,13 @@
m_settings->setTouchDragDropEnabled(enabled);
}
+void WebSettingsImpl::setThreadedHTMLParser(bool enabled)
+{
+#if ENABLE(THREADED_HTML_PARSER)
+ m_settings->setThreadedHTMLParser(enabled);
+#endif
+}
+
void WebSettingsImpl::setOfflineWebApplicationCacheEnabled(bool enabled)
{
m_settings->setOfflineWebApplicationCacheEnabled(enabled);
Modified: trunk/Source/WebKit/chromium/src/WebSettingsImpl.h (141925 => 141926)
--- trunk/Source/WebKit/chromium/src/WebSettingsImpl.h 2013-02-05 21:41:53 UTC (rev 141925)
+++ trunk/Source/WebKit/chromium/src/WebSettingsImpl.h 2013-02-05 21:44:55 UTC (rev 141926)
@@ -158,6 +158,7 @@
virtual void setTextAutosizingFontScaleFactor(float);
virtual void setTextDirectionSubmenuInclusionBehaviorNeverIncluded();
virtual void setTouchDragDropEnabled(bool);
+ virtual void setThreadedHTMLParser(bool);
virtual void setUnifiedTextCheckerEnabled(bool);
virtual void setUnsafePluginPastingEnabled(bool);
virtual void setUserStyleSheetLocation(const WebURL&);
Modified: trunk/Tools/ChangeLog (141925 => 141926)
--- trunk/Tools/ChangeLog 2013-02-05 21:41:53 UTC (rev 141925)
+++ trunk/Tools/ChangeLog 2013-02-05 21:44:55 UTC (rev 141926)
@@ -1,3 +1,26 @@
+2013-02-05 Adam Barth <[email protected]>
+
+ DumpRenderTree should be able to enable the threaded parser
+ https://bugs.webkit.org/show_bug.cgi?id=108970
+
+ Reviewed by Eric Seidel.
+
+ We can now enable the parser at runtime using --enable-threaded-html-parser.
+
+ * DumpRenderTree/chromium/DumpRenderTree.cpp:
+ (main):
+ * DumpRenderTree/chromium/TestRunner/public/WebPreferences.h:
+ (WebPreferences):
+ * DumpRenderTree/chromium/TestRunner/src/WebPreferences.cpp:
+ (WebTestRunner::WebPreferences::reset):
+ (WebTestRunner::WebPreferences::applyTo):
+ * DumpRenderTree/chromium/TestShell.cpp:
+ (TestShell::TestShell):
+ (TestShell::resetWebSettings):
+ * DumpRenderTree/chromium/TestShell.h:
+ (TestShell::setThreadedHTMLParser):
+ (TestShell):
+
2013-02-05 Benjamin Poulain <[email protected]>
Make StringBuilder::toAtomicString() consistent with StringBuilder::toString() for strings of null length
Modified: trunk/Tools/DumpRenderTree/chromium/DumpRenderTree.cpp (141925 => 141926)
--- trunk/Tools/DumpRenderTree/chromium/DumpRenderTree.cpp 2013-02-05 21:41:53 UTC (rev 141925)
+++ trunk/Tools/DumpRenderTree/chromium/DumpRenderTree.cpp 2013-02-05 21:44:55 UTC (rev 141926)
@@ -67,6 +67,7 @@
static const char optionUseGraphicsContext3DImplementation[] = "--use-graphics-context-3d-implementation=";
static const char optionEnablePerTilePainting[] = "--enable-per-tile-painting";
static const char optionEnableDeferredImageDecoding[] = "--enable-deferred-image-decoding";
+static const char optionEnableThreadedHTMLParser[] = "--enable-threaded-html-parser";
static const char optionStressOpt[] = "--stress-opt";
static const char optionStressDeopt[] = "--stress-deopt";
@@ -134,6 +135,7 @@
bool softwareCompositingEnabled = false;
bool threadedCompositingEnabled = false;
bool forceCompositingMode = false;
+ bool threadedHTMLParser = false;
bool accelerated2DCanvasEnabled = false;
bool deferred2DCanvasEnabled = false;
bool acceleratedPaintingEnabled = false;
@@ -178,6 +180,8 @@
threadedCompositingEnabled = true;
else if (argument == optionForceCompositingMode)
forceCompositingMode = true;
+ else if (argument == optionEnableThreadedHTMLParser)
+ threadedHTMLParser = true;
else if (argument == optionEnableAccelerated2DCanvas)
accelerated2DCanvasEnabled = true;
else if (argument == optionEnableDeferred2DCanvas)
@@ -233,6 +237,7 @@
shell.setSoftwareCompositingEnabled(softwareCompositingEnabled);
shell.setThreadedCompositingEnabled(threadedCompositingEnabled);
shell.setForceCompositingMode(forceCompositingMode);
+ shell.setThreadedHTMLParser(threadedHTMLParser);
shell.setAccelerated2dCanvasEnabled(accelerated2DCanvasEnabled);
shell.setDeferred2dCanvasEnabled(deferred2DCanvasEnabled);
shell.setAcceleratedPaintingEnabled(acceleratedPaintingEnabled);
Modified: trunk/Tools/DumpRenderTree/chromium/TestRunner/public/WebPreferences.h (141925 => 141926)
--- trunk/Tools/DumpRenderTree/chromium/TestRunner/public/WebPreferences.h 2013-02-05 21:41:53 UTC (rev 141925)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/public/WebPreferences.h 2013-02-05 21:44:55 UTC (rev 141926)
@@ -91,6 +91,7 @@
bool acceleratedCompositingForOverflowScrollEnabled;
bool acceleratedCompositingEnabled;
bool forceCompositingMode;
+ bool threadedHTMLParser;
bool accelerated2dCanvasEnabled;
bool deferred2dCanvasEnabled;
bool acceleratedPaintingEnabled;
Modified: trunk/Tools/DumpRenderTree/chromium/TestRunner/src/WebPreferences.cpp (141925 => 141926)
--- trunk/Tools/DumpRenderTree/chromium/TestRunner/src/WebPreferences.cpp 2013-02-05 21:41:53 UTC (rev 141925)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/src/WebPreferences.cpp 2013-02-05 21:44:55 UTC (rev 141926)
@@ -122,6 +122,7 @@
deferred2dCanvasEnabled = false;
acceleratedPaintingEnabled = false;
forceCompositingMode = false;
+ threadedHTMLParser = false;
perTilePaintingEnabled = false;
acceleratedAnimationEnabled = false;
deferredImageDecodingEnabled = false;
@@ -190,6 +191,7 @@
settings->setAcceleratedCompositingForOverflowScrollEnabled(acceleratedCompositingForOverflowScrollEnabled);
settings->setFixedPositionCreatesStackingContext(acceleratedCompositingForFixedPositionEnabled);
settings->setForceCompositingMode(forceCompositingMode);
+ settings->setThreadedHTMLParser(threadedHTMLParser);
settings->setAccelerated2dCanvasEnabled(accelerated2dCanvasEnabled);
settings->setDeferred2dCanvasEnabled(deferred2dCanvasEnabled);
settings->setAcceleratedPaintingEnabled(acceleratedPaintingEnabled);
Modified: trunk/Tools/DumpRenderTree/chromium/TestShell.cpp (141925 => 141926)
--- trunk/Tools/DumpRenderTree/chromium/TestShell.cpp 2013-02-05 21:41:53 UTC (rev 141925)
+++ trunk/Tools/DumpRenderTree/chromium/TestShell.cpp 2013-02-05 21:44:55 UTC (rev 141926)
@@ -115,6 +115,7 @@
, m_softwareCompositingEnabled(false)
, m_threadedCompositingEnabled(false)
, m_forceCompositingMode(false)
+ , m_threadedHTMLParser(false)
, m_accelerated2dCanvasEnabled(false)
, m_deferred2dCanvasEnabled(false)
, m_acceleratedPaintingEnabled(false)
@@ -250,6 +251,7 @@
m_prefs.perTilePaintingEnabled = m_perTilePaintingEnabled;
m_prefs.acceleratedAnimationEnabled = m_acceleratedAnimationEnabled;
m_prefs.deferredImageDecodingEnabled = m_deferredImageDecodingEnabled;
+ m_prefs.threadedHTMLParser = m_threadedHTMLParser;
m_prefs.applyTo(&webView);
}
Modified: trunk/Tools/DumpRenderTree/chromium/TestShell.h (141925 => 141926)
--- trunk/Tools/DumpRenderTree/chromium/TestShell.h 2013-02-05 21:41:53 UTC (rev 141925)
+++ trunk/Tools/DumpRenderTree/chromium/TestShell.h 2013-02-05 21:44:55 UTC (rev 141926)
@@ -123,6 +123,7 @@
void setSoftwareCompositingEnabled(bool enabled) { m_softwareCompositingEnabled = enabled; }
void setThreadedCompositingEnabled(bool enabled) { m_threadedCompositingEnabled = enabled; }
void setForceCompositingMode(bool enabled) { m_forceCompositingMode = enabled; }
+ void setThreadedHTMLParser(bool enabled) { m_threadedHTMLParser = enabled; }
void setAccelerated2dCanvasEnabled(bool enabled) { m_accelerated2dCanvasEnabled = enabled; }
void setDeferred2dCanvasEnabled(bool enabled) { m_deferred2dCanvasEnabled = enabled; }
void setAcceleratedPaintingEnabled(bool enabled) { m_acceleratedPaintingEnabled = enabled; }
@@ -223,6 +224,7 @@
bool m_softwareCompositingEnabled;
bool m_threadedCompositingEnabled;
bool m_forceCompositingMode;
+ bool m_threadedHTMLParser;
bool m_accelerated2dCanvasEnabled;
bool m_deferred2dCanvasEnabled;
bool m_acceleratedPaintingEnabled;
