diff options
| author | zhaoze.zhou@partner.samsung.com <zhaoze.zhou@partner.samsung.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-26 00:10:00 +0000 |
|---|---|---|
| committer | zhaoze.zhou@partner.samsung.com <zhaoze.zhou@partner.samsung.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-26 00:10:00 +0000 |
| commit | c320584e913921653538c1b80cbebd842e9067d4 (patch) | |
| tree | b5113825dc50ed282bbab6fa222c4cee31f5fd99 | |
| parent | 23c52e2dd8ab25d191c3225ec751b3a5b86bd915 (diff) | |
| download | chromium_src-c320584e913921653538c1b80cbebd842e9067d4.zip chromium_src-c320584e913921653538c1b80cbebd842e9067d4.tar.gz chromium_src-c320584e913921653538c1b80cbebd842e9067d4.tar.bz2 | |
Fix use_canvas_skia = 0
Review URL: https://codereview.chromium.org/382633002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285735 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ui/gfx/BUILD.gn | 4 | ||||
| -rw-r--r-- | ui/gfx/canvas_notimplemented.cc (renamed from ui/gfx/canvas_android.cc) | 10 | ||||
| -rw-r--r-- | ui/gfx/gfx.gyp | 4 |
3 files changed, 14 insertions, 4 deletions
diff --git a/ui/gfx/BUILD.gn b/ui/gfx/BUILD.gn index d4f30dc..c23fb16 100644 --- a/ui/gfx/BUILD.gn +++ b/ui/gfx/BUILD.gn @@ -55,7 +55,7 @@ component("gfx") { "break_list.h", "canvas.cc", "canvas.h", - "canvas_android.cc", + "canvas_notimplemented.cc", "canvas_paint_mac.h", "canvas_paint_mac.mm", "canvas_paint_win.cc", @@ -291,6 +291,8 @@ component("gfx") { "android", "jnigraphics", ] + } else { + sources -= [ "canvas_notimplemented.cc" ] } # Windows. diff --git a/ui/gfx/canvas_android.cc b/ui/gfx/canvas_notimplemented.cc index 61e3a3a..f31de5a 100644 --- a/ui/gfx/canvas_android.cc +++ b/ui/gfx/canvas_notimplemented.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -37,4 +37,12 @@ void Canvas::DrawStringRectWithShadows(const base::string16& text, NOTIMPLEMENTED(); } +void Canvas::DrawFadedString(const base::string16& text, + const FontList& font_list, + SkColor color, + const Rect& display_rect, + int flags) { + NOTIMPLEMENTED(); +} + } // namespace gfx diff --git a/ui/gfx/gfx.gyp b/ui/gfx/gfx.gyp index 7dde00b..f1bc1f0 100644 --- a/ui/gfx/gfx.gyp +++ b/ui/gfx/gfx.gyp @@ -131,7 +131,7 @@ 'break_list.h', 'canvas.cc', 'canvas.h', - 'canvas_android.cc', + 'canvas_notimplemented.cc', 'canvas_paint_mac.h', 'canvas_paint_mac.mm', 'canvas_paint_win.cc', @@ -321,7 +321,7 @@ # http://crbug.com/105550 ['use_canvas_skia==1', { 'sources!': [ - 'canvas_android.cc', + 'canvas_notimplemented.cc', ], }, { # use_canvas_skia!=1 'sources!': [ |