Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / rendering / RenderTextFragment.cpp

diff --git a/src/third_party/WebKit/Source/core/rendering/RenderTextFragment.cpp b/src/third_party/WebKit/Source/core/rendering/RenderTextFragment.cpp
index f2eb3ff..20f518f 100644 (file)
--- a/src/third_party/WebKit/Source/core/rendering/RenderTextFragment.cpp
+++ b/src/third_party/WebKit/Source/core/rendering/RenderTextFragment.cpp
@@ -27,13 +27,13 @@
 #include "core/rendering/HitTestResult.h"
 #include "core/rendering/RenderBlock.h"
 
-namespace WebCore {
+namespace blink {
 
 RenderTextFragment::RenderTextFragment(Node* node, StringImpl* str, int startOffset, int length)
     : 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);
@@ -152,4 +158,4 @@ void RenderTextFragment::updateHitTestResult(HitTestResult& result, const Layout
         result.setIsFirstLetter(true);
 }
 
-} // namespace WebCore
+} // namespace blink