Changeset 61989 in webkit

Timestamp:

Jun 28, 2010 2:44:35 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-06-28 Eric Seidel <​eric@webkit.org>

Reviewed by Adam Barth.

Make it possible to test the new HTML5 TreeBuilder
​https://bugs.webkit.org/show_bug.cgi?id=41276

Adam was concerned that someone might make their port
depend on this setting (I guess we had some trouble with that
with the HTML5Parser setting), so I littered the code with warnings.

test-html5-parser now tests this code path.

• html/HTMLTreeBuilder.cpp: (WebCore::HTMLTreeBuilder::HTMLTreeBuilder): (WebCore::HTMLTreeBuilder::constructTreeFromToken): (WebCore::HTMLTreeBuilder::finished):
• page/Settings.cpp: (WebCore::Settings::Settings):
• page/Settings.h: (WebCore::Settings::setHTML5TreeBuilderEnabled_DO_NOT_USE): (WebCore::Settings::html5TreeBuilderEnabled):

2010-06-28 Eric Seidel <​eric@webkit.org>

Reviewed by Adam Barth.

Make it possible to test the new HTML5 TreeBuilder
​https://bugs.webkit.org/show_bug.cgi?id=41276

Adam was concerned that someone might make their port
depend on this setting (I guess we had some trouble with that
with the HTML5Parser setting), so I littered the code with warnings.

test-html5-parser now tests this code path.

• WebView/WebPreferenceKeysPrivate.h:
• WebView/WebPreferences.mm: (+[WebPreferences initialize]): (-[WebPreferences html5TreeBuilderEnabled]): (-[WebPreferences setHTML5TreeBuilderEnabled:]):
• WebView/WebPreferencesPrivate.h:
• WebView/WebView.mm: (-[WebView _preferencesChangedNotification:]):

2010-06-28 Eric Seidel <​eric@webkit.org>

Reviewed by Adam Barth.

Make it possible to test the new HTML5 TreeBuilder
​https://bugs.webkit.org/show_bug.cgi?id=41276

Adam was concerned that someone might make their port
depend on this setting (I guess we had some trouble with that
with the HTML5Parser setting), so I littered the code with warnings.

test-html5-parser now tests this code path.

• DumpRenderTree/mac/DumpRenderTree.mm: (resetDefaultsToConsistentValues): (initializeGlobalsFromCommandLineOptions):
• Scripts/test-html5-parser:

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/html/HTMLTreeBuilder.cpp (modified) (6 diffs)
• WebCore/page/Settings.cpp (modified) (1 diff)
• WebCore/page/Settings.h (modified) (2 diffs)
• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/WebView/WebPreferenceKeysPrivate.h (modified) (1 diff)
• WebKit/mac/WebView/WebPreferences.mm (modified) (2 diffs)
• WebKit/mac/WebView/WebPreferencesPrivate.h (modified) (1 diff)
• WebKit/mac/WebView/WebView.mm (modified) (1 diff)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm (modified) (3 diffs)
• WebKitTools/Scripts/test-html5-parser (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-28  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        Make it possible to test the new HTML5 TreeBuilder
+        https://bugs.webkit.org/show_bug.cgi?id=41276
+
+        Adam was concerned that someone might make their port
+        depend on this setting (I guess we had some trouble with that
+        with the HTML5Parser setting), so I littered the code with warnings.
+
+        test-html5-parser now tests this code path.
+
+        * html/HTMLTreeBuilder.cpp:
+        (WebCore::HTMLTreeBuilder::HTMLTreeBuilder):
+        (WebCore::HTMLTreeBuilder::constructTreeFromToken):
+        (WebCore::HTMLTreeBuilder::finished):
+        * page/Settings.cpp:
+        (WebCore::Settings::Settings):
+        * page/Settings.h:
+        (WebCore::Settings::setHTML5TreeBuilderEnabled_DO_NOT_USE):
+        (WebCore::Settings::html5TreeBuilderEnabled):
+
 2010-06-28  Adam Barth  <abarth@webkit.org>
 

trunk/WebCore/html/HTMLTreeBuilder.cpp

@@ -42 +42 @@
 #include "LegacyHTMLTreeBuilder.h"
 #include "NotImplemented.h"
+#include "Settings.h"
 #include "ScriptController.h"
 #include "Text.h"
@@ -57 +58 @@
 {
     return cc == '\t' || cc == '\x0A' || cc == '\x0C' || cc == '\x0D' || cc == ' ';
+}
+
+bool shouldUseLegacyTreeBuilder(Document* document)
+{
+    return !document->settings() || !document->settings()->html5TreeBuilderEnabled();
 }
 
@@ -69 +75 @@
     , m_originalInsertionMode(InitialMode)
     , m_tokenizer(tokenizer)
-    , m_legacyTreeBuilder(new LegacyHTMLTreeBuilder(document, reportErrors))
+    , m_legacyTreeBuilder(shouldUseLegacyTreeBuilder(document) ? new LegacyHTMLTreeBuilder(document, reportErrors) : 0)
     , m_lastScriptElementStartLine(uninitializedLineNumberValue)
     , m_scriptToProcessStartLine(uninitializedLineNumberValue)
@@ -86 +92 @@
     , m_originalInsertionMode(InitialMode)
     , m_tokenizer(tokenizer)
-    , m_legacyTreeBuilder(new LegacyHTMLTreeBuilder(fragment, scriptingPermission))
+    , m_legacyTreeBuilder(shouldUseLegacyTreeBuilder(m_document) ? new LegacyHTMLTreeBuilder(fragment, scriptingPermission) : 0)
     , m_lastScriptElementStartLine(uninitializedLineNumberValue)
     , m_scriptToProcessStartLine(uninitializedLineNumberValue)
@@ -227 +233 @@
 void HTMLTreeBuilder::constructTreeFromToken(HTMLToken& rawToken)
 {
-    // Make MSVC ignore our unreachable code for now.
-    if (true) {
+    if (m_legacyTreeBuilder) {
         passTokenToLegacyParser(rawToken);
         return;
@@ -875 +880 @@
     // We should call m_document->finishedParsing() here, except
     // m_legacyTreeBuilder->finished() does it for us.
-    m_legacyTreeBuilder->finished();
+    if (m_legacyTreeBuilder)
+        m_legacyTreeBuilder->finished();
 }
 

trunk/WebCore/page/Settings.cpp

@@ -134 +134 @@
     , m_tiledBackingStoreEnabled(false)
     , m_html5ParserEnabled(true)
+    , m_html5TreeBuilderEnabled(false) // Will be deleted soon, do not use.
     , m_paginateDuringLayoutEnabled(false)
 {

trunk/WebCore/page/Settings.h

@@ -297 +297 @@
         void setHTML5ParserEnabled(bool flag) { m_html5ParserEnabled = flag; }
         bool html5ParserEnabled() const { return m_html5ParserEnabled; }
+
+        // NOTE: This code will be deleted once the HTML5TreeBuilder is ready
+        // to replace LegacyHTMLTreeBuilder.  Using the HTML5DocumentParser
+        // with LegacyHTMLTreeBuilder will not be supported long-term.
+        // Setting is only for testing the new tree builder in DumpRenderTree.
+        void setHTML5TreeBuilderEnabled_DO_NOT_USE(bool flag) { m_html5TreeBuilderEnabled = flag; }
+        bool html5TreeBuilderEnabled() const { return m_html5TreeBuilderEnabled; }
 
         void setPaginateDuringLayoutEnabled(bool flag) { m_paginateDuringLayoutEnabled = flag; }
@@ -381 +388 @@
         bool m_tiledBackingStoreEnabled : 1;
         bool m_html5ParserEnabled: 1;
+        bool m_html5TreeBuilderEnabled: 1; // Will be deleted soon, do not use.
         bool m_paginateDuringLayoutEnabled : 1;
     

trunk/WebKit/mac/ChangeLog

@@ +1 @@
+2010-06-28  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        Make it possible to test the new HTML5 TreeBuilder
+        https://bugs.webkit.org/show_bug.cgi?id=41276
+
+        Adam was concerned that someone might make their port
+        depend on this setting (I guess we had some trouble with that
+        with the HTML5Parser setting), so I littered the code with warnings.
+
+        test-html5-parser now tests this code path.
+
+        * WebView/WebPreferenceKeysPrivate.h:
+        * WebView/WebPreferences.mm:
+        (+[WebPreferences initialize]):
+        (-[WebPreferences html5TreeBuilderEnabled]):
+        (-[WebPreferences setHTML5TreeBuilderEnabled:]):
+        * WebView/WebPreferencesPrivate.h:
+        * WebView/WebView.mm:
+        (-[WebView _preferencesChangedNotification:]):
+
 2010-06-25  Yuzo Fujishima  <yuzo@google.com>
 

trunk/WebKit/mac/WebView/WebPreferenceKeysPrivate.h

@@ -95 +95 @@
 #define WebKitFrameFlatteningEnabledPreferenceKey @"WebKitFrameFlatteningEnabled"
 #define WebKitHTML5ParserEnabledPreferenceKey @"WebKitHTML5ParserEnabled"
+#define WebKitHTML5TreeBuilderEnabledPreferenceKey @"WebKitHTML5TreeBuilderEnabled" // Temporary, do not use.
 #define WebKitPaginateDuringLayoutEnabledPreferenceKey @"WebKitPaginateDuringLayoutEnabled"
 

trunk/WebKit/mac/WebView/WebPreferences.mm

@@ -362 +362 @@
         [NSNumber numberWithBool:NO],   WebKitFrameFlatteningEnabledPreferenceKey,
         [NSNumber numberWithBool:YES],   WebKitHTML5ParserEnabledPreferenceKey,
+        [NSNumber numberWithBool:NO],   WebKitHTML5TreeBuilderEnabledPreferenceKey,
         nil];
 
@@ -1250 +1251 @@
 }
 
+- (BOOL)html5TreeBuilderEnabled
+{
+    return [self _boolValueForKey:WebKitHTML5TreeBuilderEnabledPreferenceKey];
+}
+
+- (void)setHTML5TreeBuilderEnabled:(BOOL)flag
+{
+    [self _setBoolValue:flag forKey:WebKitHTML5TreeBuilderEnabledPreferenceKey];
+}
+
 - (BOOL)paginateDuringLayoutEnabled
 {

trunk/WebKit/mac/WebView/WebPreferencesPrivate.h

@@ -179 +179 @@
 - (void)setHTML5ParserEnabled:(BOOL)flag;
 
+// Will be deleted soon, do not use.
+- (BOOL)html5TreeBuilderEnabled;
+- (void)setHTML5TreeBuilderEnabled:(BOOL)flag;
+
 - (BOOL)paginateDuringLayoutEnabled;
 - (void)setPaginateDuringLayoutEnabled:(BOOL)flag;

trunk/WebKit/mac/WebView/WebView.mm

@@ -1415 +1415 @@
     settings->setFrameFlatteningEnabled([preferences isFrameFlatteningEnabled]);
     settings->setHTML5ParserEnabled([preferences html5ParserEnabled]);
+    settings->setHTML5TreeBuilderEnabled_DO_NOT_USE([preferences html5TreeBuilderEnabled]);
     settings->setPaginateDuringLayoutEnabled([preferences paginateDuringLayoutEnabled]);
 }

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-06-28  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        Make it possible to test the new HTML5 TreeBuilder
+        https://bugs.webkit.org/show_bug.cgi?id=41276
+
+        Adam was concerned that someone might make their port
+        depend on this setting (I guess we had some trouble with that
+        with the HTML5Parser setting), so I littered the code with warnings.
+
+        test-html5-parser now tests this code path.
+
+        * DumpRenderTree/mac/DumpRenderTree.mm:
+        (resetDefaultsToConsistentValues):
+        (initializeGlobalsFromCommandLineOptions):
+        * Scripts/test-html5-parser:
+
 2010-06-27  MORITA Hajime  <morrita@google.com>
 

trunk/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm

@@ -138 +138 @@
 static int forceComplexText;
 static int useHTML5Parser = YES;
+static int useHTML5TreeBuilder = NO; // Temporary, will be removed.
 static BOOL printSeparators;
 static RetainPtr<CFStringRef> persistentUserStyleSheetLocation;
@@ -457 +458 @@
     [preferences setWebGLEnabled:NO];
     [preferences setHTML5ParserEnabled:useHTML5Parser];
+    [preferences setHTML5TreeBuilderEnabled:useHTML5TreeBuilder]; // Temporary, will be removed.
 
     [[NSHTTPCookieStorage sharedHTTPCookieStorage] setCookieAcceptPolicy:NSHTTPCookieAcceptPolicyOnlyFromMainDocumentDomain];
@@ -564 +566 @@
         {"complex-text", no_argument, &forceComplexText, YES},
         {"legacy-parser", no_argument, &useHTML5Parser, NO},
+        {"html5-treebuilder", no_argument, &useHTML5TreeBuilder, YES},
         {NULL, 0, NULL, 0}
     };

trunk/WebKitTools/Scripts/test-html5-parser

@@ -70 +70 @@
     my $expectedPath = "LayoutTests/$test-expected-html5.txt";
     my $actualPath = "LayoutTests/$test-actual-html5.txt";
-    my $command = "DYLD_FRAMEWORK_PATH=$productDir $dumpTool --html5-parser $testPath";
+    my $command = "DYLD_FRAMEWORK_PATH=$productDir $dumpTool --html5-treebuilder $testPath";
     print $command, "\n";
     my $output = `$command`;