Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / skia / src / core / SkPictureRecorder.cpp

diff --git a/src/third_party/skia/src/core/SkPictureRecorder.cpp b/src/third_party/skia/src/core/SkPictureRecorder.cpp
index 77274e6..9ae5c21 100644 (file)
--- a/src/third_party/skia/src/core/SkPictureRecorder.cpp
+++ b/src/third_party/skia/src/core/SkPictureRecorder.cpp
@@ -5,8 +5,6 @@
  * found in the LICENSE file.
  */
 
-#include "SkBBoxHierarchyRecord.h"
-#include "SkPictureRecord.h"
 #include "SkPictureRecorder.h"
 #include "SkRecord.h"
 #include "SkRecordDraw.h"
@@ -20,37 +18,6 @@ SkPictureRecorder::~SkPictureRecorder() {}
 SkCanvas* SkPictureRecorder::beginRecording(SkScalar width, SkScalar height,
                                             SkBBHFactory* bbhFactory /* = NULL */,
                                             uint32_t recordFlags /* = 0 */) {
-#ifdef SK_PICTURE_USE_SK_RECORD
-    return EXPERIMENTAL_beginRecording(width, height, bbhFactory);
-#else
-    return DEPRECATED_beginRecording(width, height, bbhFactory, recordFlags);
-#endif
-}
-
-SkCanvas* SkPictureRecorder::DEPRECATED_beginRecording(SkScalar width, SkScalar height,
-                                                       SkBBHFactory* bbhFactory /* = NULL */,
-                                                       uint32_t recordFlags /* = 0 */) {
-    fCullWidth = width;
-    fCullHeight = height;
-
-    const SkISize size = SkISize::Make(width, height);
-
-    if (bbhFactory) {
-        // We don't need to hold a ref on the BBH ourselves, but might as well for
-        // consistency with EXPERIMENTAL_beginRecording(), which does need to.
-        fBBH.reset((*bbhFactory)(width, height));
-        SkASSERT(fBBH.get());
-        fPictureRecord.reset(SkNEW_ARGS(SkBBoxHierarchyRecord, (size, recordFlags, fBBH.get())));
-    } else {
-        fPictureRecord.reset(SkNEW_ARGS(SkPictureRecord, (size, recordFlags)));
-    }
-
-    fPictureRecord->beginRecording();
-    return this->getRecordingCanvas();
-}
-
-SkCanvas* SkPictureRecorder::EXPERIMENTAL_beginRecording(SkScalar width, SkScalar height,
-                                                         SkBBHFactory* bbhFactory /* = NULL */) {
     fCullWidth = width;
     fCullHeight = height;
 
@@ -65,49 +32,16 @@ SkCanvas* SkPictureRecorder::EXPERIMENTAL_beginRecording(SkScalar width, SkScala
 }
 
 SkCanvas* SkPictureRecorder::getRecordingCanvas() {
-    if (fRecorder.get()) {
-        return fRecorder.get();
-    }
-    return fPictureRecord.get();
+    return fRecorder.get();
 }
 
 SkPicture* SkPictureRecorder::endRecording() {
-    SkPicture* picture = NULL;
-
-    if (fRecord.get()) {
-        picture = SkNEW_ARGS(SkPicture, (fCullWidth, fCullHeight, 
-                                         fRecord.detach(), fBBH.get()));
-    }
-
-    if (fPictureRecord.get()) {
-        fPictureRecord->endRecording();
-        const bool deepCopyOps = false;
-        picture = SkNEW_ARGS(SkPicture, (fCullWidth, fCullHeight, 
-                                         *fPictureRecord.get(), deepCopyOps));
-    }
-
-    return picture;
-}
-
-void SkPictureRecorder::internalOnly_EnableOpts(bool enableOpts) {
-    if (fPictureRecord.get()) {
-        fPictureRecord->internalOnly_EnableOpts(enableOpts);
-    }
+    return SkNEW_ARGS(SkPicture, (fCullWidth, fCullHeight, fRecord.detach(), fBBH.get()));
 }
 
 void SkPictureRecorder::partialReplay(SkCanvas* canvas) const {
     if (NULL == canvas) {
         return;
     }
-
-    if (fRecord.get()) {
-        SkRecordDraw(*fRecord, canvas, NULL/*bbh*/, NULL/*callback*/);
-    }
-
-    if (fPictureRecord.get()) {
-        const bool deepCopyOps = true;
-        SkPicture picture(fCullWidth, fCullHeight, 
-                          *fPictureRecord.get(), deepCopyOps);
-        picture.playback(canvas);
-    }
+    SkRecordDraw(*fRecord, canvas, NULL/*bbh*/, NULL/*callback*/);
 }