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

Unified Diff: Source/core/paint/InlineTextBoxPainter.cpp

Issue 1156143002: *** NOT FOR LANDING *** Text nodes should only inherit inheritable properties. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Some tests need to be rebaselined. Text nodes can no longer have z-index. 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
Index: Source/core/paint/InlineTextBoxPainter.cpp
diff --git a/Source/core/paint/InlineTextBoxPainter.cpp b/Source/core/paint/InlineTextBoxPainter.cpp
index f288e7cba5170d2934f8954a49f5a5a84ec9cd07..5be04f143c1cbb0d5b13b50f4e64f3d737f66f96 100644
--- a/Source/core/paint/InlineTextBoxPainter.cpp
+++ b/Source/core/paint/InlineTextBoxPainter.cpp
@@ -121,7 +121,7 @@ void InlineTextBoxPainter::paint(const PaintInfo& paintInfo, const LayoutPoint&
bool shouldRotate = false;
LayoutTextCombine* combinedText = nullptr;
if (!m_inlineTextBox.isHorizontal()) {
- if (styleToUse.hasTextCombine() && m_inlineTextBox.layoutObject().isCombineText()) {
+ if (m_inlineTextBox.layoutObject().isCombineText()) {
combinedText = &toLayoutTextCombine(m_inlineTextBox.layoutObject());
if (!combinedText->isCombined())
combinedText = nullptr;

Powered by Google App Engine
This is Rietveld 408576698