| Index: third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageDecoder.h
|
| diff --git a/third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageDecoder.h b/third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageDecoder.h
|
| index 644a085edc4d15dff2832db3b0c921ceaa4e36df..e79a93cdd4777d961d31d01cedd2e43c71358129 100644
|
| --- a/third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageDecoder.h
|
| +++ b/third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageDecoder.h
|
| @@ -44,7 +44,7 @@ class PLATFORM_EXPORT BMPImageDecoder final : public ImageDecoder {
|
| // ImageDecoder:
|
| String FilenameExtension() const override { return "bmp"; }
|
| void OnSetData(SegmentReader*) override;
|
| - // CAUTION: setFailed() deletes |m_reader|. Be careful to avoid
|
| + // CAUTION: SetFailed() deletes |reader_|. Be careful to avoid
|
| // accessing deleted memory, especially when calling this from inside
|
| // BMPImageReader!
|
| bool SetFailed() override;
|
| @@ -54,21 +54,21 @@ class PLATFORM_EXPORT BMPImageDecoder final : public ImageDecoder {
|
| void DecodeSize() override { Decode(true); }
|
| void Decode(size_t) override { Decode(false); }
|
|
|
| - // Decodes the image. If |onlySize| is true, stops decoding after
|
| + // Decodes the image. If |only_size| is true, stops decoding after
|
| // calculating the image size. If decoding fails but there is no more
|
| // data coming, sets the "decode failure" flag.
|
| void Decode(bool only_size);
|
|
|
| - // Decodes the image. If |onlySize| is true, stops decoding after
|
| + // Decodes the image. If |only_size| is true, stops decoding after
|
| // calculating the image size. Returns whether decoding succeeded.
|
| bool DecodeHelper(bool only_size);
|
|
|
| // Processes the file header at the beginning of the data. Sets
|
| - // |imgDataOffset| based on the header contents. Returns true if the
|
| + // |img_data_offset| based on the header contents. Returns true if the
|
| // file header could be decoded.
|
| bool ProcessFileHeader(size_t& img_data_offset);
|
|
|
| - // An index into |m_data| representing how much we've already decoded.
|
| + // An index into |data_| representing how much we've already decoded.
|
| // Note that this only tracks data _this_ class decodes; once the
|
| // BMPImageReader takes over this will not be updated further.
|
| size_t decoded_offset_;
|
|
|