⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 93440 in webkit


Ignore:
Timestamp:
Aug 19, 2011, 2:40:27 PM (15 years ago)
Author:
eae@chromium.org
Message:

Switch clipping for svg to to new layout types
​https://bugs.webkit.org/show_bug.cgi?id=66586

Reviewed by Eric Seidel.

No new tests as no new functionality.

  • rendering/svg/RenderSVGForeignObject.h:
  • rendering/svg/RenderSVGGradientStop.h:

(WebCore::RenderSVGGradientStop::clippedOverflowRectForRepaint):

  • rendering/svg/RenderSVGHiddenContainer.h:

(WebCore::RenderSVGHiddenContainer::clippedOverflowRectForRepaint):

  • rendering/svg/RenderSVGInline.cpp:

(WebCore::RenderSVGInline::clippedOverflowRectForRepaint):
(WebCore::RenderSVGInline::computeRectForRepaint):

  • rendering/svg/RenderSVGInline.h:
  • rendering/svg/RenderSVGModelObject.cpp:

(WebCore::RenderSVGModelObject::clippedOverflowRectForRepaint):
(WebCore::RenderSVGModelObject::computeRectForRepaint):

  • rendering/svg/RenderSVGModelObject.h:
  • rendering/svg/RenderSVGText.cpp:

(WebCore::RenderSVGText::clippedOverflowRectForRepaint):
(WebCore::RenderSVGText::computeRectForRepaint):

  • rendering/svg/RenderSVGText.h:
  • svg/SVGSVGElement.cpp:

(WebCore::SVGSVGElement::localCoordinateSpaceTransform):

  • svg/SVGSVGElement.h:

(WebCore::SVGSVGElement::setContainerSize):
(WebCore::SVGSVGElement::containerSize):

  • svg/graphics/SVGImage.cpp:

(WebCore::SVGImageChromeClient::invalidateContentsAndWindow):
(WebCore::SVGImage::setContainerSize):

  • svg/graphics/SVGImage.h:
Location:
trunk/Source/WebCore
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r93439 r93440  
     12011-08-19  Emil A Eklund  <eae@chromium.org>
     2
     3        Switch clipping for svg to to new layout types
     4        https://bugs.webkit.org/show_bug.cgi?id=66586
     5
     6        Reviewed by Eric Seidel.
     7
     8        No new tests as no new functionality.
     9
     10        * rendering/svg/RenderSVGForeignObject.h:
     11        * rendering/svg/RenderSVGGradientStop.h:
     12        (WebCore::RenderSVGGradientStop::clippedOverflowRectForRepaint):
     13        * rendering/svg/RenderSVGHiddenContainer.h:
     14        (WebCore::RenderSVGHiddenContainer::clippedOverflowRectForRepaint):
     15        * rendering/svg/RenderSVGInline.cpp:
     16        (WebCore::RenderSVGInline::clippedOverflowRectForRepaint):
     17        (WebCore::RenderSVGInline::computeRectForRepaint):
     18        * rendering/svg/RenderSVGInline.h:
     19        * rendering/svg/RenderSVGModelObject.cpp:
     20        (WebCore::RenderSVGModelObject::clippedOverflowRectForRepaint):
     21        (WebCore::RenderSVGModelObject::computeRectForRepaint):
     22        * rendering/svg/RenderSVGModelObject.h:
     23        * rendering/svg/RenderSVGText.cpp:
     24        (WebCore::RenderSVGText::clippedOverflowRectForRepaint):
     25        (WebCore::RenderSVGText::computeRectForRepaint):
     26        * rendering/svg/RenderSVGText.h:
     27        * svg/SVGSVGElement.cpp:
     28        (WebCore::SVGSVGElement::localCoordinateSpaceTransform):
     29        * svg/SVGSVGElement.h:
     30        (WebCore::SVGSVGElement::setContainerSize):
     31        (WebCore::SVGSVGElement::containerSize):
     32        * svg/graphics/SVGImage.cpp:
     33        (WebCore::SVGImageChromeClient::invalidateContentsAndWindow):
     34        (WebCore::SVGImage::setContainerSize):
     35        * svg/graphics/SVGImage.h:
     36
    1372011-08-19  Sheriff Bot  <webkit.review.bot@gmail.com>
    238

  • trunk/Source/WebCore/rendering/svg/RenderSVGForeignObject.h

    r92434 r93440  
    4040    virtual void paint(PaintInfo&, const LayoutPoint&);
    4141
    42     virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const;
    43     virtual void computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect&, bool fixed = false) const;
     42    virtual LayoutRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const;
     43    virtual void computeRectForRepaint(RenderBoxModelObject* repaintContainer, LayoutRect&, bool fixed = false) const;
    4444
    4545    virtual bool requiresLayer() const { return false; }

  • trunk/Source/WebCore/rendering/svg/RenderSVGGradientStop.h

    r92252 r93440  
    4444    // RenderObject's default implementations ASSERT_NOT_REACHED()
    4545    // https://bugs.webkit.org/show_bug.cgi?id=20400
    46     virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject*) const { return IntRect(); }
     46    virtual LayoutRect clippedOverflowRectForRepaint(RenderBoxModelObject*) const { return LayoutRect(); }
    4747    virtual FloatRect objectBoundingBox() const { return FloatRect(); }
    4848    virtual FloatRect strokeBoundingBox() const { return FloatRect(); }

  • trunk/Source/WebCore/rendering/svg/RenderSVGHiddenContainer.h

    r92438 r93440  
    4444    virtual void paint(PaintInfo&, const LayoutPoint&);
    4545   
    46     virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject*) const { return IntRect(); }
     46    virtual LayoutRect clippedOverflowRectForRepaint(RenderBoxModelObject*) const { return LayoutRect(); }
    4747    virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed);
    4848

  • trunk/Source/WebCore/rendering/svg/RenderSVGInline.cpp

    r92438 r93440  
    6868}
    6969
    70 IntRect RenderSVGInline::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const
     70LayoutRect RenderSVGInline::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const
    7171{
    7272    return SVGRenderSupport::clippedOverflowRectForRepaint(this, repaintContainer);
    7373}
    7474
    75 void RenderSVGInline::computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect& repaintRect, bool fixed) const
     75void RenderSVGInline::computeRectForRepaint(RenderBoxModelObject* repaintContainer, LayoutRect& repaintRect, bool fixed) const
    7676{
    7777    SVGRenderSupport::computeRectForRepaint(this, repaintContainer, repaintRect, fixed);

  • trunk/Source/WebCore/rendering/svg/RenderSVGInline.h

    r92438 r93440  
    4646    virtual FloatRect repaintRectInLocalCoordinates() const;
    4747
    48     virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const;
    49     virtual void computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect&, bool fixed = false) const;
    50     virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool useTransforms, bool fixed, TransformState&,  bool* wasFixed = 0) const;
     48    virtual LayoutRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const;
     49    virtual void computeRectForRepaint(RenderBoxModelObject* repaintContainer, LayoutRect&, bool fixed = false) const;
     50    virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool useTransforms, bool fixed, TransformState&, bool* wasFixed = 0) const;
    5151    virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed);
    5252

  • trunk/Source/WebCore/rendering/svg/RenderSVGModelObject.cpp

    r93050 r93440  
    4444}
    4545
    46 IntRect RenderSVGModelObject::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const
     46LayoutRect RenderSVGModelObject::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const
    4747{
    4848    return SVGRenderSupport::clippedOverflowRectForRepaint(this, repaintContainer);
    4949}
    5050
    51 void RenderSVGModelObject::computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect& repaintRect, bool fixed) const
     51void RenderSVGModelObject::computeRectForRepaint(RenderBoxModelObject* repaintContainer, LayoutRect& repaintRect, bool fixed) const
    5252{
    5353    SVGRenderSupport::computeRectForRepaint(this, repaintContainer, repaintRect, fixed);

  • trunk/Source/WebCore/rendering/svg/RenderSVGModelObject.h

    r92438 r93440  
    5252    virtual bool requiresLayer() const { return false; }
    5353
    54     virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const;
    55     virtual void computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect&, bool fixed = false) const;
    56     virtual IntRect outlineBoundsForRepaint(RenderBoxModelObject* repaintContainer, IntPoint*) const;
     54    virtual LayoutRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const;
     55    virtual void computeRectForRepaint(RenderBoxModelObject* repaintContainer, LayoutRect&, bool fixed = false) const;
     56    virtual LayoutRect outlineBoundsForRepaint(RenderBoxModelObject* repaintContainer, LayoutPoint*) const;
    5757
    5858    virtual void absoluteRects(Vector<LayoutRect>&, const LayoutPoint& accumulatedOffset);

  • trunk/Source/WebCore/rendering/svg/RenderSVGText.cpp

    r93050 r93440  
    8383}
    8484
    85 IntRect RenderSVGText::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const
     85LayoutRect RenderSVGText::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const
    8686{
    8787    return SVGRenderSupport::clippedOverflowRectForRepaint(this, repaintContainer);
    8888}
    8989
    90 void RenderSVGText::computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect& repaintRect, bool fixed) const
     90void RenderSVGText::computeRectForRepaint(RenderBoxModelObject* repaintContainer, LayoutRect& repaintRect, bool fixed) const
    9191{
    9292    SVGRenderSupport::computeRectForRepaint(this, repaintContainer, repaintRect, fixed);

  • trunk/Source/WebCore/rendering/svg/RenderSVGText.h

    r92438 r93440  
    6363    virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed);
    6464
    65     virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const;
    66     virtual void computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect&, bool fixed = false) const;
     65    virtual LayoutRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const;
     66    virtual void computeRectForRepaint(RenderBoxModelObject* repaintContainer, LayoutRect&, bool fixed = false) const;
    6767
    6868    virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool useTransforms, bool fixed, TransformState&, bool* wasFixed = 0) const;

  • trunk/Source/WebCore/svg/SVGSVGElement.cpp

    r92423 r93440  
    493493            // Respect scroll offset.
    494494            if (FrameView* view = document()->view()) {
    495                 IntSize scrollOffset = view->scrollOffset();
     495                LayoutSize scrollOffset = view->scrollOffset();
    496496                transform.translate(-scrollOffset.width(), -scrollOffset.height());
    497497            }

  • trunk/Source/WebCore/svg/SVGSVGElement.h

    r91850 r93440  
    6464    FloatRect viewport() const;
    6565
    66     void setContainerSize(const IntSize& containerSize) { m_containerSize = containerSize; m_hasSetContainerSize = true; }
    67     IntSize containerSize() const { return m_containerSize; }
     66    void setContainerSize(const LayoutSize& containerSize) { m_containerSize = containerSize; m_hasSetContainerSize = true; }
     67    LayoutSize containerSize() const { return m_containerSize; }
    6868    bool hasSetContainerSize() const { return m_hasSetContainerSize; }
    6969    int relativeWidthValue() const;
    … …  
    182182    FloatPoint m_translation;
    183183    mutable OwnPtr<SVGViewSpec> m_viewSpec;
    184     IntSize m_containerSize;
     184    LayoutSize m_containerSize;
    185185    bool m_hasSetContainerSize;
    186186};

  • trunk/Source/WebCore/svg/graphics/SVGImage.cpp

    r91496 r93440  
    7373    }
    7474
    75     virtual void invalidateContentsAndWindow(const IntRect& r, bool)
     75    virtual void invalidateContentsAndWindow(const LayoutRect& r, bool)
    7676    {
    7777        if (m_image && m_image->imageObserver())
    … …  
    102102}
    103103
    104 void SVGImage::setContainerSize(const IntSize& containerSize)
     104void SVGImage::setContainerSize(const LayoutSize& containerSize)
    105105{
    106106    if (containerSize.isEmpty())

  • trunk/Source/WebCore/svg/graphics/SVGImage.h

    r74782 r93440  
    3131
    3232#include "Image.h"
     33#include "LayoutTypes.h"
    3334
    3435namespace WebCore {
    … …  
    4950    virtual String filenameExtension() const;
    5051
    51     virtual void setContainerSize(const IntSize&);
     52    virtual void setContainerSize(const LayoutSize&);
    5253    virtual bool usesContainerSize() const;
    5354    virtual bool hasRelativeWidth() const;
Note: See TracChangeset for help on using the changeset viewer.