summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cc/cc.gyp1
-rw-r--r--cc/debug/rasterize_and_record_benchmark.cc28
-rw-r--r--cc/debug/rasterize_and_record_benchmark.h5
-rw-r--r--cc/layers/picture_layer.cc13
-rw-r--r--cc/layers/picture_layer.h8
-rw-r--r--cc/layers/picture_layer_impl_unittest.cc12
-rw-r--r--cc/layers/picture_layer_unittest.cc2
-rw-r--r--cc/playback/discardable_image_map_unittest.cc8
-rw-r--r--cc/playback/display_list_recording_source.cc4
-rw-r--r--cc/playback/display_list_recording_source.h48
-rw-r--r--cc/playback/display_list_recording_source_unittest.cc8
-rw-r--r--cc/playback/recording_source.h59
-rw-r--r--cc/test/fake_picture_layer.cc7
-rw-r--r--cc/test/fake_picture_layer.h6
14 files changed, 87 insertions, 122 deletions
diff --git a/cc/cc.gyp b/cc/cc.gyp
index 7d02860..a4f70ff 100644
--- a/cc/cc.gyp
+++ b/cc/cc.gyp
@@ -370,7 +370,6 @@
'playback/raster_source.h',
'playback/raster_source_helper.cc',
'playback/raster_source_helper.h',
- 'playback/recording_source.h',
'playback/transform_display_item.cc',
'playback/transform_display_item.h',
'quads/content_draw_quad_base.cc',
diff --git a/cc/debug/rasterize_and_record_benchmark.cc b/cc/debug/rasterize_and_record_benchmark.cc
index 9b958d3..9083fe9 100644
--- a/cc/debug/rasterize_and_record_benchmark.cc
+++ b/cc/debug/rasterize_and_record_benchmark.cc
@@ -17,6 +17,7 @@
#include "cc/layers/layer.h"
#include "cc/layers/picture_layer.h"
#include "cc/playback/display_item_list.h"
+#include "cc/playback/display_list_recording_source.h"
#include "cc/trees/layer_tree_host.h"
#include "cc/trees/layer_tree_host_common.h"
#include "skia/ext/analysis_canvas.h"
@@ -34,11 +35,8 @@ const int kTimeLimitMillis = 1;
const int kWarmupRuns = 0;
const int kTimeCheckInterval = 1;
-const char* kModeSuffixes[RecordingSource::RECORDING_MODE_COUNT] = {
- "",
- "_sk_null_canvas",
- "_painting_disabled",
- "_caching_disabled",
+const char* kModeSuffixes[DisplayListRecordingSource::RECORDING_MODE_COUNT] = {
+ "", "_sk_null_canvas", "_painting_disabled", "_caching_disabled",
"_construction_disabled"};
} // namespace
@@ -77,7 +75,7 @@ void RasterizeAndRecordBenchmark::DidUpdateLayers(LayerTreeHost* host) {
results_->SetInteger("picture_memory_usage",
static_cast<int>(record_results_.bytes_used));
- for (int i = 0; i < RecordingSource::RECORDING_MODE_COUNT; i++) {
+ for (int i = 0; i < DisplayListRecordingSource::RECORDING_MODE_COUNT; i++) {
std::string name = base::StringPrintf("record_time%s_ms", kModeSuffixes[i]);
results_->SetDouble(name,
record_results_.total_best_time[i].InMillisecondsF());
@@ -121,24 +119,26 @@ void RasterizeAndRecordBenchmark::RunOnDisplayListLayer(
const gfx::Rect& visible_layer_rect) {
ContentLayerClient* painter = layer->client();
- for (int mode_index = 0; mode_index < RecordingSource::RECORDING_MODE_COUNT;
+ for (int mode_index = 0;
+ mode_index < DisplayListRecordingSource::RECORDING_MODE_COUNT;
mode_index++) {
ContentLayerClient::PaintingControlSetting painting_control =
ContentLayerClient::PAINTING_BEHAVIOR_NORMAL;
- switch (static_cast<RecordingSource::RecordingMode>(mode_index)) {
- case RecordingSource::RECORD_NORMALLY:
+ switch (
+ static_cast<DisplayListRecordingSource::RecordingMode>(mode_index)) {
+ case DisplayListRecordingSource::RECORD_NORMALLY:
// Already setup for normal recording.
break;
- case RecordingSource::RECORD_WITH_SK_NULL_CANVAS:
+ case DisplayListRecordingSource::RECORD_WITH_SK_NULL_CANVAS:
// Not supported for Display List recording.
continue;
- case RecordingSource::RECORD_WITH_PAINTING_DISABLED:
+ case DisplayListRecordingSource::RECORD_WITH_PAINTING_DISABLED:
painting_control = ContentLayerClient::DISPLAY_LIST_PAINTING_DISABLED;
break;
- case RecordingSource::RECORD_WITH_CACHING_DISABLED:
+ case DisplayListRecordingSource::RECORD_WITH_CACHING_DISABLED:
painting_control = ContentLayerClient::DISPLAY_LIST_CACHING_DISABLED;
break;
- case RecordingSource::RECORD_WITH_CONSTRUCTION_DISABLED:
+ case DisplayListRecordingSource::RECORD_WITH_CONSTRUCTION_DISABLED:
painting_control =
ContentLayerClient::DISPLAY_LIST_CONSTRUCTION_DISABLED;
break;
@@ -180,7 +180,7 @@ void RasterizeAndRecordBenchmark::RunOnDisplayListLayer(
min_time = duration;
}
- if (mode_index == RecordingSource::RECORD_NORMALLY) {
+ if (mode_index == DisplayListRecordingSource::RECORD_NORMALLY) {
record_results_.bytes_used +=
memory_used + painter->GetApproximateUnsharedMemoryUsage();
record_results_.pixels_recorded +=
diff --git a/cc/debug/rasterize_and_record_benchmark.h b/cc/debug/rasterize_and_record_benchmark.h
index 97cecb1..1e69851 100644
--- a/cc/debug/rasterize_and_record_benchmark.h
+++ b/cc/debug/rasterize_and_record_benchmark.h
@@ -13,7 +13,7 @@
#include "base/single_thread_task_runner.h"
#include "base/time/time.h"
#include "cc/debug/micro_benchmark_controller.h"
-#include "cc/playback/recording_source.h"
+#include "cc/playback/display_list_recording_source.h"
#include "ui/gfx/geometry/rect.h"
namespace base {
@@ -50,7 +50,8 @@ class RasterizeAndRecordBenchmark : public MicroBenchmark {
int pixels_recorded;
size_t bytes_used;
- base::TimeDelta total_best_time[RecordingSource::RECORDING_MODE_COUNT];
+ base::TimeDelta
+ total_best_time[DisplayListRecordingSource::RECORDING_MODE_COUNT];
};
RecordResults record_results_;
diff --git a/cc/layers/picture_layer.cc b/cc/layers/picture_layer.cc
index 6c215a3..d92ccc1 100644
--- a/cc/layers/picture_layer.cc
+++ b/cc/layers/picture_layer.cc
@@ -32,7 +32,7 @@ PictureLayer::PictureLayer(const LayerSettings& settings,
PictureLayer::PictureLayer(const LayerSettings& settings,
ContentLayerClient* client,
- scoped_ptr<RecordingSource> source)
+ scoped_ptr<DisplayListRecordingSource> source)
: PictureLayer(settings, client) {
recording_source_ = source.Pass();
}
@@ -150,7 +150,7 @@ bool PictureLayer::Update() {
DCHECK(client_);
updated |= recording_source_->UpdateAndExpandInvalidation(
client_, &recording_invalidation_, layer_size, update_rect,
- update_source_frame_number_, RecordingSource::RECORD_NORMALLY);
+ update_source_frame_number_, DisplayListRecordingSource::RECORD_NORMALLY);
last_updated_visible_layer_rect_ = visible_layer_rect();
if (updated) {
@@ -169,18 +169,19 @@ void PictureLayer::SetIsMask(bool is_mask) {
}
skia::RefPtr<SkPicture> PictureLayer::GetPicture() const {
- // We could either flatten the RecordingSource into a single SkPicture,
- // or paint a fresh one depending on what we intend to do with the
+ // We could either flatten the DisplayListRecordingSource 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>();
gfx::Size layer_size = bounds();
- scoped_ptr<RecordingSource> recording_source(new DisplayListRecordingSource);
+ scoped_ptr<DisplayListRecordingSource> recording_source(
+ new DisplayListRecordingSource);
Region recording_invalidation;
recording_source->UpdateAndExpandInvalidation(
client_, &recording_invalidation, layer_size, gfx::Rect(layer_size),
- update_source_frame_number_, RecordingSource::RECORD_NORMALLY);
+ update_source_frame_number_, DisplayListRecordingSource::RECORD_NORMALLY);
scoped_refptr<RasterSource> raster_source =
recording_source->CreateRasterSource(false);
diff --git a/cc/layers/picture_layer.h b/cc/layers/picture_layer.h
index 771484c..6f4f17c 100644
--- a/cc/layers/picture_layer.h
+++ b/cc/layers/picture_layer.h
@@ -13,7 +13,7 @@
namespace cc {
class ContentLayerClient;
-class RecordingSource;
+class DisplayListRecordingSource;
class ResourceUpdateQueue;
class CC_EXPORT PictureLayer : public Layer {
@@ -39,7 +39,7 @@ class CC_EXPORT PictureLayer : public Layer {
ContentLayerClient* client() { return client_; }
- RecordingSource* GetRecordingSourceForTesting() {
+ DisplayListRecordingSource* GetDisplayListRecordingSourceForTesting() {
return recording_source_.get();
}
@@ -48,7 +48,7 @@ class CC_EXPORT PictureLayer : public Layer {
// Allow tests to inject a recording source.
PictureLayer(const LayerSettings& settings,
ContentLayerClient* client,
- scoped_ptr<RecordingSource> source);
+ scoped_ptr<DisplayListRecordingSource> source);
~PictureLayer() override;
bool HasDrawableContent() const override;
@@ -57,7 +57,7 @@ class CC_EXPORT PictureLayer : public Layer {
private:
ContentLayerClient* client_;
- scoped_ptr<RecordingSource> recording_source_;
+ scoped_ptr<DisplayListRecordingSource> recording_source_;
devtools_instrumentation::
ScopedLayerObjectTracker instrumentation_object_tracker_;
// Invalidation to use the next time update is called.
diff --git a/cc/layers/picture_layer_impl_unittest.cc b/cc/layers/picture_layer_impl_unittest.cc
index 93c1f1f..5829a22 100644
--- a/cc/layers/picture_layer_impl_unittest.cc
+++ b/cc/layers/picture_layer_impl_unittest.cc
@@ -4481,7 +4481,8 @@ void PictureLayerImplTest::TestQuadsForSolidColor(bool test_for_solid) {
scoped_ptr<FakeLayerTreeHost> host =
FakeLayerTreeHost::Create(&host_client, &task_graph_runner);
host->SetRootLayer(layer);
- RecordingSource* recording_source = layer->GetRecordingSourceForTesting();
+ DisplayListRecordingSource* recording_source =
+ layer->GetDisplayListRecordingSourceForTesting();
int frame_number = 0;
@@ -4490,7 +4491,7 @@ void PictureLayerImplTest::TestQuadsForSolidColor(bool test_for_solid) {
Region invalidation(layer_rect);
recording_source->UpdateAndExpandInvalidation(
&client, &invalidation, layer_bounds, layer_rect, frame_number++,
- RecordingSource::RECORD_NORMALLY);
+ DisplayListRecordingSource::RECORD_NORMALLY);
scoped_refptr<RasterSource> pending_raster_source =
recording_source->CreateRasterSource(true);
@@ -4544,7 +4545,8 @@ TEST_F(PictureLayerImplTest, NonSolidToSolidNoTilings) {
scoped_ptr<FakeLayerTreeHost> host =
FakeLayerTreeHost::Create(&host_client, &task_graph_runner);
host->SetRootLayer(layer);
- RecordingSource* recording_source = layer->GetRecordingSourceForTesting();
+ DisplayListRecordingSource* recording_source =
+ layer->GetDisplayListRecordingSourceForTesting();
int frame_number = 0;
@@ -4553,7 +4555,7 @@ TEST_F(PictureLayerImplTest, NonSolidToSolidNoTilings) {
Region invalidation1(layer_rect);
recording_source->UpdateAndExpandInvalidation(
&client, &invalidation1, layer_bounds, layer_rect, frame_number++,
- RecordingSource::RECORD_NORMALLY);
+ DisplayListRecordingSource::RECORD_NORMALLY);
scoped_refptr<RasterSource> raster_source1 =
recording_source->CreateRasterSource(true);
@@ -4572,7 +4574,7 @@ TEST_F(PictureLayerImplTest, NonSolidToSolidNoTilings) {
Region invalidation2(layer_rect);
recording_source->UpdateAndExpandInvalidation(
&client, &invalidation2, layer_bounds, layer_rect, frame_number++,
- RecordingSource::RECORD_NORMALLY);
+ DisplayListRecordingSource::RECORD_NORMALLY);
scoped_refptr<RasterSource> raster_source2 =
recording_source->CreateRasterSource(true);
diff --git a/cc/layers/picture_layer_unittest.cc b/cc/layers/picture_layer_unittest.cc
index cb73d15..73e47d3 100644
--- a/cc/layers/picture_layer_unittest.cc
+++ b/cc/layers/picture_layer_unittest.cc
@@ -101,7 +101,7 @@ TEST(PictureLayerTest, SuitableForGpuRasterization) {
Region invalidation(layer_rect);
recording_source->UpdateAndExpandInvalidation(
&client, &invalidation, layer_bounds, layer_rect, 1,
- RecordingSource::RECORD_NORMALLY);
+ DisplayListRecordingSource::RECORD_NORMALLY);
// Layer is suitable for gpu rasterization by default.
EXPECT_TRUE(recording_source->IsSuitableForGpuRasterization());
diff --git a/cc/playback/discardable_image_map_unittest.cc b/cc/playback/discardable_image_map_unittest.cc
index 65bf68e..f5bf1ca 100644
--- a/cc/playback/discardable_image_map_unittest.cc
+++ b/cc/playback/discardable_image_map_unittest.cc
@@ -66,7 +66,7 @@ TEST(DiscardableImageMapTest, GetDiscardableImagesInRect) {
recording_source.SetGenerateDiscardableImagesMetadata(true);
recording_source.UpdateAndExpandInvalidation(
&content_layer_client, &invalidation, visible_rect.size(), visible_rect,
- 1, RecordingSource::RECORD_NORMALLY);
+ 1, DisplayListRecordingSource::RECORD_NORMALLY);
DisplayItemList* display_list = recording_source.display_list();
DiscardableImageMap image_map;
@@ -147,7 +147,7 @@ TEST(DiscardableImageMapTest, GetDiscardableImagesInRectNonZeroLayer) {
recording_source.SetGenerateDiscardableImagesMetadata(true);
recording_source.UpdateAndExpandInvalidation(
&content_layer_client, &invalidation, layer_size, visible_rect, 1,
- RecordingSource::RECORD_NORMALLY);
+ DisplayListRecordingSource::RECORD_NORMALLY);
DisplayItemList* display_list = recording_source.display_list();
DiscardableImageMap image_map;
@@ -252,7 +252,7 @@ TEST(DiscardableImageMapTest, GetDiscardableImagesInRectOnePixelQuery) {
recording_source.SetGenerateDiscardableImagesMetadata(true);
recording_source.UpdateAndExpandInvalidation(
&content_layer_client, &invalidation, visible_rect.size(), visible_rect,
- 1, RecordingSource::RECORD_NORMALLY);
+ 1, DisplayListRecordingSource::RECORD_NORMALLY);
DisplayItemList* display_list = recording_source.display_list();
DiscardableImageMap image_map;
@@ -295,7 +295,7 @@ TEST(DiscardableImageMapTest, GetDiscardableImagesInRectMassiveImage) {
recording_source.SetGenerateDiscardableImagesMetadata(true);
recording_source.UpdateAndExpandInvalidation(
&content_layer_client, &invalidation, visible_rect.size(), visible_rect,
- 1, RecordingSource::RECORD_NORMALLY);
+ 1, DisplayListRecordingSource::RECORD_NORMALLY);
DisplayItemList* display_list = recording_source.display_list();
DiscardableImageMap image_map;
diff --git a/cc/playback/display_list_recording_source.cc b/cc/playback/display_list_recording_source.cc
index c790ebe..26d7437 100644
--- a/cc/playback/display_list_recording_source.cc
+++ b/cc/playback/display_list_recording_source.cc
@@ -175,8 +175,8 @@ bool DisplayListRecordingSource::UpdateAndExpandInvalidation(
case RECORD_WITH_CONSTRUCTION_DISABLED:
painting_control = ContentLayerClient::DISPLAY_LIST_CONSTRUCTION_DISABLED;
break;
- default:
- // case RecordingSource::RECORD_WITH_SK_NULL_CANVAS should not be reached
+ case RECORD_WITH_SK_NULL_CANVAS:
+ case RECORDING_MODE_COUNT:
NOTREACHED();
}
diff --git a/cc/playback/display_list_recording_source.h b/cc/playback/display_list_recording_source.h
index b4250d0..d544349 100644
--- a/cc/playback/display_list_recording_source.h
+++ b/cc/playback/display_list_recording_source.h
@@ -5,34 +5,54 @@
#ifndef CC_PLAYBACK_DISPLAY_LIST_RECORDING_SOURCE_H_
#define CC_PLAYBACK_DISPLAY_LIST_RECORDING_SOURCE_H_
+#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
-#include "cc/playback/recording_source.h"
+#include "cc/base/cc_export.h"
+#include "third_party/skia/include/core/SkColor.h"
+#include "ui/gfx/geometry/rect.h"
+#include "ui/gfx/geometry/size.h"
namespace cc {
+class ContentLayerClient;
class DisplayItemList;
class DisplayListRasterSource;
+class RasterSource;
+class Region;
-class CC_EXPORT DisplayListRecordingSource : public RecordingSource {
+class CC_EXPORT DisplayListRecordingSource {
public:
+ // TODO(schenney) Remove RECORD_WITH_SK_NULL_CANVAS when we no longer
+ // support a non-Slimming Paint path.
+ enum RecordingMode {
+ RECORD_NORMALLY,
+ RECORD_WITH_SK_NULL_CANVAS,
+ RECORD_WITH_PAINTING_DISABLED,
+ RECORD_WITH_CACHING_DISABLED,
+ RECORD_WITH_CONSTRUCTION_DISABLED,
+ RECORDING_MODE_COUNT, // Must be the last entry.
+ };
+
DisplayListRecordingSource();
- ~DisplayListRecordingSource() override;
+ virtual ~DisplayListRecordingSource();
- // RecordingSource overrides.
bool UpdateAndExpandInvalidation(ContentLayerClient* painter,
Region* invalidation,
const gfx::Size& layer_size,
const gfx::Rect& visible_layer_rect,
int frame_number,
- RecordingMode recording_mode) override;
- scoped_refptr<RasterSource> CreateRasterSource(
- bool can_use_lcd_text) const override;
- gfx::Size GetSize() const final;
- void SetEmptyBounds() override;
- void SetSlowdownRasterScaleFactor(int factor) override;
- void SetGenerateDiscardableImagesMetadata(bool generate_metadata) override;
- void SetBackgroundColor(SkColor background_color) override;
- void SetRequiresClear(bool requires_clear) override;
- bool IsSuitableForGpuRasterization() const override;
+ RecordingMode recording_mode);
+ gfx::Size GetSize() const;
+ void SetEmptyBounds();
+ void SetSlowdownRasterScaleFactor(int factor);
+ void SetGenerateDiscardableImagesMetadata(bool generate_metadata);
+ void SetBackgroundColor(SkColor background_color);
+ void SetRequiresClear(bool requires_clear);
+
+ // These functions are virtual for testing.
+ virtual scoped_refptr<RasterSource> CreateRasterSource(
+ bool can_use_lcd_text) const;
+ virtual bool IsSuitableForGpuRasterization() const;
+
// Returns true if the new recorded viewport exposes enough new area to be
// worth re-recording.
static bool ExposesEnoughNewArea(
diff --git a/cc/playback/display_list_recording_source_unittest.cc b/cc/playback/display_list_recording_source_unittest.cc
index 83d4403..4dcee93 100644
--- a/cc/playback/display_list_recording_source_unittest.cc
+++ b/cc/playback/display_list_recording_source_unittest.cc
@@ -231,20 +231,20 @@ TEST(DisplayListRecordingSourceTest,
recording_source.UpdateAndExpandInvalidation(
&client, &invalidation, layer_size, visible_rect, 0,
- RecordingSource::RECORD_NORMALLY);
+ DisplayListRecordingSource::RECORD_NORMALLY);
EXPECT_EQ(gfx::Rect(0, 0, 4256, 4256), recording_source.recorded_viewport());
visible_rect.Offset(0, 512);
recording_source.UpdateAndExpandInvalidation(
&client, &invalidation, layer_size, visible_rect, 0,
- RecordingSource::RECORD_NORMALLY);
+ DisplayListRecordingSource::RECORD_NORMALLY);
EXPECT_EQ(gfx::Rect(0, 0, 4256, 4256), recording_source.recorded_viewport());
// Move past the threshold for enough exposed new area.
visible_rect.Offset(0, 1);
recording_source.UpdateAndExpandInvalidation(
&client, &invalidation, layer_size, visible_rect, 0,
- RecordingSource::RECORD_NORMALLY);
+ DisplayListRecordingSource::RECORD_NORMALLY);
EXPECT_EQ(gfx::Rect(0, 0, 4256, 4769), recording_source.recorded_viewport());
// Make the bottom of the potential new recorded viewport coincide with the
@@ -252,7 +252,7 @@ TEST(DisplayListRecordingSourceTest,
visible_rect.Offset(0, 231);
recording_source.UpdateAndExpandInvalidation(
&client, &invalidation, layer_size, visible_rect, 0,
- RecordingSource::RECORD_NORMALLY);
+ DisplayListRecordingSource::RECORD_NORMALLY);
EXPECT_EQ(gfx::Rect(0, 0, 4256, 4769), recording_source.recorded_viewport());
}
diff --git a/cc/playback/recording_source.h b/cc/playback/recording_source.h
deleted file mode 100644
index 7d4aba1..0000000
--- a/cc/playback/recording_source.h
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CC_PLAYBACK_RECORDING_SOURCE_H_
-#define CC_PLAYBACK_RECORDING_SOURCE_H_
-
-#include "base/memory/ref_counted.h"
-#include "cc/base/cc_export.h"
-#include "third_party/skia/include/core/SkColor.h"
-#include "ui/gfx/geometry/rect.h"
-#include "ui/gfx/geometry/size.h"
-
-namespace cc {
-class ContentLayerClient;
-class Region;
-class RasterSource;
-
-class CC_EXPORT RecordingSource {
- public:
- // TODO(schenney) Remove RECORD_WITH_SK_NULL_CANVAS when we no longer
- // support a non-Slimming Paint path.
- enum RecordingMode {
- RECORD_NORMALLY,
- RECORD_WITH_SK_NULL_CANVAS,
- RECORD_WITH_PAINTING_DISABLED,
- RECORD_WITH_CACHING_DISABLED,
- RECORD_WITH_CONSTRUCTION_DISABLED,
- RECORDING_MODE_COUNT, // Must be the last entry.
- };
-
- virtual ~RecordingSource() {}
- // Re-record parts of the picture that are invalid.
- // Invalidations are in layer space, and will be expanded to cover everything
- // that was either recorded/changed or that has no recording, leaving out only
- // pieces that we had a recording for and it was not changed.
- // Return true iff the pile was modified.
- virtual bool UpdateAndExpandInvalidation(ContentLayerClient* painter,
- Region* invalidation,
- const gfx::Size& layer_size,
- const gfx::Rect& visible_layer_rect,
- int frame_number,
- RecordingMode recording_mode) = 0;
-
- virtual scoped_refptr<RasterSource> CreateRasterSource(
- bool can_use_lcd_text) const = 0;
-
- virtual gfx::Size GetSize() const = 0;
- virtual void SetEmptyBounds() = 0;
- virtual void SetSlowdownRasterScaleFactor(int factor) = 0;
- virtual void SetGenerateDiscardableImagesMetadata(bool generate_metadata) = 0;
- virtual void SetBackgroundColor(SkColor background_color) = 0;
- virtual void SetRequiresClear(bool requires_clear) = 0;
- virtual bool IsSuitableForGpuRasterization() const = 0;
-};
-
-} // namespace cc
-
-#endif // CC_PLAYBACK_RECORDING_SOURCE_H_
diff --git a/cc/test/fake_picture_layer.cc b/cc/test/fake_picture_layer.cc
index 0570625..8892d4c 100644
--- a/cc/test/fake_picture_layer.cc
+++ b/cc/test/fake_picture_layer.cc
@@ -18,9 +18,10 @@ FakePictureLayer::FakePictureLayer(const LayerSettings& settings,
SetIsDrawable(true);
}
-FakePictureLayer::FakePictureLayer(const LayerSettings& settings,
- ContentLayerClient* client,
- scoped_ptr<RecordingSource> source)
+FakePictureLayer::FakePictureLayer(
+ const LayerSettings& settings,
+ ContentLayerClient* client,
+ scoped_ptr<DisplayListRecordingSource> source)
: PictureLayer(settings, client, source.Pass()),
update_count_(0),
push_properties_count_(0),
diff --git a/cc/test/fake_picture_layer.h b/cc/test/fake_picture_layer.h
index 2b26498..aee328f 100644
--- a/cc/test/fake_picture_layer.h
+++ b/cc/test/fake_picture_layer.h
@@ -8,7 +8,7 @@
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "cc/layers/picture_layer.h"
-#include "cc/playback/recording_source.h"
+#include "cc/playback/display_list_recording_source.h"
namespace cc {
class FakePictureLayer : public PictureLayer {
@@ -21,7 +21,7 @@ class FakePictureLayer : public PictureLayer {
static scoped_refptr<FakePictureLayer> CreateWithRecordingSource(
const LayerSettings& settings,
ContentLayerClient* client,
- scoped_ptr<RecordingSource> source) {
+ scoped_ptr<DisplayListRecordingSource> source) {
return make_scoped_refptr(
new FakePictureLayer(settings, client, source.Pass()));
}
@@ -46,7 +46,7 @@ class FakePictureLayer : public PictureLayer {
FakePictureLayer(const LayerSettings& settings, ContentLayerClient* client);
FakePictureLayer(const LayerSettings& settings,
ContentLayerClient* client,
- scoped_ptr<RecordingSource> source);
+ scoped_ptr<DisplayListRecordingSource> source);
~FakePictureLayer() override;
int update_count_;
generated by cgit v1.1 at 2024-05-27 13:15:18 +0000