Changeset 58160 in webkit

Timestamp:

Apr 23, 2010 2:31:53 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-23 Jeff Schiller <​codedread@gmail.com>

Reviewed by Nikolas Zimmermann.

Display tooltips when hovering over SVG elements, Bug 16854
​https://bugs.webkit.org/show_bug.cgi?id=16854

Manual test added for verifying tooltips.

• manual-tests/svg-tooltip.svg: Added.
• svg/SVGAElement.cpp: (WebCore::SVGAElement::title): xlink:title takes precedence, otherwise SVGStyledElement::title() is used
• svg/SVGStyledElement.cpp: (WebCore::SVGStyledElement::title): checks for a shadow parent and uses that title, otherwise uses the content's title
• svg/SVGStyledElement.h: add title() method declaration

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• manual-tests/svg-tooltip.svg (added)
• svg/SVGAElement.cpp (modified) (1 diff)
• svg/SVGStyledElement.cpp (modified) (2 diffs)
• svg/SVGStyledElement.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-23  Jeff Schiller  <codedread@gmail.com>
+
+        Reviewed by Nikolas Zimmermann.
+
+        Display tooltips when hovering over SVG elements, Bug 16854
+        https://bugs.webkit.org/show_bug.cgi?id=16854
+
+        Manual test added for verifying tooltips.
+
+        * manual-tests/svg-tooltip.svg: Added.
+        * svg/SVGAElement.cpp:
+        (WebCore::SVGAElement::title): xlink:title takes precedence, otherwise SVGStyledElement::title() is used
+        * svg/SVGStyledElement.cpp:
+        (WebCore::SVGStyledElement::title): checks for a shadow parent and uses that title, otherwise uses the content's title
+        * svg/SVGStyledElement.h: add title() method declaration
+
 2010-04-23  David Kilzer  <ddkilzer@apple.com>
 

trunk/WebCore/svg/SVGAElement.cpp

@@ -61 +61 @@
 String SVGAElement::title() const
 {
-    return getAttribute(XLinkNames::titleAttr);
+    // If the xlink:title is set (non-empty string), use it.
+    const AtomicString& title = getAttribute(XLinkNames::titleAttr);
+    if (!title.isEmpty())
+        return title;
+
+    // Otherwise, use the title of this element.
+    return SVGStyledElement::title();
 }
 

trunk/WebCore/svg/SVGStyledElement.cpp

@@ -44 +44 @@
 #include "SVGResource.h"
 #include "SVGSVGElement.h"
+#include "SVGUseElement.h"
 #include <wtf/Assertions.h>
 
@@ -65 +66 @@
 {
     SVGResource::removeClient(this);
+}
+
+String SVGStyledElement::title() const
+{
+    // According to spec, we should not return titles when hovering over <svg> elements (those 
+    // <title> elements are the title of the document, not a tooltip) so we instantly return.
+    if (hasTagName(SVGNames::svgTag))
+        return String();
+    
+    // Walk up the tree, to find out whether we're inside a <use> shadow tree, to find the right title.
+    Node* parent = const_cast<SVGStyledElement*>(this);
+    while (parent) {
+        if (!parent->isShadowNode()) {
+            parent = parent->parentNode();
+            continue;
+        }
+        
+        // Get the <use> element.
+        Node* shadowParent = parent->shadowParentNode();
+        if (shadowParent && shadowParent->isSVGElement() && shadowParent->hasTagName(SVGNames::useTag)) {
+            SVGUseElement* useElement = static_cast<SVGUseElement*>(shadowParent);
+            // If the <use> title is not empty we found the title to use.
+            String useTitle(useElement->title());
+            if (useTitle.isEmpty())
+                break;
+            return useTitle;
+        }
+        parent = parent->parentNode();
+    }
+    
+    // If we aren't an instance in a <use> or the <use> title was not found, then find the first
+    // <title> child of this element.
+    Element* titleElement = firstElementChild();
+    for (; titleElement; titleElement = titleElement->nextElementSibling()) {
+        if (titleElement->hasTagName(SVGNames::titleTag) && titleElement->isSVGElement())
+            break;
+    }
+
+    // If a title child was found, return the text contents.
+    if (titleElement)
+        return titleElement->innerText();
+    
+    // Otherwise return a null/empty string.
+    return String();
 }
 

trunk/WebCore/svg/SVGStyledElement.h

@@ -39 +39 @@
         SVGStyledElement(const QualifiedName&, Document*);
         virtual ~SVGStyledElement();
+
+        virtual String title() const;
 
         virtual bool hasRelativeValues() const { return false; }