[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756
eric at webkit.org
eric at webkit.org
Fri Feb 26 22:22:01 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit b9ac15f13587095c6d0a321a85ea30a68f9834d7
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Feb 17 03:54:23 2010 +0000
2010-02-16 Yael Aharon <yael.aharon at nokia.com>
Reviewed by Nikolas Zimmermann.
SVG not rendered as background-image from data URI
https://bugs.webkit.org/show_bug.cgi?id=33630
* platform/mac/svg/css/background-image-svg-expected.checksum: Added.
* platform/mac/svg/css/background-image-svg-expected.png: Added.
* platform/qt/svg/css/background-image-svg-expected.checksum: Added.
* platform/qt/svg/css/background-image-svg-expected.png: Added.
* svg/css/background-image-svg.html: Added.
* svg/css/background-image-svg-expected.txt: Added.
2010-02-16 Yael Aharon <yael.aharon at nokia.com>
Reviewed by Nikolas Zimmermann.
SVG not rendered as background-image from data URI
https://bugs.webkit.org/show_bug.cgi?id=33630
When the background image is an SVG image, and it is smaller than the area
it is supposed to fill, we were using renderSubTreeToImage to draw it.
That call was not going through all the drawing phases, and so the SVG itself
would not be drawn.
Test: svg/css/background-image-svg.html
* svg/graphics/SVGImage.cpp:
(WebCore::SVGImage::nativeImageForCurrentFrame):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54865 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 71b7d73..5fdbb4d 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2010-02-16 Yael Aharon <yael.aharon at nokia.com>
+
+ Reviewed by Nikolas Zimmermann.
+
+ SVG not rendered as background-image from data URI
+ https://bugs.webkit.org/show_bug.cgi?id=33630
+
+ * platform/mac/svg/css/background-image-svg-expected.checksum: Added.
+ * platform/mac/svg/css/background-image-svg-expected.png: Added.
+ * platform/qt/svg/css/background-image-svg-expected.checksum: Added.
+ * platform/qt/svg/css/background-image-svg-expected.png: Added.
+ * svg/css/background-image-svg.html: Added.
+ * svg/css/background-image-svg-expected.txt: Added.
+
2010-02-16 Nikolas Zimmermann <nzimmermann at rim.com>
Not reviewed. Correct typo in test name in Skipped list. Should turn SL slave green again.
diff --git a/LayoutTests/platform/mac/svg/css/background-image-svg-expected.checksum b/LayoutTests/platform/mac/svg/css/background-image-svg-expected.checksum
new file mode 100644
index 0000000..4fed9e5
--- /dev/null
+++ b/LayoutTests/platform/mac/svg/css/background-image-svg-expected.checksum
@@ -0,0 +1 @@
+d073058fe738c2cc0115aeba1b98e470
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/svg/css/background-image-svg-expected.png b/LayoutTests/platform/mac/svg/css/background-image-svg-expected.png
new file mode 100644
index 0000000..28176d8
Binary files /dev/null and b/LayoutTests/platform/mac/svg/css/background-image-svg-expected.png differ
diff --git a/LayoutTests/platform/qt/svg/css/background-image-svg-expected.checksum b/LayoutTests/platform/qt/svg/css/background-image-svg-expected.checksum
new file mode 100644
index 0000000..f3544e8
--- /dev/null
+++ b/LayoutTests/platform/qt/svg/css/background-image-svg-expected.checksum
@@ -0,0 +1 @@
+0b989d1c1e7ecb7772d9776e64fac369
\ No newline at end of file
diff --git a/LayoutTests/platform/qt/svg/css/background-image-svg-expected.png b/LayoutTests/platform/qt/svg/css/background-image-svg-expected.png
new file mode 100644
index 0000000..7352c36
Binary files /dev/null and b/LayoutTests/platform/qt/svg/css/background-image-svg-expected.png differ
diff --git a/LayoutTests/svg/css/background-image-svg-expected.txt b/LayoutTests/svg/css/background-image-svg-expected.txt
new file mode 100644
index 0000000..f02cfd3
--- /dev/null
+++ b/LayoutTests/svg/css/background-image-svg-expected.txt
@@ -0,0 +1,7 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x126
+ RenderBlock {HTML} at (0,0) size 800x126
+ RenderBody {BODY} at (8,8) size 784x110
+ RenderBlock {DIV} at (0,0) size 10x10 [bgcolor=#EEEEEE]
+ RenderBlock {DIV} at (0,10) size 100x100 [bgcolor=#EEEEEE]
diff --git a/LayoutTests/svg/css/background-image-svg.html b/LayoutTests/svg/css/background-image-svg.html
new file mode 100644
index 0000000..90dae83
--- /dev/null
+++ b/LayoutTests/svg/css/background-image-svg.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+
+<html>
+<head>
+<style type="text/css" media="screen">
+div.small{
+width: 10px;
+height: 10px;
+background-color: #EEE;
+background-image: url('data:image/svg+xml;charset=utf-8;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZlcnNpb249IjEuMSIgd2lkdGg9IjIwcHgiIGhlaWdodD0iMTVweCI+PHBvbHlnb24gcG9pbnRzPSIwLDE1IDEwLDAgMjAsMTUiIGZpbGw9IiMwMDAwMDAiLz48L3N2Zz4K');
+}
+div.big{
+width: 100px;
+height: 100px;
+background-color: #EEE;
+background-image: url('data:image/svg+xml;charset=utf-8;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZlcnNpb249IjEuMSIgd2lkdGg9IjIwcHgiIGhlaWdodD0iMTVweCI+PHBvbHlnb24gcG9pbnRzPSIwLDE1IDEwLDAgMjAsMTUiIGZpbGw9IiMwMDAwMDAiLz48L3N2Zz4K');
+}
+</style>
+</head>
+
+<body>
+<div class="small"></div>
+<div class="big"></div>
+</body>
+</html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 22ee287..217f626 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2010-02-16 Yael Aharon <yael.aharon at nokia.com>
+
+ Reviewed by Nikolas Zimmermann.
+
+ SVG not rendered as background-image from data URI
+ https://bugs.webkit.org/show_bug.cgi?id=33630
+
+ When the background image is an SVG image, and it is smaller than the area
+ it is supposed to fill, we were using renderSubTreeToImage to draw it.
+ That call was not going through all the drawing phases, and so the SVG itself
+ would not be drawn.
+
+ Test: svg/css/background-image-svg.html
+
+ * svg/graphics/SVGImage.cpp:
+ (WebCore::SVGImage::nativeImageForCurrentFrame):
+
2010-02-16 Bryan Yeung <bryeung at chromium.org>
Reviewed by Nikolas Zimmermann.
diff --git a/WebCore/svg/graphics/SVGImage.cpp b/WebCore/svg/graphics/SVGImage.cpp
index 348df4f..febfce8 100644
--- a/WebCore/svg/graphics/SVGImage.cpp
+++ b/WebCore/svg/graphics/SVGImage.cpp
@@ -215,7 +215,7 @@ NativeImagePtr SVGImage::nativeImageForCurrentFrame()
m_frameCache = ImageBuffer::create(size());
if (!m_frameCache) // failed to allocate image
return 0;
- renderSubtreeToImage(m_frameCache.get(), m_page->mainFrame()->contentRenderer());
+ draw(m_frameCache->context(), rect(), rect(), DeviceColorSpace, CompositeSourceOver);
}
return m_frameCache->image()->nativeImageForCurrentFrame();
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list