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

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

Issue 254573006: Avoid markDirty when removing out-of-flow line boxes. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 8 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 | « Source/core/rendering/InlineBox.cpp ('k') | Source/core/rendering/InlineFlowBox.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 Apple Inc. All rights reserved. 2 * Copyright (C) 2003, 2004, 2005, 2006, 2007 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 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 void placeBoxesInBlockDirection(LayoutUnit logicalTop, LayoutUnit maxHeight, int maxAscent, bool strictMode, LayoutUnit& lineTop, LayoutUnit& lineBottom, bo ol& setLineTop, 190 void placeBoxesInBlockDirection(LayoutUnit logicalTop, LayoutUnit maxHeight, int maxAscent, bool strictMode, LayoutUnit& lineTop, LayoutUnit& lineBottom, bo ol& setLineTop,
191 LayoutUnit& lineTopIncludingMargins, LayoutU nit& lineBottomIncludingMargins, bool& hasAnnotationsBefore, bool& hasAnnotation sAfter, FontBaseline); 191 LayoutUnit& lineTopIncludingMargins, LayoutU nit& lineBottomIncludingMargins, bool& hasAnnotationsBefore, bool& hasAnnotation sAfter, FontBaseline);
192 void flipLinesInBlockDirection(LayoutUnit lineTop, LayoutUnit lineBottom); 192 void flipLinesInBlockDirection(LayoutUnit lineTop, LayoutUnit lineBottom);
193 bool requiresIdeographicBaseline(const GlyphOverflowAndFallbackFontsMap&) co nst; 193 bool requiresIdeographicBaseline(const GlyphOverflowAndFallbackFontsMap&) co nst;
194 194
195 LayoutUnit computeOverAnnotationAdjustment(LayoutUnit allowedPosition) const ; 195 LayoutUnit computeOverAnnotationAdjustment(LayoutUnit allowedPosition) const ;
196 LayoutUnit computeUnderAnnotationAdjustment(LayoutUnit allowedPosition) cons t; 196 LayoutUnit computeUnderAnnotationAdjustment(LayoutUnit allowedPosition) cons t;
197 197
198 void computeOverflow(LayoutUnit lineTop, LayoutUnit lineBottom, GlyphOverflo wAndFallbackFontsMap&); 198 void computeOverflow(LayoutUnit lineTop, LayoutUnit lineBottom, GlyphOverflo wAndFallbackFontsMap&);
199 199
200 void removeChild(InlineBox* child); 200 void removeChild(InlineBox* child, MarkLineBoxes);
201 201
202 virtual RenderObject::SelectionState selectionState() OVERRIDE; 202 virtual RenderObject::SelectionState selectionState() OVERRIDE;
203 203
204 virtual bool canAccommodateEllipsis(bool ltr, int blockEdge, int ellipsisWid th) const OVERRIDE FINAL; 204 virtual bool canAccommodateEllipsis(bool ltr, int blockEdge, int ellipsisWid th) const OVERRIDE FINAL;
205 virtual float placeEllipsisBox(bool ltr, float blockLeftEdge, float blockRig htEdge, float ellipsisWidth, float &truncatedWidth, bool&) OVERRIDE; 205 virtual float placeEllipsisBox(bool ltr, float blockLeftEdge, float blockRig htEdge, float ellipsisWidth, float &truncatedWidth, bool&) OVERRIDE;
206 206
207 bool hasTextChildren() const { return m_hasTextChildren; } 207 bool hasTextChildren() const { return m_hasTextChildren; }
208 bool hasTextDescendants() const { return m_hasTextDescendants; } 208 bool hasTextDescendants() const { return m_hasTextDescendants; }
209 void setHasTextChildren() { m_hasTextChildren = true; setHasTextDescendants( ); } 209 void setHasTextChildren() { m_hasTextChildren = true; setHasTextDescendants( ); }
210 void setHasTextDescendants() { m_hasTextDescendants = true; } 210 void setHasTextDescendants() { m_hasTextDescendants = true; }
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
368 } 368 }
369 369
370 } // namespace WebCore 370 } // namespace WebCore
371 371
372 #ifndef NDEBUG 372 #ifndef NDEBUG
373 // Outside the WebCore namespace for ease of invocation from gdb. 373 // Outside the WebCore namespace for ease of invocation from gdb.
374 void showTree(const WebCore::InlineFlowBox*); 374 void showTree(const WebCore::InlineFlowBox*);
375 #endif 375 #endif
376 376
377 #endif // InlineFlowBox_h 377 #endif // InlineFlowBox_h
OLDNEW
« no previous file with comments | « Source/core/rendering/InlineBox.cpp ('k') | Source/core/rendering/InlineFlowBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698