diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index f02f940..32a4097 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2013-10-31  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        Decorated text sometimes does not draw its decorations
+        https://bugs.webkit.org/show_bug.cgi?id=123539
+
+        Reviewed by Antti Koivisto.
+
+        Decorated text should opt-out of the simple line layout, because
+        SimpleLineLayout::paintFlow doesn't draw decorations
+
+        Fixes fast/css3-text/css3-text-decoration/text-decoration-color.html
+
+        * rendering/SimpleLineLayout.cpp:
+        (WebCore::SimpleLineLayout::canUseFor):
+
 2013-10-31  Joseph Pecoraro  <pecoraro@apple.com>
 
         Web Inspector: Remove last member variable uses of InspectorState from Agents
diff --git a/Source/WebCore/rendering/SimpleLineLayout.cpp b/Source/WebCore/rendering/SimpleLineLayout.cpp
index 5dd46c4..cfbaa8b 100644
--- a/Source/WebCore/rendering/SimpleLineLayout.cpp
+++ b/Source/WebCore/rendering/SimpleLineLayout.cpp
@@ -94,6 +94,8 @@
             return false;
     }
     const RenderStyle& style = flow.style();
+    if (style.textDecorationsInEffect() != TextDecorationNone)
+        return false;
     if (style.textAlign() == JUSTIFY)
         return false;
     // Non-visible overflow should be pretty easy to support.