Diff
Modified: trunk/Source/WebCore/ChangeLog (129883 => 129884)
--- trunk/Source/WebCore/ChangeLog 2012-09-28 13:20:24 UTC (rev 129883)
+++ trunk/Source/WebCore/ChangeLog 2012-09-28 13:29:59 UTC (rev 129884)
@@ -1,3 +1,22 @@
+2012-09-28 Pavel Feldman <[email protected]>
+
+ Web Inspector: split ProgressBar.js into Progress.js and ProgressIndicator.js
+ https://bugs.webkit.org/show_bug.cgi?id=97902
+
+ Reviewed by Alexander Pavlov.
+
+ One is model, the other is UI component.
+
+ * WebCore.gypi:
+ * WebCore.vcproj/WebCore.vcproj:
+ * inspector/compile-front-end.py:
+ * inspector/front-end/Progress.js: Copied from Source/WebCore/inspector/front-end/ProgressBar.js.
+ * inspector/front-end/ProgressIndicator.js: Renamed from Source/WebCore/inspector/front-end/ProgressBar.js.
+ * inspector/front-end/UserAgentSupport.js:
+ * inspector/front-end/WebKit.qrc:
+ * inspector/front-end/externs.js:
+ * inspector/front-end/inspector.html:
+
2012-09-27 Alexander Pavlov <[email protected]>
Web Inspector: [Device Metrics] Remove the gutter overlay moving its functionality into the InspectorOverlay
Modified: trunk/Source/WebCore/WebCore.gypi (129883 => 129884)
--- trunk/Source/WebCore/WebCore.gypi 2012-09-28 13:20:24 UTC (rev 129883)
+++ trunk/Source/WebCore/WebCore.gypi 2012-09-28 13:29:59 UTC (rev 129884)
@@ -6407,7 +6407,8 @@
'inspector/front-end/Placard.js',
'inspector/front-end/Popover.js',
'inspector/front-end/PresentationConsoleMessageHelper.js',
- 'inspector/front-end/ProgressBar.js',
+ 'inspector/front-end/Progress.js',
+ 'inspector/front-end/ProgressIndicator.js',
'inspector/front-end/PropertiesSection.js',
'inspector/front-end/RemoteObject.js',
'inspector/front-end/Resource.js',
Modified: trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj (129883 => 129884)
--- trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2012-09-28 13:20:24 UTC (rev 129883)
+++ trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2012-09-28 13:29:59 UTC (rev 129884)
@@ -76510,10 +76510,14 @@
>
</File>
<File
- RelativePath="..\inspector\front-end\ProgressBar.js"
+ RelativePath="..\inspector\front-end\Progress.js"
>
</File>
<File
+ RelativePath="..\inspector\front-end\ProgressIndicator.js"
+ >
+ </File>
+ <File
RelativePath="..\inspector\front-end\PropertiesSection.js"
>
</File>
Modified: trunk/Source/WebCore/inspector/compile-front-end.py (129883 => 129884)
--- trunk/Source/WebCore/inspector/compile-front-end.py 2012-09-28 13:20:24 UTC (rev 129883)
+++ trunk/Source/WebCore/inspector/compile-front-end.py 2012-09-28 13:29:59 UTC (rev 129884)
@@ -48,6 +48,7 @@
"Color.js",
"Object.js",
"ParsedURL.js",
+ "Progress.js",
"Settings.js",
"UIString.js",
"UserMetrics.js",
@@ -128,7 +129,7 @@
"PanelEnablerView.js",
"Placard.js",
"Popover.js",
- "ProgressBar.js",
+ "ProgressIndicator.js",
"PropertiesSection.js",
"SearchController.js",
"Section.js",
Copied: trunk/Source/WebCore/inspector/front-end/Progress.js (from rev 129883, trunk/Source/WebCore/inspector/front-end/ProgressBar.js) (0 => 129884)
--- trunk/Source/WebCore/inspector/front-end/Progress.js (rev 0)
+++ trunk/Source/WebCore/inspector/front-end/Progress.js 2012-09-28 13:29:59 UTC (rev 129884)
@@ -0,0 +1,177 @@
+/*
+ * Copyright (C) 2012 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * @interface
+ */
+WebInspector.Progress = function()
+{
+}
+
+WebInspector.Progress.prototype = {
+ /**
+ * @param {number} totalWork
+ */
+ setTotalWork: function(totalWork) { },
+
+ /**
+ * @param {string} title
+ */
+ setTitle: function(title) { },
+
+ /**
+ * @param {number} worked
+ * @param {string=} title
+ */
+ setWorked: function(worked, title) { },
+
+ /**
+ * @param {number=} worked
+ */
+ worked: function(worked) { },
+
+ done: function() { },
+
+ /**
+ * @return {boolean}
+ */
+ isCanceled: function() { return false; }
+}
+
+/**
+ * @constructor
+ * @param {WebInspector.Progress} parent
+ */
+WebInspector.CompositeProgress = function(parent)
+{
+ this._parent = parent;
+ this._children = [];
+ this._childrenDone = 0;
+ this._parent.setTotalWork(1);
+ this._parent.setWorked(0);
+}
+
+WebInspector.CompositeProgress.prototype = {
+ _childDone: function()
+ {
+ if (++this._childrenDone === this._children.length)
+ this._parent.done();
+ },
+
+ /**
+ * @param {number=} weight
+ */
+ createSubProgress: function(weight)
+ {
+ var child = new WebInspector.SubProgress(this, weight);
+ this._children.push(child);
+ return child;
+ },
+
+ _update: function()
+ {
+ var totalWeights = 0;
+ var done = 0;
+
+ for (var i = 0; i < this._children.length; ++i) {
+ var child = this._children[i];
+ if (child._totalWork)
+ done += child._weight * child._worked / child._totalWork;
+ totalWeights += child._weight;
+ }
+ this._parent.setWorked(done / totalWeights);
+ }
+}
+
+/**
+ * @constructor
+ * @implements {WebInspector.Progress}
+ * @param {WebInspector.CompositeProgress} composite
+ * @param {number=} weight
+ */
+WebInspector.SubProgress = function(composite, weight)
+{
+ this._composite = composite;
+ this._weight = weight || 1;
+ this._worked = 0;
+}
+
+WebInspector.SubProgress.prototype = {
+ /**
+ * @return {boolean}
+ */
+ isCanceled: function()
+ {
+ return this._composite._parent.isCanceled();
+ },
+
+ /**
+ * @param {string} title
+ */
+ setTitle: function(title)
+ {
+ this._composite._parent.setTitle(title);
+ },
+
+ done: function()
+ {
+ this.setWorked(this._totalWork);
+ this._composite._childDone();
+ },
+
+ /**
+ * @param {number} totalWork
+ */
+ setTotalWork: function(totalWork)
+ {
+ this._totalWork = totalWork;
+ this._composite._update();
+ },
+
+ /**
+ * @param {number} worked
+ * @param {string=} title
+ */
+ setWorked: function(worked, title)
+ {
+ this._worked = worked;
+ if (typeof title !== "undefined")
+ this.setTitle(title);
+ this._composite._update();
+ },
+
+ /**
+ * @param {number=} worked
+ */
+ worked: function(worked)
+ {
+ this.setWorked(this._worked + (worked || 1));
+ }
+}
Deleted: trunk/Source/WebCore/inspector/front-end/ProgressBar.js (129883 => 129884)
--- trunk/Source/WebCore/inspector/front-end/ProgressBar.js 2012-09-28 13:20:24 UTC (rev 129883)
+++ trunk/Source/WebCore/inspector/front-end/ProgressBar.js 2012-09-28 13:29:59 UTC (rev 129884)
@@ -1,273 +0,0 @@
-/*
- * Copyright (C) 2012 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/**
- * @interface
- */
-WebInspector.Progress = function()
-{
-}
-
-WebInspector.Progress.prototype = {
- /**
- * @param {number} totalWork
- */
- setTotalWork: function(totalWork) { },
-
- /**
- * @param {string} title
- */
- setTitle: function(title) { },
-
- /**
- * @param {number} worked
- * @param {string=} title
- */
- setWorked: function(worked, title) { },
-
- /**
- * @param {number=} worked
- */
- worked: function(worked) { },
-
- done: function() { },
-
- /**
- * @return {boolean}
- */
- isCanceled: function() { return false; }
-}
-
-/**
- * @constructor
- * @implements {WebInspector.Progress}
- * @extends {WebInspector.Object}
- */
-WebInspector.ProgressIndicator = function()
-{
- this.element = document.createElement("div");
- this.element.className = "progress-bar-container";
- this._labelElement = this.element.createChild("span");
- this._progressElement = this.element.createChild("progress");
- this._stopButton = new WebInspector.StatusBarButton(WebInspector.UIString("Cancel"), "progress-bar-stop-button");
- this._stopButton.addEventListener("click", this.cancel, this);
- this.element.appendChild(this._stopButton.element);
- this._isCanceled = false;
- this._worked = 0;
-}
-
-WebInspector.ProgressIndicator.Events = {
- Done: "Done"
-}
-
-WebInspector.ProgressIndicator.prototype = {
- /**
- * @param {Element} parent
- */
- show: function(parent)
- {
- parent.appendChild(this.element);
- },
-
- hide: function()
- {
- var parent = this.element.parentElement;
- if (parent)
- parent.removeChild(this.element);
- },
-
- done: function()
- {
- if (this._isDone)
- return;
- this._isDone = true;
- this.hide();
- this.dispatchEventToListeners(WebInspector.ProgressIndicator.Events.Done);
- },
-
- cancel: function()
- {
- this._isCanceled = true;
- },
-
- isCanceled: function()
- {
- return this._isCanceled;
- },
-
- /**
- * @param {string} title
- */
- setTitle: function(title)
- {
- this._labelElement.textContent = title;
- },
-
- /**
- * @param {number} totalWork
- */
- setTotalWork: function(totalWork)
- {
- this._progressElement.max = totalWork;
- },
-
- /**
- * @param {number} worked
- * @param {string=} title
- */
- setWorked: function(worked, title)
- {
- this._worked = worked;
- this._progressElement.value = worked;
- if (title)
- this.setTitle(title);
- },
-
- /**
- * @param {number=} worked
- */
- worked: function(worked)
- {
- this.setWorked(this._worked + (worked || 1));
- }
-}
-
-WebInspector.ProgressIndicator.prototype.__proto__ = WebInspector.Object.prototype;
-
-/**
- * @constructor
- * @param {WebInspector.Progress} parent
- */
-WebInspector.CompositeProgress = function(parent)
-{
- this._parent = parent;
- this._children = [];
- this._childrenDone = 0;
- this._parent.setTotalWork(1);
- this._parent.setWorked(0);
-}
-
-WebInspector.CompositeProgress.prototype = {
- _childDone: function()
- {
- if (++this._childrenDone === this._children.length)
- this._parent.done();
- },
-
- /**
- * @param {number=} weight
- */
- createSubProgress: function(weight)
- {
- var child = new WebInspector.SubProgress(this, weight);
- this._children.push(child);
- return child;
- },
-
- _update: function()
- {
- var totalWeights = 0;
- var done = 0;
-
- for (var i = 0; i < this._children.length; ++i) {
- var child = this._children[i];
- if (child._totalWork)
- done += child._weight * child._worked / child._totalWork;
- totalWeights += child._weight;
- }
- this._parent.setWorked(done / totalWeights);
- }
-}
-
-/**
- * @constructor
- * @implements {WebInspector.Progress}
- * @param {WebInspector.CompositeProgress} composite
- * @param {number=} weight
- */
-WebInspector.SubProgress = function(composite, weight)
-{
- this._composite = composite;
- this._weight = weight || 1;
- this._worked = 0;
-}
-
-WebInspector.SubProgress.prototype = {
- /**
- * @return {boolean}
- */
- isCanceled: function()
- {
- return this._composite._parent.isCanceled();
- },
-
- /**
- * @param {string} title
- */
- setTitle: function(title)
- {
- this._composite._parent.setTitle(title);
- },
-
- done: function()
- {
- this.setWorked(this._totalWork);
- this._composite._childDone();
- },
-
- /**
- * @param {number} totalWork
- */
- setTotalWork: function(totalWork)
- {
- this._totalWork = totalWork;
- this._composite._update();
- },
-
- /**
- * @param {number} worked
- * @param {string=} title
- */
- setWorked: function(worked, title)
- {
- this._worked = worked;
- if (typeof title !== "undefined")
- this.setTitle(title);
- this._composite._update();
- },
-
- /**
- * @param {number=} worked
- */
- worked: function(worked)
- {
- this.setWorked(this._worked + (worked || 1));
- }
-}
Added: trunk/Source/WebCore/inspector/front-end/ProgressIndicator.js (0 => 129884)
--- trunk/Source/WebCore/inspector/front-end/ProgressIndicator.js (rev 0)
+++ trunk/Source/WebCore/inspector/front-end/ProgressIndicator.js 2012-09-28 13:29:59 UTC (rev 129884)
@@ -0,0 +1,125 @@
+/*
+ * Copyright (C) 2012 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * @constructor
+ * @implements {WebInspector.Progress}
+ * @extends {WebInspector.Object}
+ */
+WebInspector.ProgressIndicator = function()
+{
+ this.element = document.createElement("div");
+ this.element.className = "progress-bar-container";
+ this._labelElement = this.element.createChild("span");
+ this._progressElement = this.element.createChild("progress");
+ this._stopButton = new WebInspector.StatusBarButton(WebInspector.UIString("Cancel"), "progress-bar-stop-button");
+ this._stopButton.addEventListener("click", this.cancel, this);
+ this.element.appendChild(this._stopButton.element);
+ this._isCanceled = false;
+ this._worked = 0;
+}
+
+WebInspector.ProgressIndicator.Events = {
+ Done: "Done"
+}
+
+WebInspector.ProgressIndicator.prototype = {
+ /**
+ * @param {Element} parent
+ */
+ show: function(parent)
+ {
+ parent.appendChild(this.element);
+ },
+
+ hide: function()
+ {
+ var parent = this.element.parentElement;
+ if (parent)
+ parent.removeChild(this.element);
+ },
+
+ done: function()
+ {
+ if (this._isDone)
+ return;
+ this._isDone = true;
+ this.hide();
+ this.dispatchEventToListeners(WebInspector.ProgressIndicator.Events.Done);
+ },
+
+ cancel: function()
+ {
+ this._isCanceled = true;
+ },
+
+ isCanceled: function()
+ {
+ return this._isCanceled;
+ },
+
+ /**
+ * @param {string} title
+ */
+ setTitle: function(title)
+ {
+ this._labelElement.textContent = title;
+ },
+
+ /**
+ * @param {number} totalWork
+ */
+ setTotalWork: function(totalWork)
+ {
+ this._progressElement.max = totalWork;
+ },
+
+ /**
+ * @param {number} worked
+ * @param {string=} title
+ */
+ setWorked: function(worked, title)
+ {
+ this._worked = worked;
+ this._progressElement.value = worked;
+ if (title)
+ this.setTitle(title);
+ },
+
+ /**
+ * @param {number=} worked
+ */
+ worked: function(worked)
+ {
+ this.setWorked(this._worked + (worked || 1));
+ }
+}
+
+WebInspector.ProgressIndicator.prototype.__proto__ = WebInspector.Object.prototype;
Modified: trunk/Source/WebCore/inspector/front-end/UserAgentSupport.js (129883 => 129884)
--- trunk/Source/WebCore/inspector/front-end/UserAgentSupport.js 2012-09-28 13:20:24 UTC (rev 129883)
+++ trunk/Source/WebCore/inspector/front-end/UserAgentSupport.js 2012-09-28 13:29:59 UTC (rev 129884)
@@ -362,3 +362,8 @@
}
}
+
+/**
+ * @type {WebInspector.UserAgentSupport}
+ */
+WebInspector.userAgentSupport;
Modified: trunk/Source/WebCore/inspector/front-end/WebKit.qrc (129883 => 129884)
--- trunk/Source/WebCore/inspector/front-end/WebKit.qrc 2012-09-28 13:20:24 UTC (rev 129883)
+++ trunk/Source/WebCore/inspector/front-end/WebKit.qrc 2012-09-28 13:29:59 UTC (rev 129884)
@@ -128,7 +128,8 @@
<file>ProfileDataGridTree.js</file>
<file>ProfileLauncherView.js</file>
<file>ProfilesPanel.js</file>
- <file>ProgressBar.js</file>
+ <file>Progress.js</file>
+ <file>ProgressIndicator.js</file>
<file>PropertiesSection.js</file>
<file>PropertiesSidebarPane.js</file>
<file>RemoteObject.js</file>
Modified: trunk/Source/WebCore/inspector/front-end/externs.js (129883 => 129884)
--- trunk/Source/WebCore/inspector/front-end/externs.js 2012-09-28 13:20:24 UTC (rev 129883)
+++ trunk/Source/WebCore/inspector/front-end/externs.js 2012-09-28 13:29:59 UTC (rev 129884)
@@ -262,11 +262,6 @@
*/
WebInspector.inspectedPageDomain;
-/**
- * @type {WebInspector.UserAgentSupport}
- */
-WebInspector.userAgentSupport;
-
WebInspector.isCompactMode = function() { return false; }
WebInspector.SourceJavaScriptTokenizer = {}
Modified: trunk/Source/WebCore/inspector/front-end/inspector.html (129883 => 129884)
--- trunk/Source/WebCore/inspector/front-end/inspector.html 2012-09-28 13:20:24 UTC (rev 129883)
+++ trunk/Source/WebCore/inspector/front-end/inspector.html 2012-09-28 13:29:59 UTC (rev 129884)
@@ -159,7 +159,8 @@
<script type="text/_javascript_" src=""
<script type="text/_javascript_" src=""
<script type="text/_javascript_" src=""
- <script type="text/_javascript_" src=""
+ <script type="text/_javascript_" src=""
+ <script type="text/_javascript_" src=""
<script type="text/_javascript_" src=""
<script type="text/_javascript_" src=""
<script type="text/_javascript_" src=""
