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

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

Issue 1656743002: Removing more implicit LayoutUnit construction (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix additional test Created 4 years, 10 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 * Copyright (C) 2003, 2006, 2007 Apple Inc. All rights reserved. 4 * Copyright (C) 2003, 2006, 2007 Apple Inc. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 514 matching lines...) Expand 10 before | Expand all | Expand 10 after
525 void clearOverrideContainingBlockContentLogicalHeight(); 525 void clearOverrideContainingBlockContentLogicalHeight();
526 526
527 LayoutUnit extraInlineOffset() const; 527 LayoutUnit extraInlineOffset() const;
528 LayoutUnit extraBlockOffset() const; 528 LayoutUnit extraBlockOffset() const;
529 void setExtraInlineOffset(LayoutUnit inlineOffest); 529 void setExtraInlineOffset(LayoutUnit inlineOffest);
530 void setExtraBlockOffset(LayoutUnit blockOffest); 530 void setExtraBlockOffset(LayoutUnit blockOffest);
531 void clearExtraInlineAndBlockOffests(); 531 void clearExtraInlineAndBlockOffests();
532 532
533 LayoutSize offsetFromContainer(const LayoutObject*, const LayoutPoint&, bool * offsetDependsOnPoint = nullptr) const override; 533 LayoutSize offsetFromContainer(const LayoutObject*, const LayoutPoint&, bool * offsetDependsOnPoint = nullptr) const override;
534 534
535 LayoutUnit adjustBorderBoxLogicalWidthForBoxSizing(LayoutUnit width) const; 535 LayoutUnit adjustBorderBoxLogicalWidthForBoxSizing(float width) const;
536 LayoutUnit adjustBorderBoxLogicalHeightForBoxSizing(LayoutUnit height) const ; 536 LayoutUnit adjustBorderBoxLogicalHeightForBoxSizing(float height) const;
537 LayoutUnit adjustContentBoxLogicalWidthForBoxSizing(LayoutUnit width) const; 537 LayoutUnit adjustContentBoxLogicalWidthForBoxSizing(float width) const;
538 LayoutUnit adjustContentBoxLogicalHeightForBoxSizing(LayoutUnit height) cons t; 538 LayoutUnit adjustContentBoxLogicalHeightForBoxSizing(float height) const;
539 539
540 // ComputedMarginValues holds the actual values for margins. It ignores 540 // ComputedMarginValues holds the actual values for margins. It ignores
541 // margin collapsing as they are handled in LayoutBlockFlow. 541 // margin collapsing as they are handled in LayoutBlockFlow.
542 // The margins are stored in logical coordinates (see COORDINATE 542 // The margins are stored in logical coordinates (see COORDINATE
543 // SYSTEMS in LayoutBoxModel) for use during layout. 543 // SYSTEMS in LayoutBoxModel) for use during layout.
544 struct ComputedMarginValues { 544 struct ComputedMarginValues {
545 DISALLOW_NEW(); 545 DISALLOW_NEW();
546 ComputedMarginValues() { } 546 ComputedMarginValues() { }
547 547
548 LayoutUnit m_before; 548 LayoutUnit m_before;
(...skipping 562 matching lines...) Expand 10 before | Expand all | Expand 10 after
1111 if (UNLIKELY(m_inlineBoxWrapper != nullptr)) 1111 if (UNLIKELY(m_inlineBoxWrapper != nullptr))
1112 deleteLineBoxWrapper(); 1112 deleteLineBoxWrapper();
1113 } 1113 }
1114 1114
1115 m_inlineBoxWrapper = boxWrapper; 1115 m_inlineBoxWrapper = boxWrapper;
1116 } 1116 }
1117 1117
1118 } // namespace blink 1118 } // namespace blink
1119 1119
1120 #endif // LayoutBox_h 1120 #endif // LayoutBox_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutBlockFlowLine.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698