Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * (C) 1999 Lars Knoll (knoll@kde.org) | 2 * (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * (C) 2000 Dirk Mueller (mueller@kde.org) | 3 * (C) 2000 Dirk Mueller (mueller@kde.org) |
| 4 * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved. | 4 * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved. |
| 5 * | 5 * |
| 6 * This library is free software; you can redistribute it and/or | 6 * This library is free software; you can redistribute it and/or |
| 7 * modify it under the terms of the GNU Library General Public | 7 * modify it under the terms of the GNU Library General Public |
| 8 * License as published by the Free Software Foundation; either | 8 * License as published by the Free Software Foundation; either |
| 9 * version 2 of the License, or (at your option) any later version. | 9 * version 2 of the License, or (at your option) any later version. |
| 10 * | 10 * |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 46 , m_start(0) | 46 , m_start(0) |
| 47 , m_end(str ? str->length() : 0) | 47 , m_end(str ? str->length() : 0) |
| 48 , m_isRemainingTextRenderer(false) | 48 , m_isRemainingTextRenderer(false) |
| 49 , m_contentString(str) | 49 , m_contentString(str) |
| 50 , m_firstLetterPseudoElement(nullptr) | 50 , m_firstLetterPseudoElement(nullptr) |
| 51 { | 51 { |
| 52 } | 52 } |
| 53 | 53 |
| 54 RenderTextFragment::~RenderTextFragment() | 54 RenderTextFragment::~RenderTextFragment() |
| 55 { | 55 { |
| 56 #if !ENABLE(OILPAN) | |
|
esprehn
2014/10/17 22:02:05
This is not correct so skip in oilpan, you're leav
sof
2014/10/18 04:50:52
FirstPseudoElement traces its "remaining text rend
| |
| 56 if (m_isRemainingTextRenderer && m_firstLetterPseudoElement) | 57 if (m_isRemainingTextRenderer && m_firstLetterPseudoElement) |
| 57 m_firstLetterPseudoElement->setRemainingTextRenderer(nullptr); | 58 m_firstLetterPseudoElement->setRemainingTextRenderer(nullptr); |
| 58 m_firstLetterPseudoElement = nullptr; | 59 m_firstLetterPseudoElement = nullptr; |
| 60 #endif | |
| 59 } | 61 } |
| 60 | 62 |
| 61 void RenderTextFragment::trace(Visitor* visitor) | 63 void RenderTextFragment::trace(Visitor* visitor) |
| 62 { | 64 { |
| 63 visitor->trace(m_firstLetterPseudoElement); | 65 visitor->trace(m_firstLetterPseudoElement); |
| 64 RenderText::trace(visitor); | 66 RenderText::trace(visitor); |
| 65 } | 67 } |
| 66 | 68 |
| 67 PassRefPtr<StringImpl> RenderTextFragment::completeText() const | 69 PassRefPtr<StringImpl> RenderTextFragment::completeText() const |
| 68 { | 70 { |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 131 FirstLetterPseudoElement* pseudo = toFirstLetterPseudoElement(node); | 133 FirstLetterPseudoElement* pseudo = toFirstLetterPseudoElement(node); |
| 132 RenderObject* nextRenderer = FirstLetterPseudoElement::firstLetterTextRe nderer(*pseudo); | 134 RenderObject* nextRenderer = FirstLetterPseudoElement::firstLetterTextRe nderer(*pseudo); |
| 133 if (!nextRenderer) | 135 if (!nextRenderer) |
| 134 return nullptr; | 136 return nullptr; |
| 135 node = nextRenderer->node(); | 137 node = nextRenderer->node(); |
| 136 } | 138 } |
| 137 return (node && node->isTextNode()) ? toText(node) : nullptr; | 139 return (node && node->isTextNode()) ? toText(node) : nullptr; |
| 138 } | 140 } |
| 139 | 141 |
| 140 } // namespace blink | 142 } // namespace blink |
| OLD | NEW |