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

Side by Side Diff: third_party/WebKit/Source/platform/image-decoders/FastSharedBufferReader.cpp

Issue 1571233003: Fix errors caused by unsafe conversions to/from size_t (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: improved ALLOW_NUMERIC_ARG_TYPES_PROMOTABLE_TO Created 4 years, 11 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2015 Google Inc. All rights reserved. 2 * Copyright (C) 2015 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 } 81 }
82 } 82 }
83 83
84 size_t FastSharedBufferReader::getSomeData(const char*& someData, size_t dataPos ition) const 84 size_t FastSharedBufferReader::getSomeData(const char*& someData, size_t dataPos ition) const
85 { 85 {
86 getSomeDataInternal(dataPosition); 86 getSomeDataInternal(dataPosition);
87 someData = m_segment; 87 someData = m_segment;
88 return m_segmentLength; 88 return m_segmentLength;
89 } 89 }
90 90
91 void FastSharedBufferReader::getSomeDataInternal(unsigned dataPosition) const 91 void FastSharedBufferReader::getSomeDataInternal(size_t dataPosition) const
92 { 92 {
93 m_dataPosition = dataPosition; 93 m_dataPosition = dataPosition;
94 m_segmentLength = m_data->getSomeData(m_segment, dataPosition); 94 m_segmentLength = m_data->getSomeData(m_segment, dataPosition);
95 ASSERT(m_segmentLength); 95 ASSERT(m_segmentLength);
96 } 96 }
97 97
98 } // namespace blink 98 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698