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

Side by Side Diff: Source/core/rendering/RenderBlockFlow.cpp

Issue 176953008: Include the outline into the visual overflow (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 9 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 1985 matching lines...) Expand 10 before | Expand all | Expand 10 after
1996 1996
1997 LayoutRect repaintRect; 1997 LayoutRect repaintRect;
1998 if (isHorizontalWritingMode()) 1998 if (isHorizontalWritingMode())
1999 repaintRect = LayoutRect(repaintLogicalLeft, m_repaintLogicalTop, repain tLogicalRight - repaintLogicalLeft, m_repaintLogicalBottom - m_repaintLogicalTop ); 1999 repaintRect = LayoutRect(repaintLogicalLeft, m_repaintLogicalTop, repain tLogicalRight - repaintLogicalLeft, m_repaintLogicalBottom - m_repaintLogicalTop );
2000 else 2000 else
2001 repaintRect = LayoutRect(m_repaintLogicalTop, repaintLogicalLeft, m_repa intLogicalBottom - m_repaintLogicalTop, repaintLogicalRight - repaintLogicalLeft ); 2001 repaintRect = LayoutRect(m_repaintLogicalTop, repaintLogicalLeft, m_repa intLogicalBottom - m_repaintLogicalTop, repaintLogicalRight - repaintLogicalLeft );
2002 2002
2003 // The repaint rect may be split across columns, in which case adjustRectFor Columns() will return the union. 2003 // The repaint rect may be split across columns, in which case adjustRectFor Columns() will return the union.
2004 adjustRectForColumns(repaintRect); 2004 adjustRectForColumns(repaintRect);
2005 2005
2006 repaintRect.inflate(maximalOutlineSize(PaintPhaseOutline));
2007
2008 if (hasOverflowClip()) { 2006 if (hasOverflowClip()) {
2009 // Adjust repaint rect for scroll offset 2007 // Adjust repaint rect for scroll offset
2010 repaintRect.move(-scrolledContentOffset()); 2008 repaintRect.move(-scrolledContentOffset());
2011 2009
2012 // Don't allow this rect to spill out of our overflow box. 2010 // Don't allow this rect to spill out of our overflow box.
2013 repaintRect.intersect(LayoutRect(LayoutPoint(), size())); 2011 repaintRect.intersect(LayoutRect(LayoutPoint(), size()));
2014 } 2012 }
2015 2013
2016 // Make sure the rect is still non-empty after intersecting for overflow abo ve 2014 // Make sure the rect is still non-empty after intersecting for overflow abo ve
2017 if (!repaintRect.isEmpty()) { 2015 if (!repaintRect.isEmpty()) {
(...skipping 814 matching lines...) Expand 10 before | Expand all | Expand 10 after
2832 RenderBlockFlow::RenderBlockFlowRareData& RenderBlockFlow::ensureRareData() 2830 RenderBlockFlow::RenderBlockFlowRareData& RenderBlockFlow::ensureRareData()
2833 { 2831 {
2834 if (m_rareData) 2832 if (m_rareData)
2835 return *m_rareData; 2833 return *m_rareData;
2836 2834
2837 m_rareData = adoptPtr(new RenderBlockFlowRareData(this)); 2835 m_rareData = adoptPtr(new RenderBlockFlowRareData(this));
2838 return *m_rareData; 2836 return *m_rareData;
2839 } 2837 }
2840 2838
2841 } // namespace WebCore 2839 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698