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

third_party/WebKit/WebCore/WebCoreSources.bkl

 <?xml version="1.0" ?>
 <!-- 
 
 Copyright (C) 2007 Kevin Ollivier.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
 are met:
 
 1.  Redistributions of source code must retain the above copyright
@@ skipping 726 matching lines @@
         platform/text/TextDecoder.cpp
         platform/text/TextEncoding.cpp
         platform/text/TextEncodingRegistry.cpp
         platform/text/TextStream.cpp
         platform/Timer.cpp
         platform/Widget.cpp
         platform/graphics/AffineTransform.cpp
         platform/graphics/BitmapImage.cpp
         platform/graphics/Color.cpp
         platform/graphics/FloatPoint.cpp
+        platform/graphics/FloatQuad.cpp
         platform/graphics/FloatRect.cpp
         platform/graphics/FloatSize.cpp
         platform/graphics/GeneratedImage.cpp
         platform/graphics/Gradient.cpp
         platform/graphics/GraphicsContext.cpp
         platform/graphics/GraphicsTypes.cpp
         platform/graphics/Image.cpp
         platform/graphics/IntRect.cpp
         platform/graphics/Path.cpp
         platform/graphics/PathTraversalState.cpp
@@ skipping 212 matching lines @@
         xml/XPathValue.cpp
         xml/XPathVariableReference.cpp
         xml/XSLImportRule.cpp
         xml/XSLStyleSheet.cpp
         xml/XSLTExtensions.cpp
         xml/XSLTUnicodeSort.cpp
         xml/XSLTProcessor.cpp
     </set>
 
 </makefile>