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

Side by Side Diff: Source/core/layout/LayoutRubyBase.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/LayoutRuby.h ('k') | Source/core/layout/LayoutRubyBase.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) 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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 virtual bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectRubyBase || LayoutBlockFlow::isOfType(type); } 48 virtual bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectRubyBase || LayoutBlockFlow::isOfType(type); }
49 49
50 virtual bool isChildAllowed(LayoutObject*, const ComputedStyle&) const overr ide; 50 virtual bool isChildAllowed(LayoutObject*, const ComputedStyle&) const overr ide;
51 51
52 private: 52 private:
53 LayoutRubyBase(); 53 LayoutRubyBase();
54 54
55 virtual ETextAlign textAlignmentForLine(bool endsWithSoftBreak) const overri de; 55 virtual ETextAlign textAlignmentForLine(bool endsWithSoftBreak) const overri de;
56 virtual void adjustInlineDirectionLineBounds(unsigned expansionOpportunityCo unt, LayoutUnit& logicalLeft, LayoutUnit& logicalWidth) const override; 56 virtual void adjustInlineDirectionLineBounds(unsigned expansionOpportunityCo unt, LayoutUnit& logicalLeft, LayoutUnit& logicalWidth) const override;
57 57
58 void moveChildren(LayoutRubyBase* toBase, LayoutObject* beforeChild = 0); 58 void moveChildren(LayoutRubyBase* toBase, LayoutObject* beforeChild = nullpt r);
59 void moveInlineChildren(LayoutRubyBase* toBase, LayoutObject* beforeChild = 0); 59 void moveInlineChildren(LayoutRubyBase* toBase, LayoutObject* beforeChild = nullptr);
60 void moveBlockChildren(LayoutRubyBase* toBase, LayoutObject* beforeChild = 0 ); 60 void moveBlockChildren(LayoutRubyBase* toBase, LayoutObject* beforeChild = n ullptr);
61 61
62 // Allow LayoutRubyRun to manipulate the children within ruby bases. 62 // Allow LayoutRubyRun to manipulate the children within ruby bases.
63 friend class LayoutRubyRun; 63 friend class LayoutRubyRun;
64 }; 64 };
65 65
66 } // namespace blink 66 } // namespace blink
67 67
68 #endif // LayoutRubyBase_h 68 #endif // LayoutRubyBase_h
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutRuby.h ('k') | Source/core/layout/LayoutRubyBase.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698