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

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

Issue 1162383003: C++11: Replace 0 with nullptr where applicable in layout code. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Add one more file. 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
« no previous file with comments | « Source/core/layout/LayoutBox.cpp ('k') | Source/core/layout/LayoutBoxModelObject.cpp » ('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 * Copyright (C) 2003, 2006, 2007, 2009 Apple Inc. All rights reserved. 4 * Copyright (C) 2003, 2006, 2007, 2009 Apple Inc. All rights reserved.
5 * Copyright (C) 2010 Google Inc. All rights reserved. 5 * Copyright (C) 2010 Google Inc. All rights 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 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 LayoutUnit borderLogicalLeft() const { return style()->isHorizontalWritingMo de() ? borderLeft() : borderTop(); } 154 LayoutUnit borderLogicalLeft() const { return style()->isHorizontalWritingMo de() ? borderLeft() : borderTop(); }
155 155
156 LayoutUnit paddingLogicalWidth() const { return paddingStart() + paddingEnd( ); } 156 LayoutUnit paddingLogicalWidth() const { return paddingStart() + paddingEnd( ); }
157 LayoutUnit paddingLogicalHeight() const { return paddingBefore() + paddingAf ter(); } 157 LayoutUnit paddingLogicalHeight() const { return paddingBefore() + paddingAf ter(); }
158 158
159 virtual LayoutRectOutsets marginBoxOutsets() const = 0; 159 virtual LayoutRectOutsets marginBoxOutsets() const = 0;
160 virtual LayoutUnit marginTop() const = 0; 160 virtual LayoutUnit marginTop() const = 0;
161 virtual LayoutUnit marginBottom() const = 0; 161 virtual LayoutUnit marginBottom() const = 0;
162 virtual LayoutUnit marginLeft() const = 0; 162 virtual LayoutUnit marginLeft() const = 0;
163 virtual LayoutUnit marginRight() const = 0; 163 virtual LayoutUnit marginRight() const = 0;
164 virtual LayoutUnit marginBefore(const ComputedStyle* otherStyle = 0) const = 0; 164 virtual LayoutUnit marginBefore(const ComputedStyle* otherStyle = nullptr) c onst = 0;
165 virtual LayoutUnit marginAfter(const ComputedStyle* otherStyle = 0) const = 0; 165 virtual LayoutUnit marginAfter(const ComputedStyle* otherStyle = nullptr) co nst = 0;
166 virtual LayoutUnit marginStart(const ComputedStyle* otherStyle = 0) const = 0; 166 virtual LayoutUnit marginStart(const ComputedStyle* otherStyle = nullptr) co nst = 0;
167 virtual LayoutUnit marginEnd(const ComputedStyle* otherStyle = 0) const = 0; 167 virtual LayoutUnit marginEnd(const ComputedStyle* otherStyle = nullptr) cons t = 0;
168 LayoutUnit marginHeight() const { return marginTop() + marginBottom(); } 168 LayoutUnit marginHeight() const { return marginTop() + marginBottom(); }
169 LayoutUnit marginWidth() const { return marginLeft() + marginRight(); } 169 LayoutUnit marginWidth() const { return marginLeft() + marginRight(); }
170 LayoutUnit marginLogicalHeight() const { return marginBefore() + marginAfter (); } 170 LayoutUnit marginLogicalHeight() const { return marginBefore() + marginAfter (); }
171 LayoutUnit marginLogicalWidth() const { return marginStart() + marginEnd(); } 171 LayoutUnit marginLogicalWidth() const { return marginStart() + marginEnd(); }
172 172
173 bool hasInlineDirectionBordersPaddingOrMargin() const { return hasInlineDire ctionBordersOrPadding() || marginStart() || marginEnd(); } 173 bool hasInlineDirectionBordersPaddingOrMargin() const { return hasInlineDire ctionBordersOrPadding() || marginStart() || marginEnd(); }
174 bool hasInlineDirectionBordersOrPadding() const { return borderStart() || bo rderEnd() || paddingStart() || paddingEnd(); } 174 bool hasInlineDirectionBordersOrPadding() const { return borderStart() || bo rderEnd() || paddingStart() || paddingEnd(); }
175 175
176 virtual LayoutUnit containingBlockLogicalWidthForContent() const; 176 virtual LayoutUnit containingBlockLogicalWidthForContent() const;
177 177
178 virtual void childBecameNonInline(LayoutObject* /*child*/) { } 178 virtual void childBecameNonInline(LayoutObject* /*child*/) { }
179 179
180 virtual bool boxShadowShouldBeAppliedToBackground(BackgroundBleedAvoidance, InlineFlowBox* = 0) const; 180 virtual bool boxShadowShouldBeAppliedToBackground(BackgroundBleedAvoidance, InlineFlowBox* = nullptr) const;
181 181
182 // Overridden by subclasses to determine line height and baseline position. 182 // Overridden by subclasses to determine line height and baseline position.
183 virtual LayoutUnit lineHeight(bool firstLine, LineDirectionMode, LinePositio nMode = PositionOnContainingLine) const = 0; 183 virtual LayoutUnit lineHeight(bool firstLine, LineDirectionMode, LinePositio nMode = PositionOnContainingLine) const = 0;
184 virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode , LinePositionMode = PositionOnContainingLine) const = 0; 184 virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode , LinePositionMode = PositionOnContainingLine) const = 0;
185 185
186 virtual void mapAbsoluteToLocalPoint(MapCoordinatesFlags, TransformState&) c onst override; 186 virtual void mapAbsoluteToLocalPoint(MapCoordinatesFlags, TransformState&) c onst override;
187 virtual const LayoutObject* pushMappingToContainer(const LayoutBoxModelObjec t* ancestorToStopAt, LayoutGeometryMap&) const override; 187 virtual const LayoutObject* pushMappingToContainer(const LayoutBoxModelObjec t* ancestorToStopAt, LayoutGeometryMap&) const override;
188 188
189 virtual void setSelectionState(SelectionState) override; 189 virtual void setSelectionState(SelectionState) override;
190 190
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
263 virtual bool isLayoutBoxModelObject() const override final { return true; } 263 virtual bool isLayoutBoxModelObject() const override final { return true; }
264 264
265 OwnPtr<DeprecatedPaintLayer> m_layer; 265 OwnPtr<DeprecatedPaintLayer> m_layer;
266 }; 266 };
267 267
268 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBoxModelObject, isBoxModelObject()); 268 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBoxModelObject, isBoxModelObject());
269 269
270 } // namespace blink 270 } // namespace blink
271 271
272 #endif // LayoutBoxModelObject_h 272 #endif // LayoutBoxModelObject_h
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutBox.cpp ('k') | Source/core/layout/LayoutBoxModelObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698