[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
eric at webkit.org
eric at webkit.org
Wed Apr 7 23:58:11 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 650b16f3f5eae746c1cbbefeeacb3a5ac5a56e4d
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Nov 26 20:27:53 2009 +0000
2009-11-26 Daniel Bates <dbates at webkit.org>
Reviewed by Pavel Feldman.
https://bugs.webkit.org/show_bug.cgi?id=21554
Tests that the tooltip text for an image is its dimensions.
* inspector/elements-img-tooltip-expected.txt: Added.
* inspector/elements-img-tooltip.html: Added.
2009-11-26 Daniel Bates <dbates at webkit.org>
Reviewed by Pavel Feldman.
https://bugs.webkit.org/show_bug.cgi?id=21554
Implements support for hovering over <img> src to display the height and width of that image
in a tooltip. Displays both the displayable and natural dimensions of the image.
Test: inspector/elements-img-tooltip.html
* inspector/front-end/ElementsTreeOutline.js:
(WebInspector.ElementsTreeElement.prototype.createTooltipForImageNode): Added.
(WebInspector.ElementsTreeElement.prototype._updateTitle.callback):
(WebInspector.ElementsTreeElement.prototype._updateTitle):
(WebInspector.ElementsTreeElement.prototype._nodeTitleInfo):
* inspector/front-end/ObjectProxy.js:
(WebInspector.ObjectProxy.getPropertiesAsync): Added.
* inspector/front-end/inspector.js:
(WebInspector.linkifyURLAsNode): Added tooltipText argument.
(WebInspector.linkifyURL): Ditto.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51420 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 184a656..19329e9 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2009-11-26 Daniel Bates <dbates at webkit.org>
+
+ Reviewed by Pavel Feldman.
+
+ https://bugs.webkit.org/show_bug.cgi?id=21554
+
+ Tests that the tooltip text for an image is its dimensions.
+
+ * inspector/elements-img-tooltip-expected.txt: Added.
+ * inspector/elements-img-tooltip.html: Added.
+
2009-11-21 Holger Hans Peter Freyther <zecke at selfish.org>
Reviewed by Kenneth Rohde Christiansen.
diff --git a/LayoutTests/inspector/elements-img-tooltip-expected.txt b/LayoutTests/inspector/elements-img-tooltip-expected.txt
new file mode 100644
index 0000000..1c80d6f
--- /dev/null
+++ b/LayoutTests/inspector/elements-img-tooltip-expected.txt
@@ -0,0 +1,5 @@
+Tests that the tooltip text for the image (below) is "215×174 pixels".
+
+
+PASSED, tooltip text is "215×174 pixels".
+
diff --git a/LayoutTests/inspector/elements-img-tooltip.html b/LayoutTests/inspector/elements-img-tooltip.html
new file mode 100644
index 0000000..8140e31
--- /dev/null
+++ b/LayoutTests/inspector/elements-img-tooltip.html
@@ -0,0 +1,66 @@
+<html>
+<head>
+
+<script src="inspector-test.js"></script>
+<script src="elements-tests.js"></script>
+<script>
+var EXPECTED_TOOLTIP_TEXT = "215\xd7174 pixels";
+function doit()
+{
+ function callback(tooltipText)
+ {
+ if (!tooltipText)
+ output("FAILED, tooltip text should have been \"" + EXPECTED_TOOLTIP_TEXT + "\". Was " + tooltipText + ".");
+ else if (tooltipText == EXPECTED_TOOLTIP_TEXT)
+ output("PASSED, tooltip text is \"" + EXPECTED_TOOLTIP_TEXT + "\".");
+ else
+ output("FAILED, tooltip text should have been \"" + EXPECTED_TOOLTIP_TEXT + "\". Was \"" + tooltipText + "\".");
+ notifyDone();
+ }
+ evaluateInWebInspector("frontend_dumpTooltip", callback);
+}
+
+// Frontend functions.
+
+function frontend_dumpTooltip(testController)
+{
+ testController.waitUntilDone();
+ frontend_expandDOMSubtree(WebInspector.domAgent.document);
+
+ testController.runAfterPendingDispatches(function() {
+ frontend_dumpTooltipContinuation(testController);
+ });
+}
+
+function frontend_dumpTooltipContinuation(testController)
+{
+ if (!WebInspector.ElementsTreeElement.prototype.createTooltipForImageNode) {
+ testController.notifyDone();
+ return;
+ }
+
+ function callback(tooltipText)
+ {
+ testController.notifyDone(tooltipText);
+ }
+
+ var innerMapping = WebInspector.domAgent._idToDOMNode;
+ for (var nodeId in innerMapping) {
+ if (innerMapping[nodeId].nodeName === "IMG") {
+ WebInspector.ElementsTreeElement.prototype.createTooltipForImageNode(innerMapping[nodeId], callback);
+ return;
+ }
+ }
+}
+</script>
+</head>
+
+<body onload="onload()">
+<p>
+Tests that the tooltip text for the image (below) is "<script>document.write(EXPECTED_TOOLTIP_TEXT)</script>".
+</p>
+
+<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAANcAAACuCAIAAAAqMg/rAAAAAXNSR0IArs4c6QAAAU9JREFUeNrt0jERAAAIxDDAv+dHAxNLIqHXTlLwaiTAheBCXAguxIXgQlwILsSF4EJcCC7EheBCXAguxIXgQlwILsSF4EJcCC7EheBCXAguxIXgQlwILsSF4EJcCC7EheBCXAguxIXgQlwILsSF4EJcCC7EheBCXAguxIXgQlwILsSF4EJcCC7EheBCXAguxIXgQlwILsSF4EJcCC7EheBCXAguxIXgQlwILsSF4EJcCC7EheBCXAguxIXgQlwILsSF4EJcCC7EheBCXAguxIXgQlwILsSF4EJcCC7EheBCXAguxIXgQlwILsSF4EJcCC7EheBCXAguxIXgQlwILsSFEuBCcCEuBBfiQnAhLgQX4kJwIS4EF+JCcCEuBBfiQnAhLgQX4kJwIS4EF+JCcCEuBBfiQnAhLgQX4kJwIS4EF+JCcCEuBBfiQnAhLoSDBZXqBFnkRyeqAAAAAElFTkSuQmCC"/>
+
+</body>
+</html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 771607e..713b1fc 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,25 @@
+2009-11-26 Daniel Bates <dbates at webkit.org>
+
+ Reviewed by Pavel Feldman.
+
+ https://bugs.webkit.org/show_bug.cgi?id=21554
+
+ Implements support for hovering over <img> src to display the height and width of that image
+ in a tooltip. Displays both the displayable and natural dimensions of the image.
+
+ Test: inspector/elements-img-tooltip.html
+
+ * inspector/front-end/ElementsTreeOutline.js:
+ (WebInspector.ElementsTreeElement.prototype.createTooltipForImageNode): Added.
+ (WebInspector.ElementsTreeElement.prototype._updateTitle.callback):
+ (WebInspector.ElementsTreeElement.prototype._updateTitle):
+ (WebInspector.ElementsTreeElement.prototype._nodeTitleInfo):
+ * inspector/front-end/ObjectProxy.js:
+ (WebInspector.ObjectProxy.getPropertiesAsync): Added.
+ * inspector/front-end/inspector.js:
+ (WebInspector.linkifyURLAsNode): Added tooltipText argument.
+ (WebInspector.linkifyURL): Ditto.
+
2009-11-26 Kevin Ollivier <kevino at theolliviers.com>
wx build fix after drawPattern API change.
diff --git a/WebCore/inspector/front-end/ElementsTreeOutline.js b/WebCore/inspector/front-end/ElementsTreeOutline.js
index c93c50e..6c2d541 100644
--- a/WebCore/inspector/front-end/ElementsTreeOutline.js
+++ b/WebCore/inspector/front-end/ElementsTreeOutline.js
@@ -325,6 +325,26 @@ WebInspector.ElementsTreeElement.prototype = {
}
},
+ createTooltipForImageNode: function(node, callback)
+ {
+ function createTooltipThenCallback(properties)
+ {
+ if (!properties) {
+ callback();
+ return;
+ }
+
+ var tooltipText = null;
+ if (properties.offsetHeight === properties.naturalHeight && properties.offsetWidth === properties.naturalWidth)
+ tooltipText = WebInspector.UIString("%d\u00d7%d pixels", properties.offsetWidth, properties.offsetHeight);
+ else
+ tooltipText = WebInspector.UIString("%d\u00d7%d pixels (Natural: %d\u00d7%d pixels)", properties.offsetWidth, properties.offsetHeight, properties.naturalWidth, properties.naturalHeight);
+ callback(tooltipText);
+ }
+ var objectProxy = new WebInspector.ObjectProxy(node.id);
+ WebInspector.ObjectProxy.getPropertiesAsync(objectProxy, ["naturalHeight", "naturalWidth", "offsetHeight", "offsetWidth"], createTooltipThenCallback);
+ },
+
toggleNewAttributeButton: function(visible)
{
function removeAddAttributeSpan()
@@ -787,14 +807,24 @@ WebInspector.ElementsTreeElement.prototype = {
if (this._editing)
return;
- var title = this._nodeTitleInfo(this.representedObject, this.hasChildren, WebInspector.linkifyURL).title;
- this.title = "<span class=\"highlight\">" + title + "</span>";
- delete this.selectionElement;
- this.updateSelection();
- this._preventFollowingLinksOnDoubleClick();
+ var self = this;
+ function callback(tooltipText)
+ {
+ var title = self._nodeTitleInfo(self.representedObject, self.hasChildren, WebInspector.linkifyURL, tooltipText).title;
+ self.title = "<span class=\"highlight\">" + title + "</span>";
+ delete self.selectionElement;
+ self.updateSelection();
+ self._preventFollowingLinksOnDoubleClick();
+ };
+
+ // TODO: Replace with InjectedScriptAccess.getBasicProperties(obj, [names]).
+ if (this.representedObject.nodeName.toLowerCase() !== "img")
+ callback();
+ else
+ this.createTooltipForImageNode(this.representedObject, callback);
},
- _nodeTitleInfo: function(node, hasChildren, linkify)
+ _nodeTitleInfo: function(node, hasChildren, linkify, tooltipText)
{
var info = {title: "", hasChildren: hasChildren};
@@ -814,7 +844,7 @@ WebInspector.ElementsTreeElement.prototype = {
var value = attr.value;
if (linkify && (attr.name === "src" || attr.name === "href")) {
var value = value.replace(/([\/;:\)\]\}])/g, "$1\u200B");
- info.title += linkify(attr.value, value, "webkit-html-attribute-value", node.nodeName.toLowerCase() == "a");
+ info.title += linkify(attr.value, value, "webkit-html-attribute-value", node.nodeName.toLowerCase() == "a", tooltipText);
} else {
var value = value.escapeHTML();
value = value.replace(/([\/;:\)\]\}])/g, "$1​");
diff --git a/WebCore/inspector/front-end/ObjectProxy.js b/WebCore/inspector/front-end/ObjectProxy.js
index bb4afa5..f4a59a7 100644
--- a/WebCore/inspector/front-end/ObjectProxy.js
+++ b/WebCore/inspector/front-end/ObjectProxy.js
@@ -45,6 +45,24 @@ WebInspector.ObjectProxy.wrapPrimitiveValue = function(value)
return proxy;
}
+WebInspector.ObjectProxy.getPropertiesAsync = function(objectProxy, propertiesToQueryFor, callback)
+{
+ function createPropertiesMapThenCallback(propertiesPayload)
+ {
+ if (!propertiesPayload) {
+ callback();
+ return;
+ }
+
+ var result = [];
+ for (var i = 0; i < propertiesPayload.length; ++i)
+ if (propertiesToQueryFor.indexOf(propertiesPayload[i].name) !== -1)
+ result[propertiesPayload[i].name] = propertiesPayload[i].value.description;
+ callback(result);
+ };
+ InjectedScriptAccess.getProperties(objectProxy, true, createPropertiesMapThenCallback);
+}
+
WebInspector.ObjectPropertyProxy = function(name, value)
{
this.name = name;
diff --git a/WebCore/inspector/front-end/inspector.js b/WebCore/inspector/front-end/inspector.js
index 0f8ec12..0a4a595 100644
--- a/WebCore/inspector/front-end/inspector.js
+++ b/WebCore/inspector/front-end/inspector.js
@@ -1498,7 +1498,7 @@ WebInspector.showProfileForURL = function(url)
WebInspector.panels.profiles.showProfileForURL(url);
}
-WebInspector.linkifyURLAsNode = function(url, linkText, classes, isExternal)
+WebInspector.linkifyURLAsNode = function(url, linkText, classes, isExternal, tooltipText)
{
if (!linkText)
linkText = url;
@@ -1508,18 +1508,18 @@ WebInspector.linkifyURLAsNode = function(url, linkText, classes, isExternal)
var a = document.createElement("a");
a.href = url;
a.className = classes;
- a.title = url;
+ a.title = tooltipText || url;
a.target = "_blank";
a.textContent = linkText;
return a;
}
-WebInspector.linkifyURL = function(url, linkText, classes, isExternal)
+WebInspector.linkifyURL = function(url, linkText, classes, isExternal, tooltipText)
{
// Use the DOM version of this function so as to avoid needing to escape attributes.
// FIXME: Get rid of linkifyURL entirely.
- return WebInspector.linkifyURLAsNode(url, linkText, classes, isExternal).outerHTML;
+ return WebInspector.linkifyURLAsNode(url, linkText, classes, isExternal, tooltipText).outerHTML;
}
WebInspector.addMainEventListeners = function(doc)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list