Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(667)

Side by Side Diff: Source/core/rendering/RenderTextFragment.cpp

Issue 679593004: Refactor RenderQuote to not delete renderers on style change. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/rendering/RenderTextFragment.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 15 matching lines...) Expand all
26 #include "core/dom/Text.h" 26 #include "core/dom/Text.h"
27 #include "core/rendering/HitTestResult.h" 27 #include "core/rendering/HitTestResult.h"
28 #include "core/rendering/RenderBlock.h" 28 #include "core/rendering/RenderBlock.h"
29 29
30 namespace blink { 30 namespace blink {
31 31
32 RenderTextFragment::RenderTextFragment(Node* node, StringImpl* str, int startOff set, int length) 32 RenderTextFragment::RenderTextFragment(Node* node, StringImpl* str, int startOff set, int length)
33 : RenderText(node, str ? str->substring(startOffset, length) : PassRefPtr<St ringImpl>(nullptr)) 33 : RenderText(node, str ? str->substring(startOffset, length) : PassRefPtr<St ringImpl>(nullptr))
34 , m_start(startOffset) 34 , m_start(startOffset)
35 , m_end(length) 35 , m_end(length)
36 , m_contentString(str)
36 , m_firstLetter(nullptr) 37 , m_firstLetter(nullptr)
37 { 38 {
38 } 39 }
39 40
40 RenderTextFragment::RenderTextFragment(Node* node, StringImpl* str) 41 RenderTextFragment::RenderTextFragment(Node* node, StringImpl* str)
41 : RenderText(node, str) 42 : RenderText(node, str)
42 , m_start(0) 43 , m_start(0)
43 , m_end(str ? str->length() : 0) 44 , m_end(str ? str->length() : 0)
44 , m_contentString(str) 45 , m_contentString(str)
45 , m_firstLetter(nullptr) 46 , m_firstLetter(nullptr)
(...skipping 12 matching lines...) Expand all
58 59
59 RenderText* RenderTextFragment::firstRenderTextInFirstLetter() const 60 RenderText* RenderTextFragment::firstRenderTextInFirstLetter() const
60 { 61 {
61 for (RenderObject* current = m_firstLetter; current; current = current->next InPreOrder(m_firstLetter)) { 62 for (RenderObject* current = m_firstLetter; current; current = current->next InPreOrder(m_firstLetter)) {
62 if (current->isText()) 63 if (current->isText())
63 return toRenderText(current); 64 return toRenderText(current);
64 } 65 }
65 return 0; 66 return 0;
66 } 67 }
67 68
69 void RenderTextFragment::setContentString(StringImpl* str)
70 {
71 m_contentString = str;
72 setText(str);
73 }
74
68 PassRefPtr<StringImpl> RenderTextFragment::originalText() const 75 PassRefPtr<StringImpl> RenderTextFragment::originalText() const
69 { 76 {
70 Node* e = node(); 77 RefPtr<StringImpl> result = RenderText::originalText();
71 RefPtr<StringImpl> result = ((e && e->isTextNode()) ? toText(e)->dataImpl() : contentString()); 78 if (!result)
79 result = m_contentString;
72 if (!result) 80 if (!result)
73 return nullptr; 81 return nullptr;
74 return result->substring(start(), end()); 82 return result->substring(start(), end());
75 } 83 }
76 84
77 void RenderTextFragment::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle) 85 void RenderTextFragment::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
78 { 86 {
79 RenderText::styleDidChange(diff, oldStyle); 87 RenderText::styleDidChange(diff, oldStyle);
80 88
81 if (RenderBlock* block = blockForAccompanyingFirstLetter()) { 89 if (RenderBlock* block = blockForAccompanyingFirstLetter()) {
(...skipping 13 matching lines...) Expand all
95 { 103 {
96 RenderText::setText(text, force); 104 RenderText::setText(text, force);
97 105
98 m_start = 0; 106 m_start = 0;
99 m_end = textLength(); 107 m_end = textLength();
100 if (m_firstLetter) { 108 if (m_firstLetter) {
101 // FIXME: We should not modify the structure of the render tree during 109 // FIXME: We should not modify the structure of the render tree during
102 // layout. crbug.com/370458 110 // layout. crbug.com/370458
103 DeprecatedDisableModifyRenderTreeStructureAsserts disabler; 111 DeprecatedDisableModifyRenderTreeStructureAsserts disabler;
104 112
105 ASSERT(!m_contentString);
106 m_firstLetter->destroy(); 113 m_firstLetter->destroy();
107 m_firstLetter = nullptr; 114 m_firstLetter = nullptr;
108 if (Node* t = node()) { 115 if (Node* t = node()) {
109 ASSERT(!t->renderer()); 116 ASSERT(!t->renderer());
110 t->setRenderer(this); 117 t->setRenderer(this);
111 } 118 }
112 } 119 }
113 } 120 }
114 121
115 void RenderTextFragment::transformText() 122 void RenderTextFragment::transformText()
116 { 123 {
117 // Don't reset first-letter here because we are only transforming the trunca ted fragment. 124 // Don't reset first-letter here because we are only transforming the trunca ted fragment.
118 if (RefPtr<StringImpl> textToTransform = originalText()) 125 if (RefPtr<StringImpl> textToTransform = originalText())
119 RenderText::setText(textToTransform.release(), true); 126 RenderText::setText(textToTransform.release(), true);
120 } 127 }
121 128
122 UChar RenderTextFragment::previousCharacter() const 129 UChar RenderTextFragment::previousCharacter() const
123 { 130 {
124 if (start()) { 131 if (start()) {
125 Node* e = node(); 132 RefPtr<StringImpl> original = RenderText::originalText();
126 StringImpl* original = ((e && e->isTextNode()) ? toText(e)->dataImpl() : contentString()); 133 if (!original)
134 original = m_contentString;
127 if (original && start() <= original->length()) 135 if (original && start() <= original->length())
128 return (*original)[start() - 1]; 136 return (*original)[start() - 1];
129 } 137 }
130 138
131 return RenderText::previousCharacter(); 139 return RenderText::previousCharacter();
132 } 140 }
133 141
134 RenderBlock* RenderTextFragment::blockForAccompanyingFirstLetter() const 142 RenderBlock* RenderTextFragment::blockForAccompanyingFirstLetter() const
135 { 143 {
136 if (!m_firstLetter) 144 if (!m_firstLetter)
(...skipping 15 matching lines...) Expand all
152 return; 160 return;
153 RenderObject* nodeRenderer = node()->renderer(); 161 RenderObject* nodeRenderer = node()->renderer();
154 if (!nodeRenderer || !nodeRenderer->isText() || !toRenderText(nodeRenderer)- >isTextFragment()) 162 if (!nodeRenderer || !nodeRenderer->isText() || !toRenderText(nodeRenderer)- >isTextFragment())
155 return; 163 return;
156 164
157 if (isDescendantOf(toRenderTextFragment(nodeRenderer)->m_firstLetter)) 165 if (isDescendantOf(toRenderTextFragment(nodeRenderer)->m_firstLetter))
158 result.setIsFirstLetter(true); 166 result.setIsFirstLetter(true);
159 } 167 }
160 168
161 } // namespace blink 169 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderTextFragment.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698