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

Unified Diff: Source/core/rendering/RenderTextFragment.cpp

Issue 423093002: Oilpan: Prepare to move RenderObject and RenderObjectChildList to Oilpan heap. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: add more trace Created 6 years, 5 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 side-by-side diff with in-line comments
Download patch
Index: Source/core/rendering/RenderTextFragment.cpp
diff --git a/Source/core/rendering/RenderTextFragment.cpp b/Source/core/rendering/RenderTextFragment.cpp
index bc0850c43ecb88ddb3fce29822f78fb8190ed3f7..20f518f411efb627f41165815671c59eefc80566 100644
--- a/Source/core/rendering/RenderTextFragment.cpp
+++ b/Source/core/rendering/RenderTextFragment.cpp
@@ -33,7 +33,7 @@ RenderTextFragment::RenderTextFragment(Node* node, StringImpl* str, int startOff
: RenderText(node, str ? str->substring(startOffset, length) : PassRefPtr<StringImpl>(nullptr))
, m_start(startOffset)
, m_end(length)
- , m_firstLetter(0)
+ , m_firstLetter(nullptr)
{
}
@@ -42,7 +42,7 @@ RenderTextFragment::RenderTextFragment(Node* node, StringImpl* str)
, m_start(0)
, m_end(str ? str->length() : 0)
, m_contentString(str)
- , m_firstLetter(0)
+ , m_firstLetter(nullptr)
{
}
@@ -50,6 +50,12 @@ RenderTextFragment::~RenderTextFragment()
{
}
+void RenderTextFragment::trace(Visitor* visitor)
+{
+ visitor->trace(m_firstLetter);
+ RenderText::trace(visitor);
+}
+
RenderText* RenderTextFragment::firstRenderTextInFirstLetter() const
{
for (RenderObject* current = m_firstLetter; current; current = current->nextInPreOrder(m_firstLetter)) {
@@ -98,7 +104,7 @@ void RenderTextFragment::setText(PassRefPtr<StringImpl> text, bool force)
ASSERT(!m_contentString);
m_firstLetter->destroy();
- m_firstLetter = 0;
+ m_firstLetter = nullptr;
if (Node* t = node()) {
ASSERT(!t->renderer());
t->setRenderer(this);

Powered by Google App Engine
This is Rietveld 408576698