| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Apple Inc. All rights reserved. | 2 * Copyright (C) 2013 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2013 Google Inc. All rights reserved. | 3 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions are | 6 * modification, are permitted provided that the following conditions are |
| 7 * met: | 7 * met: |
| 8 * | 8 * |
| 9 * * Redistributions of source code must retain the above copyright | 9 * * Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 60 } | 60 } |
| 61 | 61 |
| 62 unsigned lastIndex() | 62 unsigned lastIndex() |
| 63 { | 63 { |
| 64 return start + length - 1; | 64 return start + length - 1; |
| 65 } | 65 } |
| 66 | 66 |
| 67 template<typename CharType> | 67 template<typename CharType> |
| 68 int toInt(const CharType* attribute, bool& isValid) | 68 int toInt(const CharType* attribute, bool& isValid) |
| 69 { | 69 { |
| 70 return charactersToInt(attribute + start, length - 1, &isValid); | 70 return charactersToIntStrict(attribute + start, length - 1, &isValid); |
| 71 } | 71 } |
| 72 | 72 |
| 73 template<typename CharType> | 73 template<typename CharType> |
| 74 float toFloat(const CharType* attribute, bool& isValid) | 74 float toFloat(const CharType* attribute, bool& isValid) |
| 75 { | 75 { |
| 76 return charactersToFloat(attribute + start, length - 1, &isValid); | 76 return charactersToFloat(attribute + start, length - 1, &isValid); |
| 77 } | 77 } |
| 78 }; | 78 }; |
| 79 | 79 |
| 80 template<typename CharType> | 80 template<typename CharType> |
| (...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 341 Vector<ImageCandidate> imageCandidates; | 341 Vector<ImageCandidate> imageCandidates; |
| 342 imageCandidates.append(srcsetImageCandidate); | 342 imageCandidates.append(srcsetImageCandidate); |
| 343 | 343 |
| 344 if (!srcAttribute.isEmpty()) | 344 if (!srcAttribute.isEmpty()) |
| 345 imageCandidates.append(ImageCandidate(srcAttribute, 0, srcAttribute.leng
th(), DescriptorParsingResult(), ImageCandidate::SrcOrigin)); | 345 imageCandidates.append(ImageCandidate(srcAttribute, 0, srcAttribute.leng
th(), DescriptorParsingResult(), ImageCandidate::SrcOrigin)); |
| 346 | 346 |
| 347 return pickBestImageCandidate(deviceScaleFactor, sourceSize, imageCandidates
).toString(); | 347 return pickBestImageCandidate(deviceScaleFactor, sourceSize, imageCandidates
).toString(); |
| 348 } | 348 } |
| 349 | 349 |
| 350 } | 350 } |
| OLD | NEW |