| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. | 2 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2008, 2009 Anthony Ricaud <rik@webkit.org> | 3 * Copyright (C) 2008, 2009 Anthony Ricaud <rik@webkit.org> |
| 4 * Copyright (C) 2011 Google Inc. All rights reserved. | 4 * Copyright (C) 2011 Google Inc. All rights reserved. |
| 5 * | 5 * |
| 6 * Redistribution and use in source and binary forms, with or without | 6 * Redistribution and use in source and binary forms, with or without |
| 7 * modification, are permitted provided that the following conditions | 7 * modification, are permitted provided that the following conditions |
| 8 * are met: | 8 * are met: |
| 9 * | 9 * |
| 10 * 1. Redistributions of source code must retain the above copyright | 10 * 1. Redistributions of source code must retain the above copyright |
| (...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 297 if (!toggled && this._filmStripRecorder) { | 297 if (!toggled && this._filmStripRecorder) { |
| 298 this._filmStripView.detach(); | 298 this._filmStripView.detach(); |
| 299 this._filmStripView = null; | 299 this._filmStripView = null; |
| 300 this._filmStripRecorder = null; | 300 this._filmStripRecorder = null; |
| 301 } | 301 } |
| 302 }, | 302 }, |
| 303 | 303 |
| 304 _resetFilmStripView: function() | 304 _resetFilmStripView: function() |
| 305 { | 305 { |
| 306 this._filmStripView.reset(); | 306 this._filmStripView.reset(); |
| 307 this._filmStripView.setStatusText(WebInspector.UIString("Hit %s to captu
re frames.", WebInspector.isMac() ? WebInspector.UIString("Cmd+R") : WebInspecto
r.UIString("Ctrl+R"))); | 307 this._filmStripView.setStatusText(WebInspector.UIString("Hit %s to reloa
d and capture filmstrip.", WebInspector.ShortcutsScreen.TimelinePanelShortcuts.R
ecordPageReload[0].name)); |
| 308 }, | 308 }, |
| 309 | 309 |
| 310 /** | 310 /** |
| 311 * @override | 311 * @override |
| 312 * @return {!Array.<!Element>} | 312 * @return {!Array.<!Element>} |
| 313 */ | 313 */ |
| 314 elementsToRestoreScrollPositionsFor: function() | 314 elementsToRestoreScrollPositionsFor: function() |
| 315 { | 315 { |
| 316 return this._networkLogView.elementsToRestoreScrollPositionsFor(); | 316 return this._networkLogView.elementsToRestoreScrollPositionsFor(); |
| 317 }, | 317 }, |
| (...skipping 413 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 731 { | 731 { |
| 732 if (!this._target) | 732 if (!this._target) |
| 733 return; | 733 return; |
| 734 | 734 |
| 735 this._target.tracingManager.stop(); | 735 this._target.tracingManager.stop(); |
| 736 this._target = null; | 736 this._target = null; |
| 737 this._callback = callback; | 737 this._callback = callback; |
| 738 this._filmStripView.setStatusText(WebInspector.UIString("Fetching frames
...")); | 738 this._filmStripView.setStatusText(WebInspector.UIString("Fetching frames
...")); |
| 739 } | 739 } |
| 740 } | 740 } |
| OLD | NEW |