Changeset 152203 in webkit

Timestamp:

Jun 28, 2013 7:41:54 PM (11 years ago)

Author:

kangil.han@samsung.com

Message:

Adopt is/toHTMLImageElement for code cleanup
​https://bugs.webkit.org/show_bug.cgi?id=118182

Reviewed by Andreas Kling.

To enhance readability, this patch adopts is/toHTMLImageElement.
This also helps out to reduce duplicated use of static_cast.

Source/WebCore:

• accessibility/AccessibilityNodeObject.cpp:

(WebCore::AccessibilityNodeObject::isNativeImage):

• accessibility/AccessibilityRenderObject.cpp:

(WebCore::AccessibilityRenderObject::url):

• bindings/js/JSNodeCustom.cpp:

(WebCore::isReachableFromDOM):

• bridge/qt/qt_pixmapruntime.cpp:

(JSC::Bindings::assignToHTMLImageElement):
(JSC::Bindings::QtPixmapRuntime::toQt):

• dom/Clipboard.cpp:

(WebCore::Clipboard::setDragImage):

• dom/Node.cpp:

(WebCore::Node::enclosingLinkEventParentOrSelf):

• editing/Editor.cpp:

(WebCore::imageElementFromImageDocument):

• html/HTMLAnchorElement.cpp:

(WebCore::appendServerMapMousePosition):

• html/HTMLImageElement.h:

(WebCore::isHTMLImageElement):
(WebCore::toHTMLImageElement):

• html/HTMLMapElement.cpp:

(WebCore::HTMLMapElement::imageElement):

• html/HTMLNameCollection.cpp:

(WebCore::WindowNameCollection::nodeMatchesIfNameAttributeMatch):
(WebCore::DocumentNameCollection::nodeMatchesIfIdAttributeMatch):
(WebCore::DocumentNameCollection::nodeMatchesIfNameAttributeMatch):
(WebCore::DocumentNameCollection::nodeMatches):

• page/DragController.cpp:

(WebCore::DragController::draggableElement):

• page/PageSerializer.cpp:

(WebCore::PageSerializer::serializeFrame):

• platform/gtk/PasteboardGtk.cpp:

(WebCore::getURLForImageNode):

• platform/mac/HTMLConverter.mm:

(+[WebHTMLConverter editingAttributedStringFromRange:]):

• rendering/HitTestResult.cpp:

(WebCore::HitTestResult::altDisplayString):
(WebCore::HitTestResult::absoluteImageURL):

• rendering/RenderImage.cpp:

(WebCore::RenderImage::paintIntoRect):
(WebCore::RenderImage::imageMap):
(WebCore::RenderImage::updateAltText):

• rendering/RenderObject.cpp:

(WebCore::RenderObject::shouldRespectImageOrientation):

Source/WebKit/blackberry:

• Api/WebPage.cpp:

(BlackBerry::WebKit::WebPagePrivate::webContext):
(BlackBerry::WebKit::WebPagePrivate::blockZoomRectForNode):
(BlackBerry::WebKit::WebPage::blockZoom):

• WebKitSupport/FatFingers.cpp:

(BlackBerry::WebKit::FatFingers::isElementClickable):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/accessibility/AccessibilityNodeObject.cpp (modified) (1 diff)
• WebCore/accessibility/AccessibilityRenderObject.cpp (modified) (1 diff)
• WebCore/bindings/js/JSNodeCustom.cpp (modified) (1 diff)
• WebCore/bridge/qt/qt_pixmapruntime.cpp (modified) (2 diffs)
• WebCore/dom/Clipboard.cpp (modified) (2 diffs)
• WebCore/dom/Node.cpp (modified) (2 diffs)
• WebCore/editing/Editor.cpp (modified) (1 diff)
• WebCore/html/HTMLAnchorElement.cpp (modified) (1 diff)
• WebCore/html/HTMLImageElement.h (modified) (1 diff)
• WebCore/html/HTMLMapElement.cpp (modified) (1 diff)
• WebCore/html/HTMLNameCollection.cpp (modified) (5 diffs)
• WebCore/page/DragController.cpp (modified) (2 diffs)
• WebCore/page/PageSerializer.cpp (modified) (1 diff)
• WebCore/platform/gtk/PasteboardGtk.cpp (modified) (2 diffs)
• WebCore/platform/mac/HTMLConverter.mm (modified) (2 diffs)
• WebCore/rendering/HitTestResult.cpp (modified) (2 diffs)
• WebCore/rendering/RenderImage.cpp (modified) (3 diffs)
• WebCore/rendering/RenderObject.cpp (modified) (2 diffs)
• WebKit/blackberry/Api/WebPage.cpp (modified) (4 diffs)
• WebKit/blackberry/ChangeLog (modified) (1 diff)
• WebKit/blackberry/WebKitSupport/FatFingers.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-06-28  Kangil Han  <kangil.han@samsung.com>
+
+        Adopt is/toHTMLImageElement for code cleanup
+        https://bugs.webkit.org/show_bug.cgi?id=118182
+
+        Reviewed by Andreas Kling.
+
+        To enhance readability, this patch adopts is/toHTMLImageElement.
+        This also helps out to reduce duplicated use of static_cast.
+
+        * accessibility/AccessibilityNodeObject.cpp:
+        (WebCore::AccessibilityNodeObject::isNativeImage):
+        * accessibility/AccessibilityRenderObject.cpp:
+        (WebCore::AccessibilityRenderObject::url):
+        * bindings/js/JSNodeCustom.cpp:
+        (WebCore::isReachableFromDOM):
+        * bridge/qt/qt_pixmapruntime.cpp:
+        (JSC::Bindings::assignToHTMLImageElement):
+        (JSC::Bindings::QtPixmapRuntime::toQt):
+        * dom/Clipboard.cpp:
+        (WebCore::Clipboard::setDragImage):
+        * dom/Node.cpp:
+        (WebCore::Node::enclosingLinkEventParentOrSelf):
+        * editing/Editor.cpp:
+        (WebCore::imageElementFromImageDocument):
+        * html/HTMLAnchorElement.cpp:
+        (WebCore::appendServerMapMousePosition):
+        * html/HTMLImageElement.h:
+        (WebCore::isHTMLImageElement):
+        (WebCore::toHTMLImageElement):
+        * html/HTMLMapElement.cpp:
+        (WebCore::HTMLMapElement::imageElement):
+        * html/HTMLNameCollection.cpp:
+        (WebCore::WindowNameCollection::nodeMatchesIfNameAttributeMatch):
+        (WebCore::DocumentNameCollection::nodeMatchesIfIdAttributeMatch):
+        (WebCore::DocumentNameCollection::nodeMatchesIfNameAttributeMatch):
+        (WebCore::DocumentNameCollection::nodeMatches):
+        * page/DragController.cpp:
+        (WebCore::DragController::draggableElement):
+        * page/PageSerializer.cpp:
+        (WebCore::PageSerializer::serializeFrame):
+        * platform/gtk/PasteboardGtk.cpp:
+        (WebCore::getURLForImageNode):
+        * platform/mac/HTMLConverter.mm:
+        (+[WebHTMLConverter editingAttributedStringFromRange:]):
+        * rendering/HitTestResult.cpp:
+        (WebCore::HitTestResult::altDisplayString):
+        (WebCore::HitTestResult::absoluteImageURL):
+        * rendering/RenderImage.cpp:
+        (WebCore::RenderImage::paintIntoRect):
+        (WebCore::RenderImage::imageMap):
+        (WebCore::RenderImage::updateAltText):
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::shouldRespectImageOrientation):
+
 2013-06-28  Gavin Barraclough  <barraclough@apple.com>
 

trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp

@@ -489 +489 @@
         return false;
 
-    if (node->hasTagName(imgTag))
+    if (isHTMLImageElement(node))
         return true;
 

trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp

@@ -1468 +1468 @@
         return m_renderer->document()->url();
     
-    if (isImage() && m_renderer->node() && m_renderer->node()->hasTagName(imgTag))
-        return static_cast<HTMLImageElement*>(m_renderer->node())->src();
+    if (isImage() && m_renderer->node() && isHTMLImageElement(m_renderer->node()))
+        return toHTMLImageElement(m_renderer->node())->src();
     
     if (isInputImage())

trunk/Source/WebCore/bindings/js/JSNodeCustom.cpp

@@ -106 +106 @@
         // the element is destroyed, its load event will not fire.
         // FIXME: The DOM should manage this issue without the help of JavaScript wrappers.
-        if (node->hasTagName(imgTag)) {
-            if (static_cast<HTMLImageElement*>(node)->hasPendingActivity())
+        if (isHTMLImageElement(node)) {
+            if (toHTMLImageElement(node)->hasPendingActivity())
                 return true;
         }

trunk/Source/WebCore/bridge/qt/qt_pixmapruntime.cpp

@@ -138 +138 @@
     // We now know that we have a valid <img> element as the argument, we can attach the pixmap to it.
     RefPtr<StillImage> stillImage = WebCore::StillImage::create(toPixmap(data));
-    HTMLImageElement* imageElement = static_cast<HTMLImageElement*>(static_cast<JSHTMLImageElement*>(jsObject)->impl());
+    HTMLImageElement* imageElement = toHTMLImageElement(static_cast<JSHTMLImageElement*>(jsObject)->impl());
     imageElement->setCachedImage(new CachedImage(stillImage.get()));
     return JSValueMakeUndefined(context);
@@ -219 +219 @@
 
     JSHTMLImageElement* elementJSWrapper = static_cast<JSHTMLImageElement*>(jsObject);
-    HTMLImageElement* imageElement = static_cast<HTMLImageElement*>(elementJSWrapper->impl());
+    HTMLImageElement* imageElement = toHTMLImageElement(elementJSWrapper->impl());
 
     if (!imageElement)

trunk/Source/WebCore/dom/Clipboard.cpp

@@ -286 +286 @@
         return;
 
-    if (element && element->hasTagName(HTMLNames::imgTag) && !element->inDocument())
-        setDragImage(static_cast<HTMLImageElement*>(element)->cachedImage(), IntPoint(x, y));
+    if (element && isHTMLImageElement(element) && !element->inDocument())
+        setDragImage(toHTMLImageElement(element)->cachedImage(), IntPoint(x, y));
     else
         setDragImageElement(element, IntPoint(x, y));
@@ -386 +386 @@
 
     CachedImage* image;
-    if (element && element->hasTagName(HTMLNames::imgTag) && !element->inDocument())
-        image = static_cast<HTMLImageElement*>(element)->cachedImage();
+    if (element && isHTMLImageElement(element) && !element->inDocument())
+        image = toHTMLImageElement(element)->cachedImage();
     else
         image = 0;

trunk/Source/WebCore/dom/Node.cpp

@@ -65 +65 @@
 #include "HTMLElement.h"
 #include "HTMLFrameOwnerElement.h"
+#include "HTMLImageElement.h"
 #include "HTMLNames.h"
 #include "HTMLStyleElement.h"
@@ -1950 +1951 @@
         // So we don't let images be the enclosingLinkNode, even though isLink sometimes returns true
         // for them.
-        if (node->isLink() && !node->hasTagName(imgTag))
+        if (node->isLink() && !isHTMLImageElement(node))
             return node;
     }

trunk/Source/WebCore/editing/Editor.cpp

@@ -289 +289 @@
     Node* node = body->firstChild();
     if (!node)
-        return 0;    
-    if (!node->hasTagName(imgTag))
         return 0;
-    return static_cast<HTMLImageElement*>(node);
+    if (!isHTMLImageElement(node))
+        return 0;
+    return toHTMLImageElement(node);
 }
 

trunk/Source/WebCore/html/HTMLAnchorElement.cpp

@@ -157 +157 @@
     Node* target = event->target()->toNode();
     ASSERT(target);
-    if (!target->hasTagName(imgTag))
-        return;
-
-    HTMLImageElement* imageElement = static_cast<HTMLImageElement*>(event->target()->toNode());
+    if (!isHTMLImageElement(target))
+        return;
+
+    HTMLImageElement* imageElement = toHTMLImageElement(target);
     if (!imageElement || !imageElement->isServerMap())
         return;

trunk/Source/WebCore/html/HTMLImageElement.h

@@ -113 +113 @@
 };
 
+inline bool isHTMLImageElement(Node* node)
+{
+    return node->hasTagName(HTMLNames::imgTag);
+}
+
+inline HTMLImageElement* toHTMLImageElement(Node* node)
+{
+    ASSERT_WITH_SECURITY_IMPLICATION(!node || isHTMLImageElement(node));
+    return static_cast<HTMLImageElement*>(node);
+}
+
 } //namespace
 

trunk/Source/WebCore/html/HTMLMapElement.cpp

@@ -86 +86 @@
     RefPtr<HTMLCollection> images = document()->images();
     for (unsigned i = 0; Node* curr = images->item(i); i++) {
-        if (!curr->hasTagName(imgTag))
+        if (!isHTMLImageElement(curr))
             continue;
         
         // The HTMLImageElement's useMap() value includes the '#' symbol at the beginning,
         // which has to be stripped off.
-        HTMLImageElement* imageElement = static_cast<HTMLImageElement*>(curr);
+        HTMLImageElement* imageElement = toHTMLImageElement(curr);
         String useMapName = imageElement->getAttribute(usemapAttr).string().substring(1);
         if (equalIgnoringCase(useMapName, m_name))

trunk/Source/WebCore/html/HTMLNameCollection.cpp

@@ -27 +27 @@
 #include "HTMLDocument.h"
 #include "HTMLFormElement.h"
+#include "HTMLImageElement.h"
 #include "HTMLNames.h"
 #include "HTMLObjectElement.h"
@@ -53 +54 @@
 bool WindowNameCollection::nodeMatchesIfNameAttributeMatch(Element* element)
 {
-    return element->hasTagName(imgTag) || isHTMLFormElement(element) || element->hasTagName(appletTag)
+    return isHTMLImageElement(element) || isHTMLFormElement(element) || element->hasTagName(appletTag)
         || element->hasTagName(embedTag) || element->hasTagName(objectTag);
 }
@@ -69 +70 @@
     // FIXME: we need to fix HTMLImageElement to update the hash map for us when name attribute has been removed.
     return element->hasTagName(appletTag) || (element->hasTagName(objectTag) && toHTMLObjectElement(element)->isDocNamedItem())
-        || (element->hasTagName(imgTag) && element->hasName());
+        || (isHTMLImageElement(element) && element->hasName());
 }
 
@@ -76 +77 @@
     return isHTMLFormElement(element) || element->hasTagName(embedTag) || element->hasTagName(iframeTag)
         || element->hasTagName(appletTag) || (element->hasTagName(objectTag) && toHTMLObjectElement(element)->isDocNamedItem())
-        || element->hasTagName(imgTag);
+        || isHTMLImageElement(element);
 }
 
@@ -89 +90 @@
     if (element->hasTagName(objectTag))
         return (element->getNameAttribute() == name || element->getIdAttribute() == name) && toHTMLObjectElement(element)->isDocNamedItem();
-    if (element->hasTagName(imgTag))
+    if (isHTMLImageElement(element))
         return element->getNameAttribute() == name || (element->getIdAttribute() == name && element->hasName());
     return false;

trunk/Source/WebCore/page/DragController.cpp

@@ -52 +52 @@
 #include "FrameView.h"
 #include "HTMLAnchorElement.h"
+#include "HTMLImageElement.h"
 #include "HTMLInputElement.h"
 #include "HTMLNames.h"
@@ -660 +661 @@
             if (dragMode == DRAG_AUTO) {
                 if ((m_dragSourceAction & DragSourceActionImage)
-                    && node->hasTagName(HTMLNames::imgTag)
+                    && isHTMLImageElement(node)
                     && sourceFrame->settings()
                     && sourceFrame->settings()->loadsImagesAutomatically()) {

trunk/Source/WebCore/page/PageSerializer.cpp

@@ -232 +232 @@
             retrieveResourcesForProperties(static_cast<StyledElement*>(element)->inlineStyle(), document);
 
-        if (element->hasTagName(HTMLNames::imgTag)) {
-            HTMLImageElement* imageElement = static_cast<HTMLImageElement*>(element);
+        if (isHTMLImageElement(element)) {
+            HTMLImageElement* imageElement = toHTMLImageElement(element);
             KURL url = document->completeURL(imageElement->getAttribute(HTMLNames::srcAttr));
             CachedImage* cachedImage = imageElement->cachedImage();

trunk/Source/WebCore/platform/gtk/PasteboardGtk.cpp

@@ -26 +26 @@
 #include "Editor.h"
 #include "Frame.h"
+#include "HTMLImageElement.h"
 #include "HTMLInputElement.h"
 #include "HTMLNames.h"
@@ -200 +201 @@
     // FIXME: Later this code should be shared with Chromium somehow. Chances are all platforms want it.
     AtomicString urlString;
-    if (node->hasTagName(HTMLNames::imgTag) || isHTMLInputElement(node))
+    if (isHTMLImageElement(node) || isHTMLInputElement(node))
         urlString = toElement(node)->getAttribute(HTMLNames::srcAttr);
 #if ENABLE(SVG)

trunk/Source/WebCore/platform/mac/HTMLConverter.mm

@@ -41 +41 @@
 #import "Frame.h"
 #import "FrameLoader.h"
+#import "HTMLImageElement.h"
 #import "HTMLNames.h"
 #import "HTMLParserIdioms.h"
@@ -1676 +1677 @@
         if (startContainer == endContainer && (startOffset == endOffset - 1)) {
             Node* node = startContainer->childNode(startOffset);
-            if (node && node->hasTagName(imgTag)) {
+            if (node && isHTMLImageElement(node)) {
                 NSFileWrapper* fileWrapper = fileWrapperForElement(toElement(node));
                 NSTextAttachment* attachment = [[NSTextAttachment alloc] initWithFileWrapper:fileWrapper];

trunk/Source/WebCore/rendering/HitTestResult.cpp

@@ -272 +272 @@
         return String();
     
-    if (m_innerNonSharedNode->hasTagName(imgTag)) {
-        HTMLImageElement* image = static_cast<HTMLImageElement*>(m_innerNonSharedNode.get());
+    if (isHTMLImageElement(m_innerNonSharedNode.get())) {
+        HTMLImageElement* image = toHTMLImageElement(m_innerNonSharedNode.get());
         return displayString(image->getAttribute(altAttr), m_innerNonSharedNode.get());
     }
@@ -317 +317 @@
     AtomicString urlString;
     if (m_innerNonSharedNode->hasTagName(embedTag)
-        || m_innerNonSharedNode->hasTagName(imgTag)
+        || isHTMLImageElement(m_innerNonSharedNode.get())
         || isHTMLInputElement(m_innerNonSharedNode.get())
         || m_innerNonSharedNode->hasTagName(objectTag)

trunk/Source/WebCore/rendering/RenderImage.cpp

@@ -472 +472 @@
         return;
 
-    HTMLImageElement* imageElt = (node() && node()->hasTagName(imgTag)) ? static_cast<HTMLImageElement*>(node()) : 0;
+    HTMLImageElement* imageElt = (node() && isHTMLImageElement(node())) ? toHTMLImageElement(node()) : 0;
     CompositeOperator compositeOperator = imageElt ? imageElt->compositeOperator() : CompositeSourceOver;
     Image* image = m_imageResource->image().get();
@@ -525 +525 @@
 HTMLMapElement* RenderImage::imageMap() const
 {
-    HTMLImageElement* i = node() && node()->hasTagName(imgTag) ? static_cast<HTMLImageElement*>(node()) : 0;
+    HTMLImageElement* i = node() && isHTMLImageElement(node()) ? toHTMLImageElement(node()) : 0;
     return i ? i->treeScope()->getImageMap(i->fastGetAttribute(usemapAttr)) : 0;
 }
@@ -560 +560 @@
     if (isHTMLInputElement(node()))
         m_altText = toHTMLInputElement(node())->altText();
-    else if (node()->hasTagName(imgTag))
-        m_altText = static_cast<HTMLImageElement*>(node())->altText();
+    else if (isHTMLImageElement(node()))
+        m_altText = toHTMLImageElement(node())->altText();
 }
 

trunk/Source/WebCore/rendering/RenderObject.cpp

@@ -41 +41 @@
 #include "HTMLAnchorElement.h"
 #include "HTMLElement.h"
+#include "HTMLImageElement.h"
 #include "HTMLNames.h"
 #include "HitTestResult.h"
@@ -2329 +2330 @@
         document()->isImageDocument() ||
 #endif
-        (document()->settings() && document()->settings()->shouldRespectImageOrientation() && node() && node()->hasTagName(HTMLNames::imgTag)) ? RespectImageOrientation : DoNotRespectImageOrientation;
+        (document()->settings() && document()->settings()->shouldRespectImageOrientation() && node() && isHTMLImageElement(node())) ? RespectImageOrientation : DoNotRespectImageOrientation;
 }
 

trunk/Source/WebKit/blackberry/Api/WebPage.cpp

@@ -2134 +2134 @@
 
     bool nodeAllowSelectionOverride = false;
-    bool nodeIsImage = node->isHTMLElement() && node->hasTagName(HTMLNames::imgTag);
+    bool nodeIsImage = node->isHTMLElement() && isHTMLImageElement(node);
     Node* linkNode = node->enclosingLinkEventParentOrSelf();
     // Set link url only when the node is linked image, or text inside anchor. Prevent CCM popup when long press non-link element(eg. button) inside an anchor.
@@ -2162 +2162 @@
         HTMLMediaElement* mediaElement = 0;
 
-        if (node->hasTagName(HTMLNames::imgTag))
-            imageElement = static_cast<HTMLImageElement*>(node.get());
+        if (isHTMLImageElement(node))
+            imageElement = toHTMLImageElement(node.get());
         else if (isHTMLAreaElement(node))
             imageElement = toHTMLAreaElement(node.get())->imageElement();
@@ -2832 +2832 @@
     double blockExpansionRatio = 5.0 * blockToPageRatio * blockToPageRatio;
 
-    if (!tnode->hasTagName(HTMLNames::imgTag) && !isHTMLInputElement(tnode) && !tnode->hasTagName(HTMLNames::textareaTag)) {
+    if (!isHTMLImageElement(tnode) && !isHTMLInputElement(tnode) && !tnode->hasTagName(HTMLNames::textareaTag)) {
         while ((tnode = tnode->parentNode())) {
             ASSERT(tnode);
@@ -4500 +4500 @@
         // Don't use a block if it is too close to the size of the actual contents.
         // We allow this for images only so that they can be zoomed tight to the screen.
-        if (!node->hasTagName(HTMLNames::imgTag)) {
+        if (!isHTMLImageElement(node)) {
             const IntRect tRect = viewportAccessor->roundToDocumentFromPixelContents(WebCore::FloatRect(blockRect));
             int blockArea = tRect.width() * tRect.height();

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2013-06-28  Kangil Han  <kangil.han@samsung.com>
+
+        Adopt is/toHTMLImageElement for code cleanup
+        https://bugs.webkit.org/show_bug.cgi?id=118182
+
+        Reviewed by Andreas Kling.
+
+        To enhance readability, this patch adopts is/toHTMLImageElement.
+        This also helps out to reduce duplicated use of static_cast.
+
+        * Api/WebPage.cpp:
+        (BlackBerry::WebKit::WebPagePrivate::webContext):
+        (BlackBerry::WebKit::WebPagePrivate::blockZoomRectForNode):
+        (BlackBerry::WebKit::WebPage::blockZoom):
+        * WebKitSupport/FatFingers.cpp:
+        (BlackBerry::WebKit::FatFingers::isElementClickable):
+
 2013-06-27  Kangil Han  <kangil.han@samsung.com>
 

trunk/Source/WebKit/blackberry/WebKitSupport/FatFingers.cpp

@@ -94 +94 @@
         || element->isMediaControlElement()
         || element->isContentEditable()
-        || (element->hasTagName(HTMLNames::imgTag) && element->parentNode() && isHTMLAnchorElement(element->parentNode())))
+        || (isHTMLImageElement(element) && element->parentNode() && isHTMLAnchorElement(element->parentNode())))
         return true;