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

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

Issue 170603003: Use nullptr_t for RefPtr, PassRefPtr and RawPtr. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Final rebase Created 6 years, 10 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/RenderScrollbar.cpp ('k') | Source/core/rendering/RenderTheme.cpp » ('j') | 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 12 matching lines...) Expand all
23 #include "config.h" 23 #include "config.h"
24 #include "core/rendering/RenderTextFragment.h" 24 #include "core/rendering/RenderTextFragment.h"
25 25
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 WebCore { 30 namespace WebCore {
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>(0)) 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_firstLetter(0) 36 , m_firstLetter(0)
37 { 37 {
38 } 38 }
39 39
40 RenderTextFragment::RenderTextFragment(Node* node, StringImpl* str) 40 RenderTextFragment::RenderTextFragment(Node* node, StringImpl* str)
41 : RenderText(node, str) 41 : RenderText(node, str)
42 , m_start(0) 42 , m_start(0)
43 , m_end(str ? str->length() : 0) 43 , m_end(str ? str->length() : 0)
(...skipping 13 matching lines...) Expand all
57 return toRenderText(current); 57 return toRenderText(current);
58 } 58 }
59 return 0; 59 return 0;
60 } 60 }
61 61
62 PassRefPtr<StringImpl> RenderTextFragment::originalText() const 62 PassRefPtr<StringImpl> RenderTextFragment::originalText() const
63 { 63 {
64 Node* e = node(); 64 Node* e = node();
65 RefPtr<StringImpl> result = ((e && e->isTextNode()) ? toText(e)->dataImpl() : contentString()); 65 RefPtr<StringImpl> result = ((e && e->isTextNode()) ? toText(e)->dataImpl() : contentString());
66 if (!result) 66 if (!result)
67 return 0; 67 return nullptr;
68 return result->substring(start(), end()); 68 return result->substring(start(), end());
69 } 69 }
70 70
71 void RenderTextFragment::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle) 71 void RenderTextFragment::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
72 { 72 {
73 RenderText::styleDidChange(diff, oldStyle); 73 RenderText::styleDidChange(diff, oldStyle);
74 74
75 if (RenderBlock* block = blockForAccompanyingFirstLetter()) { 75 if (RenderBlock* block = blockForAccompanyingFirstLetter()) {
76 block->style()->removeCachedPseudoStyle(FIRST_LETTER); 76 block->style()->removeCachedPseudoStyle(FIRST_LETTER);
77 block->updateFirstLetter(); 77 block->updateFirstLetter();
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 return; 142 return;
143 RenderObject* nodeRenderer = node()->renderer(); 143 RenderObject* nodeRenderer = node()->renderer();
144 if (!nodeRenderer || !nodeRenderer->isText() || !toRenderText(nodeRenderer)- >isTextFragment()) 144 if (!nodeRenderer || !nodeRenderer->isText() || !toRenderText(nodeRenderer)- >isTextFragment())
145 return; 145 return;
146 146
147 if (isDescendantOf(toRenderTextFragment(nodeRenderer)->m_firstLetter)) 147 if (isDescendantOf(toRenderTextFragment(nodeRenderer)->m_firstLetter))
148 result.setIsFirstLetter(true); 148 result.setIsFirstLetter(true);
149 } 149 }
150 150
151 } // namespace WebCore 151 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderScrollbar.cpp ('k') | Source/core/rendering/RenderTheme.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698