Unreviewed, rolling out r156119.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 19 Sep 2013 22:12:26 +0000 (22:12 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 19 Sep 2013 22:12:26 +0000 (22:12 +0000)
http://trac.webkit.org/changeset/156119
https://bugs.webkit.org/show_bug.cgi?id=121640

broke builds in various ways (Requested by anttik on #webkit).

* accessibility/AccessibilitySpinButton.cpp:
* bindings/scripts/CodeGeneratorObjC.pm:
(GenerateImplementation):
* css/SelectorChecker.cpp:
* dom/ContainerNode.h:
* dom/Element.h:
* dom/PseudoElement.cpp:
(WebCore::PseudoElement::didAttachRenderers):
* editing/SplitTextNodeContainingElementCommand.cpp:
(WebCore::SplitTextNodeContainingElementCommand::doApply):
* editing/TypingCommand.cpp:
* html/ImageDocument.cpp:
* page/PageSerializer.cpp:
* rendering/RenderElement.h:
* rendering/RenderObject.h:
* svg/SVGAnimatedColor.cpp:
(WebCore::adjustForCurrentColor):
* svg/SVGLocatable.cpp:
* svg/graphics/filters/SVGFEImage.cpp:
(WebCore::FEImage::determineAbsolutePaintRect):
(WebCore::FEImage::referencedRenderer):
* svg/graphics/filters/SVGFEImage.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@156121 268f45cc-cd09-0410-ab3c-d52691b4dbfc

17 files changed:
Source/WebCore/ChangeLog
Source/WebCore/accessibility/AccessibilitySpinButton.cpp
Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm
Source/WebCore/css/SelectorChecker.cpp
Source/WebCore/dom/ContainerNode.h
Source/WebCore/dom/Element.h
Source/WebCore/dom/PseudoElement.cpp
Source/WebCore/editing/SplitTextNodeContainingElementCommand.cpp
Source/WebCore/editing/TypingCommand.cpp
Source/WebCore/html/ImageDocument.cpp
Source/WebCore/page/PageSerializer.cpp
Source/WebCore/rendering/RenderElement.h
Source/WebCore/rendering/RenderObject.h
Source/WebCore/svg/SVGAnimatedColor.cpp
Source/WebCore/svg/SVGLocatable.cpp
Source/WebCore/svg/graphics/filters/SVGFEImage.cpp
Source/WebCore/svg/graphics/filters/SVGFEImage.h

index 5e62939..b685ff0 100644 (file)
@@ -1,3 +1,34 @@
+2013-09-19  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r156119.
+        http://trac.webkit.org/changeset/156119
+        https://bugs.webkit.org/show_bug.cgi?id=121640
+
+        broke builds in various ways (Requested by anttik on #webkit).
+
+        * accessibility/AccessibilitySpinButton.cpp:
+        * bindings/scripts/CodeGeneratorObjC.pm:
+        (GenerateImplementation):
+        * css/SelectorChecker.cpp:
+        * dom/ContainerNode.h:
+        * dom/Element.h:
+        * dom/PseudoElement.cpp:
+        (WebCore::PseudoElement::didAttachRenderers):
+        * editing/SplitTextNodeContainingElementCommand.cpp:
+        (WebCore::SplitTextNodeContainingElementCommand::doApply):
+        * editing/TypingCommand.cpp:
+        * html/ImageDocument.cpp:
+        * page/PageSerializer.cpp:
+        * rendering/RenderElement.h:
+        * rendering/RenderObject.h:
+        * svg/SVGAnimatedColor.cpp:
+        (WebCore::adjustForCurrentColor):
+        * svg/SVGLocatable.cpp:
+        * svg/graphics/filters/SVGFEImage.cpp:
+        (WebCore::FEImage::determineAbsolutePaintRect):
+        (WebCore::FEImage::referencedRenderer):
+        * svg/graphics/filters/SVGFEImage.h:
+
 2013-09-19  Antti Koivisto  <antti@apple.com>
 
         Add covariant RenderElement* Element::renderer()
index 26af7b7..46a1828 100644 (file)
@@ -27,7 +27,7 @@
 #include "AccessibilitySpinButton.h"
 
 #include "AXObjectCache.h"
-#include "RenderElement.h"
+#include "RenderObject.h"
 
 namespace WebCore {
 
index 8d66fd8..f5f9055 100644 (file)
@@ -1289,7 +1289,7 @@ sub GenerateImplementation
                     unless ($interfaceName eq "HTMLImageElement") {
                         push(@customGetterContent, "    if (!IMPL->renderer() || !IMPL->renderer()->isImage())\n");
                         push(@customGetterContent, "        return nil;\n");
-                        $implIncludes{"RenderElement.h"} = 1;
+                        $implIncludes{"RenderObject.h"} = 1;
                     }
                 }
                 $implIncludes{"DOMPrivate.h"} = 1;
index 6689a1e..82aaf09 100644 (file)
@@ -48,7 +48,7 @@
 #include "InspectorInstrumentation.h"
 #include "NodeRenderStyle.h"
 #include "Page.h"
-#include "RenderElement.h"
+#include "RenderObject.h"
 #include "RenderScrollbar.h"
 #include "RenderStyle.h"
 #include "ScrollableArea.h"
index dfcf4ee..d55079d 100644 (file)
@@ -33,7 +33,7 @@
 namespace WebCore {
 
 class FloatPoint;
-
+    
 typedef void (*NodeCallback)(Node*, unsigned);
 
 namespace Private { 
index 6a5f9b4..55a8e18 100644 (file)
@@ -44,7 +44,6 @@ class HTMLDocument;
 class IntSize;
 class Locale;
 class PseudoElement;
-class RenderElement;
 class RenderRegion;
 class ShadowRoot;
 
@@ -128,8 +127,6 @@ public:
     DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitfullscreenerror);
 #endif
 
-    RenderElement* renderer() const;
-
     bool hasAttribute(const QualifiedName&) const;
     const AtomicString& getAttribute(const QualifiedName&) const;
     void setAttribute(const QualifiedName&, const AtomicString& value);
index a63b973..4d65dbf 100644 (file)
@@ -29,7 +29,7 @@
 
 #include "ContentData.h"
 #include "InspectorInstrumentation.h"
-#include "RenderElement.h"
+#include "RenderObject.h"
 #include "RenderQuote.h"
 
 namespace WebCore {
@@ -78,7 +78,7 @@ PassRefPtr<RenderStyle> PseudoElement::customStyleForRenderer()
 
 void PseudoElement::didAttachRenderers()
 {
-    RenderElement* renderer = this->renderer();
+    RenderObject* renderer = this->renderer();
     if (!renderer || !renderer->style()->regionThread().isEmpty())
         return;
 
index 53fd7d6..105bbc5 100644 (file)
@@ -27,8 +27,8 @@
 #include "SplitTextNodeContainingElementCommand.h"
 
 #include "Element.h"
-#include "RenderElement.h"
 #include "Text.h"
+#include "RenderObject.h"
 #include <wtf/Assertions.h>
 
 namespace WebCore {
@@ -53,7 +53,7 @@ void SplitTextNodeContainingElementCommand::doApply()
     if (!parent || !parent->parentElement() || !parent->parentElement()->rendererIsEditable())
         return;
 
-    RenderElement* parentRenderer = parent->renderer();
+    RenderObject* parentRenderer = parent->renderer();
     if (!parentRenderer || !parentRenderer->isInline()) {
         wrapContentsInDummySpan(parent);
         Node* firstChild = parent->firstChild();
index 7381296..c16ed04 100644 (file)
@@ -37,7 +37,7 @@
 #include "InsertLineBreakCommand.h"
 #include "InsertParagraphSeparatorCommand.h"
 #include "InsertTextCommand.h"
-#include "RenderElement.h"
+#include "RenderObject.h"
 #include "TextIterator.h"
 #include "VisiblePosition.h"
 #include "VisibleUnits.h"
index daea01e..73ffdef 100644 (file)
@@ -42,7 +42,6 @@
 #include "NotImplemented.h"
 #include "Page.h"
 #include "RawDataDocumentParser.h"
-#include "RenderElement.h"
 #include "ResourceBuffer.h"
 #include "Settings.h"
 
index 9b90fcb..024fbf3 100644 (file)
@@ -50,7 +50,6 @@
 #include "MIMETypeRegistry.h"
 #include "MarkupAccumulator.h"
 #include "Page.h"
-#include "RenderElement.h"
 #include "StyleCachedImage.h"
 #include "StyleImage.h"
 #include "StylePropertySet.h"
index df7ccee..45e5025 100644 (file)
@@ -47,39 +47,6 @@ private:
     void generatingNode() const WTF_DELETED_FUNCTION;
 };
 
-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
 
 #endif // RenderElement_h
index ed818ac..f3c8b37 100644 (file)
@@ -342,7 +342,6 @@ public:
 
     bool isPseudoElement() const { return node() && node()->isPseudoElement(); }
 
-    bool isRenderElement() const { return !isText(); }
     virtual bool isBoxModelObject() const { return false; }
     virtual bool isCounter() const { return false; }
     virtual bool isQuote() const { return false; }
index 28160a1..832c2a2 100644 (file)
@@ -23,7 +23,7 @@
 #include "SVGAnimatedColor.h"
 
 #include "ColorDistance.h"
-#include "RenderElement.h"
+#include "RenderObject.h"
 #include "SVGAnimateElement.h"
 #include "SVGColor.h"
 
@@ -52,7 +52,7 @@ static inline void adjustForCurrentColor(SVGElement* targetElement, Color& color
 {
     ASSERT(targetElement);
 
-    if (RenderElement* targetRenderer = targetElement->renderer())
+    if (RenderObject* targetRenderer = targetElement->renderer())
         color = targetRenderer->style()->visitedDependentColor(CSSPropertyColor);
     else
         color = Color();
index cad52c8..d87a3f3 100644 (file)
@@ -25,7 +25,7 @@
 #if ENABLE(SVG)
 #include "SVGLocatable.h"
 
-#include "RenderElement.h"
+#include "RenderObject.h"
 #include "SVGException.h"
 #include "SVGGraphicsElement.h"
 #include "SVGImageElement.h"
index 0e7a7e1..57b8545 100644 (file)
@@ -28,7 +28,7 @@
 #include "AffineTransform.h"
 #include "Filter.h"
 #include "GraphicsContext.h"
-#include "RenderElement.h"
+#include "RenderObject.h"
 #include "RenderTreeAsText.h"
 #include "SVGElement.h"
 #include "SVGFilter.h"
@@ -74,7 +74,7 @@ void FEImage::determineAbsolutePaintRect()
     if (m_image) {
         srcRect.setSize(m_image->size());
         m_preserveAspectRatio.transformRect(paintRect, srcRect);
-    } else if (RenderElement* renderer = referencedRenderer())
+    } else if (RenderObject* renderer = referencedRenderer())
         srcRect = svgFilter->absoluteTransform().mapRect(renderer->repaintRectInLocalCoordinates());
 
     if (clipsToBounds())
@@ -84,7 +84,7 @@ void FEImage::determineAbsolutePaintRect()
     setAbsolutePaintRect(enclosingIntRect(paintRect));
 }
 
-RenderElement* FEImage::referencedRenderer() const
+RenderObject* FEImage::referencedRenderer() const
 {
     if (!m_document)
         return 0;
index 8571981..46a853c 100644 (file)
@@ -31,7 +31,7 @@ namespace WebCore {
 
 class Document;
 class Image;
-class RenderElement;
+class RenderObject;
 
 class FEImage : public FilterEffect {
 public:
@@ -54,7 +54,7 @@ private:
     virtual ~FEImage() { }
     FEImage(Filter*, PassRefPtr<Image>, const SVGPreserveAspectRatio&);
     FEImage(Filter*, Document*, const String&, const SVGPreserveAspectRatio&);
-    RenderElement* referencedRenderer() const;
+    RenderObject* referencedRenderer() const;
 
     RefPtr<Image> m_image;