From 40f52f0c52a82bc988bc95dc296ddfa89f09154a Mon Sep 17 00:00:00 2001
From: "ericroman@google.com"
<ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Tue, 23 Dec 2008 07:26:39 +0000
Subject: Webkit merge 39410:39438 (CL 4 of 4).
Review URL: http://codereview.chromium.org/16444
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7416 0039d316-1c4b-4281-b951-d872f2087c98
---
webkit/build/WebCore/SConscript | 1 +
webkit/build/WebCore/WebCore.vcproj | 8 ++++++++
.../transformed-document-element-expected.checksum | 1 +
.../transformed-document-element-expected.png | Bin 0 -> 17966 bytes
.../transformed-document-element-expected.txt | 8 ++++++++
webkit/tools/layout_tests/test_lists/tests_fixable.txt | 6 ------
webkit/tools/layout_tests/test_lists/tests_ignored.txt | 5 +++++
webkit/webkit.xcodeproj/project.pbxproj | 6 ++++++
8 files changed, 29 insertions(+), 6 deletions(-)
create mode 100644 webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/transforms/transformed-document-element-expected.checksum
create mode 100644 webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/transforms/transformed-document-element-expected.png
create mode 100644 webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/transforms/transformed-document-element-expected.txt
(limited to 'webkit')
diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript
index 70b7e73..7ededc7 100644
--- a/webkit/build/WebCore/SConscript
+++ b/webkit/build/WebCore/SConscript
@@ -508,6 +508,7 @@ input_files = [
'$WEBCORE_DIR/platform/network/AuthenticationChallengeBase.cpp',
'$WEBCORE_DIR/platform/network/Credential.cpp',
'$WEBCORE_DIR/platform/network/FormData.cpp',
+ '$WEBCORE_DIR/platform/network/FormDataBuilder.cpp',
'$WEBCORE_DIR/platform/network/HTTPParsers.cpp',
'$WEBCORE_DIR/platform/network/NetworkStateNotifier.cpp',
'$WEBCORE_DIR/platform/network/ProtectionSpace.cpp',
diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj
index d853fc4..49f7640 100644
--- a/webkit/build/WebCore/WebCore.vcproj
+++ b/webkit/build/WebCore/WebCore.vcproj
@@ -1709,6 +1709,14 @@
>
</File>
<File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\platform\network\FormDataBuilder.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\platform\network\FormDataBuilder.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\third_party\WebKit\WebCore\platform\network\HTTPHeaderMap.h"
>
</File>
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/transforms/transformed-document-element-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/transforms/transformed-document-element-expected.checksum
new file mode 100644
index 0000000..049d39d
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/transforms/transformed-document-element-expected.checksum
@@ -0,0 +1 @@
+9fccceabf705b9e5844e0a5aa56c1d5b
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/transforms/transformed-document-element-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/transforms/transformed-document-element-expected.png
new file mode 100644
index 0000000..ec9c039
Binary files /dev/null and b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/transforms/transformed-document-element-expected.png differ
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/transforms/transformed-document-element-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/transforms/transformed-document-element-expected.txt
new file mode 100644
index 0000000..108677b
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/transforms/transformed-document-element-expected.txt
@@ -0,0 +1,8 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x52
+ RenderBlock {HTML} at (0,0) size 800x52
+ RenderBody {BODY} at (8,16) size 784x20 [bgcolor=#808080]
+ RenderBlock {P} at (0,0) size 784x20
+ RenderText {#text} at (0,0) size 527x19
+ text run at (0,0) width 527: "The portions of the view exposed by the transformed document should be painted white"
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index 3d925b7..e55cd9e 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -1634,8 +1634,6 @@ LINUX WIN : LayoutTests/svg/custom/fill-fallback.svg = FAIL
LINUX WIN : LayoutTests/svg/custom/invalid-css.svg = FAIL
LINUX WIN : LayoutTests/svg/custom/js-late-gradient-and-object-creation.svg = FAIL
LINUX WIN : LayoutTests/svg/custom/resource-client-removal.svg = FAIL
-LayoutTests/wml/variable-reference-invalid-character.html = FAIL
-LayoutTests/wml/variable-reference-valid.html = FAIL
// WebKit Merge 39050:39100 failures:
LayoutTests/fast/dom/java-applet-calls.html = FAIL
@@ -1648,9 +1646,6 @@ LayoutTests/fast/events/special-key-events-in-input-text.html = FAIL
LayoutTests/fast/regex/non-pattern-characters.html = FAIL
SKIP : LayoutTests/fast/workers/worker-navigator.html = FAIL
SKIP : LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-image-not-loaded-svg.svg = FAIL
-LayoutTests/wml/go-task-get-method-external-deck.html = FAIL
-LayoutTests/wml/go-task-get-method-same-deck.html = FAIL
-LayoutTests/wml/go-task-get-method-external-deck-with-href.html = FAIL
// Windows pixeltest failure: alpha=0.5 red does not come out blended.
// Linux pixeltest failure: alpha=0.5 red (1,0,0) atop yellow (1,1,0) is
@@ -1735,7 +1730,6 @@ LayoutTests/fast/regex/quantified-assertions.html = FAIL
// we don't support. Needs more investigation.
LayoutTests/http/tests/security/feed-urls-from-remote.html = PASS FAIL
LayoutTests/transforms/2d/transform-value-types.html = FAIL
-LayoutTests/wml/go-task-animation.html = FAIL
LayoutTests/fast/workers/worker-replace-self.html = TIMEOUT
LayoutTests/http/tests/navigation/post-goback-repost-policy.html = TIMEOUT
LINUX WIN DEBUG : LayoutTests/editing/pasteboard/4947130.html = CRASH
diff --git a/webkit/tools/layout_tests/test_lists/tests_ignored.txt b/webkit/tools/layout_tests/test_lists/tests_ignored.txt
index 310a615..5cbcf7b 100644
--- a/webkit/tools/layout_tests/test_lists/tests_ignored.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_ignored.txt
@@ -23,6 +23,11 @@ SKIP : LayoutTests/fast/dom/open-and-close-by-DOM.html = FAIL
SKIP : LayoutTests/svg/custom/fill-SVGPaint-interface.svg = PASS
SKIP : LayoutTests/svg/custom/getPresentationAttribute.svg = PASS
+// WML is still an inprogress feature upstream. Chromium does not build
+// with WML support, so skip its tests.
+SKIP : LayoutTests/wml = FAIL
+SKIP : LayoutTests/http/tests/wml = FAIL
+
// -----------------------------------------------------------------
// FAILING TESTS
// -----------------------------------------------------------------
diff --git a/webkit/webkit.xcodeproj/project.pbxproj b/webkit/webkit.xcodeproj/project.pbxproj
index df61be3..8f9c009 100644
--- a/webkit/webkit.xcodeproj/project.pbxproj
+++ b/webkit/webkit.xcodeproj/project.pbxproj
@@ -38,6 +38,7 @@
/* End PBXAggregateTarget section */
/* Begin PBXBuildFile section */
+ 040BA91F0F0077E800BFA8E5 /* FormDataBuilder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 040BA91E0F0077E800BFA8E5 /* FormDataBuilder.cpp */; };
04C3AFC30EF1E43D0046D578 /* NavigatorBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 04C3AFC20EF1E43D0046D578 /* NavigatorBase.cpp */; };
04C3AFC60EF1E45F0046D578 /* WorkerNavigator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 04C3AFC50EF1E45F0046D578 /* WorkerNavigator.cpp */; };
4103039F0EFB0F7C008832CA /* CachedPage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4103039E0EFB0F7C008832CA /* CachedPage.cpp */; };
@@ -1439,6 +1440,8 @@
/* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */
+ 040BA91E0F0077E800BFA8E5 /* FormDataBuilder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FormDataBuilder.cpp; sourceTree = "<group>"; };
+ 040BA9200F0077EE00BFA8E5 /* FormDataBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FormDataBuilder.h; sourceTree = "<group>"; };
04C3AFC20EF1E43D0046D578 /* NavigatorBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NavigatorBase.cpp; sourceTree = "<group>"; };
04C3AFC40EF1E4430046D578 /* NavigatorBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NavigatorBase.h; sourceTree = "<group>"; };
04C3AFC50EF1E45F0046D578 /* WorkerNavigator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WorkerNavigator.cpp; sourceTree = "<group>"; };
@@ -5887,6 +5890,8 @@
7B5E91250D7F3CC2001ECF42 /* Credential.h */,
7B5E912C0D7F3CC2001ECF42 /* FormData.cpp */,
7B5E912D0D7F3CC2001ECF42 /* FormData.h */,
+ 040BA91E0F0077E800BFA8E5 /* FormDataBuilder.cpp */,
+ 040BA9200F0077EE00BFA8E5 /* FormDataBuilder.h */,
7B5E912E0D7F3CC2001ECF42 /* HTTPHeaderMap.h */,
7B5E912F0D7F3CC2001ECF42 /* HTTPParsers.cpp */,
7B5E91300D7F3CC2001ECF42 /* HTTPParsers.h */,
@@ -9360,6 +9365,7 @@
E456266F0E268E87005E4685 /* XSLTExtensions.cpp in Sources */,
E45626700E268E87005E4685 /* XSLTProcessor.cpp in Sources */,
E45626710E268E87005E4685 /* XSLTUnicodeSort.cpp in Sources */,
+ 040BA91F0F0077E800BFA8E5 /* FormDataBuilder.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
--
cgit v1.1