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

Side by Side Diff: Source/core/layout/LayoutListMarker.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/LayoutListItem.cpp ('k') | Source/core/layout/LayoutListMarker.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, 2004, 2005, 2006, 2007, 2009 Apple Inc. All rights reserv ed. 4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2009 Apple Inc. All rights reserv ed.
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 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 LayoutListMarker(LayoutListItem*); 64 LayoutListMarker(LayoutListItem*);
65 65
66 virtual void computePreferredLogicalWidths() override; 66 virtual void computePreferredLogicalWidths() override;
67 67
68 virtual bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectListMarker || LayoutBox::isOfType(type); } 68 virtual bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectListMarker || LayoutBox::isOfType(type); }
69 69
70 virtual void paint(const PaintInfo&, const LayoutPoint&) override; 70 virtual void paint(const PaintInfo&, const LayoutPoint&) override;
71 71
72 virtual void layout() override; 72 virtual void layout() override;
73 73
74 virtual void imageChanged(WrappedImagePtr, const IntRect* = 0) override; 74 virtual void imageChanged(WrappedImagePtr, const IntRect* = nullptr) overrid e;
75 75
76 virtual InlineBox* createInlineBox() override; 76 virtual InlineBox* createInlineBox() override;
77 77
78 virtual LayoutUnit lineHeight(bool firstLine, LineDirectionMode, LinePositio nMode = PositionOnContainingLine) const override; 78 virtual LayoutUnit lineHeight(bool firstLine, LineDirectionMode, LinePositio nMode = PositionOnContainingLine) const override;
79 virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode , LinePositionMode = PositionOnContainingLine) const override; 79 virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode , LinePositionMode = PositionOnContainingLine) const override;
80 80
81 bool isText() const { return !isImage(); } 81 bool isText() const { return !isImage(); }
82 82
83 virtual void setSelectionState(SelectionState) override; 83 virtual void setSelectionState(SelectionState) override;
84 virtual LayoutRect selectionRectForPaintInvalidation(const LayoutBoxModelObj ect* paintInvalidationContainer) const override; 84 virtual LayoutRect selectionRectForPaintInvalidation(const LayoutBoxModelObj ect* paintInvalidationContainer) const override;
85 virtual bool canBeSelectionLeaf() const override { return true; } 85 virtual bool canBeSelectionLeaf() const override { return true; }
86 86
87 void updateMargins(); 87 void updateMargins();
88 void updateContent(); 88 void updateContent();
89 89
90 virtual void styleWillChange(StyleDifference, const ComputedStyle& newStyle) override; 90 virtual void styleWillChange(StyleDifference, const ComputedStyle& newStyle) override;
91 virtual void styleDidChange(StyleDifference, const ComputedStyle* oldStyle) override; 91 virtual void styleDidChange(StyleDifference, const ComputedStyle* oldStyle) override;
92 92
93 String m_text; 93 String m_text;
94 RefPtr<StyleImage> m_image; 94 RefPtr<StyleImage> m_image;
95 LayoutListItem* m_listItem; 95 LayoutListItem* m_listItem;
96 }; 96 };
97 97
98 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutListMarker, isListMarker()); 98 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutListMarker, isListMarker());
99 99
100 } // namespace blink 100 } // namespace blink
101 101
102 #endif // LayoutListMarker_h 102 #endif // LayoutListMarker_h
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutListItem.cpp ('k') | Source/core/layout/LayoutListMarker.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698