Diff
Modified: trunk/Source/WebCore/ChangeLog (103680 => 103681)
--- trunk/Source/WebCore/ChangeLog 2011-12-26 10:41:12 UTC (rev 103680)
+++ trunk/Source/WebCore/ChangeLog 2011-12-26 12:27:47 UTC (rev 103681)
@@ -1,3 +1,28 @@
+2011-12-26 Pavel Feldman <[email protected]>
+
+ Web Inspector: make SDK compilation component self-contained.
+ https://bugs.webkit.org/show_bug.cgi?id=75172
+
+ Reviewed by Yury Semikhatsky.
+
+ * inspector/compile-front-end.sh:
+ * inspector/front-end/ConsoleMessage.js:
+ (WebInspector.ConsoleMessageImpl):
+ (WebInspector.ConsoleMessageImpl.prototype.get stackTrace):
+ (WebInspector.ConsoleMessageImpl.prototype.clone):
+ * inspector/front-end/ConsoleModel.js:
+ (WebInspector.ConsoleModel.prototype._messageRepeatCountUpdated):
+ (WebInspector.ConsoleMessage):
+ (WebInspector.ConsoleMessage.prototype.isErrorOrWarning):
+ (WebInspector.ConsoleMessage.prototype.updateRepeatCount):
+ (WebInspector.ConsoleMessage.prototype.clone):
+ * inspector/front-end/DebuggerPresentationModel.js:
+ (WebInspector.DebuggerPresentationModel.prototype._consoleMessageAdded):
+ * inspector/front-end/ResourceUtils.js:
+ * inspector/front-end/UIUtils.js:
+ (WebInspector.resetToolbarColors):
+ (WebInspector.populateHrefContextMenu):
+
2011-12-26 Hajime Morrita <[email protected]>
Unreviewed bad merge fix.
Modified: trunk/Source/WebCore/inspector/compile-front-end.sh (103680 => 103681)
--- trunk/Source/WebCore/inspector/compile-front-end.sh 2011-12-26 10:41:12 UTC (rev 103680)
+++ trunk/Source/WebCore/inspector/compile-front-end.sh 2011-12-26 12:27:47 UTC (rev 103681)
@@ -45,9 +45,10 @@
--js Source/WebCore/inspector/front-end/UserMetrics.js \
--js Source/WebCore/inspector/front-end/HandlerRegistry.js \
--js Source/WebCore/inspector/front-end/InspectorFrontendHostStub.js \
- --module jsmodule_sdk:26:jsmodule_common \
+ --module jsmodule_sdk:29:jsmodule_common \
--js Source/WebCore/inspector/front-end/InspectorBackend.js \
--js Source/WebCore/inspector/front-end/ApplicationCacheModel.js \
+ --js Source/WebCore/inspector/front-end/Color.js \
--js Source/WebCore/inspector/front-end/CompilerSourceMapping.js \
--js Source/WebCore/inspector/front-end/ConsoleModel.js \
--js Source/WebCore/inspector/front-end/ContentProviders.js \
@@ -63,19 +64,20 @@
--js Source/WebCore/inspector/front-end/DebuggerPresentationModel.js \
--js Source/WebCore/inspector/front-end/HAREntry.js \
--js Source/WebCore/inspector/front-end/NetworkLog.js \
+ --js Source/WebCore/inspector/front-end/Placard.js \
--js Source/WebCore/inspector/front-end/Script.js \
--js Source/WebCore/inspector/front-end/ScriptFormatter.js \
--js Source/WebCore/inspector/front-end/RawSourceCode.js \
--js Source/WebCore/inspector/front-end/RemoteObject.js \
+ --js Source/WebCore/inspector/front-end/Resource.js \
--js Source/WebCore/inspector/front-end/ResourceCategory.js \
--js Source/WebCore/inspector/front-end/ResourceTreeModel.js \
- --js Source/WebCore/inspector/front-end/Resource.js \
+ --js Source/WebCore/inspector/front-end/ResourceUtils.js \
--js Source/WebCore/inspector/front-end/NetworkManager.js \
--js Source/WebCore/inspector/front-end/UISourceCode.js \
- --module jsmodule_ui:36:jsmodule_common \
+ --module jsmodule_ui:34:jsmodule_common \
--js Source/WebCore/inspector/front-end/AdvancedSearchController.js \
--js Source/WebCore/inspector/front-end/Checkbox.js \
- --js Source/WebCore/inspector/front-end/Color.js \
--js Source/WebCore/inspector/front-end/ContextMenu.js \
--js Source/WebCore/inspector/front-end/CookiesTable.js \
--js Source/WebCore/inspector/front-end/DOMSyntaxHighlighter.js \
@@ -87,7 +89,6 @@
--js Source/WebCore/inspector/front-end/KeyboardShortcut.js \
--js Source/WebCore/inspector/front-end/Panel.js \
--js Source/WebCore/inspector/front-end/PanelEnablerView.js \
- --js Source/WebCore/inspector/front-end/Placard.js \
--js Source/WebCore/inspector/front-end/Popover.js \
--js Source/WebCore/inspector/front-end/PropertiesSection.js \
--js Source/WebCore/inspector/front-end/PropertiesSidebarPane.js \
@@ -109,7 +110,7 @@
--js Source/WebCore/inspector/front-end/UIUtils.js \
--js Source/WebCore/inspector/front-end/View.js \
--js Source/WebCore/inspector/front-end/WelcomeView.js \
- --module jsmodule_components:16:jsmodule_sdk,jsmodule_ui \
+ --module jsmodule_components:15:jsmodule_sdk,jsmodule_ui \
--js Source/WebCore/inspector/front-end/ConsoleMessage.js \
--js Source/WebCore/inspector/front-end/BreakpointsSidebarPane.js \
--js Source/WebCore/inspector/front-end/DOMBreakpointsSidebarPane.js \
@@ -120,7 +121,6 @@
--js Source/WebCore/inspector/front-end/_javascript_ContextManager.js \
--js Source/WebCore/inspector/front-end/ObjectPopoverHelper.js \
--js Source/WebCore/inspector/front-end/ObjectPropertiesSection.js \
- --js Source/WebCore/inspector/front-end/ResourceUtils.js \
--js Source/WebCore/inspector/front-end/SourceFrame.js \
--js Source/WebCore/inspector/front-end/SourceTokenizer.js \
--js Source/WebCore/inspector/front-end/TimelineAgent.js \
Modified: trunk/Source/WebCore/inspector/front-end/ConsoleMessage.js (103680 => 103681)
--- trunk/Source/WebCore/inspector/front-end/ConsoleMessage.js 2011-12-26 10:41:12 UTC (rev 103680)
+++ trunk/Source/WebCore/inspector/front-end/ConsoleMessage.js 2011-12-26 12:27:47 UTC (rev 103681)
@@ -46,18 +46,10 @@
*/
WebInspector.ConsoleMessageImpl = function(source, level, message, linkifier, type, url, line, repeatCount, parameters, stackTrace, request)
{
- WebInspector.ConsoleMessage.call();
+ WebInspector.ConsoleMessage.call(this, source, level, url, line, repeatCount);
this._linkifier = linkifier;
- this.source = source;
this.type = type || WebInspector.ConsoleMessage.MessageType.Log;
- this.level = level;
- this.line = line || 0;
- this.url = "" || null;
- repeatCount = repeatCount || 1;
- this.repeatCount = repeatCount;
- this.repeatDelta = repeatCount;
- this.totalRepeatCount = repeatCount;
this._messageText = message;
this._parameters = parameters;
this._stackTrace = stackTrace;
@@ -594,6 +586,14 @@
get stackTrace()
{
return this._stackTrace;
+ },
+
+ /**
+ * @return {WebInspector.ConsoleMessage}
+ */
+ clone: function()
+ {
+ return WebInspector.ConsoleMessage.create(this.source, this.level, this._messageText, this.type, this.url, this.line, this.repeatCount, this._parameters, this._stackTrace, this._request);
}
}
Modified: trunk/Source/WebCore/inspector/front-end/ConsoleModel.js (103680 => 103681)
--- trunk/Source/WebCore/inspector/front-end/ConsoleModel.js 2011-12-26 10:41:12 UTC (rev 103680)
+++ trunk/Source/WebCore/inspector/front-end/ConsoleModel.js 2011-12-26 12:27:47 UTC (rev 103681)
@@ -121,8 +121,10 @@
this._incrementErrorWarningCount(msg);
this.dispatchEventToListeners(WebInspector.ConsoleModel.Events.RepeatCountUpdated, msg);
} else {
- var msgCopy = WebInspector.ConsoleMessage.create(msg.source, msg.level, msg._messageText, msg.type, msg.url, msg.line, count - prevRepeatCount, msg._parameters, msg._stackTrace, msg._request);
+ var msgCopy = msg.clone();
msgCopy.totalRepeatCount = count;
+ msgCopy.repeatCount = (count - prevRepeatCount) || 1;
+ msgCopy.repeatDelta = msgCopy.repeatCount;
this.addMessage(msgCopy);
}
}
@@ -132,29 +134,40 @@
/**
* @constructor
+ * @param {string} source
+ * @param {string} level
+ * @param {string=} url
+ * @param {number=} line
+ * @param {number=} repeatCount
*/
-WebInspector.ConsoleMessage = function()
+WebInspector.ConsoleMessage = function(source, level, url, line, repeatCount)
{
- this.repeatDelta = 0;
- this.repeatCount = 0;
- this._totalRepeatCount = 0;
+ this.source = source;
+ this.level = level;
+ this.url = "" || null;
+ this.line = line || 0;
+
+ repeatCount = repeatCount || 1;
+ this.repeatCount = repeatCount;
+ this.repeatDelta = repeatCount;
+ this.totalRepeatCount = repeatCount;
}
WebInspector.ConsoleMessage.prototype = {
- /**
- * @return {number}
- */
- get totalRepeatCount()
+ isErrorOrWarning: function()
{
- return this._totalRepeatCount;
+ return (this.level === WebInspector.ConsoleMessage.MessageLevel.Warning || this.level === WebInspector.ConsoleMessage.MessageLevel.Error);
},
- set totalRepeatCount(totalRepeatCount)
+ updateRepeatCount: function()
{
- this._totalRepeatCount = totalRepeatCount;
+ // Implemented by concrete instances
},
- updateRepeatCount: function()
+ /**
+ * @return {WebInspector.ConsoleMessage}
+ */
+ clone: function()
{
// Implemented by concrete instances
}
Modified: trunk/Source/WebCore/inspector/front-end/DebuggerPresentationModel.js (103680 => 103681)
--- trunk/Source/WebCore/inspector/front-end/DebuggerPresentationModel.js 2011-12-26 10:41:12 UTC (rev 103680)
+++ trunk/Source/WebCore/inspector/front-end/DebuggerPresentationModel.js 2011-12-26 12:27:47 UTC (rev 103681)
@@ -82,7 +82,7 @@
/**
* @param {WebInspector.PresentationCallFrame} callFrame
- * @return {WebInspector.Placard}
+ * @return {WebInspector.DebuggerPresentationModel.CallFramePlacard}
*/
createPlacard: function(callFrame)
{
@@ -350,7 +350,7 @@
_consoleMessageAdded: function(event)
{
var message = /** @type {WebInspector.ConsoleMessage} */ event.data;
- if (!message.url || !message.isErrorOrWarning() || !message.message)
+ if (!message.url || !message.isErrorOrWarning())
return;
var rawSourceCode = this._rawSourceCodeForScriptWithURL(message.url);
Modified: trunk/Source/WebCore/inspector/front-end/ResourceUtils.js (103680 => 103681)
--- trunk/Source/WebCore/inspector/front-end/ResourceUtils.js 2011-12-26 10:41:12 UTC (rev 103680)
+++ trunk/Source/WebCore/inspector/front-end/ResourceUtils.js 2011-12-26 12:27:47 UTC (rev 103681)
@@ -250,29 +250,6 @@
}
/**
- * @param {WebInspector.ContextMenu} contextMenu
- * @param {Node} contextNode
- * @param {Event} event
- */
-WebInspector.populateHrefContextMenu = function(contextMenu, contextNode, event)
-{
- var anchorElement = event.target.enclosingNodeOrSelfWithClass("webkit-html-resource-link") || event.target.enclosingNodeOrSelfWithClass("webkit-html-external-link");
- if (!anchorElement)
- return false;
-
- var resourceURL = WebInspector.resourceURLForRelatedNode(contextNode, anchorElement.href);
- if (!resourceURL)
- return false;
-
- // Add resource-related actions.
- contextMenu.appendItem(WebInspector.openLinkExternallyLabel(), WebInspector.openResource.bind(WebInspector, resourceURL, false));
- if (WebInspector.resourceForURL(resourceURL))
- contextMenu.appendItem(WebInspector.UIString(WebInspector.useLowerCaseMenuTitles() ? "Open link in Resources panel" : "Open Link in Resources Panel"), WebInspector.openResource.bind(null, resourceURL, true));
- contextMenu.appendItem(WebInspector.copyLinkAddressLabel(), InspectorFrontendHost.copyText.bind(InspectorFrontendHost, resourceURL));
- return true;
-}
-
-/**
* @param {string} baseURL
* @param {string} href
* @return {?string}
Modified: trunk/Source/WebCore/inspector/front-end/UIUtils.js (103680 => 103681)
--- trunk/Source/WebCore/inspector/front-end/UIUtils.js 2011-12-26 10:41:12 UTC (rev 103680)
+++ trunk/Source/WebCore/inspector/front-end/UIUtils.js 2011-12-26 12:27:47 UTC (rev 103681)
@@ -633,7 +633,29 @@
{
if (WebInspector._themeStyleElement)
WebInspector._themeStyleElement.textContent = "";
+}
+/**
+ * @param {WebInspector.ContextMenu} contextMenu
+ * @param {Node} contextNode
+ * @param {Event} event
+ */
+WebInspector.populateHrefContextMenu = function(contextMenu, contextNode, event)
+{
+ var anchorElement = event.target.enclosingNodeOrSelfWithClass("webkit-html-resource-link") || event.target.enclosingNodeOrSelfWithClass("webkit-html-external-link");
+ if (!anchorElement)
+ return false;
+
+ var resourceURL = WebInspector.resourceURLForRelatedNode(contextNode, anchorElement.href);
+ if (!resourceURL)
+ return false;
+
+ // Add resource-related actions.
+ contextMenu.appendItem(WebInspector.openLinkExternallyLabel(), WebInspector.openResource.bind(WebInspector, resourceURL, false));
+ if (WebInspector.resourceForURL(resourceURL))
+ contextMenu.appendItem(WebInspector.UIString(WebInspector.useLowerCaseMenuTitles() ? "Open link in Resources panel" : "Open Link in Resources Panel"), WebInspector.openResource.bind(null, resourceURL, true));
+ contextMenu.appendItem(WebInspector.copyLinkAddressLabel(), InspectorFrontendHost.copyText.bind(InspectorFrontendHost, resourceURL));
+ return true;
}
;(function() {
