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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutBlockFlow.h

Issue 1959623002: Move line-specific parts of addOutlineRects() into LayoutBlockFlow. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2007 David Smith (catfish.man@gmail.com) 4 * (C) 2007 David Smith (catfish.man@gmail.com)
5 * Copyright (C) 2003-2013 Apple Inc. All rights reserved. 5 * Copyright (C) 2003-2013 Apple Inc. All rights reserved.
6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
7 * Copyright (C) 2013 Google Inc. All rights reserved. 7 * Copyright (C) 2013 Google Inc. All rights reserved.
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions are 10 * modification, are permitted provided that the following conditions are
(...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 return adjustLogicalLeftOffsetForLine(logicalLeftFloatOffsetForLine(logi calTop, fixedOffset, logicalHeight), applyTextIndent); 318 return adjustLogicalLeftOffsetForLine(logicalLeftFloatOffsetForLine(logi calTop, fixedOffset, logicalHeight), applyTextIndent);
319 } 319 }
320 320
321 virtual LayoutObject* layoutSpecialExcludedChild(bool /*relayoutChildren*/, SubtreeLayoutScope&); 321 virtual LayoutObject* layoutSpecialExcludedChild(bool /*relayoutChildren*/, SubtreeLayoutScope&);
322 bool updateLogicalWidthAndColumnWidth() override; 322 bool updateLogicalWidthAndColumnWidth() override;
323 323
324 void setLogicalLeftForChild(LayoutBox& child, LayoutUnit logicalLeft); 324 void setLogicalLeftForChild(LayoutBox& child, LayoutUnit logicalLeft);
325 void setLogicalTopForChild(LayoutBox& child, LayoutUnit logicalTop); 325 void setLogicalTopForChild(LayoutBox& child, LayoutUnit logicalTop);
326 void determineLogicalLeftPositionForChild(LayoutBox& child); 326 void determineLogicalLeftPositionForChild(LayoutBox& child);
327 327
328 void addOutlineRects(Vector<LayoutRect>&, const LayoutPoint& additionalOffse t, IncludeBlockVisualOverflowOrNot) const override;
329
328 PaintInvalidationReason invalidatePaintIfNeeded(const PaintInvalidationState &) override; 330 PaintInvalidationReason invalidatePaintIfNeeded(const PaintInvalidationState &) override;
329 331
330 private: 332 private:
331 bool layoutBlockFlow(bool relayoutChildren, LayoutUnit& pageLogicalHeight, S ubtreeLayoutScope&); 333 bool layoutBlockFlow(bool relayoutChildren, LayoutUnit& pageLogicalHeight, S ubtreeLayoutScope&);
332 void layoutBlockChildren(bool relayoutChildren, SubtreeLayoutScope&, LayoutU nit beforeEdge, LayoutUnit afterEdge); 334 void layoutBlockChildren(bool relayoutChildren, SubtreeLayoutScope&, LayoutU nit beforeEdge, LayoutUnit afterEdge);
333 335
334 void markDescendantsWithFloatsForLayoutIfNeeded(LayoutBlockFlow& child, Layo utUnit newLogicalTop, LayoutUnit previousFloatLogicalBottom); 336 void markDescendantsWithFloatsForLayoutIfNeeded(LayoutBlockFlow& child, Layo utUnit newLogicalTop, LayoutUnit previousFloatLogicalBottom);
335 bool positionAndLayoutOnceIfNeeded(LayoutBox& child, LayoutUnit newLogicalTo p, BlockChildrenLayoutInfo&); 337 bool positionAndLayoutOnceIfNeeded(LayoutBox& child, LayoutUnit newLogicalTo p, BlockChildrenLayoutInfo&);
336 338
337 // Handle breaking policy before the child, and insert a forced break in fro nt of it if needed. 339 // Handle breaking policy before the child, and insert a forced break in fro nt of it if needed.
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after
621 623
622 // END METHODS DEFINED IN LayoutBlockFlowLine 624 // END METHODS DEFINED IN LayoutBlockFlowLine
623 625
624 }; 626 };
625 627
626 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow()); 628 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow());
627 629
628 } // namespace blink 630 } // namespace blink
629 631
630 #endif // LayoutBlockFlow_h 632 #endif // LayoutBlockFlow_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutBlock.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698