| Index: cc/layers/picture_layer_impl.cc
|
| diff --git a/cc/layers/picture_layer_impl.cc b/cc/layers/picture_layer_impl.cc
|
| index bd4aa0f788bd7620d53802614b34b68e20602b1d..ff7941a75f7ed3956eb8494a5e303dd37193422a 100644
|
| --- a/cc/layers/picture_layer_impl.cc
|
| +++ b/cc/layers/picture_layer_impl.cc
|
| @@ -12,6 +12,7 @@
|
| #include "cc/layers/quad_sink.h"
|
| #include "cc/quads/checkerboard_draw_quad.h"
|
| #include "cc/quads/debug_border_draw_quad.h"
|
| +#include "cc/quads/picture_draw_quad.h"
|
| #include "cc/quads/solid_color_draw_quad.h"
|
| #include "cc/quads/tile_draw_quad.h"
|
| #include "cc/trees/layer_tree_impl.h"
|
| @@ -120,6 +121,9 @@ void PictureLayerImpl::AppendQuads(QuadSink* quadSink,
|
| mode == ManagedTileState::DrawingInfo::TRANSPARENT_MODE) {
|
| color = DebugColors::SolidColorTileBorderColor();
|
| width = DebugColors::SolidColorTileBorderWidth(layer_tree_impl());
|
| + } else if (mode == ManagedTileState::DrawingInfo::PICTURE_PILE_MODE) {
|
| + color = DebugColors::PictureTileBorderColor();
|
| + width = DebugColors::PictureTileBorderWidth(layer_tree_impl());
|
| } else if (iter->priority(ACTIVE_TREE).resolution == HIGH_RESOLUTION) {
|
| color = DebugColors::HighResTileBorderColor();
|
| width = DebugColors::HighResTileBorderWidth(layer_tree_impl());
|
| @@ -180,7 +184,8 @@ void PictureLayerImpl::AppendQuads(QuadSink* quadSink,
|
|
|
| const ManagedTileState::DrawingInfo& drawing_info = iter->drawing_info();
|
| switch (drawing_info.mode()) {
|
| - case ManagedTileState::DrawingInfo::TEXTURE_MODE: {
|
| + case ManagedTileState::DrawingInfo::TEXTURE_MODE:
|
| + case ManagedTileState::DrawingInfo::PICTURE_PILE_MODE: {
|
| if (iter->contents_scale() != ideal_contents_scale_)
|
| appendQuadsData->hadIncompleteTile = true;
|
|
|
| @@ -188,15 +193,30 @@ void PictureLayerImpl::AppendQuads(QuadSink* quadSink,
|
| gfx::Rect opaque_rect = iter->opaque_rect();
|
| opaque_rect.Intersect(content_rect);
|
|
|
| - scoped_ptr<TileDrawQuad> quad = TileDrawQuad::Create();
|
| - quad->SetNew(sharedQuadState,
|
| - geometry_rect,
|
| - opaque_rect,
|
| - drawing_info.get_resource_id(),
|
| - texture_rect,
|
| - iter.texture_size(),
|
| - drawing_info.contents_swizzled());
|
| - quadSink->Append(quad.PassAs<DrawQuad>(), appendQuadsData);
|
| + if (drawing_info.mode() ==
|
| + ManagedTileState::DrawingInfo::TEXTURE_MODE) {
|
| + scoped_ptr<TileDrawQuad> quad = TileDrawQuad::Create();
|
| + quad->SetNew(sharedQuadState,
|
| + geometry_rect,
|
| + opaque_rect,
|
| + drawing_info.get_resource_id(),
|
| + texture_rect,
|
| + iter.texture_size(),
|
| + drawing_info.contents_swizzled());
|
| + quadSink->Append(quad.PassAs<DrawQuad>(), appendQuadsData);
|
| + } else {
|
| + scoped_ptr<PictureDrawQuad> quad = PictureDrawQuad::Create();
|
| + quad->SetNew(sharedQuadState,
|
| + geometry_rect,
|
| + opaque_rect,
|
| + texture_rect,
|
| + iter.texture_size(),
|
| + drawing_info.contents_swizzled(),
|
| + iter->content_rect(),
|
| + iter->contents_scale(),
|
| + pile_);
|
| + quadSink->Append(quad.PassAs<DrawQuad>(), appendQuadsData);
|
| + }
|
| break;
|
| }
|
| case ManagedTileState::DrawingInfo::SOLID_COLOR_MODE: {
|
| @@ -209,8 +229,6 @@ void PictureLayerImpl::AppendQuads(QuadSink* quadSink,
|
| }
|
| case ManagedTileState::DrawingInfo::TRANSPARENT_MODE:
|
| break;
|
| - case ManagedTileState::DrawingInfo::PICTURE_PILE_MODE:
|
| - // TODO: crbug.com/173011 would fill this part in.
|
| default:
|
| NOTREACHED();
|
| }
|
|
|