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

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

Issue 931423003: Rename rendering/RenderList* to layout/LayoutList* (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Remove spurious LayoutLayerModelObject reference Created 5 years, 10 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 | « Source/core/layout/TextAutosizer.cpp ('k') | Source/core/layout/line/InlineFlowBox.cpp » ('j') | 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 bf0ca8582b286b4f7c2db61a62df1e71256885d4..023e32796f7c02bd1774f2d93ca5e49eb2be8035 100644
--- a/Source/core/layout/line/BreakingContextInlineHeaders.h
+++ b/Source/core/layout/line/BreakingContextInlineHeaders.h
@@ -25,6 +25,7 @@
#define BreakingContextInlineHeaders_h
#include "core/layout/Layer.h"
+#include "core/layout/LayoutListMarker.h"
#include "core/layout/LayoutObject.h"
#include "core/layout/LayoutRubyRun.h"
#include "core/layout/TextRunConstructor.h"
@@ -39,7 +40,6 @@
#include "core/layout/svg/LayoutSVGInlineText.h"
#include "core/rendering/RenderCombineText.h"
#include "core/rendering/RenderInline.h"
-#include "core/rendering/RenderListMarker.h"
#include "platform/text/TextBreakIterator.h"
namespace blink {
@@ -469,7 +469,7 @@ inline void BreakingContext::handleReplaced()
m_currentCharacterShouldCollapseIfPreWap = m_currentCharacterIsSpace = true;
m_ignoringSpaces = true;
}
- if (toRenderListMarker(m_current.object())->isInside())
+ if (toLayoutListMarker(m_current.object())->isInside())
m_width.addUncommittedWidth(replacedLogicalWidth.toFloat());
} else {
m_width.addUncommittedWidth(replacedLogicalWidth.toFloat());
@@ -876,7 +876,7 @@ inline void BreakingContext::commitAndUpdateLineBreakIfNeeded()
if (!m_current.object()->isFloatingOrOutOfFlowPositioned()) {
m_lastObject = m_current.object();
- if (m_lastObject->isReplaced() && m_autoWrap && (!m_lastObject->isImage() || m_allowImagesToBreak) && (!m_lastObject->isListMarker() || toRenderListMarker(m_lastObject)->isInside())) {
+ if (m_lastObject->isReplaced() && m_autoWrap && (!m_lastObject->isImage() || m_allowImagesToBreak) && (!m_lastObject->isListMarker() || toLayoutListMarker(m_lastObject)->isInside())) {
m_width.commit();
m_lineBreak.moveToStartOf(m_nextObject);
}
« no previous file with comments | « Source/core/layout/TextAutosizer.cpp ('k') | Source/core/layout/line/InlineFlowBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698