| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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_skia.h" | 5 #include "ui/gfx/canvas_skia.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include <cairo/cairo.h> | 9 #include <cairo/cairo.h> |
| 10 #include <pango/pango.h> | 10 #include <pango/pango.h> |
| (...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 270 return; | 270 return; |
| 271 } | 271 } |
| 272 | 272 |
| 273 skia::ScopedPlatformPaint scoped_platform_paint(canvas_); | 273 skia::ScopedPlatformPaint scoped_platform_paint(canvas_); |
| 274 cairo_t* cr = scoped_platform_paint.GetPlatformSurface(); | 274 cairo_t* cr = scoped_platform_paint.GetPlatformSurface(); |
| 275 gdk_cairo_set_source_pixbuf(cr, pixbuf, x, y); | 275 gdk_cairo_set_source_pixbuf(cr, pixbuf, x, y); |
| 276 cairo_paint(cr); | 276 cairo_paint(cr); |
| 277 } | 277 } |
| 278 #endif // defined(TOOLKIT_USES_GTK) | 278 #endif // defined(TOOLKIT_USES_GTK) |
| 279 | 279 |
| 280 ui::TextureID CanvasSkia::GetTextureID() { | |
| 281 // TODO(wjmaclean) | |
| 282 return 0; | |
| 283 } | |
| 284 | |
| 285 } // namespace gfx | 280 } // namespace gfx |
| OLD | NEW |