| OLD | NEW |
| 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 10 matching lines...) Expand all Loading... |
| 21 * Boston, MA 02110-1301, USA. | 21 * Boston, MA 02110-1301, USA. |
| 22 * | 22 * |
| 23 */ | 23 */ |
| 24 | 24 |
| 25 #ifndef BorderValue_h | 25 #ifndef BorderValue_h |
| 26 #define BorderValue_h | 26 #define BorderValue_h |
| 27 | 27 |
| 28 #include "core/css/StyleColor.h" | 28 #include "core/css/StyleColor.h" |
| 29 #include "core/style/ComputedStyleConstants.h" | 29 #include "core/style/ComputedStyleConstants.h" |
| 30 #include "platform/graphics/Color.h" | 30 #include "platform/graphics/Color.h" |
| 31 #include "wtf/Allocator.h" |
| 31 | 32 |
| 32 namespace blink { | 33 namespace blink { |
| 33 | 34 |
| 34 class BorderValue { | 35 class BorderValue { |
| 36 DISALLOW_ALLOCATION(); |
| 35 friend class ComputedStyle; | 37 friend class ComputedStyle; |
| 36 public: | 38 public: |
| 37 BorderValue() | 39 BorderValue() |
| 38 : m_color(0) | 40 : m_color(0) |
| 39 , m_colorIsCurrentColor(true) | 41 , m_colorIsCurrentColor(true) |
| 40 , m_width(3) | 42 , m_width(3) |
| 41 , m_style(BNONE) | 43 , m_style(BNONE) |
| 42 , m_isAuto(AUTO_OFF) | 44 , m_isAuto(AUTO_OFF) |
| 43 { | 45 { |
| 44 } | 46 } |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 98 unsigned m_width : 26; | 100 unsigned m_width : 26; |
| 99 unsigned m_style : 4; // EBorderStyle | 101 unsigned m_style : 4; // EBorderStyle |
| 100 | 102 |
| 101 // This is only used by OutlineValue but moved here to keep the bits packed. | 103 // This is only used by OutlineValue but moved here to keep the bits packed. |
| 102 unsigned m_isAuto : 1; // OutlineIsAuto | 104 unsigned m_isAuto : 1; // OutlineIsAuto |
| 103 }; | 105 }; |
| 104 | 106 |
| 105 } // namespace blink | 107 } // namespace blink |
| 106 | 108 |
| 107 #endif // BorderValue_h | 109 #endif // BorderValue_h |
| OLD | NEW |