| 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 13 matching lines...) Expand all Loading... |
| 24 | 24 |
| 25 #ifndef CounterDirectives_h | 25 #ifndef CounterDirectives_h |
| 26 #define CounterDirectives_h | 26 #define CounterDirectives_h |
| 27 | 27 |
| 28 #include "wtf/Allocator.h" | 28 #include "wtf/Allocator.h" |
| 29 #include "wtf/HashMap.h" | 29 #include "wtf/HashMap.h" |
| 30 #include "wtf/MathExtras.h" | 30 #include "wtf/MathExtras.h" |
| 31 #include "wtf/RefPtr.h" | 31 #include "wtf/RefPtr.h" |
| 32 #include "wtf/text/AtomicString.h" | 32 #include "wtf/text/AtomicString.h" |
| 33 #include "wtf/text/AtomicStringHash.h" | 33 #include "wtf/text/AtomicStringHash.h" |
| 34 #include <memory> |
| 34 | 35 |
| 35 namespace blink { | 36 namespace blink { |
| 36 | 37 |
| 37 class CounterDirectives { | 38 class CounterDirectives { |
| 38 DISALLOW_NEW_EXCEPT_PLACEMENT_NEW(); | 39 DISALLOW_NEW_EXCEPT_PLACEMENT_NEW(); |
| 39 public: | 40 public: |
| 40 CounterDirectives() | 41 CounterDirectives() |
| 41 : m_isResetSet(false) | 42 : m_isResetSet(false) |
| 42 , m_isIncrementSet(false) | 43 , m_isIncrementSet(false) |
| 43 , m_resetValue(0) | 44 , m_resetValue(0) |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 99 bool m_isIncrementSet; | 100 bool m_isIncrementSet; |
| 100 int m_resetValue; | 101 int m_resetValue; |
| 101 int m_incrementValue; | 102 int m_incrementValue; |
| 102 }; | 103 }; |
| 103 | 104 |
| 104 bool operator==(const CounterDirectives&, const CounterDirectives&); | 105 bool operator==(const CounterDirectives&, const CounterDirectives&); |
| 105 inline bool operator!=(const CounterDirectives& a, const CounterDirectives& b) {
return !(a == b); } | 106 inline bool operator!=(const CounterDirectives& a, const CounterDirectives& b) {
return !(a == b); } |
| 106 | 107 |
| 107 typedef HashMap<AtomicString, CounterDirectives> CounterDirectiveMap; | 108 typedef HashMap<AtomicString, CounterDirectives> CounterDirectiveMap; |
| 108 | 109 |
| 109 PassOwnPtr<CounterDirectiveMap> clone(const CounterDirectiveMap&); | 110 std::unique_ptr<CounterDirectiveMap> clone(const CounterDirectiveMap&); |
| 110 | 111 |
| 111 } // namespace blink | 112 } // namespace blink |
| 112 | 113 |
| 113 #endif // CounterDirectives_h | 114 #endif // CounterDirectives_h |
| OLD | NEW |