Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(55)

Side by Side Diff: Source/WebCore/inspector/front-end/inspector.js

Issue 6368081: Merge 77480 - 2011-02-03 Pavel Feldman <pfeldman@chromium.org>... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/648/
Patch Set: Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/WebCore/inspector/front-end/ResourcesPanel.js ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
3 * Copyright (C) 2007 Matt Lilek (pewtermoose@gmail.com). 3 * Copyright (C) 2007 Matt Lilek (pewtermoose@gmail.com).
4 * Copyright (C) 2009 Joseph Pecoraro 4 * Copyright (C) 2009 Joseph Pecoraro
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 9 *
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
(...skipping 1153 matching lines...) Expand 10 before | Expand all | Expand 10 after
1164 this.panels.audits.mainResourceDOMContentTime = time; 1164 this.panels.audits.mainResourceDOMContentTime = time;
1165 if (this.panels.network) 1165 if (this.panels.network)
1166 this.panels.network.mainResourceDOMContentTime = time; 1166 this.panels.network.mainResourceDOMContentTime = time;
1167 this.extensionServer.notifyPageDOMContentLoaded((time - WebInspector.mainRes ource.startTime) * 1000); 1167 this.extensionServer.notifyPageDOMContentLoaded((time - WebInspector.mainRes ource.startTime) * 1000);
1168 this.mainResourceDOMContentTime = time; 1168 this.mainResourceDOMContentTime = time;
1169 } 1169 }
1170 1170
1171 WebInspector.loadEventFired = function(time) 1171 WebInspector.loadEventFired = function(time)
1172 { 1172 {
1173 this.panels.audits.mainResourceLoadTime = time; 1173 this.panels.audits.mainResourceLoadTime = time;
1174 if (this.panels.network) 1174 this.panels.network.mainResourceLoadTime = time;
1175 this.panels.network.mainResourceLoadTime = time; 1175 this.panels.resources.loadEventFired();
1176 this.extensionServer.notifyPageLoaded((time - WebInspector.mainResource.star tTime) * 1000); 1176 this.extensionServer.notifyPageLoaded((time - WebInspector.mainResource.star tTime) * 1000);
1177 this.mainResourceLoadTime = time; 1177 this.mainResourceLoadTime = time;
1178 } 1178 }
1179 1179
1180 WebInspector.searchingForNodeWasEnabled = function() 1180 WebInspector.searchingForNodeWasEnabled = function()
1181 { 1181 {
1182 this.panels.elements.searchingForNodeWasEnabled(); 1182 this.panels.elements.searchingForNodeWasEnabled();
1183 } 1183 }
1184 1184
1185 WebInspector.searchingForNodeWasDisabled = function() 1185 WebInspector.searchingForNodeWasDisabled = function()
(...skipping 747 matching lines...) Expand 10 before | Expand all | Expand 10 after
1933 { 1933 {
1934 if (this._inHistory) 1934 if (this._inHistory)
1935 return; 1935 return;
1936 1936
1937 this._history.splice(this._historyIterator + 1, this._history.length - t his._historyIterator - 1); 1937 this._history.splice(this._historyIterator + 1, this._history.length - t his._historyIterator - 1);
1938 if (!this._history.length || this._history[this._history.length - 1] !== panelName) 1938 if (!this._history.length || this._history[this._history.length - 1] !== panelName)
1939 this._history.push(panelName); 1939 this._history.push(panelName);
1940 this._historyIterator = this._history.length - 1; 1940 this._historyIterator = this._history.length - 1;
1941 } 1941 }
1942 } 1942 }
OLDNEW
« no previous file with comments | « Source/WebCore/inspector/front-end/ResourcesPanel.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698