WebKit merge 40364:40409, Chromium part

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

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

5 files changed, 39 insertions, 15 deletions

diff --git a/webkit/build/JavaScriptCore/WTF.vcproj b/webkit/build/JavaScriptCore/WTF.vcproj
index 5467e42..b669304 100644
--- a/webkit/build/JavaScriptCore/WTF.vcproj
+++ b/webkit/build/JavaScriptCore/WTF.vcproj
@@ -346,6 +346,10 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\TypeTraits.h"
+			>
+		</File>
+		<File
 			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\ThreadSpecificWin.cpp"
 			>
 		</File>
diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript
index 9ab98a3..78e8a0d 100644
--- a/webkit/build/WebCore/SConscript
+++ b/webkit/build/WebCore/SConscript
@@ -441,6 +441,7 @@ input_files = [
     '$WEBCORE_DIR/platform/ScrollView.cpp',
     '$WEBCORE_DIR/platform/SharedBuffer.cpp',
     '$WEBCORE_DIR/platform/ThreadGlobalData.cpp',
+    '$WEBCORE_DIR/platform/ThreadTimers.cpp',
     '$WEBCORE_DIR/platform/Timer.cpp',
     '$WEBCORE_DIR/platform/Widget.cpp',
 
@@ -621,7 +622,6 @@ input_files = [
     '$WEBCORE_DIR/rendering/RenderFieldset.cpp',
     '$WEBCORE_DIR/rendering/RenderFileUploadControl.cpp',
     '$WEBCORE_DIR/rendering/RenderFlexibleBox.cpp',
-    '$WEBCORE_DIR/rendering/RenderFlow.cpp',
     '$WEBCORE_DIR/rendering/RenderForeignObject.cpp',
     '$WEBCORE_DIR/rendering/RenderFrame.cpp',
     '$WEBCORE_DIR/rendering/RenderFrameSet.cpp',
diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj
index d41b34d..70f42d3 100644
--- a/webkit/build/WebCore/WebCore.vcproj
+++ b/webkit/build/WebCore/WebCore.vcproj
@@ -1259,6 +1259,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\platform\ThreadTimers.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\platform\ThreadTimers.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\third_party\WebKit\WebCore\platform\Timer.cpp"
 				>
 			</File>
@@ -3239,14 +3247,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderFlow.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderFlow.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderForeignObject.cpp"
 				>
 			</File>
@@ -3383,6 +3383,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderObjectChildList.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderPart.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 ef8c133..14ba5f1 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -1786,3 +1786,17 @@ LINUX WIN : LayoutTests/editing/spelling/spelling-linebreak.html = FAIL
 
 // Started failng at build 1379 (r8741).  passes locally
 LINUX : LayoutTests/fast/text/cg-fallback-bolding.html = FAIL PASS
+
+// Merge 40364:40409 -- new test
+LayoutTests/svg/custom/pattern-with-transformation.svg = FAIL
+
+// Merge 40364:40409 -- fails after http://trac.webkit.org/changeset/40379
+// Perhaps needs some change on Skia side.
+LayoutTests/svg/W3C-SVG-1.1/pservers-grad-06-b.svg = FAIL
+
+// Merge 40364:40409 -- fails after http://trac.webkit.org/changeset/40379
+// ASSERTs in Debug after this change: http://trac.webkit.org/changeset/40372
+// Likely will be fixed with subsequent merge. 
+LayoutTests/fast/dynamic/insert-before-table-part-in-continuation.html = FAIL
+
+
diff --git a/webkit/webkit.xcodeproj/project.pbxproj b/webkit/webkit.xcodeproj/project.pbxproj
index e4e41a2..57b9729 100644
--- a/webkit/webkit.xcodeproj/project.pbxproj
+++ b/webkit/webkit.xcodeproj/project.pbxproj
@@ -93,6 +93,7 @@
 		82F14D610ED230E700B36428 /* webcursor_mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 82F14D600ED230E700B36428 /* webcursor_mac.mm */; };
 		89F4A0D50F200D5B000A326A /* V8CanvasPixelArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 89F4A0D30F200D59000A326A /* V8CanvasPixelArray.cpp */; };
 		89F4A2090F2106EF000A326A /* V8CanvasPixelArrayCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 89F4A1FC0F2101F8000A326A /* V8CanvasPixelArrayCustom.cpp */; };
+		8EFD7D527676BF3B3C92361E /* ThreadTimers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6A9898388068C93C5A7C011C /* ThreadTimers.cpp */; };
 		934CC0040EBFE0E000A658F2 /* chromium_bridge_impl.cc in Sources */ = {isa = PBXBuildFile; fileRef = 934CC0030EBFE0E000A658F2 /* chromium_bridge_impl.cc */; };
 		938180500EF3394A00993F02 /* back_forward_list_client_impl.cc in Sources */ = {isa = PBXBuildFile; fileRef = 9381804E0EF3394A00993F02 /* back_forward_list_client_impl.cc */; };
 		938444080F16B0570075F4C5 /* AccessibilityImageMapLink.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DB7F1E80E9BAE2900C66CE0 /* AccessibilityImageMapLink.cpp */; };
@@ -557,7 +558,6 @@
 		938445D80F16B0570075F4C5 /* RenderFieldset.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E95470D7F3E94001ECF42 /* RenderFieldset.cpp */; };
 		938445D90F16B0570075F4C5 /* RenderFileUploadControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E95490D7F3E94001ECF42 /* RenderFileUploadControl.cpp */; };
 		938445DA0F16B0570075F4C5 /* RenderFlexibleBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E954B0D7F3E94001ECF42 /* RenderFlexibleBox.cpp */; };
-		938445DB0F16B0570075F4C5 /* RenderFlow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E954D0D7F3E94001ECF42 /* RenderFlow.cpp */; };
 		938445DC0F16B0570075F4C5 /* RenderForeignObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E954F0D7F3E94001ECF42 /* RenderForeignObject.cpp */; };
 		938445DD0F16B0570075F4C5 /* RenderFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E95510D7F3E94001ECF42 /* RenderFrame.cpp */; };
 		938445DE0F16B0570075F4C5 /* RenderFrameSet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E95530D7F3E94001ECF42 /* RenderFrameSet.cpp */; };
@@ -1548,6 +1548,7 @@
 		41AF32C50EE5E6ED00BF6361 /* ScriptInstance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptInstance.h; sourceTree = "<group>"; };
 		41DEA0670F27C0F900E40D43 /* BackForwardListChromium.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BackForwardListChromium.cpp; sourceTree = "<group>"; };
 		41F1D4620EF70D1600DA8753 /* FontFastPath.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FontFastPath.cpp; sourceTree = "<group>"; };
+		4C04BF9CDE7B0B591087B440 /* RenderObjectChildList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderObjectChildList.h; sourceTree = "<group>"; };
 		4D1637C30EBFA49E008F024E /* SQLiteAuthorizer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SQLiteAuthorizer.cpp; sourceTree = "<group>"; };
 		4D1637C40EBFA49E008F024E /* SQLiteDatabase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SQLiteDatabase.cpp; sourceTree = "<group>"; };
 		4D1637C50EBFA49E008F024E /* SQLiteDatabase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SQLiteDatabase.h; sourceTree = "<group>"; };
@@ -1863,6 +1864,7 @@
 		53AAC3930F291FCF00233688 /* HTTPHeaderMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTTPHeaderMap.cpp; sourceTree = "<group>"; };
 		53E8BE8D0EC36F4B00B3F8B0 /* autocomplete_input_listener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = autocomplete_input_listener.h; sourceTree = "<group>"; };
 		688FFA9B9CEFE9B1B66F8671 /* V8WebKitCSSMatrix.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = V8WebKitCSSMatrix.cpp; sourceTree = "<group>"; };
+		6A9898388068C93C5A7C011C /* ThreadTimers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ThreadTimers.cpp; sourceTree = "<group>"; };
 		715E874BCC05E0A3DD5E5D8F /* GCController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = GCController.cpp; path = port/bindings/v8/extensions/GCController.cpp; sourceTree = SOURCE_ROOT; };
 		7B00912B0DAFEFBE00F72082 /* CSSGrammar.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSGrammar.cpp; sourceTree = "<group>"; };
 		7B00912C0DAFEFBE00F72082 /* CSSGrammar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSGrammar.h; sourceTree = "<group>"; };
@@ -3362,7 +3364,6 @@
 		7B5E954A0D7F3E94001ECF42 /* RenderFileUploadControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderFileUploadControl.h; sourceTree = "<group>"; };
 		7B5E954B0D7F3E94001ECF42 /* RenderFlexibleBox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderFlexibleBox.cpp; sourceTree = "<group>"; };
 		7B5E954C0D7F3E94001ECF42 /* RenderFlexibleBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderFlexibleBox.h; sourceTree = "<group>"; };
-		7B5E954D0D7F3E94001ECF42 /* RenderFlow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderFlow.cpp; sourceTree = "<group>"; };
 		7B5E954F0D7F3E94001ECF42 /* RenderForeignObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderForeignObject.cpp; sourceTree = "<group>"; };
 		7B5E95500D7F3E94001ECF42 /* RenderForeignObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderForeignObject.h; sourceTree = "<group>"; };
 		7B5E95510D7F3E94001ECF42 /* RenderFrame.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderFrame.cpp; sourceTree = "<group>"; };
@@ -4123,6 +4124,7 @@
 		93EF1C060F214F260070601B /* PNGImageDecoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PNGImageDecoder.h; path = "image-decoders/skia/PNGImageDecoder.h"; sourceTree = "<group>"; };
 		93EF1C070F214F260070601B /* XBMImageDecoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = XBMImageDecoder.cpp; path = "image-decoders/skia/XBMImageDecoder.cpp"; sourceTree = "<group>"; };
 		93EF1C080F214F260070601B /* XBMImageDecoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = XBMImageDecoder.h; path = "image-decoders/skia/XBMImageDecoder.h"; sourceTree = "<group>"; };
+		9A4CDAA44657D29017C6C78D /* ThreadTimers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThreadTimers.h; sourceTree = "<group>"; };
 		9DEAFAB44D279360C80A1BA9 /* PtrAndFlags.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PtrAndFlags.h; sourceTree = "<group>"; };
 		A7218BEB0EEDF5BD000FC021 /* CSSSelectorList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSSelectorList.cpp; sourceTree = "<group>"; };
 		A7CBB2A40F327C8D00360BF5 /* debugger_bridge.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = debugger_bridge.cc; sourceTree = "<group>"; };
@@ -4323,7 +4325,6 @@
 		B5C1807A0E9581DE006EAF87 /* TextDecoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextDecoder.cpp; sourceTree = "<group>"; };
 		B5C180950E958D23006EAF87 /* bidi.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = bidi.cpp; sourceTree = "<group>"; };
 		B5C180970E958D44006EAF87 /* RenderBlock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderBlock.cpp; sourceTree = "<group>"; };
-		B5C180990E958D53006EAF87 /* RenderFlow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderFlow.h; sourceTree = "<group>"; };
 		B5C1809A0E958D81006EAF87 /* RenderObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderObject.h; sourceTree = "<group>"; };
 		B5C1809B0E958D81006EAF87 /* RenderObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderObject.cpp; sourceTree = "<group>"; };
 		B5C1809D0E958D96006EAF87 /* RenderPart.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderPart.h; sourceTree = "<group>"; };
@@ -5798,6 +5799,8 @@
 				7B5E91F90D7F3CC3001ECF42 /* ThreadCheck.h */,
 				3CF1E74A0F09B3FA009BC1A7 /* ThreadGlobalData.cpp */,
 				3CF1E74B0F09B3FA009BC1A7 /* ThreadGlobalData.h */,
+				6A9898388068C93C5A7C011C /* ThreadTimers.cpp */,
+				9A4CDAA44657D29017C6C78D /* ThreadTimers.h */,
 				7B5E91FC0D7F3CC3001ECF42 /* Timer.cpp */,
 				7B5E91FD0D7F3CC3001ECF42 /* Timer.h */,
 				4D16411E0EC29D01008F024E /* TreeShared.h */,
@@ -6194,8 +6197,6 @@
 				7B5E954A0D7F3E94001ECF42 /* RenderFileUploadControl.h */,
 				7B5E954B0D7F3E94001ECF42 /* RenderFlexibleBox.cpp */,
 				7B5E954C0D7F3E94001ECF42 /* RenderFlexibleBox.h */,
-				7B5E954D0D7F3E94001ECF42 /* RenderFlow.cpp */,
-				B5C180990E958D53006EAF87 /* RenderFlow.h */,
 				7B5E954F0D7F3E94001ECF42 /* RenderForeignObject.cpp */,
 				7B5E95500D7F3E94001ECF42 /* RenderForeignObject.h */,
 				7B5E95510D7F3E94001ECF42 /* RenderFrame.cpp */,
@@ -6228,6 +6229,7 @@
 				7B5E95680D7F3E95001ECF42 /* RenderMenuList.h */,
 				B5C1809A0E958D81006EAF87 /* RenderObject.h */,
 				B5C1809B0E958D81006EAF87 /* RenderObject.cpp */,
+				4C04BF9CDE7B0B591087B440 /* RenderObjectChildList.h */,
 				7B5E956B0D7F3E95001ECF42 /* RenderPart.cpp */,
 				B5C1809D0E958D96006EAF87 /* RenderPart.h */,
 				7B5E956D0D7F3E95001ECF42 /* RenderPartObject.cpp */,
@@ -9014,7 +9016,6 @@
 				938445D80F16B0570075F4C5 /* RenderFieldset.cpp in Sources */,
 				938445D90F16B0570075F4C5 /* RenderFileUploadControl.cpp in Sources */,
 				938445DA0F16B0570075F4C5 /* RenderFlexibleBox.cpp in Sources */,
-				938445DB0F16B0570075F4C5 /* RenderFlow.cpp in Sources */,
 				938445DC0F16B0570075F4C5 /* RenderForeignObject.cpp in Sources */,
 				938445DD0F16B0570075F4C5 /* RenderFrame.cpp in Sources */,
 				938445DE0F16B0570075F4C5 /* RenderFrameSet.cpp in Sources */,
@@ -9356,6 +9357,7 @@
 				938447330F16B0570075F4C5 /* TextStream.cpp in Sources */,
 				53AAC3800F291F4400233688 /* ThreadableLoader.cpp in Sources */,
 				938447340F16B0570075F4C5 /* ThreadGlobalData.cpp in Sources */,
+				8EFD7D527676BF3B3C92361E /* ThreadTimers.cpp in Sources */,
 				938447350F16B0570075F4C5 /* Timer.cpp in Sources */,
 				938447360F16B0570075F4C5 /* TimeRanges.cpp in Sources */,
 				938447370F16B0570075F4C5 /* TransformationMatrix.cpp in Sources */,