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

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

Issue 23509003: Address regression bug report, revert the PaintInfo rect member function. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Including revision in cl. Created 7 years, 3 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
« no previous file with comments | « no previous file | Source/core/rendering/InlineTextBox.cpp » ('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) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 1053 matching lines...) Expand 10 before | Expand all | Expand 10 after
1064 return false; 1064 return false;
1065 } 1065 }
1066 1066
1067 void InlineFlowBox::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset, LayoutUnit lineTop, LayoutUnit lineBottom) 1067 void InlineFlowBox::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset, LayoutUnit lineTop, LayoutUnit lineBottom)
1068 { 1068 {
1069 LayoutRect overflowRect(visualOverflowRect(lineTop, lineBottom)); 1069 LayoutRect overflowRect(visualOverflowRect(lineTop, lineBottom));
1070 overflowRect.inflate(renderer()->maximalOutlineSize(paintInfo.phase)); 1070 overflowRect.inflate(renderer()->maximalOutlineSize(paintInfo.phase));
1071 flipForWritingMode(overflowRect); 1071 flipForWritingMode(overflowRect);
1072 overflowRect.moveBy(paintOffset); 1072 overflowRect.moveBy(paintOffset);
1073 1073
1074 if (!paintInfo.rect().intersects(pixelSnappedIntRect(overflowRect))) 1074 if (!paintInfo.rect.intersects(pixelSnappedIntRect(overflowRect)))
1075 return; 1075 return;
1076 1076
1077 if (paintInfo.phase != PaintPhaseChildOutlines) { 1077 if (paintInfo.phase != PaintPhaseChildOutlines) {
1078 if (paintInfo.phase == PaintPhaseOutline || paintInfo.phase == PaintPhas eSelfOutline) { 1078 if (paintInfo.phase == PaintPhaseOutline || paintInfo.phase == PaintPhas eSelfOutline) {
1079 // Add ourselves to the paint info struct's list of inlines that nee d to paint their 1079 // Add ourselves to the paint info struct's list of inlines that nee d to paint their
1080 // outlines. 1080 // outlines.
1081 if (renderer()->style()->visibility() == VISIBLE && renderer()->hasO utline() && !isRootInlineBox()) { 1081 if (renderer()->style()->visibility() == VISIBLE && renderer()->hasO utline() && !isRootInlineBox()) {
1082 RenderInline* inlineFlow = toRenderInline(renderer()); 1082 RenderInline* inlineFlow = toRenderInline(renderer());
1083 1083
1084 RenderBlock* cb = 0; 1084 RenderBlock* cb = 0;
(...skipping 551 matching lines...) Expand 10 before | Expand all | Expand 10 after
1636 ASSERT(child->prevOnLine() == prev); 1636 ASSERT(child->prevOnLine() == prev);
1637 prev = child; 1637 prev = child;
1638 } 1638 }
1639 ASSERT(prev == m_lastChild); 1639 ASSERT(prev == m_lastChild);
1640 #endif 1640 #endif
1641 } 1641 }
1642 1642
1643 #endif 1643 #endif
1644 1644
1645 } // namespace WebCore 1645 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | Source/core/rendering/InlineTextBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698