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

Unified Diff: cc/test/fake_delegated_renderer_layer_impl.cc

Issue 26023004: aura: Allow delegated frames to be used by more than one impl layer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: frameprovider: are_layers_attached checks Created 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/test/fake_delegated_renderer_layer.cc ('k') | cc/trees/layer_tree_host_unittest_context.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/test/fake_delegated_renderer_layer_impl.cc
diff --git a/cc/test/fake_delegated_renderer_layer_impl.cc b/cc/test/fake_delegated_renderer_layer_impl.cc
index 14d8062210b538f69863f5f4eb7bd3d338d2cea3..4057736a31250a8a99555d3dea055ae380d8fca7 100644
--- a/cc/test/fake_delegated_renderer_layer_impl.cc
+++ b/cc/test/fake_delegated_renderer_layer_impl.cc
@@ -8,6 +8,7 @@
#include "cc/output/delegated_frame_data.h"
#include "cc/quads/draw_quad.h"
#include "cc/resources/returned_resource.h"
+#include "cc/trees/layer_tree_impl.h"
namespace cc {
@@ -24,11 +25,12 @@ scoped_ptr<LayerImpl> FakeDelegatedRendererLayerImpl::CreateLayerImpl(
}
static ResourceProvider::ResourceId AddResourceToFrame(
+ ResourceProvider* resource_provider,
DelegatedFrameData* frame,
ResourceProvider::ResourceId resource_id) {
TransferableResource resource;
resource.id = resource_id;
- resource.target = GL_TEXTURE_2D;
+ resource.target = resource_provider->TargetForTesting(resource_id);
frame->resource_list.push_back(resource);
return resource_id;
}
@@ -50,9 +52,10 @@ void FakeDelegatedRendererLayerImpl::SetFrameDataForRenderPasses(
scoped_ptr<DelegatedFrameData> delegated_frame(new DelegatedFrameData);
delegated_frame->render_pass_list.swap(*pass_list);
+ ResourceProvider* resource_provider = layer_tree_impl()->resource_provider();
+
DrawQuad::ResourceIteratorCallback add_resource_to_frame_callback =
- base::Bind(&AddResourceToFrame,
- delegated_frame.get());
+ base::Bind(&AddResourceToFrame, resource_provider, delegated_frame.get());
for (size_t i = 0; i < delegated_frame->render_pass_list.size(); ++i) {
RenderPass* pass = delegated_frame->render_pass_list[i];
for (size_t j = 0; j < pass->quad_list.size(); ++j)
@@ -60,7 +63,7 @@ void FakeDelegatedRendererLayerImpl::SetFrameDataForRenderPasses(
}
CreateChildIdIfNeeded(base::Bind(&NoopReturnCallback));
- SetFrameData(delegated_frame.Pass(), gfx::RectF());
+ SetFrameData(delegated_frame.get(), gfx::RectF());
}
} // namespace cc
« no previous file with comments | « cc/test/fake_delegated_renderer_layer.cc ('k') | cc/trees/layer_tree_host_unittest_context.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698