Do another merge using nifty new merge script (CL for that coming soon).

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['PLATFORM'] == 'win32':
   env.Append(
@@ skipping 395 matching lines @@
     '$WEBCORE_DIR/platform/ScrollView.cpp',
     '$WEBCORE_DIR/platform/SharedBuffer.cpp',
     '$WEBCORE_DIR/platform/Timer.cpp',
     '$WEBCORE_DIR/platform/Widget.cpp',
 
     '$WEBCORE_DIR/platform/graphics/AffineTransform.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',
+    '$WEBCORE_DIR/platform/graphics/FloatQuad.cpp',
     '$WEBCORE_DIR/platform/graphics/FloatRect.cpp',
     '$WEBCORE_DIR/platform/graphics/FloatSize.cpp',
     '$WEBCORE_DIR/platform/graphics/Font.cpp',
     '$WEBCORE_DIR/platform/graphics/FontData.cpp',
     '$WEBCORE_DIR/platform/graphics/FontFallbackList.cpp',
     '$WEBCORE_DIR/platform/graphics/FontDescription.cpp',
     '$WEBCORE_DIR/platform/graphics/FontFamily.cpp',
     '$WEBCORE_DIR/platform/graphics/FontCache.cpp',
     '$WEBCORE_DIR/platform/graphics/GeneratedImage.cpp',
     '$WEBCORE_DIR/platform/graphics/GlyphPageTreeNode.cpp',
@@ skipping 398 matching lines @@
   env_p = env.Clone()
   env_p.Append(CCFLAGS='/Ylwebcore')
   pch, obj = env_p.PCH('$OBJ_ROOT/webkit/build/precompiled_webkit.cc')
   env['PCH'] = pch
   env['PCHSTOP'] = 'precompiled_webkit.h'
   env.Append(CCPCHFLAGS = ['/FIprecompiled_webkit.h'])
   input_files += [obj]
 
 env.ChromeStaticLibrary('WebCore', input_files)