Patch by Thatcher Ulrich <tulrich@google.com>....

webkit/port/platform/graphics/SkiaUtils.cpp

 // Copyright (c) 2008, Google Inc.
 // All rights reserved.
 // 
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 // 
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
@@ skipping 21 matching lines @@
 #include "SkiaUtils.h"
 
 #include "SharedBuffer.h"
 #include "SkCanvas.h"
 #include "SkColorPriv.h"
 #include "SkMatrix.h"
 #include "SkRegion.h"
 
 #include "base/basictypes.h"
 #if defined(OS_WIN)
-#include "base/gfx/bitmap_header.h"
+#include "base/gfx/gdi_util.h"
 #endif
 
 void WebCorePointToSkiaPoint(const WebCore::FloatPoint& src, SkPoint* dst)
 {
     dst->set(WebCoreFloatToSkScalar(src.x()), WebCoreFloatToSkScalar(src.y()));
 }
 
 void WebCoreRectToSkiaRect(const WebCore::IntRect& src, SkRect* dst)
 {
     dst->set(SkIntToScalar(src.x()),
@@ skipping 223 matching lines @@
                                     header_size);
 
     // Skia stores colors pre-multiplied, BMP doesn't. Need to convert the
     // colors.
     for (int i = width * height - 1; i >= 0; --i)
       dest_image_data[i] = SkPMColorToColor(src_image_data[i]);
 
     return buffer;
 }
 #endif