Title: [107079] trunk/Source/WebCore
- Revision
- 107079
- Author
- apav...@chromium.org
- Date
- 2012-02-08 05:22:33 -0800 (Wed, 08 Feb 2012)
Log Message
Web Inspector: Add changes for Spectrum colorpicker
https://bugs.webkit.org/show_bug.cgi?id=75454
Patch by Brian Grinstead <briangrinst...@gmail.com> on 2012-02-01
Reviewed by Pavel Feldman.
* inspector/front-end/Color.js:
(WebInspector.Color.fromRGB):
* inspector/front-end/utilities.js:
(Element.prototype.totalOffsetLeft):
(Element.prototype.totalOffsetTop):
(Element.prototype.totalOffset):
(Element.prototype.scrollOffset):
():
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (107078 => 107079)
--- trunk/Source/WebCore/ChangeLog 2012-02-08 13:00:54 UTC (rev 107078)
+++ trunk/Source/WebCore/ChangeLog 2012-02-08 13:22:33 UTC (rev 107079)
@@ -1,3 +1,19 @@
+2012-02-01 Brian Grinstead <briangrinst...@gmail.com>
+
+ Web Inspector: Add changes for Spectrum colorpicker
+ https://bugs.webkit.org/show_bug.cgi?id=75454
+
+ Reviewed by Pavel Feldman.
+
+ * inspector/front-end/Color.js:
+ (WebInspector.Color.fromRGB):
+ * inspector/front-end/utilities.js:
+ (Element.prototype.totalOffsetLeft):
+ (Element.prototype.totalOffsetTop):
+ (Element.prototype.totalOffset):
+ (Element.prototype.scrollOffset):
+ ():
+
2012-02-08 Alexander Pavlov <apav...@chromium.org>
Web Inspector: Avoid an avalanche of "class" attribute modifications in WatchExpressionsSidebarPane
Modified: trunk/Source/WebCore/inspector/front-end/Color.js (107078 => 107079)
--- trunk/Source/WebCore/inspector/front-end/Color.js 2012-02-08 13:00:54 UTC (rev 107078)
+++ trunk/Source/WebCore/inspector/front-end/Color.js 2012-02-08 13:22:33 UTC (rev 107079)
@@ -44,6 +44,11 @@
return new WebInspector.Color("rgba(" + r + "," + g + "," + b + "," + (typeof a === "undefined" ? 1 : a) + ")");
}
+WebInspector.Color.fromRGB = function(r, g, b)
+{
+ return new WebInspector.Color("rgb(" + r + "," + g + "," + b + ")");
+}
+
WebInspector.Color.prototype = {
/**
* @return {string}
Modified: trunk/Source/WebCore/inspector/front-end/utilities.js (107078 => 107079)
--- trunk/Source/WebCore/inspector/front-end/utilities.js 2012-02-08 13:00:54 UTC (rev 107078)
+++ trunk/Source/WebCore/inspector/front-end/utilities.js 2012-02-08 13:22:33 UTC (rev 107079)
@@ -256,14 +256,7 @@
*/
Element.prototype.totalOffsetLeft = function()
{
- var total = 0;
- for (var element = this; element; element = element.offsetParent) {
- total += element.offsetLeft
- if (this !== element)
- total += element.clientLeft - element.scrollLeft;
- }
-
- return total;
+ return this.totalOffset().left;
}
/**
@@ -271,16 +264,38 @@
*/
Element.prototype.totalOffsetTop = function()
{
- var total = 0;
+ return this.totalOffset().top;
+
+}
+
+Element.prototype.totalOffset = function()
+{
+ var totalLeft = 0;
+ var totalTop = 0;
+
for (var element = this; element; element = element.offsetParent) {
- total += element.offsetTop
- if (this !== element)
- total += element.clientTop - element.scrollTop;
+ totalLeft += element.offsetLeft;
+ totalTop += element.offsetTop;
+ if (this !== element) {
+ totalLeft += element.clientLeft - element.scrollLeft;
+ totalTop += element.clientTop - element.scrollTop;
+ }
}
-
- return total;
+
+ return { left: totalLeft, top: totalTop };
}
+Element.prototype.scrollOffset = function()
+{
+ var curLeft = 0;
+ var curTop = 0;
+ for (var element = this; element; element = element.scrollParent) {
+ curLeft += element.scrollLeft;
+ curTop += element.scrollTop;
+ }
+ return { left: curLeft, top: curTop };
+}
+
/**
* @constructor
* @param {number=} x
@@ -901,6 +916,11 @@
return event.keyCode !== 229 && event.keyIdentifier === "Enter";
}
+function stopPropagation(e)
+{
+ e.stopPropagation();
+}
+
/**
* @param {Element} element
* @param {number} offset
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
