diff options
author | robhogan@gmail.com <robhogan@gmail.com> | 2014-12-09 19:37:55 +0000 |
---|---|---|
committer | robhogan@gmail.com <robhogan@gmail.com> | 2014-12-09 19:37:55 +0000 |
commit | 1717cf4bfefc8504ff6971d2e8fab1e14ea462bb (patch) | |
tree | b46ada8f6f287ee74240b9e08e52c3e9256f3172 /third_party/WebKit/LayoutTests | |
parent | f7ccb9ee30e9f3186e58c3ecae3eb6387baf7eae (diff) | |
download | chromium_src-1717cf4bfefc8504ff6971d2e8fab1e14ea462bb.zip chromium_src-1717cf4bfefc8504ff6971d2e8fab1e14ea462bb.tar.gz chromium_src-1717cf4bfefc8504ff6971d2e8fab1e14ea462bb.tar.bz2 |
Use Shadow DOM to display fallback content for images
This replaces the use of painting in RenderImage to display an image's alt text
with an implementation in shadow DOM. This initial implementation is close in
appearance to the legacy display of alt-text but will ultimately move closer to
the one seen in Firefox and described in http://hixie.ch/specs/alttext.
The alt-text and broken-image icon is now rendered as:
<style>
#alttext-container {
overflow: hidden;
border: 1px solid silver;
padding: 1px;
display: inline-block;
}
#alttext { display: none; overflow: hidden;}
</style>
<div id="alttext-container">
<img src="data:png, [broken-image-icon]" width="16" height="16" align="left" style="margin: 0px">
<div id="alt-text">Alt text in here</div>
</div>
Some notes on the way the fallback content is now rendered:
- The fallback content is rendered inside an inline-block so it does not calculate
its dimensions the way a replaced element (i.e. an image) would (as defined by
http://www.w3.org/TR/CSS2/visudet.html#inline-replaced-width). So where one of width
or height is auto but the other is not, the fallback content will not exactly match
the dimensions calculated by RenderImage in error mode currently. We do a modest
imitation of the logic in quirks mode, but in strict mode it will behave exactly like an inline-block.
- Where the image has no src attribute and no alt attribute RenderImage.cpp
still looks after the painting of the element - no fallback content is generated
and no broken image is displayed. This is consistent with existing behaviour.
- The only image resource requests that still use the synchronous load path are
those where the item is cached (and didn't error out),
where its the fallback image for an object element, or where it's the image
for a main resource load. All other image loads are now asynchronous so that
fallback content can be loaded outside the style recalc phase.
- Instead of aborting an image resource request when the src element is empty
(i.e. src='') we now allow the request to go through so that it can fail and
invoke the fallback content in HTMLImageLoader.cpp.
- As you can see in the new result for fast/borders/rtl-border-05.html, since
the alt-text is displayed as an inline-block it no longer artificially shrinks
any border on the element to the broken-image icon.
Some notes on the rebaselined test results:
- I've modified inspector/network/network-image-404.html to output the state of
both the resource requests, i.e. the failed one and the resource request for the
data:png to display the broken image icon.
- I've added a missing support file for fast/css/counters/complex-before.html -
its absence meant that the result was polluted by the behaviour of broken image
rendering.
- Likewise for fast/images/imagemap-polygon* tests - our new rendering of failed
image loads was interfering with an assumption in the tests that a broken image
still painted a RenderImage. So I've removed the src attribute to allow the
assumption hold (img elements without a src attribute are painted by
RenderImage).
- I have altered fast/forms/state-restore-to-non-edited-controls.html to wait
100ms before submitting the form as the image load in the input element is now
asynchronous. Likewise for fast/forms/basic-buttons.html.
- I did the same to svg/canvas/canvas-draw-image-globalalpha.html and
fast/canvas/canvas-drawImage-out-of-bounds-src.html. Since all image loads that
might need alt content are performed asynchronously canvas.drawImage() now needs
to ensure the content has loaded before drawing.
- http/tests/security/local-image-from-remote-whitelisted.html has been masking
a bug - blink does not load the image even though it is whitelisted. I am
rebaselining the test to reflect the failure revealed by this CL and tracking
a fix under crbug.com/410949.
- As the alt text is now always exposed if the image doesn't load, any input elements
that use an image will show the default alt title 'Submit'. This shows up in
the accessibility unit tests in content_browsertests. I plan to rebaseline these
in a separate CL.
Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=185847
Review URL: https://codereview.chromium.org/481753002
git-svn-id: svn://svn.chromium.org/blink/trunk@186800 bbb929c8-8fbe-4397-9dbb-9b2b20218538
Diffstat (limited to 'third_party/WebKit/LayoutTests')
26 files changed, 225 insertions, 18 deletions
diff --git a/third_party/WebKit/LayoutTests/TestExpectations b/third_party/WebKit/LayoutTests/TestExpectations index f87211c8..d910139 100644 --- a/third_party/WebKit/LayoutTests/TestExpectations +++ b/third_party/WebKit/LayoutTests/TestExpectations @@ -848,7 +848,7 @@ crbug.com/393523 [ Mac Release ] http/tests/misc/submit-post-keygen.html [ Pass crbug.com/362047 [ Mac Linux ] mhtml/mhtml_in_iframe.html [ Crash Pass ] crbug.com/362073 [ Mac Debug ] fast/dom/shadow/input-color-in-content.html [ Crash Pass ] -crbug.com/365400 [ Mac ] compositing/images/direct-pdf-image.html [ Pass ImageOnlyFailure ] +crbug.com/365400 [ Mac ] compositing/images/direct-pdf-image.html [ Failure ] crbug.com/306222 fast/hidpi/image-srcset-relative-svg-canvas.html [ Skip ] crbug.com/306222 fast/hidpi/image-srcset-relative-svg-canvas-2x.html [ Skip ] @@ -1021,6 +1021,155 @@ crbug.com/350853 fast/multicol/widows2.html [ Skip ] crbug.com/350853 fast/pagination/auto-height.html [ Skip ] crbug.com/350853 fast/pagination/auto-height-with-break.html [ Skip ] +crbug.com/419101 http/tests/security/contentSecurityPolicy/report-and-enforce.html [ NeedsRebaseline ] +crbug.com/419101 [ Mac Linux ] http/tests/security/contentSecurityPolicy/report-cross-origin-no-cookies.html [ NeedsRebaseline ] +crbug.com/419101 [ Win Debug ] http/tests/security/contentSecurityPolicy/report-cross-origin-no-cookies.html [ NeedsRebaseline ] +crbug.com/419101 http/tests/security/contentSecurityPolicy/report-same-origin-with-cookies.html [ NeedsRebaseline ] +crbug.com/419101 http/tests/security/mixedContent/preload-insecure-image-in-main-frame-blocked.html [ NeedsRebaseline ] +crbug.com/419101 virtual/slimmingpaint/fast/table/007.html [ NeedsRebaseline ] +crbug.com/419101 virtual/slimmingpaint/fast/table/008.html [ NeedsRebaseline ] +crbug.com/419101 virtual/deferred/fast/images/alt-text-wrapping.html [ NeedsRebaseline ] +crbug.com/419101 fast/images/alt-text-wrapping.html [ NeedsRebaseline ] +crbug.com/419101 compositing/color-matching/pdf-image-match.html [ NeedsRebaseline ] +crbug.com/419101 css1/box_properties/float_elements_in_series.html [ NeedsRebaseline ] +crbug.com/419101 editing/execCommand/insertImage.html [ NeedsRebaseline ] +crbug.com/419101 editing/pasteboard/drag-image-to-contenteditable-in-iframe.html [ NeedsRebaseline ] +crbug.com/419101 editing/selection/select-missing-image.html [ NeedsRebaseline ] +crbug.com/419101 fast/block/float/002.html [ NeedsRebaseline ] +crbug.com/419101 fast/block/float/017.html [ NeedsRebaseline ] +crbug.com/419101 fast/block/positioning/001.html [ NeedsRebaseline ] +crbug.com/419101 fast/block/positioning/058.html [ NeedsRebaseline ] +crbug.com/419101 fast/block/positioning/061.html [ NeedsRebaseline ] +crbug.com/419101 fast/borders/rtl-border-05.html [ NeedsRebaseline ] +crbug.com/419101 fast/dom/34176.html [ NeedsRebaseline ] +crbug.com/419101 fast/dom/HTMLAnchorElement/anchor-ismap-crash.html [ NeedsRebaseline ] +crbug.com/419101 fast/dom/HTMLImageElement/image-alt-text.html [ NeedsRebaseline ] +crbug.com/419101 fast/dom/HTMLImageElement/image-sizes-js-change.html [ NeedsRebaseline ] +crbug.com/419101 fast/dom/HTMLInputElement/input-image-alt-text.html [ NeedsRebaseline ] +crbug.com/419101 fast/dom/HTMLLinkElement/link-and-subresource-test-nonexistent.html [ NeedsRebaseline ] +crbug.com/419101 fast/dom/Range/range-clone-contents.html [ NeedsRebaseline ] +crbug.com/419101 fast/dom/inner-text.html [ NeedsRebaseline ] +crbug.com/419101 fast/dynamic/float-from-empty-line.html [ NeedsRebaseline ] +crbug.com/419101 fast/encoding/utf-16-big-endian.html [ NeedsRebaseline ] +crbug.com/419101 fast/encoding/utf-16-little-endian.html [ NeedsRebaseline ] +crbug.com/419101 fast/events/domactivate-sets-underlying-click-event-as-handled.html [ NeedsRebaseline ] +crbug.com/419101 fast/flexbox/023.html [ NeedsRebaseline ] +crbug.com/419101 fast/flexbox/024.html [ NeedsRebaseline ] +crbug.com/419101 fast/forms/002.html [ NeedsRebaseline ] +crbug.com/419101 fast/forms/005.html [ NeedsRebaseline ] +crbug.com/419101 fast/forms/input-value.html [ NeedsRebaseline ] +crbug.com/419101 fast/hidpi/broken-image-icon-hidpi.html [ NeedsRebaseline ] +crbug.com/419101 fast/hidpi/broken-image-with-size-hidpi.html [ NeedsRebaseline ] +crbug.com/419101 fast/images/55.html [ NeedsRebaseline ] +crbug.com/419101 fast/images/image-error-event-not-firing.html [ NeedsRebaseline ] +crbug.com/419101 fast/images/image-in-map.html [ NeedsRebaseline ] +crbug.com/419101 fast/images/imagemap-circle-focus-ring.html [ NeedsRebaseline ] +crbug.com/419101 fast/images/imagemap-focus-ring-outline-color-explicitly-inherited-from-map.html [ NeedsRebaseline ] +crbug.com/419101 fast/images/imagemap-focus-ring-outline-color-not-inherited-from-map.html [ NeedsRebaseline ] +crbug.com/419101 fast/images/imagemap-focus-ring-outline-color.html [ NeedsRebaseline ] +crbug.com/419101 fast/images/imagemap-focus-ring-zoom.html [ NeedsRebaseline ] +crbug.com/419101 fast/images/imagemap-focus-ring.html [ NeedsRebaseline ] +crbug.com/419101 fast/images/imagemap-nested-area.html [ NeedsRebaseline ] +crbug.com/419101 fast/images/imagemap-overflowing-circle-focus-ring.html [ NeedsRebaseline ] +crbug.com/419101 fast/images/imagemap-overflowing-polygon-focus-ring.html [ NeedsRebaseline ] +crbug.com/419101 fast/images/imagemap-polygon-focus-ring.html [ NeedsRebaseline ] +crbug.com/419101 fast/invalid/012.html [ NeedsRebaseline ] +crbug.com/419101 fast/invalid/016.html [ NeedsRebaseline ] +crbug.com/419101 fast/lists/inlineBoxWrapperNullCheck.html [ NeedsRebaseline ] +crbug.com/419101 fast/loader/resource-request-callbacks.html [ NeedsRebaseline ] +crbug.com/419101 fast/media/media-svg-crash.html [ NeedsRebaseline ] +crbug.com/419101 fast/overflow/infiniteRecursion.html [ NeedsRebaseline ] +crbug.com/419101 fast/parser/comment-in-script.html [ NeedsRebaseline ] +crbug.com/419101 fast/table/007.html [ NeedsRebaseline ] +crbug.com/419101 fast/table/008.html [ NeedsRebaseline ] +crbug.com/419101 fast/text-autosizing/tables/nested-tables.html [ NeedsRebaseline ] +crbug.com/419101 fast/text/bidi-img-alt-text.html [ NeedsRebaseline ] +crbug.com/419101 fast/text/whitespace/normal-after-nowrap-breaking.html [ NeedsRebaseline ] +crbug.com/419101 http/tests/inspector/network/network-image-404.html [ NeedsRebaseline ] +crbug.com/419101 http/tests/inspector/network/network-initiator.html [ NeedsRebaseline ] +crbug.com/419101 http/tests/loading/preload-picture-invalid.html [ NeedsRebaseline ] +crbug.com/419101 http/tests/loading/preload-picture-nested.html [ NeedsRebaseline ] +crbug.com/419101 http/tests/misc/image-blocked-src-no-change.html [ NeedsRebaseline ] +crbug.com/419101 [ Mac ] http/tests/misc/image-blocked-src-change.html [ NeedsRebaseline ] +crbug.com/419101 http/tests/misc/xslt-bad-import.html [ NeedsRebaseline ] +crbug.com/419101 http/tests/security/contentSecurityPolicy/image-blocked.html [ NeedsRebaseline ] +crbug.com/419101 http/tests/security/contentSecurityPolicy/report-multiple-violations-01.html [ NeedsRebaseline ] +crbug.com/419101 http/tests/security/contentSecurityPolicy/xsl-img-blocked.php [ NeedsRebaseline ] +crbug.com/419101 http/tests/security/contentTypeOptions/nosniff-script-without-content-type-blocked.html [ NeedsRebaseline ] +crbug.com/419101 http/tests/security/local-image-from-remote-whitelisted.html [ NeedsRebaseline ] +crbug.com/419101 http/tests/security/mixedContent/insecure-empty-srcset-in-main-frame-blocked.html [ NeedsRebaseline ] +crbug.com/419101 http/tests/security/mixedContent/insecure-image-in-iframe.html [ NeedsRebaseline ] +crbug.com/419101 http/tests/security/mixedContent/insecure-image-in-main-frame-allowed.html [ NeedsRebaseline ] +crbug.com/419101 http/tests/security/mixedContent/insecure-image-in-main-frame-blocked.html [ NeedsRebaseline ] +crbug.com/419101 http/tests/security/mixedContent/insecure-image-in-main-frame.html [ NeedsRebaseline ] +crbug.com/419101 http/tests/security/mixedContent/insecure-picture-in-main-frame-blocked.html [ NeedsRebaseline ] +crbug.com/419101 http/tests/security/mixedContent/insecure-srcset-in-main-frame-blocked.html [ NeedsRebaseline ] +crbug.com/419101 http/tests/serviceworker/fetch-csp.html [ NeedsRebaseline ] +crbug.com/419101 inspector/extensions/extensions-network.html [ NeedsRebaseline ] +crbug.com/419101 security/block-test-no-port.html [ NeedsRebaseline ] +crbug.com/419101 security/block-test.html [ NeedsRebaseline ] +crbug.com/419101 svg/as-image/svg-invalid-image-1.html [ NeedsRebaseline ] +crbug.com/419101 tables/mozilla/bugs/bug11026.html [ NeedsRebaseline ] +crbug.com/419101 tables/mozilla/bugs/bug12268.html [ NeedsRebaseline ] +crbug.com/419101 tables/mozilla/bugs/bug17587.html [ NeedsRebaseline ] +crbug.com/419101 tables/mozilla/bugs/bug215629.html [ NeedsRebaseline ] +crbug.com/419101 tables/mozilla/bugs/bug24661.html [ NeedsRebaseline ] +crbug.com/419101 tables/mozilla/bugs/bug2479-1.html [ NeedsRebaseline ] +crbug.com/419101 tables/mozilla/bugs/bug2962.html [ NeedsRebaseline ] +crbug.com/419101 tables/mozilla/bugs/bug2997.html [ NeedsRebaseline ] +crbug.com/419101 tables/mozilla/bugs/bug3977.html [ NeedsRebaseline ] +crbug.com/419101 tables/mozilla/bugs/bug4527.html [ NeedsRebaseline ] +crbug.com/419101 tables/mozilla/bugs/bug4576.html [ NeedsRebaseline ] +crbug.com/419101 tables/mozilla/bugs/bug5538.html [ NeedsRebaseline ] +crbug.com/419101 tables/mozilla/bugs/bug56201.html [ NeedsRebaseline ] +crbug.com/419101 tables/mozilla/bugs/bug60804.html [ NeedsRebaseline ] +crbug.com/419101 tables/mozilla/bugs/bug60807.html [ NeedsRebaseline ] +crbug.com/419101 tables/mozilla/bugs/bug9123-1.html [ NeedsRebaseline ] +crbug.com/419101 tables/mozilla/collapsing_borders/bug41262-3.html [ NeedsRebaseline ] +crbug.com/419101 tables/mozilla_expected_failures/bugs/bug10140.html [ NeedsRebaseline ] +crbug.com/419101 tables/mozilla_expected_failures/bugs/bug23847.html [ NeedsRebaseline ] +crbug.com/419101 tables/mozilla_expected_failures/bugs/bug32205-4.html [ NeedsRebaseline ] +crbug.com/419101 tables/mozilla_expected_failures/bugs/bug72393.html [ NeedsRebaseline ] +crbug.com/419101 virtual/deferred/fast/images/55.html [ NeedsRebaseline ] +crbug.com/419101 virtual/deferred/fast/images/image-in-map.html [ NeedsRebaseline ] +crbug.com/419101 virtual/deferred/fast/images/imagemap-circle-focus-ring.html [ NeedsRebaseline ] +crbug.com/419101 virtual/deferred/fast/images/imagemap-focus-ring-outline-color-explicitly-inherited-from-map.html [ NeedsRebaseline ] +crbug.com/419101 virtual/deferred/fast/images/imagemap-focus-ring-outline-color-not-inherited-from-map.html [ NeedsRebaseline ] +crbug.com/419101 virtual/deferred/fast/images/imagemap-focus-ring-outline-color.html [ NeedsRebaseline ] +crbug.com/419101 virtual/deferred/fast/images/imagemap-overflowing-circle-focus-ring.html [ NeedsRebaseline ] +crbug.com/419101 virtual/deferred/fast/images/imagemap-overflowing-polygon-focus-ring.html [ NeedsRebaseline ] +crbug.com/419101 virtual/deferred/fast/images/imagemap-polygon-focus-ring.html [ NeedsRebaseline ] +crbug.com/419101 virtual/deferred/fast/images/png-suite/test.html [ NeedsRebaseline ] +crbug.com/419101 virtual/implsidepainting/inspector/tracing/paint-command-log-nodes.html [ NeedsRebaseline ] +crbug.com/419101 [ Linux Mac Win ] fast/images/png-suite/test.html [ NeedsRebaseline ] +crbug.com/419101 virtual/textblob/fast/text/whitespace/normal-after-nowrap-breaking.html [ NeedsRebaseline ] +crbug.com/419101 virtual/antialiasedtext/fast/text/whitespace/normal-after-nowrap-breaking.html [ NeedsRebaseline ] +crbug.com/419101 virtual/textblob/fast/text/bidi-img-alt-text.html [ NeedsRebaseline ] +crbug.com/419101 virtual/antialiasedtext/fast/text/bidi-img-alt-text.html [ NeedsRebaseline ] +crbug.com/419101 virtual/deferred/fast/images/image-error-event-not-firing.html [ NeedsRebaseline ] +crbug.com/419101 [ Mac Win ] virtual/deferred/fast/images/imagemap-focus-ring.html [ NeedsRebaseline ] +crbug.com/419101 [ Mac Win ] virtual/deferred/fast/images/imagemap-focus-ring-zoom.html [ NeedsRebaseline ] +crbug.com/419101 http/tests/loading/promote-img-in-viewport-priority.html [ NeedsRebaseline ] +crbug.com/419101 virtual/slimmingpaint/fast/block/float/017.html [ NeedsRebaseline ] +crbug.com/419101 virtual/slimmingpaint/fast/block/positioning/061.html [ NeedsRebaseline ] +crbug.com/419101 virtual/slimmingpaint/fast/block/float/002.html [ NeedsRebaseline ] +crbug.com/419101 virtual/slimmingpaint/fast/block/positioning/058.html [ NeedsRebaseline ] +crbug.com/419101 virtual/slimmingpaint/fast/block/positioning/001.html [ NeedsRebaseline ] +crbug.com/419101 http/tests/security/contentSecurityPolicy/image-blocked-alt-content.html [ NeedsRebaseline ] +crbug.com/419101 virtual/slimmingpaint/fast/images/imagemap-circle-focus-ring.html [ NeedsRebaseline ] +crbug.com/419101 virtual/slimmingpaint/fast/images/imagemap-focus-ring-outline-color.html [ NeedsRebaseline ] +crbug.com/419101 virtual/slimmingpaint/fast/images/imagemap-overflowing-circle-focus-ring.html [ NeedsRebaseline ] +crbug.com/419101 virtual/slimmingpaint/fast/images/imagemap-focus-ring-outline-color-explicitly-inherited-from-map.html [ NeedsRebaseline ] +crbug.com/419101 virtual/slimmingpaint/fast/images/alt-text-wrapping.html [ NeedsRebaseline ] +crbug.com/419101 virtual/slimmingpaint/fast/images/imagemap-polygon-focus-ring.html [ NeedsRebaseline ] +crbug.com/419101 virtual/slimmingpaint/fast/images/imagemap-overflowing-polygon-focus-ring.html [ NeedsRebaseline ] +crbug.com/419101 virtual/slimmingpaint/fast/images/image-in-map.html [ NeedsRebaseline ] +crbug.com/419101 virtual/slimmingpaint/fast/images/imagemap-focus-ring-zoom.html [ NeedsRebaseline ] +crbug.com/419101 virtual/slimmingpaint/fast/images/imagemap-focus-ring-outline-color-not-inherited-from-map.html [ NeedsRebaseline ] +crbug.com/419101 virtual/slimmingpaint/fast/text/bidi-img-alt-text.html [ NeedsRebaseline ] +crbug.com/419101 virtual/slimmingpaint/fast/text/whitespace/normal-after-nowrap-breaking.html [ NeedsRebaseline ] +crbug.com/419101 virtual/slimmingpaint/fast/images/imagemap-focus-ring.html [ NeedsRebaseline ] + crbug.com/374572 svg/filters/feImage-target-reappend-to-document.svg [ Pass Failure ] crbug.com/374572 svg/dynamic-updates/SVGImageElement-svgdom-preserveAspectRatio-prop.html [ Pass ImageOnlyFailure ] diff --git a/third_party/WebKit/LayoutTests/fast/css/counters/support/square-outline-32x32.png b/third_party/WebKit/LayoutTests/fast/css/counters/support/square-outline-32x32.png Binary files differnew file mode 100644 index 0000000..917163f --- /dev/null +++ b/third_party/WebKit/LayoutTests/fast/css/counters/support/square-outline-32x32.png diff --git a/third_party/WebKit/LayoutTests/fast/forms/state-restore-to-non-edited-controls.html b/third_party/WebKit/LayoutTests/fast/forms/state-restore-to-non-edited-controls.html index 6aebc58..a2f3867 100644 --- a/third_party/WebKit/LayoutTests/fast/forms/state-restore-to-non-edited-controls.html +++ b/third_party/WebKit/LayoutTests/fast/forms/state-restore-to-non-edited-controls.html @@ -40,7 +40,7 @@ function runTest() document.getElementById('text1').value = 'edit'; // Submit form in a timeout to make sure that we create a new back/forward list item. - setTimeout(function() {document.getElementById('form1').submit();}, 0); + setTimeout(function() {document.getElementById('form1').submit();}, 100); } else { // Second visit. makeForm(parent, '2', '2', '2', '2', '2', '2', '2', '2', '2'); diff --git a/third_party/WebKit/LayoutTests/fast/images/alt-text-wrapping.html b/third_party/WebKit/LayoutTests/fast/images/alt-text-wrapping.html new file mode 100644 index 0000000..9b55ba0 --- /dev/null +++ b/third_party/WebKit/LayoutTests/fast/images/alt-text-wrapping.html @@ -0,0 +1 @@ +<img src="none.jpg" width="100px" height="100px" alt="This text should wrap inside the fallback content."></img> diff --git a/third_party/WebKit/LayoutTests/fast/images/imagemap-circle-focus-ring.html b/third_party/WebKit/LayoutTests/fast/images/imagemap-circle-focus-ring.html index 832bcd53..20a9c42 100644 --- a/third_party/WebKit/LayoutTests/fast/images/imagemap-circle-focus-ring.html +++ b/third_party/WebKit/LayoutTests/fast/images/imagemap-circle-focus-ring.html @@ -4,7 +4,7 @@ <map name="imagemap"> <area id="area" shape="circle" coords="64,64,61" href="#dummy" /> </map> -<img src="dummy.gif" width="128" height="128" usemap="#imagemap" /> +<img width="128" height="128" usemap="#imagemap" /> <script>document.getElementById("area").focus()</script> </body> </html> diff --git a/third_party/WebKit/LayoutTests/fast/images/imagemap-focus-ring-outline-color-explicitly-inherited-from-map.html b/third_party/WebKit/LayoutTests/fast/images/imagemap-focus-ring-outline-color-explicitly-inherited-from-map.html index de9103d..9c3e190 100644 --- a/third_party/WebKit/LayoutTests/fast/images/imagemap-focus-ring-outline-color-explicitly-inherited-from-map.html +++ b/third_party/WebKit/LayoutTests/fast/images/imagemap-focus-ring-outline-color-explicitly-inherited-from-map.html @@ -16,7 +16,7 @@ window.onload = function() <map name="imagemap"> <area id="area" shape="rect" coords="0,0,128,128" href="#dummy"/> </map> -<img src="imagemap.jpg" width="128" height="128" usemap="#imagemap" /> +<img width="128" height="128" usemap="#imagemap" /> </body> </head> </html> diff --git a/third_party/WebKit/LayoutTests/fast/images/imagemap-focus-ring-outline-color-not-inherited-from-map.html b/third_party/WebKit/LayoutTests/fast/images/imagemap-focus-ring-outline-color-not-inherited-from-map.html index e3bd236..5213ae7 100644 --- a/third_party/WebKit/LayoutTests/fast/images/imagemap-focus-ring-outline-color-not-inherited-from-map.html +++ b/third_party/WebKit/LayoutTests/fast/images/imagemap-focus-ring-outline-color-not-inherited-from-map.html @@ -15,7 +15,7 @@ window.onload = function() <map name="imagemap"> <area id="area" shape="rect" coords="0,0,128,128" href="#dummy"/> </map> -<img src="imagemap.jpg" width="128" height="128" usemap="#imagemap" /> +<img width="128" height="128" usemap="#imagemap" /> </body> </head> </html> diff --git a/third_party/WebKit/LayoutTests/fast/images/imagemap-focus-ring-outline-color.html b/third_party/WebKit/LayoutTests/fast/images/imagemap-focus-ring-outline-color.html index d513be2..427ebf2 100644 --- a/third_party/WebKit/LayoutTests/fast/images/imagemap-focus-ring-outline-color.html +++ b/third_party/WebKit/LayoutTests/fast/images/imagemap-focus-ring-outline-color.html @@ -15,7 +15,7 @@ window.onload = function() <map name="imagemap"> <area id="area" shape="rect" coords="0,0,128,128" href="#dummy"/> </map> -<img src="imagemap.jpg" width="128" height="128" usemap="#imagemap" /> +<img width="128" height="128" usemap="#imagemap" /> </body> </head> </html> diff --git a/third_party/WebKit/LayoutTests/fast/images/imagemap-focus-ring-zoom-style-expected.html b/third_party/WebKit/LayoutTests/fast/images/imagemap-focus-ring-zoom-style-expected.html index a26579d..c13a01e 100644 --- a/third_party/WebKit/LayoutTests/fast/images/imagemap-focus-ring-zoom-style-expected.html +++ b/third_party/WebKit/LayoutTests/fast/images/imagemap-focus-ring-zoom-style-expected.html @@ -12,7 +12,7 @@ window.onload = function() <map name="imagemap"> <area id="area" shape="rect" coords="0,0,256,256" href="#dummy" /> </map> -<img src="imagemap.jpg" width="256" height="256" usemap="#imagemap" ismap /> +<img width="256" height="256" usemap="#imagemap" ismap /> </body> </head> </html> diff --git a/third_party/WebKit/LayoutTests/fast/images/imagemap-focus-ring-zoom-style.html b/third_party/WebKit/LayoutTests/fast/images/imagemap-focus-ring-zoom-style.html index 6d6666b..021e313 100644 --- a/third_party/WebKit/LayoutTests/fast/images/imagemap-focus-ring-zoom-style.html +++ b/third_party/WebKit/LayoutTests/fast/images/imagemap-focus-ring-zoom-style.html @@ -15,7 +15,7 @@ img { zoom: 2.0; } <map name="imagemap"> <area id="area" shape="rect" coords="0,0,128,128" href="#dummy" /> </map> -<img src="imagemap.jpg" width="128" height="128" usemap="#imagemap" ismap /> +<img width="128" height="128" usemap="#imagemap" ismap /> </body> </head> </html> diff --git a/third_party/WebKit/LayoutTests/fast/images/imagemap-focus-ring-zoom.html b/third_party/WebKit/LayoutTests/fast/images/imagemap-focus-ring-zoom.html index b8aee15..55c22b1 100644 --- a/third_party/WebKit/LayoutTests/fast/images/imagemap-focus-ring-zoom.html +++ b/third_party/WebKit/LayoutTests/fast/images/imagemap-focus-ring-zoom.html @@ -18,7 +18,7 @@ This test can be used to ensure that a focus ring is drawn correctly for an imag <map name="imagemap"> <area id="area" shape="rect" coords="0,0,128,128" href="#dummy" /> </map> -<img src="imagemap.jpg" width="128" height="128" usemap="#imagemap" ismap /> +<img width="128" height="128" usemap="#imagemap" ismap /> </body> </head> </html> diff --git a/third_party/WebKit/LayoutTests/fast/images/imagemap-focus-ring.html b/third_party/WebKit/LayoutTests/fast/images/imagemap-focus-ring.html index 5759cc4..34036d3 100644 --- a/third_party/WebKit/LayoutTests/fast/images/imagemap-focus-ring.html +++ b/third_party/WebKit/LayoutTests/fast/images/imagemap-focus-ring.html @@ -12,7 +12,7 @@ window.onload = function() <map name="imagemap"> <area id="area" shape="rect" coords="0,0,128,128" href="#dummy" /> </map> -<img src="imagemap.jpg" width="128" height="128" usemap="#imagemap" ismap /> +<img width="128" height="128" usemap="#imagemap" ismap /> </body> </head> </html> diff --git a/third_party/WebKit/LayoutTests/fast/images/imagemap-nested-area.html b/third_party/WebKit/LayoutTests/fast/images/imagemap-nested-area.html index 0682fe2..642e4e8 100644 --- a/third_party/WebKit/LayoutTests/fast/images/imagemap-nested-area.html +++ b/third_party/WebKit/LayoutTests/fast/images/imagemap-nested-area.html @@ -36,7 +36,7 @@ <area id="area" shape="rect" coords="0,0,128,128" href="#dummy" /> </div> </map> - <img src="imagemap.jpg" width="128" height="128" usemap="#imagemap" ismap /> + <img width="128" height="128" usemap="#imagemap" ismap /> </div> <div id="after" tabIndex=0 /> diff --git a/third_party/WebKit/LayoutTests/fast/images/imagemap-overflowing-circle-focus-ring.html b/third_party/WebKit/LayoutTests/fast/images/imagemap-overflowing-circle-focus-ring.html index 464cccd..a2d6d06 100644 --- a/third_party/WebKit/LayoutTests/fast/images/imagemap-overflowing-circle-focus-ring.html +++ b/third_party/WebKit/LayoutTests/fast/images/imagemap-overflowing-circle-focus-ring.html @@ -4,7 +4,7 @@ <map name="imagemap"> <area id="area" shape="circle" coords="128,64,61" href="#dummy" /> </map> -<img src="dummy.gif" width="128" height="128" usemap="#imagemap" /> +<img width="128" height="128" usemap="#imagemap" /> <script>document.getElementById("area").focus()</script> </body> </html> diff --git a/third_party/WebKit/LayoutTests/fast/images/imagemap-overflowing-polygon-focus-ring.html b/third_party/WebKit/LayoutTests/fast/images/imagemap-overflowing-polygon-focus-ring.html index a55a3dad..7456f63 100644 --- a/third_party/WebKit/LayoutTests/fast/images/imagemap-overflowing-polygon-focus-ring.html +++ b/third_party/WebKit/LayoutTests/fast/images/imagemap-overflowing-polygon-focus-ring.html @@ -4,7 +4,7 @@ <map name="imagemap"> <area id="area" shape="polygon" coords="60,-10,0,160,150,40,-30,40,120,160" href="#dummy" /> </map> -<img src="dummy.gif" width="128" height="128" usemap="#imagemap" /> +<img width="128" height="128" usemap="#imagemap" /> <script>document.getElementById("area").focus()</script> </body> </html> diff --git a/third_party/WebKit/LayoutTests/fast/images/imagemap-polygon-focus-ring.html b/third_party/WebKit/LayoutTests/fast/images/imagemap-polygon-focus-ring.html index b60694a..401ce20 100644 --- a/third_party/WebKit/LayoutTests/fast/images/imagemap-polygon-focus-ring.html +++ b/third_party/WebKit/LayoutTests/fast/images/imagemap-polygon-focus-ring.html @@ -4,7 +4,7 @@ <map name="imagemap"> <area id="area" shape="polygon" coords="44,4,84,4,84,44,124,44,124,84,84,84,84,124,44,124,44,84,4,84,4,44,44,44" href="#dummy" /> </map> -<img src="dummy.gif" width="128" height="128" usemap="#imagemap" /> +<img width="128" height="128" usemap="#imagemap" /> <script>document.getElementById("area").focus()</script> </body> </html> diff --git a/third_party/WebKit/LayoutTests/http/tests/inspector/network/network-image-404.html b/third_party/WebKit/LayoutTests/http/tests/inspector/network/network-image-404.html index f2cbdf1..5d19d1a 100644 --- a/third_party/WebKit/LayoutTests/http/tests/inspector/network/network-image-404.html +++ b/third_party/WebKit/LayoutTests/http/tests/inspector/network/network-image-404.html @@ -40,8 +40,14 @@ function test() function step3() { - var request1 = InspectorTest.networkRequests().pop(); - InspectorTest.addResult("resource.content after requesting content: " + request1.content); + var requests = InspectorTest.networkRequests(); + requests.sort(function(a, b) {return a.url.localeCompare(b.url);}); + InspectorTest.addResult("resources count = " + requests.length); + for (i = 0; i < requests.length; i++) { + InspectorTest.addResult(requests[i].url); + InspectorTest.addResult("resource.content after requesting content: " + requests[i].content); + } + InspectorTest.completeTest(); } diff --git a/third_party/WebKit/LayoutTests/http/tests/security/contentSecurityPolicy/image-blocked-alt-content-expected.txt b/third_party/WebKit/LayoutTests/http/tests/security/contentSecurityPolicy/image-blocked-alt-content-expected.txt new file mode 100644 index 0000000..bce9ddb --- /dev/null +++ b/third_party/WebKit/LayoutTests/http/tests/security/contentSecurityPolicy/image-blocked-alt-content-expected.txt @@ -0,0 +1,17 @@ +layer at (0,0) size 800x600 + RenderView at (0,0) size 800x600 +layer at (0,0) size 800x91 + RenderBlock {HTML} at (0,0) size 800x91 + RenderBody {BODY} at (8,8) size 784x75 + RenderText {#text} at (0,0) size 758x19 + text run at (0,0) width 758: "This test shows what alt content looks like when an image errors out on a page with a CSP that blocks data: URIs for images. " + RenderBlock {IMG} at (0,20) size 50x50 + RenderText {#text} at (0,0) size 0x0 +layer at (8,28) size 50x50 clip at (9,29) size 48x48 + RenderBlock {DIV} at (0,0) size 50x50 [border: (1px solid #C0C0C0)] + RenderImage {IMG} at (2,2) size 16x16 +layer at (26,30) size 30x40 + RenderBlock {DIV} at (18,2) size 30x40 + RenderText {#text} at (0,0) size 22x39 + text run at (0,0) width 14: "alt" + text run at (0,20) width 22: "text" diff --git a/third_party/WebKit/LayoutTests/http/tests/security/contentSecurityPolicy/image-blocked-alt-content.html b/third_party/WebKit/LayoutTests/http/tests/security/contentSecurityPolicy/image-blocked-alt-content.html new file mode 100644 index 0000000..de590c1 --- /dev/null +++ b/third_party/WebKit/LayoutTests/http/tests/security/contentSecurityPolicy/image-blocked-alt-content.html @@ -0,0 +1,10 @@ +<!DOCTYPE html> +<html> +<head> +<meta http-equiv="Content-Security-Policy" content="img-src 'self'; script-src 'unsafe-inline'"> +</head> +<body> +This test shows what alt content looks like when an image errors out on a page with a CSP that blocks data: URIs for images. +<img src="../resources/ab.png" width="50px;" height="50px;" alt="alt text"> +</body> +</html> diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/hidpi/broken-image-icon-hidpi-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/hidpi/broken-image-icon-hidpi-expected.png Binary files differnew file mode 100644 index 0000000..0c0b537 --- /dev/null +++ b/third_party/WebKit/LayoutTests/platform/linux/fast/hidpi/broken-image-icon-hidpi-expected.png diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/hidpi/broken-image-icon-hidpi-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/fast/hidpi/broken-image-icon-hidpi-expected.txt index 8a0a90b7e..fba4c0a 100644 --- a/third_party/WebKit/LayoutTests/platform/linux/fast/hidpi/broken-image-icon-hidpi-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/linux/fast/hidpi/broken-image-icon-hidpi-expected.txt @@ -7,5 +7,8 @@ layer at (0,0) size 800x600 RenderText {#text} at (0,0) size 700x19 text run at (0,0) width 700: "This test passes if the broken image icon appears high-resolution in HiDPI and if the outline is of the appropriate size." RenderBlock (anonymous) at (0,20) size 784x20 - RenderImage {IMG} at (0,0) size 20x20 + RenderBlock {IMG} at (0,0) size 20x20 RenderText {#text} at (0,0) size 0x0 +layer at (8,28) size 20x20 clip at (9,29) size 18x18 + RenderBlock {DIV} at (0,0) size 20x20 [border: (1px solid #C0C0C0)] + RenderImage {IMG} at (2,2) size 16x16 diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/hidpi/broken-image-with-size-hidpi-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/hidpi/broken-image-with-size-hidpi-expected.png Binary files differnew file mode 100644 index 0000000..b0219ca --- /dev/null +++ b/third_party/WebKit/LayoutTests/platform/linux/fast/hidpi/broken-image-with-size-hidpi-expected.png diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/hidpi/broken-image-with-size-hidpi-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/fast/hidpi/broken-image-with-size-hidpi-expected.txt index 0d24013..3b997c4 100644 --- a/third_party/WebKit/LayoutTests/platform/linux/fast/hidpi/broken-image-with-size-hidpi-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/linux/fast/hidpi/broken-image-with-size-hidpi-expected.txt @@ -7,5 +7,8 @@ layer at (0,0) size 800x600 RenderText {#text} at (0,0) size 608x19 text run at (0,0) width 608: "This test passes if the broken image icon appears high-resolution in HiDPI and is the appropriate size." RenderBlock (anonymous) at (0,20) size 784x150 - RenderImage {IMG} at (0,0) size 300x150 + RenderBlock {IMG} at (0,0) size 300x150 RenderText {#text} at (0,0) size 0x0 +layer at (8,28) size 300x150 clip at (9,29) size 298x148 + RenderBlock {DIV} at (0,0) size 300x150 [border: (1px solid #C0C0C0)] + RenderImage {IMG} at (2,2) size 16x16 diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/images/alt-text-wrapping-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/images/alt-text-wrapping-expected.png Binary files differnew file mode 100644 index 0000000..02d1845 --- /dev/null +++ b/third_party/WebKit/LayoutTests/platform/linux/fast/images/alt-text-wrapping-expected.png diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/images/alt-text-wrapping-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/fast/images/alt-text-wrapping-expected.txt new file mode 100644 index 0000000..d1f09118 --- /dev/null +++ b/third_party/WebKit/LayoutTests/platform/linux/fast/images/alt-text-wrapping-expected.txt @@ -0,0 +1,18 @@ +layer at (0,0) size 800x600 + RenderView at (0,0) size 800x600 +layer at (0,0) size 800x600 + RenderBlock {HTML} at (0,0) size 800x600 + RenderBody {BODY} at (8,8) size 784x584 + RenderBlock {IMG} at (0,0) size 100x100 + RenderText {#text} at (0,0) size 0x0 +layer at (8,8) size 100x100 clip at (9,9) size 98x98 scrollHeight 102 + RenderBlock {DIV} at (0,0) size 100x100 [border: (1px solid #C0C0C0)] + RenderImage {IMG} at (2,2) size 16x16 +layer at (26,10) size 80x100 backgroundClip at (26,10) size 80x97 clip at (26,10) size 80x97 outlineClip at (9,9) size 98x98 + RenderBlock {DIV} at (18,2) size 80x100 + RenderText {#text} at (0,0) size 74x99 + text run at (0,0) width 51: "This text" + text run at (0,20) width 74: "should wrap" + text run at (0,40) width 56: "inside the" + text run at (0,60) width 47: "fallback" + text run at (0,80) width 48: "content." diff --git a/third_party/WebKit/LayoutTests/platform/linux/http/tests/security/contentSecurityPolicy/image-blocked-alt-content-expected.png b/third_party/WebKit/LayoutTests/platform/linux/http/tests/security/contentSecurityPolicy/image-blocked-alt-content-expected.png Binary files differnew file mode 100644 index 0000000..5f1c1a4 --- /dev/null +++ b/third_party/WebKit/LayoutTests/platform/linux/http/tests/security/contentSecurityPolicy/image-blocked-alt-content-expected.png |