Chromium side of merge 39453:39501....

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 403 matching lines @@
     '$WEBCORE_DIR/platform/FileChooser.cpp',
     '$WEBCORE_DIR/platform/GeolocationService.cpp',
     '$WEBCORE_DIR/platform/GKURL.cpp',
     '$WEBCORE_DIR/platform/Length.cpp',
     '$WEBCORE_DIR/platform/LinkHash.cpp',
     '$WEBCORE_DIR/platform/Logging.cpp',
     '$WEBCORE_DIR/platform/Scrollbar.cpp',
     '$WEBCORE_DIR/platform/ScrollbarThemeComposite.cpp',
     '$WEBCORE_DIR/platform/ScrollView.cpp',
     '$WEBCORE_DIR/platform/SharedBuffer.cpp',
+    '$WEBCORE_DIR/platform/ThreadGlobalData.cpp',
     '$WEBCORE_DIR/platform/Timer.cpp',
     '$WEBCORE_DIR/platform/Widget.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',
     '$WEBCORE_DIR/platform/graphics/FloatPoint3D.cpp',
@@ skipping 197 matching lines @@
     '$WEBCORE_DIR/rendering/RenderSVGTransformableContainer.cpp',
     '$WEBCORE_DIR/rendering/RenderSVGTSpan.cpp',
     '$WEBCORE_DIR/rendering/RenderSVGViewportContainer.cpp',
     '$WEBCORE_DIR/rendering/RenderTable.cpp',
     '$WEBCORE_DIR/rendering/RenderTableCell.cpp',
     '$WEBCORE_DIR/rendering/RenderTableCol.cpp',
     '$WEBCORE_DIR/rendering/RenderTableRow.cpp',
     '$WEBCORE_DIR/rendering/RenderTableSection.cpp',
     '$WEBCORE_DIR/rendering/RenderText.cpp',
     '$WEBCORE_DIR/rendering/RenderTextControl.cpp',
+    '$WEBCORE_DIR/rendering/RenderTextControlMultiLine.cpp',
+    '$WEBCORE_DIR/rendering/RenderTextControlSingleLine.cpp',
     '$WEBCORE_DIR/rendering/RenderTextFragment.cpp',
     '$WEBCORE_DIR/rendering/RenderTheme.cpp',
     '$WEBCORE_DIR/rendering/RenderTreeAsText.cpp',
     '$WEBCORE_DIR/rendering/RenderVideo.cpp',
     '$WEBCORE_DIR/rendering/RenderView.cpp',
     '$WEBCORE_DIR/rendering/RenderWidget.cpp',
     '$WEBCORE_DIR/rendering/RenderWordBreak.cpp',
     '$WEBCORE_DIR/rendering/RootInlineBox.cpp',
     '$WEBCORE_DIR/rendering/SVGCharacterLayoutInfo.cpp',
     '$WEBCORE_DIR/rendering/SVGInlineFlowBox.cpp',
@@ skipping 304 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}')