WebKit merge 41498:41530.

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 666 matching lines @@
     '$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/ScrollBehavior.cpp',
     '$WEBCORE_DIR/rendering/SVGCharacterLayoutInfo.cpp',
     '$WEBCORE_DIR/rendering/SVGInlineFlowBox.cpp',
     '$WEBCORE_DIR/rendering/SVGInlineTextBox.cpp',
     '$WEBCORE_DIR/rendering/SVGRenderSupport.cpp',
     '$WEBCORE_DIR/rendering/SVGRenderTreeAsText.cpp',
     '$WEBCORE_DIR/rendering/SVGRootInlineBox.cpp',
     '$WEBCORE_DIR/rendering/TextControlInnerElements.cpp',
     '$WEBCORE_DIR/rendering/TransformState.cpp',
 
     '$WEBCORE_DIR/rendering/style/BindingURI.cpp',
@@ skipping 303 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}')