Commit f4b79b51 authored by sadrul@chromium.org's avatar sadrul@chromium.org

image: Remove operator for converting from SkBitmap to ImageSkia.

BUG=141146

Review URL: https://chromiumcodereview.appspot.com/10880063

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153497 0039d316-1c4b-4281-b951-d872f2087c98
parent acb49cef
...@@ -160,11 +160,6 @@ ImageSkia& ImageSkia::operator=(const ImageSkia& other) { ...@@ -160,11 +160,6 @@ ImageSkia& ImageSkia::operator=(const ImageSkia& other) {
return *this; return *this;
} }
ImageSkia& ImageSkia::operator=(const SkBitmap& other) {
Init(ImageSkiaRep(other, ui::SCALE_FACTOR_100P));
return *this;
}
ImageSkia::~ImageSkia() { ImageSkia::~ImageSkia() {
} }
......
...@@ -53,13 +53,6 @@ class UI_EXPORT ImageSkia { ...@@ -53,13 +53,6 @@ class UI_EXPORT ImageSkia {
// Copies a reference to |other|'s storage. // Copies a reference to |other|'s storage.
ImageSkia& operator=(const ImageSkia& other); ImageSkia& operator=(const ImageSkia& other);
// Converts from SkBitmap.
// Adds ref to passed in bitmap.
// DIP width and height are set based on scale factor of 1x.
// TODO(pkotwicz): This is temporary till conversion to gfx::ImageSkia is
// done.
ImageSkia& operator=(const SkBitmap& other);
#if defined(OS_WIN) #if defined(OS_WIN)
// Converts to gfx::ImageSkiaRep and SkBitmap. // Converts to gfx::ImageSkiaRep and SkBitmap.
// TODO(pkotwicz): This is temporary till conversion to gfx::ImageSkia is // TODO(pkotwicz): This is temporary till conversion to gfx::ImageSkia is
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment