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

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

Issue 2856993002: Fix comments after Blink rename (Closed)
Patch Set: Re-aligning comment Created 3 years, 8 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/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 a9e858a89e58a327e3d9213595fdd74b74b6f69f..712409cd3b8d276fe1c5cdfd3145f85f567e6f97 100644
--- a/third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoder.cpp
+++ b/third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoder.cpp
@@ -97,7 +97,7 @@ bool ICOImageDecoder::SetFailed() {
bool ICOImageDecoder::HotSpot(IntPoint& hot_spot) const {
// When unspecified, the default frame is always frame 0. This is consistent
- // with BitmapImage, where currentFrame() starts at 0 and only increases when
+ // with BitmapImage, where CurrentFrame() starts at 0 and only increases when
// animation is requested.
return HotSpotAtIndex(0, hot_spot);
}
@@ -123,7 +123,7 @@ bool ICOImageDecoder::CompareEntries(const IconDirectoryEntry& a,
size_t ICOImageDecoder::DecodeFrameCount() {
DecodeSize();
- // If decodeSize() fails, return the existing number of frames. This way
+ // If DecodeSize() fails, return the existing number of frames. This way
// if we get halfway through the image before decoding fails, we won't
// suddenly start reporting that the image has zero frames.
if (Failed())
@@ -156,7 +156,7 @@ void ICOImageDecoder::Decode(size_t index, bool only_size) {
return;
// Defensively clear the FastSharedBufferReader's cache, as another caller
- // may have called SharedBuffer::mergeSegmentsIntoBuffer().
+ // may have called SharedBuffer::MergeSegmentsIntoBuffer().
fast_reader_.ClearCache();
// If we couldn't decode the image but we've received all the data, decoding
@@ -200,7 +200,7 @@ bool ICOImageDecoder::DecodeAtIndex(size_t index) {
bmp_readers_[index]->SetData(data_.Get());
}
// Update the pointer to the buffer as it could change after
- // m_frameBufferCache.resize().
+ // frame_buffer_cache_.resize().
bmp_readers_[index]->SetBuffer(&frame_buffer_cache_[index]);
frame_size_ = dir_entry.size_;
bool result = bmp_readers_[index]->DecodeBMP(false);
@@ -265,7 +265,7 @@ bool ICOImageDecoder::ProcessDirectoryEntries() {
for (IconDirectoryEntries::iterator i(dir_entries_.begin());
i != dir_entries_.end(); ++i)
- *i = ReadDirectoryEntry(); // Updates m_decodedOffset.
+ *i = ReadDirectoryEntry(); // Updates decoded_offset_.
// Make sure the specified image offsets are past the end of the directory
// entries.
@@ -281,13 +281,13 @@ bool ICOImageDecoder::ProcessDirectoryEntries() {
// The image size is the size of the largest entry.
const IconDirectoryEntry& dir_entry = dir_entries_.front();
// Technically, this next call shouldn't be able to fail, since the width
- // and height here are each <= 256, and |m_frameSize| is empty.
+ // and height here are each <= 256, and |frame_size_| is empty.
return SetSize(dir_entry.size_.Width(), dir_entry.size_.Height());
}
ICOImageDecoder::IconDirectoryEntry ICOImageDecoder::ReadDirectoryEntry() {
// Read icon data.
- // The following calls to readUint8() return a uint8_t, which is appropriate
+ // The following calls to ReadUint8() return a uint8_t, which is appropriate
// because that's the on-disk type of the width and height values. Storing
// them in ints (instead of matching uint8_ts) is so we can record dimensions
// of size 256 (which is what a zero byte really means).

Powered by Google App Engine
This is Rietveld 408576698