summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-20 05:58:06 +0000
committerojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-20 05:58:06 +0000
commit305d8c7eab56ac69d8451b47523c9e0bbcdfd8fa (patch)
treefcb15e7360d74c5fd61a44f4206ad8f84328cad2 /webkit
parent417fe352d821a355ef0c48178e10b3f84f3fb320 (diff)
downloadchromium_src-305d8c7eab56ac69d8451b47523c9e0bbcdfd8fa.zip
chromium_src-305d8c7eab56ac69d8451b47523c9e0bbcdfd8fa.tar.gz
chromium_src-305d8c7eab56ac69d8451b47523c9e0bbcdfd8fa.tar.bz2
Remove files that we no longer need after the last merge.
Mac build doesn't need to be updated. The CG equivalent files are already deleted. Review URL: http://codereview.chromium.org/11315 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5762 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/SConscript.port1
-rw-r--r--webkit/build/port/port.vcproj4
-rw-r--r--webkit/port/platform/graphics/svg/SVGPaintServerSolidSkia.cpp85
-rw-r--r--webkit/port/platform/graphics/svg/SVGResourceClipperSkia.cpp79
4 files changed, 0 insertions, 169 deletions
diff --git a/webkit/SConscript.port b/webkit/SConscript.port
index 9b82339..ac4f785 100644
--- a/webkit/SConscript.port
+++ b/webkit/SConscript.port
@@ -95,7 +95,6 @@ input_files = [
'$PORT_DIR/platform/graphics/svg/SVGPaintServerGradientSkia.cpp',
'$PORT_DIR/platform/graphics/svg/SVGPaintServerPatternSkia.cpp',
'$PORT_DIR/platform/graphics/svg/SVGPaintServerSkia.cpp',
- '$PORT_DIR/platform/graphics/svg/SVGPaintServerSolidSkia.cpp',
'$PORT_DIR/platform/graphics/svg/SVGResourceFilterSkia.cpp',
'$PORT_DIR/platform/graphics/svg/SVGResourceMaskerSkia.cpp',
diff --git a/webkit/build/port/port.vcproj b/webkit/build/port/port.vcproj
index fad9723..0a042f0 100644
--- a/webkit/build/port/port.vcproj
+++ b/webkit/build/port/port.vcproj
@@ -1030,10 +1030,6 @@
>
</File>
<File
- RelativePath="..\..\port\platform\graphics\svg\SVGPaintServerSolidSkia.cpp"
- >
- </File>
- <File
RelativePath="..\..\port\platform\graphics\svg\SVGResourceFilterSkia.cpp"
>
</File>
diff --git a/webkit/port/platform/graphics/svg/SVGPaintServerSolidSkia.cpp b/webkit/port/platform/graphics/svg/SVGPaintServerSolidSkia.cpp
deleted file mode 100644
index 82e0cd6..0000000
--- a/webkit/port/platform/graphics/svg/SVGPaintServerSolidSkia.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright 2008, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-// * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-// * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include "config.h"
-
-#if ENABLE(SVG)
-#include "SVGPaintServerSolid.h"
-
-#include "GraphicsContext.h"
-#include "RenderPath.h"
-#include "SkiaSupport.h"
-
-#include "SkiaUtils.h"
-
-namespace WebCore {
-
-// TODO(jhaas): probably there's already an implementation of this somewhere; find it
- inline int FloatAlphaToInt(float alpha) { return std::min(0xFF, std::max(0, static_cast<int>(alpha * 0xFF))); }
-
-bool SVGPaintServerSolid::setup(GraphicsContext*& context, const RenderObject* object, SVGPaintTargetType type, bool isPaintingText) const
-{
- const RenderStyle* style = object ? object->style() : NULL;
- const SVGRenderStyle* svgStyle = style ? style->svgStyle() : NULL;
-
- int red = color().red();
- int green = color().green();
- int blue = color().blue();
- int alpha = color().alpha();
-
- if ((type & ApplyToFillTargetType) && (!svgStyle || svgStyle->hasFill())) {
- if (svgStyle) {
- alpha = FloatAlphaToInt(svgStyle->fillOpacity());
- context->setFillRule(svgStyle->fillRule());
- }
-
- if (isPaintingText)
- context->setTextDrawingMode(cTextFill);
-
- context->setFillColor(SkColorSetARGB(alpha, red, green, blue));
- }
-
- if ((type & ApplyToStrokeTargetType) && (!svgStyle || svgStyle->hasStroke())) {
- if (svgStyle) {
- alpha = FloatAlphaToInt(svgStyle->strokeOpacity());
- context->setStrokeColor(SkColorSetARGB(alpha, red, green, blue));
- }
-
- if (isPaintingText)
- context->setTextDrawingMode(cTextStroke);
-
- applyStrokeStyleToContext(context, style, object);
- }
-
- return true;
-}
-
-} // namespace WebCore
-
-#endif
diff --git a/webkit/port/platform/graphics/svg/SVGResourceClipperSkia.cpp b/webkit/port/platform/graphics/svg/SVGResourceClipperSkia.cpp
deleted file mode 100644
index 1bf7ce8..0000000
--- a/webkit/port/platform/graphics/svg/SVGResourceClipperSkia.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright 2008, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-// * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-// * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include "config.h"
-
-#if ENABLE(SVG)
-#include "SVGResourceClipper.h"
-#include "AffineTransform.h"
-#include "GraphicsContext.h"
-
-#include "SkPath.h"
-
-namespace WebCore {
-
-void SVGResourceClipper::applyClip(GraphicsContext* context, const FloatRect& boundingBox) const
-{
- Vector<ClipData> data = m_clipData.clipData();
- unsigned int count = data.size();
- if (!count)
- return;
-
- static Path clipPath;
- clipPath.platformPath()->reset();
-
- for (unsigned int x = 0; x < count; x++) {
- Path path = data[x].path;
-
- if (path.isEmpty())
- continue;
- path.closeSubpath();
-
- if (data[x].bboxUnits) {
- // Make use of the clipping units
- AffineTransform transform;
- transform.translate(boundingBox.x(), boundingBox.y());
- transform.scale(boundingBox.width(), boundingBox.height());
- path.transform(transform);
- }
-
- SkPath* platformPath = path.platformPath();
-
- clipPath.platformPath()->addPath(*platformPath);
- }
-
- //TODO(jhaas): this currently does not respect clipping path
- //winding rules (even-odd or nonzero)
-
- context->clip(clipPath);
-}
-
-} // namespace WebCore
-
-#endif