Webkit merge 39829:39744, Chromium portion.

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

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

9 files changed, 52 insertions, 14 deletions

diff --git a/DEPS b/DEPS
index 6c75197..93c9bae 100644
--- a/DEPS
+++ b/DEPS
@@ -12,7 +12,7 @@ deps = {
     "http://googletest.googlecode.com/svn/trunk@167",
 
   "src/third_party/WebKit":
-    "/trunk/deps/third_party/WebKit@7973",
+    "/trunk/deps/third_party/WebKit@7985",
 
   "src/third_party/icu38":
     "/trunk/deps/third_party/icu38@7525",
@@ -21,13 +21,13 @@ deps = {
     "http://v8.googlecode.com/svn/trunk@1040",
 
   "src/webkit/data/layout_tests/LayoutTests":
-    "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@39744",
+    "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@39829",
 
   "src/third_party/WebKit/WebKit":
-    "http://svn.webkit.org/repository/webkit/trunk/WebKit@39744",
+    "http://svn.webkit.org/repository/webkit/trunk/WebKit@39829",
 
   "src/third_party/WebKit/WebKitLibraries":
-    "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@39744",
+    "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@39829",
 }
 
 
diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION
index 8f3d12b..8337aa4 100644
--- a/WEBKIT_MERGE_REVISION
+++ b/WEBKIT_MERGE_REVISION
@@ -1 +1 @@
-http://svn.webkit.org/repository/webkit/trunk@39744
\ No newline at end of file
+http://svn.webkit.org/repository/webkit/trunk@39829
\ No newline at end of file
diff --git a/webkit/build/JavaScriptCore/SConscript b/webkit/build/JavaScriptCore/SConscript
index afb7f10..e691d31 100644
--- a/webkit/build/JavaScriptCore/SConscript
+++ b/webkit/build/JavaScriptCore/SConscript
@@ -148,6 +148,7 @@ if env.Bit('windows'):
 wtf_inputs = [
     '$JAVASCRIPTCORE_DIR/runtime/ByteArray.cpp',
     '$WTF_DIR/Assertions.cpp',
+    '$WTF_DIR/CurrentTime.cpp',
     '$WTF_DIR/dtoa.cpp',
     '$WTF_DIR/FastMalloc.cpp',
     '$WTF_DIR/HashTable.cpp',
diff --git a/webkit/build/JavaScriptCore/WTF.vcproj b/webkit/build/JavaScriptCore/WTF.vcproj
index fcdb697..baf5d8c 100644
--- a/webkit/build/JavaScriptCore/WTF.vcproj
+++ b/webkit/build/JavaScriptCore/WTF.vcproj
@@ -154,6 +154,14 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\CurrentTime.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\CurrentTime.h"
+			>
+		</File>
+		<File
 			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\Deque.h"
 			>
 		</File>
@@ -246,6 +254,10 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\PtrAndFlags.h"
+			>
+		</File>
+		<File
 			RelativePath="..\precompiled_webkit.cc"
 			>
 			<FileConfiguration
diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript
index be7e4f0..d905cd4 100644
--- a/webkit/build/WebCore/SConscript
+++ b/webkit/build/WebCore/SConscript
@@ -846,7 +846,6 @@ input_files = [
     '$WEBCORE_DIR/svg/graphics/SVGResourceMarker.cpp',
     '$WEBCORE_DIR/svg/graphics/SVGResourceMasker.cpp',
 
-    '$WEBCORE_DIR/svg/graphics/skia/RenderPathSkia.cpp',
     '$WEBCORE_DIR/svg/graphics/skia/SVGPaintServerPatternSkia.cpp',
     '$WEBCORE_DIR/svg/graphics/skia/SVGPaintServerSkia.cpp',
     '$WEBCORE_DIR/svg/graphics/skia/SVGResourceFilterSkia.cpp',
diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj
index 8ae60a5..29e7cbf 100644
--- a/webkit/build/WebCore/WebCore.vcproj
+++ b/webkit/build/WebCore/WebCore.vcproj
@@ -7052,10 +7052,6 @@
 					Name="skia"
 					>
 					<File
-						RelativePath="..\..\..\third_party\WebKit\WebCore\svg\graphics\skia\RenderPathSkia.cpp"
-						>
-					</File>
-					<File
 						RelativePath="..\..\..\third_party\WebKit\WebCore\svg\graphics\skia\SVGPaintServerPatternSkia.cpp"
 						>
 					</File>
diff --git a/webkit/glue/regular_expression_unittest.cc b/webkit/glue/regular_expression_unittest.cc
index 719879b..eaab8ce 100644
--- a/webkit/glue/regular_expression_unittest.cc
+++ b/webkit/glue/regular_expression_unittest.cc
@@ -35,7 +35,7 @@ struct Match {
 TEST(RegexTest, Basic) {
   // Just make sure we're not completely broken.
   const String pattern("the quick brown fox");
-  RegularExpression regex(pattern, /* case sensitive */ true);
+  RegularExpression regex(pattern, WebCore::TextCaseSensitive);
   EXPECT_EQ(0, regex.match("the quick brown fox"));
   EXPECT_EQ(1, regex.match(" the quick brown fox"));
   EXPECT_EQ(3, regex.match("foothe quick brown foxbar"));
@@ -50,7 +50,7 @@ TEST(RegexTest, Unicode) {
   // Test 1
   wstring wstr_pattern(L"\x6240\x6709\x7f51\x9875");
   String pattern = StdWStringToString(wstr_pattern);
-  RegularExpression regex(pattern, /* case sensitive */ false);
+  RegularExpression regex(pattern, WebCore::TextCaseInsensitive);
 
   EXPECT_EQ(0, regex.match(StdWStringToString(wstr_pattern)));
   EXPECT_EQ(1, regex.match(StdWStringToString(
@@ -63,7 +63,7 @@ TEST(RegexTest, Unicode) {
   // Test 2, mixed length
   wstr_pattern = L":[ \x2000]+:";
   pattern = StdWStringToString(wstr_pattern);
-  regex = RegularExpression(pattern, /* case sensitive */ false);
+  regex = RegularExpression(pattern, WebCore::TextCaseInsensitive);
   
   const Match matches[] = {
     { L":  :", 0, 4 },
@@ -82,7 +82,7 @@ TEST(RegexTest, Unicode) {
   // Test 3, empty match
   wstr_pattern = L"|x";
   pattern = StdWStringToString(wstr_pattern);
-  regex = RegularExpression(pattern, /* case sensitive */ false);
+  regex = RegularExpression(pattern, WebCore::TextCaseInsensitive);
   
   const Match matches2[] = {
     { L"", 0, 0 },
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index c2c909a..45cf91b 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -1889,6 +1889,26 @@ SKIP : LayoutTests/fast/events/pointer-events.html = FAIL
 SKIP : LayoutTests/animations/animation-controller-drt-api.html = TIMEOUT
 SKIP : LayoutTests/transitions/zero-duration-with-non-zero-delay-end.html = TIMEOUT
 
+
+// Merge 39744:39829 - new tests
+LayoutTests/fast/canvas/canvas-incremental-repaint-2.html = FAIL
+LayoutTests/fast/encoding/char-encoding-mac.html = FAIL
+WIN LINUX : LayoutTests/fast/forms/focus2.html = FAIL
+LayoutTests/fast/repaint/transform-disable-layoutstate.html = FAIL
+
+// Merge 39744:39829 - regression likely due to bad implementation of RenderPath::strokeContains in PathSkia.cpp
+LayoutTests/fast/canvas/pointInPath.html = FAIL
+LayoutTests/svg/custom/path-bad-data.svg = FAIL
+
+// Merge 39744:39829 - regressions
+LayoutTests/editing/pasteboard/4947130.html = FAIL
+WIN LINUX : LayoutTests/editing/selection/drag-text-delay.html = FAIL
+LayoutTests/fast/events/space-scroll-event.html = FAIL
+
+WIN LINUX : LayoutTests/fast/forms/enter-clicks-buttons.html = FAIL
+WIN LINUX : LayoutTests/http/tests/security/cross-frame-access-protocol-explicit-domain.html = FAIL
+WIN LINUX : LayoutTests/http/tests/security/cross-frame-access-protocol.html = FAIL
+
 // 12-Jan-2009 Regressions:
 // I'm turning these off to green the build until I can look at them tomorrow. For the
 // most part they probably just need to be rebaselined due to recent Skia SVG changes.
@@ -1904,5 +1924,7 @@ LINUX : LayoutTests/svg/custom/viewbox-syntax.svg = FAIL
 // Another 12-Jan-2009 regression.
 LINUX : chrome/fonts/courier.html = FAIL
 
+
+
 // TODO(mmoss): rebaseline this when patterns are drawn correctly.
 LINUX WIN : LayoutTests/svg/W3C-SVG-1.1/pservers-grad-06-b.svg = FAIL
diff --git a/webkit/webkit.xcodeproj/project.pbxproj b/webkit/webkit.xcodeproj/project.pbxproj
index a6d4256..da6d3a9 100644
--- a/webkit/webkit.xcodeproj/project.pbxproj
+++ b/webkit/webkit.xcodeproj/project.pbxproj
@@ -1307,6 +1307,7 @@
 		E4A238C70E3FA19C002BDE14 /* image_decoder.cc in Sources */ = {isa = PBXBuildFile; fileRef = E4A238C50E3FA19C002BDE14 /* image_decoder.cc */; };
 		E4E4C7F90E781B5B009A687C /* webplugin_impl_mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = E4E4C7F80E781B5B009A687C /* webplugin_impl_mac.mm */; };
 		E4E4C94A0E797648009A687C /* ImageSourceCG.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E8FBD0D7F3CC1001ECF42 /* ImageSourceCG.cpp */; };
+		FBBBF2E4099C8EA9BDAF80F9 /* CurrentTime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CCBDDEF91A55ACE86471036E /* CurrentTime.cpp */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -4290,6 +4291,9 @@
 		E4A238C50E3FA19C002BDE14 /* image_decoder.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = image_decoder.cc; sourceTree = "<group>"; };
 		E4A238C60E3FA19C002BDE14 /* image_decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = image_decoder.h; sourceTree = "<group>"; };
 		E4E4C7F80E781B5B009A687C /* webplugin_impl_mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = webplugin_impl_mac.mm; sourceTree = "<group>"; };
+		9DEAFAB44D279360C80A1BA9 /* PtrAndFlags.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PtrAndFlags.h; sourceTree = "<group>"; };
+		20EF92D9CD4E55999674A63E /* CurrentTime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CurrentTime.h; sourceTree = "<group>"; };
+		CCBDDEF91A55ACE86471036E /* CurrentTime.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CurrentTime.cpp; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -4707,6 +4711,8 @@
 				7B5E85B60D7F28F5001ECF42 /* Assertions.cpp */,
 				7B5E85B70D7F28F5001ECF42 /* Assertions.h */,
 				4DB7F51F0E9BD3FB00C66CE0 /* AVLTree.h */,
+				CCBDDEF91A55ACE86471036E /* CurrentTime.cpp */,
+				20EF92D9CD4E55999674A63E /* CurrentTime.h */,
 				7B5E85B80D7F28F5001ECF42 /* Deque.h */,
 				7B5E85B90D7F28F5001ECF42 /* DisallowCType.h */,
 				4D35557B0ED4ACF600FB28B1 /* dtoa.cpp */,
@@ -4737,6 +4743,7 @@
 				7B5E85CC0D7F28F5001ECF42 /* OwnPtr.h */,
 				7B5E85CE0D7F28F5001ECF42 /* PassRefPtr.h */,
 				7B5E85CF0D7F28F5001ECF42 /* Platform.h */,
+				9DEAFAB44D279360C80A1BA9 /* PtrAndFlags.h */,
 				4112E7050EFB0A26001E0E7A /* RandomNumber.cpp */,
 				4112E7040EFB0A26001E0E7A /* RandomNumber.h */,
 				7B5E85D00D7F28F5001ECF42 /* RefCounted.h */,
@@ -8190,6 +8197,7 @@
 				7B5E85E70D7F28F5001ECF42 /* Assertions.cpp in Sources */,
 				4D7FAB940F156764004F1B19 /* ByteArray.cpp in Sources */,
 				E40054B10E9BCC5C0055B38E /* CollatorICU.cpp in Sources */,
+				FBBBF2E4099C8EA9BDAF80F9 /* CurrentTime.cpp in Sources */,
 				4D35557D0ED4ACF600FB28B1 /* dtoa.cpp in Sources */,
 				7B5E862C0D7F2B56001ECF42 /* FastMalloc.cpp in Sources */,
 				7B5E85F40D7F28F5001ECF42 /* HashTable.cpp in Sources */,