Title: [102193] branches/safari-534.53-branch
Diff
Modified: branches/safari-534.53-branch/LayoutTests/ChangeLog (102192 => 102193)
--- branches/safari-534.53-branch/LayoutTests/ChangeLog 2011-12-07 00:45:49 UTC (rev 102192)
+++ branches/safari-534.53-branch/LayoutTests/ChangeLog 2011-12-07 00:51:19 UTC (rev 102193)
@@ -1,5 +1,20 @@
2011-12-06 Lucas Forschler <[email protected]>
+ Merge 95386
+
+ 2011-09-17 David Hyatt <[email protected]>
+
+ https://bugs.webkit.org/show_bug.cgi?id=68307
+
+ Crash in border image cssText. Make sure to null check all the components, since they're all
+ optional now.
+
+ Reviewed by Sam Weinig.
+
+ * fast/borders/border-image-slice-omission.html: Added.
+
+2011-12-06 Lucas Forschler <[email protected]>
+
Merge 95129
2011-09-14 David Hyatt <[email protected]>
Copied: branches/safari-534.53-branch/LayoutTests/fast/borders/border-image-slice-omission-expected.txt (from rev 95386, trunk/LayoutTests/fast/borders/border-image-slice-omission-expected.txt) (0 => 102193)
--- branches/safari-534.53-branch/LayoutTests/fast/borders/border-image-slice-omission-expected.txt (rev 0)
+++ branches/safari-534.53-branch/LayoutTests/fast/borders/border-image-slice-omission-expected.txt 2011-12-07 00:51:19 UTC (rev 102193)
@@ -0,0 +1 @@
+This test passes if it does not crash.
Copied: branches/safari-534.53-branch/LayoutTests/fast/borders/border-image-slice-omission.html (from rev 95386, trunk/LayoutTests/fast/borders/border-image-slice-omission.html) (0 => 102193)
--- branches/safari-534.53-branch/LayoutTests/fast/borders/border-image-slice-omission.html (rev 0)
+++ branches/safari-534.53-branch/LayoutTests/fast/borders/border-image-slice-omission.html 2011-12-07 00:51:19 UTC (rev 102193)
@@ -0,0 +1,17 @@
+<html>
+<head>
+<script>
+if (window.layoutTestController)
+ window.layoutTestController.dumpAsText()
+
+function runTest()
+{
+ document.body.style.borderImage = 'none'
+ document.body.style.cssText
+}
+</script>
+</head>
+<body _onload_="runTest()">
+This test passes if it does not crash.
+</body>
+
Modified: branches/safari-534.53-branch/Source/WebCore/ChangeLog (102192 => 102193)
--- branches/safari-534.53-branch/Source/WebCore/ChangeLog 2011-12-07 00:45:49 UTC (rev 102192)
+++ branches/safari-534.53-branch/Source/WebCore/ChangeLog 2011-12-07 00:51:19 UTC (rev 102193)
@@ -1,5 +1,23 @@
2011-12-06 Lucas Forschler <[email protected]>
+ Merge 95386
+
+ 2011-09-17 David Hyatt <[email protected]>
+
+ https://bugs.webkit.org/show_bug.cgi?id=68307
+
+ Crash in border image cssText. Make sure to null check all the components, since they're all
+ optional now.
+
+ Reviewed by Sam Weinig.
+
+ Added fast/borders/border-image-slice-omission.html
+
+ * css/CSSBorderImageValue.cpp:
+ (WebCore::CSSBorderImageValue::cssText):
+
+2011-12-06 Lucas Forschler <[email protected]>
+
Merge 95244
2011-09-15 Beth Dakin <[email protected]>
Modified: branches/safari-534.53-branch/Source/WebCore/css/CSSBorderImageValue.cpp (102192 => 102193)
--- branches/safari-534.53-branch/Source/WebCore/css/CSSBorderImageValue.cpp 2011-12-07 00:45:49 UTC (rev 102192)
+++ branches/safari-534.53-branch/Source/WebCore/css/CSSBorderImageValue.cpp 2011-12-07 00:51:19 UTC (rev 102193)
@@ -43,11 +43,17 @@
String CSSBorderImageValue::cssText() const
{
// Image first.
- String text(m_image->cssText());
- text += " ";
+ String text;
+
+ if (m_image)
+ text += m_image->cssText();
// Now the slices.
- text += m_imageSlice->cssText();
+ if (m_imageSlice) {
+ if (!text.isEmpty())
+ text += " ";
+ text += m_imageSlice->cssText();
+ }
// Now the border widths.
if (m_borderSlice) {
@@ -62,7 +68,8 @@
if (m_repeat) {
// Now the keywords.
- text += " ";
+ if (!text.isEmpty())
+ text += " ";
text += m_repeat->cssText();
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
