Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / cc / resources / picture.h

diff --git a/src/cc/resources/picture.h b/src/cc/resources/picture.h
index 69e3293..1677309 100644 (file)
--- a/src/cc/resources/picture.h
+++ b/src/cc/resources/picture.h
@@ -21,8 +21,7 @@
 #include "skia/ext/refptr.h"
 #include "third_party/skia/include/core/SkBBHFactory.h"
 #include "third_party/skia/include/core/SkPicture.h"
-#include "third_party/skia/include/record/SkRecording.h"
-#include "ui/gfx/rect.h"
+#include "ui/gfx/geometry/rect.h"
 
 class SkPixelRef;
 
@@ -49,7 +48,6 @@ class CC_EXPORT Picture
     RECORD_NORMALLY,
     RECORD_WITH_SK_NULL_CANVAS,
     RECORD_WITH_PAINTING_DISABLED,
-    RECORD_WITH_SKRECORD,
     RECORDING_MODE_COUNT,  // Must be the last entry.
   };
 
@@ -150,7 +148,6 @@ class CC_EXPORT Picture
 
   gfx::Rect layer_rect_;
   skia::RefPtr<SkPicture> picture_;
-  scoped_ptr<const EXPERIMENTAL::SkPlayback> playback_;
 
   PixelRefMap pixel_refs_;
   gfx::Point min_pixel_cell_;