Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1141)

Unified Diff: Source/core/layout/line/BreakingContextInlineHeaders.h

Issue 1159623007: Don't auto-wrap <svg:text> (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « LayoutTests/svg/text/white-space-no-autowrap-expected.html ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/line/BreakingContextInlineHeaders.h
diff --git a/Source/core/layout/line/BreakingContextInlineHeaders.h b/Source/core/layout/line/BreakingContextInlineHeaders.h
index e9f85ff4dec837d772ce4ec8f605ec029fe2ffe4..4e097318f2d763bbec68c463f24250eb1f015d55 100644
--- a/Source/core/layout/line/BreakingContextInlineHeaders.h
+++ b/Source/core/layout/line/BreakingContextInlineHeaders.h
@@ -248,10 +248,11 @@ inline void BreakingContext::initializeForCurrentObject()
m_currWS = m_current.object()->isReplaced() ? m_current.object()->parent()->style()->whiteSpace() : m_currentStyle->whiteSpace();
m_lastWS = m_lastObject->isReplaced() ? m_lastObject->parent()->style()->whiteSpace() : m_lastObject->style()->whiteSpace();
- m_autoWrap = ComputedStyle::autoWrap(m_currWS);
+ bool isSVGText = m_current.object()->isSVGInlineText();
+ m_autoWrap = !isSVGText && ComputedStyle::autoWrap(m_currWS);
m_autoWrapWasEverTrueOnLine = m_autoWrapWasEverTrueOnLine || m_autoWrap;
- m_preservesNewline = m_current.object()->isSVGInlineText() ? false : ComputedStyle::preserveNewline(m_currWS);
+ m_preservesNewline = !isSVGText && ComputedStyle::preserveNewline(m_currWS);
m_collapseWhiteSpace = ComputedStyle::collapseWhiteSpace(m_currWS);
}
« no previous file with comments | « LayoutTests/svg/text/white-space-no-autowrap-expected.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698