Make Mac bitmaps use BGRA to match the MD5 hash Apple uses in its WebKit expe...

webkit/tools/test_shell/test_shell.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/tools/test_shell/test_shell.h"
 
 #include "base/command_line.h"
 #include "base/debug_on_start.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ skipping 179 matching lines @@
     const std::wstring& file_name) {
   scoped_ptr<skia::BitmapPlatformDevice> device;
   if (!web_frame->CaptureImage(&device, true))
     return std::string();
 
   const SkBitmap& src_bmp = device->accessBitmap(false);
 
   // Encode image.
   std::vector<unsigned char> png;
   SkAutoLockPixels src_bmp_lock(src_bmp);
+  PNGEncoder::ColorFormat color_format = PNGEncoder::FORMAT_BGRA;
 #if defined(OS_WIN) || defined(OS_LINUX)
   bool discard_transparency = true;
-  PNGEncoder::ColorFormat color_format = PNGEncoder::FORMAT_BGRA;
 #elif defined(OS_MACOSX)
-  // the expected PNGs in webkit have an alpha channel. We must not discard
-  // the transparency else the checksums won't match.
+  // the expected PNGs in webkit have an alpha channel. We shouldn't discard
+  // the transparency for reference purposes, though the hashes will still
+  // match.
   bool discard_transparency = false;
-  PNGEncoder::ColorFormat color_format = PNGEncoder::FORMAT_RGBA;
 #endif
   PNGEncoder::Encode(
       reinterpret_cast<const unsigned char*>(src_bmp.getPixels()),
       color_format, src_bmp.width(), src_bmp.height(),
       static_cast<int>(src_bmp.rowBytes()), discard_transparency, &png);
 
   // Write to disk.
   file_util::WriteFile(file_name, reinterpret_cast<const char *>(&png[0]),
                        png.size());
 
@@ skipping 272 matching lines @@
   return net::GetPreferredExtensionForMimeType(mime_type, ext);
 }
 
 std::string GetDataResource(int resource_id) {
   switch (resource_id) {
   case IDR_BROKENIMAGE: {
     // Use webkit's broken image icon (16x16)
     static std::string broken_image_data;
     if (broken_image_data.empty()) {
       FilePath path = GetResourcesFilePath();
+#if defined(OS_WIN) || defined(OS_LINUX)
       path = path.Append(FILE_PATH_LITERAL("missingImage.gif"));
+#elif defined(OS_MACOSX)
+      // In order to match WebKit's colors for the missing image, we have to
+      // use a PNG. The GIF doesn't have the color range needed to correctly
+      // match the TIFF they use in Safari.
+      path = path.Append(FILE_PATH_LITERAL("missingImage.png"));
+#endif
       bool success = file_util::ReadFileToString(path.ToWStringHack(),
                                                  &broken_image_data);
       if (!success) {
         LOG(FATAL) << "Failed reading: " << path.value();
       }
     }
     return broken_image_data;
   }
   case IDR_FEED_PREVIEW:
     // It is necessary to return a feed preview template that contains
@@ skipping 87 matching lines @@
 
 uint64 VisitedLinkHash(const char* canonical_url, size_t length) {
   return 0;
 }
 
 bool IsLinkVisited(uint64 link_hash) {
   return false;
 }
 
 }  // namespace webkit_glue