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

Unified Diff: third_party/WebKit/Source/core/html/parser/TextResourceDecoder.cpp

Issue 2014483003: Rename OwnPtr::clear() to reset() in core/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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: third_party/WebKit/Source/core/html/parser/TextResourceDecoder.cpp
diff --git a/third_party/WebKit/Source/core/html/parser/TextResourceDecoder.cpp b/third_party/WebKit/Source/core/html/parser/TextResourceDecoder.cpp
index 49897d7c3ac409bd860dbaf44bbc4786a39ad3b4..1185bd8cb73e6b29e28c1a89899e86a5abaea7b5 100644
--- a/third_party/WebKit/Source/core/html/parser/TextResourceDecoder.cpp
+++ b/third_party/WebKit/Source/core/html/parser/TextResourceDecoder.cpp
@@ -146,7 +146,7 @@ void TextResourceDecoder::setEncoding(const WTF::TextEncoding& encoding, Encodin
else
m_encoding = encoding;
- m_codec.clear();
+ m_codec.reset();
m_source = source;
}
@@ -344,7 +344,7 @@ void TextResourceDecoder::checkForMetaCharset(const char* data, size_t length)
return;
setEncoding(m_charsetParser->encoding(), EncodingFromMetaTag);
- m_charsetParser.clear();
+ m_charsetParser.reset();
m_checkedForMetaCharset = true;
return;
}
@@ -436,7 +436,7 @@ String TextResourceDecoder::flush()
String result = m_codec->decode(m_buffer.data(), m_buffer.size(), FetchEOF, m_contentType == XMLContent && !m_useLenientXMLDecoding, m_sawError);
m_buffer.clear();
- m_codec.clear();
+ m_codec.reset();
m_checkedForBOM = false; // Skip BOM again when re-decoding.
return result;
}

Powered by Google App Engine
This is Rietveld 408576698