Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

cc/resources/display_list_raster_source.h

 // 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_RESOURCES_DISPLAY_LIST_RASTER_SOURCE_H_
 #define CC_RESOURCES_DISPLAY_LIST_RASTER_SOURCE_H_
 
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 #include "cc/debug/rendering_stats_instrumentation.h"
 #include "cc/resources/display_list_recording_source.h"
 #include "cc/resources/raster_source.h"
 #include "skia/ext/analysis_canvas.h"
 #include "skia/ext/refptr.h"
 #include "third_party/skia/include/core/SkPicture.h"
 
 namespace cc {
 class DisplayItemList;
 
 class CC_EXPORT DisplayListRasterSource : public RasterSource {
  public:
+  static scoped_refptr<DisplayListRasterSource> Create();
   static scoped_refptr<DisplayListRasterSource>
-  CreateFromDisplayListRecordingSource(const DisplayListRecordingSource* other,
-                                       bool can_use_lcd_text);
+  CreateFromDisplayListRecordingSource(const DisplayListRecordingSource* other);
 
   // RasterSource overrides.
   void PlaybackToCanvas(SkCanvas* canvas,
                         const gfx::Rect& canvas_rect,
                         float contents_scale) const override;
   void PlaybackToSharedCanvas(SkCanvas* canvas,
                               const gfx::Rect& canvas_rect,
                               float contents_scale) const override;
   void PerformSolidColorAnalysis(
       const gfx::Rect& content_rect,
       float contents_scale,
       RasterSource::SolidColorAnalysis* analysis) const override;
   bool IsSolidColor() const override;
   SkColor GetSolidColor() const override;
   gfx::Size GetSize() const override;
   void GatherPixelRefs(const gfx::Rect& content_rect,
                        float contents_scale,
                        std::vector<SkPixelRef*>* pixel_refs) const override;
   bool CoversRect(const gfx::Rect& content_rect,
                   float contents_scale) const override;
   bool HasRecordings() const override;
   void SetShouldAttemptToUseDistanceFieldText() override;
   bool ShouldAttemptToUseDistanceFieldText() const override;
   void DidBeginTracing() override;
   void AsValueInto(base::trace_event::TracedValue* array) const override;
   skia::RefPtr<SkPicture> GetFlattenedPicture() override;
   size_t GetPictureMemoryUsage() const override;
   bool CanUseLCDText() const override;
-  scoped_refptr<RasterSource> CreateCloneWithoutLCDText() const override;
 
  protected:
   DisplayListRasterSource();
-  DisplayListRasterSource(const DisplayListRecordingSource* other,
-                          bool can_use_lcd_text);
-  DisplayListRasterSource(const DisplayListRasterSource* other,
-                          bool can_use_lcd_text);
+  explicit DisplayListRasterSource(const DisplayListRecordingSource* other);
   ~DisplayListRasterSource() override;
 
   // These members are const as this raster source may be in use on another
   // thread and so should not be touched after construction.
   const scoped_refptr<DisplayItemList> display_list_;
   const SkColor background_color_;
   const bool requires_clear_;
   const bool can_use_lcd_text_;
   const bool is_solid_color_;
   const SkColor solid_color_;
@@ skipping 17 matching lines @@
                     const gfx::Rect& canvas_rect,
                     float contents_scale,
                     bool is_analysis) const;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayListRasterSource);
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_DISPLAY_LIST_RASTER_SOURCE_H_