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

Side by Side Diff: Source/core/rendering/line/BreakingContextInlineHeaders.h

Issue 224723023: Implements hanging property for text-indent from CSS3 (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 8 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ight reserved. 3 * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ight reserved.
4 * Copyright (C) 2010 Google Inc. All rights reserved. 4 * Copyright (C) 2010 Google Inc. All rights reserved.
5 * Copyright (C) 2013 Adobe Systems Incorporated. 5 * Copyright (C) 2013 Adobe Systems Incorporated.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 880 matching lines...) Expand 10 before | Expand all | Expand 10 after
891 m_lastObject = m_current.object(); 891 m_lastObject = m_current.object();
892 if (m_lastObject->isReplaced() && m_autoWrap && (!m_lastObject->isImage( ) || m_allowImagesToBreak) && (!m_lastObject->isListMarker() || toRenderListMark er(m_lastObject)->isInside())) { 892 if (m_lastObject->isReplaced() && m_autoWrap && (!m_lastObject->isImage( ) || m_allowImagesToBreak) && (!m_lastObject->isListMarker() || toRenderListMark er(m_lastObject)->isInside())) {
893 m_width.commit(); 893 m_width.commit();
894 m_lineBreak.moveToStartOf(m_nextObject); 894 m_lineBreak.moveToStartOf(m_nextObject);
895 } 895 }
896 } 896 }
897 } 897 }
898 898
899 inline IndentTextOrNot requiresIndent(bool isFirstLine, bool isAfterHardLineBrea k, RenderStyle* style) 899 inline IndentTextOrNot requiresIndent(bool isFirstLine, bool isAfterHardLineBrea k, RenderStyle* style)
900 { 900 {
901 if (isFirstLine) 901 IndentTextOrNot shouldIndentText = DoNotIndentText;
902 return IndentText; 902 if (isFirstLine || (isAfterHardLineBreak && style->textIndentLine()) == Text IndentEachLine)
903 if (isAfterHardLineBreak && style->textIndentLine() == TextIndentEachLine) 903 shouldIndentText = IndentText;
904 return IndentText;
905 904
906 return DoNotIndentText; 905 if (style->textIndentType() == TextIndentHanging)
906 shouldIndentText = shouldIndentText == IndentText ? DoNotIndentText : In dentText;
907
908 return shouldIndentText;
907 } 909 }
908 910
909 } 911 }
910 912
911 #endif // BreakingContextInlineHeaders_h 913 #endif // BreakingContextInlineHeaders_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698