Skip to content
Permalink
Browse files
2011-11-08 Nikolas Zimmermann <nzimmermann@rim.com>
        [Qt] 4 new tests fail introduced in r98852
        https://bugs.webkit.org/show_bug.cgi?id=71253

        Reviewed by Rob Buis.

        Address some problems seen on Qt/Chromium:
        - Remove the scaled png which is the source of the problem in zoom-background-images.html, we really only want to test zooming in the SVGImage there.
        - Don't zoom out more than three times, otherwise its ignored on Mac/DRT, where the minimum zoom factor is clamped to 0.5f.
          Qt doesn't have this limit, and currently zooms more than Mac does. There's no need to zoom out that often, three times is enough.

        * platform/mac/svg/zoom/page/zoom-background-images-expected.png: Updated.
        * platform/mac/svg/zoom/page/zoom-background-images-expected.txt: Update.
        * svg/zoom/page/zoom-background-image-tiled.html: Don't set shouldZoomOut to false, it's the default.
        * svg/zoom/page/zoom-background-images.html: Don't zoom out more than three times.
        * svg/zoom/page/zoom-replaced-intrinsic-ratio-001.htm: Ditto.
        * svg/zoom/page/zoom-svg-as-background-with-relative-size.html: Ditto.
        * svg/zoom/page/zoom-svg-as-image.html: There is no shouldZoomIn, just remove it, zooming in is the default.


Canonical link: https://commits.webkit.org/88139@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@99566 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
Nikolas Zimmermann committed Nov 8, 2011
1 parent 2139c04 commit 1dc8c10d459c8b1ec11aaf481f793aa66b9f67df
@@ -1,3 +1,23 @@
2011-11-08 Nikolas Zimmermann <nzimmermann@rim.com>

[Qt] 4 new tests fail introduced in r98852
https://bugs.webkit.org/show_bug.cgi?id=71253

Reviewed by Rob Buis.

Address some problems seen on Qt/Chromium:
- Remove the scaled png which is the source of the problem in zoom-background-images.html, we really only want to test zooming in the SVGImage there.
- Don't zoom out more than three times, otherwise its ignored on Mac/DRT, where the minimum zoom factor is clamped to 0.5f.
Qt doesn't have this limit, and currently zooms more than Mac does. There's no need to zoom out that often, three times is enough.

* platform/mac/svg/zoom/page/zoom-background-images-expected.png: Updated.
* platform/mac/svg/zoom/page/zoom-background-images-expected.txt: Update.
* svg/zoom/page/zoom-background-image-tiled.html: Don't set shouldZoomOut to false, it's the default.
* svg/zoom/page/zoom-background-images.html: Don't zoom out more than three times.
* svg/zoom/page/zoom-replaced-intrinsic-ratio-001.htm: Ditto.
* svg/zoom/page/zoom-svg-as-background-with-relative-size.html: Ditto.
* svg/zoom/page/zoom-svg-as-image.html: There is no shouldZoomIn, just remove it, zooming in is the default.

2011-11-08 Gavin Peters <gavinp@chromium.org>

Fix width of m_type in CachedResource
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -13,9 +13,6 @@ layer at (0,0) size 800x161
RenderText {#text} at (457,143) size 2x10
text run at (457,143) width 2: " "
RenderImage {IMG} at (470,11) size 129x129 [border: (1px solid #000000)]
RenderText {#text} at (610,143) size 2x10
text run at (610,143) width 2: " "
RenderImage {IMG} at (623,11) size 129x129 [border: (1px solid #000000)]
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
@@ -17,7 +17,7 @@
<body>
<div></div>

<script>var zoomCount = 4; window.shouldZoomOut = false;</script>
<script>var zoomCount = 4;</script>
<script src="../resources/testPageZoom.js"></script>

</body>
@@ -31,9 +31,8 @@
<div class="svg"></div>
<div class="gradient"></div>
<img src="resources/circle.svg"></img>
<img src="../../custom/resources/green-checker.png"></img>

<script>var zoomCount = 5; window.shouldZoomOut = true;</script>
<script>var zoomCount = 3; window.shouldZoomOut = true;</script>
<script src="../resources/testPageZoom.js"></script>

</body>
@@ -40,7 +40,7 @@
<table id="t5"><tr><td><object id="img5" type="image/svg+xml" data="resources/intrinsic-ratio.svg">This test won't work because you do not have images enabled.</object></td></tr></table>
<p id="p3"><object id="img3" type="image/svg+xml" data="resources/intrinsic-ratio.svg">This test won't work because you do not have images enabled.</object></p>

<script>var zoomCount = 4; window.shouldZoomOut = true;</script>
<script>var zoomCount = 3; window.shouldZoomOut = true;</script>
<script src="../resources/testPageZoom.js"></script>
</body>
</html>
@@ -14,7 +14,7 @@
<body style='margin: 0px'>
<div>&nbsp;</div>

<script>var zoomCount = 4; window.shouldZoomOut = true;</script>
<script>var zoomCount = 3; window.shouldZoomOut = true;</script>
<script src="../resources/testPageZoom.js"></script>
</body>
</html>
@@ -13,7 +13,7 @@
<img src='../../as-image/resources/green-fixed-size-rect.svg'>
</div>

<script>var zoomCount = 4; window.shouldZoomIn = true;</script>
<script>var zoomCount = 4;</script>
<script src="../resources/testPageZoom.js"></script>

</body>

0 comments on commit 1dc8c10

Please sign in to comment.