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

Side by Side Diff: Source/core/layout/LayoutRuby.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/LayoutReplica.cpp ('k') | Source/core/layout/LayoutRubyBase.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) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 // Note: <rp> elements are defined as having 'display:none' and thus normally ar e not assigned a layoutObject. 49 // Note: <rp> elements are defined as having 'display:none' and thus normally ar e not assigned a layoutObject.
50 // 50 //
51 // Generated :before/:after content is shunted into anonymous inline blocks 51 // Generated :before/:after content is shunted into anonymous inline blocks
52 52
53 // <ruby> when used as 'display:inline' 53 // <ruby> when used as 'display:inline'
54 class LayoutRubyAsInline final : public LayoutInline { 54 class LayoutRubyAsInline final : public LayoutInline {
55 public: 55 public:
56 LayoutRubyAsInline(Element*); 56 LayoutRubyAsInline(Element*);
57 virtual ~LayoutRubyAsInline(); 57 virtual ~LayoutRubyAsInline();
58 58
59 virtual void addChild(LayoutObject* child, LayoutObject* beforeChild = 0) ov erride; 59 virtual void addChild(LayoutObject* child, LayoutObject* beforeChild = nullp tr) override;
60 virtual void removeChild(LayoutObject* child) override; 60 virtual void removeChild(LayoutObject* child) override;
61 61
62 virtual const char* name() const override { return "LayoutRuby (inline)"; } 62 virtual const char* name() const override { return "LayoutRuby (inline)"; }
63 63
64 protected: 64 protected:
65 virtual void styleDidChange(StyleDifference, const ComputedStyle* oldStyle) override; 65 virtual void styleDidChange(StyleDifference, const ComputedStyle* oldStyle) override;
66 66
67 private: 67 private:
68 virtual bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectRuby || LayoutInline::isOfType(type); } 68 virtual bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectRuby || LayoutInline::isOfType(type); }
69 virtual bool createsAnonymousWrapper() const override { return true; } 69 virtual bool createsAnonymousWrapper() const override { return true; }
70 }; 70 };
71 71
72 // <ruby> when used as 'display:block' or 'display:inline-block' 72 // <ruby> when used as 'display:block' or 'display:inline-block'
73 class LayoutRubyAsBlock final : public LayoutBlockFlow { 73 class LayoutRubyAsBlock final : public LayoutBlockFlow {
74 public: 74 public:
75 LayoutRubyAsBlock(Element*); 75 LayoutRubyAsBlock(Element*);
76 virtual ~LayoutRubyAsBlock(); 76 virtual ~LayoutRubyAsBlock();
77 77
78 virtual void addChild(LayoutObject* child, LayoutObject* beforeChild = 0) ov erride; 78 virtual void addChild(LayoutObject* child, LayoutObject* beforeChild = nullp tr) override;
79 virtual void removeChild(LayoutObject* child) override; 79 virtual void removeChild(LayoutObject* child) override;
80 80
81 virtual const char* name() const override { return "LayoutRuby (block)"; } 81 virtual const char* name() const override { return "LayoutRuby (block)"; }
82 82
83 protected: 83 protected:
84 virtual void styleDidChange(StyleDifference, const ComputedStyle* oldStyle) override; 84 virtual void styleDidChange(StyleDifference, const ComputedStyle* oldStyle) override;
85 85
86 private: 86 private:
87 virtual bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectRuby || LayoutBlockFlow::isOfType(type); } 87 virtual bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectRuby || LayoutBlockFlow::isOfType(type); }
88 virtual bool createsAnonymousWrapper() const override { return true; } 88 virtual bool createsAnonymousWrapper() const override { return true; }
89 virtual void removeLeftoverAnonymousBlock(LayoutBlock*) override { ASSERT_NO T_REACHED(); } 89 virtual void removeLeftoverAnonymousBlock(LayoutBlock*) override { ASSERT_NO T_REACHED(); }
90 }; 90 };
91 91
92 } // namespace blink 92 } // namespace blink
93 93
94 #endif // LayoutRuby_h 94 #endif // LayoutRuby_h
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutReplica.cpp ('k') | Source/core/layout/LayoutRubyBase.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698