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

Unified Diff: third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoder.cpp

Issue 2547053003: s/ passed(...) / WTF::passed(...) / to avoid future ambiguity w/ base::Passed. (Closed)
Patch Set: Rebasing... Created 4 years 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/platform/image-decoders/ico/ICOImageDecoder.cpp
diff --git a/third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoder.cpp b/third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoder.cpp
index 7a6a188380827effee79e46add9f148a7e5f04f3..0288899dd7a366b1e6f9066a02beab9c1e5f24f5 100644
--- a/third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoder.cpp
+++ b/third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoder.cpp
@@ -195,8 +195,8 @@ bool ICOImageDecoder::decodeAtIndex(size_t index) {
if (imageType == BMP) {
if (!m_bmpReaders[index]) {
- m_bmpReaders[index] =
- wrapUnique(new BMPImageReader(this, dirEntry.m_imageOffset, 0, true));
+ m_bmpReaders[index] = WTF::wrapUnique(
+ new BMPImageReader(this, dirEntry.m_imageOffset, 0, true));
m_bmpReaders[index]->setData(m_data.get());
}
// Update the pointer to the buffer as it could change after
@@ -211,7 +211,7 @@ bool ICOImageDecoder::decodeAtIndex(size_t index) {
if (!m_pngDecoders[index]) {
AlphaOption alphaOption =
m_premultiplyAlpha ? AlphaPremultiplied : AlphaNotPremultiplied;
- m_pngDecoders[index] = wrapUnique(
+ m_pngDecoders[index] = WTF::wrapUnique(
new PNGImageDecoder(alphaOption, m_colorBehavior, m_maxDecodedBytes,
dirEntry.m_imageOffset));
setDataForPNGDecoderAtIndex(index);

Powered by Google App Engine
This is Rietveld 408576698