Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(455)

Side by Side Diff: ui/views/controls/image_view.cc

Issue 2640983002: Rename paint data structures (Closed)
Patch Set: DrawingDisplayItem Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ui/views/controls/focusable_rounded_border_mac.cc ('k') | ui/views/controls/md_slider.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/views/controls/image_view.h" 5 #include "ui/views/controls/image_view.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
11 #include "third_party/skia/include/core/SkPaint.h" 11 #include "cc/paint/paint_flags.h"
12 #include "ui/accessibility/ax_node_data.h" 12 #include "ui/accessibility/ax_node_data.h"
13 #include "ui/gfx/canvas.h" 13 #include "ui/gfx/canvas.h"
14 #include "ui/gfx/geometry/insets.h" 14 #include "ui/gfx/geometry/insets.h"
15 #include "ui/views/painter.h" 15 #include "ui/views/painter.h"
16 16
17 namespace views { 17 namespace views {
18 18
19 namespace { 19 namespace {
20 20
21 // Returns the pixels for the bitmap in |image| at scale |image_scale|. 21 // Returns the pixels for the bitmap in |image| at scale |image_scale|.
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 214
215 if (image_.isNull()) 215 if (image_.isNull())
216 return; 216 return;
217 217
218 gfx::Rect image_bounds(GetImageBounds()); 218 gfx::Rect image_bounds(GetImageBounds());
219 if (image_bounds.IsEmpty()) 219 if (image_bounds.IsEmpty())
220 return; 220 return;
221 221
222 if (image_bounds.size() != gfx::Size(image_.width(), image_.height())) { 222 if (image_bounds.size() != gfx::Size(image_.width(), image_.height())) {
223 // Resize case 223 // Resize case
224 SkPaint paint; 224 cc::PaintFlags paint;
225 paint.setFilterQuality(kLow_SkFilterQuality); 225 paint.setFilterQuality(kLow_SkFilterQuality);
226 canvas->DrawImageInt(image_, 0, 0, image_.width(), image_.height(), 226 canvas->DrawImageInt(image_, 0, 0, image_.width(), image_.height(),
227 image_bounds.x(), image_bounds.y(), image_bounds.width(), 227 image_bounds.x(), image_bounds.y(), image_bounds.width(),
228 image_bounds.height(), true, paint); 228 image_bounds.height(), true, paint);
229 } else { 229 } else {
230 canvas->DrawImageInt(image_, image_bounds.x(), image_bounds.y()); 230 canvas->DrawImageInt(image_, image_bounds.x(), image_bounds.y());
231 } 231 }
232 last_painted_bitmap_pixels_ = GetBitmapPixels(image_, last_paint_scale_); 232 last_painted_bitmap_pixels_ = GetBitmapPixels(image_, last_paint_scale_);
233 } 233 }
234 234
235 } // namespace views 235 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/controls/focusable_rounded_border_mac.cc ('k') | ui/views/controls/md_slider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698