Changeset 156144 in webkit

Timestamp:

Sep 20, 2013, 1:59:25 AM (11 years ago)

Author:

Antti Koivisto

Message:

Add covariant RenderElement* Element::renderer()
​https://bugs.webkit.org/show_bug.cgi?id=121638

Reviewed by Andreas Kling.

Also add isRenderElement() test and casting functions.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• accessibility/AccessibilityScrollView.cpp (modified) (1 diff)
• accessibility/AccessibilitySpinButton.cpp (modified) (1 diff)
• accessibility/atk/WebKitAccessibleInterfaceTable.cpp (modified) (2 diffs)
• bindings/scripts/CodeGeneratorObjC.pm (modified) (1 diff)
• bridge/qt/qt_pixmapruntime.cpp (modified) (1 diff)
• css/SelectorChecker.cpp (modified) (1 diff)
• dom/ContainerNode.h (modified) (1 diff)
• dom/Element.h (modified) (2 diffs)
• dom/PseudoElement.cpp (modified) (2 diffs)
• editing/SplitTextNodeContainingElementCommand.cpp (modified) (2 diffs)
• editing/TypingCommand.cpp (modified) (1 diff)
• html/ImageDocument.cpp (modified) (1 diff)
• loader/cache/CachedResourceLoader.cpp (modified) (1 diff)
• page/PageSerializer.cpp (modified) (1 diff)
• plugins/gtk/PluginViewGtk.cpp (modified) (1 diff)
• rendering/RenderElement.h (modified) (1 diff)
• rendering/RenderObject.h (modified) (1 diff)
• svg/SVGAnimatedColor.cpp (modified) (2 diffs)
• svg/SVGLocatable.cpp (modified) (1 diff)
• svg/graphics/filters/SVGFEImage.cpp (modified) (3 diffs)
• svg/graphics/filters/SVGFEImage.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-09-20  Antti Koivisto  <antti@apple.com>
+
+        Add covariant RenderElement* Element::renderer()
+        https://bugs.webkit.org/show_bug.cgi?id=121638
+
+        Reviewed by Andreas Kling.
+
+        Also add isRenderElement() test and casting functions.
+
 2013-09-19  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebCore/accessibility/AccessibilityScrollView.cpp

@@ -32 +32 @@
 #include "FrameView.h"
 #include "HTMLFrameOwnerElement.h"
+#include "RenderElement.h"
 #include "ScrollView.h"
 #include "Widget.h"

trunk/Source/WebCore/accessibility/AccessibilitySpinButton.cpp

@@ -28 +28 @@
 
 #include "AXObjectCache.h"
-#include "RenderObject.h"
+#include "RenderElement.h"
 
 namespace WebCore {

trunk/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceTable.cpp

@@ -41 +41 @@
 #include "HTMLTableCaptionElement.h"
 #include "HTMLTableElement.h"
-#include "RenderObject.h"
+#include "RenderElement.h"
 #include "WebKitAccessibleInterfaceText.h"
 #include "WebKitAccessibleWrapperAtk.h"
@@ -216 +216 @@
             HTMLTableCaptionElement* caption = toHTMLTableElement(node)->caption();
             if (caption)
-                return AccessibilityObject::firstAccessibleObjectFromNode(caption->renderer()->node())->wrapper();
+                return AccessibilityObject::firstAccessibleObjectFromNode(caption->renderer()->element())->wrapper();
         }
     }

trunk/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm

@@ -1290 +1290 @@
                         push(@customGetterContent, "    if (!IMPL->renderer() || !IMPL->renderer()->isImage())\n");
                         push(@customGetterContent, "        return nil;\n");
-                        $implIncludes{"RenderObject.h"} = 1;
+                        $implIncludes{"RenderElement.h"} = 1;
                     }
                 }

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

@@ -31 +31 @@
 #include "JSRetainPtr.h"
 #include "JavaScript.h"
+#include "RenderElement.h"
 #include "StillImageQt.h"
 #include <QBuffer>

trunk/Source/WebCore/css/SelectorChecker.cpp

@@ -49 +49 @@
 #include "NodeRenderStyle.h"
 #include "Page.h"
-#include "RenderObject.h"
+#include "RenderElement.h"
 #include "RenderScrollbar.h"
 #include "RenderStyle.h"

trunk/Source/WebCore/dom/ContainerNode.h

@@ -34 +34 @@
 
 class FloatPoint;
-    
+
 typedef void (*NodeCallback)(Node*, unsigned);
 

trunk/Source/WebCore/dom/Element.h

@@ -45 +45 @@
 class Locale;
 class PseudoElement;
+class RenderElement;
 class RenderRegion;
 class ShadowRoot;
@@ -128 +129 @@
 #endif
 
+    RenderElement* renderer() const;
+
     bool hasAttribute(const QualifiedName&) const;
     const AtomicString& getAttribute(const QualifiedName&) const;

trunk/Source/WebCore/dom/PseudoElement.cpp

@@ -30 +30 @@
 #include "ContentData.h"
 #include "InspectorInstrumentation.h"
-#include "RenderObject.h"
+#include "RenderElement.h"
 #include "RenderQuote.h"
 
@@ -79 +79 @@
 void PseudoElement::didAttachRenderers()
 {
-    RenderObject* renderer = this->renderer();
+    RenderElement* renderer = this->renderer();
     if (!renderer || !renderer->style()->regionThread().isEmpty())
         return;

trunk/Source/WebCore/editing/SplitTextNodeContainingElementCommand.cpp

@@ -28 +28 @@
 
 #include "Element.h"
+#include "RenderElement.h"
 #include "Text.h"
-#include "RenderObject.h"
 #include <wtf/Assertions.h>
 
@@ -54 +54 @@
         return;
 
-    RenderObject* parentRenderer = parent->renderer();
+    RenderElement* parentRenderer = parent->renderer();
     if (!parentRenderer || !parentRenderer->isInline()) {
         wrapContentsInDummySpan(parent);

trunk/Source/WebCore/editing/TypingCommand.cpp

@@ -38 +38 @@
 #include "InsertParagraphSeparatorCommand.h"
 #include "InsertTextCommand.h"
-#include "RenderObject.h"
+#include "RenderElement.h"
 #include "TextIterator.h"
 #include "VisiblePosition.h"

trunk/Source/WebCore/html/ImageDocument.cpp

@@ -43 +43 @@
 #include "Page.h"
 #include "RawDataDocumentParser.h"
+#include "RenderElement.h"
 #include "ResourceBuffer.h"
 #include "Settings.h"

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

@@ -51 +51 @@
 #include "PingLoader.h"
 #include "PlatformStrategies.h"
+#include "RenderElement.h"
 #include "ResourceLoadScheduler.h"
 #include "ScriptController.h"

trunk/Source/WebCore/page/PageSerializer.cpp

@@ -51 +51 @@
 #include "MarkupAccumulator.h"
 #include "Page.h"
+#include "RenderElement.h"
 #include "StyleCachedImage.h"
 #include "StyleImage.h"

trunk/Source/WebCore/plugins/gtk/PluginViewGtk.cpp

@@ -59 +59 @@
 #include "PluginMainThreadScheduler.h"
 #include "PluginPackage.h"
-#include "RenderObject.h"
+#include "RenderElement.h"
 #include "Settings.h"
 #include "SpatialNavigation.h"

trunk/Source/WebCore/rendering/RenderElement.h

@@ -48 +48 @@
 };
 
+inline RenderElement& toRenderElement(RenderObject& object)
+{
+    ASSERT_WITH_SECURITY_IMPLICATION(object.isRenderElement());
+    return static_cast<RenderElement&>(object);
+}
+
+inline const RenderElement& toRenderElement(const RenderObject& object)
+{
+    ASSERT_WITH_SECURITY_IMPLICATION(object.isRenderElement());
+    return static_cast<const RenderElement&>(object);
+}
+
+inline RenderElement* toRenderElement(RenderObject* object)
+{
+    ASSERT_WITH_SECURITY_IMPLICATION(!object || object->isRenderElement());
+    return static_cast<RenderElement*>(object);
+}
+
+inline const RenderElement* toRenderElement(const RenderObject* object)
+{
+    ASSERT_WITH_SECURITY_IMPLICATION(!object || object->isRenderElement());
+    return static_cast<const RenderElement*>(object);
+}
+
+// This will catch anyone doing an unnecessary cast.
+void toRenderElement(const RenderElement*);
+void toRenderElement(const RenderElement&);
+
+inline RenderElement* Element::renderer() const
+{
+    return toRenderElement(Node::renderer());
+}
+
 } // namespace WebCore
 

trunk/Source/WebCore/rendering/RenderObject.h

@@ -343 +343 @@
     bool isPseudoElement() const { return node() && node()->isPseudoElement(); }
 
+    bool isRenderElement() const { return !isText(); }
     virtual bool isBoxModelObject() const { return false; }
     virtual bool isCounter() const { return false; }

trunk/Source/WebCore/svg/SVGAnimatedColor.cpp

@@ -24 +24 @@
 
 #include "ColorDistance.h"
-#include "RenderObject.h"
+#include "RenderElement.h"
 #include "SVGAnimateElement.h"
 #include "SVGColor.h"
@@ -53 +53 @@
     ASSERT(targetElement);
 
-    if (RenderObject* targetRenderer = targetElement->renderer())
+    if (RenderElement* targetRenderer = targetElement->renderer())
         color = targetRenderer->style()->visitedDependentColor(CSSPropertyColor);
     else

trunk/Source/WebCore/svg/SVGLocatable.cpp

@@ -26 +26 @@
 #include "SVGLocatable.h"
 
-#include "RenderObject.h"
+#include "RenderElement.h"
 #include "SVGException.h"
 #include "SVGGraphicsElement.h"

trunk/Source/WebCore/svg/graphics/filters/SVGFEImage.cpp

@@ -29 +29 @@
 #include "Filter.h"
 #include "GraphicsContext.h"
-#include "RenderObject.h"
+#include "RenderElement.h"
 #include "RenderTreeAsText.h"
 #include "SVGElement.h"
@@ -75 +75 @@
         srcRect.setSize(m_image->size());
         m_preserveAspectRatio.transformRect(paintRect, srcRect);
-    } else if (RenderObject* renderer = referencedRenderer())
+    } else if (RenderElement* renderer = referencedRenderer())
         srcRect = svgFilter->absoluteTransform().mapRect(renderer->repaintRectInLocalCoordinates());
 
@@ -85 +85 @@
 }
 
-RenderObject* FEImage::referencedRenderer() const
+RenderElement* FEImage::referencedRenderer() const
 {
     if (!m_document)

trunk/Source/WebCore/svg/graphics/filters/SVGFEImage.h

@@ -32 +32 @@
 class Document;
 class Image;
-class RenderObject;
+class RenderElement;
 
 class FEImage : public FilterEffect {
@@ -55 +55 @@
     FEImage(Filter*, PassRefPtr<Image>, const SVGPreserveAspectRatio&);
     FEImage(Filter*, Document*, const String&, const SVGPreserveAspectRatio&);
-    RenderObject* referencedRenderer() const;
+    RenderElement* referencedRenderer() const;
 
     RefPtr<Image> m_image;