diff options
| author | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-23 23:00:19 +0000 |
|---|---|---|
| committer | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-23 23:00:19 +0000 |
| commit | 32e7a9b5af36ff4c9288defd8c58c21b6217871b (patch) | |
| tree | 15c65f28d8f67c265a5013fb5d09a8c1fb36df0f /content | |
| parent | 21f2e2d73211c9e155b8e33313c6d1a5b5a52add (diff) | |
| download | chromium_src-32e7a9b5af36ff4c9288defd8c58c21b6217871b.zip chromium_src-32e7a9b5af36ff4c9288defd8c58c21b6217871b.tar.gz chromium_src-32e7a9b5af36ff4c9288defd8c58c21b6217871b.tar.bz2 | |
Convert gfx::Image::Image(const SkBitmap&) and gfx::ImageSkia::ImageSkia(const SkBitmap&) to gfx::Image::CreateFrom1xBitmap(const SkBitmap&) and gfx::ImageSkia::CreateFrom1xBitmap(const SkBitmap&) respectively
Hopefully these changes will make the constructors / factory methods less confusing and prevent bugs as a result of confusion about what the constructors do.
Review URL: https://chromiumcodereview.appspot.com/11970013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@178408 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/renderer_host/render_widget_host_view_win.cc | 2 | ||||
| -rw-r--r-- | content/browser/web_contents/navigation_controller_impl_unittest.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/content/browser/renderer_host/render_widget_host_view_win.cc b/content/browser/renderer_host/render_widget_host_view_win.cc index 488d7b4..9367a44 100644 --- a/content/browser/renderer_host/render_widget_host_view_win.cc +++ b/content/browser/renderer_host/render_widget_host_view_win.cc @@ -1320,7 +1320,7 @@ void RenderWidgetHostViewWin::DrawBackground(const RECT& dirty_rect, gfx::Rect dc_rect(dc->m_ps.rcPaint); // TODO(pkotwicz): Fix |background_| such that it is an ImageSkia. - canvas.TileImageInt(gfx::ImageSkia(background_), + canvas.TileImageInt(gfx::ImageSkia::CreateFrom1xBitmap(background_), 0, 0, dc_rect.width(), dc_rect.height()); skia::DrawToNativeContext(canvas.sk_canvas(), *dc, dirty_area.x(), diff --git a/content/browser/web_contents/navigation_controller_impl_unittest.cc b/content/browser/web_contents/navigation_controller_impl_unittest.cc index c00a94b9..18146d3 100644 --- a/content/browser/web_contents/navigation_controller_impl_unittest.cc +++ b/content/browser/web_contents/navigation_controller_impl_unittest.cc @@ -49,7 +49,7 @@ gfx::Image CreateImage(SkColor color) { bitmap.setConfig(SkBitmap::kARGB_8888_Config, 1, 1); bitmap.allocPixels(); bitmap.eraseColor(color); - return gfx::Image(bitmap); + return gfx::Image::CreateFrom1xBitmap(bitmap); } // Returns true if images |a| and |b| have the same pixel data. |