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

Side by Side Diff: cc/stubs/int_point.h

Issue 10984053: cc: Use ui/gfx geometry types for the CCRenderPass and CCDrawQuad classes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 2 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 | « cc/stubs/float_size.h ('k') | cc/stubs/int_rect.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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 CC_STUBS_INTPOINT_H_ 5 #ifndef CC_STUBS_INTPOINT_H_
6 #define CC_STUBS_INTPOINT_H_ 6 #define CC_STUBS_INTPOINT_H_
7 7
8 #include "IntSize.h" 8 #include "IntSize.h"
9 #if INSIDE_WEBKIT_BUILD 9 #if INSIDE_WEBKIT_BUILD
10 #include "Source/WebCore/platform/graphics/IntPoint.h" 10 #include "Source/WebCore/platform/graphics/IntPoint.h"
11 #else 11 #else
12 #include "third_party/WebKit/Source/WebCore/platform/graphics/IntPoint.h" 12 #include "third_party/WebKit/Source/WebCore/platform/graphics/IntPoint.h"
13 #endif 13 #endif
14 #include "ui/gfx/point.h"
14 15
15 namespace cc { 16 namespace cc {
16 17
17 class IntPoint : public WebCore::IntPoint { 18 class IntPoint : public WebCore::IntPoint {
18 public: 19 public:
19 IntPoint() { } 20 IntPoint() { }
20 21
21 IntPoint(int width, int height) 22 IntPoint(int width, int height)
22 : WebCore::IntPoint(width, height) 23 : WebCore::IntPoint(width, height)
23 { 24 {
24 } 25 }
25 26
26 IntPoint(IntSize size) 27 IntPoint(IntSize size)
27 : WebCore::IntPoint(size.width(), size.height()) 28 : WebCore::IntPoint(size.width(), size.height())
28 { 29 {
29 } 30 }
30 31
31 IntPoint(WebCore::IntPoint point) 32 IntPoint(WebCore::IntPoint point)
32 : WebCore::IntPoint(point.x(), point.y()) 33 : WebCore::IntPoint(point.x(), point.y())
33 { 34 {
34 35
35 } 36 }
37
38 operator gfx::Point() const { return gfx::Point(x(), y()); }
36 }; 39 };
37 40
38 } 41 }
39 42
40 #endif 43 #endif
OLDNEW
« no previous file with comments | « cc/stubs/float_size.h ('k') | cc/stubs/int_rect.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698