[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
krit at webkit.org
krit at webkit.org
Wed Dec 22 14:47:27 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 9ecb4f38dfe3bf419114781243bed0efa8e2cba1
Author: krit at webkit.org <krit at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Oct 20 09:24:10 2010 +0000
2010-10-20 Dirk Schulze <krit at webkit.org>
Reviewed by Andreas Kling.
Remove left over code after moving Cairo port to ShadowContext
https://bugs.webkit.org/show_bug.cgi?id=47929
ImageBufferFilter is not needed anymore, since Cairo is using ShadowContext now.
Made kernelPosition() in FEGaussianBlur a inline function instead of a static function.
* CMakeLists.txt:
* GNUmakefile.am:
* WebCore.gypi:
* WebCore.vcproj/WebCore.vcproj:
* platform/graphics/filters/FEGaussianBlur.cpp:
(WebCore::kernelPosition):
* platform/graphics/filters/FEGaussianBlur.h:
* platform/graphics/filters/ImageBufferFilter.cpp: Removed.
* platform/graphics/filters/ImageBufferFilter.h: Removed.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70140 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/CMakeLists.txt b/WebCore/CMakeLists.txt
index 39aaf2b..42e344a 100644
--- a/WebCore/CMakeLists.txt
+++ b/WebCore/CMakeLists.txt
@@ -1317,7 +1317,6 @@ SET(WebCore_SOURCES
platform/graphics/filters/FETile.cpp
platform/graphics/filters/FETurbulence.cpp
platform/graphics/filters/FilterEffect.cpp
- platform/graphics/filters/ImageBufferFilter.cpp
platform/graphics/filters/LightSource.cpp
platform/graphics/filters/SourceAlpha.cpp
platform/graphics/filters/SourceGraphic.cpp
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 88caf25..d2bdefc 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,23 @@
+2010-10-20 Dirk Schulze <krit at webkit.org>
+
+ Reviewed by Andreas Kling.
+
+ Remove left over code after moving Cairo port to ShadowContext
+ https://bugs.webkit.org/show_bug.cgi?id=47929
+
+ ImageBufferFilter is not needed anymore, since Cairo is using ShadowContext now.
+ Made kernelPosition() in FEGaussianBlur a inline function instead of a static function.
+
+ * CMakeLists.txt:
+ * GNUmakefile.am:
+ * WebCore.gypi:
+ * WebCore.vcproj/WebCore.vcproj:
+ * platform/graphics/filters/FEGaussianBlur.cpp:
+ (WebCore::kernelPosition):
+ * platform/graphics/filters/FEGaussianBlur.h:
+ * platform/graphics/filters/ImageBufferFilter.cpp: Removed.
+ * platform/graphics/filters/ImageBufferFilter.h: Removed.
+
2010-10-20 Nikolas Zimmermann <nzimmermann at rim.com>
Not reviewed.
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index a6cb06b..b057051 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -2225,8 +2225,6 @@ webcore_sources += \
WebCore/platform/graphics/filters/FilterEffect.cpp \
WebCore/platform/graphics/filters/FilterEffect.h \
WebCore/platform/graphics/filters/Filter.h \
- WebCore/platform/graphics/filters/ImageBufferFilter.cpp \
- WebCore/platform/graphics/filters/ImageBufferFilter.h \
WebCore/platform/graphics/filters/LightSource.cpp \
WebCore/platform/graphics/filters/LightSource.h \
WebCore/platform/graphics/filters/PointLightSource.h \
diff --git a/WebCore/WebCore.gypi b/WebCore/WebCore.gypi
index 48e0ed2..166c4d1 100644
--- a/WebCore/WebCore.gypi
+++ b/WebCore/WebCore.gypi
@@ -2496,8 +2496,6 @@
'platform/graphics/filters/Filter.h',
'platform/graphics/filters/FilterEffect.cpp',
'platform/graphics/filters/FilterEffect.h',
- 'platform/graphics/filters/ImageBufferFilter.cpp',
- 'platform/graphics/filters/ImageBufferFilter.h',
'platform/graphics/filters/SourceAlpha.cpp',
'platform/graphics/filters/SourceAlpha.h',
'platform/graphics/filters/SourceGraphic.cpp',
diff --git a/WebCore/WebCore.vcproj/WebCore.vcproj b/WebCore/WebCore.vcproj/WebCore.vcproj
index ebd9296..0642a0b 100644
--- a/WebCore/WebCore.vcproj/WebCore.vcproj
+++ b/WebCore/WebCore.vcproj/WebCore.vcproj
@@ -27425,14 +27425,6 @@
>
</File>
<File
- RelativePath="..\platform\graphics\filters\ImageBufferFilter.cpp"
- >
- </File>
- <File
- RelativePath="..\platform\graphics\filters\ImageBufferFilter.h"
- >
- </File>
- <File
RelativePath="..\platform\graphics\filters\LightSource.cpp"
>
</File>
diff --git a/WebCore/platform/graphics/filters/FEGaussianBlur.cpp b/WebCore/platform/graphics/filters/FEGaussianBlur.cpp
index b3264dd..1f36ba7 100644
--- a/WebCore/platform/graphics/filters/FEGaussianBlur.cpp
+++ b/WebCore/platform/graphics/filters/FEGaussianBlur.cpp
@@ -99,7 +99,7 @@ static void boxBlur(CanvasPixelArray*& srcPixelArray, CanvasPixelArray*& dstPixe
}
}
-void FEGaussianBlur::kernelPosition(int boxBlur, unsigned& std, int& dLeft, int& dRight)
+inline void kernelPosition(int boxBlur, unsigned& std, int& dLeft, int& dRight)
{
// check http://www.w3.org/TR/SVG/filters.html#feGaussianBlurElement for details
switch (boxBlur) {
diff --git a/WebCore/platform/graphics/filters/FEGaussianBlur.h b/WebCore/platform/graphics/filters/FEGaussianBlur.h
index 0f72543..50fc610 100644
--- a/WebCore/platform/graphics/filters/FEGaussianBlur.h
+++ b/WebCore/platform/graphics/filters/FEGaussianBlur.h
@@ -49,7 +49,6 @@ public:
private:
FEGaussianBlur(float, float);
- static void kernelPosition(int boxBlur, unsigned& std, int& dLeft, int& dRight);
float m_stdX;
float m_stdY;
diff --git a/WebCore/platform/graphics/filters/ImageBufferFilter.cpp b/WebCore/platform/graphics/filters/ImageBufferFilter.cpp
deleted file mode 100644
index 0237977..0000000
--- a/WebCore/platform/graphics/filters/ImageBufferFilter.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2009 Dirk Schulze <krit at webkit.org>
- * Copyright (C) 2009 Brent Fulgham <bfulgham at webkit.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "config.h"
-
-#if ENABLE(FILTERS)
-#include "ImageBufferFilter.h"
-
-#include "FloatSize.h"
-
-namespace WebCore {
-
-ImageBufferFilter::ImageBufferFilter(const FloatRect& sourceImageRect)
- : Filter()
- , m_sourceImageRect(sourceImageRect)
-{
- setFilterResolution(FloatSize(1, 1));
-}
-
-PassRefPtr<ImageBufferFilter> ImageBufferFilter::create(const FloatRect& sourceImageRect)
-{
- return adoptRef(new ImageBufferFilter(sourceImageRect));
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(FILTERS)
diff --git a/WebCore/platform/graphics/filters/ImageBufferFilter.h b/WebCore/platform/graphics/filters/ImageBufferFilter.h
deleted file mode 100644
index 5a37214..0000000
--- a/WebCore/platform/graphics/filters/ImageBufferFilter.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2009 Dirk Schulze <krit at webkit.org>
- * Copyright (C) 2009 Brent Fulgham <bfulgham at webkit.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef ImageBufferFilter_h
-#define ImageBufferFilter_h
-
-#if ENABLE(FILTERS)
-#include "Filter.h"
-#include "FilterEffect.h"
-#include "FloatRect.h"
-#include "FloatSize.h"
-
-#include <wtf/PassRefPtr.h>
-#include <wtf/RefCounted.h>
-#include <wtf/RefPtr.h>
-
-namespace WebCore {
-
-class ImageBufferFilter : public Filter {
-public:
- static PassRefPtr<ImageBufferFilter> create(const FloatRect&);
-
- virtual FloatRect filterRegion() const { return m_sourceImageRect; }
- virtual FloatRect sourceImageRect() const { return m_sourceImageRect; }
-
- // SVG specific
- virtual bool effectBoundingBoxMode() const { return false; }
-
- virtual FloatSize maxImageSize() const { return FloatSize(); }
- virtual void calculateEffectSubRegion(FilterEffect*) { }
-
-private:
- ImageBufferFilter(const FloatRect&);
-
- FloatRect m_sourceImageRect;
-};
-
-} // namespace WebCore
-
-#endif // ENABLE(FILTERS)
-
-#endif // ImageBufferFilter_h
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list