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

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

Issue 1952753002: Move parts of baseline calculation over to 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 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 LayoutUnit logicalLeftSelectionOffset(const LayoutBlock* rootBlock, LayoutUn it position) const override; 134 LayoutUnit logicalLeftSelectionOffset(const LayoutBlock* rootBlock, LayoutUn it position) const override;
135 LayoutUnit logicalRightSelectionOffset(const LayoutBlock* rootBlock, LayoutU nit position) const override; 135 LayoutUnit logicalRightSelectionOffset(const LayoutBlock* rootBlock, LayoutU nit position) const override;
136 136
137 RootInlineBox* createAndAppendRootInlineBox(); 137 RootInlineBox* createAndAppendRootInlineBox();
138 138
139 // Return the number of lines in *this* block flow. Does not recurse into bl ock flow children. 139 // Return the number of lines in *this* block flow. Does not recurse into bl ock flow children.
140 // Will start counting from the first line, and stop counting right after |s topRootInlineBox|, 140 // Will start counting from the first line, and stop counting right after |s topRootInlineBox|,
141 // if specified. 141 // if specified.
142 int lineCount(const RootInlineBox* stopRootInlineBox = nullptr) const; 142 int lineCount(const RootInlineBox* stopRootInlineBox = nullptr) const;
143 143
144 int firstLineBoxBaseline() const override;
145 int inlineBlockBaseline(LineDirectionMode) const override;
146
144 void removeFloatingObjectsFromDescendants(); 147 void removeFloatingObjectsFromDescendants();
145 void markAllDescendantsWithFloatsForLayout(LayoutBox* floatToRemove = nullpt r, bool inLayout = true); 148 void markAllDescendantsWithFloatsForLayout(LayoutBox* floatToRemove = nullpt r, bool inLayout = true);
146 void markSiblingsWithFloatsForLayout(LayoutBox* floatToRemove = nullptr); 149 void markSiblingsWithFloatsForLayout(LayoutBox* floatToRemove = nullptr);
147 150
148 bool containsFloats() const { return m_floatingObjects && !m_floatingObjects ->set().isEmpty(); } 151 bool containsFloats() const { return m_floatingObjects && !m_floatingObjects ->set().isEmpty(); }
149 bool containsFloat(LayoutBox*) const; 152 bool containsFloat(LayoutBox*) const;
150 153
151 void removeFloatingObjects(); 154 void removeFloatingObjects();
152 155
153 void addChild(LayoutObject* newChild, LayoutObject* beforeChild = nullptr) o verride; 156 void addChild(LayoutObject* newChild, LayoutObject* beforeChild = nullptr) o verride;
(...skipping 458 matching lines...) Expand 10 before | Expand all | Expand 10 after
612 615
613 // END METHODS DEFINED IN LayoutBlockFlowLine 616 // END METHODS DEFINED IN LayoutBlockFlowLine
614 617
615 }; 618 };
616 619
617 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow()); 620 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow());
618 621
619 } // namespace blink 622 } // namespace blink
620 623
621 #endif // LayoutBlockFlow_h 624 #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