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

Side by Side Diff: webkit/port/platform/graphics/skia/public/PlatformCanvas.h

Issue 11244: Move PlatformCanvas and PlatformDevice from base/gfx to webkit/port. I left h... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 12 years, 1 month 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
Property Changes:
Added: svn:mergeinfo
Merged /branches/chrome_webkit_merge_branch/base/gfx/platform_canvas.h:r69-2775
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 // Declare a platform-neutral name for this platform's canvas class 5 // Declare a platform-neutral name for this platform's canvas class
6 // that can be used by upper-level classes that just need to pass a reference 6 // that can be used by upper-level classes that just need to pass a reference
7 // around. 7 // around.
8 8
9 #include "build/build_config.h" 9 #if defined(WIN32)
10 10 #include "PlatformCanvasWin.h"
11 #if defined(OS_WIN)
12 #include "base/gfx/platform_canvas_win.h"
13 namespace gfx { 11 namespace gfx {
14 12
15 typedef PlatformCanvasWin PlatformCanvas; 13 typedef PlatformCanvasWin PlatformCanvas;
16 14
17 } // namespace gfx 15 } // namespace gfx
18 #elif defined(OS_MACOSX) 16 #elif defined(__APPLE__)
19 #include "base/gfx/platform_canvas_mac.h" 17 #include "PlatformCanvasMac.h"
20 namespace gfx { 18 namespace gfx {
21 19
22 typedef PlatformCanvasMac PlatformCanvas; 20 typedef PlatformCanvasMac PlatformCanvas;
23 21
24 } // namespace gfx 22 } // namespace gfx
25 #elif defined(OS_LINUX) 23 #elif defined(__linux__)
26 #include "base/gfx/platform_canvas_linux.h" 24 #include "PlatformCanvasLinux.h"
27 namespace gfx { 25 namespace gfx {
28 26
29 typedef PlatformCanvasLinux PlatformCanvas; 27 typedef PlatformCanvasLinux PlatformCanvas;
30 28
31 } // namespace gfx 29 } // namespace gfx
32 #endif 30 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698