Changeset 152524 in webkit

Timestamp:

Jul 9, 2013 10:31:50 PM (11 years ago)

Author:

gyuyoung.kim@samsung.com

Message:

Introduce isSVGFontElement() and isSVGImageElement(), use them
​https://bugs.webkit.org/show_bug.cgi?id=118504

Reviewed by Benjamin Poulain.

Let's use isFoo() to enhance readibility in svg element classes along with html's.

No new tests, there is no behavior changes.

• loader/cache/CachedFont.cpp:

(WebCore::CachedFont::getSVGFontById):

• rendering/HitTestResult.cpp:

(WebCore::HitTestResult::absoluteImageURL):

• svg/SVGAnimateMotionElement.cpp:

(WebCore::SVGAnimateMotionElement::hasValidAttributeType):

• svg/SVGElement.cpp:

(WebCore::SVGElement::viewportElement):

• svg/SVGFontElement.cpp:

(WebCore::SVGFontElement::SVGFontElement):

• svg/SVGFontElement.h:

(WebCore::toSVGFontElement):
(WebCore::isSVGFontElement):

• svg/SVGFontFaceElement.cpp:

(WebCore::SVGFontFaceElement::associatedFontElement):
(WebCore::SVGFontFaceElement::rebuildFontFace):

• svg/SVGGlyphElement.cpp:

(WebCore::SVGGlyphElement::invalidateGlyphCache):

• svg/SVGHKernElement.cpp:

(WebCore::SVGHKernElement::insertedInto):
(WebCore::SVGHKernElement::removedFrom):

• svg/SVGImageElement.cpp:

(WebCore::SVGImageElement::SVGImageElement):

• svg/SVGImageElement.h:

(WebCore::toSVGImageElement):
(WebCore::isSVGImageElement):

• svg/SVGLocatable.cpp:

(WebCore::isViewportElement):

• svg/SVGVKernElement.cpp:

(WebCore::SVGVKernElement::insertedInto):
(WebCore::SVGVKernElement::removedFrom):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/cache/CachedFont.cpp (modified) (1 diff)
• rendering/HitTestResult.cpp (modified) (2 diffs)
• svg/SVGAnimateMotionElement.cpp (modified) (2 diffs)
• svg/SVGElement.cpp (modified) (2 diffs)
• svg/SVGFontElement.h (modified) (1 diff)
• svg/SVGFontFaceElement.cpp (modified) (2 diffs)
• svg/SVGGlyphElement.cpp (modified) (1 diff)
• svg/SVGHKernElement.cpp (modified) (2 diffs)
• svg/SVGImageElement.cpp (modified) (1 diff)
• svg/SVGImageElement.h (modified) (1 diff)
• svg/SVGLocatable.cpp (modified) (2 diffs)
• svg/SVGVKernElement.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-07-09  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
+
+        Introduce isSVGFontElement() and isSVGImageElement(), use them
+        https://bugs.webkit.org/show_bug.cgi?id=118504
+
+        Reviewed by Benjamin Poulain.
+
+        Let's use isFoo() to enhance readibility in svg element classes along with html's.
+
+        No new tests, there is no behavior changes.
+
+        * loader/cache/CachedFont.cpp:
+        (WebCore::CachedFont::getSVGFontById):
+        * rendering/HitTestResult.cpp:
+        (WebCore::HitTestResult::absoluteImageURL):
+        * svg/SVGAnimateMotionElement.cpp:
+        (WebCore::SVGAnimateMotionElement::hasValidAttributeType):
+        * svg/SVGElement.cpp:
+        (WebCore::SVGElement::viewportElement):
+        * svg/SVGFontElement.cpp:
+        (WebCore::SVGFontElement::SVGFontElement):
+        * svg/SVGFontElement.h:
+        (WebCore::toSVGFontElement):
+        (WebCore::isSVGFontElement):
+        * svg/SVGFontFaceElement.cpp:
+        (WebCore::SVGFontFaceElement::associatedFontElement):
+        (WebCore::SVGFontFaceElement::rebuildFontFace):
+        * svg/SVGGlyphElement.cpp:
+        (WebCore::SVGGlyphElement::invalidateGlyphCache):
+        * svg/SVGHKernElement.cpp:
+        (WebCore::SVGHKernElement::insertedInto):
+        (WebCore::SVGHKernElement::removedFrom):
+        * svg/SVGImageElement.cpp:
+        (WebCore::SVGImageElement::SVGImageElement):
+        * svg/SVGImageElement.h:
+        (WebCore::toSVGImageElement):
+        (WebCore::isSVGImageElement):
+        * svg/SVGLocatable.cpp:
+        (WebCore::isViewportElement):
+        * svg/SVGVKernElement.cpp:
+        (WebCore::SVGVKernElement::insertedInto):
+        (WebCore::SVGVKernElement::removedFrom):
+
 2013-07-09  Ryuan Choi  <ryuan.choi@samsung.com>
 

trunk/Source/WebCore/loader/cache/CachedFont.cpp

@@ -146 +146 @@
     for (unsigned i = 0; i < listLength; ++i) {
         ASSERT(list->item(i));
-        ASSERT(list->item(i)->hasTagName(SVGNames::fontTag));
+        ASSERT(isSVGFontElement(list->item(i)));
     }
 #endif

trunk/Source/WebCore/rendering/HitTestResult.cpp

@@ -48 +48 @@
 
 #if ENABLE(SVG)
+#include "SVGImageElement.h"
 #include "SVGNames.h"
 #include "XLinkNames.h"
@@ -322 +323 @@
         || m_innerNonSharedNode->hasTagName(objectTag)
 #if ENABLE(SVG)
-        || m_innerNonSharedNode->hasTagName(SVGNames::imageTag)
+        || isSVGImageElement(m_innerNonSharedNode.get())
 #endif
        ) {

trunk/Source/WebCore/svg/SVGAnimateMotionElement.cpp

@@ -29 +29 @@
 #include "RenderSVGResource.h"
 #include "SVGElementInstance.h"
+#include "SVGImageElement.h"
 #include "SVGMPathElement.h"
 #include "SVGNames.h"
@@ -70 +71 @@
         || targetElement->hasTagName(defsTag)
         || targetElement->hasTagName(useTag)
-        || targetElement->hasTagName(SVGNames::imageTag)
+        || isSVGImageElement(targetElement)
         || targetElement->hasTagName(switchTag)
         || targetElement->hasTagName(pathTag)

trunk/Source/WebCore/svg/SVGElement.cpp

@@ -39 +39 @@
 #include "SVGElementRareData.h"
 #include "SVGGraphicsElement.h"
+#include "SVGImageElement.h"
 #include "SVGNames.h"
 #include "SVGSVGElement.h"
@@ -207 +208 @@
     ContainerNode* n = parentOrShadowHostNode();
     while (n) {
-        if (n->hasTagName(SVGNames::svgTag) || n->hasTagName(SVGNames::imageTag) || n->hasTagName(SVGNames::symbolTag))
+        if (n->hasTagName(SVGNames::svgTag) || isSVGImageElement(n) || n->hasTagName(SVGNames::symbolTag))
             return toSVGElement(n);
 

trunk/Source/WebCore/svg/SVGFontElement.h

@@ -91 +91 @@
 };
 
+inline bool isSVGFontElement(const Node* node)
+{
+    return node->hasTagName(SVGNames::fontTag);
+}
+
 inline SVGFontElement* toSVGFontElement(Node* node)
 {
-    ASSERT_WITH_SECURITY_IMPLICATION(!node || node->hasTagName(SVGNames::fontTag));
+    ASSERT_WITH_SECURITY_IMPLICATION(!node || isSVGFontElement(node));
     return static_cast<SVGFontElement*>(node);
 }

trunk/Source/WebCore/svg/SVGFontFaceElement.cpp

@@ -266 +266 @@
 {
     ASSERT(parentNode() == m_fontElement);
-    ASSERT(!parentNode() || parentNode()->hasTagName(SVGNames::fontTag));
+    ASSERT(!parentNode() || isSVGFontElement(parentNode()));
     return m_fontElement;
 }
@@ -285 +285 @@
     }
 
-    bool describesParentFont = parentNode()->hasTagName(SVGNames::fontTag);
+    bool describesParentFont = isSVGFontElement(parentNode());
     RefPtr<CSSValueList> list;
 

trunk/Source/WebCore/svg/SVGGlyphElement.cpp

@@ -48 +48 @@
 {
     ContainerNode* fontNode = parentNode();
-    if (fontNode && fontNode->hasTagName(SVGNames::fontTag))
+    if (fontNode && isSVGFontElement(fontNode))
         toSVGFontElement(fontNode)->invalidateGlyphCache();
 }

trunk/Source/WebCore/svg/SVGHKernElement.cpp

@@ -45 +45 @@
 {
     ContainerNode* fontNode = parentNode();
-    if (fontNode && fontNode->hasTagName(SVGNames::fontTag))
+    if (fontNode && isSVGFontElement(fontNode))
         toSVGFontElement(fontNode)->invalidateGlyphCache();
 
@@ -54 +54 @@
 {
     ContainerNode* fontNode = parentNode();
-    if (fontNode && fontNode->hasTagName(SVGNames::fontTag))
+    if (fontNode && isSVGFontElement(fontNode))
         toSVGFontElement(fontNode)->invalidateGlyphCache();
 

trunk/Source/WebCore/svg/SVGImageElement.cpp

@@ -65 +65 @@
     , m_imageLoader(this)
 {
-    ASSERT(hasTagName(SVGNames::imageTag));
+    ASSERT(isSVGImageElement(SVGNames::imageTag));
     registerAnimatedPropertiesForSVGImageElement();
 }

trunk/Source/WebCore/svg/SVGImageElement.h

@@ -78 +78 @@
 };
 
+inline bool isSVGImageElement(const Node* node)
+{
+    return node->hasTagName(SVGNames::imageTag);
+}
+
 inline SVGImageElement* toSVGImageElement(Node* node)
 {
-    ASSERT_WITH_SECURITY_IMPLICATION(!node || node->hasTagName(SVGNames::imageTag));
+    ASSERT_WITH_SECURITY_IMPLICATION(!node || isSVGImageElement(node));
     return static_cast<SVGImageElement*>(node);
 }

trunk/Source/WebCore/svg/SVGLocatable.cpp

@@ -29 +29 @@
 #include "SVGException.h"
 #include "SVGGraphicsElement.h"
+#include "SVGImageElement.h"
 #include "SVGNames.h"
 
@@ -38 +39 @@
         || node->hasTagName(SVGNames::symbolTag)
         || node->hasTagName(SVGNames::foreignObjectTag)
-        || node->hasTagName(SVGNames::imageTag));
+        || isSVGImageElement(node));
 }
 

trunk/Source/WebCore/svg/SVGVKernElement.cpp

@@ -44 +44 @@
     if (rootParent->inDocument()) {
         ContainerNode* fontNode = parentNode();
-        if (fontNode && fontNode->hasTagName(SVGNames::fontTag))
+        if (fontNode && isSVGFontElement(fontNode))
             toSVGFontElement(fontNode)->invalidateGlyphCache();
     }
@@ -54 +54 @@
 {
     ContainerNode* fontNode = parentNode();
-    if (fontNode && fontNode->hasTagName(SVGNames::fontTag))
+    if (fontNode && isSVGFontElement(fontNode))
         toSVGFontElement(fontNode)->invalidateGlyphCache();