Title: [126584] trunk
Revision
126584
Author
[email protected]
Date
2012-08-24 07:05:40 -0700 (Fri, 24 Aug 2012)

Log Message

Web Inspector: Get rid of frontendReused logic on front-end.
https://bugs.webkit.org/show_bug.cgi?id=94929

Reviewed by Pavel Feldman.

Source/WebCore:

Removed frontendReused method from ResourceTreeModel.

* inspector/front-end/ResourceTreeModel.js:
(WebInspector.ResourceTreeModel.prototype._frameNavigated):
* inspector/front-end/Workspace.js:
(WebInspector.Workspace): workspace doesn't need to listen for CachedResourcesLoaded event anymore.
* inspector/front-end/inspector.js: removed unused method.

LayoutTests:

* http/tests/inspector/resource-tree/resource-tree-events.html:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (126583 => 126584)


--- trunk/LayoutTests/ChangeLog	2012-08-24 14:02:00 UTC (rev 126583)
+++ trunk/LayoutTests/ChangeLog	2012-08-24 14:05:40 UTC (rev 126584)
@@ -1,3 +1,12 @@
+2012-08-24  Vsevolod Vlasov  <[email protected]>
+
+        Web Inspector: Get rid of frontendReused logic on front-end.
+        https://bugs.webkit.org/show_bug.cgi?id=94929
+
+        Reviewed by Pavel Feldman.
+
+        * http/tests/inspector/resource-tree/resource-tree-events.html:
+
 2012-08-24  'Pavel Feldman'  <[email protected]>
 
         Web Inspector: three layout tests crashing with assertion failure

Modified: trunk/LayoutTests/http/tests/inspector/resource-tree/resource-tree-events.html (126583 => 126584)


--- trunk/LayoutTests/http/tests/inspector/resource-tree/resource-tree-events.html	2012-08-24 14:02:00 UTC (rev 126583)
+++ trunk/LayoutTests/http/tests/inspector/resource-tree/resource-tree-events.html	2012-08-24 14:05:40 UTC (rev 126584)
@@ -12,7 +12,6 @@
 
     function step1()
     {
-        WebInspector.resourceTreeModel._frontendReused = function() { return false; }
         WebInspector.resourceTreeModel._frameNavigated(createFramePayload("root1"));
 
         for (var eventName in WebInspector.ResourceTreeModel.EventTypes)

Modified: trunk/Source/WebCore/ChangeLog (126583 => 126584)


--- trunk/Source/WebCore/ChangeLog	2012-08-24 14:02:00 UTC (rev 126583)
+++ trunk/Source/WebCore/ChangeLog	2012-08-24 14:05:40 UTC (rev 126584)
@@ -1,3 +1,18 @@
+2012-08-24  Vsevolod Vlasov  <[email protected]>
+
+        Web Inspector: Get rid of frontendReused logic on front-end.
+        https://bugs.webkit.org/show_bug.cgi?id=94929
+
+        Reviewed by Pavel Feldman.
+
+        Removed frontendReused method from ResourceTreeModel.
+
+        * inspector/front-end/ResourceTreeModel.js:
+        (WebInspector.ResourceTreeModel.prototype._frameNavigated):
+        * inspector/front-end/Workspace.js:
+        (WebInspector.Workspace): workspace doesn't need to listen for CachedResourcesLoaded event anymore.
+        * inspector/front-end/inspector.js: removed unused method.
+
 2012-08-24  Grzegorz Czajkowski  <[email protected]>
 
         Share WebKit-Gtk's Enchant implementation with others WebKit ports.

Modified: trunk/Source/WebCore/inspector/front-end/ResourceTreeModel.js (126583 => 126584)


--- trunk/Source/WebCore/inspector/front-end/ResourceTreeModel.js	2012-08-24 14:02:00 UTC (rev 126583)
+++ trunk/Source/WebCore/inspector/front-end/ResourceTreeModel.js	2012-08-24 14:05:40 UTC (rev 126584)
@@ -116,9 +116,6 @@
      */
     _frameNavigated: function(framePayload)
     {
-        if (this._frontendReused(framePayload))
-            return;
-
         // Do nothing unless cached resource tree is processed - it will overwrite everything.
         if (!this._cachedResourcesProcessed)
             return;
@@ -154,20 +151,6 @@
     },
 
     /**
-     * @param {PageAgent.Frame} framePayload
-     * @return {boolean}
-     */
-    _frontendReused: function(framePayload)
-    {
-        if (!framePayload.parentId && !WebInspector.networkLog.requests.length) {
-            // We are navigating main frame to the existing loaded backend (no provisioual loaded resources are there). 
-            this._fetchResourceTree();
-            return true;
-        }
-        return false;
-    },
-
-    /**
      * @param {NetworkAgent.FrameId} frameId
      */
     _frameDetached: function(frameId)

Modified: trunk/Source/WebCore/inspector/front-end/Workspace.js (126583 => 126584)


--- trunk/Source/WebCore/inspector/front-end/Workspace.js	2012-08-24 14:02:00 UTC (rev 126583)
+++ trunk/Source/WebCore/inspector/front-end/Workspace.js	2012-08-24 14:05:40 UTC (rev 126584)
@@ -132,7 +132,6 @@
     new WebInspector.PresentationConsoleMessageHelper(this);
     
     WebInspector.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.MainFrameNavigated, this._reset, this);
-    WebInspector.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.CachedResourcesLoaded, this._reset, this);
 }
 
 WebInspector.Workspace.Events = {

Modified: trunk/Source/WebCore/inspector/front-end/inspector.js (126583 => 126584)


--- trunk/Source/WebCore/inspector/front-end/inspector.js	2012-08-24 14:02:00 UTC (rev 126583)
+++ trunk/Source/WebCore/inspector/front-end/inspector.js	2012-08-24 14:05:40 UTC (rev 126584)
@@ -1084,9 +1084,4 @@
     doc.addEventListener("click", this.documentClick.bind(this), true);
 }
 
-WebInspector.frontendReused = function()
-{
-    this.resourceTreeModel.frontendReused();
-}
-
 WebInspector.ProfileURLRegExp = /webkit-profile:\/\/(.+)\/(.+)#([0-9]+)/;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to