Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-28 05:10:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 628747: Back out 0435ed183c2d (first version of this bug's patch). a=backout

Browse Source
This commit is contained in:
Daniel Holbert 2011-01-28 07:52:16 -08:00
parent ff41b01fc8
commit 35983e2c7f
3 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
content/base/src/nsDataDocumentContentPolicy.cpp
View File

@ -78,8 +78,8 @@ nsDataDocumentContentPolicy::ShouldLoad(PRUint32 aContentType,
return NS_OK;
}
// Nothing else is OK to load for data documents or SVG-as-an-image documents
if (doc->IsLoadedAsData() || doc->IsBeingUsedAsImage()) {
// Nothing else is OK to load for data documents
if (doc->IsLoadedAsData()) {
*aDecision = nsIContentPolicy::REJECT_TYPE;
return NS_OK;
}

8
layout/reftests/svg/as-image/img-and-image-1-ref.svg
View File

@ -29,18 +29,10 @@
<!-- Single column from the testcase -->
<g id="column">
<use y="0" xlink:href="#pAR_xMaxYMax_slice" width="60" height="20"/>
<!--
XXXdholbert As of bug 628747, the svg:image elements *within* an SVG
image are no longer honored, so I'm commenting out the chunk of this
reference case that was expected to match those parts of the testcase.
We might eventually want to just remove this chunk, but I'm leaving it
for now in case we refine this behavior later on.
<use y="50" xlink:href="#pAR_xMinYMin_slice" width="100" height="40"/>
<use y="100" xlink:href="#pAR_none" width="100" height="40"/>
<use y="150" xlink:href="#pAR_xMaxYMax_meet" width="80" height="40"/>
<use y="200" xlink:href="#pAR_xMaxYMax_slice" width="80" height="40"/>
-->
<use y="250" xlink:href="#pAR_xMaxYMax_slice" width="30" height="50"/>
</g>
</defs>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

4
layout/reftests/svg/as-image/reftest.list
View File

@ -52,8 +52,8 @@ fails == canvas-drawImage-slice-1b.html lime100x100-ref.html # XXX all edges fuz
# Test with mix of <html:img> and <svg:image> referring to the same images,
# with a variety of preserveAspectRatio values in play.
# NOTE: The reference cases in this test triggers 30 assertions (bug 563481)
asserts(30) == img-and-image-1.html img-and-image-1-ref.svg
# NOTE: The reference cases in this test triggers 72 assertions (bug 563481)
asserts(72) == img-and-image-1.html img-and-image-1-ref.svg
# More complex <img> tests
random-if(gtk2Widget) == img-anim-1.html lime100x100-ref.html # bug 612214