Changeset 44810 in webkit

Timestamp:

Jun 18, 2009 11:53:51 AM (15 years ago)

Author:

krit@webkit.org

Message:

2009-06-18 Dirk Schulze <​krit@webkit.org>

Reviewed by Oliver Hunt.

Share code between filterEffects
​https://bugs.webkit.org/show_bug.cgi?id=26479

Share more code of filter effects. The imageBuffer creation can move to
FilterEffect ant every effect asks for the GraphicsContext. Move the
drawingRect calculation to FilterEffect.

• platform/graphics/filters/FilterEffect.cpp: (WebCore::FilterEffect::calculateDrawingRect): (WebCore::FilterEffect::getEffectContext):
• platform/graphics/filters/FilterEffect.h:
• platform/graphics/filters/SourceGraphic.cpp: (WebCore::SourceGraphic::apply):
• svg/graphics/filters/SVGFEFlood.cpp: (WebCore::FEFlood::apply):
• svg/graphics/filters/SVGFEOffset.cpp: (WebCore::FEOffset::apply):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/filters/FilterEffect.cpp (modified) (1 diff)
• platform/graphics/filters/FilterEffect.h (modified) (2 diffs)
• platform/graphics/filters/SourceGraphic.cpp (modified) (1 diff)
• svg/graphics/filters/SVGFEFlood.cpp (modified) (1 diff)
• svg/graphics/filters/SVGFEOffset.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-06-18  Dirk Schulze  <krit@webkit.org>
+
+        Reviewed by Oliver Hunt.
+
+        Share code between filterEffects
+        [https://bugs.webkit.org/show_bug.cgi?id=26479]
+
+        Share more code of filter effects. The imageBuffer creation can move to
+        FilterEffect ant every effect asks for the GraphicsContext. Move the
+        drawingRect calculation to FilterEffect.
+
+        * platform/graphics/filters/FilterEffect.cpp:
+        (WebCore::FilterEffect::calculateDrawingRect):
+        (WebCore::FilterEffect::getEffectContext):
+        * platform/graphics/filters/FilterEffect.h:
+        * platform/graphics/filters/SourceGraphic.cpp:
+        (WebCore::SourceGraphic::apply):
+        * svg/graphics/filters/SVGFEFlood.cpp:
+        (WebCore::FEFlood::apply):
+        * svg/graphics/filters/SVGFEOffset.cpp:
+        (WebCore::FEOffset::apply):
+
 2009-06-18  Simon Fraser  <simon.fraser@apple.com>
 

trunk/WebCore/platform/graphics/filters/FilterEffect.cpp

@@ -60 +60 @@
 }
 
+FloatRect FilterEffect::calculateDrawingRect(const FloatRect& srcRect)
+{
+    FloatPoint startPoint = FloatPoint(srcRect.x() - subRegion().x(), srcRect.y() - subRegion().y());
+    FloatRect drawingRect = FloatRect(startPoint, srcRect.size());
+    return drawingRect;
+}
+
+GraphicsContext* FilterEffect::getEffectContext()
+{
+    IntRect bufferRect = enclosingIntRect(subRegion());
+    m_effectBuffer = ImageBuffer::create(bufferRect.size(), false);
+    return m_effectBuffer->context();
+}
+
 TextStream& FilterEffect::externalRepresentation(TextStream& ts) const
 {

trunk/WebCore/platform/graphics/filters/FilterEffect.h

@@ -25 +25 @@
 #include "Filter.h"
 #include "FloatRect.h"
+#include "GraphicsContext.h"
 #include "ImageBuffer.h"
 #include "TextStream.h"
@@ -75 +76 @@
         FloatRect calculateUnionOfChildEffectSubregions(Filter*, FilterEffect*);
 
+        GraphicsContext* getEffectContext();
+        FloatRect calculateDrawingRect(const FloatRect&);
+
         virtual FloatRect uniteChildEffectSubregions(Filter* filter) { return filter->filterRegion(); }
         virtual FloatRect calculateEffectRect(Filter*);

trunk/WebCore/platform/graphics/filters/SourceGraphic.cpp

@@ -55 +55 @@
 void SourceGraphic::apply(Filter* filter)
 {
-    IntRect bufferRect = enclosingIntRect(subRegion());
-    OwnPtr<ImageBuffer> filterGraphic(ImageBuffer::create(bufferRect.size(), false));
-
-    if (!filterGraphic.get())
+    GraphicsContext* filterContext = getEffectContext();
+    if (!filterContext)
         return;
 
-    GraphicsContext* filterContext = filterGraphic->context();
     filterContext->drawImage(filter->sourceImage()->image(), IntPoint());
-
-    setEffectBuffer(filterGraphic.release());
 }
 

trunk/WebCore/svg/graphics/filters/SVGFEFlood.cpp

@@ -67 +67 @@
 void FEFlood::apply(Filter*)
 {
-    IntRect bufferRect = enclosingIntRect(subRegion());
-    OwnPtr<ImageBuffer> filterGraphic(ImageBuffer::create(bufferRect.size(), false));
-
-    if (!filterGraphic)
+    GraphicsContext* filterContext = getEffectContext();
+    if (!filterContext)
         return;
 
     Color color = colorWithOverrideAlpha(floodColor().rgb(), floodOpacity());
-    GraphicsContext* filterContext = filterGraphic->context();
     filterContext->fillRect(FloatRect(FloatPoint(), subRegion().size()), color);
-
-    setEffectBuffer(filterGraphic.release());
 }
 

trunk/WebCore/svg/graphics/filters/SVGFEOffset.cpp

@@ -71 +71 @@
         return;
 
-    IntRect bufferRect = enclosingIntRect(subRegion());
-    OwnPtr<ImageBuffer> filterGraphic(ImageBuffer::create(bufferRect.size(), false));
-
-    if (!filterGraphic)
+    GraphicsContext* filterContext = getEffectContext();
+    if (!filterContext)
         return;
 
@@ -82 +80 @@
                                   m_in->subRegion().height());
 
-    GraphicsContext* filterContext = filterGraphic->context();
     filterContext->drawImage(m_in->resultImage()->image(), dstRect);
-    setEffectBuffer(filterGraphic.release());
 }