Index: cc/resources/picture.cc |
diff --git a/cc/resources/picture.cc b/cc/resources/picture.cc |
index adc85de3d53e2610a45a780ca35daf41a05722d4..f790865a7ad910d55e0ffbd5fd822d46ba957b5c 100644 |
--- a/cc/resources/picture.cc |
+++ b/cc/resources/picture.cc |
@@ -350,8 +350,10 @@ int Picture::Raster(SkCanvas* canvas, |
canvas->translate(layer_rect_.x(), layer_rect_.y()); |
if (playback_) { |
playback_->draw(canvas); |
+ } else if (callback) { |
+ picture_->draw(canvas, callback); // AnalysisCanvas |
} else { |
- picture_->draw(canvas, callback); |
+ canvas->drawPicture(picture_.get()); |
} |
reveman
2014/09/22 21:29:05
I assume this is the fix for picture ops being bei
hendrikw
2014/09/22 21:48:39
I'd rather not separate these. I can put more det
reveman
2014/09/22 22:41:08
Ok, a comment here would be useful as it's not obv
robertphillips
2014/09/23 12:54:55
We have renamed SkPicture::draw to be SkPicture::p
reveman
2014/09/23 14:59:46
Ok, that makes sense. We should probably change th
|
SkIRect bounds; |
canvas->getClipDeviceBounds(&bounds); |