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

Unified Diff: cc/layers/texture_layer_impl.cc

Issue 308193003: Removed QuadSink and MockQuadCuller (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@plumLayerImpl
Patch Set: rm unused line Created 6 years, 7 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
Index: cc/layers/texture_layer_impl.cc
diff --git a/cc/layers/texture_layer_impl.cc b/cc/layers/texture_layer_impl.cc
index f70754c9044f3c4057c19eea6153b9b6e18fdf71..887cb4d71fa18c98e85ddea055e76476e809cf4a 100644
--- a/cc/layers/texture_layer_impl.cc
+++ b/cc/layers/texture_layer_impl.cc
@@ -7,13 +7,13 @@
#include <vector>
#include "base/strings/stringprintf.h"
-#include "cc/layers/quad_sink.h"
#include "cc/output/renderer.h"
#include "cc/quads/texture_draw_quad.h"
#include "cc/resources/platform_color.h"
#include "cc/resources/scoped_resource.h"
#include "cc/resources/single_release_callback.h"
#include "cc/trees/layer_tree_impl.h"
+#include "cc/trees/occlusion_tracker.h"
namespace cc {
@@ -139,14 +139,17 @@ bool TextureLayerImpl::WillDraw(DrawMode draw_mode,
LayerImpl::WillDraw(draw_mode, resource_provider);
}
-void TextureLayerImpl::AppendQuads(QuadSink* quad_sink,
- AppendQuadsData* append_quads_data) {
+void TextureLayerImpl::AppendQuads(
+ RenderPass* render_pass,
+ const OcclusionTracker<LayerImpl>& occlusion_tracker,
+ AppendQuadsData* append_quads_data) {
DCHECK(external_texture_resource_ || valid_texture_copy_);
- SharedQuadState* shared_quad_state = quad_sink->CreateSharedQuadState();
+ SharedQuadState* shared_quad_state =
+ render_pass->CreateAndAppendSharedQuadState();
PopulateSharedQuadState(shared_quad_state);
- AppendDebugBorderQuad(quad_sink, shared_quad_state, append_quads_data);
+ AppendDebugBorderQuad(render_pass, shared_quad_state, append_quads_data);
SkColor bg_color = blend_background_color_ ?
background_color() : SK_ColorTRANSPARENT;
@@ -154,8 +157,10 @@ void TextureLayerImpl::AppendQuads(QuadSink* quad_sink,
gfx::Rect quad_rect(content_bounds());
gfx::Rect opaque_rect = opaque ? quad_rect : gfx::Rect();
- gfx::Rect visible_quad_rect = quad_sink->UnoccludedContentRect(
- this, quad_rect, draw_properties().target_space_transform);
+ gfx::Rect visible_quad_rect = occlusion_tracker.UnoccludedContentRect(
+ this->render_target(),
+ quad_rect,
+ draw_properties().target_space_transform);
if (visible_quad_rect.IsEmpty())
return;
@@ -173,7 +178,7 @@ void TextureLayerImpl::AppendQuads(QuadSink* quad_sink,
bg_color,
vertex_opacity_,
flipped_);
- quad_sink->Append(quad.PassAs<DrawQuad>());
+ render_pass->AppendDrawQuad(quad.PassAs<DrawQuad>());
}
Region TextureLayerImpl::VisibleContentOpaqueRegion() const {

Powered by Google App Engine
This is Rietveld 408576698