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

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

Issue 1406923009: Rename DISALLOW_ALLOCATION and ALLOW_ONLY_INLINE_ALLOCATION (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 } 53 }
54 54
55 static PassRefPtr<AbstractInlineTextBox> getOrCreate(LayoutText*, InlineText Box*); 55 static PassRefPtr<AbstractInlineTextBox> getOrCreate(LayoutText*, InlineText Box*);
56 static void willDestroy(InlineTextBox*); 56 static void willDestroy(InlineTextBox*);
57 57
58 friend class LayoutText; 58 friend class LayoutText;
59 friend class InlineTextBox; 59 friend class InlineTextBox;
60 60
61 public: 61 public:
62 struct WordBoundaries { 62 struct WordBoundaries {
63 ALLOW_ONLY_INLINE_ALLOCATION(); 63 DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
64 WordBoundaries(int startIndex, int endIndex) : startIndex(startIndex), e ndIndex(endIndex) { } 64 WordBoundaries(int startIndex, int endIndex) : startIndex(startIndex), e ndIndex(endIndex) { }
65 int startIndex; 65 int startIndex;
66 int endIndex; 66 int endIndex;
67 }; 67 };
68 68
69 enum Direction { 69 enum Direction {
70 LeftToRight, 70 LeftToRight,
71 RightToLeft, 71 RightToLeft,
72 TopToBottom, 72 TopToBottom,
73 BottomToTop 73 BottomToTop
(...skipping 22 matching lines...) Expand all
96 LayoutText* m_layoutText; 96 LayoutText* m_layoutText;
97 InlineTextBox* m_inlineTextBox; 97 InlineTextBox* m_inlineTextBox;
98 98
99 typedef HashMap<InlineTextBox*, RefPtr<AbstractInlineTextBox>> InlineToAbstr actInlineTextBoxHashMap; 99 typedef HashMap<InlineTextBox*, RefPtr<AbstractInlineTextBox>> InlineToAbstr actInlineTextBoxHashMap;
100 static InlineToAbstractInlineTextBoxHashMap* gAbstractInlineTextBoxMap; 100 static InlineToAbstractInlineTextBoxHashMap* gAbstractInlineTextBoxMap;
101 }; 101 };
102 102
103 } // namespace blink 103 } // namespace blink
104 104
105 #endif // AbstractInlineTextBox_h 105 #endif // AbstractInlineTextBox_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698