WebKit Merge! (chrome part)

Review URL: http://codereview.chromium.org/27028

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10233 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 43 insertions, 10 deletions

diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript
index c9704c3..3c1ba65 100644
--- a/webkit/build/WebCore/SConscript
+++ b/webkit/build/WebCore/SConscript
@@ -432,6 +432,7 @@ input_files = [
     '$WEBCORE_DIR/page/chromium/FrameChromium.cpp',
 
     '$WEBCORE_DIR/platform/Arena.cpp',
+    '$WEBCORE_DIR/platform/ContentType.cpp',
     '$WEBCORE_DIR/platform/ContextMenu.cpp',
     '$WEBCORE_DIR/platform/DeprecatedPtrListImpl.cpp',
     '$WEBCORE_DIR/platform/DragData.cpp',
diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj
index 859401f..c477ceb 100644
--- a/webkit/build/WebCore/WebCore.vcproj
+++ b/webkit/build/WebCore/WebCore.vcproj
@@ -945,6 +945,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\platform\ContentType.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\platform\ContentType.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\third_party\WebKit\WebCore\platform\ContextMenu.cpp"
 				>
 			</File>
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index 56ef0f7..c037b73 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -142,10 +142,6 @@ DEFER : LayoutTests/fast/html/keygen.html = FAIL
 // Other
 // -----------------------------------------------------------------
 
-// Bug 5248
-MAC : LayoutTests/http/tests/security/cross-frame-access-protocol-explicit-domain.html = FAIL
-MAC : LayoutTests/http/tests/security/cross-frame-access-protocol.html = FAIL
-
 // Pixeltest failure: Form control metrics incorrect
 LINUX MAC : LayoutTests/http/tests/navigation/javascriptlink-frames.html = FAIL PASS
 
@@ -362,8 +358,6 @@ DEFER LINUX : LayoutTests/svg/hixie/perf/007.xml = FAIL
 DEFER LINUX : LayoutTests/svg/hixie/text/003a.xml = FAIL
 DEFER LINUX : LayoutTests/svg/hixie/viewbox/preserveAspectRatio/001.xml = FAIL
 DEFER LINUX : LayoutTests/svg/hixie/viewbox/preserveAspectRatio/002.xml = FAIL
-DEFER LINUX : LayoutTests/svg/text/text-intro-05-t.svg = FAIL
-LINUX : LayoutTests/svg/W3C-SVG-1.1/text-intro-05-t.svg = FAIL
 DEFER LINUX : LayoutTests/svg/W3C-SVG-1.1/animate-elem-36-t.svg = FAIL
 LINUX : LayoutTests/svg/W3C-SVG-1.1/animate-elem-40-t.svg = FAIL
 LINUX : LayoutTests/svg/W3C-SVG-1.1/animate-elem-41-t.svg = FAIL
@@ -655,7 +649,7 @@ LINUX WIN : LayoutTests/fast/encoding/invalid-UTF-8.html = FAIL
 
 // HTTPS tests fail on the open source buildbot with error "cross-site
 // not access allowed".  See bug # 2306
-LINUX MAC : LayoutTests/http/tests/ssl/verify-ssl-enabled.php = FAIL PASS
+LayoutTests/http/tests/ssl/verify-ssl-enabled.php = FAIL PASS
 
 // These require application cache to be enabled.  Skip the tests because
 // they're all timing out.  TODO(tc): Upstream changes to the test so they
@@ -849,7 +843,6 @@ LINUX MAC : LayoutTests/fast/loader/file-URL-with-port-number.html = FAIL
 LINUX : LayoutTests/fast/text/atsui-kerning-and-ligatures.html = FAIL
 LINUX : LayoutTests/fast/text/atsui-partial-selection.html = FAIL
 LINUX : LayoutTests/fast/text/atsui-small-caps-punctuation-size.html = FAIL
-LINUX : LayoutTests/fast/text/atsui-spacing-features.html = FAIL
 LINUX : LayoutTests/fast/text/cg-vs-atsui.html = FAIL
 LINUX : LayoutTests/fast/text/international/complex-character-based-fallback.html = FAIL
 LINUX : LayoutTests/fast/text/large-text-composed-char.html = FAIL
@@ -991,7 +984,7 @@ pending/security/block-test.html = CRASH FAIL
 // New test. We should fix it, but it doesn't need to block the current release
 DEFER : LayoutTests/http/tests/security/originHeader/origin-header-for-empty.html = FAIL PASS
 
-MAC : LayoutTests/http/tests/security/originHeader/origin-header-for-https.html = FAIL TIMEOUT
+LayoutTests/http/tests/security/originHeader/origin-header-for-https.html = FAIL TIMEOUT
 
 // MERGE 38389:38450
 // WebKit regression: https://bugs.webkit.org/show_bug.cgi?id=20342
@@ -1705,7 +1698,6 @@ MAC : LayoutTests/animations/change-keyframes.html = FAIL PASS
 // TODO(dsh): These started to fail after r9202.
 LINUX : LayoutTests/fast/block/positioning/047.html = FAIL
 LINUX : LayoutTests/svg/W3C-SVG-1.1/text-path-01-b.svg = FAIL
-LINUX : LayoutTests/svg/text/text-fonts-01-t.svg = FAIL
 LINUX : LayoutTests/svg/text/text-path-01-b.svg = FAIL
 
 // Regressions from WebKit merge 40539:40668
@@ -1810,3 +1802,31 @@ LINUX : LayoutTests/fast/canvas/fillrect_gradient.html = FAIL PASS
 // aligning 15px Ahem should end up in a certain spot. But we have the  
 // x-height correct and we're still one px off. 
 LINUX : LayoutTests/css2.1/t100801-c544-valgn-01-d-ag.html = FAIL
+
+// New failures from Merge 41078:41149
+LayoutTests/fast/dom/SelectorAPI/dumpNodeList-almost-strict.html = FAIL
+LayoutTests/fast/dom/SelectorAPI/dumpNodeList.html = FAIL
+LayoutTests/fast/dom/anchor-backslash.html = FAIL
+LayoutTests/fast/dom/empty-hash-and-search.html = FAIL
+LayoutTests/fast/dom/onload-open.html = FAIL
+LayoutTests/fast/loader/location-port.html = FAIL
+LayoutTests/fast/reflections/reflection-direction.html = FAIL
+LayoutTests/fast/reflections/reflection-masks-opacity.html = FAIL
+LayoutTests/fast/text/international/001.html = FAIL
+LayoutTests/fast/text/international/002.html = FAIL
+LayoutTests/fast/text/international/003.html = FAIL
+LayoutTests/fast/text/international/bidi-linebreak-001.html = FAIL
+LayoutTests/fast/text/international/bidi-linebreak-002.html = FAIL
+LayoutTests/fast/text/international/bidi-linebreak-003.html = FAIL
+LayoutTests/fast/text/international/wrap-CJK-001.html = FAIL
+LayoutTests/fast/borders/border-image-rotate-transform.html = CRASH
+LayoutTests/fast/text/atsui-spacing-features.html = FAIL
+LayoutTests/svg/W3C-SVG-1.1/text-fonts-01-t.svg = FAIL
+LayoutTests/svg/W3C-SVG-1.1/text-intro-05-t.svg = FAIL
+LayoutTests/svg/text/text-fonts-01-t.svg = FAIL
+LayoutTests/svg/text/text-intro-05-t.svg = FAIL
+
+// Always fails for mac bug 5248, new failure with merge for eseidel
+LayoutTests/http/tests/security/cross-frame-access-protocol-explicit-domain.html = FAIL
+LayoutTests/http/tests/security/cross-frame-access-protocol.html = FAIL
+
diff --git a/webkit/webkit.xcodeproj/project.pbxproj b/webkit/webkit.xcodeproj/project.pbxproj
index 08b5442..ee993b9 100644
--- a/webkit/webkit.xcodeproj/project.pbxproj
+++ b/webkit/webkit.xcodeproj/project.pbxproj
@@ -39,6 +39,7 @@
 
 /* Begin PBXBuildFile section */
 		07390253EA4F1C8D86C78CCD /* PNGImageEncoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31493A4FA536C112F8C2FB03 /* PNGImageEncoder.cpp */; };
+		1C289F9B0516188EB348C3E6 /* ContentType.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 516F2CC999D8F5AAC74B5341 /* ContentType.cpp */; };
 		25B9F25199984DFE5E4A59AE /* V8WebKitCSSMatrix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 688FFA9B9CEFE9B1B66F8671 /* V8WebKitCSSMatrix.cpp */; };
 		31BF82F52CDAED9621AC244E /* CrossThreadCopier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E9CDA0420F5FBB839D45544 /* CrossThreadCopier.cpp */; };
 		3C9197C6A7DABB989CBDBF81 /* Playback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C1174C9D4E12AB30D653019A /* Playback.cpp */; };
@@ -1885,6 +1886,7 @@
 		4DDC62B30EAD142D00FB5EBE /* Plugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Plugin.h; sourceTree = "<group>"; };
 		4DDC62B40EAD142D00FB5EBE /* PluginArray.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PluginArray.cpp; sourceTree = "<group>"; };
 		4DDC62B50EAD142D00FB5EBE /* PluginArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginArray.h; sourceTree = "<group>"; };
+		516F2CC999D8F5AAC74B5341 /* ContentType.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ContentType.cpp; sourceTree = "<group>"; };
 		535EE0BE0EC4D10E00939D54 /* clipboard_conversion.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = clipboard_conversion.cc; sourceTree = "<group>"; };
 		535EE0BF0EC4D10E00939D54 /* clipboard_conversion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = clipboard_conversion.h; sourceTree = "<group>"; };
 		5379C0C70F2A840D0092C7DF /* WorkerThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WorkerThread.h; sourceTree = "<group>"; };
@@ -5805,6 +5807,7 @@
 				7B5E8F810D7F3CC1001ECF42 /* AutodrainedPool.h */,
 				7B5E8F820D7F3CC1001ECF42 /* cf */,
 				93AF52620F002ED00073C62D /* chromium */,
+				516F2CC999D8F5AAC74B5341 /* ContentType.cpp */,
 				7B5E8F860D7F3CC1001ECF42 /* ContextMenu.cpp */,
 				7B5E8F870D7F3CC1001ECF42 /* ContextMenu.h */,
 				7B5E8F880D7F3CC1001ECF42 /* ContextMenuItem.h */,
@@ -8739,6 +8742,7 @@
 				938444570F16B0570075F4C5 /* Console.cpp in Sources */,
 				938444580F16B0570075F4C5 /* ContainerNode.cpp in Sources */,
 				938444590F16B0570075F4C5 /* ContentData.cpp in Sources */,
+				1C289F9B0516188EB348C3E6 /* ContentType.cpp in Sources */,
 				9384445A0F16B0570075F4C5 /* ContextMenu.cpp in Sources */,
 				9384445B0F16B0570075F4C5 /* ContextMenuChromium.cpp in Sources */,
 				9384445C0F16B0570075F4C5 /* ContextMenuController.cpp in Sources */,