[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
eric at webkit.org
eric at webkit.org
Thu Apr 8 00:44:43 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 0c270c60ef35aa2b2235e0bb5e788ec813456641
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Dec 21 18:58:24 2009 +0000
2009-12-21 Andreas Kling <andreas.kling at nokia.com>
Reviewed by Darin Adler.
Test that dragging an SVG as <img> doesn't crash the browser.
Note that this only works in debug mode as it's a failing assert.
https://bugs.webkit.org/show_bug.cgi?id=32511
* fast/images/drag-svg-as-image.html: Added.
* platform/qt/Skipped: fast/images/drag-svg-as-image.html added.
2009-12-21 Andreas Kling <andreas.kling at nokia.com>
Reviewed by Darin Adler.
Fix assertion failure when dragging an SVG image.
https://bugs.webkit.org/show_bug.cgi?id=32511
Test: fast/images/drag-svg-as-image.html
* svg/graphics/SVGImage.cpp:
(WebCore::SVGImage::filenameExtension): Return "svg"
* svg/graphics/SVGImage.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52448 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index a7c0cc3..43f5dda 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2009-12-21 Andreas Kling <andreas.kling at nokia.com>
+
+ Reviewed by Darin Adler.
+
+ Test that dragging an SVG as <img> doesn't crash the browser.
+ Note that this only works in debug mode as it's a failing assert.
+
+ https://bugs.webkit.org/show_bug.cgi?id=32511
+
+ * fast/images/drag-svg-as-image.html: Added.
+ * platform/qt/Skipped: fast/images/drag-svg-as-image.html added.
+
2009-12-21 Nate Chapin <japhet at chromium.org>
Reviewed by Darin Adler.
diff --git a/LayoutTests/fast/images/drag-svg-as-image-expected.txt b/LayoutTests/fast/images/drag-svg-as-image-expected.txt
new file mode 100644
index 0000000..4ffe4eb
--- /dev/null
+++ b/LayoutTests/fast/images/drag-svg-as-image-expected.txt
@@ -0,0 +1,2 @@
+
+This test checks that dragging an SVG image doesn't crash the browser.
diff --git a/LayoutTests/fast/images/drag-svg-as-image.html b/LayoutTests/fast/images/drag-svg-as-image.html
new file mode 100644
index 0000000..9d47749
--- /dev/null
+++ b/LayoutTests/fast/images/drag-svg-as-image.html
@@ -0,0 +1,30 @@
+<html>
+<head>
+<script type="text/javascript">
+function test() {
+
+ if (!window.layoutTestController || !window.eventSender)
+ return;
+
+ layoutTestController.dumpAsText();
+
+ var dragMe = document.getElementById("dragMe");
+ var startX = dragMe.offsetLeft + (dragMe.offsetWidth / 2);
+ var startY = dragMe.offsetTop + (dragMe.offsetTop / 2);
+ var endX = startX + 100;
+ var endY = startY + 100;
+
+ eventSender.mouseMoveTo(startX, startY);
+ eventSender.mouseDown();
+ eventSender.mouseMoveTo(endX, endY);
+ eventSender.mouseUp();
+}
+</script>
+</head>
+<body onload="test()">
+ <img id="dragMe" src='resources/green-fixed-size-rect.svg'>
+ <div>
+ This test checks that dragging an SVG image doesn't crash the browser.
+ </div>
+</body>
+</html>
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index b3e35e6..c134939 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -249,6 +249,9 @@ fast/forms/input-file-re-render.html
fast/events/drag-file-crash.html
http/tests/security/clipboard/clipboard-file-access.html
+# Missing drag & drop functionality in DRT
+fast/images/drag-svg-as-image.html
+
# ------- missing eventSender.zoomPageIn
fast/events/clientXY-in-zoom-and-scroll.html
fast/dom/Document/CaretRangeFromPoint/caretRangeFromPoint-in-zoom-and-scroll.html
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index cb0d7fc..a114362 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2009-12-21 Andreas Kling <andreas.kling at nokia.com>
+
+ Reviewed by Darin Adler.
+
+ Fix assertion failure when dragging an SVG image.
+ https://bugs.webkit.org/show_bug.cgi?id=32511
+
+ Test: fast/images/drag-svg-as-image.html
+
+ * svg/graphics/SVGImage.cpp:
+ (WebCore::SVGImage::filenameExtension): Return "svg"
+ * svg/graphics/SVGImage.h:
+
2009-12-17 Philippe Normand <pnormand at igalia.com>
Reviewed by Xan Lopez.
diff --git a/WebCore/svg/graphics/SVGImage.cpp b/WebCore/svg/graphics/SVGImage.cpp
index f9c5277..050dcca 100644
--- a/WebCore/svg/graphics/SVGImage.cpp
+++ b/WebCore/svg/graphics/SVGImage.cpp
@@ -268,6 +268,11 @@ bool SVGImage::dataChanged(bool allDataReceived)
return m_page;
}
+String SVGImage::filenameExtension() const
+{
+ return "svg";
+}
+
}
#endif // ENABLE(SVG)
diff --git a/WebCore/svg/graphics/SVGImage.h b/WebCore/svg/graphics/SVGImage.h
index 10f39ba..a0414fe 100644
--- a/WebCore/svg/graphics/SVGImage.h
+++ b/WebCore/svg/graphics/SVGImage.h
@@ -47,6 +47,8 @@ namespace WebCore {
private:
virtual ~SVGImage();
+ virtual String filenameExtension() const;
+
virtual void setContainerSize(const IntSize&);
virtual bool usesContainerSize() const;
virtual bool hasRelativeWidth() const;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list