| Index: app/gfx/canvas_linux.cc
|
| diff --git a/app/gfx/canvas_linux.cc b/app/gfx/canvas_linux.cc
|
| old mode 100644
|
| new mode 100755
|
| index 3b363f8615a7a48f9c79ddcfb3ec2fd1c6e0fb10..67511155b763d4317240ec17494175063190bdb0
|
| --- a/app/gfx/canvas_linux.cc
|
| +++ b/app/gfx/canvas_linux.cc
|
| @@ -4,7 +4,9 @@
|
|
|
| #include "app/gfx/canvas.h"
|
|
|
| +#include <cairo/cairo.h>
|
| #include <pango/pango.h>
|
| +#include <pango/pangocairo.h>
|
|
|
| #include "app/gfx/font.h"
|
| #include "base/gfx/rect.h"
|
| @@ -44,10 +46,10 @@ PangoFontDescription* PangoFontFromGfxFont(const gfx::Font& gfx_font) {
|
| namespace gfx {
|
|
|
| Canvas::Canvas(int width, int height, bool is_opaque)
|
| - : skia::PlatformCanvasLinux(width, height, is_opaque) {
|
| + : skia::PlatformCanvas(width, height, is_opaque) {
|
| }
|
|
|
| -Canvas::Canvas() : skia::PlatformCanvasLinux() {
|
| +Canvas::Canvas() : skia::PlatformCanvas() {
|
| }
|
|
|
| Canvas::~Canvas() {
|
| @@ -58,7 +60,7 @@ void Canvas::SizeStringInt(const std::wstring& text,
|
| const gfx::Font& font,
|
| int* width, int* height, int flags) {
|
| cairo_surface_t* surface =
|
| - cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 0, 0);
|
| + cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 0, 0);
|
| cairo_t* cr = cairo_create(surface);
|
| PangoLayout* layout = pango_cairo_create_layout(cr);
|
|
|
|
|