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

Side by Side Diff: third_party/WebKit/Source/core/editing/CompositionUnderline.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) 2006, 2007, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008 Apple 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 14 matching lines...) Expand all
25 25
26 #ifndef CompositionUnderline_h 26 #ifndef CompositionUnderline_h
27 #define CompositionUnderline_h 27 #define CompositionUnderline_h
28 28
29 #include "platform/graphics/Color.h" 29 #include "platform/graphics/Color.h"
30 #include "wtf/Allocator.h" 30 #include "wtf/Allocator.h"
31 31
32 namespace blink { 32 namespace blink {
33 33
34 struct CompositionUnderline { 34 struct CompositionUnderline {
35 ALLOW_ONLY_INLINE_ALLOCATION(); 35 DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
36 CompositionUnderline() 36 CompositionUnderline()
37 : startOffset(0) 37 : startOffset(0)
38 , endOffset(0) 38 , endOffset(0)
39 , color(Color::transparent) 39 , color(Color::transparent)
40 , thick(false) 40 , thick(false)
41 , backgroundColor(Color::transparent) { } 41 , backgroundColor(Color::transparent) { }
42 42
43 CompositionUnderline(unsigned s, unsigned e, const Color& c, bool t, const C olor& bc) 43 CompositionUnderline(unsigned s, unsigned e, const Color& c, bool t, const C olor& bc)
44 : startOffset(s) 44 : startOffset(s)
45 , endOffset(e) 45 , endOffset(e)
46 , color(c) 46 , color(c)
47 , thick(t) 47 , thick(t)
48 , backgroundColor(bc) { } 48 , backgroundColor(bc) { }
49 49
50 unsigned startOffset; 50 unsigned startOffset;
51 unsigned endOffset; 51 unsigned endOffset;
52 Color color; 52 Color color;
53 bool thick; 53 bool thick;
54 Color backgroundColor; 54 Color backgroundColor;
55 }; 55 };
56 56
57 } // namespace blink 57 } // namespace blink
58 58
59 #endif // CompositionUnderline_h 59 #endif // CompositionUnderline_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698