| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 167 canvas.clipRect(SkRect::MakeXYWH(clipRect->x(), clipRect->y(), clipR
ect->width(), clipRect->height())); | 167 canvas.clipRect(SkRect::MakeXYWH(clipRect->x(), clipRect->y(), clipR
ect->width(), clipRect->height())); |
| 168 canvas.resetStepCount(); | 168 canvas.resetStepCount(); |
| 169 } | 169 } |
| 170 canvas.setTimings(currentTimings); | 170 canvas.setTimings(currentTimings); |
| 171 m_picture->playback(&canvas); | 171 m_picture->playback(&canvas); |
| 172 now = WTF::monotonicallyIncreasingTime(); | 172 now = WTF::monotonicallyIncreasingTime(); |
| 173 } | 173 } |
| 174 return timings; | 174 return timings; |
| 175 } | 175 } |
| 176 | 176 |
| 177 PassRefPtr<JSONArray> PictureSnapshot::snapshotCommandLog() const | 177 std::unique_ptr<JSONArray> PictureSnapshot::snapshotCommandLog() const |
| 178 { | 178 { |
| 179 const SkIRect bounds = m_picture->cullRect().roundOut(); | 179 const SkIRect bounds = m_picture->cullRect().roundOut(); |
| 180 LoggingCanvas canvas(bounds.width(), bounds.height()); | 180 LoggingCanvas canvas(bounds.width(), bounds.height()); |
| 181 m_picture->playback(&canvas); | 181 m_picture->playback(&canvas); |
| 182 return canvas.log(); | 182 return canvas.log(); |
| 183 } | 183 } |
| 184 | 184 |
| 185 } // namespace blink | 185 } // namespace blink |
| OLD | NEW |