Skip to content

GitLab

T
tangled
Commit 41c37b46 authored by yoav@yoav.ws's avatar yoav@yoav.ws
Browse files
Options

Revert of Enable a srcset 0x descriptor (https://codereview.chromium.org/305643006/) 

Reason for revert:
This patch closed the tree with a '"update" on "Win7 Tests"' message. Reverting

Original issue's description:
> Enable a srcset 0x descriptor
> 
> According to recent spec changes, a "0x" descriptor should be correctly parsed,
> and imply intrinsic dimensions of infinity to the image.
> This CL enables that, and tests that intrinsic dimensions are impacted accordingly.
> 
> BUG=378252
> 
> Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=175196

TBR=eseidel@chromium.org,pdr@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=378252

Review URL: https://codereview.chromium.org/302083009

git-svn-id: svn://svn.chromium.org/blink/trunk@175197 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent e2df3dc1
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 49 deletions
third_party/WebKit/LayoutTests/TestExpectations
View file @ 41c37b46
......@@ -62,11 +62,6 @@ crbug.com/245611 [ Linux ] fast/hidpi/video-controls-in-hidpi.html [ ImageOnlyFa
crbug.com/304953 fast/css/font-face-download-error.html [ Pass Timeout ]
crbug.com/379155 [ Win ] fast/hidpi/image-srcset-intrinsic-size-zero.html [ Failure ]
crbug.com/379155 [ Win ] virtual/gpu/fast/hidpi/image-srcset-intrinsic-size-zero.html [ Failure ]
crbug.com/379155 [ Linux Debug ] fast/hidpi/image-srcset-intrinsic-size-zero.html [ Failure ]
crbug.com/379155 [ Linux Debug ] virtual/gpu/fast/hidpi/image-srcset-intrinsic-size-zero.html [ Failure ]
# This batch were marked as NeedsRebaseline for crbug.com/133097 but are flaky:
crbug.com/310679 [ Mac ] compositing/fixed-body-background-positioned.html [ Failure Pass ]
crbug.com/310679 [ Mac ] compositing/rubberbanding/transform-overhang-e.html [ ImageOnlyFailure Pass ]
......
third_party/WebKit/LayoutTests/fast/hidpi/image-srcset-intrinsic-size-expected.txt
View file @ 41c37b46
PASS successfullyParsed is true
TEST COMPLETE
PASS document.getElementById("foo").clientWidth is 200
PASS document.getElementById("foo2").clientWidth is 400
PASS document.getElementById("foo3").clientWidth is 100
PASS document.getElementById("foo4").clientWidth is 200
PASS document.getElementById("foo5").clientWidth is 200
PASS document.getElementById("foo").clientWidth==200 is true
PASS document.getElementById("foo2").clientWidth==400 is true
PASS document.getElementById("foo3").clientWidth==100 is true
PASS document.getElementById("foo4").clientWidth==200 is true
This test passes if the images are all displayed with appropriate dimensions.
third_party/WebKit/LayoutTests/fast/hidpi/image-srcset-intrinsic-size-zero-expected.txt deleted 100644 → 0
View file @ e2df3dc1
PASS successfullyParsed is true
TEST COMPLETE
PASS document.getElementById("foo").clientWidth is 33554432
This test passes if the image is displayed with infinite dimensions
third_party/WebKit/LayoutTests/fast/hidpi/image-srcset-intrinsic-size-zero.html deleted 100644 → 0
View file @ e2df3dc1
<html>
<head>
<script>
window.targetScaleFactor = 2;
</script>
<script src="resources/srcset-helper.js"></script>
<script src="../../resources/js-test.js"></script>
<script>
addEventListener("load", function() {
shouldBe('document.getElementById("foo").clientWidth', '33554432');
}, false);
</script>
</head>
<body id="body">
<div>
This test passes if the image is displayed with infinite dimensions
</div>
<img id="foo" srcset="resources/blue-100-px-square.png 0x">
</body>
</html>
third_party/WebKit/LayoutTests/fast/hidpi/image-srcset-intrinsic-size.html
View file @ 41c37b46
......@@ -7,11 +7,10 @@
<script src="../../resources/js-test.js"></script>
<script>
addEventListener("load", function() {
shouldBe('document.getElementById("foo").clientWidth', '200');
shouldBe('document.getElementById("foo2").clientWidth', '400');
shouldBe('document.getElementById("foo3").clientWidth', '100');
shouldBe('document.getElementById("foo4").clientWidth', '200');
shouldBe('document.getElementById("foo5").clientWidth', '200');
shouldBeTrue('document.getElementById("foo").clientWidth==200');
shouldBeTrue('document.getElementById("foo2").clientWidth==400');
shouldBeTrue('document.getElementById("foo3").clientWidth==100');
shouldBeTrue('document.getElementById("foo4").clientWidth==200');
}, false);
</script>
</head>
......@@ -26,8 +25,6 @@
<br>
<img id="foo3" srcset="resources/srcset.svg 2x">
<br>
<img id="foo4" srcset="resources/blue-100-px-square.png 0.5x">
<br>
<img id="foo5" src="resources/srcset.svg">
<img id="foo4" src="resources/srcset.svg">
</body>
</html>
third_party/WebKit/Source/core/html/HTMLImageElement.cpp
View file @ 41c37b46
......@@ -181,8 +181,9 @@ void HTMLImageElement::setBestFitURLAndDPRFromImageCandidate(const ImageCandidat
m_bestFitImageURL = candidate.url();
m_currentSrc = AtomicString(document().completeURL(imageSourceURL()).string());
float candidateDensity = candidate.density();
if (candidateDensity >= 0)
m_imageDevicePixelRatio = 1.0 / candidateDensity;
// FIXME: Make this ">0" part match the spec, once it settles.
if (candidateDensity > 0)
m_imageDevicePixelRatio = 1 / candidateDensity;
if (renderer() && renderer()->isImage())
toRenderImage(renderer())->setImageDevicePixelRatio(m_imageDevicePixelRatio);
}
......
third_party/WebKit/Source/core/html/parser/HTMLSrcsetParser.cpp
View file @ 41c37b46
......@@ -185,7 +185,7 @@ static bool parseDescriptors(const CharType* attribute, Vector<DescriptorToken>&
} else if (c == 'x') {
if (result.hasDensity() || result.hasHeight() || result.hasWidth())
return false;
float density = it->toFloat(attribute, isValid);
int density = it->toFloat(attribute, isValid);
if (!isValid || density < 0)
return false;
result.setDensity(density);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment