fix svg bugs

fix svg make; (feng's recent webkit merge included a
file that no longer exists)
draw stroked paths
add support for image/svg+xml

2 files changed, 2 insertions, 11 deletions

diff --git a/WebCore/Android.mk b/WebCore/Android.mk
index af0a31c..50b9a91 100644
--- a/WebCore/Android.mk
+++ b/WebCore/Android.mk
@@ -112,7 +112,6 @@
 #	dom/Touch*.cpp \
 #	platform/graphics/skia/NativeImageSkia.cpp \
 #	platform/image-decoders/skia/GIFImage*.cpp \
-#	svg/graphics/skia/SVGResourceMaskerSkia.cpp \
 
 # The remainder of the file is read by tools/webkitsync/diff.cpp
 # If you edit it, keep it in alphabetical order
@@ -1083,9 +1082,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	svg/graphics/filters/SVGFETile.cpp \
 	svg/graphics/filters/SVGFETurbulence.cpp \
 	svg/graphics/filters/SVGFilterEffect.cpp \
-	svg/graphics/filters/SVGLightSource.cpp \
-	\
-	svg/graphics/skia/SVGResourceMaskerSkia.cpp
+	svg/graphics/filters/SVGLightSource.cpp
 endif
 
 LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
diff --git a/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp b/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp
index 7571926..8800699 100644
--- a/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp
+++ b/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp
@@ -1100,12 +1100,6 @@ void GraphicsContext::addPath(const Path& p)
     m_data->addPath(*p.platformPath());
 }
 
-void GraphicsContext::drawPath()
-{
-    this->fillPath();
-    this->strokePath();
-}
-
 void GraphicsContext::fillPath()
 {
     SkPath* path = m_data->getPath();
@@ -1134,7 +1128,7 @@ void GraphicsContext::fillPath()
 void GraphicsContext::strokePath()
 {
     const SkPath* path = m_data->getPath();
-    if (paintingDisabled() || !path || strokeStyle() == NoStroke)
+    if (paintingDisabled() || !path)
         return;
     
     SkPaint paint;