Changeset 143159 in webkit

Timestamp:

Feb 17, 2013 11:51:52 PM (11 years ago)

Author:

eustas@chromium.org

Message:

Web Inspector: Introduce ProfilesPanelDescriptor.
​https://bugs.webkit.org/show_bug.cgi?id=109906

Reviewed by Pavel Feldman.

Source/WebCore:

Some constants/methods should be accesible before ProfilesPanel
is instantiated.

Extracted methods to check if profile is "user-initiated" and what is
its index.

Also profile URL regexp moved to ProfilesPanelDescriptor.

• inspector/front-end/ProfilesPanelDescriptor.js: Added.
• WebCore.gypi: Added ProfilesPanelDescriptor.js
• WebCore.vcproj/WebCore.vcproj: Ditto.
• inspector/compile-front-end.py: Ditto.
• inspector/front-end/WebKit.qrc: Ditto.
• inspector/front-end/inspector.html: Ditto.
• inspector/front-end/HeapSnapshotView.js: Adopted changes.
• inspector/front-end/ProfilesPanel.js: Ditto.
• inspector/front-end/externs.js: Ditto.
• inspector/front-end/inspector.js: Ditto.

LayoutTests:

• inspector/profiler/heap-snapshot-test.js: Adopted changes.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/profiler/heap-snapshot-test.js (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/WebCore.gypi (modified) (1 diff)
• Source/WebCore/WebCore.vcproj/WebCore.vcproj (modified) (1 diff)
• Source/WebCore/inspector/compile-front-end.py (modified) (1 diff)
• Source/WebCore/inspector/front-end/HeapSnapshotView.js (modified) (2 diffs)
• Source/WebCore/inspector/front-end/ProfilesPanel.js (modified) (5 diffs)
• Source/WebCore/inspector/front-end/ProfilesPanelDescriptor.js (added)
• Source/WebCore/inspector/front-end/WebKit.qrc (modified) (1 diff)
• Source/WebCore/inspector/front-end/externs.js (modified) (1 diff)
• Source/WebCore/inspector/front-end/inspector.html (modified) (1 diff)
• Source/WebCore/inspector/front-end/inspector.js (modified) (5 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-02-15  Eugene Klyuchnikov  <eustas@chromium.org>
+
+        Web Inspector: Introduce ProfilesPanelDescriptor.
+        https://bugs.webkit.org/show_bug.cgi?id=109906
+
+        Reviewed by Pavel Feldman.
+
+        * inspector/profiler/heap-snapshot-test.js: Adopted changes.
+
 2013-02-17  Takashi Toyoshima  <toyoshim@chromium.org>
 

trunk/LayoutTests/inspector/profiler/heap-snapshot-test.js

@@ -723 +723 @@
     var profileType = WebInspector.panels.profiles.getProfileType(WebInspector.HeapSnapshotProfileType.TypeId);
     var profile = profileType.createProfile({
-        title: UserInitiatedProfileName + "." + uid,
+        title: WebInspector.ProfilesPanelDescriptor.UserInitiatedProfileName + "." + uid,
         uid: uid,
         maxJSObjectId: snapshot.maxJSObjectId

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-15  Eugene Klyuchnikov  <eustas@chromium.org>
+
+        Web Inspector: Introduce ProfilesPanelDescriptor.
+        https://bugs.webkit.org/show_bug.cgi?id=109906
+
+        Reviewed by Pavel Feldman.
+
+        Some constants/methods should be accesible before ProfilesPanel
+        is instantiated.
+
+        Extracted methods to check if profile is "user-initiated" and what is
+        its index.
+
+        Also profile URL regexp moved to ProfilesPanelDescriptor.
+
+        * inspector/front-end/ProfilesPanelDescriptor.js: Added.
+        * WebCore.gypi: Added ProfilesPanelDescriptor.js
+        * WebCore.vcproj/WebCore.vcproj: Ditto.
+        * inspector/compile-front-end.py: Ditto.
+        * inspector/front-end/WebKit.qrc: Ditto.
+        * inspector/front-end/inspector.html: Ditto.
+        * inspector/front-end/HeapSnapshotView.js: Adopted changes.
+        * inspector/front-end/ProfilesPanel.js: Ditto.
+        * inspector/front-end/externs.js: Ditto.
+        * inspector/front-end/inspector.js: Ditto.
+
 2013-02-17  Dimitri Glazkov  <dglazkov@chromium.org>
 

trunk/Source/WebCore/WebCore.gypi

@@ -5255 +5255 @@
             'inspector/front-end/Popover.js',
             'inspector/front-end/PresentationConsoleMessageHelper.js',
+            'inspector/front-end/ProfilesPanelDescriptor.js',
             'inspector/front-end/Progress.js',
             'inspector/front-end/ProgressIndicator.js',

trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj

@@ -77627 +77627 @@
                                 </File>
                                 <File
+                                        RelativePath="..\inspector\front-end\ProfilesPanelDescriptor.js"
+                                        >
+                                </File>
+                                <File
                                         RelativePath="..\inspector\front-end\Progress.js"
                                         >

trunk/Source/WebCore/inspector/compile-front-end.py

@@ -349 +349 @@
             "ProfileDataGridTree.js",
             "ProfilesPanel.js",
+            "ProfilesPanelDescriptor.js",
             "ProfileLauncherView.js",
             "TopDownProfileDataGridTree.js",

trunk/Source/WebCore/inspector/front-end/HeapSnapshotView.js

@@ -699 +699 @@
             var baseOption = document.createElement("option");
             var title = list[i].title;
-            if (!title.indexOf(UserInitiatedProfileName))
-                title = WebInspector.UIString("Snapshot %d", title.substring(UserInitiatedProfileName.length + 1));
+            if (WebInspector.ProfilesPanelDescriptor.isUserInitiatedProfile(title))
+                title = WebInspector.UIString("Snapshot %d", WebInspector.ProfilesPanelDescriptor.userInitiatedProfileIndex(title));
             baseOption.label = title;
             this.baseSelectElement.appendChild(baseOption);
@@ -725 +725 @@
             var filterOption = document.createElement("option");
             var title = list[i].title;
-            if (!title.indexOf(UserInitiatedProfileName)) {
+            if (WebInspector.ProfilesPanelDescriptor.isUserInitiatedProfile(title)) {
+                var profileIndex = WebInspector.ProfilesPanelDescriptor.userInitiatedProfileIndex(title);
                 if (!i)
-                    title = WebInspector.UIString("Objects allocated before Snapshot %d", title.substring(UserInitiatedProfileName.length + 1));
+                    title = WebInspector.UIString("Objects allocated before Snapshot %d", profileIndex);
                 else
-                    title = WebInspector.UIString("Objects allocated between Snapshots %d and %d", title.substring(UserInitiatedProfileName.length + 1) - 1, title.substring(UserInitiatedProfileName.length + 1));
+                    title = WebInspector.UIString("Objects allocated between Snapshots %d and %d", profileIndex - 1, profileIndex);
             }
             filterOption.label = title;

trunk/Source/WebCore/inspector/front-end/ProfilesPanel.js

@@ -341 +341 @@
 
         var profileType = this.getProfileType(WebInspector.HeapSnapshotProfileType.TypeId);
-        var temporaryProfile = profileType.createTemporaryProfile(UserInitiatedProfileName + "." + file.name);
+        var temporaryProfile = profileType.createTemporaryProfile(WebInspector.ProfilesPanelDescriptor.UserInitiatedProfileName + "." + file.name);
         this.addProfileHeader(temporaryProfile);
 
@@ -557 +557 @@
         this._profilesIdMap[this._makeKey(profile.uid, typeId)] = profile;
 
-        if (!profile.title.startsWith(UserInitiatedProfileName)) {
+        if (!WebInspector.ProfilesPanelDescriptor.isUserInitiatedProfile(profile.title)) {
             var profileTitleKey = this._makeTitleKey(profile.title, typeId);
             if (!(profileTitleKey in this._profileGroups))
@@ -790 +790 @@
     showProfileForURL: function(url)
     {
-        var match = url.match(WebInspector.ProfileURLRegExp);
+        var match = url.match(WebInspector.ProfilesPanelDescriptor.ProfileURLRegExp);
         if (!match)
             return;
@@ -1396 +1396 @@
     this._titleFormat = titleFormat;
 
-    if (this.profile.title.startsWith(UserInitiatedProfileName))
-        this._profileNumber = this.profile.title.substring(UserInitiatedProfileName.length + 1);
+    if (WebInspector.ProfilesPanelDescriptor.isUserInitiatedProfile(this.profile.title))
+        this._profileNumber = WebInspector.ProfilesPanelDescriptor.userInitiatedProfileIndex(this.profile.title);
 
     WebInspector.SidebarTreeElement.call(this, className, "", "", profile, false);
@@ -1421 +1421 @@
         if (this._mainTitle)
             return this._mainTitle;
-        if (this.profile.title.startsWith(UserInitiatedProfileName))
+        if (WebInspector.ProfilesPanelDescriptor.isUserInitiatedProfile(this.profile.title))
             return WebInspector.UIString(this._titleFormat, this._profileNumber);
         return this.profile.title;

trunk/Source/WebCore/inspector/front-end/WebKit.qrc

@@ -140 +140 @@
     <file>ProfileLauncherView.js</file>
     <file>ProfilesPanel.js</file>
+    <file>ProfilesPanelDescriptor.js</file>
     <file>Progress.js</file>
     <file>ProgressIndicator.js</file>

trunk/Source/WebCore/inspector/front-end/externs.js

@@ -330 +330 @@
 WebInspector.CodeMirrorTextEditor = function(url, delegate) { }
 
-WebInspector.ProfileURLRegExp = "";
-
-
 /** @type {boolean} */
 window.dispatchStandaloneTestRunnerMessages;

trunk/Source/WebCore/inspector/front-end/inspector.html

@@ -178 +178 @@
     <script type="text/javascript" src="ElementsPanelDescriptor.js"></script>
     <script type="text/javascript" src="NetworkPanelDescriptor.js"></script>
+    <script type="text/javascript" src="ProfilesPanelDescriptor.js"></script>
     <script type="text/javascript" src="ScriptsPanelDescriptor.js"></script>
     <script type="text/javascript" src="TimelinePanelDescriptor.js"></script>

trunk/Source/WebCore/inspector/front-end/inspector.js

@@ -43 +43 @@
         var scripts = new WebInspector.ScriptsPanelDescriptor();
         var timeline = new WebInspector.TimelinePanelDescriptor();
-        var profiles = new WebInspector.PanelDescriptor("profiles", WebInspector.UIString("Profiles"), "ProfilesPanel", "ProfilesPanel.js");
+        var profiles = new WebInspector.ProfilesPanelDescriptor();
         var audits = new WebInspector.PanelDescriptor("audits", WebInspector.UIString("Audits"), "AuditsPanel", "AuditsPanel.js");
         var console = new WebInspector.PanelDescriptor("console", WebInspector.UIString("Console"), "ConsolePanel");
@@ -275 +275 @@
     _profilesLinkifier: function(title)
     {
-        var profileStringMatches = WebInspector.ProfileURLRegExp.exec(title);
+        var profileStringMatches = WebInspector.ProfilesPanelDescriptor.ProfileURLRegExp.exec(title);
         if (profileStringMatches) {
             var profilesPanel = /** @ type {WebInspector.ProfilesPanel} */ WebInspector.panel("profiles");
@@ -583 +583 @@
 {
     var anchor = event.target.enclosingNodeOrSelfWithNodeName("a");
-    if (!anchor || (anchor.target === "_blank" && !WebInspector.ProfileURLRegExp.exec(anchor.href)))
+    if (!anchor || (anchor.target === "_blank" && !WebInspector.ProfilesPanelDescriptor.ProfileURLRegExp.exec(anchor.href)))
         return;
 
@@ -594 +594 @@
             return;
 
-        const profileMatch = WebInspector.ProfileURLRegExp.exec(anchor.href);
+        const profileMatch = WebInspector.ProfilesPanelDescriptor.ProfileURLRegExp.exec(anchor.href);
         if (profileMatch) {
             WebInspector.showProfileForURL(anchor.href);
@@ -1005 +1005 @@
 }
 
-WebInspector.ProfileURLRegExp = /webkit-profile:\/\/(.+)\/(.+)#([0-9]+)/;
-
 WebInspector.Zoom = {
     Table: [0.25, 0.33, 0.5, 0.66, 0.75, 0.9, 1, 1.1, 1.25, 1.5, 1.75, 2, 2.5, 3, 4, 5],