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

Side by Side Diff: ui/gfx/canvas.h

Issue 7517020: First pass at removal of unneeded dependencies on skia\ext\platform_canvas.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 4 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 | « media/tools/scaler_bench/scaler_bench.cc ('k') | ui/gfx/native_theme.h » ('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) 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 #ifndef UI_GFX_CANVAS_H_ 5 #ifndef UI_GFX_CANVAS_H_
6 #define UI_GFX_CANVAS_H_ 6 #define UI_GFX_CANVAS_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
11 #include "base/string16.h" 11 #include "base/string16.h"
12 // TODO(beng): remove this include when we no longer depend on SkTypes. 12 // TODO(beng): remove these includes when we no longer depend on SkTypes.
13 #include "skia/ext/platform_canvas.h" 13 #include "third_party/skia/include/core/SkColor.h"
14 #include "third_party/skia/include/core/SkXfermode.h"
14 #include "ui/gfx/native_widget_types.h" 15 #include "ui/gfx/native_widget_types.h"
15 #include "ui/ui_api.h" 16 #include "ui/ui_api.h"
16 17
17 namespace ui { 18 namespace ui {
18 class Transform; 19 class Transform;
19 20
20 typedef unsigned int TextureID; 21 typedef unsigned int TextureID;
21 } 22 }
22 23
23 namespace gfx { 24 namespace gfx {
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 // Returns the rectangle that is invalid. 245 // Returns the rectangle that is invalid.
245 virtual gfx::Rect GetInvalidRect() const = 0; 246 virtual gfx::Rect GetInvalidRect() const = 0;
246 247
247 // Returns the underlying Canvas. 248 // Returns the underlying Canvas.
248 virtual Canvas* AsCanvas() = 0; 249 virtual Canvas* AsCanvas() = 0;
249 }; 250 };
250 251
251 } // namespace gfx; 252 } // namespace gfx;
252 253
253 #endif // UI_GFX_CANVAS_H_ 254 #endif // UI_GFX_CANVAS_H_
OLDNEW
« no previous file with comments | « media/tools/scaler_bench/scaler_bench.cc ('k') | ui/gfx/native_theme.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698