summaryrefslogtreecommitdiffstats
path: root/webkit/glue
diff options
context:
space:
mode:
authormnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-14 13:47:18 +0000
committermnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-14 13:47:18 +0000
commit370c828c355c779a8890089e4ee6d155c4e85c20 (patch)
treeee301534a1b8d71063283d71314e042a28ac59cb /webkit/glue
parent38b7607f0ce2bbda1f6bbce1465249aa4b3f3a27 (diff)
downloadchromium_src-370c828c355c779a8890089e4ee6d155c4e85c20.zip
chromium_src-370c828c355c779a8890089e4ee6d155c4e85c20.tar.gz
chromium_src-370c828c355c779a8890089e4ee6d155c4e85c20.tar.bz2
DevTools: prepare for a patch from WebKit bug 30328.
BUG=none TEST=none Review URL: http://codereview.chromium.org/269075 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28957 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
-rw-r--r--webkit/glue/devtools/js/devtools.js10
-rw-r--r--webkit/glue/devtools/js/inspector_controller.js3
2 files changed, 13 insertions, 0 deletions
diff --git a/webkit/glue/devtools/js/devtools.js b/webkit/glue/devtools/js/devtools.js
index 47034a4..522e698 100644
--- a/webkit/glue/devtools/js/devtools.js
+++ b/webkit/glue/devtools/js/devtools.js
@@ -426,3 +426,13 @@ WebInspector.ResourcesPanel.prototype._createResourceView = function(
return orig.apply(this, arguments);
};
})();
+
+// Temporary workaround for a patch from WebKit bug 30328.
+// TODO(mnaganov): Remove when after WebKit roll.
+if (!('addProfile' in WebInspector)) {
+ WebInspector.addProfile = function(profile) {
+ WebInspector.__fullProfiles = WebInspector.__fullProfiles || {};
+ WebInspector.__fullProfiles[profile.uid] = profile;
+ WebInspector.addProfileHeader(profile);
+ };
+}
diff --git a/webkit/glue/devtools/js/inspector_controller.js b/webkit/glue/devtools/js/inspector_controller.js
index 435d26e..474b0b5 100644
--- a/webkit/glue/devtools/js/inspector_controller.js
+++ b/webkit/glue/devtools/js/inspector_controller.js
@@ -466,6 +466,9 @@ devtools.InspectorController.prototype.getProfileHeaders = function(callId) {
* Async function for lazy loading an existing profile.
*/
devtools.InspectorController.prototype.getProfile = function(callId, uid) {
+ if (WebInspector.__fullProfiles && (uid in WebInspector.__fullProfiles)) {
+ WebInspector.didGetProfile(callId, WebInspector.__fullProfiles[uid]);
+ }
};