Chrome side of webkit merge to 40124.

Not much here other than CanvasPixelArray being re-added
in webkit@r40089.

Changes:
http://trac.webkit.org/changeset?new=40124@trunk&old=40086@trunk

Review URL: http://codereview.chromium.org/16617

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8520 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 37 insertions, 15 deletions

diff --git a/webkit/build/V8Bindings/SConscript b/webkit/build/V8Bindings/SConscript
index 25778b2..94e56ac 100644
--- a/webkit/build/V8Bindings/SConscript
+++ b/webkit/build/V8Bindings/SConscript
@@ -321,7 +321,6 @@ inputs = [
     '$DERIVED_DIR/V8XPathResult.cpp',
     '$DERIVED_DIR/V8XSLTProcessor.cpp',
 
-    '$PORT_DIR/bindings/v8/CanvasPixelArray.cpp',
     '$PORT_DIR/bindings/v8/JSDOMBinding.cpp',
     '$PORT_DIR/bindings/v8/JSXPathNSResolver.cpp',
     '$PORT_DIR/bindings/v8/np_v8object.cpp',
diff --git a/webkit/build/V8Bindings/V8Bindings.vcproj b/webkit/build/V8Bindings/V8Bindings.vcproj
index d582d80..4e8da10 100644
--- a/webkit/build/V8Bindings/V8Bindings.vcproj
+++ b/webkit/build/V8Bindings/V8Bindings.vcproj
@@ -2501,10 +2501,6 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\port\bindings\v8\CanvasPixelArray.cpp"
-			>
-		</File>
-		<File
 			RelativePath="..\..\port\bindings\v8\RGBColor.cpp"
 			>
 		</File>
@@ -2553,10 +2549,6 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\port\bindings\v8\CanvasPixelArray.h"
-			>
-		</File>
-		<File
 			RelativePath="..\..\port\bindings\v8\ScriptSourceCode.h"
 			>
 		</File>
diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript
index 78b59b4..f901c90 100644
--- a/webkit/build/WebCore/SConscript
+++ b/webkit/build/WebCore/SConscript
@@ -240,6 +240,7 @@ input_files = [
 
     '$WEBCORE_DIR/html/CanvasGradient.cpp',
     '$WEBCORE_DIR/html/CanvasPattern.cpp',
+    '$WEBCORE_DIR/html/CanvasPixelArray.cpp',
     '$WEBCORE_DIR/html/CanvasRenderingContext2D.cpp',
     '$WEBCORE_DIR/html/CanvasStyle.cpp',
     '$WEBCORE_DIR/html/File.cpp',
@@ -343,6 +344,7 @@ input_files = [
     '$WEBCORE_DIR/loader/CachedXSLStyleSheet.cpp',
     '$WEBCORE_DIR/loader/DocLoader.cpp',
     '$WEBCORE_DIR/loader/DocumentLoader.cpp',
+    '$WEBCORE_DIR/loader/DocumentThreadableLoader.cpp',
     '$WEBCORE_DIR/loader/FormState.cpp',
     '$WEBCORE_DIR/loader/FrameLoader.cpp',
     '$WEBCORE_DIR/loader/FrameLoaderClient.cpp',
@@ -362,6 +364,7 @@ input_files = [
     '$WEBCORE_DIR/loader/SubresourceLoader.cpp',
     '$WEBCORE_DIR/loader/TextDocument.cpp',
     '$WEBCORE_DIR/loader/TextResourceDecoder.cpp',
+    '$WEBCORE_DIR/loader/ThreadableLoader.cpp',
 
     '$WEBCORE_DIR/loader/archive/ArchiveFactory.cpp',
     '$WEBCORE_DIR/loader/archive/ArchiveResource.cpp',
@@ -539,6 +542,7 @@ input_files = [
     '$WEBCORE_DIR/platform/network/Credential.cpp',
     '$WEBCORE_DIR/platform/network/FormData.cpp',
     '$WEBCORE_DIR/platform/network/FormDataBuilder.cpp',
+    '$WEBCORE_DIR/platform/network/HTTPHeaderMap.cpp',
     '$WEBCORE_DIR/platform/network/HTTPParsers.cpp',
     '$WEBCORE_DIR/platform/network/NetworkStateNotifier.cpp',
     '$WEBCORE_DIR/platform/network/ProtectionSpace.cpp',
@@ -867,7 +871,6 @@ input_files = [
     '$WEBCORE_DIR/svg/graphics/SVGResourceMarker.cpp',
     '$WEBCORE_DIR/svg/graphics/SVGResourceMasker.cpp',
 
-    '$WEBCORE_DIR/svg/graphics/skia/SVGPaintServerSkia.cpp',
     '$WEBCORE_DIR/svg/graphics/skia/SVGResourceFilterSkia.cpp',
     '$WEBCORE_DIR/svg/graphics/skia/SVGResourceMaskerSkia.cpp',
 
diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj
index a628a06..2888166 100644
--- a/webkit/build/WebCore/WebCore.vcproj
+++ b/webkit/build/WebCore/WebCore.vcproj
@@ -675,6 +675,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\loader\DocumentThreadableLoader.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\loader\DocumentThreadableLoader.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\third_party\WebKit\WebCore\loader\FormState.cpp"
 				>
 			</File>
@@ -838,6 +846,18 @@
 				RelativePath="..\..\..\third_party\WebKit\WebCore\loader\TextResourceDecoder.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\loader\ThreadableLoader.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\loader\ThreadableLoader.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\loader\ThreadableLoaderClient.h"
+				>
+			</File>
 			<Filter
 				Name="archive"
 				>
@@ -1774,6 +1794,10 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\network\HTTPHeaderMap.cpp"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\network\HTTPHeaderMap.h"
 					>
 				</File>
@@ -5291,6 +5315,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\html\CanvasPixelArray.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\html\CanvasPixelArray.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\third_party\WebKit\WebCore\html\CanvasRenderingContext2D.cpp"
 				>
 			</File>
@@ -7213,10 +7245,6 @@
 					Name="skia"
 					>
 					<File
-						RelativePath="..\..\..\third_party\WebKit\WebCore\svg\graphics\skia\SVGPaintServerSkia.cpp"
-						>
-					</File>
-					<File
 						RelativePath="..\..\..\third_party\WebKit\WebCore\svg\graphics\skia\SVGResourceFilterSkia.cpp"
 						>
 					</File>
diff --git a/webkit/build/port/SConscript b/webkit/build/port/SConscript
index 295bd60..1a86174 100644
--- a/webkit/build/port/SConscript
+++ b/webkit/build/port/SConscript
@@ -150,7 +150,6 @@ else:
 
 
 idl_files = [
-    'bindings/v8/CanvasPixelArray.idl',
     'bindings/v8/UndetectableHTMLCollection.idl',
 
     'css/Counter.idl',
@@ -228,6 +227,7 @@ idl_files = [
 
     'html/CanvasGradient.idl',
     'html/CanvasPattern.idl',
+    'html/CanvasPixelArray.idl',
     'html/CanvasRenderingContext2D.idl',
     'html/File.idl',
     'html/FileList.idl',