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

Side by Side Diff: ui/gfx/image/image_skia_operations.cc

Issue 1357423009: gfx: Make conversions from Size to SizeF be explicit. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: sizefconvert-gfx: . Created 5 years, 2 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/gfx/image/image_skia.cc ('k') | ui/gfx/platform_font_mac.mm » ('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/gfx/image/image_skia_operations.h" 5 #include "ui/gfx/image/image_skia_operations.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "skia/ext/image_operations.h" 9 #include "skia/ext/image_operations.h"
10 #include "ui/gfx/canvas.h" 10 #include "ui/gfx/canvas.h"
11 #include "ui/gfx/geometry/insets.h" 11 #include "ui/gfx/geometry/insets.h"
12 #include "ui/gfx/geometry/point.h" 12 #include "ui/gfx/geometry/point.h"
13 #include "ui/gfx/geometry/point_conversions.h" 13 #include "ui/gfx/geometry/point_conversions.h"
14 #include "ui/gfx/geometry/rect.h" 14 #include "ui/gfx/geometry/rect.h"
15 #include "ui/gfx/geometry/rect_conversions.h" 15 #include "ui/gfx/geometry/rect_conversions.h"
16 #include "ui/gfx/geometry/size.h" 16 #include "ui/gfx/geometry/size.h"
17 #include "ui/gfx/geometry/size_conversions.h" 17 #include "ui/gfx/geometry/size_conversions.h"
18 #include "ui/gfx/image/canvas_image_source.h" 18 #include "ui/gfx/image/canvas_image_source.h"
19 #include "ui/gfx/image/image_skia.h" 19 #include "ui/gfx/image/image_skia.h"
20 #include "ui/gfx/image/image_skia_rep.h" 20 #include "ui/gfx/image/image_skia_rep.h"
21 #include "ui/gfx/image/image_skia_source.h" 21 #include "ui/gfx/image/image_skia_source.h"
22 #include "ui/gfx/skbitmap_operations.h" 22 #include "ui/gfx/skbitmap_operations.h"
23 #include "ui/gfx/skia_util.h" 23 #include "ui/gfx/skia_util.h"
24 24
25 namespace gfx { 25 namespace gfx {
26 namespace { 26 namespace {
27 27
28 gfx::Size DIPToPixelSize(gfx::Size dip_size, float scale) { 28 gfx::Size DIPToPixelSize(gfx::Size dip_size, float scale) {
29 return ToCeiledSize(ScaleSize(dip_size, scale)); 29 return ScaleToCeiledSize(dip_size, scale);
30 } 30 }
31 31
32 gfx::Rect DIPToPixelBounds(gfx::Rect dip_bounds, float scale) { 32 gfx::Rect DIPToPixelBounds(gfx::Rect dip_bounds, float scale) {
33 return gfx::Rect(ToFlooredPoint(ScalePoint(dip_bounds.origin(), scale)), 33 return gfx::Rect(ToFlooredPoint(ScalePoint(dip_bounds.origin(), scale)),
34 DIPToPixelSize(dip_bounds.size(), scale)); 34 DIPToPixelSize(dip_bounds.size(), scale));
35 } 35 }
36 36
37 // Returns an image rep for the ImageSkiaSource to return to visually indicate 37 // Returns an image rep for the ImageSkiaSource to return to visually indicate
38 // an error. 38 // an error.
39 ImageSkiaRep GetErrorImageRep(float scale, const gfx::Size& pixel_size) { 39 ImageSkiaRep GetErrorImageRep(float scale, const gfx::Size& pixel_size) {
(...skipping 499 matching lines...) Expand 10 before | Expand all | Expand 10 after
539 return ImageSkia(); 539 return ImageSkia();
540 540
541 return ImageSkia(new RotatedSource(source, rotation), 541 return ImageSkia(new RotatedSource(source, rotation),
542 SkBitmapOperations::ROTATION_180_CW == rotation ? 542 SkBitmapOperations::ROTATION_180_CW == rotation ?
543 source.size() : 543 source.size() :
544 gfx::Size(source.height(), source.width())); 544 gfx::Size(source.height(), source.width()));
545 545
546 } 546 }
547 547
548 } // namespace gfx 548 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gfx/image/image_skia.cc ('k') | ui/gfx/platform_font_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698