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

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

Issue 23819007: Have Node::document() return a reference instead of a pointer (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase on master Created 7 years, 4 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
« no previous file with comments | « Source/core/rendering/RenderTableSection.cpp ('k') | Source/core/rendering/RenderTextControlSingleLine.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderText.cpp
diff --git a/Source/core/rendering/RenderText.cpp b/Source/core/rendering/RenderText.cpp
index a2e8a824f75f34e10bcd869db99fe503117b6595..075f2694252fe6a89f98835fce3878f59b37c4e8 100644
--- a/Source/core/rendering/RenderText.cpp
+++ b/Source/core/rendering/RenderText.cpp
@@ -74,7 +74,7 @@ public:
void restartWithNewText(unsigned lastTypedCharacterOffset)
{
m_lastTypedCharacterOffset = lastTypedCharacterOffset;
- if (Settings* settings = m_renderText->document()->settings())
+ if (Settings* settings = m_renderText->document().settings())
startOneShot(settings->passwordEchoDurationInSeconds());
}
void invalidate() { m_lastTypedCharacterOffset = -1; }
@@ -186,7 +186,7 @@ bool RenderText::isWordBreak() const
void RenderText::updateNeedsTranscoding()
{
- const WTF::TextEncoding* encoding = document()->decoder() ? &document()->decoder()->encoding() : 0;
+ const WTF::TextEncoding* encoding = document().decoder() ? &document().decoder()->encoding() : 0;
m_needsTranscoding = fontTranscoder().needsTranscoding(style()->font().fontDescription(), encoding);
}
@@ -1329,7 +1329,7 @@ void RenderText::setTextInternal(PassRefPtr<StringImpl> text)
ASSERT(text);
m_text = text;
if (m_needsTranscoding) {
- const WTF::TextEncoding* encoding = document()->decoder() ? &document()->decoder()->encoding() : 0;
+ const WTF::TextEncoding* encoding = document().decoder() ? &document().decoder()->encoding() : 0;
fontTranscoder().convert(m_text, style()->font().fontDescription(), encoding);
}
ASSERT(m_text);
@@ -1393,7 +1393,7 @@ void RenderText::setText(PassRefPtr<StringImpl> text, bool force)
setNeedsLayoutAndPrefWidthsRecalc();
m_knownToHaveNoOverflowAndNoFallbackFonts = false;
- if (AXObjectCache* cache = document()->existingAXObjectCache())
+ if (AXObjectCache* cache = document().existingAXObjectCache())
cache->textChanged(this);
}
« no previous file with comments | « Source/core/rendering/RenderTableSection.cpp ('k') | Source/core/rendering/RenderTextControlSingleLine.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698