1 files changed, 103 insertions, 67 deletions

diff --git a/chromium/cc/layers/picture_layer.cc b/chromium/cc/layers/picture_layer.cc
index c56ff8be082..999363282a0 100644
--- a/chromium/cc/layers/picture_layer.cc
+++ b/chromium/cc/layers/picture_layer.cc
@@ -7,6 +7,9 @@
 #include "base/auto_reset.h"
 #include "cc/layers/content_layer_client.h"
 #include "cc/layers/picture_layer_impl.h"
+#include "cc/playback/display_list_recording_source.h"
+#include "cc/playback/picture_pile.h"
+#include "cc/trees/layer_tree_host.h"
 #include "cc/trees/layer_tree_impl.h"
 #include "third_party/skia/include/core/SkPictureRecorder.h"
 #include "ui/gfx/geometry/rect_conversions.h"
@@ -21,55 +24,83 @@ PictureLayer::PictureLayer(ContentLayerClient* client)
     : client_(client),
       instrumentation_object_tracker_(id()),
       update_source_frame_number_(-1),
-      can_use_lcd_text_last_frame_(can_use_lcd_text()) {
+      is_mask_(false),
+      nearest_neighbor_(false) {
+}
+
+PictureLayer::PictureLayer(ContentLayerClient* client,
+                           scoped_ptr<RecordingSource> source)
+    : PictureLayer(client) {
+  recording_source_ = source.Pass();
 }
 
 PictureLayer::~PictureLayer() {
 }
 
 scoped_ptr<LayerImpl> PictureLayer::CreateLayerImpl(LayerTreeImpl* tree_impl) {
-  return PictureLayerImpl::Create(tree_impl, id());
+  return PictureLayerImpl::Create(tree_impl, id(), is_mask_,
+                                  new LayerImpl::SyncedScrollOffset);
 }
 
 void PictureLayer::PushPropertiesTo(LayerImpl* base_layer) {
   Layer::PushPropertiesTo(base_layer);
   PictureLayerImpl* layer_impl = static_cast<PictureLayerImpl*>(base_layer);
+  // TODO(danakj): Make is_mask_ a constructor parameter for PictureLayer.
+  DCHECK_EQ(layer_impl->is_mask(), is_mask_);
 
   int source_frame_number = layer_tree_host()->source_frame_number();
   gfx::Size impl_bounds = layer_impl->bounds();
-  gfx::Size pile_bounds = pile_.tiling_size();
+  gfx::Size recording_source_bounds = recording_source_->GetSize();
 
-  // If update called, then pile size must match bounds pushed to impl layer.
+  // If update called, then recording source size must match bounds pushed to
+  // impl layer.
   DCHECK_IMPLIES(update_source_frame_number_ == source_frame_number,
-                 impl_bounds == pile_bounds)
-      << " bounds " << impl_bounds.ToString() << " pile "
-      << pile_bounds.ToString();
+                 impl_bounds == recording_source_bounds)
+      << " bounds " << impl_bounds.ToString() << " recording source "
+      << recording_source_bounds.ToString();
 
   if (update_source_frame_number_ != source_frame_number &&
-      pile_bounds != impl_bounds) {
+      recording_source_bounds != impl_bounds) {
     // Update may not get called for the layer (if it's not in the viewport
-    // for example, even though it has resized making the pile no longer
-    // valid. In this case just destroy the pile.
-    pile_.SetEmptyBounds();
+    // for example, even though it has resized making the recording source no
+    // longer valid. In this case just destroy the recording source.
+    recording_source_->SetEmptyBounds();
   }
 
-  // Unlike other properties, invalidation must always be set on layer_impl.
-  // See PictureLayerImpl::PushPropertiesTo for more details.
-  layer_impl->invalidation_.Clear();
-  layer_impl->invalidation_.Swap(&pile_invalidation_);
-  layer_impl->UpdatePile(PicturePileImpl::CreateFromOther(&pile_));
+  layer_impl->SetNearestNeighbor(nearest_neighbor_);
+
+  // Preserve lcd text settings from the current raster source.
+  bool can_use_lcd_text = layer_impl->RasterSourceUsesLCDText();
+  scoped_refptr<RasterSource> raster_source =
+      recording_source_->CreateRasterSource(can_use_lcd_text);
+  layer_impl->set_gpu_raster_max_texture_size(
+      layer_tree_host()->device_viewport_size());
+  layer_impl->UpdateRasterSource(raster_source, &recording_invalidation_,
+                                 nullptr);
+  DCHECK(recording_invalidation_.IsEmpty());
 }
 
 void PictureLayer::SetLayerTreeHost(LayerTreeHost* host) {
   Layer::SetLayerTreeHost(host);
-  if (host) {
-    pile_.SetMinContentsScale(host->settings().minimum_contents_scale);
-    pile_.SetTileGridSize(host->settings().default_tile_grid_size);
-    pile_.set_slow_down_raster_scale_factor(
-        host->debug_state().slow_down_raster_scale_factor);
-    pile_.set_show_debug_picture_borders(
-        host->debug_state().show_picture_borders);
+  if (!host)
+    return;
+
+  const LayerTreeSettings& settings = layer_tree_host()->settings();
+  if (!recording_source_) {
+    if (settings.use_display_lists) {
+      recording_source_.reset(new DisplayListRecordingSource(
+          settings.default_tile_grid_size,
+          settings.use_cached_picture_in_display_list));
+    } else {
+      recording_source_.reset(new PicturePile(settings.minimum_contents_scale,
+                                              settings.default_tile_grid_size));
+    }
   }
+  recording_source_->SetSlowdownRasterScaleFactor(
+      host->debug_state().slow_down_raster_scale_factor);
+  recording_source_->SetGatherPixelRefs(settings.gather_pixel_refs);
+
+  DCHECK(settings.raster_enabled);
 }
 
 void PictureLayer::SetNeedsDisplayRect(const gfx::Rect& layer_rect) {
@@ -86,22 +117,21 @@ bool PictureLayer::Update(ResourceUpdateQueue* queue,
   update_source_frame_number_ = layer_tree_host()->source_frame_number();
   bool updated = Layer::Update(queue, occlusion);
 
-  {
-    base::AutoReset<bool> ignore_set_needs_commit(&ignore_set_needs_commit_,
-                                                  true);
-    UpdateCanUseLCDText();
-  }
-
   gfx::Rect visible_layer_rect = gfx::ScaleToEnclosingRect(
       visible_content_rect(), 1.f / contents_scale_x());
   gfx::Size layer_size = paint_properties().bounds;
 
   if (last_updated_visible_content_rect_ == visible_content_rect() &&
-      pile_.tiling_size() == layer_size && pending_invalidation_.IsEmpty()) {
+      recording_source_->GetSize() == layer_size &&
+      pending_invalidation_.IsEmpty()) {
     // Only early out if the visible content rect of this layer hasn't changed.
     return updated;
   }
 
+  recording_source_->SetBackgroundColor(SafeOpaqueBackgroundColor());
+  recording_source_->SetRequiresClear(!contents_opaque() &&
+                                      !client_->FillsBoundsCompletely());
+
   TRACE_EVENT1("cc", "PictureLayer::Update",
                "source_frame_number",
                layer_tree_host()->source_frame_number());
@@ -110,7 +140,7 @@ bool PictureLayer::Update(ResourceUpdateQueue* queue,
 
   // Calling paint in WebKit can sometimes cause invalidations, so save
   // off the invalidation prior to calling update.
-  pending_invalidation_.Swap(&pile_invalidation_);
+  pending_invalidation_.Swap(&recording_invalidation_);
   pending_invalidation_.Clear();
 
   if (layer_tree_host()->settings().record_full_layer) {
@@ -124,68 +154,66 @@ bool PictureLayer::Update(ResourceUpdateQueue* queue,
   // to the impl side so that it drops tiles that may not have a recording
   // for them.
   DCHECK(client_);
-  updated |=
-      pile_.UpdateAndExpandInvalidation(client_,
-                                        &pile_invalidation_,
-                                        SafeOpaqueBackgroundColor(),
-                                        contents_opaque(),
-                                        client_->FillsBoundsCompletely(),
-                                        layer_size,
-                                        visible_layer_rect,
-                                        update_source_frame_number_,
-                                        Picture::RECORD_NORMALLY,
-                                        rendering_stats_instrumentation());
+  updated |= recording_source_->UpdateAndExpandInvalidation(
+      client_, &recording_invalidation_, layer_size, visible_layer_rect,
+      update_source_frame_number_, RecordingSource::RECORD_NORMALLY);
   last_updated_visible_content_rect_ = visible_content_rect();
 
   if (updated) {
     SetNeedsPushProperties();
   } else {
-    // If this invalidation did not affect the pile, then it can be cleared as
-    // an optimization.
-    pile_invalidation_.Clear();
+    // If this invalidation did not affect the recording source, then it can be
+    // cleared as an optimization.
+    recording_invalidation_.Clear();
   }
 
   return updated;
 }
 
 void PictureLayer::SetIsMask(bool is_mask) {
-  pile_.set_is_mask(is_mask);
-}
-
-bool PictureLayer::SupportsLCDText() const {
-  return true;
-}
-
-void PictureLayer::UpdateCanUseLCDText() {
-  if (can_use_lcd_text_last_frame_ == can_use_lcd_text())
-    return;
-
-  can_use_lcd_text_last_frame_ = can_use_lcd_text();
-  if (client_)
-    client_->DidChangeLayerCanUseLCDText();
+  is_mask_ = is_mask;
 }
 
 skia::RefPtr<SkPicture> PictureLayer::GetPicture() const {
-  // We could either flatten the PicturePile into a single SkPicture,
+  // We could either flatten the RecordingSource into a single SkPicture,
   // or paint a fresh one depending on what we intend to do with the
   // picture. For now we just paint a fresh one to get consistent results.
   if (!DrawsContent())
     return skia::RefPtr<SkPicture>();
 
-  int width = bounds().width();
-  int height = bounds().height();
+  gfx::Size layer_size = bounds();
+  const LayerTreeSettings& settings = layer_tree_host()->settings();
+
+  if (settings.use_display_lists) {
+    scoped_ptr<RecordingSource> recording_source;
+    recording_source.reset(new DisplayListRecordingSource(
+        settings.default_tile_grid_size,
+        settings.use_cached_picture_in_display_list));
+    Region recording_invalidation;
+    recording_source->UpdateAndExpandInvalidation(
+        client_, &recording_invalidation, layer_size, gfx::Rect(layer_size),
+        update_source_frame_number_, RecordingSource::RECORD_NORMALLY);
+
+    scoped_refptr<RasterSource> raster_source =
+        recording_source->CreateRasterSource(false);
+
+    return raster_source->GetFlattenedPicture();
+  }
+
+  int width = layer_size.width();
+  int height = layer_size.height();
 
   SkPictureRecorder recorder;
   SkCanvas* canvas = recorder.beginRecording(width, height, nullptr, 0);
-  client_->PaintContents(canvas,
-                         gfx::Rect(width, height),
-                         ContentLayerClient::GRAPHICS_CONTEXT_ENABLED);
-  skia::RefPtr<SkPicture> picture = skia::AdoptRef(recorder.endRecording());
+  client_->PaintContents(canvas, gfx::Rect(width, height),
+                         ContentLayerClient::PAINTING_BEHAVIOR_NORMAL);
+  skia::RefPtr<SkPicture> picture =
+      skia::AdoptRef(recorder.endRecordingAsPicture());
   return picture;
 }
 
 bool PictureLayer::IsSuitableForGpuRasterization() const {
-  return pile_.is_suitable_for_gpu_rasterization();
+  return recording_source_->IsSuitableForGpuRasterization();
 }
 
 void PictureLayer::ClearClient() {
@@ -193,6 +221,14 @@ void PictureLayer::ClearClient() {
   UpdateDrawsContent(HasDrawableContent());
 }
 
+void PictureLayer::SetNearestNeighbor(bool nearest_neighbor) {
+  if (nearest_neighbor_ == nearest_neighbor)
+    return;
+
+  nearest_neighbor_ = nearest_neighbor;
+  SetNeedsCommit();
+}
+
 bool PictureLayer::HasDrawableContent() const {
   return client_ && Layer::HasDrawableContent();
 }