| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
| 4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) | 4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) |
| 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) | 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) |
| 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. | 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. |
| 7 * Copyright (C) 2010 Google Inc. All rights reserved. | 7 * Copyright (C) 2010 Google Inc. All rights reserved. |
| 8 * | 8 * |
| 9 * This library is free software; you can redistribute it and/or | 9 * This library is free software; you can redistribute it and/or |
| 10 * modify it under the terms of the GNU Library General Public | 10 * modify it under the terms of the GNU Library General Public |
| (...skipping 2013 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2024 } | 2024 } |
| 2025 | 2025 |
| 2026 void RenderBoxModelObject::clipBorderSidePolygon(GraphicsContext* graphicsContex
t, const RoundedRect& outerBorder, const RoundedRect& innerBorder, | 2026 void RenderBoxModelObject::clipBorderSidePolygon(GraphicsContext* graphicsContex
t, const RoundedRect& outerBorder, const RoundedRect& innerBorder, |
| 2027 BoxSide side, bool firstEdgeMat
ches, bool secondEdgeMatches) | 2027 BoxSide side, bool firstEdgeMat
ches, bool secondEdgeMatches) |
| 2028 { | 2028 { |
| 2029 FloatPoint quad[4]; | 2029 FloatPoint quad[4]; |
| 2030 | 2030 |
| 2031 const LayoutRect& outerRect = outerBorder.rect(); | 2031 const LayoutRect& outerRect = outerBorder.rect(); |
| 2032 const LayoutRect& innerRect = innerBorder.rect(); | 2032 const LayoutRect& innerRect = innerBorder.rect(); |
| 2033 | 2033 |
| 2034 FloatPoint centerPoint(innerRect.location().x() + static_cast<float>(innerRe
ct.width()) / 2, innerRect.location().y() + static_cast<float>(innerRect.height(
)) / 2); | 2034 FloatPoint centerPoint(innerRect.location().x().toFloat() + innerRect.width(
).toFloat() / 2, innerRect.location().y().toFloat() + innerRect.height().toFloat
() / 2); |
| 2035 | 2035 |
| 2036 // For each side, create a quad that encompasses all parts of that side that
may draw, | 2036 // For each side, create a quad that encompasses all parts of that side that
may draw, |
| 2037 // including areas inside the innerBorder. | 2037 // including areas inside the innerBorder. |
| 2038 // | 2038 // |
| 2039 // 0----------------3 | 2039 // 0----------------3 |
| 2040 // 0 \ / 0 | 2040 // 0 \ / 0 |
| 2041 // |\ 1----------- 2 /| | 2041 // |\ 1----------- 2 /| |
| 2042 // | 1 1 | | 2042 // | 1 1 | |
| 2043 // | | | | | 2043 // | | | | |
| 2044 // | | | | | 2044 // | | | | |
| (...skipping 761 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2806 ASSERT(!beforeChild || toBoxModelObject == beforeChild->parent()); | 2806 ASSERT(!beforeChild || toBoxModelObject == beforeChild->parent()); |
| 2807 for (RenderObject* child = startChild; child && child != endChild; ) { | 2807 for (RenderObject* child = startChild; child && child != endChild; ) { |
| 2808 // Save our next sibling as moveChildTo will clear it. | 2808 // Save our next sibling as moveChildTo will clear it. |
| 2809 RenderObject* nextSibling = child->nextSibling(); | 2809 RenderObject* nextSibling = child->nextSibling(); |
| 2810 moveChildTo(toBoxModelObject, child, beforeChild, fullRemoveInsert); | 2810 moveChildTo(toBoxModelObject, child, beforeChild, fullRemoveInsert); |
| 2811 child = nextSibling; | 2811 child = nextSibling; |
| 2812 } | 2812 } |
| 2813 } | 2813 } |
| 2814 | 2814 |
| 2815 } // namespace WebCore | 2815 } // namespace WebCore |
| OLD | NEW |