[NOT FOR COMMIT] Fully replace SkCanvas uses.

third_party/WebKit/Source/platform/graphics/paint/RasterInvalidationTracking.h

 // Copyright 2016 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 RasterInvalidationTracking_h
 #define RasterInvalidationTracking_h
 
 #include "platform/geometry/IntRect.h"
 #include "platform/geometry/Region.h"
 #include "platform/graphics/PaintInvalidationReason.h"
 #include "platform/json/JSONValues.h"
 #include "third_party/skia/include/core/SkColor.h"
-#include "third_party/skia/include/core/SkPicture.h"
+#include "skia/ext/cdl_picture.h"
 #include "wtf/Allocator.h"
 #include "wtf/text/WTFString.h"
 
 namespace blink {
 
 class DisplayItemClient;
 
 struct RasterInvalidationInfo {
   DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
   // This is for comparison only. Don't dereference because the client may have
@@ skipping 14 matching lines @@
   DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
   int x;
   int y;
   SkColor oldPixel;
   SkColor newPixel;
 };
 
 struct PLATFORM_EXPORT RasterInvalidationTracking {
   DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
   Vector<RasterInvalidationInfo> trackedRasterInvalidations;
-  sk_sp<SkPicture> lastPaintedPicture;
+  sk_sp<CdlPicture> lastPaintedPicture;
   IntRect lastInterestRect;
   Region rasterInvalidationRegionSinceLastPaint;
   Vector<UnderPaintInvalidation> underPaintInvalidations;
 
   void asJSON(JSONObject*);
 };
 
 template <class TargetClass>
 class PLATFORM_EXPORT RasterInvalidationTrackingMap {
  public:
@@ skipping 23 matching lines @@
 
  private:
   typedef HashMap<TargetClass*, RasterInvalidationTracking>
       InvalidationTrackingMap;
   InvalidationTrackingMap m_invalidationTrackingMap;
 };
 
 }  // namespace blink
 
 #endif  // RasterInvalidationTracking_h