Make RenderPass::Id an isolated class
Move RenderPass::Id out of RenderPass and make it an isolated class
called RenderPassId, so RenderPassDrawQuad and AppendQuadsData will not
need to depend on entire RenderPass class.
BUG=344962
Review URL: https://codereview.chromium.org/404563005
Cr-Commit-Position: refs/heads/master@{#291403}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@291403 0039d316-1c4b-4281-b951-d872f2087c98
CrOS-Libchrome-Original-Commit: 0cd7d6f7eb5aaf054e123a2281f6b1067c03655b
diff --git a/mojo/examples/surfaces_app/child_gl_impl.cc b/mojo/examples/surfaces_app/child_gl_impl.cc
index e669761..ec135fe 100644
--- a/mojo/examples/surfaces_app/child_gl_impl.cc
+++ b/mojo/examples/surfaces_app/child_gl_impl.cc
@@ -32,6 +32,7 @@
namespace examples {
using cc::RenderPass;
+using cc::RenderPassId;
using cc::DrawQuad;
using cc::TextureDrawQuad;
using cc::DelegatedFrameData;
@@ -142,7 +143,7 @@
resource.is_software = false;
gfx::Rect rect(size_);
- RenderPass::Id id(1, 1);
+ RenderPassId id(1, 1);
scoped_ptr<RenderPass> pass = RenderPass::Create();
pass->SetNew(id, rect, rect, gfx::Transform());
diff --git a/mojo/examples/surfaces_app/child_impl.cc b/mojo/examples/surfaces_app/child_impl.cc
index 578c65c..afefe09 100644
--- a/mojo/examples/surfaces_app/child_impl.cc
+++ b/mojo/examples/surfaces_app/child_impl.cc
@@ -22,6 +22,7 @@
namespace examples {
using cc::RenderPass;
+using cc::RenderPassId;
using cc::DrawQuad;
using cc::SolidColorDrawQuad;
using cc::DelegatedFrameData;
@@ -63,7 +64,7 @@
surface_->CreateSurface(mojo::SurfaceId::From(id_),
mojo::Size::From(size_));
gfx::Rect rect(size_);
- RenderPass::Id id(1, 1);
+ RenderPassId id(1, 1);
scoped_ptr<RenderPass> pass = RenderPass::Create();
pass->SetNew(id, rect, rect, gfx::Transform());
diff --git a/mojo/examples/surfaces_app/embedder.cc b/mojo/examples/surfaces_app/embedder.cc
index 1896717..683d4b9 100644
--- a/mojo/examples/surfaces_app/embedder.cc
+++ b/mojo/examples/surfaces_app/embedder.cc
@@ -20,6 +20,7 @@
namespace examples {
using cc::RenderPass;
+using cc::RenderPassId;
using cc::SurfaceDrawQuad;
using cc::DrawQuad;
using cc::SolidColorDrawQuad;
@@ -38,7 +39,7 @@
const gfx::Size& size,
int offset) {
gfx::Rect rect(size);
- RenderPass::Id pass_id(1, 1);
+ RenderPassId pass_id(1, 1);
scoped_ptr<RenderPass> pass = RenderPass::Create();
pass->SetNew(pass_id, rect, rect, gfx::Transform());
diff --git a/mojo/services/public/cpp/surfaces/lib/surfaces_type_converters.cc b/mojo/services/public/cpp/surfaces/lib/surfaces_type_converters.cc
index 309d1a1..6b39d9c 100644
--- a/mojo/services/public/cpp/surfaces/lib/surfaces_type_converters.cc
+++ b/mojo/services/public/cpp/surfaces/lib/surfaces_type_converters.cc
@@ -259,7 +259,7 @@
// static
scoped_ptr<cc::RenderPass> ConvertTo(const PassPtr& input) {
scoped_ptr<cc::RenderPass> pass = cc::RenderPass::Create();
- pass->SetAll(cc::RenderPass::Id(1, input->id),
+ pass->SetAll(cc::RenderPassId(1, input->id),
input->output_rect.To<gfx::Rect>(),
input->damage_rect.To<gfx::Rect>(),
input->transform_to_root_target.To<gfx::Transform>(),
diff --git a/mojo/services/public/cpp/surfaces/tests/surface_unittest.cc b/mojo/services/public/cpp/surfaces/tests/surface_unittest.cc
index bc933c3..f269d4e 100644
--- a/mojo/services/public/cpp/surfaces/tests/surface_unittest.cc
+++ b/mojo/services/public/cpp/surfaces/tests/surface_unittest.cc
@@ -203,7 +203,7 @@
TEST(SurfaceLibTest, RenderPass) {
scoped_ptr<cc::RenderPass> pass = cc::RenderPass::Create();
- cc::RenderPass::Id pass_id(1, 6);
+ cc::RenderPassId pass_id(1, 6);
gfx::Rect output_rect(4, 9, 13, 71);
gfx::Rect damage_rect(9, 17, 41, 45);
gfx::Transform transform_to_root_target;