[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
eric at webkit.org
eric at webkit.org
Wed Dec 22 12:32:22 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 34e903399131025b8794e67baaf583fd0a5fd7c1
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Aug 25 05:01:57 2010 +0000
2010-08-24 Eric Seidel <eric at webkit.org>
Reviewed by Adam Barth.
Remove HTML5 parser testing infrastructure now that we don't need it
https://bugs.webkit.org/show_bug.cgi?id=44581
* html5lib/runner-expected-html5.txt: Removed.
* html5lib/webkit-resumer-expected-html5.txt: Removed.
2010-08-24 Eric Seidel <eric at webkit.org>
Reviewed by Adam Barth.
Remove HTML5 parser testing infrastructure now that we don't need it
https://bugs.webkit.org/show_bug.cgi?id=44581
Just removing dead code, no tests.
* dom/DocumentFragment.cpp:
* dom/DocumentFragment.h:
* page/Settings.cpp:
(WebCore::Settings::Settings):
* page/Settings.h:
2010-08-24 Eric Seidel <eric at webkit.org>
Reviewed by Adam Barth.
Remove HTML5 parser testing infrastructure now that we don't need it
https://bugs.webkit.org/show_bug.cgi?id=44581
* WebView/WebPreferenceKeysPrivate.h:
* WebView/WebPreferences.mm:
(+[WebPreferences initialize]):
* WebView/WebPreferencesPrivate.h:
* WebView/WebView.mm:
(-[WebView _preferencesChangedNotification:]):
2010-08-24 Eric Seidel <eric at webkit.org>
Reviewed by Adam Barth.
Remove HTML5 parser testing infrastructure now that we don't need it
https://bugs.webkit.org/show_bug.cgi?id=44581
* DumpRenderTree/mac/DumpRenderTree.mm:
(resetDefaultsToConsistentValues):
(initializeGlobalsFromCommandLineOptions):
* Scripts/old-run-webkit-tests:
* Scripts/test-html5-parser: Removed.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65978 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 0ba26e1..4f28daa 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,15 @@
2010-08-24 Eric Seidel <eric at webkit.org>
+ Reviewed by Adam Barth.
+
+ Remove HTML5 parser testing infrastructure now that we don't need it
+ https://bugs.webkit.org/show_bug.cgi?id=44581
+
+ * html5lib/runner-expected-html5.txt: Removed.
+ * html5lib/webkit-resumer-expected-html5.txt: Removed.
+
+2010-08-24 Eric Seidel <eric at webkit.org>
+
Unreviewed. Just adding test results.
XMLDocumentParser needs to implement DocumentParser::detach()
diff --git a/LayoutTests/html5lib/runner-expected-html5.txt b/LayoutTests/html5lib/runner-expected-html5.txt
deleted file mode 100644
index 84c7217..0000000
--- a/LayoutTests/html5lib/runner-expected-html5.txt
+++ /dev/null
@@ -1,236 +0,0 @@
-CONSOLE MESSAGE: line 1: SyntaxError: Parse error
-CONSOLE MESSAGE: line 1: SyntaxError: Parse error
-CONSOLE MESSAGE: line 0: Warning: Problem parsing viewBox=""
-CONSOLE MESSAGE: line 0: Warning: Problem parsing viewBox=""
-CONSOLE MESSAGE: line 0: Warning: Problem parsing viewBox=""
-CONSOLE MESSAGE: line 1: SyntaxError: Parse error
-CONSOLE MESSAGE: line 1: SyntaxError: Parse error
-CONSOLE MESSAGE: line 1: SyntaxError: Parse error
-CONSOLE MESSAGE: line 1: SyntaxError: Parse error
-CONSOLE MESSAGE: line 2: PASS
-CONSOLE MESSAGE: line 2: FOO<span>BAR</span>BAZ
-Content-Type: text/plain
-resources/tests1.dat: PASS
-
-resources/tests2.dat: PASS
-
-resources/tests3.dat: PASS
-
-resources/tests4.dat: PASS
-
-resources/tests5.dat: PASS
-
-resources/tests6.dat: PASS
-
-resources/tests7.dat:
-30
-
-Test 30 of 30 in resources/tests7.dat failed. Input:
-<select><keygen>
-Got:
-| <html>
-| <head>
-| <body>
-| <select>
-| <keygen>
-| <option>
-| "2048 (High Grade)"
-| <option>
-| "1024 (Medium Grade)"
-| <option>
-| "512 (Low Grade)"
-Expected:
-| <html>
-| <head>
-| <body>
-| <select>
-| <keygen>
-resources/tests8.dat: PASS
-
-resources/tests9.dat: PASS
-
-resources/tests10.dat: PASS
-
-resources/tests11.dat: PASS
-
-resources/tests12.dat: PASS
-
-resources/tests14.dat: PASS
-
-resources/tests15.dat: PASS
-
-resources/tests16.dat: PASS
-
-resources/tests17.dat: PASS
-
-resources/tests18.dat: PASS
-
-resources/tests19.dat:
-63
-
-Test 63 of 102 in resources/tests19.dat failed. Input:
-<!doctype html><keygen><frameset>
-Got:
-| <!DOCTYPE html>
-| <html>
-| <head>
-| <body>
-| <keygen>
-| <option>
-| "2048 (High Grade)"
-| <option>
-| "1024 (Medium Grade)"
-| <option>
-| "512 (Low Grade)"
-Expected:
-| <!DOCTYPE html>
-| <html>
-| <head>
-| <body>
-| <keygen>
-resources/tests20.dat:
-16
-
-Test 16 of 25 in resources/tests20.dat failed. Input:
-<!doctype html><p><button><table>
-Got:
-| <!DOCTYPE html>
-| <html>
-| <head>
-| <body>
-| <p>
-| <button>
-| <p>
-| <table>
-Expected:
-| <!DOCTYPE html>
-| <html>
-| <head>
-| <body>
-| <p>
-| <button>
-| <table>
-resources/webkit01.dat: PASS
-
-resources/webkit02.dat: PASS
-
-resources/doctype01.dat: PASS
-
-resources/scriptdata01.dat: PASS
-
-resources/html5test-com.dat: PASS
-
-resources/entities01.dat: PASS
-
-resources/entities02.dat: PASS
-
-resources/comments01.dat: PASS
-
-resources/adoption01.dat:
-12
-
-Test 12 of 12 in resources/adoption01.dat failed. Input:
-<table>A<td>B</td>C</table>
-Got:
-| <html>
-| <head>
-| <body>
-| "AC"
-| <table>
-| <tbody>
-| <tr>
-| <td>
-| "B"
-Expected:
-| <html>
-| <head>
-| <body>
-| "A"
-| "C"
-| <table>
-| <tbody>
-| <tr>
-| <td>
-| "B"
-resources/adoption02.dat:
-2
-
-Test 2 of 3 in resources/adoption02.dat failed. Input:
-<b id="b">1<i id="i">2<p>3<script>document.getElementById("b").id = "c";document.getElementById("i").id = "j"</script></b>4
-Got:
-| <html>
-| <head>
-| <body>
-| <b>
-| id="c"
-| "1"
-| <i>
-| id="j"
-| "2"
-| <i>
-| id="j"
-| <p>
-| <b>
-| id="c"
-| "3"
-| <script>
-| "document.getElementById("b").id = "c";document.getElementById("i").id = "j""
-| "4"
-Expected:
-| <html>
-| <head>
-| <body>
-| <b>
-| id="c"
-| "1"
-| <i>
-| id="j"
-| "2"
-| <i>
-| id="i"
-| <p>
-| <b>
-| id="b"
-| "3"
-| <script>
-| "document.getElementById("b").id = "c";document.getElementById("i").id = "j""
-| "4"
-resources/inbody01.dat: PASS
-
-resources/isindex.dat: PASS
-
-resources/tables01.dat: PASS
-
-resources/tricky01.dat: PASS
-
-resources/scripted/adoption01.dat:
-1
-
-Test 1 of 1 in resources/scripted/adoption01.dat failed. Input:
-<p><b id="A"><script>document.getElementById("A").id = "B"</script></p>TEXT</b>
-Got:
-| <html>
-| <head>
-| <body>
-| <p>
-| <b>
-| id="B"
-| <script>
-| "document.getElementById("A").id = "B""
-| <b>
-| id="B"
-| "TEXT"
-Expected:
-| <html>
-| <head>
-| <body>
-| <p>
-| <b>
-| id="B"
-| <script>
-| "document.getElementById("A").id = "B""
-| <b>
-| id="A"
-| "TEXT"
-resources/scripted/webkit01.dat: PASS
-#EOF
diff --git a/LayoutTests/html5lib/webkit-resumer-expected-html5.txt b/LayoutTests/html5lib/webkit-resumer-expected-html5.txt
deleted file mode 100644
index d117a44..0000000
--- a/LayoutTests/html5lib/webkit-resumer-expected-html5.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-CONSOLE MESSAGE: line 36: TypeError: Result of expression 'iframe.contentWindow.document.lastChild' [null] is not an object.
-Content-Type: text/plain
-
-#EOF
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 347302b..6a0a08e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-08-24 Eric Seidel <eric at webkit.org>
+
+ Reviewed by Adam Barth.
+
+ Remove HTML5 parser testing infrastructure now that we don't need it
+ https://bugs.webkit.org/show_bug.cgi?id=44581
+
+ Just removing dead code, no tests.
+
+ * dom/DocumentFragment.cpp:
+ * dom/DocumentFragment.h:
+ * page/Settings.cpp:
+ (WebCore::Settings::Settings):
+ * page/Settings.h:
+
2010-08-24 Adam Barth <abarth at webkit.org>
Reviewed by Eric Seidel.
diff --git a/WebCore/dom/DocumentFragment.cpp b/WebCore/dom/DocumentFragment.cpp
index 70e57b9..c9c3020 100644
--- a/WebCore/dom/DocumentFragment.cpp
+++ b/WebCore/dom/DocumentFragment.cpp
@@ -75,12 +75,6 @@ PassRefPtr<Node> DocumentFragment::cloneNode(bool deep)
return clone.release();
}
-bool DocumentFragment::shouldUseLegacyHTMLParser() const
-{
- return document()->page() && document()->page()->settings()
- && !document()->page()->settings()->html5ParserEnabled();
-}
-
void DocumentFragment::parseHTML(const String& source, Element* contextElement, FragmentScriptingPermission scriptingPermission)
{
HTMLDocumentParser::parseDocumentFragment(source, this, contextElement, scriptingPermission);
diff --git a/WebCore/dom/DocumentFragment.h b/WebCore/dom/DocumentFragment.h
index d3dadb8..d588b4e 100644
--- a/WebCore/dom/DocumentFragment.h
+++ b/WebCore/dom/DocumentFragment.h
@@ -39,8 +39,6 @@ public:
private:
DocumentFragment(Document*);
- bool shouldUseLegacyHTMLParser() const;
-
virtual String nodeName() const;
virtual NodeType nodeType() const;
virtual PassRefPtr<Node> cloneNode(bool deep);
diff --git a/WebCore/page/Settings.cpp b/WebCore/page/Settings.cpp
index 29cb5a6..51a30fb 100644
--- a/WebCore/page/Settings.cpp
+++ b/WebCore/page/Settings.cpp
@@ -132,7 +132,6 @@ Settings::Settings(Page* page)
, m_acceleratedCanvas2dEnabled(false)
, m_loadDeferringEnabled(true)
, m_tiledBackingStoreEnabled(false)
- , m_html5ParserEnabled(true)
, m_paginateDuringLayoutEnabled(false)
, m_dnsPrefetchingEnabled(true)
, m_memoryInfoEnabled(false)
diff --git a/WebCore/page/Settings.h b/WebCore/page/Settings.h
index b523be3..029a0a3 100644
--- a/WebCore/page/Settings.h
+++ b/WebCore/page/Settings.h
@@ -308,9 +308,6 @@ namespace WebCore {
void setTiledBackingStoreEnabled(bool);
bool tiledBackingStoreEnabled() const { return m_tiledBackingStoreEnabled; }
- void setHTML5ParserEnabled(bool flag) { m_html5ParserEnabled = flag; }
- bool html5ParserEnabled() const { return m_html5ParserEnabled; }
-
void setPaginateDuringLayoutEnabled(bool flag) { m_paginateDuringLayoutEnabled = flag; }
bool paginateDuringLayoutEnabled() const { return m_paginateDuringLayoutEnabled; }
@@ -403,7 +400,6 @@ namespace WebCore {
bool m_acceleratedCanvas2dEnabled : 1;
bool m_loadDeferringEnabled : 1;
bool m_tiledBackingStoreEnabled : 1;
- bool m_html5ParserEnabled: 1;
bool m_paginateDuringLayoutEnabled : 1;
bool m_dnsPrefetchingEnabled : 1;
bool m_memoryInfoEnabled: 1;
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 48e300c..565b1b0 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,17 @@
+2010-08-24 Eric Seidel <eric at webkit.org>
+
+ Reviewed by Adam Barth.
+
+ Remove HTML5 parser testing infrastructure now that we don't need it
+ https://bugs.webkit.org/show_bug.cgi?id=44581
+
+ * WebView/WebPreferenceKeysPrivate.h:
+ * WebView/WebPreferences.mm:
+ (+[WebPreferences initialize]):
+ * WebView/WebPreferencesPrivate.h:
+ * WebView/WebView.mm:
+ (-[WebView _preferencesChangedNotification:]):
+
2010-08-24 Sam Weinig <sam at webkit.org>
Reviewed by Oliver Hunt.
diff --git a/WebKit/mac/WebView/WebPreferenceKeysPrivate.h b/WebKit/mac/WebView/WebPreferenceKeysPrivate.h
index a8ebdca..86f6d85 100644
--- a/WebKit/mac/WebView/WebPreferenceKeysPrivate.h
+++ b/WebKit/mac/WebView/WebPreferenceKeysPrivate.h
@@ -95,8 +95,6 @@
#define WebKitUsesProxiedOpenPanelPreferenceKey @"WebKitUsesProxiedOpenPanel"
#define WebKitPluginAllowedRunTimePreferenceKey @"WebKitPluginAllowedRunTime"
#define WebKitFrameFlatteningEnabledPreferenceKey @"WebKitFrameFlatteningEnabled"
-#define WebKitHTML5ParserEnabledPreferenceKey @"WebKitHTML5ParserEnabled"
-#define WebKitHTML5TreeBuilderEnabledPreferenceKey @"WebKitHTML5TreeBuilderEnabled" // Temporary, do not use.
#define WebKitPaginateDuringLayoutEnabledPreferenceKey @"WebKitPaginateDuringLayoutEnabled"
#define WebKitDNSPrefetchingEnabledPreferenceKey @"WebKitDNSPrefetchingEnabled"
#define WebKitMemoryInfoEnabledPreferenceKey @"WebKitMemoryInfoEnabled"
diff --git a/WebKit/mac/WebView/WebPreferences.mm b/WebKit/mac/WebView/WebPreferences.mm
index c46dca7..eae2d8d 100644
--- a/WebKit/mac/WebView/WebPreferences.mm
+++ b/WebKit/mac/WebView/WebPreferences.mm
@@ -364,8 +364,6 @@ static WebCacheModel cacheModelForMainBundle(void)
[NSNumber numberWithBool:NO], WebKitUsesProxiedOpenPanelPreferenceKey,
[NSNumber numberWithUnsignedInt:4], WebKitPluginAllowedRunTimePreferenceKey,
[NSNumber numberWithBool:NO], WebKitFrameFlatteningEnabledPreferenceKey,
- [NSNumber numberWithBool:YES], WebKitHTML5ParserEnabledPreferenceKey,
- [NSNumber numberWithBool:NO], WebKitHTML5TreeBuilderEnabledPreferenceKey,
[NSNumber numberWithBool:YES], WebKitDNSPrefetchingEnabledPreferenceKey,
[NSNumber numberWithBool:NO], WebKitMemoryInfoEnabledPreferenceKey,
[NSNumber numberWithLongLong:WebCore::ApplicationCacheStorage::noQuota()], WebKitApplicationCacheTotalQuota,
@@ -1298,26 +1296,6 @@ static NSString *classIBCreatorID = nil;
[self _setBoolValue:flag forKey:WebKitFrameFlatteningEnabledPreferenceKey];
}
-- (BOOL)html5ParserEnabled
-{
- return [self _boolValueForKey:WebKitHTML5ParserEnabledPreferenceKey];
-}
-
-- (void)setHTML5ParserEnabled:(BOOL)flag
-{
- [self _setBoolValue:flag forKey:WebKitHTML5ParserEnabledPreferenceKey];
-}
-
-- (BOOL)html5TreeBuilderEnabled
-{
- return [self _boolValueForKey:WebKitHTML5TreeBuilderEnabledPreferenceKey];
-}
-
-- (void)setHTML5TreeBuilderEnabled:(BOOL)flag
-{
- [self _setBoolValue:flag forKey:WebKitHTML5TreeBuilderEnabledPreferenceKey];
-}
-
- (BOOL)paginateDuringLayoutEnabled
{
return [self _boolValueForKey:WebKitPaginateDuringLayoutEnabledPreferenceKey];
diff --git a/WebKit/mac/WebView/WebPreferencesPrivate.h b/WebKit/mac/WebView/WebPreferencesPrivate.h
index 01f2aa8..45c2a24 100644
--- a/WebKit/mac/WebView/WebPreferencesPrivate.h
+++ b/WebKit/mac/WebView/WebPreferencesPrivate.h
@@ -184,13 +184,6 @@ extern NSString *WebPreferencesRemovedNotification;
- (BOOL)webGLEnabled;
- (void)setWebGLEnabled:(BOOL)enabled;
-- (BOOL)html5ParserEnabled;
-- (void)setHTML5ParserEnabled:(BOOL)flag;
-
-// Will be deleted soon, do not use.
-- (BOOL)html5TreeBuilderEnabled;
-- (void)setHTML5TreeBuilderEnabled:(BOOL)flag;
-
- (BOOL)paginateDuringLayoutEnabled;
- (void)setPaginateDuringLayoutEnabled:(BOOL)flag;
diff --git a/WebKit/mac/WebView/WebView.mm b/WebKit/mac/WebView/WebView.mm
index 393a8be..2d3dbfa 100644
--- a/WebKit/mac/WebView/WebView.mm
+++ b/WebKit/mac/WebView/WebView.mm
@@ -1437,7 +1437,6 @@ static bool fastDocumentTeardownEnabled()
settings->setWebGLEnabled([preferences webGLEnabled]);
settings->setLoadDeferringEnabled(shouldEnableLoadDeferring());
settings->setFrameFlatteningEnabled([preferences isFrameFlatteningEnabled]);
- settings->setHTML5ParserEnabled([preferences html5ParserEnabled]);
settings->setPaginateDuringLayoutEnabled([preferences paginateDuringLayoutEnabled]);
settings->setMemoryInfoEnabled([preferences memoryInfoEnabled]);
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 16f6050..a48b408 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2010-08-24 Eric Seidel <eric at webkit.org>
+
+ Reviewed by Adam Barth.
+
+ Remove HTML5 parser testing infrastructure now that we don't need it
+ https://bugs.webkit.org/show_bug.cgi?id=44581
+
+ * DumpRenderTree/mac/DumpRenderTree.mm:
+ (resetDefaultsToConsistentValues):
+ (initializeGlobalsFromCommandLineOptions):
+ * Scripts/old-run-webkit-tests:
+ * Scripts/test-html5-parser: Removed.
+
2010-08-24 Kent Tamura <tkent at chromium.org>
Reviewed by Dimitri Glazkov.
diff --git a/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm b/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm
index 89a25cf..12a4a50 100644
--- a/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm
+++ b/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm
@@ -136,8 +136,6 @@ static int dumpPixels;
static int threaded;
static int dumpTree = YES;
static int forceComplexText;
-static int useHTML5Parser = YES;
-static int useHTML5TreeBuilder = NO; // Temporary, will be removed.
static BOOL printSeparators;
static RetainPtr<CFStringRef> persistentUserStyleSheetLocation;
@@ -456,8 +454,6 @@ static void resetDefaultsToConsistentValues()
[preferences setUsesPageCache:NO];
[preferences setAcceleratedCompositingEnabled:YES];
[preferences setWebGLEnabled:NO];
- [preferences setHTML5ParserEnabled:useHTML5Parser];
- [preferences setHTML5TreeBuilderEnabled:useHTML5TreeBuilder]; // Temporary, will be removed.
[[NSHTTPCookieStorage sharedHTTPCookieStorage] setCookieAcceptPolicy:NSHTTPCookieAcceptPolicyOnlyFromMainDocumentDomain];
@@ -564,8 +560,6 @@ static void initializeGlobalsFromCommandLineOptions(int argc, const char *argv[]
{"tree", no_argument, &dumpTree, YES},
{"threaded", no_argument, &threaded, YES},
{"complex-text", no_argument, &forceComplexText, YES},
- {"legacy-parser", no_argument, &useHTML5Parser, NO},
- {"html5-treebuilder", no_argument, &useHTML5TreeBuilder, YES},
{NULL, 0, NULL, 0}
};
diff --git a/WebKitTools/Scripts/old-run-webkit-tests b/WebKitTools/Scripts/old-run-webkit-tests
index 727869c..886b4a8 100755
--- a/WebKitTools/Scripts/old-run-webkit-tests
+++ b/WebKitTools/Scripts/old-run-webkit-tests
@@ -160,7 +160,6 @@ my $tmpDir = "/tmp";
my $testResultsDirectory = File::Spec->catfile($tmpDir, "layout-test-results");
my $testsPerDumpTool = 1000;
my $threaded = 0;
-my $html5treebuilder = 0;
# DumpRenderTree has an internal timeout of 30 seconds, so this must be > 30.
my $timeoutSeconds = 35;
my $tolerance = 0;
@@ -301,7 +300,6 @@ Usage: $programName [options] [testdir|testpath ...]
--ignore-metrics Ignore metrics in tests
--[no-]strip-editing-callbacks Remove editing callbacks from expected results
-t|--threaded Run a concurrent JavaScript thead with each test
- --html5-treebuilder Run the tests using the HTML5 tree builder
--timeout t Sets the number of seconds before a test times out (default: $timeoutSeconds)
--valgrind Run DumpRenderTree inside valgrind (Qt/Linux only)
-v|--verbose More verbose output (overrides --quiet)
@@ -345,7 +343,6 @@ my $getOptionsResult = GetOptions(
'slowest' => \$report10Slowest,
'strip-editing-callbacks!' => \$stripEditingCallbacks,
'threaded|t' => \$threaded,
- 'html5-treebuilder' => \$html5treebuilder,
'timeout=i' => \$timeoutSeconds,
'tolerance=f' => \$tolerance,
'use-remote-links-to-tests' => \$useRemoteLinksToTests,
@@ -578,7 +575,6 @@ my $totalLeaks = 0;
my @toolArgs = ();
push @toolArgs, "--pixel-tests" if $pixelTests;
push @toolArgs, "--threaded" if $threaded;
-push @toolArgs, "--html5-treebuilder" if $html5treebuilder;
push @toolArgs, "--complex-text" if $complexText;
push @toolArgs, "-";
diff --git a/WebKitTools/Scripts/test-html5-parser b/WebKitTools/Scripts/test-html5-parser
deleted file mode 100755
index eb9bab4..0000000
--- a/WebKitTools/Scripts/test-html5-parser
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/usr/bin/perl
-# Copyright (C) 2010 Google Inc. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Google, Inc. nor the names of
-# its contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY GOOGLE AND ITS CONTRIBUTORS "AS IS" AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL GOOGLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Temporary script to test the HTML5 parser until it is able to
-# run enough LayoutTests so that we know what changes we'll need
-# to make to run-webkit-tests to support testing with the new parser.
-
-# NOTE: This script is a total hack and should be rolled into
-# run-webkit-tests instead of being improved further.
-
-use strict;
-use warnings;
-
-use FindBin;
-use lib $FindBin::Bin;
-use webkitdirs;
-use VCSUtils;
-
-sub writeToFile($$)
-{
- my ($filePath, $contents) = @_;
- open NEWFILE, ">", "$filePath" or die "Could not create $filePath. $!\n";
- print NEWFILE $contents;
- close NEWFILE;
-}
-
-setConfiguration();
-
-my $productDir = productDir();
-my $dumpTool = "$productDir/DumpRenderTree";
-
-chdirWebKit();
-
-my @args = argumentsForConfiguration();
-system("WebKitTools/Scripts/build-dumprendertree", @args) == 0 or die "Failed to build DumpRenderTree";
-
-my @tests = (
- "html5lib/runner",
-);
-
-foreach my $test (@tests) {
- # This logic is super-dumb. Instead of making it smarter, we should
- # roll this into run-webkit-tests once we can run enough of the layout tests.
- my $testPath = "LayoutTests/$test.html";
- my $expectedPath = "LayoutTests/$test-expected-html5.txt";
- my $actualPath = "LayoutTests/$test-actual-html5.txt";
- my $command = "DYLD_FRAMEWORK_PATH=$productDir $dumpTool --html5-treebuilder $testPath";
- print $command, "\n";
- my $output = `$command`;
- writeToFile($actualPath, $output);
- if (-r $expectedPath) {
- my $expectedOutput = `cat $expectedPath`;
- if ($expectedOutput eq $output) {
- print "$test -> PASS\n";
- } else {
- print "$test -> FAIL, diff:\n";
- system("diff -u $expectedPath $actualPath");
- }
- } else {
- print "$test -> NEW, results:\n";
- writeToFile($expectedPath, $output);
- print $output;
- }
-}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list