cChrome side of WebKit merge 39369:39410.

* Move files from platform/graphics into platform/animation and
platform/graphics/transforms and update include path

* Add stubs for two new methods in FrameLoaderClient

* Re-baseline one new layout test for Windows and add two to tests_fixable.
Review URL: http://codereview.chromium.org/14917

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

3 files changed, 104 insertions, 94 deletions

diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript
index dde370a..1235c8f 100644
--- a/webkit/build/WebCore/SConscript
+++ b/webkit/build/WebCore/SConscript
@@ -415,7 +415,9 @@ input_files = [
     '$WEBCORE_DIR/platform/Timer.cpp',
     '$WEBCORE_DIR/platform/Widget.cpp',
 
-    '$WEBCORE_DIR/platform/graphics/AffineTransform.cpp',
+    '$WEBCORE_DIR/platform/animation/Animation.cpp',
+    '$WEBCORE_DIR/platform/animation/AnimationList.cpp',
+
     '$WEBCORE_DIR/platform/graphics/BitmapImage.cpp',
     '$WEBCORE_DIR/platform/graphics/Color.cpp',
     '$WEBCORE_DIR/platform/graphics/FloatPoint.cpp',
@@ -448,6 +450,14 @@ input_files = [
     '$WEBCORE_DIR/platform/graphics/StringTruncator.cpp',
     '$WEBCORE_DIR/platform/graphics/WidthIterator.cpp',
 
+    '$WEBCORE_DIR/platform/graphics/transforms/ScaleTransformOperation.cpp',
+    '$WEBCORE_DIR/platform/graphics/transforms/TranslateTransformOperation.cpp',
+    '$WEBCORE_DIR/platform/graphics/transforms/RotateTransformOperation.cpp',
+    '$WEBCORE_DIR/platform/graphics/transforms/TransformOperations.cpp',
+    '$WEBCORE_DIR/platform/graphics/transforms/MatrixTransformOperation.cpp',
+    '$WEBCORE_DIR/platform/graphics/transforms/AffineTransform.cpp',
+    '$WEBCORE_DIR/platform/graphics/transforms/SkewTransformOperation.cpp',
+
     '$WEBCORE_DIR/platform/network/AuthenticationChallengeBase.cpp',
     '$WEBCORE_DIR/platform/network/Credential.cpp',
     '$WEBCORE_DIR/platform/network/FormData.cpp',
@@ -580,20 +590,14 @@ input_files = [
     '$WEBCORE_DIR/rendering/SVGRootInlineBox.cpp',
     '$WEBCORE_DIR/rendering/TextControlInnerElements.cpp',
 
-    '$WEBCORE_DIR/rendering/style/Animation.cpp',
-    '$WEBCORE_DIR/rendering/style/AnimationList.cpp',
     '$WEBCORE_DIR/rendering/style/BindingURI.cpp',
     '$WEBCORE_DIR/rendering/style/ContentData.cpp',
     '$WEBCORE_DIR/rendering/style/CounterDirectives.cpp',
     '$WEBCORE_DIR/rendering/style/FillLayer.cpp',
     '$WEBCORE_DIR/rendering/style/KeyframeList.cpp',
-    '$WEBCORE_DIR/rendering/style/MatrixTransformOperation.cpp',
     '$WEBCORE_DIR/rendering/style/NinePieceImage.cpp',
     '$WEBCORE_DIR/rendering/style/RenderStyle.cpp',
-    '$WEBCORE_DIR/rendering/style/RotateTransformOperation.cpp',
-    '$WEBCORE_DIR/rendering/style/ScaleTransformOperation.cpp',
     '$WEBCORE_DIR/rendering/style/ShadowData.cpp',
-    '$WEBCORE_DIR/rendering/style/SkewTransformOperation.cpp',
     '$WEBCORE_DIR/rendering/style/StyleBackgroundData.cpp',
     '$WEBCORE_DIR/rendering/style/StyleBoxData.cpp',
     '$WEBCORE_DIR/rendering/style/StyleCachedImage.cpp',
@@ -609,8 +613,6 @@ input_files = [
     '$WEBCORE_DIR/rendering/style/StyleVisualData.cpp',
     '$WEBCORE_DIR/rendering/style/SVGRenderStyle.cpp',
     '$WEBCORE_DIR/rendering/style/SVGRenderStyleDefs.cpp',
-    '$WEBCORE_DIR/rendering/style/TransformOperations.cpp',
-    '$WEBCORE_DIR/rendering/style/TranslateTransformOperation.cpp',
 
     '$WEBCORE_DIR/storage/ChangeVersionWrapper.cpp',
     '$WEBCORE_DIR/storage/Database.cpp',
diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj
index 14cb243..dbf6632 100644
--- a/webkit/build/WebCore/WebCore.vcproj
+++ b/webkit/build/WebCore/WebCore.vcproj
@@ -1205,14 +1205,6 @@
 				Name="graphics"
 				>
 				<File
-					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\AffineTransform.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\AffineTransform.h"
-					>
-				</File>
-				<File
 					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\BitmapImage.cpp"
 					>
 				</File>
@@ -1420,6 +1412,74 @@
 					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\SimpleFontData.h"
 					>
 				</File>
+				<Filter
+					Name="transforms"
+					>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\transforms\AffineTransform.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\transforms\AffineTransform.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\transforms\IdentityTransformOperation.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\transforms\MatrixTransformOperation.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\transforms\MatrixTransformOperation.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\transforms\RotateTransformOperation.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\transforms\RotateTransformOperation.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\transforms\ScaleTransformOperation.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\transforms\ScaleTransformOperation.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\transforms\SkewTransformOperation.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\transforms\SkewTransformOperation.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\transforms\TransformOperation.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\transforms\TransformOperations.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\transforms\TransformOperations.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\transforms\TranslateTransformOperation.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\transforms\TranslateTransformOperation.h"
+						>
+					</File>
+				</Filter>
 			</Filter>
 			<Filter
 				Name="network"
@@ -1781,6 +1841,30 @@
 					>
 				</File>
 			</Filter>
+			<Filter
+				Name="animation"
+				>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\animation\Animation.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\animation\Animation.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\animation\AnimationList.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\animation\AnimationList.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\animation\TimingFunction.h"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="css"
@@ -3025,22 +3109,6 @@
 				Name="style"
 				>
 				<File
-					RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\Animation.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\Animation.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\AnimationList.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\AnimationList.h"
-					>
-				</File>
-				<File
 					RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\BindingURI.cpp"
 					>
 				</File>
@@ -3101,10 +3169,6 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\IdentityTransformOperation.h"
-					>
-				</File>
-				<File
 					RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\KeyframeList.cpp"
 					>
 				</File>
@@ -3113,14 +3177,6 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\MatrixTransformOperation.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\MatrixTransformOperation.h"
-					>
-				</File>
-				<File
 					RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\NinePieceImage.cpp"
 					>
 				</File>
@@ -3145,22 +3201,6 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\RotateTransformOperation.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\RotateTransformOperation.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\ScaleTransformOperation.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\ScaleTransformOperation.h"
-					>
-				</File>
-				<File
 					RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\ShadowData.cpp"
 					>
 				</File>
@@ -3169,14 +3209,6 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\SkewTransformOperation.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\SkewTransformOperation.h"
-					>
-				</File>
-				<File
 					RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\StyleBackgroundData.cpp"
 					>
 				</File>
@@ -3304,30 +3336,6 @@
 					RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\SVGRenderStyleDefs.h"
 					>
 				</File>
-				<File
-					RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\TimingFunction.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\TransformOperation.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\TransformOperations.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\TransformOperations.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\TranslateTransformOperation.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\TranslateTransformOperation.h"
-					>
-				</File>
 			</Filter>
 		</Filter>
 		<Filter
diff --git a/webkit/build/webkit_common_includes.vsprops b/webkit/build/webkit_common_includes.vsprops
index 6813548..d5614b2 100644
--- a/webkit/build/webkit_common_includes.vsprops
+++ b/webkit/build/webkit_common_includes.vsprops
@@ -6,6 +6,6 @@
 	>
 	<Tool
 		Name="VCCLCompilerTool"
-		AdditionalIncludeDirectories="&quot;$(OutDir)\obj\WebCore&quot;;&quot;$(OutDir)\obj\WebCore\JavaScriptHeaders&quot;;&quot;$(OutDir)\obj\WebCore\JavaScriptHeaders\JavaScriptCore&quot;;..\..\pending\;..\..\pending\kjs;..\..\pending\wtf;..\..\port\bridge;..\..\port\css;..\..\port\dom;..\..\port\history;..\..\port\loader;..\..\port\page;..\..\port\page\chromium;..\..\port\page\win;..\..\port\platform;..\..\port\platform\chromium;..\..\port\platform\win;..\..\port\platform\network\chromium;..\..\port\platform\image-decoders;..\..\port\platform\image-decoders\bmp;..\..\port\platform\image-decoders\gif;..\..\port\platform\image-decoders\ico;..\..\port\platform\image-decoders\jpeg;..\..\port\platform\image-decoders\png;..\..\port\platform\image-decoders\xbm;..\..\port\platform\network;..\..\port\plugins;..\..\port\rendering;..\..\;&quot;$(ProjectDir)&quot;;..\..\..\third_party\WebKit\WebCore\;..\..\..\third_party\WebKit\WebCore\bridge;..\..\..\third_party\WebKit\WebCore\bridge\c;..\..\..\third_party\WebKit\WebCore\css;..\..\..\third_party\WebKit\WebCore\dom;..\..\..\third_party\WebKit\WebCore\editing;..\..\..\third_party\WebKit\WebCore\history;..\..\..\third_party\WebKit\WebCore\html;..\..\..\third_party\WebKit\WebCore\loader;..\..\..\third_party\WebKit\WebCore\loader\appcache;..\..\..\third_party\WebKit\WebCore\loader\archive;..\..\..\third_party\WebKit\WebCore\loader\icon;..\..\..\third_party\WebKit\WebCore\page;..\..\..\third_party\WebKit\WebCore\platform;..\..\..\third_party\WebKit\WebCore\page\animation;..\..\..\third_party\WebKit\WebCore\platform\text;..\..\..\third_party\WebKit\WebCore\platform\graphics;..\..\port\platform\graphics;..\..\port\platform\graphics\chromium;..\..\port\platform\graphics\skia;..\..\..\third_party\WebKit\WebCore\svg\graphics;..\..\..\third_party\WebKit\WebCore\platform\network;..\..\..\third_party\WebKit\WebCore\platform\sql;..\..\..\third_party\WebKit\WebCore\rendering;..\..\..\third_party\WebKit\WebCore\rendering\style;..\..\..\third_party\WebKit\WebCore\storage;..\..\..\third_party\WebKit\WebCore\xml;..\..\..\third_party\WebKit\WebCore;&quot;..\..\..\third_party\WebKit\WebCore\os-win32&quot;;..\..\..\third_party\WebKit\WebCore\wtf;..\..\..\third_party\WebKit\JavaScriptCore;..\..\..\third_party\WebKit\JavaScriptCore\wtf;&quot;..\..\..\third_party\WebKit\JavaScriptCore\os-win32&quot;;..\..\build;&quot;$(SDKIncludes)&quot;;&quot;$(IntDir)\..\WebCore\DerivedSources&quot;;..\..\..\third_party\WebKit\WebCore\svg;..\..\..\third_party\WebKit\WebCore\svg\animation;..\..\..\third_party\WebKit\WebCore\svg\graphics\filters;..\..\..\third_party\WebKit\WebCore\plugins;..\..\..\third_party\WebKit\WebCore\inspector;..\..\..\third_party\sqlite"
+		AdditionalIncludeDirectories="&quot;$(OutDir)\obj\WebCore&quot;;&quot;$(OutDir)\obj\WebCore\JavaScriptHeaders&quot;;&quot;$(OutDir)\obj\WebCore\JavaScriptHeaders\JavaScriptCore&quot;;..\..\pending\;..\..\pending\kjs;..\..\pending\wtf;..\..\port\bridge;..\..\port\css;..\..\port\dom;..\..\port\history;..\..\port\loader;..\..\port\page;..\..\port\page\chromium;..\..\port\page\win;..\..\port\platform;..\..\port\platform\chromium;..\..\port\platform\win;..\..\port\platform\network\chromium;..\..\port\platform\image-decoders;..\..\port\platform\image-decoders\bmp;..\..\port\platform\image-decoders\gif;..\..\port\platform\image-decoders\ico;..\..\port\platform\image-decoders\jpeg;..\..\port\platform\image-decoders\png;..\..\port\platform\image-decoders\xbm;..\..\port\platform\network;..\..\port\plugins;..\..\port\rendering;..\..\;&quot;$(ProjectDir)&quot;;..\..\..\third_party\WebKit\WebCore\;..\..\..\third_party\WebKit\WebCore\bridge;..\..\..\third_party\WebKit\WebCore\bridge\c;..\..\..\third_party\WebKit\WebCore\css;..\..\..\third_party\WebKit\WebCore\dom;..\..\..\third_party\WebKit\WebCore\editing;..\..\..\third_party\WebKit\WebCore\history;..\..\..\third_party\WebKit\WebCore\html;..\..\..\third_party\WebKit\WebCore\loader;..\..\..\third_party\WebKit\WebCore\loader\appcache;..\..\..\third_party\WebKit\WebCore\loader\archive;..\..\..\third_party\WebKit\WebCore\loader\icon;..\..\..\third_party\WebKit\WebCore\page;..\..\..\third_party\WebKit\WebCore\platform;..\..\..\third_party\WebKit\WebCore\platform\animation;..\..\..\third_party\WebKit\WebCore\page\animation;..\..\..\third_party\WebKit\WebCore\platform\text;..\..\..\third_party\WebKit\WebCore\platform\graphics;..\..\..\third_party\WebKit\WebCore\platform\graphics\transforms;..\..\port\platform\graphics;..\..\port\platform\graphics\chromium;..\..\port\platform\graphics\skia;..\..\..\third_party\WebKit\WebCore\svg\graphics;..\..\..\third_party\WebKit\WebCore\platform\network;..\..\..\third_party\WebKit\WebCore\platform\sql;..\..\..\third_party\WebKit\WebCore\rendering;..\..\..\third_party\WebKit\WebCore\rendering\style;..\..\..\third_party\WebKit\WebCore\storage;..\..\..\third_party\WebKit\WebCore\xml;..\..\..\third_party\WebKit\WebCore;&quot;..\..\..\third_party\WebKit\WebCore\os-win32&quot;;..\..\..\third_party\WebKit\WebCore\wtf;..\..\..\third_party\WebKit\JavaScriptCore;..\..\..\third_party\WebKit\JavaScriptCore\wtf;&quot;..\..\..\third_party\WebKit\JavaScriptCore\os-win32&quot;;..\..\build;&quot;$(SDKIncludes)&quot;;&quot;$(IntDir)\..\WebCore\DerivedSources&quot;;..\..\..\third_party\WebKit\WebCore\svg;..\..\..\third_party\WebKit\WebCore\svg\animation;..\..\..\third_party\WebKit\WebCore\svg\graphics\filters;..\..\..\third_party\WebKit\WebCore\plugins;..\..\..\third_party\WebKit\WebCore\inspector;..\..\..\third_party\sqlite"
 	/>
 </VisualStudioPropertySheet>