| OLD | NEW |
|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ui/gfx/image.h" | 5 #include "ui/gfx/image.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "third_party/skia/include/core/SkBitmap.h" |
| 8 | 9 |
| 9 #if defined(OS_LINUX) | 10 #if defined(OS_LINUX) |
| 10 #include <gdk-pixbuf/gdk-pixbuf.h> | 11 #include <gdk-pixbuf/gdk-pixbuf.h> |
| 11 #include <glib-object.h> | 12 #include <glib-object.h> |
| 12 #include "ui/gfx/canvas_skia.h" | 13 #include "ui/gfx/canvas_skia.h" |
| 13 #include "ui/gfx/gtk_util.h" | 14 #include "ui/gfx/gtk_util.h" |
| 14 #elif defined(OS_MACOSX) | 15 #elif defined(OS_MACOSX) |
| 15 #include "base/mac/mac_util.h" | 16 #include "base/mac/mac_util.h" |
| 16 #include "skia/ext/skia_utils_mac.h" | 17 #include "skia/ext/skia_utils_mac.h" |
| 17 #endif | 18 #endif |
| (...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 270 | 271 |
| 271 // Something went seriously wrong... | 272 // Something went seriously wrong... |
| 272 return NULL; | 273 return NULL; |
| 273 } | 274 } |
| 274 | 275 |
| 275 void Image::AddRepresentation(internal::ImageRep* rep) { | 276 void Image::AddRepresentation(internal::ImageRep* rep) { |
| 276 representations_.insert(std::make_pair(rep->type(), rep)); | 277 representations_.insert(std::make_pair(rep->type(), rep)); |
| 277 } | 278 } |
| 278 | 279 |
| 279 } // namespace gfx | 280 } // namespace gfx |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 6541031:
Integrate gfx::Image into the ResourceBundle. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src