Imported WebKit commit 0dc6cd75e1d4836eaffbb520be96fac4847cc9d2 (http://svn.webkit.org/repository/webkit/trunk@131300)

WebKit update which introduces the QtWebKitWidgets module that contains the WK1
widgets based API. (In fact it renames QtWebKit to QtWebKitWidgets while we're
working on completing the entire split as part of
https://bugs.webkit.org/show_bug.cgi?id=99314

1 files changed, 19 insertions, 0 deletions

diff --git a/Source/WebKit/chromium/tests/WebPageNewSerializerTest.cpp b/Source/WebKit/chromium/tests/WebPageNewSerializerTest.cpp
index 3ea4fcf9e..9d4b60acd 100644
--- a/Source/WebKit/chromium/tests/WebPageNewSerializerTest.cpp
+++ b/Source/WebKit/chromium/tests/WebPageNewSerializerTest.cpp
@@ -88,6 +88,7 @@ public:
         , m_xhtmlMimeType(WebString::fromUTF8("application/xhtml+xml"))
         , m_cssMimeType(WebString::fromUTF8("text/css"))
         , m_pngMimeType(WebString::fromUTF8("image/png"))
+        , m_svgMimeType(WebString::fromUTF8("image/svg+xml"))
     {
     }
 
@@ -148,6 +149,7 @@ protected:
     const WebString& xhtmlMimeType() const { return m_xhtmlMimeType; }
     const WebString& cssMimeType() const { return m_cssMimeType; }
     const WebString& pngMimeType() const { return m_pngMimeType; }
+    const WebString& svgMimeType() const { return m_svgMimeType; }
 
     static bool resourceVectorContains(const WebVector<WebPageSerializer::Resource>& resources, const char* url, const char* mimeType)
     {
@@ -167,6 +169,7 @@ private:
     WebString m_xhtmlMimeType;
     WebString m_cssMimeType;
     WebString m_pngMimeType;
+    WebString m_svgMimeType;
     TestWebFrameClient m_webFrameClient;
 };
 
@@ -329,4 +332,20 @@ TEST_F(WebPageNewSerializeTest, FAILS_TestMHTMLEncoding)
     EXPECT_EQ(12, sectionCheckedCount);
 }
 
+// Test that we don't regress https://bugs.webkit.org/show_bug.cgi?id=99105
+TEST_F(WebPageNewSerializeTest, SVGImageDontCrash)
+{
+    WebURL pageUrl = toKURL("http://www.test.com");
+    WebURL imageUrl = toKURL("http://www.test.com/green_rectangle.svg");
+
+    registerMockedURLLoad(pageUrl, WebString::fromUTF8("page_with_svg_image.html"), WebString::fromUTF8("pageserializer/"), htmlMimeType());
+    registerMockedURLLoad(imageUrl, WebString::fromUTF8("green_rectangle.svg"), WebString::fromUTF8("pageserializer/"), svgMimeType());
+
+    loadURLInTopFrame(pageUrl);
+
+    WebCString mhtml = WebPageSerializer::serializeToMHTML(m_webView);
+    // We expect some data to be generated.
+    EXPECT_GT(mhtml.length(), 50U);
+}
+
 }