Changing Aura background for new temporary one.

ui/base/resource/resource_bundle.cc

 // Copyright (c) 2011 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 "ui/base/resource/resource_bundle.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
 #include "base/stl_util.h"
 #include "base/string_piece.h"
 #include "base/synchronization/lock.h"
 #include "base/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/data_pack.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/base/ui_base_switches.h"
+#include "ui/gfx/codec/jpeg_codec.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/image/image.h"
 
 namespace ui {
 
 namespace {
 
 // Font sizes relative to base font.
 #if defined(OS_CHROMEOS) && defined(CROS_FONTS_USING_BCI)
@@ skipping 330 matching lines @@
 }
 
 /* static */
 SkBitmap* ResourceBundle::LoadBitmap(DataHandle data_handle, int resource_id) {
   scoped_refptr<RefCountedMemory> memory(
       LoadResourceBytes(data_handle, resource_id));
   if (!memory)
     return NULL;
 
   SkBitmap bitmap;
-  if (!gfx::PNGCodec::Decode(memory->front(), memory->size(), &bitmap)) {
-    NOTREACHED() << "Unable to decode theme image resource " << resource_id;
-    return NULL;
-  }
+  if (gfx::PNGCodec::Decode(memory->front(), memory->size(), &bitmap))
+    return new SkBitmap(bitmap);
 
-  return new SkBitmap(bitmap);
+  // 99% of our assets are PNGs, however fallback to JPEG.
+  SkBitmap *allocated_bitmap =

[sky, 2011/12/16 19:27:23]

'SkBitmap *' -> 'SkBitmap* '

[Emmanuel Saint-loubert-Bié, 2011/12/16 21:43:39]

Done.

+      gfx::JPEGCodec::Decode(memory->front(), memory->size());
+  if (allocated_bitmap)
+    return allocated_bitmap;
+
+  NOTREACHED() << "Unable to decode theme image resource " << resource_id;
+  return NULL;
 }
 
 gfx::Image* ResourceBundle::GetEmptyImage() {
   base::AutoLock lock(*lock_);
 
   static gfx::Image* empty_image = NULL;
   if (!empty_image) {
     // The placeholder bitmap is bright red so people notice the problem.
     // This bitmap will be leaked, but this code should never be hit.
     SkBitmap* bitmap = new SkBitmap();
@@ skipping 34 matching lines @@
 }
 
 RefCountedStaticMemory* ResourceBundle::LoadedDataPack::GetStaticMemory(
     int resource_id) const {
   if (!data_pack_.get())
     return NULL;
   return data_pack_->GetStaticMemory(resource_id);
 }
 
 }  // namespace ui