[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75
pfeldman at chromium.org
pfeldman at chromium.org
Thu Oct 29 20:44:23 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit eec48d392f9df8d4f9d57e5a12c2860dd6c3af88
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Oct 14 14:54:18 2009 +0000
2009-10-14 Pavel Feldman <pfeldman at chromium.org>
Not reviewed, reverting r49558 since it broke profiler tests.
https://bugs.webkit.org/show_bug.cgi?id=30328
* bindings/js/JSInspectorBackendCustom.cpp:
* bindings/v8/custom/V8CustomBinding.h:
* inspector/InspectorBackend.cpp:
(WebCore::InspectorBackend::getProfileHeaders):
(WebCore::InspectorBackend::getProfile):
* inspector/InspectorBackend.h:
* inspector/InspectorBackend.idl:
* inspector/InspectorController.cpp:
(WebCore::InspectorController::addProfile):
(WebCore::InspectorController::getProfileHeaders):
(WebCore::InspectorController::getProfile):
(WebCore::InspectorController::createProfileHeader):
* inspector/InspectorController.h:
* inspector/InspectorFrontend.cpp:
(WebCore::InspectorFrontend::addProfileHeader):
(WebCore::InspectorFrontend::didGetProfileHeaders):
(WebCore::InspectorFrontend::didGetProfile):
* inspector/InspectorFrontend.h:
* inspector/JavaScriptProfileNode.cpp:
(WebCore::ProfileNodeClass):
* inspector/front-end/ProfileView.js:
(WebInspector.ProfileView.profileCallback):
(WebInspector.ProfileView):
(WebInspector.ProfileView.prototype._mouseDownInDataGrid):
(WebInspector.ProfileView.prototype._assignParentsInProfile):
* inspector/front-end/ProfilesPanel.js:
(WebInspector.ProfilesPanel.prototype.addProfileHeader):
* inspector/front-end/inspector.js:
(WebInspector.addProfileHeader):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49560 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b14effa..dc572ea 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,39 @@
+2009-10-14 Pavel Feldman <pfeldman at chromium.org>
+
+ Not reviewed, reverting r49558 since it broke profiler tests.
+
+ https://bugs.webkit.org/show_bug.cgi?id=30328
+
+ * bindings/js/JSInspectorBackendCustom.cpp:
+ * bindings/v8/custom/V8CustomBinding.h:
+ * inspector/InspectorBackend.cpp:
+ (WebCore::InspectorBackend::getProfileHeaders):
+ (WebCore::InspectorBackend::getProfile):
+ * inspector/InspectorBackend.h:
+ * inspector/InspectorBackend.idl:
+ * inspector/InspectorController.cpp:
+ (WebCore::InspectorController::addProfile):
+ (WebCore::InspectorController::getProfileHeaders):
+ (WebCore::InspectorController::getProfile):
+ (WebCore::InspectorController::createProfileHeader):
+ * inspector/InspectorController.h:
+ * inspector/InspectorFrontend.cpp:
+ (WebCore::InspectorFrontend::addProfileHeader):
+ (WebCore::InspectorFrontend::didGetProfileHeaders):
+ (WebCore::InspectorFrontend::didGetProfile):
+ * inspector/InspectorFrontend.h:
+ * inspector/JavaScriptProfileNode.cpp:
+ (WebCore::ProfileNodeClass):
+ * inspector/front-end/ProfileView.js:
+ (WebInspector.ProfileView.profileCallback):
+ (WebInspector.ProfileView):
+ (WebInspector.ProfileView.prototype._mouseDownInDataGrid):
+ (WebInspector.ProfileView.prototype._assignParentsInProfile):
+ * inspector/front-end/ProfilesPanel.js:
+ (WebInspector.ProfilesPanel.prototype.addProfileHeader):
+ * inspector/front-end/inspector.js:
+ (WebInspector.addProfileHeader):
+
2009-10-13 Holger Hans Peter Freyther <zecke at selfish.org>
Reviewed by Simon Hausmann.
diff --git a/WebCore/bindings/js/JSInspectorBackendCustom.cpp b/WebCore/bindings/js/JSInspectorBackendCustom.cpp
index 391cacc..73fa268 100644
--- a/WebCore/bindings/js/JSInspectorBackendCustom.cpp
+++ b/WebCore/bindings/js/JSInspectorBackendCustom.cpp
@@ -66,7 +66,10 @@
#if ENABLE(JAVASCRIPT_DEBUGGER)
#include "JavaScriptCallFrame.h"
#include "JavaScriptDebugServer.h"
+#include "JavaScriptProfile.h"
#include "JSJavaScriptCallFrame.h"
+#include <profiler/Profile.h>
+#include <profiler/Profiler.h>
#endif
using namespace JSC;
@@ -250,6 +253,21 @@ JSValue JSInspectorBackend::currentCallFrame(ExecState* exec, const ArgList&)
return JSInspectedObjectWrapper::wrap(globalExec, toJS(exec, callFrame));
}
+JSValue JSInspectorBackend::profiles(JSC::ExecState* exec, const JSC::ArgList&)
+{
+ JSLock lock(SilenceAssertionsOnly);
+ MarkedArgumentBuffer result;
+ InspectorController* ic = impl()->inspectorController();
+ if (!ic)
+ return jsUndefined();
+ const Vector<RefPtr<Profile> >& profiles = ic->profiles();
+
+ for (size_t i = 0; i < profiles.size(); ++i)
+ result.append(toJS(exec, profiles[i].get()));
+
+ return constructArray(exec, result);
+}
+
#endif
JSValue JSInspectorBackend::nodeForId(ExecState* exec, const ArgList& args)
diff --git a/WebCore/bindings/v8/custom/V8CustomBinding.h b/WebCore/bindings/v8/custom/V8CustomBinding.h
index 71dd88e..1f6c2a5 100644
--- a/WebCore/bindings/v8/custom/V8CustomBinding.h
+++ b/WebCore/bindings/v8/custom/V8CustomBinding.h
@@ -461,6 +461,7 @@ namespace WebCore {
DECLARE_CALLBACK(TreeWalkerNextSibling);
DECLARE_CALLBACK(TreeWalkerPreviousSibling);
+ DECLARE_CALLBACK(InspectorBackendProfiles);
DECLARE_CALLBACK(InspectorBackendHighlightDOMNode);
DECLARE_CALLBACK(InspectorBackendAddResourceSourceToFrame);
DECLARE_CALLBACK(InspectorBackendAddSourceToFrame);
diff --git a/WebCore/inspector/InspectorBackend.cpp b/WebCore/inspector/InspectorBackend.cpp
index 7a776c3..76a70f1 100644
--- a/WebCore/inspector/InspectorBackend.cpp
+++ b/WebCore/inspector/InspectorBackend.cpp
@@ -278,6 +278,13 @@ bool InspectorBackend::timelineEnabled() const
}
#if ENABLE(JAVASCRIPT_DEBUGGER)
+const ProfilesArray& InspectorBackend::profiles() const
+{
+ if (m_inspectorController)
+ return m_inspectorController->profiles();
+ return m_emptyProfiles;
+}
+
void InspectorBackend::startProfiling()
{
if (m_inspectorController)
@@ -309,18 +316,6 @@ bool InspectorBackend::profilerEnabled()
return false;
}
-void InspectorBackend::getProfileHeaders(long callId)
-{
- if (m_inspectorController)
- m_inspectorController->getProfileHeaders(callId);
-}
-
-void InspectorBackend::getProfile(long callId, unsigned uid)
-{
- if (m_inspectorController)
- m_inspectorController->getProfile(callId, uid);
-}
-
void InspectorBackend::enableDebugger(bool always)
{
if (m_inspectorController)
diff --git a/WebCore/inspector/InspectorBackend.h b/WebCore/inspector/InspectorBackend.h
index 28581d6..86ee6f9 100644
--- a/WebCore/inspector/InspectorBackend.h
+++ b/WebCore/inspector/InspectorBackend.h
@@ -100,6 +100,8 @@ public:
bool timelineEnabled() const;
#if ENABLE(JAVASCRIPT_DEBUGGER)
+ const ProfilesArray& profiles() const;
+
void startProfiling();
void stopProfiling();
@@ -107,9 +109,6 @@ public:
void disableProfiler(bool always);
bool profilerEnabled();
- void getProfileHeaders(long callId);
- void getProfile(long callId, unsigned uid);
-
void enableDebugger(bool always);
void disableDebugger(bool always);
bool debuggerEnabled() const;
@@ -172,6 +171,9 @@ private:
InspectorController* m_inspectorController;
InspectorClient* m_client;
+#if ENABLE(JAVASCRIPT_DEBUGGER)
+ ProfilesArray m_emptyProfiles;
+#endif
};
} // namespace WebCore
diff --git a/WebCore/inspector/InspectorBackend.idl b/WebCore/inspector/InspectorBackend.idl
index b439af1..ab147ec 100644
--- a/WebCore/inspector/InspectorBackend.idl
+++ b/WebCore/inspector/InspectorBackend.idl
@@ -100,8 +100,7 @@ module core {
void startProfiling();
void stopProfiling();
- void getProfileHeaders(in long callId);
- void getProfile(in long callId, in unsigned long uid);
+ [Custom] Array profiles();
#endif
void dispatchOnInjectedScript(in long callId, in DOMString methodName, in DOMString arguments, in boolean async);
void getChildNodes(in long callId, in long nodeId);
diff --git a/WebCore/inspector/InspectorController.cpp b/WebCore/inspector/InspectorController.cpp
index 51c681c..ff00bf0 100644
--- a/WebCore/inspector/InspectorController.cpp
+++ b/WebCore/inspector/InspectorController.cpp
@@ -1346,11 +1346,11 @@ void InspectorController::addProfile(PassRefPtr<Profile> prpProfile, unsigned li
return;
RefPtr<Profile> profile = prpProfile;
- m_profiles.add(profile->uid(), profile);
+ m_profiles.append(profile);
if (m_frontend) {
JSLock lock(SilenceAssertionsOnly);
- m_frontend->addProfileHeader(createProfileHeader(*profile));
+ m_frontend->addProfile(toJS(m_scriptState, profile.get()));
}
addProfileFinishedMessageToConsole(profile, lineNumber, sourceURL);
@@ -1380,35 +1380,6 @@ void InspectorController::addStartProfilingMessageToConsole(const UString& title
addMessageToConsole(JSMessageSource, LogMessageType, LogMessageLevel, message, lineNumber, sourceURL);
}
-void InspectorController::getProfileHeaders(long callId)
-{
- if (!m_frontend)
- return;
- ScriptArray result = m_frontend->newScriptArray();
- ProfilesMap::iterator profilesEnd = m_profiles.end();
- int i = 0;
- for (ProfilesMap::iterator it = m_profiles.begin(); it != profilesEnd; ++it)
- result.set(i++, createProfileHeader(*it->second));
- m_frontend->didGetProfileHeaders(callId, result);
-}
-
-void InspectorController::getProfile(long callId, unsigned uid)
-{
- if (!m_frontend)
- return;
- ProfilesMap::iterator it = m_profiles.find(uid);
- if (it != m_profiles.end())
- m_frontend->didGetProfile(callId, toJS(m_scriptState, it->second.get()));
-}
-
-ScriptObject InspectorController::createProfileHeader(const JSC::Profile& profile)
-{
- ScriptObject header = m_frontend->newScriptObject();
- header.set("title", profile.title());
- header.set("uid", profile.uid());
- return header;
-}
-
UString InspectorController::getCurrentUserInitiatedProfileName(bool incrementProfileNumber = false)
{
if (incrementProfileNumber)
diff --git a/WebCore/inspector/InspectorController.h b/WebCore/inspector/InspectorController.h
index 5990fbc..1d17899 100644
--- a/WebCore/inspector/InspectorController.h
+++ b/WebCore/inspector/InspectorController.h
@@ -265,6 +265,7 @@ public:
void addProfile(PassRefPtr<JSC::Profile>, unsigned lineNumber, const JSC::UString& sourceURL);
void addProfileFinishedMessageToConsole(PassRefPtr<JSC::Profile>, unsigned lineNumber, const JSC::UString& sourceURL);
void addStartProfilingMessageToConsole(const JSC::UString& title, unsigned lineNumber, const JSC::UString& sourceURL);
+ const ProfilesArray& profiles() const { return m_profiles; }
bool isRecordingUserInitiatedProfile() const { return m_recordingUserInitiatedProfile; }
@@ -314,14 +315,9 @@ private:
void deleteCookie(const String& cookieName, const String& domain);
#if ENABLE(JAVASCRIPT_DEBUGGER)
- typedef HashMap<unsigned int, RefPtr<JSC::Profile> > ProfilesMap;
-
void startUserInitiatedProfilingSoon();
void toggleRecordButton(bool);
void enableDebuggerFromFrontend(bool always);
- void getProfileHeaders(long callId);
- void getProfile(long callId, unsigned uid);
- ScriptObject createProfileHeader(const JSC::Profile& profile);
#endif
#if ENABLE(DATABASE)
void selectDatabase(Database* database);
@@ -398,7 +394,7 @@ private:
int m_currentUserInitiatedProfileNumber;
unsigned m_nextUserInitiatedProfileNumber;
Timer<InspectorController> m_startProfiling;
- ProfilesMap m_profiles;
+ ProfilesArray m_profiles;
#endif
};
diff --git a/WebCore/inspector/InspectorFrontend.cpp b/WebCore/inspector/InspectorFrontend.cpp
index ad6a511..bdb622d 100644
--- a/WebCore/inspector/InspectorFrontend.cpp
+++ b/WebCore/inspector/InspectorFrontend.cpp
@@ -261,9 +261,9 @@ void InspectorFrontend::failedToParseScriptSource(const JSC::SourceCode& source,
function->call();
}
-void InspectorFrontend::addProfileHeader(const ScriptValue& profile)
+void InspectorFrontend::addProfile(const JSC::JSValue& profile)
{
- OwnPtr<ScriptFunctionCall> function(newFunctionCall("addProfileHeader"));
+ OwnPtr<ScriptFunctionCall> function(newFunctionCall("addProfile"));
function->appendArgument(profile);
function->call();
}
@@ -275,22 +275,6 @@ void InspectorFrontend::setRecordingProfile(bool isProfiling)
function->call();
}
-void InspectorFrontend::didGetProfileHeaders(int callId, const ScriptArray& headers)
-{
- OwnPtr<ScriptFunctionCall> function(newFunctionCall("didGetProfileHeaders"));
- function->appendArgument(callId);
- function->appendArgument(headers);
- function->call();
-}
-
-void InspectorFrontend::didGetProfile(int callId, const ScriptValue& profile)
-{
- OwnPtr<ScriptFunctionCall> function(newFunctionCall("didGetProfile"));
- function->appendArgument(callId);
- function->appendArgument(profile);
- function->call();
-}
-
void InspectorFrontend::pausedScript(const ScriptValue& callFrames)
{
OwnPtr<ScriptFunctionCall> function(newFunctionCall("pausedScript"));
diff --git a/WebCore/inspector/InspectorFrontend.h b/WebCore/inspector/InspectorFrontend.h
index 586c893..1d7adf0 100644
--- a/WebCore/inspector/InspectorFrontend.h
+++ b/WebCore/inspector/InspectorFrontend.h
@@ -89,10 +89,8 @@ namespace WebCore {
void profilerWasDisabled();
void parsedScriptSource(const JSC::SourceCode&);
void failedToParseScriptSource(const JSC::SourceCode&, int errorLine, const JSC::UString& errorMessage);
- void addProfileHeader(const ScriptValue& profile);
+ void addProfile(const JSC::JSValue& profile);
void setRecordingProfile(bool isProfiling);
- void didGetProfileHeaders(int callId, const ScriptArray& headers);
- void didGetProfile(int callId, const ScriptValue& profile);
void pausedScript(const ScriptValue& callFrames);
void resumedScript();
#endif
diff --git a/WebCore/inspector/JavaScriptProfileNode.cpp b/WebCore/inspector/JavaScriptProfileNode.cpp
index 84a0200..3c3e279 100644
--- a/WebCore/inspector/JavaScriptProfileNode.cpp
+++ b/WebCore/inspector/JavaScriptProfileNode.cpp
@@ -104,6 +104,28 @@ static JSValueRef getSelfTime(JSContextRef ctx, JSObjectRef thisObject, JSString
return JSValueMakeNumber(ctx, profileNode->selfTime());
}
+static JSValueRef getTotalPercent(JSContextRef ctx, JSObjectRef thisObject, JSStringRef, JSValueRef*)
+{
+ JSC::JSLock lock(SilenceAssertionsOnly);
+
+ if (!JSValueIsObjectOfClass(ctx, thisObject, ProfileNodeClass()))
+ return JSValueMakeUndefined(ctx);
+
+ ProfileNode* profileNode = static_cast<ProfileNode*>(JSObjectGetPrivate(thisObject));
+ return JSValueMakeNumber(ctx, profileNode->totalPercent());
+}
+
+static JSValueRef getSelfPercent(JSContextRef ctx, JSObjectRef thisObject, JSStringRef, JSValueRef*)
+{
+ JSC::JSLock lock(SilenceAssertionsOnly);
+
+ if (!JSValueIsObjectOfClass(ctx, thisObject, ProfileNodeClass()))
+ return JSValueMakeUndefined(ctx);
+
+ ProfileNode* profileNode = static_cast<ProfileNode*>(JSObjectGetPrivate(thisObject));
+ return JSValueMakeNumber(ctx, profileNode->selfPercent());
+}
+
static JSValueRef getNumberOfCalls(JSContextRef ctx, JSObjectRef thisObject, JSStringRef, JSValueRef*)
{
JSC::JSLock lock(SilenceAssertionsOnly);
@@ -162,6 +184,41 @@ static JSValueRef getChildren(JSContextRef ctx, JSObjectRef thisObject, JSString
return result;
}
+static JSValueRef getParent(JSContextRef ctx, JSObjectRef thisObject, JSStringRef, JSValueRef*)
+{
+ JSC::JSLock lock(SilenceAssertionsOnly);
+
+ if (!JSValueIsObjectOfClass(ctx, thisObject, ProfileNodeClass()))
+ return JSValueMakeUndefined(ctx);
+
+ ProfileNode* profileNode = static_cast<ProfileNode*>(JSObjectGetPrivate(thisObject));
+ ExecState* exec = toJS(ctx);
+ return toRef(exec, toJS(exec, profileNode->parent()));
+}
+
+static JSValueRef getHead(JSContextRef ctx, JSObjectRef thisObject, JSStringRef, JSValueRef*)
+{
+ JSC::JSLock lock(SilenceAssertionsOnly);
+
+ if (!JSValueIsObjectOfClass(ctx, thisObject, ProfileNodeClass()))
+ return JSValueMakeUndefined(ctx);
+
+ ProfileNode* profileNode = static_cast<ProfileNode*>(JSObjectGetPrivate(thisObject));
+ ExecState* exec = toJS(ctx);
+ return toRef(exec, toJS(exec, profileNode->head()));
+}
+
+static JSValueRef getVisible(JSContextRef ctx, JSObjectRef thisObject, JSStringRef, JSValueRef*)
+{
+ JSC::JSLock lock(SilenceAssertionsOnly);
+
+ if (!JSValueIsObjectOfClass(ctx, thisObject, ProfileNodeClass()))
+ return JSValueMakeUndefined(ctx);
+
+ ProfileNode* profileNode = static_cast<ProfileNode*>(JSObjectGetPrivate(thisObject));
+ return JSValueMakeBoolean(ctx, profileNode->visible());
+}
+
static JSValueRef getCallUID(JSContextRef ctx, JSObjectRef thisObject, JSStringRef, JSValueRef*)
{
JSC::JSLock lock(SilenceAssertionsOnly);
@@ -188,8 +245,13 @@ JSClassRef ProfileNodeClass()
{ "lineNumber", getLineNumber, 0, kJSPropertyAttributeNone },
{ "totalTime", getTotalTime, 0, kJSPropertyAttributeNone },
{ "selfTime", getSelfTime, 0, kJSPropertyAttributeNone },
+ { "totalPercent", getTotalPercent, 0, kJSPropertyAttributeNone },
+ { "selfPercent", getSelfPercent, 0, kJSPropertyAttributeNone },
{ "numberOfCalls", getNumberOfCalls, 0, kJSPropertyAttributeNone },
{ "children", getChildren, 0, kJSPropertyAttributeNone },
+ { "parent", getParent, 0, kJSPropertyAttributeNone },
+ { "head", getHead, 0, kJSClassAttributeNone },
+ { "visible", getVisible, 0, kJSPropertyAttributeNone },
{ "callUID", getCallUID, 0, kJSPropertyAttributeNone },
{ 0, 0, 0, 0 }
};
diff --git a/WebCore/inspector/front-end/ProfileView.js b/WebCore/inspector/front-end/ProfileView.js
index a8c3f14..2b8c6ce 100644
--- a/WebCore/inspector/front-end/ProfileView.js
+++ b/WebCore/inspector/front-end/ProfileView.js
@@ -78,22 +78,12 @@ WebInspector.ProfileView = function(profile)
this.profile = profile;
- var self = this;
- function profileCallback(profile)
- {
- self.profile = profile;
- self._assignParentsInProfile();
-
- self.profileDataGridTree = self.bottomUpProfileDataGridTree;
- self.profileDataGridTree.sort(WebInspector.ProfileDataGridTree.propertyComparator("selfTime", false));
-
- self.refresh();
-
- self._updatePercentButton();
- }
+ this.profileDataGridTree = this.bottomUpProfileDataGridTree;
+ this.profileDataGridTree.sort(WebInspector.ProfileDataGridTree.propertyComparator("selfTime", false));
+
+ this.refresh();
- var callId = WebInspector.Callback.wrap(profileCallback);
- InspectorController.getProfile(callId, this.profile.uid);
+ this._updatePercentButton();
}
WebInspector.ProfileView.prototype = {
@@ -543,26 +533,6 @@ WebInspector.ProfileView.prototype = {
event.preventDefault();
event.stopPropagation();
- },
-
- _assignParentsInProfile: function()
- {
- var head = this.profile.head;
- head.parent = null;
- head.head = null;
- var nodesToTraverse = [ { parent: head, children: head.children } ];
- while (nodesToTraverse.length > 0) {
- var pair = nodesToTraverse.shift();
- var parent = pair.parent;
- var children = pair.children;
- var length = children.length;
- for (var i = 0; i < length; ++i) {
- children[i].head = head;
- children[i].parent = parent;
- if (children[i].children.length > 0)
- nodesToTraverse.push({ parent: children[i], children: children[i].children });
- }
- }
}
}
diff --git a/WebCore/inspector/front-end/ProfilesPanel.js b/WebCore/inspector/front-end/ProfilesPanel.js
index ced9587..ab23f1f 100644
--- a/WebCore/inspector/front-end/ProfilesPanel.js
+++ b/WebCore/inspector/front-end/ProfilesPanel.js
@@ -161,7 +161,7 @@ WebInspector.ProfilesPanel.prototype = {
this.sidebarTree.handleKeyEvent(event);
},
- addProfileHeader: function(profile)
+ addProfile: function(profile)
{
this._profiles.push(profile);
this._profilesIdMap[profile.uid] = profile;
@@ -401,17 +401,15 @@ WebInspector.ProfilesPanel.prototype = {
if (cpuProfiles.children.length)
return;
- function populateCallback(profileHeaders) {
- profileHeaders.sort(function(a, b) { return a.uid - b.uid; });
- var profileHeadersLength = profileHeaders.length;
- for (var i = 0; i < profileHeadersLength; ++i)
- WebInspector.addProfileHeader(profileHeaders[i]);
- if (cpuProfiles.children[0])
- cpuProfiles.children[0].select();
+ var profiles = InspectorController.profiles();
+ var profilesLength = profiles.length;
+ for (var i = 0; i < profilesLength; ++i) {
+ var profile = profiles[i];
+ this.addProfile(profile);
}
- var callId = WebInspector.Callback.wrap(populateCallback);
- InspectorController.getProfileHeaders(callId);
+ if (cpuProfiles.children[0])
+ cpuProfiles.children[0].select();
delete this._shouldPopulateProfiles;
},
@@ -537,6 +535,3 @@ WebInspector.ProfileGroupSidebarTreeElement.prototype = {
}
WebInspector.ProfileGroupSidebarTreeElement.prototype.__proto__ = WebInspector.SidebarTreeElement.prototype;
-
-WebInspector.didGetProfileHeaders = WebInspector.Callback.processCallback;
-WebInspector.didGetProfile = WebInspector.Callback.processCallback;
diff --git a/WebCore/inspector/front-end/inspector.js b/WebCore/inspector/front-end/inspector.js
index 909a5b6..8cf7615 100644
--- a/WebCore/inspector/front-end/inspector.js
+++ b/WebCore/inspector/front-end/inspector.js
@@ -1262,9 +1262,9 @@ WebInspector.log = function(message)
logMessage(message);
}
-WebInspector.addProfileHeader = function(profile)
+WebInspector.addProfile = function(profile)
{
- this.panels.profiles.addProfileHeader(profile);
+ this.panels.profiles.addProfile(profile);
}
WebInspector.setRecordingProfile = function(isProfiling)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list