chrome side of merge from r41181 to r41217

webkit/build/WebCore/SConscript

Index: webkit/build/WebCore/SConscript
diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript
index f2c9f57b727bfd35278a59fa7de767cab189854a..32e3bd1bde7478fe60a2da93a47fc05b4aa61fce 100644
--- a/webkit/build/WebCore/SConscript
+++ b/webkit/build/WebCore/SConscript
@@ -119,7 +119,6 @@ input_files = [
     '$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',
@@ -181,12 +180,6 @@ input_files = [
     '$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',
 
@@ -434,6 +427,7 @@ input_files = [
     '$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',
@@ -696,6 +690,7 @@ input_files = [
     '$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',
@@ -888,6 +883,13 @@ input_files = [
     '$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',