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

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

Issue 1993713002: Move line painting to BlockFlowPainter. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Invoke BlockFlowPainter from BlockPainter instead. 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
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/layout/LayoutBlockFlow.h » ('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) 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, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All r ights reserved. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All r ights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
296 296
297 LayoutUnit marginIntrinsicLogicalWidthForChild(LayoutBox& child) const; 297 LayoutUnit marginIntrinsicLogicalWidthForChild(LayoutBox& child) const;
298 298
299 int beforeMarginInLineDirection(LineDirectionMode) const; 299 int beforeMarginInLineDirection(LineDirectionMode) const;
300 300
301 void paint(const PaintInfo&, const LayoutPoint&) const override; 301 void paint(const PaintInfo&, const LayoutPoint&) const override;
302 public: 302 public:
303 virtual void paintObject(const PaintInfo&, const LayoutPoint&) const; 303 virtual void paintObject(const PaintInfo&, const LayoutPoint&) const;
304 virtual void paintChildren(const PaintInfo&, const LayoutPoint&) const; 304 virtual void paintChildren(const PaintInfo&, const LayoutPoint&) const;
305 305
306 // FIXME-BLOCKFLOW: Remove virtualization when all callers have moved to Lay outBlockFlow
307 virtual void paintFloats(const PaintInfo&, const LayoutPoint&) const { }
308
309 protected: 306 protected:
310 virtual void adjustInlineDirectionLineBounds(unsigned /* expansionOpportunit yCount */, LayoutUnit& /* logicalLeft */, LayoutUnit& /* logicalWidth */) const { } 307 virtual void adjustInlineDirectionLineBounds(unsigned /* expansionOpportunit yCount */, LayoutUnit& /* logicalLeft */, LayoutUnit& /* logicalWidth */) const { }
311 308
312 void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const override; 309 void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const override;
313 void computePreferredLogicalWidths() override; 310 void computePreferredLogicalWidths() override;
314 void computeChildPreferredLogicalWidths(LayoutObject& child, LayoutUnit& min PreferredLogicalWidth, LayoutUnit& maxPreferredLogicalWidth) const; 311 void computeChildPreferredLogicalWidths(LayoutObject& child, LayoutUnit& min PreferredLogicalWidth, LayoutUnit& maxPreferredLogicalWidth) const;
315 312
316 int firstLineBoxBaseline() const override; 313 int firstLineBoxBaseline() const override;
317 int inlineBlockBaseline(LineDirectionMode) const override; 314 int inlineBlockBaseline(LineDirectionMode) const override;
318 315
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
466 // FIXME: This is temporary as we move code that accesses block flow 463 // FIXME: This is temporary as we move code that accesses block flow
467 // member variables out of LayoutBlock and into LayoutBlockFlow. 464 // member variables out of LayoutBlock and into LayoutBlockFlow.
468 friend class LayoutBlockFlow; 465 friend class LayoutBlockFlow;
469 }; 466 };
470 467
471 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlock, isLayoutBlock()); 468 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlock, isLayoutBlock());
472 469
473 } // namespace blink 470 } // namespace blink
474 471
475 #endif // LayoutBlock_h 472 #endif // LayoutBlock_h
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/layout/LayoutBlockFlow.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698