Changeset 71010 in webkit
- Timestamp:
- Nov 1, 2010 12:07:20 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 16 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r71005 r71010 1 2010-10-31 Pavel Feldman <pfeldman@chromium.org> 2 3 Reviewed by Timothy Hatcher. 4 5 Web Inspector: unhide new network and resources panels. 6 https://bugs.webkit.org/show_bug.cgi?id=48725 7 8 * http/tests/inspector/console-xhr-logging-expected.txt: 9 * http/tests/inspector/resource-parameters-expected.txt: 10 * inspector/console-log-syntax-error-expected.txt: 11 * inspector/elements-panel-styles-expected.txt: 12 1 13 2010-10-31 Jeremy Moskovich <jeremy@chromium.org> 2 14 -
trunk/LayoutTests/http/tests/inspector/console-xhr-logging-expected.txt
r66735 r71010 13 13 XHR finished loading: "http://127.0.0.1:8000/inspector/resources/xhr-exists.html". 14 14 console-xhr-logging.html:40sending a GET request to resources/xhr-does-not-exist.html 15 resources/xhr-does-not-exist.htmlFailed to load resource: the server responded with a status of 404 (Not Found)15 xhr-does-not-exist.htmlFailed to load resource: the server responded with a status of 404 (Not Found) 16 16 XHR finished loading: "http://127.0.0.1:8000/inspector/resources/xhr-does-not-exist.html". 17 17 console-xhr-logging.html:40sending a POST request to resources/post-target.cgi … … 20 20 console-xhr-logging.html:40sending a GET request to resources/xhr-exists.html 21 21 console-xhr-logging.html:40sending a GET request to resources/xhr-does-not-exist.html 22 resources/xhr-does-not-exist.htmlFailed to load resource: the server responded with a status of 404 (Not Found)22 xhr-does-not-exist.htmlFailed to load resource: the server responded with a status of 404 (Not Found) 23 23 console-xhr-logging.html:40sending a POST request to resources/post-target.cgi 24 24 -
trunk/LayoutTests/http/tests/inspector/resource-parameters-expected.txt
r67474 r71010 4 4 5 5 { 6 pageref : " about:blank"6 pageref : "http://localhost:8000/inspector/resources/post-target.cgi?queryParam1=queryValue1&queryParam2=" 7 7 startedDateTime : <string> 8 8 time : <number> -
trunk/LayoutTests/inspector/elements-panel-styles-expected.txt
r67469 r71010 3 3 [expanded] () 4 4 color: blue; 5 .foo, .foo::before - blue resources/elements-panel-styles.css:156 /-- overloaded --/ .foo - black resources/elements-panel-styles.css:105 .foo, .foo::before - blue elements-panel-styles.css:15 6 /-- overloaded --/ .foo - black elements-panel-styles.css:10 7 7 display: none; 8 8 element.style - none 9 9 /-- overloaded --/ div - block user agent stylesheet 10 10 font-family: serif; 11 #container - serif resources/elements-panel-styles.css:511 #container - serif elements-panel-styles.css:5 12 12 font-size: 14px; 13 #container - 14px resources/elements-panel-styles.css:514 /-- overloaded --/ body - 12px resources/elements-panel-styles.css:113 #container - 14px elements-panel-styles.css:5 14 /-- overloaded --/ body - 12px elements-panel-styles.css:1 15 15 margin-bottom: 2px; 16 .foo - 2px resources/elements-panel-styles.css:1016 .foo - 2px elements-panel-styles.css:10 17 17 margin-left: 0px; 18 .foo - 0px resources/elements-panel-styles.css:1018 .foo - 0px elements-panel-styles.css:10 19 19 margin-right: 0px; 20 .foo - 0px resources/elements-panel-styles.css:1020 .foo - 0px elements-panel-styles.css:10 21 21 margin-top: 10px; 22 .foo - 10px resources/elements-panel-styles.css:1022 .foo - 10px elements-panel-styles.css:10 23 23 24 24 [expanded] element.style { () … … 26 26 27 27 ======== Matched CSS Rules ======== 28 [expanded] .foo { ( resources/elements-panel-styles.css:33)28 [expanded] .foo { (elements-panel-styles.css:33) 29 29 30 [expanded] .foo, .foo::before { ( resources/elements-panel-styles.css:15)30 [expanded] .foo, .foo::before { (elements-panel-styles.css:15) 31 31 color: blue; 32 32 content: '[before Foo]'; 33 33 34 [expanded] .foo { ( resources/elements-panel-styles.css:10)34 [expanded] .foo { (elements-panel-styles.css:10) 35 35 /-- overloaded --/ color: black; 36 36 margin: 10px 0px 2px; … … 44 44 45 45 ======== Inherited from div#container ======== 46 [expanded] #container { ( resources/elements-panel-styles.css:5)46 [expanded] #container { (elements-panel-styles.css:5) 47 47 font-family: serif; 48 48 font-size: 14px; 49 49 50 50 ======== Inherited from body ======== 51 [expanded] body { ( resources/elements-panel-styles.css:1)51 [expanded] body { (elements-panel-styles.css:1) 52 52 /-- overloaded --/ font-size: 12px; 53 53 54 54 55 55 ======== Pseudo ::before element ======== 56 [expanded] .foo::before { ( resources/elements-panel-styles.css:37)56 [expanded] .foo::before { (elements-panel-styles.css:37) 57 57 58 [expanded] .foo::before { ( resources/elements-panel-styles.css:20)58 [expanded] .foo::before { (elements-panel-styles.css:20) 59 59 color: red; 60 60 61 [expanded] .foo, .foo::before { ( resources/elements-panel-styles.css:15)61 [expanded] .foo, .foo::before { (elements-panel-styles.css:15) 62 62 /-- overloaded --/ color: blue; 63 63 content: '[before Foo]'; … … 65 65 66 66 ======== Pseudo ::after element ======== 67 [expanded] .foo::after { ( resources/elements-panel-styles.css:28)67 [expanded] .foo::after { (elements-panel-styles.css:28) 68 68 content: '[after Foo 2]'; 69 69 font-family: courier; 70 70 71 [expanded] .foo::after { ( resources/elements-panel-styles.css:24)71 [expanded] .foo::after { (elements-panel-styles.css:24) 72 72 color: green; 73 73 /-- overloaded --/ content: '[after Foo]'; -
trunk/WebCore/ChangeLog
r71009 r71010 1 2010-10-31 Pavel Feldman <pfeldman@chromium.org> 2 3 Reviewed by Timothy Hatcher. 4 5 Web Inspector: unhide new network and resources panels. 6 https://bugs.webkit.org/show_bug.cgi?id=48725 7 8 * English.lproj/localizedStrings.js: 9 * inspector/InspectorController.h: 10 * inspector/front-end/NetworkPanel.js: 11 (WebInspector.NetworkPanel): 12 * inspector/front-end/Settings.js: 13 * inspector/front-end/StoragePanel.js: 14 (WebInspector.StoragePanel): 15 (WebInspector.StoragePanel.prototype.reset): 16 (WebInspector.StoragePanel.prototype.addResourceToFrame): 17 (WebInspector.StoragePanel.prototype.addDocumentURL): 18 (WebInspector.StoragePanel.prototype.showFileSystem): 19 (WebInspector.FileSystemTreeElement): 20 (WebInspector.FileSystemTreeElement.prototype.get itemURL): 21 (WebInspector.FileSystemTreeElement.prototype.onselect): 22 * inspector/front-end/inspector.js: 23 (WebInspector.updateResource): 24 * inspector/front-end/networkPanel.css: 25 (#network-close-button): 26 (.network.panel.viewing-resource #network-close-button): 27 1 28 2010-10-26 MORITA Hajime <morrita@google.com> 2 29 -
trunk/WebCore/inspector/InspectorController.h
r70956 r71010 87 87 class StorageArea; 88 88 89 #define LEGACY_RESOURCE_TRACKING_ENABLED 189 #define LEGACY_RESOURCE_TRACKING_ENABLED 0 90 90 91 91 #if LEGACY_RESOURCE_TRACKING_ENABLED -
trunk/WebCore/inspector/front-end/NetworkPanel.js
r70989 r71010 57 57 58 58 var closeButtonElement = document.createElement("button"); 59 closeButtonElement. className= "network-close-button";59 closeButtonElement.id = "network-close-button"; 60 60 closeButtonElement.addEventListener("click", this._toggleGridMode.bind(this), false); 61 this. _viewsContainerElement.appendChild(closeButtonElement);61 this.element.appendChild(closeButtonElement); 62 62 63 63 this._createSortingFunctions(); … … 67 67 this._createFilterStatusBarItems(); 68 68 this._createSummaryBar(); 69 70 if (!WebInspector.applicationSettings.resourcesLargeRows) 71 this._setLargerResources(WebInspector.applicationSettings.resourcesLargeRows); 69 72 70 73 this._popoverHelper = new WebInspector.PopoverHelper(this.element, this._getPopoverAnchor.bind(this), this._showPopover.bind(this), true); … … 614 617 this._largerResourcesButton = new WebInspector.StatusBarButton(WebInspector.UIString("Use small resource rows."), "network-larger-resources-status-bar-item"); 615 618 this._largerResourcesButton.toggled = WebInspector.applicationSettings.resourcesLargeRows; 616 if (!WebInspector.applicationSettings.resourcesLargeRows)617 this._setLargerResources(WebInspector.applicationSettings.resourcesLargeRows);618 619 this._largerResourcesButton.addEventListener("click", this._toggleLargerResources.bind(this), false); 619 620 }, … … 902 903 this._viewsContainerElement.removeStyleClass("small"); 903 904 } 905 this._positionSummaryBar(); 904 906 }, 905 907 -
trunk/WebCore/inspector/front-end/Resource.js
r70853 r71010 26 26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 27 27 */ 28 29 28 WebInspector.Resource = function(identifier, url) 30 29 { … … 333 332 break; 334 333 case WebInspector.Resource.Type.WebSocket: 335 this.category = WebInspector.resourceCategories.websocket ;334 this.category = WebInspector.resourceCategories.websockets; 336 335 break; 337 336 case WebInspector.Resource.Type.Other: … … 644 643 callbacks[i](this._content, this._contentEncoded); 645 644 this._pendingContentCallbacks.length = 0; 645 delete this._contentRequested; 646 646 } 647 647 WebInspector.ResourceManager.getContent(this, this._contentEncoded, onResourceContent.bind(this)); -
trunk/WebCore/inspector/front-end/ResourceManager.js
r70989 r71010 80 80 var resource = new WebInspector.Resource(identifier, url); 81 81 resource.loader = loader; 82 resource.documentURL = loader.url; 82 if (loader) 83 resource.documentURL = loader.url; 83 84 84 85 this._resourcesById[identifier] = resource; … … 137 138 138 139 resource.cached = true; 140 delete resource.timing; 139 141 WebInspector.panels.network.refreshResource(resource); 140 142 }, … … 268 270 didCreateWebSocket: function(identifier, requestURL) 269 271 { 270 this.identifierForInitialRequest(identifier, requestURL); 271 var resource = this._resourcesById[identifier]; 272 var resource = this._createResource(identifier, requestURL); 272 273 resource.type = WebInspector.Resource.Type.WebSocket; 273 274 274 WebInspector.panels.network.refreshResource(resource); 275 275 }, … … 474 474 { 475 475 // FIXME: eventually, cached resources will have no identifiers. 476 if ( resource.loader)476 if (Preferences.networkPanelEnabled) 477 477 InspectorBackend.resourceContent(resource.loader.frameId, resource.url, base64Encode, callback); 478 478 else -
trunk/WebCore/inspector/front-end/Settings.js
r70989 r71010 46 46 nativeInstrumentationEnabled: false, 47 47 resourceExportEnabled: false, 48 networkPanelEnabled: false,48 networkPanelEnabled: true, 49 49 fileSystemEnabled: false, 50 50 useDataURLForResourceImageIcons: true -
trunk/WebCore/inspector/front-end/StoragePanel.js
r70989 r71010 60 60 61 61 if (Preferences.fileSystemEnabled) { 62 this.fileSystemListTreeElement = new WebInspector.StorageCategoryTreeElement(this, WebInspector.UIString("File System"), " file-system-storage-tree-item");62 this.fileSystemListTreeElement = new WebInspector.StorageCategoryTreeElement(this, WebInspector.UIString("File System"), "FileSystem", "file-system-storage-tree-item"); 63 63 this.sidebarTree.appendChild(this.fileSystemListTreeElement); 64 64 this.fileSystemListTreeElement.expand(); … … 75 75 this._domStorage = []; 76 76 this._cookieViews = {}; 77 this._origins = {}; 77 78 this._domains = {}; 78 79 } … … 89 90 }, 90 91 92 elementsToRestoreScrollPositionsFor: function() 93 { 94 return [this.sidebarElement]; 95 }, 96 91 97 show: function() 92 98 { 93 99 WebInspector.Panel.prototype.show.call(this); 100 101 if (this.visibleView instanceof WebInspector.ResourceView) { 102 // SourceViews are shared between the panels. 103 this.visibleView.headersVisible = true; 104 this.visibleView.show(this.storageViews); 105 } 106 94 107 if (this._initializedDefaultSelection) 95 108 return; … … 117 130 reset: function() 118 131 { 132 this._origins = {}; 119 133 this._domains = {}; 120 134 for (var i = 0; i < this._databases.length; ++i) { … … 199 213 addResourceToFrame: function(frameId, resource) 200 214 { 201 if (!this._domains[resource.domain]) { 202 this._domains[resource.domain] = true; 203 this.addCookieDomain(resource.domain); 204 this.addApplicationCache(resource.domain); 205 } 215 this.addDocumentURL(resource.documentURL); 206 216 207 217 if (resource.statusCode >= 301 && resource.statusCode <= 303) … … 245 255 if (resource.type === WebInspector.Resource.Type.XHR) { 246 256 var resourceTreeElement = this._findTreeElementForResource(resource); 247 resourceTreeElement.parent.removeChild(resourceTreeElement); 257 if (resourceTreeElement) 258 resourceTreeElement.parent.removeChild(resourceTreeElement); 248 259 } 249 260 }, … … 257 268 this.databasesListTreeElement.appendChild(databaseTreeElement); 258 269 }, 259 260 addCookieDomain: function(domain) 261 { 262 var cookieDomainTreeElement = new WebInspector.CookieTreeElement(this, domain); 263 this.cookieListTreeElement.appendChild(cookieDomainTreeElement); 270 271 addDocumentURL: function(url) 272 { 273 var parsedURL = url.asParsedURL(); 274 if (!parsedURL) 275 return; 276 277 var domain = parsedURL.host; 278 if (!this._domains[domain]) { 279 this._domains[domain] = true; 280 281 var cookieDomainTreeElement = new WebInspector.CookieTreeElement(this, domain); 282 this.cookieListTreeElement.appendChild(cookieDomainTreeElement); 283 284 var applicationCacheTreeElement = new WebInspector.ApplicationCacheTreeElement(this, domain); 285 this.applicationCacheListTreeElement.appendChild(applicationCacheTreeElement); 286 } 287 288 if (Preferences.fileSystemEnabled) { 289 // FIXME: This should match the SecurityOrigin::toString(), add a test for this. 290 var securityOrigin = parsedURL.scheme + "://" + parsedURL.host + (parsedURL.port ? (":" + parsedURL.port) : ""); 291 if (!this._origins[securityOrigin]) { 292 this._origins[securityOrigin] = true; 293 var fileSystemTreeElement = new WebInspector.FileSystemTreeElement(this, securityOrigin); 294 this.fileSystemListTreeElement.appendChild(fileSystemTreeElement); 295 } 296 } 264 297 }, 265 298 … … 275 308 }, 276 309 277 addApplicationCache: function(domain)278 {279 var applicationCacheTreeElement = new WebInspector.ApplicationCacheTreeElement(this, domain);280 this.applicationCacheListTreeElement.appendChild(applicationCacheTreeElement);281 },282 283 addFileSystem: function(origin)284 {285 var fileSystemTreeElement = new WebInspector.FileSystemTreeElement(this, origin);286 this.fileSystemListTreeElement.appendChild(fileSystemTreeElement);287 },288 289 310 selectDatabase: function(databaseId) 290 311 { … … 410 431 }, 411 432 412 showFileSystem: function(treeElement, fileSystemDomain)413 { 414 this._fileSystemView = new WebInspector.FileSystemView(treeElement, fileSystemDomain);433 showFileSystem: function(treeElement, origin) 434 { 435 this._fileSystemView = new WebInspector.FileSystemView(treeElement, origin); 415 436 this._innerShowView(this._fileSystemView); 416 437 }, … … 652 673 function isAncestor(ancestor, object) 653 674 { 654 console.error("There should be no calls to isAncestor, but there was one for ", object);675 // Redirects, XHRs do not belong to the tree, it is fine to silently return false here. 655 676 return false; 656 677 } … … 658 679 function getParent(object) 659 680 { 660 console.error("There should be no calls to getParent, but there was one for ", object);681 // Redirects, XHRs do not belong to the tree, it is fine to silently return false here. 661 682 return null; 662 683 } … … 1071 1092 WebInspector.ApplicationCacheTreeElement.prototype.__proto__ = WebInspector.BaseStorageTreeElement.prototype; 1072 1093 1073 WebInspector.FileSystemTreeElement = function(storagePanel, fileSystemDomain)1094 WebInspector.FileSystemTreeElement = function(storagePanel, origin) 1074 1095 { 1075 WebInspector.BaseStorageTreeElement.call(this, storagePanel, null, fileSystemDomain ? fileSystemDomain : WebInspector.UIString("Local Files"), "file-system-storage-tree-item");1076 this._ fileSystemDomain = fileSystemDomain;1096 WebInspector.BaseStorageTreeElement.call(this, storagePanel, null, origin, "file-system-storage-tree-item"); 1097 this._origin = origin; 1077 1098 } 1078 1099 1079 1100 WebInspector.FileSystemTreeElement.prototype = { 1101 get itemURL() 1102 { 1103 return "file-system://" + encodeURI(this._origin); 1104 }, 1105 1080 1106 onselect: function() 1081 1107 { 1082 this._storagePanel.showFileSystem(this, this._fileSystemDomain); 1108 WebInspector.BaseStorageTreeElement.prototype.onselect.call(this); 1109 this._storagePanel.showFileSystem(this, this._origin); 1083 1110 } 1084 1111 } -
trunk/WebCore/inspector/front-end/inspector.js
r70956 r71010 51 51 var WebInspector = { 52 52 resources: {}, 53 cookieDomains: {},54 applicationCacheDomains: {},55 fileSystemOrigins: {},56 53 missingLocalizedStrings: {}, 57 54 pendingDispatches: 0, … … 557 554 xhr: new WebInspector.ResourceCategory("xhr", WebInspector.UIString("XHR"), "rgb(231,231,10)"), 558 555 fonts: new WebInspector.ResourceCategory("fonts", WebInspector.UIString("Fonts"), "rgb(255,82,62)"), 559 websocket : new WebInspector.ResourceCategory("websockets", WebInspector.UIString("WebSocket"), "rgb(186,186,186)"), // FIXME: Decide the color.556 websockets: new WebInspector.ResourceCategory("websockets", WebInspector.UIString("WebSocket"), "rgb(186,186,186)"), // FIXME: Decide the color. 560 557 other: new WebInspector.ResourceCategory("other", WebInspector.UIString("Other"), "rgb(186,186,186)") 561 558 }; … … 1295 1292 this.mainResource = resource; 1296 1293 1297 var parsedURL = payload.documentURL.asParsedURL(); 1298 if (parsedURL) { 1299 this._addCookieDomain(parsedURL.host); 1300 this._addAppCacheDomain(parsedURL.host); 1301 if (Preferences.fileSystemEnabled) 1302 // This should match the SecurityOrigin::toString(). FIXME: Add a test for this. 1303 this._addFileSystemOrigin(parsedURL.scheme + "://" + parsedURL.host + (parsedURL.port ? (":" + parsedURL.port) : "")); 1304 } 1294 this.panels.storage.addDocumentURL(payload.documentURL); 1305 1295 } 1306 1296 … … 1392 1382 payload.version); 1393 1383 this.panels.storage.addDatabase(database); 1394 }1395 1396 WebInspector._addCookieDomain = function(domain)1397 {1398 // Eliminate duplicate domains from the list.1399 if (domain in this.cookieDomains)1400 return;1401 this.cookieDomains[domain] = true;1402 1403 if (!this.panels.storage)1404 return;1405 this.panels.storage.addCookieDomain(domain);1406 }1407 1408 WebInspector._addAppCacheDomain = function(domain)1409 {1410 // Eliminate duplicate domains from the list.1411 if (domain in this.applicationCacheDomains)1412 return;1413 this.applicationCacheDomains[domain] = true;1414 1415 if (!this.panels.storage)1416 return;1417 this.panels.storage.addApplicationCache(domain);1418 }1419 1420 WebInspector._addFileSystemOrigin = function(origin)1421 {1422 if (!this.panels.storage)1423 return;1424 // Eliminate duplicate origins.1425 // FIXME: Move appcache/cookies/filesystem domain dup checks in StoragePanel.js1426 if (origin in this.fileSystemOrigins)1427 return;1428 this.fileSystemOrigins[origin] = true;1429 this.panels.storage.addFileSystem(origin);1430 1384 } 1431 1385 -
trunk/WebCore/inspector/front-end/networkPanel.css
r70879 r71010 23 23 } 24 24 25 .network.panel .data-grid td {25 .network.panel .data-grid td:not(.network-summary) { 26 26 line-height: 17px; 27 27 height: 37px; … … 488 488 font-size: 11px; 489 489 font-weight: bold; 490 padding-top: 1px;490 padding-top: 3px; 491 491 padding-left: 10px; 492 492 z-index: 2000; … … 545 545 } 546 546 547 .network-close-button {547 #network-close-button { 548 548 position: absolute; 549 549 width: 14px; … … 556 556 right: 5px; 557 557 z-index: 10; 558 display: none; 559 } 560 561 .network.panel.viewing-resource #network-close-button { 562 display: block; 558 563 } 559 564 -
trunk/WebKit/chromium/ChangeLog
r70976 r71010 1 2010-10-31 Pavel Feldman <pfeldman@chromium.org> 2 3 Reviewed by Timothy Hatcher. 4 5 Web Inspector: unhide new network and resources panels. 6 https://bugs.webkit.org/show_bug.cgi?id=48725 7 8 * src/WebDevToolsAgentImpl.cpp: 9 (WebKit::WebDevToolsAgentImpl::setApuAgentEnabled): 10 1 11 2010-10-29 Daniel Bates <dbates@rim.com> 2 12 -
trunk/WebKit/chromium/src/WebDevToolsAgentImpl.cpp
r69948 r71010 265 265 if (!ic->hasFrontend()) 266 266 connectFrontend(true); 267 268 #if LEGACY_RESOURCE_TRACKING_ENABLED 267 269 m_resourceTrackingWasEnabled = ic->resourceTrackingEnabled(); 270 #endif 268 271 ic->startTimelineProfiler(); 272 #if LEGACY_RESOURCE_TRACKING_ENABLED 269 273 if (!m_resourceTrackingWasEnabled) { 270 274 // TODO(knorton): Introduce some kind of agents dependency here so that … … 272 276 ic->setResourceTrackingEnabled(true); 273 277 } 278 #endif 274 279 m_debuggerAgentImpl->setAutoContinueOnException(true); 275 280 } else { 276 281 ic->stopTimelineProfiler(); 282 #if LEGACY_RESOURCE_TRACKING_ENABLED 277 283 if (!m_resourceTrackingWasEnabled) 278 284 ic->setResourceTrackingEnabled(false); 279 285 m_resourceTrackingWasEnabled = false; 286 #endif 280 287 } 281 288 m_client->runtimePropertyChanged(
Note: See TracChangeset
for help on using the changeset viewer.