Changeset 183984 in webkit

Timestamp:

May 7, 2015 11:50:57 PM (9 years ago)

Author:

yoav@yoav.ws

Message:

Calculate source-size length as a float
​https://bugs.webkit.org/show_bug.cgi?id=144766

Reviewed by Dean Jackson.

Source/WebCore:

Make sure that the source-size length is calculated as a float,
to align with the spec.

Test: fast/dom/HTMLImageElement/sizes/image-sizes-1x.html

fast/dom/HTMLImageElement/sizes/image-sizes-2x.html

• css/SourceSizeList.cpp:

(WebCore::parseSizesAttribute):
(WebCore::defaultLength):
(WebCore::computeLength):

• css/SourceSizeList.h:
• html/HTMLImageElement.cpp:

(WebCore::HTMLImageElement::parseAttribute):

• html/parser/HTMLPreloadScanner.cpp:

(WebCore::TokenPreloadScanner::StartTagScanner::processAttributes):

• html/parser/HTMLSrcsetParser.cpp:

(WebCore::pickBestImageCandidate):
(WebCore::bestFitSourceForImageAttributes):

• html/parser/HTMLSrcsetParser.h:

LayoutTests:

Add tests that make sure fractional source-size lengths are supported
and are calculated as floats.

• fast/dom/HTMLImageElement/sizes/image-sizes-1x-expected.txt:
• fast/dom/HTMLImageElement/sizes/image-sizes-1x.html:
• fast/dom/HTMLImageElement/sizes/image-sizes-2x-expected.txt:
• fast/dom/HTMLImageElement/sizes/image-sizes-2x.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/HTMLImageElement/sizes/image-sizes-1x-expected.txt (modified) (1 diff)
• LayoutTests/fast/dom/HTMLImageElement/sizes/image-sizes-1x.html (modified) (2 diffs)
• LayoutTests/fast/dom/HTMLImageElement/sizes/image-sizes-2x-expected.txt (modified) (1 diff)
• LayoutTests/fast/dom/HTMLImageElement/sizes/image-sizes-2x.html (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/SourceSizeList.cpp (modified) (3 diffs)
• Source/WebCore/css/SourceSizeList.h (modified) (1 diff)
• Source/WebCore/html/HTMLImageElement.cpp (modified) (1 diff)
• Source/WebCore/html/parser/HTMLPreloadScanner.cpp (modified) (1 diff)
• Source/WebCore/html/parser/HTMLSrcsetParser.cpp (modified) (3 diffs)
• Source/WebCore/html/parser/HTMLSrcsetParser.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-05-07  Yoav Weiss  <yoav@yoav.ws>
+
+        Calculate source-size length as a float
+        https://bugs.webkit.org/show_bug.cgi?id=144766
+
+        Reviewed by Dean Jackson.
+
+        Add tests that make sure fractional source-size lengths are supported
+        and are calculated as floats.
+
+        * fast/dom/HTMLImageElement/sizes/image-sizes-1x-expected.txt:
+        * fast/dom/HTMLImageElement/sizes/image-sizes-1x.html:
+        * fast/dom/HTMLImageElement/sizes/image-sizes-2x-expected.txt:
+        * fast/dom/HTMLImageElement/sizes/image-sizes-2x.html:
+
 2015-05-07  Commit Queue  <commit-queue@webkit.org>
 

trunk/LayoutTests/fast/dom/HTMLImageElement/sizes/image-sizes-1x-expected.txt

@@ -28 +28 @@
 PASS document.getElementById("infitisimal_sizes").clientWidth is (window.innerWidth/100)
 PASS currentSrcFileName("infitisimal_sizes") is "image-set-2x.png"
+PASS document.getElementById("fractional_sizes").clientWidth is 799
+PASS currentSrcFileName("fractional_sizes") is "image-set-2x.png"
 PASS successfullyParsed is true
 
 TEST COMPLETE
-              
+               

trunk/LayoutTests/fast/dom/HTMLImageElement/sizes/image-sizes-1x.html

@@ -36 +36 @@
         shouldBe('document.getElementById("infitisimal_sizes").clientWidth', '(window.innerWidth/100)');
         shouldBe('currentSrcFileName("infitisimal_sizes")', '"image-set-2x.png"');
+        shouldBe('document.getElementById("fractional_sizes").clientWidth', '799');
+        shouldBe('currentSrcFileName("fractional_sizes")', '"image-set-2x.png"');
     }, false);
 </script>
@@ -57 +59 @@
 <img id="half_size" sizes="50vw" srcset="../../../hidpi/resources/image-set-2x.png 800w, ../resources/image-set-4x.png 16000w">
 <img id="infitisimal_sizes" sizes="1vw" srcset="../../../hidpi/resources/image-set-2x.png 800w, ../resources/image-set-4x.png 16000w">
+<img id="fractional_sizes" sizes="99.875vw" srcset="../../../hidpi/resources/image-set-2x.png 800w, ../resources/image-set-4x.png 16000w">

trunk/LayoutTests/fast/dom/HTMLImageElement/sizes/image-sizes-2x-expected.txt

@@ -23 +23 @@
 PASS document.getElementById("infitisimal_sizes").clientWidth is (window.innerWidth/100)
 PASS currentSrcFileName("infitisimal_sizes") is "image-set-2x.png"
+PASS currentSrcFileName("fractional_sizes") is "image-set-4x.png?1599"
 PASS successfullyParsed is true
 
 TEST COMPLETE
-            
+             

trunk/LayoutTests/fast/dom/HTMLImageElement/sizes/image-sizes-2x.html

@@ -36 +36 @@
         shouldBe('document.getElementById("infitisimal_sizes").clientWidth', '(window.innerWidth/100)');
         shouldBe('currentSrcFileName("infitisimal_sizes")', '"image-set-2x.png"');
+        shouldBe('currentSrcFileName("fractional_sizes")', '"image-set-4x.png?1599"');
     }
 </script>
@@ -54 +55 @@
 <img id="half_size" sizes="50vw" srcset="../../../hidpi/resources/image-set-2x.png 800w, ../resources/image-set-4x.png 16000w">
 <img id="infitisimal_sizes" sizes="1vw" srcset="../../../hidpi/resources/image-set-2x.png 800w, ../resources/image-set-4x.png 16000w">
+<img id="fractional_sizes" sizes="99.9375vw" srcset="../resources/image-set-4x.png?1598 1598w,../resources/image-set-4x.png?1599 1599w,../resources/image-set-4x.png?1600 1600w,">

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-05-07  Yoav Weiss  <yoav@yoav.ws>
+
+        Calculate source-size length as a float
+        https://bugs.webkit.org/show_bug.cgi?id=144766
+
+        Reviewed by Dean Jackson.
+
+        Make sure that the source-size length is calculated as a float,
+        to align with the spec.
+
+        Test: fast/dom/HTMLImageElement/sizes/image-sizes-1x.html
+              fast/dom/HTMLImageElement/sizes/image-sizes-2x.html
+
+        * css/SourceSizeList.cpp:
+        (WebCore::parseSizesAttribute):
+        (WebCore::defaultLength):
+        (WebCore::computeLength):
+        * css/SourceSizeList.h:
+        * html/HTMLImageElement.cpp:
+        (WebCore::HTMLImageElement::parseAttribute):
+        * html/parser/HTMLPreloadScanner.cpp:
+        (WebCore::TokenPreloadScanner::StartTagScanner::processAttributes):
+        * html/parser/HTMLSrcsetParser.cpp:
+        (WebCore::pickBestImageCandidate):
+        (WebCore::bestFitSourceForImageAttributes):
+        * html/parser/HTMLSrcsetParser.h:
+
 2015-05-07  Commit Queue  <commit-queue@webkit.org>
 

trunk/Source/WebCore/css/SourceSizeList.cpp

@@ -35 +35 @@
 #if !ENABLE(PICTURE_SIZES)
 
-unsigned parseSizesAttribute(StringView, RenderView*, Frame*)
+float parseSizesAttribute(StringView, RenderView*, Frame*)
 {
     return 0;
@@ -57 +57 @@
 }
 
-static unsigned defaultLength(RenderStyle& style, RenderView* view)
+static float defaultLength(RenderStyle& style, RenderView* view)
 {
-    return CSSPrimitiveValue::create(100, CSSPrimitiveValue::CSS_VW)->computeLength<unsigned>(CSSToLengthConversionData(&style, &style, view));
+    return CSSPrimitiveValue::create(100, CSSPrimitiveValue::CSS_VW)->computeLength<float>(CSSToLengthConversionData(&style, &style, view));
 }
 
-static unsigned computeLength(CSSValue* value, RenderStyle& style, RenderView* view)
+static float computeLength(CSSValue* value, RenderStyle& style, RenderView* view)
 {
     CSSToLengthConversionData conversionData(&style, &style, view);
@@ -69 +69 @@
         if (!primitiveValue.isLength())
             return defaultLength(style, view);
-        return primitiveValue.computeLength<unsigned>(conversionData);
+        return primitiveValue.computeLength<float>(conversionData);
     }
     if (is<CSSCalcValue>(value)) {
         Length length(downcast<CSSCalcValue>(*value).createCalculationValue(conversionData));
-        return CSSPrimitiveValue::create(length, &style)->computeLength<unsigned>(conversionData);
+        return CSSPrimitiveValue::create(length, &style)->computeLength<float>(conversionData);
     }
     return defaultLength(style, view);
 }
 
-unsigned parseSizesAttribute(StringView sizesAttribute, RenderView* view, Frame* frame)
+float parseSizesAttribute(StringView sizesAttribute, RenderView* view, Frame* frame)
 {
     if (!view)

trunk/Source/WebCore/css/SourceSizeList.h

@@ -29 +29 @@
 class RenderView;
 
-unsigned parseSizesAttribute(StringView sizesAttribute, RenderView*, Frame*);
+float parseSizesAttribute(StringView sizesAttribute, RenderView*, Frame*);
 
 } // namespace WebCore

trunk/Source/WebCore/html/HTMLImageElement.cpp

@@ -143 +143 @@
             downcast<RenderImage>(*renderer()).updateAltText();
     } else if (name == srcAttr || name == srcsetAttr) {
-        unsigned sourceSize = parseSizesAttribute(fastGetAttribute(sizesAttr).string(), document().renderView(), document().frame());
+        float sourceSize = parseSizesAttribute(fastGetAttribute(sizesAttr).string(), document().renderView(), document().frame());
         ImageCandidate candidate = bestFitSourceForImageAttributes(document().deviceScaleFactor(), fastGetAttribute(srcAttr), fastGetAttribute(srcsetAttr), sourceSize);
         setBestFitURLAndDPRFromImageCandidate(candidate);

trunk/Source/WebCore/html/parser/HTMLPreloadScanner.cpp

@@ -112 +112 @@
         // Resolve between src and srcSet if we have them and the tag is img.
         if (m_tagId == TagId::Img && !m_srcSetAttribute.isEmpty()) {
-            unsigned sourceSize = 0;
+            float sourceSize = 0;
 #if ENABLE(PICTURE_SIZES)
             sourceSize = parseSizesAttribute(m_sizesAttribute, document.renderView(), document.frame());

trunk/Source/WebCore/html/parser/HTMLSrcsetParser.cpp

@@ -230 +230 @@
 }
 
-static ImageCandidate pickBestImageCandidate(float deviceScaleFactor, Vector<ImageCandidate>& imageCandidates, unsigned sourceSize)
+static ImageCandidate pickBestImageCandidate(float deviceScaleFactor, Vector<ImageCandidate>& imageCandidates, float sourceSize)
 {
 #if !ENABLE(PICTURE_SIZES)
@@ -244 +244 @@
 #if ENABLE(PICTURE_SIZES)
         if (candidate.resourceWidth > 0) {
-            candidate.density = static_cast<float>(candidate.resourceWidth) / static_cast<float>(sourceSize);
+            candidate.density = static_cast<float>(candidate.resourceWidth) / sourceSize;
             ignoreSrc = true;
         } else
@@ -275 +275 @@
 }
 
-ImageCandidate bestFitSourceForImageAttributes(float deviceScaleFactor, const AtomicString& srcAttribute, const AtomicString& srcsetAttribute, unsigned sourceSize)
+ImageCandidate bestFitSourceForImageAttributes(float deviceScaleFactor, const AtomicString& srcAttribute, const AtomicString& srcsetAttribute, float sourceSize)
 {
     if (srcsetAttribute.isNull()) {

trunk/Source/WebCore/html/parser/HTMLSrcsetParser.h

@@ -99 +99 @@
 };
 
-ImageCandidate bestFitSourceForImageAttributes(float deviceScaleFactor, const AtomicString& srcAttribute, const AtomicString& srcsetAttribute, unsigned sourceSize);
+ImageCandidate bestFitSourceForImageAttributes(float deviceScaleFactor, const AtomicString& srcAttribute, const AtomicString& srcsetAttribute, float sourceSize);
 
 Vector<ImageCandidate> parseImageCandidatesFromSrcsetAttribute(StringView attribute);