diff options
author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-10 17:28:06 +0000 |
---|---|---|
committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-10 17:28:06 +0000 |
commit | 77030daf904058dbb76ab58525b778eb52150f2e (patch) | |
tree | 049bbaa2c93c16ad38cebb1f57467d919048af79 /gfx | |
parent | 686b9aa07189787576c5bc1bccc002c8bd4f08af (diff) | |
download | chromium_src-77030daf904058dbb76ab58525b778eb52150f2e.zip chromium_src-77030daf904058dbb76ab58525b778eb52150f2e.tar.gz chromium_src-77030daf904058dbb76ab58525b778eb52150f2e.tar.bz2 |
FBTF: Minor gfx/ header cleanup.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/3034039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55577 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gfx')
-rw-r--r-- | gfx/blit.h | 2 | ||||
-rw-r--r-- | gfx/blit_unittest.cc | 2 | ||||
-rw-r--r-- | gfx/canvas.h | 1 | ||||
-rw-r--r-- | gfx/canvas_direct2d.cc | 1 | ||||
-rw-r--r-- | gfx/canvas_direct2d_unittest.cc | 1 | ||||
-rw-r--r-- | gfx/canvas_skia.cc | 1 | ||||
-rw-r--r-- | gfx/path.cc | 8 | ||||
-rw-r--r-- | gfx/path.h | 4 |
8 files changed, 16 insertions, 4 deletions
@@ -7,8 +7,6 @@ #pragma once #include "gfx/native_widget_types.h" -#include "gfx/point.h" -#include "gfx/rect.h" namespace skia { class PlatformCanvas; diff --git a/gfx/blit_unittest.cc b/gfx/blit_unittest.cc index c5bff1e..cea3296 100644 --- a/gfx/blit_unittest.cc +++ b/gfx/blit_unittest.cc @@ -4,6 +4,8 @@ #include "base/basictypes.h" #include "gfx/blit.h" +#include "gfx/point.h" +#include "gfx/rect.h" #include "skia/ext/platform_canvas.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/gfx/canvas.h b/gfx/canvas.h index de06e73..8699807 100644 --- a/gfx/canvas.h +++ b/gfx/canvas.h @@ -8,7 +8,6 @@ #include <string> -#include "gfx/brush.h" #include "gfx/native_widget_types.h" // TODO(beng): remove this include when we no longer depend on SkTypes. #include "skia/ext/platform_canvas.h" diff --git a/gfx/canvas_direct2d.cc b/gfx/canvas_direct2d.cc index 633ea9f..dbd1287 100644 --- a/gfx/canvas_direct2d.cc +++ b/gfx/canvas_direct2d.cc @@ -5,6 +5,7 @@ #include "gfx/canvas_direct2d.h" #include "base/scoped_ptr.h" +#include "gfx/brush.h" #include "gfx/rect.h" namespace { diff --git a/gfx/canvas_direct2d_unittest.cc b/gfx/canvas_direct2d_unittest.cc index 6595a4c..95f4398 100644 --- a/gfx/canvas_direct2d_unittest.cc +++ b/gfx/canvas_direct2d_unittest.cc @@ -11,6 +11,7 @@ #include "base/ref_counted_memory.h" #include "base/resource_util.h" #include "base/scoped_ptr.h" +#include "gfx/brush.h" #include "gfx/canvas_direct2d.h" #include "gfx/canvas_skia.h" #include "gfx/codec/png_codec.h" diff --git a/gfx/canvas_skia.cc b/gfx/canvas_skia.cc index f2c344c..d46e519 100644 --- a/gfx/canvas_skia.cc +++ b/gfx/canvas_skia.cc @@ -8,6 +8,7 @@ #include "base/i18n/rtl.h" #include "base/logging.h" +#include "gfx/brush.h" #include "gfx/font.h" #include "gfx/rect.h" #include "third_party/skia/include/effects/SkGradientShader.h" diff --git a/gfx/path.cc b/gfx/path.cc index 10d1ddd..e456679 100644 --- a/gfx/path.cc +++ b/gfx/path.cc @@ -8,6 +8,11 @@ namespace gfx { +Path::Path() + : SkPath() { + moveTo(0, 0); +} + Path::Path(const Point* points, size_t count) { DCHECK(count > 1); moveTo(SkIntToScalar(points[0].x), SkIntToScalar(points[0].y)); @@ -15,4 +20,7 @@ Path::Path(const Point* points, size_t count) { lineTo(SkIntToScalar(points[i].x), SkIntToScalar(points[i].y)); } +Path::~Path() { +} + } // namespace gfx @@ -21,11 +21,13 @@ class Path : public SkPath { int y; }; - Path() : SkPath() { moveTo(0, 0); } + 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. |