| 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 * Copyright (C) 2003, 2004, 2005, 2006, 2010 Apple Inc. All rights reserved. | 4 * Copyright (C) 2003, 2004, 2005, 2006, 2010 Apple Inc. All rights reserved. |
| 5 * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net) | 5 * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net) |
| 6 * | 6 * |
| 7 * This library is free software; you can redistribute it and/or | 7 * This library is free software; you can redistribute it and/or |
| 8 * modify it under the terms of the GNU Library General Public | 8 * modify it under the terms of the GNU Library General Public |
| 9 * License as published by the Free Software Foundation; either | 9 * License as published by the Free Software Foundation; either |
| 10 * version 2 of the License, or (at your option) any later version. | 10 * version 2 of the License, or (at your option) any later version. |
| (...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 351 newLogicalLayoutOverflowRect.setWidth(newLogicalLayoutOverfl
owRect.maxX() - markerLogicalLeft); | 351 newLogicalLayoutOverflowRect.setWidth(newLogicalLayoutOverfl
owRect.maxX() - markerLogicalLeft); |
| 352 newLogicalLayoutOverflowRect.setX(markerLogicalLeft); | 352 newLogicalLayoutOverflowRect.setX(markerLogicalLeft); |
| 353 if (box == root) | 353 if (box == root) |
| 354 adjustOverflow = true; | 354 adjustOverflow = true; |
| 355 } | 355 } |
| 356 box->setOverflowFromLogicalRects(newLogicalLayoutOverflowRect, n
ewLogicalVisualOverflowRect, lineTop, lineBottom); | 356 box->setOverflowFromLogicalRects(newLogicalLayoutOverflowRect, n
ewLogicalVisualOverflowRect, lineTop, lineBottom); |
| 357 if (box->boxModelObject()->hasSelfPaintingLayer()) | 357 if (box->boxModelObject()->hasSelfPaintingLayer()) |
| 358 hitSelfPaintingLayer = true; | 358 hitSelfPaintingLayer = true; |
| 359 } | 359 } |
| 360 } else { | 360 } else { |
| 361 markerLogicalLeft = m_marker->logicalLeft() + paddingStart() + borde
rStart() + m_marker->marginEnd(); | |
| 362 LayoutUnit rightLineOffset = logicalRightOffsetForLine(blockOffset,
logicalRightOffsetForLine(blockOffset, false), false); | 361 LayoutUnit rightLineOffset = logicalRightOffsetForLine(blockOffset,
logicalRightOffsetForLine(blockOffset, false), false); |
| 363 markerLogicalLeft = rightLineOffset - lineOffset + paddingStart() +
borderStart() + m_marker->marginEnd(); | 362 markerLogicalLeft = rightLineOffset - lineOffset + paddingStart() +
borderStart() + m_marker->marginEnd(); |
| 364 m_marker->inlineBoxWrapper()->adjustLineDirectionPosition(markerLogi
calLeft - markerOldLogicalLeft); | 363 m_marker->inlineBoxWrapper()->adjustLineDirectionPosition(markerLogi
calLeft - markerOldLogicalLeft); |
| 365 for (InlineFlowBox* box = m_marker->inlineBoxWrapper()->parent(); bo
x; box = box->parent()) { | 364 for (InlineFlowBox* box = m_marker->inlineBoxWrapper()->parent(); bo
x; box = box->parent()) { |
| 366 LayoutRect newLogicalVisualOverflowRect = box->logicalVisualOver
flowRect(lineTop, lineBottom); | 365 LayoutRect newLogicalVisualOverflowRect = box->logicalVisualOver
flowRect(lineTop, lineBottom); |
| 367 LayoutRect newLogicalLayoutOverflowRect = box->logicalLayoutOver
flowRect(lineTop, lineBottom); | 366 LayoutRect newLogicalLayoutOverflowRect = box->logicalLayoutOver
flowRect(lineTop, lineBottom); |
| 368 if (markerLogicalLeft + m_marker->logicalWidth() > newLogicalVis
ualOverflowRect.maxX() && !hitSelfPaintingLayer) { | 367 if (markerLogicalLeft + m_marker->logicalWidth() > newLogicalVis
ualOverflowRect.maxX() && !hitSelfPaintingLayer) { |
| 369 newLogicalVisualOverflowRect.setWidth(markerLogicalLeft + m_
marker->logicalWidth() - newLogicalVisualOverflowRect.x()); | 368 newLogicalVisualOverflowRect.setWidth(markerLogicalLeft + m_
marker->logicalWidth() - newLogicalVisualOverflowRect.x()); |
| 370 if (box == root) | 369 if (box == root) |
| 371 adjustOverflow = true; | 370 adjustOverflow = true; |
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 504 // assume that all the following ones have too. | 503 // assume that all the following ones have too. |
| 505 // This gives us the opportunity to stop here and avoid | 504 // This gives us the opportunity to stop here and avoid |
| 506 // marking the same nodes again. | 505 // marking the same nodes again. |
| 507 break; | 506 break; |
| 508 } | 507 } |
| 509 item->updateValue(); | 508 item->updateValue(); |
| 510 } | 509 } |
| 511 } | 510 } |
| 512 | 511 |
| 513 } // namespace WebCore | 512 } // namespace WebCore |
| OLD | NEW |