OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/test/fake_picture_pile_impl.h" | 5 #include "cc/test/fake_picture_pile_impl.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <limits> | 8 #include <limits> |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
97 return pile_impl; | 97 return pile_impl; |
98 } | 98 } |
99 | 99 |
100 scoped_refptr<FakePicturePileImpl> FakePicturePileImpl::CreateFromPile( | 100 scoped_refptr<FakePicturePileImpl> FakePicturePileImpl::CreateFromPile( |
101 const PicturePile* other, | 101 const PicturePile* other, |
102 base::WaitableEvent* playback_allowed_event) { | 102 base::WaitableEvent* playback_allowed_event) { |
103 return make_scoped_refptr( | 103 return make_scoped_refptr( |
104 new FakePicturePileImpl(other, playback_allowed_event)); | 104 new FakePicturePileImpl(other, playback_allowed_event)); |
105 } | 105 } |
106 | 106 |
107 void FakePicturePileImpl::PlaybackToCanvas(SkCanvas* canvas, | 107 void FakePicturePileImpl::PlaybackToCanvas( |
108 const gfx::Rect& canvas_rect, | 108 SkCanvas* canvas, |
109 float contents_scale) const { | 109 const gfx::Rect& canvas_bitmap_rect, |
| 110 const gfx::Rect& canvas_playback_rect, |
| 111 float contents_scale) const { |
110 if (playback_allowed_event_) | 112 if (playback_allowed_event_) |
111 playback_allowed_event_->Wait(); | 113 playback_allowed_event_->Wait(); |
112 PicturePileImpl::PlaybackToCanvas(canvas, canvas_rect, contents_scale); | 114 PicturePileImpl::PlaybackToCanvas(canvas, canvas_bitmap_rect, |
| 115 canvas_playback_rect, contents_scale); |
113 } | 116 } |
114 | 117 |
115 bool FakePicturePileImpl::HasRecordingAt(int x, int y) const { | 118 bool FakePicturePileImpl::HasRecordingAt(int x, int y) const { |
116 PictureMap::const_iterator found = picture_map_.find(PictureMapKey(x, y)); | 119 PictureMap::const_iterator found = picture_map_.find(PictureMapKey(x, y)); |
117 return found != picture_map_.end(); | 120 return found != picture_map_.end(); |
118 } | 121 } |
119 | 122 |
120 } // namespace cc | 123 } // namespace cc |
OLD | NEW |