| 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 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 116 FloatPoint shapeToRendererPoint(FloatPoint) const; | 116 FloatPoint shapeToRendererPoint(FloatPoint) const; |
| 117 FloatSize shapeToRendererSize(FloatSize) const; | 117 FloatSize shapeToRendererSize(FloatSize) const; |
| 118 const Shape& computedShape() const; | 118 const Shape& computedShape() const; |
| 119 | 119 |
| 120 protected: | 120 protected: |
| 121 ShapeOutsideInfo(const RenderBox& renderer) | 121 ShapeOutsideInfo(const RenderBox& renderer) |
| 122 : m_renderer(renderer) | 122 : m_renderer(renderer) |
| 123 { } | 123 { } |
| 124 | 124 |
| 125 private: | 125 private: |
| 126 PassOwnPtr<Shape> createShapeForImage(StyleImage*, float shapeImageThreshold
, WritingMode, float margin) const; | 126 PassOwnPtr<Shape> createShapeForImage(StyleImage*, float shapeImageThreshold
, float margin) const; |
| 127 | 127 |
| 128 LayoutUnit logicalTopOffset() const; | 128 LayoutUnit logicalTopOffset() const; |
| 129 LayoutUnit logicalLeftOffset() const; | 129 LayoutUnit logicalLeftOffset() const; |
| 130 | 130 |
| 131 typedef HashMap<const RenderBox*, OwnPtr<ShapeOutsideInfo> > InfoMap; | 131 typedef HashMap<const RenderBox*, OwnPtr<ShapeOutsideInfo> > InfoMap; |
| 132 static InfoMap& infoMap() | 132 static InfoMap& infoMap() |
| 133 { | 133 { |
| 134 DEFINE_STATIC_LOCAL(InfoMap, staticInfoMap, ()); | 134 DEFINE_STATIC_LOCAL(InfoMap, staticInfoMap, ()); |
| 135 return staticInfoMap; | 135 return staticInfoMap; |
| 136 } | 136 } |
| 137 | 137 |
| 138 const RenderBox& m_renderer; | 138 const RenderBox& m_renderer; |
| 139 mutable OwnPtr<Shape> m_shape; | 139 mutable OwnPtr<Shape> m_shape; |
| 140 LayoutSize m_referenceBoxLogicalSize; | 140 LayoutSize m_referenceBoxLogicalSize; |
| 141 ShapeOutsideDeltas m_shapeOutsideDeltas; | 141 ShapeOutsideDeltas m_shapeOutsideDeltas; |
| 142 }; | 142 }; |
| 143 | 143 |
| 144 } | 144 } |
| 145 #endif | 145 #endif |
| OLD | NEW |