Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2010 The Chromium Authors. All rights reserved. | 1 // Copyright 2010 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "cc/layers/picture_image_layer.h" | 5 #include "cc/layers/picture_image_layer.h" |
| 6 | 6 |
| 7 #include "cc/layers/picture_image_layer_impl.h" | 7 #include "cc/layers/picture_image_layer_impl.h" |
| 8 #include "third_party/skia/include/core/SkCanvas.h" | 8 #include "third_party/skia/include/core/SkCanvas.h" |
| 9 | 9 |
| 10 namespace cc { | 10 namespace cc { |
| (...skipping 24 matching lines...) Expand all Loading... | |
| 35 // With this check in place we avoid unecessary texture uploads. | 35 // With this check in place we avoid unecessary texture uploads. |
| 36 if (bitmap.pixelRef() && bitmap.pixelRef() == bitmap_.pixelRef()) | 36 if (bitmap.pixelRef() && bitmap.pixelRef() == bitmap_.pixelRef()) |
| 37 return; | 37 return; |
| 38 | 38 |
| 39 bitmap_ = bitmap; | 39 bitmap_ = bitmap; |
| 40 SetNeedsDisplay(); | 40 SetNeedsDisplay(); |
| 41 } | 41 } |
| 42 | 42 |
| 43 void PictureImageLayer::PaintContents(SkCanvas* canvas, | 43 void PictureImageLayer::PaintContents(SkCanvas* canvas, |
| 44 const gfx::Rect& clip, | 44 const gfx::Rect& clip, |
| 45 gfx::RectF* opaque) { | 45 gfx::RectF* opaque, |
| 46 bool disableContext) { | |
| 46 if (!canvas || !bitmap_.width() || !bitmap_.height()) | 47 if (!canvas || !bitmap_.width() || !bitmap_.height()) |
|
Sami
2014/04/29 10:57:23
I think we can now also remove all the null checks
Stephen Chennney
2014/04/29 20:30:45
Done.
| |
| 47 return; | 48 return; |
| 48 | 49 |
| 49 SkScalar content_to_layer_scale_x = | 50 SkScalar content_to_layer_scale_x = |
| 50 SkFloatToScalar(static_cast<float>(bounds().width()) / bitmap_.width()); | 51 SkFloatToScalar(static_cast<float>(bounds().width()) / bitmap_.width()); |
| 51 SkScalar content_to_layer_scale_y = | 52 SkScalar content_to_layer_scale_y = |
| 52 SkFloatToScalar(static_cast<float>(bounds().height()) / bitmap_.height()); | 53 SkFloatToScalar(static_cast<float>(bounds().height()) / bitmap_.height()); |
| 53 canvas->scale(content_to_layer_scale_x, content_to_layer_scale_y); | 54 canvas->scale(content_to_layer_scale_x, content_to_layer_scale_y); |
| 54 | 55 |
| 55 // Because PictureImageLayer always FillsBoundsCompletely it will not clear | 56 // Because PictureImageLayer always FillsBoundsCompletely it will not clear |
| 56 // before painting on playback. As a result we must configure the paint to | 57 // before painting on playback. As a result we must configure the paint to |
| 57 // copy over the uncleared destination, rather than blending with it. | 58 // copy over the uncleared destination, rather than blending with it. |
| 58 SkPaint paint; | 59 SkPaint paint; |
| 59 paint.setXfermodeMode(SkXfermode::kSrc_Mode); | 60 paint.setXfermodeMode(SkXfermode::kSrc_Mode); |
| 60 canvas->drawBitmap(bitmap_, 0, 0, &paint); | 61 canvas->drawBitmap(bitmap_, 0, 0, &paint); |
| 61 } | 62 } |
| 62 | 63 |
| 63 bool PictureImageLayer::FillsBoundsCompletely() const { | 64 bool PictureImageLayer::FillsBoundsCompletely() const { |
| 64 // PictureImageLayer will always paint to the entire layer bounds. | 65 // PictureImageLayer will always paint to the entire layer bounds. |
| 65 return true; | 66 return true; |
| 66 } | 67 } |
| 67 | 68 |
| 68 } // namespace cc | 69 } // namespace cc |
| OLD | NEW |