diff options
author | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-04 08:34:42 +0000 |
---|---|---|
committer | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-04 08:34:42 +0000 |
commit | f7d8990e20a92e0e83f69d3cde7c1979cd4cc6f8 (patch) | |
tree | bf0d9c6fb6b551b4693e5df806a56df5aa6af0eb /webkit/glue/devtools | |
parent | dbd66915c44803aea177d24295893591e131176c (diff) | |
download | chromium_src-f7d8990e20a92e0e83f69d3cde7c1979cd4cc6f8.zip chromium_src-f7d8990e20a92e0e83f69d3cde7c1979cd4cc6f8.tar.gz chromium_src-f7d8990e20a92e0e83f69d3cde7c1979cd4cc6f8.tar.bz2 |
APU: Makes appropriate devtools updates for empty TimelineAgent implementation.
Original review url: http://codereview.chromium.org/174131
TBR=knorton
Review URL: http://codereview.chromium.org/200017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25437 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/devtools')
-rw-r--r-- | webkit/glue/devtools/js/devtools.html | 1 | ||||
-rw-r--r-- | webkit/glue/devtools/js/inspector_controller.js | 30 | ||||
-rw-r--r-- | webkit/glue/devtools/js/inspector_controller_impl.js | 2 |
3 files changed, 33 insertions, 0 deletions
diff --git a/webkit/glue/devtools/js/devtools.html b/webkit/glue/devtools/js/devtools.html index 9c88467..82bcaf5 100644 --- a/webkit/glue/devtools/js/devtools.html +++ b/webkit/glue/devtools/js/devtools.html @@ -72,6 +72,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. <script type="text/javascript" src="Database.js"></script> <script type="text/javascript" src="Callback.js"></script> <script type="text/javascript" src="DOMAgent.js"></script> + <script type="text/javascript" src="TimelineAgent.js"></script> <script type="text/javascript" src="inspector_controller_impl.js"></script> <script type="text/javascript" src="DOMStorage.js"></script> <script type="text/javascript" src="DOMStorageItemsView.js"></script> diff --git a/webkit/glue/devtools/js/inspector_controller.js b/webkit/glue/devtools/js/inspector_controller.js index 235c166..5cca4a2 100644 --- a/webkit/glue/devtools/js/inspector_controller.js +++ b/webkit/glue/devtools/js/inspector_controller.js @@ -46,6 +46,11 @@ devtools.InspectorController = function() { * @type {boolean} */ this.resourceTrackingEnabled_ = false; + + /** + * @type {boolean} + */ + this.timelineEnabled_ = false; }; @@ -282,6 +287,31 @@ devtools.InspectorController.prototype.resourceTrackingEnabled = function() { /** + * Enables timeline. + */ +devtools.InspectorController.prototype.enableTimeline = function() { + this.timelineEnabled_ = true; + WebInspector.timelineWasEnabled(); +}; + + +/** + * Disables timeline. + */ +devtools.InspectorController.prototype.disableTimeline = function() { + this.timelineEnabled_ = false; + WebInspector.timelineWasDisabled(); +}; + +/** + * @return {boolean} True iff timeline is enabled. + */ +devtools.InspectorController.prototype.timelineEnabled = function() { + return this.timelineEnabled_; +}; + + +/** * Enables debugger. */ devtools.InspectorController.prototype.enableDebugger = function() { diff --git a/webkit/glue/devtools/js/inspector_controller_impl.js b/webkit/glue/devtools/js/inspector_controller_impl.js index c23ee1f..0f12035 100644 --- a/webkit/glue/devtools/js/inspector_controller_impl.js +++ b/webkit/glue/devtools/js/inspector_controller_impl.js @@ -23,6 +23,8 @@ devtools.InspectorControllerImpl = function() { this.installInspectorControllerDelegate_('setTextNodeValue'); this.installInspectorControllerDelegate_('enableResourceTracking'); this.installInspectorControllerDelegate_('disableResourceTracking'); + this.installInspectorControllerDelegate_('enableTimeline'); + this.installInspectorControllerDelegate_('disableTimeline'); this.installInjectedScriptDelegate_('getStyles'); this.installInjectedScriptDelegate_('getComputedStyle'); |