| 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 239 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 250 LayoutObject* firstChild = curr->firstChild(); | 250 LayoutObject* firstChild = curr->firstChild(); |
| 251 if (!firstChild) | 251 if (!firstChild) |
| 252 return nullptr; | 252 return nullptr; |
| 253 | 253 |
| 254 bool inQuirksMode = curr->document().inQuirksMode(); | 254 bool inQuirksMode = curr->document().inQuirksMode(); |
| 255 for (LayoutObject* currChild = firstChild; currChild; | 255 for (LayoutObject* currChild = firstChild; currChild; |
| 256 currChild = currChild->nextSibling()) { | 256 currChild = currChild->nextSibling()) { |
| 257 if (currChild == marker) | 257 if (currChild == marker) |
| 258 continue; | 258 continue; |
| 259 | 259 |
| 260 // Shouldn't add marker into Overflow box, instead, add marker |
| 261 // into listitem |
| 262 if (currChild->hasOverflowClip()) |
| 263 break; |
| 264 |
| 260 if (currChild->isInline() && | 265 if (currChild->isInline() && |
| 261 (!currChild->isLayoutInline() || | 266 (!currChild->isLayoutInline() || |
| 262 curr->generatesLineBoxesForInlineChild(currChild))) | 267 curr->generatesLineBoxesForInlineChild(currChild))) |
| 263 return curr; | 268 return curr; |
| 264 | 269 |
| 265 if (currChild->isFloating() || currChild->isOutOfFlowPositioned()) | 270 if (currChild->isFloating() || currChild->isOutOfFlowPositioned()) |
| 266 continue; | 271 continue; |
| 267 | 272 |
| 268 if (!currChild->isLayoutBlockFlow() || | 273 if (!currChild->isLayoutBlockFlow() || |
| 269 (currChild->isBox() && toLayoutBox(currChild)->isWritingModeRoot())) | 274 (currChild->isBox() && toLayoutBox(currChild)->isWritingModeRoot())) |
| (...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 541 // assume that all the following ones have too. | 546 // assume that all the following ones have too. |
| 542 // This gives us the opportunity to stop here and avoid | 547 // This gives us the opportunity to stop here and avoid |
| 543 // marking the same nodes again. | 548 // marking the same nodes again. |
| 544 break; | 549 break; |
| 545 } | 550 } |
| 546 item->updateValue(); | 551 item->updateValue(); |
| 547 } | 552 } |
| 548 } | 553 } |
| 549 | 554 |
| 550 } // namespace blink | 555 } // namespace blink |
| OLD | NEW |