From d9d595e26f5bcf25a09597a796881d1de73665f0 Mon Sep 17 00:00:00 2001 From: "robert@webkit.org" Date: Fri, 17 Feb 2012 21:48:09 +0000 Subject: [PATCH] AppleMac Build fix for r108111 Remove variable that is now unused. Unreviewed, build fix. * rendering/RenderBlockLineLayout.cpp: (WebCore::alwaysRequiresLineBox): Remove lineInfo (WebCore::requiresLineBox): (WebCore::RenderBlock::LineBreaker::nextLineBreak): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@108117 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebCore/ChangeLog | 13 +++++++++++++ Source/WebCore/rendering/RenderBlockLineLayout.cpp | 6 +++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 735d8ff..bd3fba3 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,16 @@ +2012-02-17 Robert Hogan + + AppleMac Build fix for r108111 + + Remove variable that is now unused. + + Unreviewed, build fix. + + * rendering/RenderBlockLineLayout.cpp: + (WebCore::alwaysRequiresLineBox): Remove lineInfo + (WebCore::requiresLineBox): + (WebCore::RenderBlock::LineBreaker::nextLineBreak): + 2012-02-17 Michal Mocny [chromium] GL_CHROMIUM_gpu_memory_manager extension diff --git a/Source/WebCore/rendering/RenderBlockLineLayout.cpp b/Source/WebCore/rendering/RenderBlockLineLayout.cpp index f411c4e..296cb06 100755 --- a/Source/WebCore/rendering/RenderBlockLineLayout.cpp +++ b/Source/WebCore/rendering/RenderBlockLineLayout.cpp @@ -1845,7 +1845,7 @@ static bool requiresLineBoxForContent(RenderInline* flow, const LineInfo& lineIn return false; } -static bool alwaysRequiresLineBox(RenderInline* flow, const LineInfo& lineInfo) +static bool alwaysRequiresLineBox(RenderInline* flow) { // FIXME: Right now, we only allow line boxes for inlines that are truly empty. // We need to fix this, though, because at the very least, inlines containing only @@ -1858,7 +1858,7 @@ static bool requiresLineBox(const InlineIterator& it, const LineInfo& lineInfo = if (it.m_obj->isFloatingOrPositioned()) return false; - if (it.m_obj->isRenderInline() && !alwaysRequiresLineBox(toRenderInline(it.m_obj), lineInfo) && !requiresLineBoxForContent(toRenderInline(it.m_obj), lineInfo)) + if (it.m_obj->isRenderInline() && !alwaysRequiresLineBox(toRenderInline(it.m_obj)) && !requiresLineBoxForContent(toRenderInline(it.m_obj), lineInfo)) return false; if (!shouldCollapseWhiteSpace(it.m_obj->style(), lineInfo, whitespacePosition) || it.m_obj->isBR()) @@ -2246,7 +2246,7 @@ InlineIterator RenderBlock::LineBreaker::nextLineBreak(InlineBidiResolver& resol // to make sure that we stop to include this object and then start ignoring spaces again. // If this object is at the start of the line, we need to behave like list markers and // start ignoring spaces. - bool requiresLineBox = alwaysRequiresLineBox(flowBox, lineInfo); + bool requiresLineBox = alwaysRequiresLineBox(flowBox); if (requiresLineBox || requiresLineBoxForContent(flowBox, lineInfo)) { // An empty inline that only has line-height, vertical-align or font-metrics will only get a // line box to affect the height of the line if the rest of the line is not empty. -- 2.7.4