chrome side of merge from r41181 to r41217

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 101 matching lines @@
     '$WEBCORE_DIR/dom/CharacterData.cpp',
     '$WEBCORE_DIR/dom/ChildNodeList.cpp',
     '$WEBCORE_DIR/dom/ClassNames.cpp',
     '$WEBCORE_DIR/dom/ClassNodeList.cpp',
     '$WEBCORE_DIR/dom/ClientRect.cpp',
     '$WEBCORE_DIR/dom/ClientRectList.cpp',
     '$WEBCORE_DIR/dom/Clipboard.cpp',
     '$WEBCORE_DIR/dom/ClipboardEvent.cpp',
     '$WEBCORE_DIR/dom/Comment.cpp',
     '$WEBCORE_DIR/dom/ContainerNode.cpp',
-    '$WEBCORE_DIR/dom/CrossThreadCopier.cpp',
     '$WEBCORE_DIR/dom/CSSMappedAttributeDeclaration.cpp',
     '$WEBCORE_DIR/dom/Document.cpp',
     '$WEBCORE_DIR/dom/DocumentFragment.cpp',
     '$WEBCORE_DIR/dom/DocumentType.cpp',
     '$WEBCORE_DIR/dom/DOMImplementation.cpp',
     '$WEBCORE_DIR/dom/DOMStringList.cpp',
     '$WEBCORE_DIR/dom/DynamicNodeList.cpp',
     '$WEBCORE_DIR/dom/EditingText.cpp',
     '$WEBCORE_DIR/dom/Element.cpp',
     '$WEBCORE_DIR/dom/Entity.cpp',
@@ skipping 41 matching lines @@
     '$WEBCORE_DIR/dom/TagNodeList.cpp',
     '$WEBCORE_DIR/dom/Text.cpp',
     '$WEBCORE_DIR/dom/TextEvent.cpp',
     '$WEBCORE_DIR/dom/Traversal.cpp',
     '$WEBCORE_DIR/dom/TreeWalker.cpp',
     '$WEBCORE_DIR/dom/UIEvent.cpp',
     '$WEBCORE_DIR/dom/UIEventWithKeyState.cpp',
     '$WEBCORE_DIR/dom/WebKitAnimationEvent.cpp',
     '$WEBCORE_DIR/dom/WebKitTransitionEvent.cpp',
     '$WEBCORE_DIR/dom/WheelEvent.cpp',
-    '$WEBCORE_DIR/dom/Worker.cpp',
-    '$WEBCORE_DIR/dom/WorkerContext.cpp',
-    '$WEBCORE_DIR/dom/WorkerLocation.cpp',
-    '$WEBCORE_DIR/dom/WorkerMessagingProxy.cpp',
-    '$WEBCORE_DIR/dom/WorkerRunLoop.cpp',
-    '$WEBCORE_DIR/dom/WorkerThread.cpp',
     '$WEBCORE_DIR/dom/XMLTokenizer.cpp',
     '$WEBCORE_DIR/dom/XMLTokenizerLibxml2.cpp',
 
     '$WEBCORE_DIR/editing/chromium/EditorChromium.cpp',
 
     '$WEBCORE_DIR/editing/AppendNodeCommand.cpp',
     '$WEBCORE_DIR/editing/ApplyStyleCommand.cpp',
     '$WEBCORE_DIR/editing/BreakBlockquoteCommand.cpp',
     '$WEBCORE_DIR/editing/CompositeEditCommand.cpp',
     '$WEBCORE_DIR/editing/CreateLinkCommand.cpp',
@@ skipping 227 matching lines @@
 
     '$WEBCORE_DIR/page/chromium/AccessibilityObjectChromium.cpp',
     '$WEBCORE_DIR/page/chromium/AXObjectCacheChromium.cpp',
     '$WEBCORE_DIR/page/chromium/DragControllerChromium.cpp',
     '$WEBCORE_DIR/page/chromium/EventHandlerChromium.cpp',
     '$WEBCORE_DIR/page/chromium/FrameChromium.cpp',
 
     '$WEBCORE_DIR/platform/Arena.cpp',
     '$WEBCORE_DIR/platform/ContentType.cpp',
     '$WEBCORE_DIR/platform/ContextMenu.cpp',
+    '$WEBCORE_DIR/platform/CrossThreadCopier.cpp',
     '$WEBCORE_DIR/platform/DeprecatedPtrListImpl.cpp',
     '$WEBCORE_DIR/platform/DragData.cpp',
     '$WEBCORE_DIR/platform/DragImage.cpp',
     '$WEBCORE_DIR/platform/FileChooser.cpp',
     '$WEBCORE_DIR/platform/GeolocationService.cpp',
     '$WEBCORE_DIR/platform/KURLGoogle.cpp',
     '$WEBCORE_DIR/platform/Length.cpp',
     '$WEBCORE_DIR/platform/LinkHash.cpp',
     '$WEBCORE_DIR/platform/Logging.cpp',
     '$WEBCORE_DIR/platform/Scrollbar.cpp',
@@ skipping 242 matching lines @@
     '$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',
     '$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',
     '$WEBCORE_DIR/rendering/style/ContentData.cpp',
     '$WEBCORE_DIR/rendering/style/CounterDirectives.cpp',
     '$WEBCORE_DIR/rendering/style/FillLayer.cpp',
     '$WEBCORE_DIR/rendering/style/KeyframeList.cpp',
     '$WEBCORE_DIR/rendering/style/NinePieceImage.cpp',
     '$WEBCORE_DIR/rendering/style/RenderStyle.cpp',
     '$WEBCORE_DIR/rendering/style/ShadowData.cpp',
     '$WEBCORE_DIR/rendering/style/StyleBackgroundData.cpp',
@@ skipping 172 matching lines @@
     '$WEBCORE_DIR/svg/graphics/SVGPaintServerSolid.cpp',
     '$WEBCORE_DIR/svg/graphics/SVGResource.cpp',
     '$WEBCORE_DIR/svg/graphics/SVGResourceClipper.cpp',
     '$WEBCORE_DIR/svg/graphics/SVGResourceFilter.cpp',
     '$WEBCORE_DIR/svg/graphics/SVGResourceMarker.cpp',
     '$WEBCORE_DIR/svg/graphics/SVGResourceMasker.cpp',
 
     '$WEBCORE_DIR/svg/graphics/skia/SVGResourceFilterSkia.cpp',
     '$WEBCORE_DIR/svg/graphics/skia/SVGResourceMaskerSkia.cpp',
 
+    '$WEBCORE_DIR/workers/Worker.cpp',
+    '$WEBCORE_DIR/workers/WorkerContext.cpp',
+    '$WEBCORE_DIR/workers/WorkerLocation.cpp',
+    '$WEBCORE_DIR/workers/WorkerMessagingProxy.cpp',
+    '$WEBCORE_DIR/workers/WorkerRunLoop.cpp',
+    '$WEBCORE_DIR/workers/WorkerThread.cpp',
+
     '$WEBCORE_DIR/xml/DOMParser.cpp',
     '$WEBCORE_DIR/xml/NativeXPathNSResolver.cpp',
     '$WEBCORE_DIR/xml/XMLHttpRequest.cpp',
     '$WEBCORE_DIR/xml/XMLHttpRequestUpload.cpp',
     '$WEBCORE_DIR/xml/XMLSerializer.cpp',
     '$WEBCORE_DIR/xml/XPathEvaluator.cpp',
     '$WEBCORE_DIR/xml/XPathExpression.cpp',
     '$WEBCORE_DIR/xml/XPathExpressionNode.cpp',
     '$WEBCORE_DIR/xml/XPathFunctions.cpp',
     '$WEBCORE_DIR/xml/XPathNamespace.cpp',
@@ skipping 98 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}')