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

Unified Diff: gfx/path.h

Issue 6246027: Move src/gfx/ to src/ui/gfx... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gfx/native_widget_types_gtk.cc ('k') | gfx/path.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gfx/path.h
===================================================================
--- gfx/path.h (revision 73487)
+++ gfx/path.h (working copy)
@@ -6,52 +6,7 @@
#define GFX_PATH_H_
#pragma once
-#include "base/basictypes.h"
-#include "gfx/native_widget_types.h"
+#include "ui/gfx/path.h"
+// TODO(sail): remove this file once all includes have been updated.
-#include "third_party/skia/include/core/SkPath.h"
-
-namespace gfx {
-
-class Path : public SkPath {
- public:
- // Used by Path(Point,size_t) constructor.
- struct Point {
- int x;
- int y;
- };
-
- Path();
-
- // Creates a path populated with the specified points.
- Path(const Point* points, size_t count);
-
- ~Path();
-
-#if defined(OS_WIN) || defined(USE_X11)
- // Creates a NativeRegion from the path. The caller is responsible for freeing
- // resources used by this region. This only supports polygon paths.
- NativeRegion CreateNativeRegion() const;
-
- // Returns the intersection of the two regions. The caller owns the returned
- // object.
- static gfx::NativeRegion IntersectRegions(gfx::NativeRegion r1,
- gfx::NativeRegion r2);
-
- // Returns the union of the two regions. The caller owns the returned object.
- static gfx::NativeRegion CombineRegions(gfx::NativeRegion r1,
- gfx::NativeRegion r2);
-
- // Returns the difference of the two regions. The caller owns the returned
- // object.
- static gfx::NativeRegion SubtractRegion(gfx::NativeRegion r1,
- gfx::NativeRegion r2);
-#endif
-
- private:
- DISALLOW_COPY_AND_ASSIGN(Path);
-};
-
-}
-
#endif // GFX_PATH_H_
« no previous file with comments | « gfx/native_widget_types_gtk.cc ('k') | gfx/path.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698