added GetImageInfo() method to DlCanvas

Author: flar

display_list/display_list_builder.cc

@@ -98,6 +98,15 @@ DisplayListBuilder::~DisplayListBuilder() {
   }
 }
 
+SkISize DisplayListBuilder::GetBaseLayerSize() const {
+  return tracker_.base_device_cull_rect().roundOut().size();
+}
+
+SkImageInfo DisplayListBuilder::GetImageInfo() const {
+  SkISize size = GetBaseLayerSize();
+  return SkImageInfo::MakeUnknown(size.width(), size.height());
+}
+
 void DisplayListBuilder::onSetAntiAlias(bool aa) {
   current_.setAntiAlias(aa);
   Push<SetAntiAliasOp>(0, 0, aa);

display_list/display_list_builder.h

@@ -41,9 +41,8 @@ class DisplayListBuilder final : public virtual DlCanvas,
   explicit DisplayListBuilder(const SkRect& cull_rect = kMaxCullRect,
                               bool prepare_rtree = false);
 
-  SkISize GetBaseLayerSize() const override {
-    return tracker_.base_device_cull_rect().roundOut().size();
-  }
+  SkISize GetBaseLayerSize() const override;
+  SkImageInfo GetImageInfo() const override;
 
   ~DisplayListBuilder();
 

display_list/display_list_unittests.cc

@@ -59,6 +59,18 @@ TEST(DisplayList, RecorderInitialClipBoundsNaN) {
   ASSERT_EQ(canvas->getDeviceClipBounds(), clip_bounds);
 }
 
+TEST(DisplayList, BuilderBoundsTransformComparedToSkia) {
+  const SkRect frame_rect = SkRect::MakeLTRB(10, 10, 100, 100);
+  DisplayListBuilder builder(frame_rect);
+  SkPictureRecorder recorder;
+  SkCanvas* canvas = recorder.beginRecording(frame_rect);
+  ASSERT_EQ(builder.GetDestinationClipBounds(),
+            SkRect::Make(canvas->getDeviceClipBounds()));
+  ASSERT_EQ(builder.GetLocalClipBounds().makeOutset(1, 1),
+            canvas->getLocalClipBounds());
+  ASSERT_EQ(builder.GetTransform(), canvas->getTotalMatrix());
+}
+
 TEST(DisplayList, RecorderClipBoundsAfterClipRect) {
   SkRect cull_rect = SkRect::MakeWH(100, 100);
   SkRect clip_rect = SkRect::MakeLTRB(10, 10, 20, 20);

display_list/dl_canvas.h

@@ -38,6 +38,7 @@ class DlCanvas {
   virtual ~DlCanvas() = default;
 
   virtual SkISize GetBaseLayerSize() const = 0;
+  virtual SkImageInfo GetImageInfo() const = 0;
 
   virtual void Save() = 0;
   virtual void SaveLayer(const SkRect* bounds,

display_list/skia/dl_sk_canvas.cc

@@ -87,6 +87,10 @@ SkISize DlSkCanvasAdapter::GetBaseLayerSize() const {
   return delegate_->getBaseLayerSize();
 }
 
+SkImageInfo DlSkCanvasAdapter::GetImageInfo() const {
+  return delegate_->imageInfo();
+}
+
 void DlSkCanvasAdapter::Save() {
   delegate_->save();
 }

display_list/skia/dl_sk_canvas.h

@@ -21,6 +21,7 @@ class DlSkCanvasAdapter final : public virtual DlCanvas {
   SkCanvas* canvas() { return delegate_; }
 
   SkISize GetBaseLayerSize() const override;
+  SkImageInfo GetImageInfo() const override;
 
   void Save() override;
   void SaveLayer(const SkRect* bounds,

flow/embedded_views.h

@@ -326,8 +326,10 @@ enum class PostPrerollResult {
 
 // The |EmbedderViewSlice| represents the details of recording all of
 // the layer tree rendering operations that appear between before, after
-// and between the embedded views. The Slice may be recorded into an
-// SkPicture or a DisplayListBuilder depending on the ScopedFrame.
+// and between the embedded views. The Slice used to abstract away
+// implementations that were based on either an SkPicture or a
+// DisplayListBuilder but more recently all of the embedder recordings
+// have standardized on the DisplayList.
 class EmbedderViewSlice {
  public:
   virtual ~EmbedderViewSlice() = default;

flow/layers/layer_tree.cc

@@ -30,8 +30,7 @@ LayerTree::LayerTree(const SkISize& frame_size, float device_pixel_ratio)
 }
 
 inline SkColorSpace* GetColorSpace(DlCanvas* canvas) {
-  // return canvas ? canvas->imageInfo().colorSpace() : nullptr;
-  return nullptr;
+  return canvas ? canvas->GetImageInfo().colorSpace() : nullptr;
 }
 
 bool LayerTree::Preroll(CompositorContext::ScopedFrame& frame,

testing/mock_canvas.cc

@@ -32,6 +32,11 @@ SkISize MockCanvas::GetBaseLayerSize() const {
   return tracker_.base_device_cull_rect().roundOut().size();
 }
 
+SkImageInfo MockCanvas::GetImageInfo() const {
+  SkISize size = GetBaseLayerSize();
+  return SkImageInfo::MakeUnknown(size.width(), size.height());
+}
+
 void MockCanvas::Save() {
   draw_calls_.emplace_back(
       DrawCall{current_layer_, SaveData{current_layer_ + 1}});

testing/mock_canvas.h

@@ -165,6 +165,7 @@ class MockCanvas final : public DlCanvas {
   void reset_draw_calls() { draw_calls_.clear(); }
 
   SkISize GetBaseLayerSize() const override;
+  SkImageInfo GetImageInfo() const override;
 
   void Save() override;
   void SaveLayer(const SkRect* bounds,