Bug 59590 - Web Inspector: clicking bookmarklet multiplies resources panel entries.
Summary: Web Inspector: clicking bookmarklet multiplies resources panel entries.
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: Web Inspector (Deprecated) (show other bugs)
Version: 528+ (Nightly build)
Hardware: All All
: P2 Normal
Assignee: Pavel Feldman
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-04-27 02:28 PDT by Pavel Feldman
Modified: 2011-04-27 07:42 PDT (History)
14 users (show)

See Also:


Attachments
Patch (6.59 KB, patch)
2011-04-27 05:04 PDT, Pavel Feldman
no flags Details | Formatted Diff | Diff
Patch (7.53 KB, patch)
2011-04-27 05:24 PDT, Pavel Feldman
yurys: review+
Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Pavel Feldman 2011-04-27 02:28:17 PDT
Patch to follow.
Comment 1 Pavel Feldman 2011-04-27 05:04:24 PDT
Created attachment 91271 [details]
Patch
Comment 2 Yury Semikhatsky 2011-04-27 05:13:54 PDT
Comment on attachment 91271 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=91271&action=review

> Source/WebCore/ChangeLog:19
> +2011-04-27  Pavel Feldman  <pfeldman@google.com>

poor merge?

> Source/WebCore/inspector/front-end/ResourceTreeModel.js:73
>          this.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTypes.CachedResourcesLoaded);

Can we get rid of this call in favor of _frameNavigated?
Comment 3 Pavel Feldman 2011-04-27 05:24:35 PDT
Created attachment 91273 [details]
Patch
Comment 4 Yury Semikhatsky 2011-04-27 05:29:45 PDT
Comment on attachment 91273 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=91273&action=review

> Source/WebCore/inspector/front-end/ResourceTreeModel.js:136
>              WebInspector.mainResource = this.resourceForURL(frame.url);

Can you swap this line with the one above?

> Source/WebCore/inspector/front-end/ResourcesPanel.js:1017
> +        this._treeElementForResource[resource.url] = resourceTreeElement;

I'd rather move it to the beginning of the method.

> Source/WebCore/inspector/front-end/ResourcesPanel.js:1022
> +        WebInspector.BaseStorageTreeElement.prototype.removeChildren.call();

call(this)
Comment 5 Pavel Feldman 2011-04-27 05:37:30 PDT
Committed r85048: <http://trac.webkit.org/changeset/85048>
Comment 6 Csaba Osztrogonác 2011-04-27 07:33:15 PDT
It seems that a test need rebaseline after this patch.
Could you confirm it?

--- /Volumes/Data/WebKit-BuildSlave/snowleopard-intel-release-tests/build/layout-test-results/inspector/extensions/extensions-events-expected.txt	2011-04-27 05:54:26.000000000 -0700
+++ /Volumes/Data/WebKit-BuildSlave/snowleopard-intel-release-tests/build/layout-test-results/inspector/extensions/extensions-events-actual.txt	2011-04-27 05:54:26.000000000 -0700
@@ -5,8 +5,8 @@
 RUNNING TEST: extension_testOnNavigated
 Page reloaded.
 Page reloaded.
-Navigated to: extensions-events.html
 Navigated to: extensions-events.html?navigated
+Navigated to: extensions-events.html
 RUNNING TEST: extension_testOnResourceFinished
 onFinished fired
 RUNNING TEST: extension_testOnSelectionChanged
Comment 7 WebKit Review Bot 2011-04-27 07:42:11 PDT
http://trac.webkit.org/changeset/85048 might have broken SnowLeopard Intel Release (Tests)
The following tests are not passing:
inspector/extensions/extensions-events.html