| Index: Source/core/html/parser/HTMLSrcsetParser.cpp
|
| diff --git a/Source/core/html/parser/HTMLSrcsetParser.cpp b/Source/core/html/parser/HTMLSrcsetParser.cpp
|
| index 40c95a19643c7000afcc631bcf41f13bd126effb..815b5560647515e817a51e69f08bef53760b644d 100644
|
| --- a/Source/core/html/parser/HTMLSrcsetParser.cpp
|
| +++ b/Source/core/html/parser/HTMLSrcsetParser.cpp
|
| @@ -154,10 +154,13 @@ ImageCandidate bestFitSourceForSrcsetAttribute(float deviceScaleFactor, const St
|
| return pickBestImageCandidate(deviceScaleFactor, imageCandidates);
|
| }
|
|
|
| -String bestFitSourceForImageAttributes(float deviceScaleFactor, const String& srcAttribute, const String& srcsetAttribute)
|
| +ImageCandidate bestFitSourceForImageAttributes(float deviceScaleFactor, const String& srcAttribute, const String& srcsetAttribute)
|
| {
|
| - if (srcsetAttribute.isNull())
|
| - return srcAttribute;
|
| + if (srcsetAttribute.isNull()) {
|
| + if (srcAttribute.isNull())
|
| + return ImageCandidate();
|
| + return ImageCandidate(srcAttribute, 0, srcAttribute.length(), 1);
|
| + }
|
|
|
| Vector<ImageCandidate> imageCandidates;
|
|
|
| @@ -166,7 +169,7 @@ String bestFitSourceForImageAttributes(float deviceScaleFactor, const String& sr
|
| if (!srcAttribute.isEmpty())
|
| imageCandidates.append(ImageCandidate(srcAttribute, 0, srcAttribute.length(), 1.0));
|
|
|
| - return pickBestImageCandidate(deviceScaleFactor, imageCandidates).toString();
|
| + return pickBestImageCandidate(deviceScaleFactor, imageCandidates);
|
| }
|
|
|
| String bestFitSourceForImageAttributes(float deviceScaleFactor, const String& srcAttribute, ImageCandidate& srcsetImageCandidate)
|
|
|