<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[70045] trunk/WebCore</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/70045">70045</a></dd>
<dt>Author</dt> <dd>pfeldman@chromium.org</dd>
<dt>Date</dt> <dd>2010-10-19 03:35:21 -0700 (Tue, 19 Oct 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>2010-10-19  Pavel Feldman  &lt;pfeldman@chromium.org&gt;

        Reviewed by Yury Semikhatsky.

        Web Inspector: do not access ResourcePanel from resources directly.
        https://bugs.webkit.org/show_bug.cgi?id=47892

        * inspector/front-end/Resource.js:
        (WebInspector.Resource.prototype.set documentURL):
        (WebInspector.Resource.prototype.set startTime):
        (WebInspector.Resource.prototype.set responseReceivedTime):
        (WebInspector.Resource.prototype.set endTime):
        (WebInspector.Resource.prototype.set resourceSize):
        (WebInspector.Resource.prototype.set expectedContentLength):
        (WebInspector.Resource.prototype.set category):
        (WebInspector.Resource.prototype.set cached):
        (WebInspector.Resource.prototype.set mimeType):
        (WebInspector.Resource.prototype.get requestHeaders):
        (WebInspector.Resource.prototype.set requestHeaders):
        (WebInspector.Resource.prototype.get responseHeaders):
        (WebInspector.Resource.prototype.set responseHeaders):
        * inspector/front-end/ResourcesPanel.js:
        (WebInspector.ResourcesPanel.prototype.addResource):
        (WebInspector.ResourcesPanel.prototype.refreshResource):
        (WebInspector.ResourcesPanel.prototype._recreateViewForResourceIfNeeded):
        (WebInspector.ResourcesPanel.prototype._resourceViewIsConsistentWithCategory):
        (WebInspector.ResourceGraph):
        (WebInspector.ResourceGraph.prototype.refresh):
        * inspector/front-end/inspector.js:
        (WebInspector.updateResource):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoreinspectorfrontendResourcejs">trunk/WebCore/inspector/front-end/Resource.js</a></li>
<li><a href="#trunkWebCoreinspectorfrontendResourcesPaneljs">trunk/WebCore/inspector/front-end/ResourcesPanel.js</a></li>
<li><a href="#trunkWebCoreinspectorfrontendinspectorjs">trunk/WebCore/inspector/front-end/inspector.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (70044 => 70045)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2010-10-19 10:34:56 UTC (rev 70044)
+++ trunk/WebCore/ChangeLog        2010-10-19 10:35:21 UTC (rev 70045)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2010-10-19  Pavel Feldman  &lt;pfeldman@chromium.org&gt;
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: do not access ResourcePanel from resources directly.
+        https://bugs.webkit.org/show_bug.cgi?id=47892
+
+        * inspector/front-end/Resource.js:
+        (WebInspector.Resource.prototype.set documentURL):
+        (WebInspector.Resource.prototype.set startTime):
+        (WebInspector.Resource.prototype.set responseReceivedTime):
+        (WebInspector.Resource.prototype.set endTime):
+        (WebInspector.Resource.prototype.set resourceSize):
+        (WebInspector.Resource.prototype.set expectedContentLength):
+        (WebInspector.Resource.prototype.set category):
+        (WebInspector.Resource.prototype.set cached):
+        (WebInspector.Resource.prototype.set mimeType):
+        (WebInspector.Resource.prototype.get requestHeaders):
+        (WebInspector.Resource.prototype.set requestHeaders):
+        (WebInspector.Resource.prototype.get responseHeaders):
+        (WebInspector.Resource.prototype.set responseHeaders):
+        * inspector/front-end/ResourcesPanel.js:
+        (WebInspector.ResourcesPanel.prototype.addResource):
+        (WebInspector.ResourcesPanel.prototype.refreshResource):
+        (WebInspector.ResourcesPanel.prototype._recreateViewForResourceIfNeeded):
+        (WebInspector.ResourcesPanel.prototype._resourceViewIsConsistentWithCategory):
+        (WebInspector.ResourceGraph):
+        (WebInspector.ResourceGraph.prototype.refresh):
+        * inspector/front-end/inspector.js:
+        (WebInspector.updateResource):
+
</ins><span class="cx"> 2010-10-19  Yuta Kitamura  &lt;yutak@chromium.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Pavel Feldman.
</span></span></pre></div>
<a id="trunkWebCoreinspectorfrontendResourcejs"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/inspector/front-end/Resource.js (70044 => 70045)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/inspector/front-end/Resource.js        2010-10-19 10:34:56 UTC (rev 70044)
+++ trunk/WebCore/inspector/front-end/Resource.js        2010-10-19 10:35:21 UTC (rev 70045)
</span><span class="lines">@@ -119,8 +119,6 @@
</span><span class="cx"> 
</span><span class="cx">     set documentURL(x)
</span><span class="cx">     {
</span><del>-        if (this._documentURL === x)
-            return;
</del><span class="cx">         this._documentURL = x;
</span><span class="cx">     },
</span><span class="cx"> 
</span><span class="lines">@@ -153,13 +151,7 @@
</span><span class="cx"> 
</span><span class="cx">     set startTime(x)
</span><span class="cx">     {
</span><del>-        if (this._startTime === x)
-            return;
-
</del><span class="cx">         this._startTime = x;
</span><del>-
-        if (WebInspector.panels.resources)
-            WebInspector.panels.resources.refreshResource(this);
</del><span class="cx">     },
</span><span class="cx"> 
</span><span class="cx">     get responseReceivedTime()
</span><span class="lines">@@ -174,13 +166,7 @@
</span><span class="cx"> 
</span><span class="cx">     set responseReceivedTime(x)
</span><span class="cx">     {
</span><del>-        if (this._responseReceivedTime === x)
-            return;
-
</del><span class="cx">         this._responseReceivedTime = x;
</span><del>-
-        if (WebInspector.panels.resources)
-            WebInspector.panels.resources.refreshResource(this);
</del><span class="cx">     },
</span><span class="cx"> 
</span><span class="cx">     get endTime()
</span><span class="lines">@@ -196,13 +182,7 @@
</span><span class="cx">         if (x &lt; this.responseReceivedTime)
</span><span class="cx">             this.responseReceivedTime = x;
</span><span class="cx"> 
</span><del>-        if (this._endTime === x)
-            return;
-
</del><span class="cx">         this._endTime = x;
</span><del>-
-        if (WebInspector.panels.resources)
-            WebInspector.panels.resources.refreshResource(this);
</del><span class="cx">     },
</span><span class="cx"> 
</span><span class="cx">     get duration()
</span><span class="lines">@@ -233,13 +213,7 @@
</span><span class="cx"> 
</span><span class="cx">     set resourceSize(x)
</span><span class="cx">     {
</span><del>-        if (this._resourceSize === x)
-            return;
-
</del><span class="cx">         this._resourceSize = x;
</span><del>-
-        if (WebInspector.panels.resources)
-            WebInspector.panels.resources.refreshResource(this);
</del><span class="cx">     },
</span><span class="cx"> 
</span><span class="cx">     get transferSize()
</span><span class="lines">@@ -255,8 +229,6 @@
</span><span class="cx"> 
</span><span class="cx">     set expectedContentLength(x)
</span><span class="cx">     {
</span><del>-        if (this._expectedContentLength === x)
-            return;
</del><span class="cx">         this._expectedContentLength = x;
</span><span class="cx">     },
</span><span class="cx"> 
</span><span class="lines">@@ -306,11 +278,6 @@
</span><span class="cx"> 
</span><span class="cx">         if (this._category)
</span><span class="cx">             this._category.addResource(this);
</span><del>-
-        if (WebInspector.panels.resources) {
-            WebInspector.panels.resources.refreshResource(this);
-            WebInspector.panels.resources.recreateViewForResourceIfNeeded(this);
-        }
</del><span class="cx">     },
</span><span class="cx"> 
</span><span class="cx">     get cached()
</span><span class="lines">@@ -321,7 +288,6 @@
</span><span class="cx">     set cached(x)
</span><span class="cx">     {
</span><span class="cx">         this._cached = x;
</span><del>-        this.dispatchEventToListeners(&quot;cached changed&quot;);
</del><span class="cx">     },
</span><span class="cx"> 
</span><span class="cx">     get mimeType()
</span><span class="lines">@@ -331,9 +297,6 @@
</span><span class="cx"> 
</span><span class="cx">     set mimeType(x)
</span><span class="cx">     {
</span><del>-        if (this._mimeType === x)
-            return;
-
</del><span class="cx">         this._mimeType = x;
</span><span class="cx">     },
</span><span class="cx"> 
</span><span class="lines">@@ -380,16 +343,11 @@
</span><span class="cx"> 
</span><span class="cx">     get requestHeaders()
</span><span class="cx">     {
</span><del>-        if (this._requestHeaders === undefined)
-            this._requestHeaders = {};
-        return this._requestHeaders;
</del><ins>+        return this._requestHeaders || {};
</ins><span class="cx">     },
</span><span class="cx"> 
</span><span class="cx">     set requestHeaders(x)
</span><span class="cx">     {
</span><del>-        if (this._requestHeaders === x)
-            return;
-
</del><span class="cx">         this._requestHeaders = x;
</span><span class="cx">         delete this._sortedRequestHeaders;
</span><span class="cx"> 
</span><span class="lines">@@ -427,16 +385,11 @@
</span><span class="cx"> 
</span><span class="cx">     get responseHeaders()
</span><span class="cx">     {
</span><del>-        if (this._responseHeaders === undefined)
-            this._responseHeaders = {};
-        return this._responseHeaders;
</del><ins>+        return this._responseHeaders || {};
</ins><span class="cx">     },
</span><span class="cx"> 
</span><span class="cx">     set responseHeaders(x)
</span><span class="cx">     {
</span><del>-        if (this._responseHeaders === x)
-            return;
-
</del><span class="cx">         this._responseHeaders = x;
</span><span class="cx">         delete this._sortedResponseHeaders;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkWebCoreinspectorfrontendResourcesPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/inspector/front-end/ResourcesPanel.js (70044 => 70045)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/inspector/front-end/ResourcesPanel.js        2010-10-19 10:34:56 UTC (rev 70044)
+++ trunk/WebCore/inspector/front-end/ResourcesPanel.js        2010-10-19 10:35:21 UTC (rev 70045)
</span><span class="lines">@@ -757,7 +757,6 @@
</span><span class="cx">     addResource: function(resource)
</span><span class="cx">     {
</span><span class="cx">         this._resources.push(resource);
</span><del>-        this.refreshResource(resource);
</del><span class="cx">     },
</span><span class="cx"> 
</span><span class="cx">     removeResource: function(resource)
</span><span class="lines">@@ -815,18 +814,19 @@
</span><span class="cx"> 
</span><span class="cx">     refreshResource: function(resource)
</span><span class="cx">     {
</span><ins>+        this._recreateViewForResourceIfNeeded(resource);
</ins><span class="cx">         this.refreshItem(resource);
</span><span class="cx">     },
</span><span class="cx"> 
</span><del>-    recreateViewForResourceIfNeeded: function(resource)
</del><ins>+    _recreateViewForResourceIfNeeded: function(resource)
</ins><span class="cx">     {
</span><span class="cx">         if (!resource || !resource._resourcesView)
</span><span class="cx">             return;
</span><span class="cx"> 
</span><del>-        var newView = this._createResourceView(resource);
-        if (newView.__proto__ === resource._resourcesView.__proto__)
</del><ins>+        if (this._resourceViewIsConsistentWithCategory(resource, resource._resourcesView))
</ins><span class="cx">             return;
</span><span class="cx"> 
</span><ins>+        var newView = this._createResourceView(resource);
</ins><span class="cx">         if (!this.currentQuery &amp;&amp; resource._itemsTreeElement)
</span><span class="cx">             resource._itemsTreeElement.updateErrorsAndWarnings();
</span><span class="cx"> 
</span><span class="lines">@@ -1068,6 +1068,23 @@
</span><span class="cx">         this.calculator = this.summaryBar.calculator = selectedOption.calculator;
</span><span class="cx">     },
</span><span class="cx"> 
</span><ins>+    _resourceViewIsConsistentWithCategory: function(resource, resourceView)
+    {
+        switch (resource.category) {
+            case WebInspector.resourceCategories.documents:
+            case WebInspector.resourceCategories.stylesheets:
+            case WebInspector.resourceCategories.scripts:
+            case WebInspector.resourceCategories.xhr:
+                return resourceView.__proto__ === WebInspector.SourceView.prototype;
+            case WebInspector.resourceCategories.images:
+                return resourceView.__proto__ === WebInspector.ImageView.prototype;
+            case WebInspector.resourceCategories.fonts:
+                return resourceView.__proto__ === WebInspector.FontView.prototype;
+            default:
+                return resourceView.__proto__ === WebInspector.ResourceView.prototype;
+        }
+    },
+
</ins><span class="cx">     _createResourceView: function(resource)
</span><span class="cx">     {
</span><span class="cx">         switch (resource.category) {
</span><span class="lines">@@ -1819,7 +1836,8 @@
</span><span class="cx">     this._graphElement.className = &quot;resources-graph-side&quot;;
</span><span class="cx">     this._graphElement.addEventListener(&quot;mouseover&quot;, this.refreshLabelPositions.bind(this), false);
</span><span class="cx"> 
</span><del>-    this._cachedChanged();
</del><ins>+    if (this.resource.cached)
+        this._graphElement.addStyleClass(&quot;resource-cached&quot;);
</ins><span class="cx"> 
</span><span class="cx">     this._barAreaElement = document.createElement(&quot;div&quot;);
</span><span class="cx">     this._barAreaElement.className = &quot;resources-graph-bar-area hidden&quot;;
</span><span class="lines">@@ -1843,8 +1861,6 @@
</span><span class="cx">     this._barAreaElement.appendChild(this._labelRightElement);
</span><span class="cx"> 
</span><span class="cx">     this._graphElement.addStyleClass(&quot;resources-category-&quot; + resource.category.name);
</span><del>-
-    resource.addEventListener(&quot;cached changed&quot;, this._cachedChanged, this);
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> WebInspector.ResourceGraph.prototype = {
</span><span class="lines">@@ -1968,11 +1984,8 @@
</span><span class="cx">         this._labelLeftElement.title = tooltip;
</span><span class="cx">         this._labelRightElement.title = tooltip;
</span><span class="cx">         this._barRightElement.title = tooltip;
</span><del>-    },
</del><span class="cx"> 
</span><del>-    _cachedChanged: function()
-    {
-        if (this.resource.cached)
</del><ins>+        if (this.resource.cached &amp;&amp; !this._graphElement.hasStyleClass(&quot;resource-cached&quot;))
</ins><span class="cx">             this._graphElement.addStyleClass(&quot;resource-cached&quot;);
</span><span class="cx">     }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkWebCoreinspectorfrontendinspectorjs"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/inspector/front-end/inspector.js (70044 => 70045)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/inspector/front-end/inspector.js        2010-10-19 10:34:56 UTC (rev 70044)
+++ trunk/WebCore/inspector/front-end/inspector.js        2010-10-19 10:35:21 UTC (rev 70045)
</span><span class="lines">@@ -1281,6 +1281,7 @@
</span><span class="cx">         if (payload.endTime)
</span><span class="cx">             resource.endTime = payload.endTime;
</span><span class="cx">     }
</span><ins>+    this.panels.resources.refreshResource(resource);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> WebInspector.domContentEventFired = function(time)
</span></span></pre>
</div>
</div>

</body>
</html>