| 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 17 matching lines...) Expand all Loading... |
| 28 */ | 28 */ |
| 29 | 29 |
| 30 #ifndef Shape_h | 30 #ifndef Shape_h |
| 31 #define Shape_h | 31 #define Shape_h |
| 32 | 32 |
| 33 #include "core/rendering/style/BasicShapes.h" | 33 #include "core/rendering/style/BasicShapes.h" |
| 34 #include "core/rendering/style/StyleImage.h" | 34 #include "core/rendering/style/StyleImage.h" |
| 35 #include "platform/geometry/LayoutRect.h" | 35 #include "platform/geometry/LayoutRect.h" |
| 36 #include "platform/geometry/RoundedRect.h" | 36 #include "platform/geometry/RoundedRect.h" |
| 37 #include "platform/graphics/Path.h" | 37 #include "platform/graphics/Path.h" |
| 38 #include "platform/text/WritingMode.h" | |
| 39 #include "wtf/PassOwnPtr.h" | 38 #include "wtf/PassOwnPtr.h" |
| 40 #include "wtf/Vector.h" | 39 #include "wtf/Vector.h" |
| 41 | 40 |
| 42 namespace blink { | 41 namespace blink { |
| 43 | 42 |
| 44 struct LineSegment { | 43 struct LineSegment { |
| 45 LineSegment() | 44 LineSegment() |
| 46 : logicalLeft(0) | 45 : logicalLeft(0) |
| 47 , logicalRight(0) | 46 , logicalRight(0) |
| 48 , isValid(false) | 47 , isValid(false) |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 96 return false; | 95 return false; |
| 97 return (lineTop < rect.maxY() && lineTop + lineHeight > rect.y()) || (!l
ineHeight && lineTop == rect.y()); | 96 return (lineTop < rect.maxY() && lineTop + lineHeight > rect.y()) || (!l
ineHeight && lineTop == rect.y()); |
| 98 } | 97 } |
| 99 | 98 |
| 100 float m_margin; | 99 float m_margin; |
| 101 }; | 100 }; |
| 102 | 101 |
| 103 } // namespace blink | 102 } // namespace blink |
| 104 | 103 |
| 105 #endif // Shape_h | 104 #endif // Shape_h |
| OLD | NEW |