From e598ad77dddb4046be70be45afaec8ab93c8f03b Mon Sep 17 00:00:00 2001
From: "levin@chromium.org"
 <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 6 Feb 2009 09:14:21 +0000
Subject: WebKit merge 40539:40668 [chromium side]

Just adding and removing files corresponding to what has been done in webkit,
and one test regression.


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9311 0039d316-1c4b-4281-b951-d872f2087c98
---
 webkit/build/WebCore/SConscript     |  2 +-
 webkit/build/WebCore/WebCore.vcproj | 20 ++++++++++++++------
 2 files changed, 15 insertions(+), 7 deletions(-)

(limited to 'webkit/build/WebCore')

diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript
index 1733a69..ceea840 100644
--- a/webkit/build/WebCore/SConscript
+++ b/webkit/build/WebCore/SConscript
@@ -616,9 +616,9 @@ input_files = [
     '$WEBCORE_DIR/rendering/RenderArena.cpp',
     '$WEBCORE_DIR/rendering/RenderBlock.cpp',
     '$WEBCORE_DIR/rendering/RenderBox.cpp',
+    '$WEBCORE_DIR/rendering/RenderBoxModelObject.cpp',
     '$WEBCORE_DIR/rendering/RenderBR.cpp',
     '$WEBCORE_DIR/rendering/RenderButton.cpp',
-    '$WEBCORE_DIR/rendering/RenderContainer.cpp',
     '$WEBCORE_DIR/rendering/RenderCounter.cpp',
     '$WEBCORE_DIR/rendering/RenderFieldset.cpp',
     '$WEBCORE_DIR/rendering/RenderFileUploadControl.cpp',
diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj
index 9e3966b..5b31d6d 100644
--- a/webkit/build/WebCore/WebCore.vcproj
+++ b/webkit/build/WebCore/WebCore.vcproj
@@ -512,6 +512,10 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\page\animation\AnimationControllerPrivate.h"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\third_party\WebKit\WebCore\page\animation\CompositeAnimation.cpp"
 					>
 				</File>
@@ -3169,27 +3173,27 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderBR.cpp"
+				RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderBoxModelObject.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderBR.h"
+				RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderBoxModelObject.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderButton.cpp"
+				RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderBR.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderButton.h"
+				RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderBR.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderContainer.cpp"
+				RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderButton.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderContainer.h"
+				RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderButton.h"
 				>
 			</File>
 			<File
@@ -3433,6 +3437,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderSelectionInfo.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderSlider.cpp"
 				>
 			</File>
-- 
cgit v1.1