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

Side by Side Diff: Source/core/layout/line/InlineFlowBox.cpp

Issue 1269123002: Preparation for combining paths of focus rings and outlines (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Remove debug from fast/css/focus-ring-recursive-continuations.html Created 5 years, 4 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) 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 783 matching lines...) Expand 10 before | Expand all | Expand 10 after
794 inline void InlineFlowBox::addOutlineVisualOverflow(LayoutRect& logicalVisualOve rflow) 794 inline void InlineFlowBox::addOutlineVisualOverflow(LayoutRect& logicalVisualOve rflow)
795 { 795 {
796 // Outline on root line boxes is applied to the block and not to the lines. 796 // Outline on root line boxes is applied to the block and not to the lines.
797 if (!parent()) 797 if (!parent())
798 return; 798 return;
799 799
800 const ComputedStyle& style = layoutObject().styleRef(isFirstLineStyle()); 800 const ComputedStyle& style = layoutObject().styleRef(isFirstLineStyle());
801 if (!style.hasOutline()) 801 if (!style.hasOutline())
802 return; 802 return;
803 803
804 logicalVisualOverflow.inflate(style.outlineSize()); 804 logicalVisualOverflow.inflate(style.outlineOutsetExtent());
805 } 805 }
806 806
807 inline void InlineFlowBox::addTextBoxVisualOverflow(InlineTextBox* textBox, Glyp hOverflowAndFallbackFontsMap& textBoxDataMap, LayoutRect& logicalVisualOverflow) 807 inline void InlineFlowBox::addTextBoxVisualOverflow(InlineTextBox* textBox, Glyp hOverflowAndFallbackFontsMap& textBoxDataMap, LayoutRect& logicalVisualOverflow)
808 { 808 {
809 if (textBox->knownToHaveNoOverflow()) 809 if (textBox->knownToHaveNoOverflow())
810 return; 810 return;
811 811
812 const ComputedStyle& style = textBox->layoutObject().styleRef(isFirstLineSty le()); 812 const ComputedStyle& style = textBox->layoutObject().styleRef(isFirstLineSty le());
813 813
814 GlyphOverflowAndFallbackFontsMap::iterator it = textBoxDataMap.find(textBox) ; 814 GlyphOverflowAndFallbackFontsMap::iterator it = textBoxDataMap.find(textBox) ;
(...skipping 493 matching lines...) Expand 10 before | Expand all | Expand 10 after
1308 ASSERT(child->prevOnLine() == prev); 1308 ASSERT(child->prevOnLine() == prev);
1309 prev = child; 1309 prev = child;
1310 } 1310 }
1311 ASSERT(prev == m_lastChild); 1311 ASSERT(prev == m_lastChild);
1312 #endif 1312 #endif
1313 } 1313 }
1314 1314
1315 #endif 1315 #endif
1316 1316
1317 } // namespace blink 1317 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698