2009-06-12 Peter Kasting <pkasting@google.com>

        Fix Chromium and some of Cairo build bustage, fallout from
        https://bugs.webkit.org/show_bug.cgi?id=25709 changes.

        * WebCore.vcproj/WebCore.vcproj: Add missing XBM decoder files.
        * platform/image-decoders/skia/ImageDecoder.h:
        (WebCore::RGBA32Buffer::copyRowNTimes): Fix typo that broke Skia GIF decoding.



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@44639 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog

+2009-06-12  Peter Kasting  <pkasting@google.com>
+
+        Fix Chromium and some of Cairo build bustage, fallout from
+        https://bugs.webkit.org/show_bug.cgi?id=25709 changes.
+
+        * WebCore.vcproj/WebCore.vcproj: Add missing XBM decoder files.
+        * platform/image-decoders/skia/ImageDecoder.h:
+        (WebCore::RGBA32Buffer::copyRowNTimes): Fix typo that broke Skia GIF decoding.
+
 2009-06-12  Simon Fraser  <simon.fraser@apple.com>
 
         Fix build when ACCELERATED_COMPOSITING is defined.

WebCore/WebCore.vcproj/WebCore.vcproj

@@ -6695,6 +6695,66 @@
 						</FileConfiguration>
 					</File>
 				</Filter>
+				<Filter
+					Name="xbm"
+					>
+					<File
+						RelativePath="..\platform\image-decoders\xbm\XBMImageDecoder.cpp"
+						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							ExcludedFromBuild="true"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							ExcludedFromBuild="true"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Debug_Internal|Win32"
+							ExcludedFromBuild="true"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\platform\image-decoders\xbm\XBMImageDecoder.h"
+						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							ExcludedFromBuild="true"
+							>
+							<Tool
+								Name="VCCustomBuildTool"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							ExcludedFromBuild="true"
+							>
+							<Tool
+								Name="VCCustomBuildTool"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Debug_Internal|Win32"
+							ExcludedFromBuild="true"
+							>
+							<Tool
+								Name="VCCustomBuildTool"
+							/>
+						</FileConfiguration>
+					</File>
+				</Filter>
 			</Filter>
 			<Filter
 				Name="animation"

WebCore/platform/image-decoders/skia/ImageDecoder.h

@@ -113,7 +113,7 @@ namespace WebCore {
             const int rowBytes = (endX - startX) * sizeof(PixelData);
             const PixelData* const startAddr = getAddr(startX, startY);
             for (int destY = startY + 1; destY < endY; ++destY)
-                memcpy(getAddr(startX, startY), startAddr, rowBytes);
+                memcpy(getAddr(startX, destY), startAddr, rowBytes);
         }
 
         // Must be called before any pixels are written. Will return true on