Chromium side of merge 40314:40364.

webkit/build/WebCore/SConscript

 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 Import('env')
 
 env = env.Clone()
 
 if env.Bit('windows'):
   env.Append(
@@ skipping 613 matching lines @@
     '$WEBCORE_DIR/rendering/RenderFlow.cpp',
     '$WEBCORE_DIR/rendering/RenderForeignObject.cpp',
     '$WEBCORE_DIR/rendering/RenderFrame.cpp',
     '$WEBCORE_DIR/rendering/RenderFrameSet.cpp',
     '$WEBCORE_DIR/rendering/RenderHTMLCanvas.cpp',
     '$WEBCORE_DIR/rendering/RenderImage.cpp',
     '$WEBCORE_DIR/rendering/RenderImageGeneratedContent.cpp',
     '$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',
     '$WEBCORE_DIR/rendering/RenderMarquee.cpp',
     '$WEBCORE_DIR/rendering/RenderMedia.cpp',    
     '$WEBCORE_DIR/rendering/RenderMenuList.cpp',
     '$WEBCORE_DIR/rendering/RenderObject.cpp',
     '$WEBCORE_DIR/rendering/RenderPart.cpp',
     '$WEBCORE_DIR/rendering/RenderPartObject.cpp',
     '$WEBCORE_DIR/rendering/RenderPath.cpp',
@@ skipping 341 matching lines @@
 
 env.ChromeMSVSProject('$WEBKIT_DIR/build/WebCore/WebCore.vcproj',
                 dependencies = [
                     '$WEBKIT_DIR/build/JSConfig/V8Config.vcproj',
                     '$WEBKIT_DIR/build/V8Bindings/V8Bindings_prebuild.vcproj',
                     '$LIBXML_DIR/build/libxml_config.vcproj',
                     '$LIBXSLT_DIR/build/libxslt_config.vcproj',
                     '$SQLITE_DIR/sqlite.vcproj',
                 ],
                 guid='{1C16337B-ACF3-4D03-AA90-851C5B5EADA6}')