OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) Research In Motion Limited 2010. All rights reserved. | 2 * Copyright (C) Research In Motion Limited 2010. All rights reserved. |
3 * | 3 * |
4 * This library is free software; you can redistribute it and/or | 4 * This library is free software; you can redistribute it and/or |
5 * modify it under the terms of the GNU Library General Public | 5 * modify it under the terms of the GNU Library General Public |
6 * License as published by the Free Software Foundation; either | 6 * License as published by the Free Software Foundation; either |
7 * version 2 of the License, or (at your option) any later version. | 7 * version 2 of the License, or (at your option) any later version. |
8 * | 8 * |
9 * This library is distributed in the hope that it will be useful, | 9 * This library is distributed in the hope that it will be useful, |
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
(...skipping 12 matching lines...) Expand all Loading... |
23 #include "core/svg/properties/SVGPropertyTearOff.h" | 23 #include "core/svg/properties/SVGPropertyTearOff.h" |
24 | 24 |
25 namespace WebCore { | 25 namespace WebCore { |
26 | 26 |
27 #if COMPILER(MSVC) | 27 #if COMPILER(MSVC) |
28 // UpdateMethod is 12 bytes. We have to pack to a size greater than or equal to
that to avoid an | 28 // UpdateMethod is 12 bytes. We have to pack to a size greater than or equal to
that to avoid an |
29 // alignment warning (C4121). 16 is the next-largest size allowed for packing, s
o we use that. | 29 // alignment warning (C4121). 16 is the next-largest size allowed for packing, s
o we use that. |
30 #pragma pack(push, 16) | 30 #pragma pack(push, 16) |
31 #endif | 31 #endif |
32 template<typename ContextElement, typename PropertyType> | 32 template<typename ContextElement, typename PropertyType> |
33 class SVGStaticPropertyTearOff : public SVGPropertyTearOff<PropertyType> { | 33 class SVGStaticPropertyTearOff FINAL : public SVGPropertyTearOff<PropertyType> { |
34 public: | 34 public: |
35 typedef SVGStaticPropertyTearOff<ContextElement, PropertyType> Self; | 35 typedef SVGStaticPropertyTearOff<ContextElement, PropertyType> Self; |
36 typedef void (ContextElement::*UpdateMethod)(); | 36 typedef void (ContextElement::*UpdateMethod)(); |
37 | 37 |
38 // Used for non-animated POD types that are not associated with a SVGAnimate
dProperty object, nor with a XML DOM attribute | 38 // Used for non-animated POD types that are not associated with a SVGAnimate
dProperty object, nor with a XML DOM attribute |
39 // (for example: SVGSVGElement::currentTranslate). | 39 // (for example: SVGSVGElement::currentTranslate). |
40 static PassRefPtr<Self> create(ContextElement* contextElement, PropertyType&
value, UpdateMethod update) | 40 static PassRefPtr<Self> create(ContextElement* contextElement, PropertyType&
value, UpdateMethod update) |
41 { | 41 { |
42 ASSERT(contextElement); | 42 ASSERT(contextElement); |
43 return adoptRef(new Self(contextElement, value, update)); | 43 return adoptRef(new Self(contextElement, value, update)); |
44 } | 44 } |
45 | 45 |
46 virtual void commitChange() { (m_contextElement.get()->*m_update)(); } | 46 virtual void commitChange() OVERRIDE { (m_contextElement.get()->*m_update)()
; } |
47 | 47 |
48 private: | 48 private: |
49 SVGStaticPropertyTearOff(ContextElement* contextElement, PropertyType& value
, UpdateMethod update) | 49 SVGStaticPropertyTearOff(ContextElement* contextElement, PropertyType& value
, UpdateMethod update) |
50 : SVGPropertyTearOff<PropertyType>(0, UndefinedRole, value) | 50 : SVGPropertyTearOff<PropertyType>(0, UndefinedRole, value) |
51 , m_update(update) | 51 , m_update(update) |
52 , m_contextElement(contextElement) | 52 , m_contextElement(contextElement) |
53 { | 53 { |
54 m_contextElement->setContextElement(); | 54 m_contextElement->setContextElement(); |
55 } | 55 } |
56 | 56 |
57 UpdateMethod m_update; | 57 UpdateMethod m_update; |
58 RefPtr<ContextElement> m_contextElement; | 58 RefPtr<ContextElement> m_contextElement; |
59 }; | 59 }; |
60 #if COMPILER(MSVC) | 60 #if COMPILER(MSVC) |
61 #pragma pack(pop) | 61 #pragma pack(pop) |
62 #endif | 62 #endif |
63 | 63 |
64 } | 64 } |
65 | 65 |
66 #endif // SVGStaticPropertyTearOff_h | 66 #endif // SVGStaticPropertyTearOff_h |
OLD | NEW |