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

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

Issue 6312156: Change includes of gfx/* to ui/gfx/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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 | Annotate | Revision Log
« no previous file with comments | « ui/gfx/canvas_skia.cc ('k') | ui/gfx/canvas_skia_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) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 "gfx/canvas_skia.h" 5 #include "ui/gfx/canvas_skia.h"
6 6
7 #include <cairo/cairo.h> 7 #include <cairo/cairo.h>
8 #include <gtk/gtk.h> 8 #include <gtk/gtk.h>
9 #include <pango/pango.h> 9 #include <pango/pango.h>
10 #include <pango/pangocairo.h> 10 #include <pango/pangocairo.h>
11 11
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/utf_string_conversions.h" 13 #include "base/utf_string_conversions.h"
14 #include "gfx/font.h" 14 #include "ui/gfx/font.h"
15 #include "gfx/gtk_util.h" 15 #include "ui/gfx/gtk_util.h"
16 #include "gfx/platform_font_gtk.h" 16 #include "ui/gfx/platform_font_gtk.h"
17 #include "gfx/rect.h" 17 #include "ui/gfx/rect.h"
18 18
19 namespace { 19 namespace {
20 20
21 const gunichar kAcceleratorChar = '&'; 21 const gunichar kAcceleratorChar = '&';
22 22
23 // Font settings that we initialize once and then use when drawing text in 23 // Font settings that we initialize once and then use when drawing text in
24 // DrawStringInt(). 24 // DrawStringInt().
25 static cairo_font_options_t* cairo_font_options = NULL; 25 static cairo_font_options_t* cairo_font_options = NULL;
26 26
27 // Update |cairo_font_options| based on GtkSettings, allocating it if needed. 27 // Update |cairo_font_options| based on GtkSettings, allocating it if needed.
(...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after
378 NOTREACHED(); 378 NOTREACHED();
379 return; 379 return;
380 } 380 }
381 381
382 cairo_t* cr = beginPlatformPaint(); 382 cairo_t* cr = beginPlatformPaint();
383 gdk_cairo_set_source_pixbuf(cr, pixbuf, x, y); 383 gdk_cairo_set_source_pixbuf(cr, pixbuf, x, y);
384 cairo_paint(cr); 384 cairo_paint(cr);
385 } 385 }
386 386
387 } // namespace gfx 387 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gfx/canvas_skia.cc ('k') | ui/gfx/canvas_skia_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698