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

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: Fixed dumb bug caught by Mac. 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
« no previous file with comments | « Source/core/rendering/RenderBlock.cpp ('k') | Source/core/rendering/RenderBox.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1970 matching lines...) Expand 10 before | Expand all | Expand 10 after
1981 1981
1982 LayoutRect repaintRect; 1982 LayoutRect repaintRect;
1983 if (isHorizontalWritingMode()) 1983 if (isHorizontalWritingMode())
1984 repaintRect = LayoutRect(repaintLogicalLeft, m_repaintLogicalTop, repain tLogicalRight - repaintLogicalLeft, m_repaintLogicalBottom - m_repaintLogicalTop ); 1984 repaintRect = LayoutRect(repaintLogicalLeft, m_repaintLogicalTop, repain tLogicalRight - repaintLogicalLeft, m_repaintLogicalBottom - m_repaintLogicalTop );
1985 else 1985 else
1986 repaintRect = LayoutRect(m_repaintLogicalTop, repaintLogicalLeft, m_repa intLogicalBottom - m_repaintLogicalTop, repaintLogicalRight - repaintLogicalLeft ); 1986 repaintRect = LayoutRect(m_repaintLogicalTop, repaintLogicalLeft, m_repa intLogicalBottom - m_repaintLogicalTop, repaintLogicalRight - repaintLogicalLeft );
1987 1987
1988 // The repaint rect may be split across columns, in which case adjustRectFor Columns() will return the union. 1988 // The repaint rect may be split across columns, in which case adjustRectFor Columns() will return the union.
1989 adjustRectForColumns(repaintRect); 1989 adjustRectForColumns(repaintRect);
1990 1990
1991 repaintRect.inflate(maximalOutlineSize(PaintPhaseOutline));
1992
1993 if (hasOverflowClip()) { 1991 if (hasOverflowClip()) {
1994 // Adjust repaint rect for scroll offset 1992 // Adjust repaint rect for scroll offset
1995 repaintRect.move(-scrolledContentOffset()); 1993 repaintRect.move(-scrolledContentOffset());
1996 1994
1997 // Don't allow this rect to spill out of our overflow box. 1995 // Don't allow this rect to spill out of our overflow box.
1998 repaintRect.intersect(LayoutRect(LayoutPoint(), size())); 1996 repaintRect.intersect(LayoutRect(LayoutPoint(), size()));
1999 } 1997 }
2000 1998
2001 // Make sure the rect is still non-empty after intersecting for overflow abo ve 1999 // Make sure the rect is still non-empty after intersecting for overflow abo ve
2002 if (!repaintRect.isEmpty()) { 2000 if (!repaintRect.isEmpty()) {
(...skipping 819 matching lines...) Expand 10 before | Expand all | Expand 10 after
2822 RenderBlockFlow::RenderBlockFlowRareData& RenderBlockFlow::ensureRareData() 2820 RenderBlockFlow::RenderBlockFlowRareData& RenderBlockFlow::ensureRareData()
2823 { 2821 {
2824 if (m_rareData) 2822 if (m_rareData)
2825 return *m_rareData; 2823 return *m_rareData;
2826 2824
2827 m_rareData = adoptPtr(new RenderBlockFlowRareData(this)); 2825 m_rareData = adoptPtr(new RenderBlockFlowRareData(this));
2828 return *m_rareData; 2826 return *m_rareData;
2829 } 2827 }
2830 2828
2831 } // namespace WebCore 2829 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderBlock.cpp ('k') | Source/core/rendering/RenderBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698