| 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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 48 static PassOwnPtr<ShapeOutsideInfo> createInfo(const RenderBox& renderer) {
return adoptPtr(new ShapeOutsideInfo(renderer)); } | 48 static PassOwnPtr<ShapeOutsideInfo> createInfo(const RenderBox& renderer) {
return adoptPtr(new ShapeOutsideInfo(renderer)); } |
| 49 static bool isEnabledFor(const RenderBox&); | 49 static bool isEnabledFor(const RenderBox&); |
| 50 void updateDeltasForContainingBlockLine(const RenderBlockFlow&, const Floati
ngObject&, LayoutUnit lineTop, LayoutUnit lineHeight); | 50 void updateDeltasForContainingBlockLine(const RenderBlockFlow&, const Floati
ngObject&, LayoutUnit lineTop, LayoutUnit lineHeight); |
| 51 | 51 |
| 52 virtual bool lineOverlapsShapeBounds() const OVERRIDE | 52 virtual bool lineOverlapsShapeBounds() const OVERRIDE |
| 53 { | 53 { |
| 54 return computedShape().lineOverlapsShapeMarginBounds(m_referenceBoxLineT
op, m_lineHeight); | 54 return computedShape().lineOverlapsShapeMarginBounds(m_referenceBoxLineT
op, m_lineHeight); |
| 55 } | 55 } |
| 56 | 56 |
| 57 protected: | 57 protected: |
| 58 virtual LayoutBox referenceBox() const OVERRIDE | 58 virtual CSSBoxType referenceBox() const OVERRIDE |
| 59 { | 59 { |
| 60 if (shapeValue()->layoutBox() == BoxMissing) | 60 if (shapeValue()->cssBox() == BoxMissing) |
| 61 return MarginBox; | 61 return MarginBox; |
| 62 return shapeValue()->layoutBox(); | 62 return shapeValue()->cssBox(); |
| 63 } | 63 } |
| 64 virtual LayoutRect computedShapeLogicalBoundingBox() const OVERRIDE { return
computedShape().shapeMarginLogicalBoundingBox(); } | 64 virtual LayoutRect computedShapeLogicalBoundingBox() const OVERRIDE { return
computedShape().shapeMarginLogicalBoundingBox(); } |
| 65 virtual ShapeValue* shapeValue() const OVERRIDE; | 65 virtual ShapeValue* shapeValue() const OVERRIDE; |
| 66 virtual void getIntervals(LayoutUnit lineTop, LayoutUnit lineHeight, Segment
List& segments) const OVERRIDE | 66 virtual void getIntervals(LayoutUnit lineTop, LayoutUnit lineHeight, Segment
List& segments) const OVERRIDE |
| 67 { | 67 { |
| 68 return computedShape().getExcludedIntervals(lineTop, lineHeight, segment
s); | 68 return computedShape().getExcludedIntervals(lineTop, lineHeight, segment
s); |
| 69 } | 69 } |
| 70 | 70 |
| 71 virtual const RenderStyle* styleForWritingMode() const OVERRIDE; | 71 virtual const RenderStyle* styleForWritingMode() const OVERRIDE; |
| 72 | 72 |
| 73 private: | 73 private: |
| 74 ShapeOutsideInfo(const RenderBox& renderer) | 74 ShapeOutsideInfo(const RenderBox& renderer) |
| 75 : ShapeInfo<RenderBox>(renderer) | 75 : ShapeInfo<RenderBox>(renderer) |
| 76 , m_lineOverlapsShape(false) | 76 , m_lineOverlapsShape(false) |
| 77 { } | 77 { } |
| 78 | 78 |
| 79 LayoutUnit m_leftMarginBoxDelta; | 79 LayoutUnit m_leftMarginBoxDelta; |
| 80 LayoutUnit m_rightMarginBoxDelta; | 80 LayoutUnit m_rightMarginBoxDelta; |
| 81 LayoutUnit m_borderBoxLineTop; | 81 LayoutUnit m_borderBoxLineTop; |
| 82 bool m_lineOverlapsShape; | 82 bool m_lineOverlapsShape; |
| 83 }; | 83 }; |
| 84 | 84 |
| 85 } | 85 } |
| 86 #endif | 86 #endif |
| OLD | NEW |