| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2007 Apple Inc. All rights reserved. | 2 * Copyright (C) 2007 Apple Inc. 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 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 58 if (fixed) { | 58 if (fixed) { |
| 59 // FIXME: This doesn't work correctly with transforms. | 59 // FIXME: This doesn't work correctly with transforms. |
| 60 FloatPoint fixedOffset = renderer.view()->localToAbsolute(FloatPoint(),
IsFixed); | 60 FloatPoint fixedOffset = renderer.view()->localToAbsolute(FloatPoint(),
IsFixed); |
| 61 m_paintOffset = LayoutSize(fixedOffset.x(), fixedOffset.y()) + offset; | 61 m_paintOffset = LayoutSize(fixedOffset.x(), fixedOffset.y()) + offset; |
| 62 } else { | 62 } else { |
| 63 m_paintOffset = m_next->m_paintOffset + offset; | 63 m_paintOffset = m_next->m_paintOffset + offset; |
| 64 } | 64 } |
| 65 | 65 |
| 66 if (renderer.isOutOfFlowPositioned() && !fixed) { | 66 if (renderer.isOutOfFlowPositioned() && !fixed) { |
| 67 if (RenderObject* container = renderer.container()) { | 67 if (RenderObject* container = renderer.container()) { |
| 68 if (container->isInFlowPositioned() && container->isRenderInline()) | 68 if (container->isRelPositioned() && container->isRenderInline()) |
| 69 m_paintOffset += toRenderInline(container)->offsetForInFlowPosit
ionedInline(renderer); | 69 m_paintOffset += toRenderInline(container)->offsetForInFlowPosit
ionedInline(renderer); |
| 70 } | 70 } |
| 71 } | 71 } |
| 72 | 72 |
| 73 m_layoutOffset = m_paintOffset; | 73 m_layoutOffset = m_paintOffset; |
| 74 | 74 |
| 75 if (renderer.isInFlowPositioned() && renderer.hasLayer()) | 75 if (renderer.isRelPositioned() && renderer.hasLayer()) |
| 76 m_paintOffset += renderer.layer()->offsetForInFlowPosition(); | 76 m_paintOffset += renderer.layer()->offsetForInFlowPosition(); |
| 77 | 77 |
| 78 m_clipped = !fixed && m_next->m_clipped; | 78 m_clipped = !fixed && m_next->m_clipped; |
| 79 if (m_clipped) | 79 if (m_clipped) |
| 80 m_clipRect = m_next->m_clipRect; | 80 m_clipRect = m_next->m_clipRect; |
| 81 | 81 |
| 82 if (renderer.hasOverflowClip()) { | 82 if (renderer.hasOverflowClip()) { |
| 83 LayoutRect clipRect(toPoint(m_paintOffset), renderer.cachedSizeForOverfl
owClip()); | 83 LayoutRect clipRect(toPoint(m_paintOffset), renderer.cachedSizeForOverfl
owClip()); |
| 84 if (m_clipped) | 84 if (m_clipped) |
| 85 m_clipRect.intersect(clipRect); | 85 m_clipRect.intersect(clipRect); |
| (...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 186 } | 186 } |
| 187 | 187 |
| 188 void LayoutState::addForcedColumnBreak(const RenderBox& child, const LayoutUnit&
childLogicalOffset) | 188 void LayoutState::addForcedColumnBreak(const RenderBox& child, const LayoutUnit&
childLogicalOffset) |
| 189 { | 189 { |
| 190 if (!m_columnInfo || m_columnInfo->columnHeight()) | 190 if (!m_columnInfo || m_columnInfo->columnHeight()) |
| 191 return; | 191 return; |
| 192 m_columnInfo->addForcedBreak(pageLogicalOffset(child, childLogicalOffset)); | 192 m_columnInfo->addForcedBreak(pageLogicalOffset(child, childLogicalOffset)); |
| 193 } | 193 } |
| 194 | 194 |
| 195 } // namespace WebCore | 195 } // namespace WebCore |
| OLD | NEW |