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

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

Issue 399423006: Move widow-avoiding code from RenderBlock down to RenderBlockFlow. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 5 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/rendering/RenderBlock.h ('k') | Source/core/rendering/RenderBlockFlow.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderBlock.cpp
diff --git a/Source/core/rendering/RenderBlock.cpp b/Source/core/rendering/RenderBlock.cpp
index 2d0e66f81a8c87a706952ff95a8683d1e81f19b1..0b17fec4f4296a395730c2c66687bb634c95e4c5 100644
--- a/Source/core/rendering/RenderBlock.cpp
+++ b/Source/core/rendering/RenderBlock.cpp
@@ -86,7 +86,6 @@ struct SameSizeAsRenderBlock : public RenderBox {
struct SameSizeAsRenderBlockRareData {
int pageLogicalOffset;
- uint32_t bitfields;
};
COMPILE_ASSERT(sizeof(RenderBlock) == sizeof(SameSizeAsRenderBlock), RenderBlock_should_stay_small);
@@ -4381,44 +4380,6 @@ void RenderBlock::setPageLogicalOffset(LayoutUnit logicalOffset)
m_rareData->m_pageLogicalOffset = logicalOffset;
}
-void RenderBlock::setBreakAtLineToAvoidWidow(int lineToBreak)
-{
- ASSERT(lineToBreak >= 0);
- if (!m_rareData)
- m_rareData = adoptPtr(new RenderBlockRareData());
-
- ASSERT(!m_rareData->m_didBreakAtLineToAvoidWidow);
- m_rareData->m_lineBreakToAvoidWidow = lineToBreak;
-}
-
-void RenderBlock::setDidBreakAtLineToAvoidWidow()
-{
- ASSERT(!shouldBreakAtLineToAvoidWidow());
-
- // This function should be called only after a break was applied to avoid widows
- // so assert |m_rareData| exists.
- ASSERT(m_rareData);
-
- m_rareData->m_didBreakAtLineToAvoidWidow = true;
-}
-
-void RenderBlock::clearDidBreakAtLineToAvoidWidow()
-{
- if (!m_rareData)
- return;
-
- m_rareData->m_didBreakAtLineToAvoidWidow = false;
-}
-
-void RenderBlock::clearShouldBreakAtLineToAvoidWidow() const
-{
- ASSERT(shouldBreakAtLineToAvoidWidow());
- if (!m_rareData)
- return;
-
- m_rareData->m_lineBreakToAvoidWidow = -1;
-}
-
void RenderBlock::absoluteRects(Vector<IntRect>& rects, const LayoutPoint& accumulatedOffset) const
{
// For blocks inside inlines, we go ahead and include margins so that we run right up to the
« no previous file with comments | « Source/core/rendering/RenderBlock.h ('k') | Source/core/rendering/RenderBlockFlow.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698