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) 2007 David Smith (catfish.man@gmail.com) | 4 * (C) 2007 David Smith (catfish.man@gmail.com) |
5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All r
ights reserved. | 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All r
ights reserved. |
6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. | 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. |
7 * | 7 * |
8 * This library is free software; you can redistribute it and/or | 8 * This library is free software; you can redistribute it and/or |
9 * modify it under the terms of the GNU Library General Public | 9 * modify it under the terms of the GNU Library General Public |
10 * License as published by the Free Software Foundation; either | 10 * License as published by the Free Software Foundation; either |
(...skipping 5452 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5463 if (currChild->isListMarker()) | 5463 if (currChild->isListMarker()) |
5464 currChild = currChild->nextSibling(); | 5464 currChild = currChild->nextSibling(); |
5465 else if (currChild->isFloatingOrPositioned()) { | 5465 else if (currChild->isFloatingOrPositioned()) { |
5466 if (currChild->style()->styleType() == FIRST_LETTER) { | 5466 if (currChild->style()->styleType() == FIRST_LETTER) { |
5467 currChild = currChild->firstChild(); | 5467 currChild = currChild->firstChild(); |
5468 break; | 5468 break; |
5469 } | 5469 } |
5470 currChild = currChild->nextSibling(); | 5470 currChild = currChild->nextSibling(); |
5471 } else if (currChild->isReplaced() || currChild->isRenderButton() || cur
rChild->isMenuList()) | 5471 } else if (currChild->isReplaced() || currChild->isRenderButton() || cur
rChild->isMenuList()) |
5472 break; | 5472 break; |
| 5473 else if (currChild->style()->hasPseudoStyle(FIRST_LETTER) && currChild->
canHaveChildren()) { |
| 5474 // We found a lower-level node with first-letter, which supersedes t
he higher-level style |
| 5475 firstLetterBlock = currChild; |
| 5476 currChild = currChild->firstChild(); |
| 5477 } |
5473 else | 5478 else |
5474 currChild = currChild->firstChild(); | 5479 currChild = currChild->firstChild(); |
5475 } | 5480 } |
5476 | 5481 |
5477 if (!currChild) | 5482 if (!currChild) |
5478 return; | 5483 return; |
5479 | 5484 |
5480 // If the child already has style, then it has already been created, so we j
ust want | 5485 // If the child already has style, then it has already been created, so we j
ust want |
5481 // to update it. | 5486 // to update it. |
5482 if (currChild->parent()->style()->styleType() == FIRST_LETTER) { | 5487 if (currChild->parent()->style()->styleType() == FIRST_LETTER) { |
(...skipping 1122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6605 } | 6610 } |
6606 | 6611 |
6607 String ValueToString<RenderBlock::FloatingObject*>::string(const RenderBlock::Fl
oatingObject* floatingObject) | 6612 String ValueToString<RenderBlock::FloatingObject*>::string(const RenderBlock::Fl
oatingObject* floatingObject) |
6608 { | 6613 { |
6609 return String::format("%p (%dx%d %dx%d)", floatingObject, floatingObject->x(
), floatingObject->y(), floatingObject->maxX(), floatingObject->maxY()); | 6614 return String::format("%p (%dx%d %dx%d)", floatingObject, floatingObject->x(
), floatingObject->y(), floatingObject->maxX(), floatingObject->maxY()); |
6610 } | 6615 } |
6611 | 6616 |
6612 #endif | 6617 #endif |
6613 | 6618 |
6614 } // namespace WebCore | 6619 } // namespace WebCore |
OLD | NEW |