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

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

Issue 1043643002: Switch line layout to LayoutUnit. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: More TestExpectations tweaks Created 5 years, 6 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
« no previous file with comments | « Source/core/layout/LayoutBR.h ('k') | 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 14 matching lines...) Expand all
25 25
26 #include "core/CoreExport.h" 26 #include "core/CoreExport.h"
27 #include "core/layout/ColumnInfo.h" 27 #include "core/layout/ColumnInfo.h"
28 #include "core/layout/FloatingObjects.h" 28 #include "core/layout/FloatingObjects.h"
29 #include "core/layout/GapRects.h" 29 #include "core/layout/GapRects.h"
30 #include "core/layout/LayoutBox.h" 30 #include "core/layout/LayoutBox.h"
31 #include "core/layout/line/LineBoxList.h" 31 #include "core/layout/line/LineBoxList.h"
32 #include "core/layout/line/RootInlineBox.h" 32 #include "core/layout/line/RootInlineBox.h"
33 #include "core/style/ShapeValue.h" 33 #include "core/style/ShapeValue.h"
34 #include "platform/text/TextBreakIterator.h" 34 #include "platform/text/TextBreakIterator.h"
35 #include "platform/text/TextRun.h"
36 #include "wtf/ListHashSet.h" 35 #include "wtf/ListHashSet.h"
37 #include "wtf/OwnPtr.h" 36 #include "wtf/OwnPtr.h"
38 37
39 namespace blink { 38 namespace blink {
40 39
41 class LineLayoutState; 40 class LineLayoutState;
42 struct PaintInfo; 41 struct PaintInfo;
43 class LayoutInline; 42 class LayoutInline;
44 class WordMeasurement; 43 class WordMeasurement;
45 44
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
264 virtual void paint(const PaintInfo&, const LayoutPoint&) override; 263 virtual void paint(const PaintInfo&, const LayoutPoint&) override;
265 public: 264 public:
266 virtual void paintObject(const PaintInfo&, const LayoutPoint&) override; 265 virtual void paintObject(const PaintInfo&, const LayoutPoint&) override;
267 virtual void paintChildren(const PaintInfo&, const LayoutPoint&); 266 virtual void paintChildren(const PaintInfo&, const LayoutPoint&);
268 267
269 // FIXME-BLOCKFLOW: Remove virtualizaion when all callers have moved to Layo utBlockFlow 268 // FIXME-BLOCKFLOW: Remove virtualizaion when all callers have moved to Layo utBlockFlow
270 virtual void paintFloats(const PaintInfo&, const LayoutPoint&, bool) { } 269 virtual void paintFloats(const PaintInfo&, const LayoutPoint&, bool) { }
271 virtual void paintSelection(const PaintInfo&, const LayoutPoint&) { } 270 virtual void paintSelection(const PaintInfo&, const LayoutPoint&) { }
272 271
273 protected: 272 protected:
274 virtual void adjustInlineDirectionLineBounds(unsigned /* expansionOpportunit yCount */, float& /* logicalLeft */, float& /* logicalWidth */) const { } 273 virtual void adjustInlineDirectionLineBounds(unsigned /* expansionOpportunit yCount */, LayoutUnit& /* logicalLeft */, LayoutUnit& /* logicalWidth */) const { }
275 274
276 virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, Layo utUnit& maxLogicalWidth) const override; 275 virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, Layo utUnit& maxLogicalWidth) const override;
277 virtual void computePreferredLogicalWidths() override; 276 virtual void computePreferredLogicalWidths() override;
278 void adjustIntrinsicLogicalWidthsForColumns(LayoutUnit& minLogicalWidth, Lay outUnit& maxLogicalWidth) const; 277 void adjustIntrinsicLogicalWidthsForColumns(LayoutUnit& minLogicalWidth, Lay outUnit& maxLogicalWidth) const;
279 278
280 virtual int firstLineBoxBaseline() const override; 279 virtual int firstLineBoxBaseline() const override;
281 virtual int inlineBlockBaseline(LineDirectionMode) const override; 280 virtual int inlineBlockBaseline(LineDirectionMode) const override;
282 int lastLineBoxBaseline(LineDirectionMode) const; 281 int lastLineBoxBaseline(LineDirectionMode) const;
283 282
284 virtual void updateHitTestResult(HitTestResult&, const LayoutPoint&) overrid e; 283 virtual void updateHitTestResult(HitTestResult&, const LayoutPoint&) overrid e;
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
466 // FIXME: This is temporary as we move code that accesses block flow 465 // FIXME: This is temporary as we move code that accesses block flow
467 // member variables out of LayoutBlock and into LayoutBlockFlow. 466 // member variables out of LayoutBlock and into LayoutBlockFlow.
468 friend class LayoutBlockFlow; 467 friend class LayoutBlockFlow;
469 }; 468 };
470 469
471 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlock, isLayoutBlock()); 470 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlock, isLayoutBlock());
472 471
473 } // namespace blink 472 } // namespace blink
474 473
475 #endif // LayoutBlock_h 474 #endif // LayoutBlock_h
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutBR.h ('k') | Source/core/layout/LayoutBlockFlow.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698