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

Side by Side Diff: ui/gfx/canvas_skia.cc

Issue 1543183002: Switch to standard integer types in ui/gfx/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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/canvas.cc ('k') | ui/gfx/canvas_unittest.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/gfx/canvas.h" 5 #include "ui/gfx/canvas.h"
6 6
7 #include <stddef.h>
8 #include <stdint.h>
9
7 #include "base/i18n/rtl.h" 10 #include "base/i18n/rtl.h"
8 #include "base/logging.h" 11 #include "base/logging.h"
9 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
10 #include "base/numerics/safe_conversions.h" 13 #include "base/numerics/safe_conversions.h"
14 #include "build/build_config.h"
11 #include "third_party/skia/include/core/SkBitmap.h" 15 #include "third_party/skia/include/core/SkBitmap.h"
12 #include "third_party/skia/include/core/SkPixmap.h" 16 #include "third_party/skia/include/core/SkPixmap.h"
13 #include "ui/gfx/font_list.h" 17 #include "ui/gfx/font_list.h"
14 #include "ui/gfx/geometry/insets.h" 18 #include "ui/gfx/geometry/insets.h"
15 #include "ui/gfx/geometry/rect.h" 19 #include "ui/gfx/geometry/rect.h"
16 #include "ui/gfx/range/range.h" 20 #include "ui/gfx/range/range.h"
17 #include "ui/gfx/render_text.h" 21 #include "ui/gfx/render_text.h"
18 #include "ui/gfx/shadow_value.h" 22 #include "ui/gfx/shadow_value.h"
19 #include "ui/gfx/text_elider.h" 23 #include "ui/gfx/text_elider.h"
20 #include "ui/gfx/text_utils.h" 24 #include "ui/gfx/text_utils.h"
(...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after
340 UpdateRenderText(rect, text, font_list, flags, color, render_text.get()); 344 UpdateRenderText(rect, text, font_list, flags, color, render_text.get());
341 render_text->SetElideBehavior(FADE_TAIL); 345 render_text->SetElideBehavior(FADE_TAIL);
342 346
343 canvas_->save(); 347 canvas_->save();
344 ClipRect(display_rect); 348 ClipRect(display_rect);
345 render_text->Draw(this); 349 render_text->Draw(this);
346 canvas_->restore(); 350 canvas_->restore();
347 } 351 }
348 352
349 } // namespace gfx 353 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gfx/canvas.cc ('k') | ui/gfx/canvas_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698