diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-04-16 07:26:45 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-04-16 07:26:45 -0700 |
| commit | 826212099865d38f65f224768c3f5ee68b4b6661 (patch) | |
| tree | dbf37a2ce51aef5da048a7b81b771c202df2881a | |
| parent | 4ad220c730dab8595473783d4c3b01642cbc629f (diff) | |
| parent | 781eb1e80ed736b825aec967c3cc711f01516200 (diff) | |
| download | external_webkit-826212099865d38f65f224768c3f5ee68b4b6661.zip external_webkit-826212099865d38f65f224768c3f5ee68b4b6661.tar.gz external_webkit-826212099865d38f65f224768c3f5ee68b4b6661.tar.bz2 | |
Merge change 217
* changes:
fix svg linear gradients and embed
| -rw-r--r-- | WebCore/platform/graphics/android/GradientAndroid.cpp | 3 | ||||
| -rw-r--r-- | WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/WebCore/platform/graphics/android/GradientAndroid.cpp b/WebCore/platform/graphics/android/GradientAndroid.cpp index 718c49b..c76b08d 100644 --- a/WebCore/platform/graphics/android/GradientAndroid.cpp +++ b/WebCore/platform/graphics/android/GradientAndroid.cpp @@ -104,6 +104,9 @@ SkShader* Gradient::getShader(SkShader::TileMode mode) m_gradient->m_shader->safeUnref(); m_gradient->m_shader = s; m_gradient->m_tileMode = mode; + SkMatrix matrix = m_gradientSpaceTransformation; + s->setLocalMatrix(matrix); + return s; } diff --git a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp index ffbff0f..795d18d 100644 --- a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp +++ b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp @@ -973,10 +973,12 @@ ObjectContentType FrameLoaderClientAndroid::objectContentType(const KURL& url, } return ObjectContentFrame; } - if (equalIgnoringCase(mimeType, "image/svg+xml") || - equalIgnoringCase(mimeType, "text/html") || + if (equalIgnoringCase(mimeType, "text/html") || equalIgnoringCase(mimeType, "text/xml") || equalIgnoringCase(mimeType, "text/") || +#if ENABLE(SVG) + equalIgnoringCase(mimeType, "image/svg+xml") || +#endif equalIgnoringCase(mimeType, "application/xml") || equalIgnoringCase(mimeType, "application/xhtml+xml") || equalIgnoringCase(mimeType, "application/x-javascript")) |