| 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 2435 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2446 if (continuation) { | 2446 if (continuation) { |
| 2447 if (!continuationMap) | 2447 if (!continuationMap) |
| 2448 continuationMap = new OwnPtr<ContinuationMap>(adoptPtr(new Continuat
ionMap)); | 2448 continuationMap = new OwnPtr<ContinuationMap>(adoptPtr(new Continuat
ionMap)); |
| 2449 (*continuationMap)->set(this, continuation); | 2449 (*continuationMap)->set(this, continuation); |
| 2450 } else { | 2450 } else { |
| 2451 if (continuationMap) | 2451 if (continuationMap) |
| 2452 (*continuationMap)->remove(this); | 2452 (*continuationMap)->remove(this); |
| 2453 } | 2453 } |
| 2454 } | 2454 } |
| 2455 | 2455 |
| 2456 void RenderBoxModelObject::computeLayerHitTestRects(LayerHitTestRects& rects) co
nst | |
| 2457 { | |
| 2458 RenderLayerModelObject::computeLayerHitTestRects(rects); | |
| 2459 | |
| 2460 // If there is a continuation then we need to consult it here, since this is | |
| 2461 // the root of the tree walk and it wouldn't otherwise get picked up. | |
| 2462 // Continuations should always be siblings in the tree, so any others should | |
| 2463 // get picked up already by the tree walk. | |
| 2464 if (continuation()) | |
| 2465 continuation()->computeLayerHitTestRects(rects); | |
| 2466 } | |
| 2467 | |
| 2468 LayoutRect RenderBoxModelObject::localCaretRectForEmptyElement(LayoutUnit width,
LayoutUnit textIndentOffset) | 2456 LayoutRect RenderBoxModelObject::localCaretRectForEmptyElement(LayoutUnit width,
LayoutUnit textIndentOffset) |
| 2469 { | 2457 { |
| 2470 ASSERT(!slowFirstChild()); | 2458 ASSERT(!slowFirstChild()); |
| 2471 | 2459 |
| 2472 // FIXME: This does not take into account either :first-line or :first-lette
r | 2460 // FIXME: This does not take into account either :first-line or :first-lette
r |
| 2473 // However, as soon as some content is entered, the line boxes will be | 2461 // However, as soon as some content is entered, the line boxes will be |
| 2474 // constructed and this kludge is not called any more. So only the caret siz
e | 2462 // constructed and this kludge is not called any more. So only the caret siz
e |
| 2475 // of an empty :first-line'd block is wrong. I think we can live with that. | 2463 // of an empty :first-line'd block is wrong. I think we can live with that. |
| 2476 RenderStyle* currentStyle = firstLineStyle(); | 2464 RenderStyle* currentStyle = firstLineStyle(); |
| 2477 | 2465 |
| (...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2621 ASSERT(!beforeChild || toBoxModelObject == beforeChild->parent()); | 2609 ASSERT(!beforeChild || toBoxModelObject == beforeChild->parent()); |
| 2622 for (RenderObject* child = startChild; child && child != endChild; ) { | 2610 for (RenderObject* child = startChild; child && child != endChild; ) { |
| 2623 // Save our next sibling as moveChildTo will clear it. | 2611 // Save our next sibling as moveChildTo will clear it. |
| 2624 RenderObject* nextSibling = child->nextSibling(); | 2612 RenderObject* nextSibling = child->nextSibling(); |
| 2625 moveChildTo(toBoxModelObject, child, beforeChild, fullRemoveInsert); | 2613 moveChildTo(toBoxModelObject, child, beforeChild, fullRemoveInsert); |
| 2626 child = nextSibling; | 2614 child = nextSibling; |
| 2627 } | 2615 } |
| 2628 } | 2616 } |
| 2629 | 2617 |
| 2630 } // namespace blink | 2618 } // namespace blink |
| OLD | NEW |