cc: Remove save/restore from DrawingDisplayItem::Raster.

cc/resources/drawing_display_item.cc

 // 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.
 
 #include "cc/resources/drawing_display_item.h"
 
 #include <string>
 
 #include "base/strings/stringprintf.h"
 #include "base/trace_event/trace_event_argument.h"
 #include "cc/debug/picture_debug_util.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkDrawPictureCallback.h"
 #include "third_party/skia/include/core/SkMatrix.h"
 #include "third_party/skia/include/core/SkPicture.h"
 #include "third_party/skia/include/utils/SkPictureUtils.h"
 
 namespace cc {
 
 DrawingDisplayItem::DrawingDisplayItem(skia::RefPtr<SkPicture> picture)
     : picture_(picture) {
 }
 
 DrawingDisplayItem::~DrawingDisplayItem() {
 }
 
 void DrawingDisplayItem::Raster(SkCanvas* canvas,
                                 SkDrawPictureCallback* callback) const {
-  canvas->save();

[danakj, 2015/04/28 21:46:41]

could you say this in a comment here?

[jbroman, 2015/04/28 21:48:16]

Done. Was debating whether I should.

   if (callback)
     picture_->playback(canvas, callback);
   else
     canvas->drawPicture(picture_.get());

[ajuma, 2015/04/28 21:48:50]

Does drawPicture also guarantee save/restore?

[jbroman, 2015/04/28 21:55:33]

Yes.

It always dispatches either to SkRecordDraw, which does (via
SkCanvas::drawPicture -> SkCanvas::onDrawPicture -> SkPicture::playback), the
usual path, or to GrRecordReplaceDraw (via SkCanvas::drawPicture ->
SkCanvas::onDrawPicture -> SkGpuDevice::EXPERIMENTAL_drawPicture).

-  canvas->restore();
 }
 
 bool DrawingDisplayItem::IsSuitableForGpuRasterization() const {
   return picture_->suitableForGpuRasterization(NULL);
 }
 
 int DrawingDisplayItem::ApproximateOpCount() const {
   return picture_->approximateOpCount();
 }
 
@@ skipping 11 matching lines @@
       base::StringPrintf("[%f,%f,%f,%f]", picture_->cullRect().x(),
                          picture_->cullRect().y(), picture_->cullRect().width(),
                          picture_->cullRect().height()));
   std::string b64_picture;
   PictureDebugUtil::SerializeAsBase64(picture_.get(), &b64_picture);
   array->SetString("skp64", b64_picture);
   array->EndDictionary();
 }
 
 }  // namespace cc