| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved. | 2 * Copyright (C) 2012 Adobe Systems Incorporated. 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 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above | 8 * 1. Redistributions of source code must retain the above |
| 9 * copyright notice, this list of conditions and the following | 9 * copyright notice, this list of conditions and the following |
| 10 * disclaimer. | 10 * disclaimer. |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 23 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR | 24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR |
| 25 * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF | 25 * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF |
| 26 * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | 26 * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
| 27 * SUCH DAMAGE. | 27 * SUCH DAMAGE. |
| 28 */ | 28 */ |
| 29 | 29 |
| 30 #ifndef ShapeInfo_h | 30 #ifndef ShapeInfo_h |
| 31 #define ShapeInfo_h | 31 #define ShapeInfo_h |
| 32 | 32 |
| 33 #include "core/platform/graphics/FloatRect.h" | |
| 34 #include "core/rendering/shapes/Shape.h" | 33 #include "core/rendering/shapes/Shape.h" |
| 35 #include "core/rendering/style/RenderStyle.h" | 34 #include "core/rendering/style/RenderStyle.h" |
| 36 #include "core/rendering/style/ShapeValue.h" | 35 #include "core/rendering/style/ShapeValue.h" |
| 37 #include "platform/LayoutUnit.h" | 36 #include "platform/LayoutUnit.h" |
| 37 #include "platform/geometry/FloatRect.h" |
| 38 #include "wtf/OwnPtr.h" | 38 #include "wtf/OwnPtr.h" |
| 39 #include "wtf/Vector.h" | 39 #include "wtf/Vector.h" |
| 40 | 40 |
| 41 namespace WebCore { | 41 namespace WebCore { |
| 42 | 42 |
| 43 template<class KeyType, class InfoType> | 43 template<class KeyType, class InfoType> |
| 44 class MappedInfo { | 44 class MappedInfo { |
| 45 public: | 45 public: |
| 46 static InfoType* ensureInfo(const KeyType* key) | 46 static InfoType* ensureInfo(const KeyType* key) |
| 47 { | 47 { |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 118 SegmentList m_segments; | 118 SegmentList m_segments; |
| 119 | 119 |
| 120 const RenderType* m_renderer; | 120 const RenderType* m_renderer; |
| 121 | 121 |
| 122 private: | 122 private: |
| 123 mutable OwnPtr<Shape> m_shape; | 123 mutable OwnPtr<Shape> m_shape; |
| 124 LayoutSize m_shapeLogicalSize; | 124 LayoutSize m_shapeLogicalSize; |
| 125 }; | 125 }; |
| 126 } | 126 } |
| 127 #endif | 127 #endif |
| OLD | NEW |