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

Side by Side Diff: third_party/WebKit/Source/core/style/CollapsedBorderValue.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) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Antti Koivisto (koivisto@kde.org) 3 * (C) 2000 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) 6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 13 matching lines...) Expand all
24 24
25 #ifndef CollapsedBorderValue_h 25 #ifndef CollapsedBorderValue_h
26 #define CollapsedBorderValue_h 26 #define CollapsedBorderValue_h
27 27
28 #include "core/style/BorderValue.h" 28 #include "core/style/BorderValue.h"
29 #include "wtf/Allocator.h" 29 #include "wtf/Allocator.h"
30 30
31 namespace blink { 31 namespace blink {
32 32
33 class CollapsedBorderValue { 33 class CollapsedBorderValue {
34 ALLOW_ONLY_INLINE_ALLOCATION(); 34 DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
35 public: 35 public:
36 CollapsedBorderValue() 36 CollapsedBorderValue()
37 : m_color(0) 37 : m_color(0)
38 , m_colorIsCurrentColor(true) 38 , m_colorIsCurrentColor(true)
39 , m_width(0) 39 , m_width(0)
40 , m_style(BNONE) 40 , m_style(BNONE)
41 , m_precedence(BOFF) 41 , m_precedence(BOFF)
42 , m_transparent(false) 42 , m_transparent(false)
43 { 43 {
44 } 44 }
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 unsigned m_colorIsCurrentColor : 1; 80 unsigned m_colorIsCurrentColor : 1;
81 unsigned m_width : 23; 81 unsigned m_width : 23;
82 unsigned m_style : 4; // EBorderStyle 82 unsigned m_style : 4; // EBorderStyle
83 unsigned m_precedence : 3; // EBorderPrecedence 83 unsigned m_precedence : 3; // EBorderPrecedence
84 unsigned m_transparent : 1; 84 unsigned m_transparent : 1;
85 }; 85 };
86 86
87 } // namespace blink 87 } // namespace blink
88 88
89 #endif // CollapsedBorderValue_h 89 #endif // CollapsedBorderValue_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/style/BorderValue.h ('k') | third_party/WebKit/Source/core/style/CounterDirectives.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698