diff options
| author | Steve Block <steveblock@google.com> | 2011-05-25 19:08:45 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-08 13:51:31 +0100 |
| commit | 2bde8e466a4451c7319e3a072d118917957d6554 (patch) | |
| tree | 28f4a1b869a513e565c7760d0e6a06e7cf1fe95a /Source/WebCore/inspector/front-end/ProfileView.js | |
| parent | 6939c99b71d9372d14a0c74a772108052e8c48c8 (diff) | |
| download | external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.zip external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.gz external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.bz2 | |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
Diffstat (limited to 'Source/WebCore/inspector/front-end/ProfileView.js')
| -rw-r--r-- | Source/WebCore/inspector/front-end/ProfileView.js | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Source/WebCore/inspector/front-end/ProfileView.js b/Source/WebCore/inspector/front-end/ProfileView.js index 335bf03..a8c5ff4 100644 --- a/Source/WebCore/inspector/front-end/ProfileView.js +++ b/Source/WebCore/inspector/front-end/ProfileView.js @@ -81,8 +81,10 @@ WebInspector.CPUProfileView = function(profile) this.profile = profile; var self = this; - function profileCallback(profile) + function profileCallback(error, profile) { + if (error) + return; self.profile.head = profile.head; self._assignParentsInProfile(); @@ -593,9 +595,9 @@ WebInspector.CPUProfileType.prototype = { this._recording = !this._recording; if (this._recording) - InspectorAgent.startProfiling(); + ProfilerAgent.start(); else - InspectorAgent.stopProfiling(); + ProfilerAgent.stop(); }, get welcomeMessage() |