diff options
| author | Cary Clark <cary@android.com> | 2009-04-15 17:34:20 -0400 |
|---|---|---|
| committer | Cary Clark <cary@android.com> | 2009-04-15 17:34:20 -0400 |
| commit | bb29c0f2f85d4f4bba314b554f572f762c0a412d (patch) | |
| tree | 2fd291a1b40cf71fabbeef7e27d055206064c187 | |
| parent | 467bf1c41ef2c6d84dc533fbc0718c6d97a78582 (diff) | |
| download | external_webkit-bb29c0f2f85d4f4bba314b554f572f762c0a412d.zip external_webkit-bb29c0f2f85d4f4bba314b554f572f762c0a412d.tar.gz external_webkit-bb29c0f2f85d4f4bba314b554f572f762c0a412d.tar.bz2 | |
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
| -rw-r--r-- | WebCore/Android.mk | 5 | ||||
| -rw-r--r-- | WebCore/platform/graphics/android/GraphicsContextAndroid.cpp | 8 | ||||
| -rw-r--r-- | WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp | 3 |
3 files changed, 4 insertions, 12 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; diff --git a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp index 3e821cc..ffbff0f 100644 --- a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp +++ b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp @@ -973,7 +973,8 @@ ObjectContentType FrameLoaderClientAndroid::objectContentType(const KURL& url, } return ObjectContentFrame; } - if (equalIgnoringCase(mimeType, "text/html") || + if (equalIgnoringCase(mimeType, "image/svg+xml") || + equalIgnoringCase(mimeType, "text/html") || equalIgnoringCase(mimeType, "text/xml") || equalIgnoringCase(mimeType, "text/") || equalIgnoringCase(mimeType, "application/xml") || |