From 13324b2fe5b579fe0338ab30084b01e92e7523be Mon Sep 17 00:00:00 2001
From: "ojan@google.com" <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 30 Jan 2009 02:15:40 +0000
Subject: Chromium side of merge 40314:40364. Review URL:
 http://codereview.chromium.org/19485

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

(limited to 'webkit/build/WebCore')

diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript
index 553b45e..9ab98a3 100644
--- a/webkit/build/WebCore/SConscript
+++ b/webkit/build/WebCore/SConscript
@@ -631,6 +631,7 @@ input_files = [
     '$WEBCORE_DIR/rendering/RenderInline.cpp',
     '$WEBCORE_DIR/rendering/RenderLayer.cpp',
     '$WEBCORE_DIR/rendering/RenderLegend.cpp',
+    '$WEBCORE_DIR/rendering/RenderLineBoxList.cpp',
     '$WEBCORE_DIR/rendering/RenderListBox.cpp',
     '$WEBCORE_DIR/rendering/RenderListItem.cpp',
     '$WEBCORE_DIR/rendering/RenderListMarker.cpp',
diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj
index d343e99..d41b34d 100644
--- a/webkit/build/WebCore/WebCore.vcproj
+++ b/webkit/build/WebCore/WebCore.vcproj
@@ -3318,6 +3318,14 @@
 				RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderLegend.h"
 				>
 			</File>
+      <File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderLineBoxList.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderLineBoxList.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderListBox.cpp"
 				>
-- 
cgit v1.1