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

Unified Diff: Source/core/rendering/RenderBlockLineLayout.cpp

Issue 22336008: Use the runtime flag and remove '-webkit-' prefix for CSS3 text-indent. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 4 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/rendering/RenderBlockLineLayout.cpp
diff --git a/Source/core/rendering/RenderBlockLineLayout.cpp b/Source/core/rendering/RenderBlockLineLayout.cpp
index 4c399dbbc41e8a639de41bd7f04f78c3c1c1043f..72a0594e77aa87439ee907edac2c210e31a01239 100644
--- a/Source/core/rendering/RenderBlockLineLayout.cpp
+++ b/Source/core/rendering/RenderBlockLineLayout.cpp
@@ -22,6 +22,7 @@
#include "config.h"
+#include "RuntimeEnabledFeatures.h"
#include "core/platform/text/BidiResolver.h"
#include "core/rendering/InlineIterator.h"
#include "core/rendering/InlineTextBox.h"
@@ -958,13 +959,9 @@ static IndentTextOrNot requiresIndent(bool isFirstLine, bool isAfterHardLineBrea
{
if (isFirstLine)
return IndentText;
-#if ENABLE(CSS3_TEXT)
- if (isAfterHardLineBreak && style->textIndentLine() == TextIndentEachLine)
+ if (RuntimeEnabledFeatures::css3TextEnabled() && isAfterHardLineBreak && style->textIndentLine() == TextIndentEachLine)
Julien - ping for review 2013/08/21 01:50:08 This is unneeded. If CSS3 Text is not enabled, we
jaehun 2013/08/21 05:51:02 Done.
return IndentText;
-#else
- UNUSED_PARAM(isAfterHardLineBreak);
- UNUSED_PARAM(style);
-#endif
+
return DoNotIndentText;
}
@@ -983,7 +980,7 @@ void RenderBlock::computeInlineDirectionPositionsForLine(RootInlineBox* lineBox,
// CSS 2.1: "'Text-indent' only affects a line if it is the first formatted line of an element. For example, the first line of an anonymous block
// box is only affected if it is the first child of its parent element."
- // CSS3 "text-indent", "-webkit-each-line" affects the first line of the block container as well as each line after a forced line break,
+ // CSS3 "text-indent", "each-line" affects the first line of the block container as well as each line after a forced line break,
// but does not affect lines after a soft wrap break.
bool isFirstLine = lineInfo.isFirstLine() && !(isAnonymousBlock() && parent()->firstChild() != this);
bool isAfterHardLineBreak = lineBox->prevRootBox() && lineBox->prevRootBox()->endsWithBreak();

Powered by Google App Engine
This is Rietveld 408576698