[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[rwlbuis at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit cc87e39deb8dab458b0be6aae4ca422a1a86a4a2
Author: rwlbuis at webkit.org <rwlbuis at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Dec 19 18:44:24 2010 +0000

    2010-12-19  Rob Buis  <rwlbuis at gmail.com>
    
            Reviewed by Andreas Kling.
    
            Remove m_drawsContents from RenderSVGContainer.h
            https://bugs.webkit.org/show_bug.cgi?id=51305
    
            Remove m_drawsContents, its getter and setter and the call
            sites, since it has no effect anymore.
    
            * WebCore.order:
            * rendering/RenderSVGContainer.cpp:
            (WebCore::RenderSVGContainer::RenderSVGContainer):
            (WebCore::RenderSVGContainer::paint):
            * rendering/RenderSVGContainer.h:
            * rendering/RenderSVGResourceContainer.h:
            * rendering/SVGImageBufferTools.cpp:
            (WebCore::SVGImageBufferTools::renderSubtreeToImageBuffer):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74325 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 00001a7..15546c3 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2010-12-19  Rob Buis  <rwlbuis at gmail.com>
+
+        Reviewed by Andreas Kling.
+
+        Remove m_drawsContents from RenderSVGContainer.h
+        https://bugs.webkit.org/show_bug.cgi?id=51305
+
+        Remove m_drawsContents, its getter and setter and the call
+        sites, since it has no effect anymore.
+
+        * WebCore.order:
+        * rendering/RenderSVGContainer.cpp:
+        (WebCore::RenderSVGContainer::RenderSVGContainer):
+        (WebCore::RenderSVGContainer::paint):
+        * rendering/RenderSVGContainer.h:
+        * rendering/RenderSVGResourceContainer.h:
+        * rendering/SVGImageBufferTools.cpp:
+        (WebCore::SVGImageBufferTools::renderSubtreeToImageBuffer):
+
 2010-12-19  Benjamin Poulain  <benjamin.poulain at nokia.com>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebCore/WebCore.order b/WebCore/WebCore.order
index 0fdabb1..271dfc9 100644
--- a/WebCore/WebCore.order
+++ b/WebCore/WebCore.order
@@ -18176,7 +18176,6 @@ __ZNK7WebCore22SVGPreserveAspectRatio11meetOrSliceEv
 __ZNK7WebCore18RenderSVGContainer29repaintRectInLocalCoordinatesEv
 __ZNK7WebCore31RenderSVGTransformableContainer22localToParentTransformEv
 __ZN7WebCore18RenderSVGContainer5paintERNS_12RenderObject9PaintInfoEii
-__ZNK7WebCore18RenderSVGContainer13drawsContentsEv
 __ZN7WebCore18RenderSVGContainer17applyViewportClipERNS_12RenderObject9PaintInfoE
 __ZN7WebCore31RenderSVGTransformableContainerD0Ev
 -[DOMHTMLIFrameElement contentDocument]
diff --git a/WebCore/rendering/RenderSVGContainer.cpp b/WebCore/rendering/RenderSVGContainer.cpp
index 0761562..32e0598 100644
--- a/WebCore/rendering/RenderSVGContainer.cpp
+++ b/WebCore/rendering/RenderSVGContainer.cpp
@@ -38,7 +38,6 @@ namespace WebCore {
 
 RenderSVGContainer::RenderSVGContainer(SVGStyledElement* node)
     : RenderSVGModelObject(node)
-    , m_drawsContents(true)
     , m_needsBoundariesUpdate(true)
 {
 }
@@ -94,7 +93,7 @@ bool RenderSVGContainer::selfWillPaint()
 
 void RenderSVGContainer::paint(PaintInfo& paintInfo, int, int)
 {
-    if (paintInfo.context->paintingDisabled() || !drawsContents())
+    if (paintInfo.context->paintingDisabled())
         return;
 
     // Spec: groups w/o children still may render filter content.
diff --git a/WebCore/rendering/RenderSVGContainer.h b/WebCore/rendering/RenderSVGContainer.h
index 5bdbf32..3bd5346 100644
--- a/WebCore/rendering/RenderSVGContainer.h
+++ b/WebCore/rendering/RenderSVGContainer.h
@@ -39,10 +39,6 @@ public:
     const RenderObjectChildList* children() const { return &m_children; }
     RenderObjectChildList* children() { return &m_children; }
 
-    // <marker> uses these methods to only allow drawing children during a special marker draw time
-    void setDrawsContents(bool drawsContents) { m_drawsContents = drawsContents; }
-    bool drawsContents() const { return m_drawsContents; }
-
     virtual void paint(PaintInfo&, int parentX, int parentY);
     virtual void setNeedsBoundariesUpdate() { m_needsBoundariesUpdate = true; }
 
@@ -79,7 +75,6 @@ private:
     FloatRect m_objectBoundingBox;
     FloatRect m_strokeBoundingBox;
     FloatRect m_repaintBoundingBox;
-    bool m_drawsContents : 1;
     bool m_needsBoundariesUpdate : 1;
 };
   
diff --git a/WebCore/rendering/RenderSVGResourceContainer.h b/WebCore/rendering/RenderSVGResourceContainer.h
index 08e18d4..4e5e475 100644
--- a/WebCore/rendering/RenderSVGResourceContainer.h
+++ b/WebCore/rendering/RenderSVGResourceContainer.h
@@ -38,7 +38,6 @@ public:
     virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle);
 
     virtual bool isSVGResourceContainer() const { return true; }
-    virtual bool drawsContents() { return false; }
     virtual RenderSVGResourceContainer* toRenderSVGResourceContainer() { return this; }
 
     static AffineTransform transformOnNonScalingStroke(RenderObject*, const AffineTransform& resourceTransform);
diff --git a/WebCore/rendering/SVGImageBufferTools.cpp b/WebCore/rendering/SVGImageBufferTools.cpp
index 20f45b1..2dc0a6f 100644
--- a/WebCore/rendering/SVGImageBufferTools.cpp
+++ b/WebCore/rendering/SVGImageBufferTools.cpp
@@ -81,14 +81,6 @@ void SVGImageBufferTools::renderSubtreeToImageBuffer(ImageBuffer* image, RenderO
 
     PaintInfo info(image->context(), PaintInfo::infiniteRect(), PaintPhaseForeground, 0, 0, 0);
 
-    RenderSVGContainer* svgContainer = 0;
-    if (item && item->isSVGContainer() && !item->isSVGViewportContainer())
-        svgContainer = toRenderSVGContainer(item);
-
-    bool drawsContents = svgContainer ? svgContainer->drawsContents() : false;
-    if (svgContainer && !drawsContents)
-        svgContainer->setDrawsContents(true);
-
     AffineTransform& contentTransformation = currentContentTransformation();
     AffineTransform savedContentTransformation = contentTransformation;
     contentTransformation.multiply(subtreeContentTransformation);
@@ -97,9 +89,6 @@ void SVGImageBufferTools::renderSubtreeToImageBuffer(ImageBuffer* image, RenderO
     item->paint(info, 0, 0);
 
     contentTransformation = savedContentTransformation;
-
-    if (svgContainer && !drawsContents)
-        svgContainer->setDrawsContents(false);
 }
 
 void SVGImageBufferTools::clipToImageBuffer(GraphicsContext* context, const AffineTransform& absoluteTransform, const FloatRect& clampedAbsoluteTargetRect, OwnPtr<ImageBuffer>& imageBuffer)

-- 
WebKit Debian packaging