6 files changed, 84 insertions, 103 deletions
diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript
index 5fff436..a9d1b96 100644
--- a/webkit/build/WebCore/SConscript
+++ b/webkit/build/WebCore/SConscript
@@ -515,6 +515,15 @@ input_files = [
     '$WEBCORE_DIR/platform/graphics/skia/SkiaUtils.cpp',
     '$WEBCORE_DIR/platform/graphics/skia/TransformationMatrixSkia.cpp',
 
+    '$WEBCORE_DIR/platform/image-decoders/skia/BMPImageDecoder.cpp',
+    '$WEBCORE_DIR/platform/image-decoders/skia/BMPImageReader.cpp',
+    '$WEBCORE_DIR/platform/image-decoders/skia/GIFImageDecoder.cpp',
+    '$WEBCORE_DIR/platform/image-decoders/skia/GIFImageReader.cpp',
+    '$WEBCORE_DIR/platform/image-decoders/skia/ICOImageDecoder.cpp',
+    '$WEBCORE_DIR/platform/image-decoders/skia/JPEGImageDecoder.cpp',
+    '$WEBCORE_DIR/platform/image-decoders/skia/PNGImageDecoder.cpp',
+    '$WEBCORE_DIR/platform/image-decoders/skia/XBMImageDecoder.cpp',
+
     '$WEBCORE_DIR/platform/network/AuthenticationChallengeBase.cpp',
     '$WEBCORE_DIR/platform/network/Credential.cpp',
     '$WEBCORE_DIR/platform/network/FormData.cpp',
diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj
index 7a0aca5..5ffda11 100644
--- a/webkit/build/WebCore/WebCore.vcproj
+++ b/webkit/build/WebCore/WebCore.vcproj
@@ -2369,6 +2369,78 @@
 					>
 				</File>
 			</Filter>
+			<Filter
+				Name="image-decoders"
+				>
+				<Filter
+					Name="skia"
+					>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\image-decoders\skia\BMPImageDecoder.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\image-decoders\skia\BMPImageDecoder.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\image-decoders\skia\BMPImageReader.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\image-decoders\skia\BMPImageReader.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\image-decoders\skia\GIFImageDecoder.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\image-decoders\skia\GIFImageDecoder.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\image-decoders\skia\GIFImageReader.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\image-decoders\skia\GIFImageReader.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\image-decoders\skia\ICOImageDecoder.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\image-decoders\skia\ICOImageDecoder.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\image-decoders\skia\ImageDecoder.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\image-decoders\skia\JPEGImageDecoder.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\image-decoders\skia\JPEGImageDecoder.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\image-decoders\skia\PNGImageDecoder.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\image-decoders\skia\PNGImageDecoder.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\image-decoders\skia\XBMImageDecoder.cpp"
+						>
+					</File>
+				</Filter>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="css"
diff --git a/webkit/build/WebCore/webcore.vsprops b/webkit/build/WebCore/webcore.vsprops
index fae7dd5..436e5b0 100644
--- a/webkit/build/WebCore/webcore.vsprops
+++ b/webkit/build/WebCore/webcore.vsprops
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="webcore"
-	InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\third_party\libxml\build\using_libxml.vsprops;$(SolutionDir)..\third_party\libxslt\build\using_libxslt.vsprops;..\webkit_common.vsprops"
+	InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\third_party\libxml\build\using_libxml.vsprops;$(SolutionDir)..\third_party\libxslt\build\using_libxslt.vsprops;$(SolutionDir)..\third_party\libpng\using_libpng.vsprops;$(SolutionDir)..\third_party\libjpeg\using_libjpeg.vsprops;$(SolutionDir)..\third_party\zlib\using_zlib.vsprops;..\webkit_common.vsprops"
 	>
 	<Tool
 		Name="VCCLCompilerTool"
diff --git a/webkit/build/port/port.vcproj b/webkit/build/port/port.vcproj
index 3db4f3d..d87d072 100644
--- a/webkit/build/port/port.vcproj
+++ b/webkit/build/port/port.vcproj
@@ -785,106 +785,6 @@
 				</File>
 			</Filter>
 		</Filter>
-		<Filter
-			Name="platform"
-			>
-			<Filter
-				Name="image-decoders"
-				>
-				<File
-					RelativePath="..\..\port\platform\image-decoders\ImageDecoder.h"
-					>
-				</File>
-				<Filter
-					Name="bmp"
-					>
-					<File
-						RelativePath="..\..\port\platform\image-decoders\bmp\BMPImageDecoder.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\port\platform\image-decoders\bmp\BMPImageDecoder.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\port\platform\image-decoders\bmp\BMPImageReader.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\port\platform\image-decoders\bmp\BMPImageReader.h"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="ico"
-					>
-					<File
-						RelativePath="..\..\port\platform\image-decoders\ico\ICOImageDecoder.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\port\platform\image-decoders\ico\ICOImageDecoder.h"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="xbm"
-					>
-					<File
-						RelativePath="..\..\port\platform\image-decoders\xbm\XBMImageDecoder.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\port\platform\image-decoders\xbm\XBMImageDecoder.h"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="jpeg"
-					>
-					<File
-						RelativePath="..\..\port\platform\image-decoders\jpeg\JPEGImageDecoder.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\port\platform\image-decoders\jpeg\JPEGImageDecoder.h"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="gif"
-					>
-					<File
-						RelativePath="..\..\port\platform\image-decoders\gif\GIFImageDecoder.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\port\platform\image-decoders\gif\GIFImageDecoder.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\port\platform\image-decoders\gif\GIFImageReader.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\port\platform\image-decoders\gif\GIFImageReader.h"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="png"
-					>
-					<File
-						RelativePath="..\..\port\platform\image-decoders\png\PNGImageDecoder.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\port\platform\image-decoders\png\PNGImageDecoder.h"
-						>
-					</File>
-				</Filter>
-			</Filter>
-		</Filter>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/webkit/build/port/port.vsprops b/webkit/build/port/port.vsprops
index 4e9af53..17e7fdc 100644
--- a/webkit/build/port/port.vsprops
+++ b/webkit/build/port/port.vsprops
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="port"
-	InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;..\webkit_common.vsprops;$(SolutionDir)..\third_party\libpng\using_libpng.vsprops;$(SolutionDir)..\third_party\libjpeg\using_libjpeg.vsprops;..\..\..\third_party\zlib\using_zlib.vsprops"
+	InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;..\webkit_common.vsprops"
 	>
 	<Tool
 		Name="VCCLCompilerTool"
diff --git a/webkit/build/webkit_common_includes.vsprops b/webkit/build/webkit_common_includes.vsprops
index f788669..139a48b 100644
--- a/webkit/build/webkit_common_includes.vsprops
+++ b/webkit/build/webkit_common_includes.vsprops
@@ -6,6 +6,6 @@
 	>
 	<Tool
 		Name="VCCLCompilerTool"
-		AdditionalIncludeDirectories="&quot;$(OutDir)\obj\WebCore&quot;;&quot;$(OutDir)\obj\WebCore\JavaScriptHeaders&quot;;&quot;$(OutDir)\obj\WebCore\JavaScriptHeaders\JavaScriptCore&quot;;..\..\pending;..\..\port\bridge;&quot;..\..\port\platform\image-decoders&quot;;&quot;..\..\port\platform\image-decoders\bmp&quot;;&quot;..\..\port\platform\image-decoders\gif&quot;;&quot;..\..\port\platform\image-decoders\ico&quot;;&quot;..\..\port\platform\image-decoders\jpeg&quot;;&quot;..\..\port\platform\image-decoders\png&quot;;&quot;..\..\port\platform\image-decoders\xbm&quot;;..\..\;&quot;$(ProjectDir)&quot;;..\..\..\third_party\WebKit\WebCore;..\..\..\third_party\WebKit\WebCore\bridge;..\..\..\third_party\WebKit\WebCore\bridge\c;..\..\..\third_party\WebKit\WebCore\css;..\..\..\third_party\WebKit\WebCore\dom;..\..\..\third_party\WebKit\WebCore\editing;..\..\..\third_party\WebKit\WebCore\history;..\..\..\third_party\WebKit\WebCore\html;..\..\..\third_party\WebKit\WebCore\loader;..\..\..\third_party\WebKit\WebCore\loader\appcache;..\..\..\third_party\WebKit\WebCore\loader\archive;..\..\..\third_party\WebKit\WebCore\loader\icon;..\..\..\third_party\WebKit\WebCore\page;..\..\..\third_party\WebKit\WebCore\page\chromium;..\..\..\third_party\WebKit\WebCore\platform;..\..\..\third_party\WebKit\WebCore\platform\animation;..\..\..\third_party\WebKit\WebCore\platform\chromium;..\..\..\third_party\WebKit\WebCore\page\animation;..\..\..\third_party\WebKit\WebCore\platform\text;..\..\..\third_party\WebKit\WebCore\platform\graphics;..\..\..\third_party\WebKit\WebCore\platform\graphics\chromium;..\..\..\third_party\WebKit\WebCore\platform\graphics\opentype;..\..\..\third_party\WebKit\WebCore\platform\graphics\transforms;..\..\..\third_party\WebKit\WebCore\platform\graphics\skia;..\..\..\third_party\WebKit\WebCore\svg\graphics;..\..\..\third_party\WebKit\WebCore\platform\network;..\..\..\third_party\WebKit\WebCore\platform\network\chromium;..\..\..\third_party\WebKit\WebCore\platform\sql;..\..\..\third_party\WebKit\WebCore\rendering;..\..\..\third_party\WebKit\WebCore\rendering\style;..\..\..\third_party\WebKit\WebCore\storage;..\..\..\third_party\WebKit\WebCore\xml;&quot;..\..\..\third_party\WebKit\WebCore\os-win32&quot;;..\..\..\third_party\WebKit\WebCore\wtf;..\..\..\third_party\WebKit\JavaScriptCore;..\..\..\third_party\WebKit\JavaScriptCore\wtf;&quot;..\..\..\third_party\WebKit\JavaScriptCore\os-win32&quot;;..\..\build;&quot;$(SDKIncludes)&quot;;&quot;$(IntDir)\..\WebCore\DerivedSources&quot;;..\..\..\third_party\WebKit\WebCore\svg;..\..\..\third_party\WebKit\WebCore\svg\animation;..\..\..\third_party\WebKit\WebCore\svg\graphics\filters;..\..\..\third_party\WebKit\WebCore\plugins;..\..\..\third_party\WebKit\WebCore\inspector;..\..\..\third_party\sqlite\preprocessed"
+		AdditionalIncludeDirectories="&quot;$(OutDir)\obj\WebCore&quot;;&quot;$(OutDir)\obj\WebCore\JavaScriptHeaders&quot;;&quot;$(OutDir)\obj\WebCore\JavaScriptHeaders\JavaScriptCore&quot;;..\..\pending;..\..\port\bridge;..\..\;&quot;$(ProjectDir)&quot;;..\..\..\third_party\WebKit\WebCore;..\..\..\third_party\WebKit\WebCore\bridge;..\..\..\third_party\WebKit\WebCore\bridge\c;..\..\..\third_party\WebKit\WebCore\css;..\..\..\third_party\WebKit\WebCore\dom;..\..\..\third_party\WebKit\WebCore\editing;..\..\..\third_party\WebKit\WebCore\history;..\..\..\third_party\WebKit\WebCore\html;..\..\..\third_party\WebKit\WebCore\loader;..\..\..\third_party\WebKit\WebCore\loader\appcache;..\..\..\third_party\WebKit\WebCore\loader\archive;..\..\..\third_party\WebKit\WebCore\loader\icon;..\..\..\third_party\WebKit\WebCore\page;..\..\..\third_party\WebKit\WebCore\page\chromium;..\..\..\third_party\WebKit\WebCore\platform;..\..\..\third_party\WebKit\WebCore\platform\animation;..\..\..\third_party\WebKit\WebCore\platform\chromium;..\..\..\third_party\WebKit\WebCore\platform\image-decoders\skia;..\..\..\third_party\WebKit\WebCore\page\animation;..\..\..\third_party\WebKit\WebCore\platform\text;..\..\..\third_party\WebKit\WebCore\platform\graphics;..\..\..\third_party\WebKit\WebCore\platform\graphics\chromium;..\..\..\third_party\WebKit\WebCore\platform\graphics\opentype;..\..\..\third_party\WebKit\WebCore\platform\graphics\transforms;..\..\..\third_party\WebKit\WebCore\platform\graphics\skia;..\..\..\third_party\WebKit\WebCore\svg\graphics;..\..\..\third_party\WebKit\WebCore\platform\network;..\..\..\third_party\WebKit\WebCore\platform\network\chromium;..\..\..\third_party\WebKit\WebCore\platform\sql;..\..\..\third_party\WebKit\WebCore\rendering;..\..\..\third_party\WebKit\WebCore\rendering\style;..\..\..\third_party\WebKit\WebCore\storage;..\..\..\third_party\WebKit\WebCore\xml;&quot;..\..\..\third_party\WebKit\WebCore\os-win32&quot;;..\..\..\third_party\WebKit\WebCore\wtf;..\..\..\third_party\WebKit\JavaScriptCore;..\..\..\third_party\WebKit\JavaScriptCore\wtf;&quot;..\..\..\third_party\WebKit\JavaScriptCore\os-win32&quot;;..\..\build;&quot;$(SDKIncludes)&quot;;&quot;$(IntDir)\..\WebCore\DerivedSources&quot;;..\..\..\third_party\WebKit\WebCore\svg;..\..\..\third_party\WebKit\WebCore\svg\animation;..\..\..\third_party\WebKit\WebCore\svg\graphics\filters;..\..\..\third_party\WebKit\WebCore\plugins;..\..\..\third_party\WebKit\WebCore\inspector;..\..\..\third_party\sqlite\preprocessed"
 	/>
 </VisualStudioPropertySheet>