Changeset 102193 in webkit

Timestamp:

Dec 6, 2011, 4:51:19 PM (15 years ago)

Author:

Lucas Forschler

Message:

Merged r95386.

Location:

branches/safari-534.53-branch

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/borders/border-image-slice-omission-expected.txt (copied) (copied from trunk/LayoutTests/fast/borders/border-image-slice-omission-expected.txt )
• LayoutTests/fast/borders/border-image-slice-omission.html (copied) (copied from trunk/LayoutTests/fast/borders/border-image-slice-omission.html )
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/CSSBorderImageValue.cpp (modified) (2 diffs)

branches/safari-534.53-branch/LayoutTests/ChangeLog

@@ +1 @@
+2011-12-06  Lucas Forschler  <lforschler@apple.com>
+
+    Merge 95386
+
+    2011-09-17  David Hyatt  <hyatt@apple.com>
+
+            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  <lforschler@apple.com>
 

branches/safari-534.53-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2011-12-06  Lucas Forschler  <lforschler@apple.com>
+
+    Merge 95386
+
+    2011-09-17  David Hyatt  <hyatt@apple.com>
+
+            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  <lforschler@apple.com>
 

branches/safari-534.53-branch/Source/WebCore/css/CSSBorderImageValue.cpp

@@ -44 +44 @@
 {
     // 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.
@@ -63 +69 @@
     if (m_repeat) {
         // Now the keywords.
-        text += " ";
+        if (!text.isEmpty())
+            text += " ";
         text += m_repeat->cssText();
     }