summaryrefslogtreecommitdiffstats
path: root/cc/quads
diff options
context:
space:
mode:
authorheejin.r.chung <heejin.r.chung@samsung.com>2014-10-23 09:36:20 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-23 16:36:44 +0000
commitd28506ba1497a3f5fa5b9f6702892cb1cb58ea15 (patch)
tree94f6bc3ab76eb146d4414d2e9f6821c0025ced5c /cc/quads
parent8d00df06667a84206db7b750aba89e0e7cb8a737 (diff)
downloadchromium_src-d28506ba1497a3f5fa5b9f6702892cb1cb58ea15.zip
chromium_src-d28506ba1497a3f5fa5b9f6702892cb1cb58ea15.tar.gz
chromium_src-d28506ba1497a3f5fa5b9f6702892cb1cb58ea15.tar.bz2
cc cleanup: Update paths to geometry headers
Geometry headers were moved from /ui/gfx/ to ui/gfx/geometry. Updating includes accordingly. BUG=395370 Review URL: https://codereview.chromium.org/660333004 Cr-Commit-Position: refs/heads/master@{#300902}
Diffstat (limited to 'cc/quads')
-rw-r--r--cc/quads/content_draw_quad_base.h4
-rw-r--r--cc/quads/draw_polygon.h6
-rw-r--r--cc/quads/draw_quad.cc2
-rw-r--r--cc/quads/io_surface_draw_quad.h2
-rw-r--r--cc/quads/picture_draw_quad.h6
-rw-r--r--cc/quads/render_pass.h4
-rw-r--r--cc/quads/shared_quad_state.h2
-rw-r--r--cc/quads/texture_draw_quad.cc2
-rw-r--r--cc/quads/texture_draw_quad.h2
9 files changed, 15 insertions, 15 deletions
diff --git a/cc/quads/content_draw_quad_base.h b/cc/quads/content_draw_quad_base.h
index 6917e6b..b0e53dc 100644
--- a/cc/quads/content_draw_quad_base.h
+++ b/cc/quads/content_draw_quad_base.h
@@ -9,8 +9,8 @@
#include "cc/base/cc_export.h"
#include "cc/quads/draw_quad.h"
#include "third_party/khronos/GLES2/gl2.h"
-#include "ui/gfx/point.h"
-#include "ui/gfx/size.h"
+#include "ui/gfx/geometry/point.h"
+#include "ui/gfx/geometry/size.h"
namespace cc {
diff --git a/cc/quads/draw_polygon.h b/cc/quads/draw_polygon.h
index a1a6e83..32643ee 100644
--- a/cc/quads/draw_polygon.h
+++ b/cc/quads/draw_polygon.h
@@ -9,10 +9,10 @@
#include "cc/base/math_util.h"
#include "cc/output/bsp_compare_result.h"
+#include "ui/gfx/geometry/point3_f.h"
+#include "ui/gfx/geometry/quad_f.h"
+#include "ui/gfx/geometry/rect_f.h"
#include "ui/gfx/geometry/vector3d_f.h"
-#include "ui/gfx/point3_f.h"
-#include "ui/gfx/quad_f.h"
-#include "ui/gfx/rect_f.h"
#include "ui/gfx/transform.h"
namespace cc {
diff --git a/cc/quads/draw_quad.cc b/cc/quads/draw_quad.cc
index 38b24b0..7322a7a 100644
--- a/cc/quads/draw_quad.cc
+++ b/cc/quads/draw_quad.cc
@@ -20,7 +20,7 @@
#include "cc/quads/texture_draw_quad.h"
#include "cc/quads/tile_draw_quad.h"
#include "cc/quads/yuv_video_draw_quad.h"
-#include "ui/gfx/quad_f.h"
+#include "ui/gfx/geometry/quad_f.h"
namespace cc {
diff --git a/cc/quads/io_surface_draw_quad.h b/cc/quads/io_surface_draw_quad.h
index 9c8b50b..ba64384 100644
--- a/cc/quads/io_surface_draw_quad.h
+++ b/cc/quads/io_surface_draw_quad.h
@@ -8,7 +8,7 @@
#include "base/memory/scoped_ptr.h"
#include "cc/base/cc_export.h"
#include "cc/quads/draw_quad.h"
-#include "ui/gfx/size.h"
+#include "ui/gfx/geometry/size.h"
namespace cc {
diff --git a/cc/quads/picture_draw_quad.h b/cc/quads/picture_draw_quad.h
index d2a7271..1bea1a2 100644
--- a/cc/quads/picture_draw_quad.h
+++ b/cc/quads/picture_draw_quad.h
@@ -10,9 +10,9 @@
#include "cc/base/cc_export.h"
#include "cc/quads/content_draw_quad_base.h"
#include "cc/resources/picture_pile_impl.h"
-#include "ui/gfx/rect.h"
-#include "ui/gfx/rect_f.h"
-#include "ui/gfx/size.h"
+#include "ui/gfx/geometry/rect.h"
+#include "ui/gfx/geometry/rect_f.h"
+#include "ui/gfx/geometry/size.h"
namespace cc {
diff --git a/cc/quads/render_pass.h b/cc/quads/render_pass.h
index 65c712d..76536b5 100644
--- a/cc/quads/render_pass.h
+++ b/cc/quads/render_pass.h
@@ -15,8 +15,8 @@
#include "cc/quads/list_container.h"
#include "cc/quads/render_pass_id.h"
#include "skia/ext/refptr.h"
-#include "ui/gfx/rect.h"
-#include "ui/gfx/rect_f.h"
+#include "ui/gfx/geometry/rect.h"
+#include "ui/gfx/geometry/rect_f.h"
#include "ui/gfx/transform.h"
namespace base {
diff --git a/cc/quads/shared_quad_state.h b/cc/quads/shared_quad_state.h
index dde87a8..ebf7d11 100644
--- a/cc/quads/shared_quad_state.h
+++ b/cc/quads/shared_quad_state.h
@@ -8,7 +8,7 @@
#include "base/memory/scoped_ptr.h"
#include "cc/base/cc_export.h"
#include "third_party/skia/include/core/SkXfermode.h"
-#include "ui/gfx/rect.h"
+#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/transform.h"
namespace base {
diff --git a/cc/quads/texture_draw_quad.cc b/cc/quads/texture_draw_quad.cc
index 72435c2..9ff9744 100644
--- a/cc/quads/texture_draw_quad.cc
+++ b/cc/quads/texture_draw_quad.cc
@@ -8,7 +8,7 @@
#include "base/logging.h"
#include "base/values.h"
#include "cc/base/math_util.h"
-#include "ui/gfx/vector2d_f.h"
+#include "ui/gfx/geometry/vector2d_f.h"
namespace cc {
diff --git a/cc/quads/texture_draw_quad.h b/cc/quads/texture_draw_quad.h
index 3e0632c..9137d51 100644
--- a/cc/quads/texture_draw_quad.h
+++ b/cc/quads/texture_draw_quad.h
@@ -8,7 +8,7 @@
#include "base/memory/scoped_ptr.h"
#include "cc/base/cc_export.h"
#include "cc/quads/draw_quad.h"
-#include "ui/gfx/rect_f.h"
+#include "ui/gfx/geometry/rect_f.h"
namespace cc {