Attachment 171368 Details for Bug 100698 – Patch for landing

[patch] Patch for landing

bug-100698-20121029211145.patch (text/plain), 6.07 KB, created by Nico Weber on 2012-10-29 21:13:12 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Nico Weber

Created: 2012-10-29 21:13:12 PDT

Size: 6.07 KB

patch

obsolete

>Subversion Revision: 132815
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 29c6d95cb7d1285155779309cd2dbfbb97f245ab..6af4e84bb8ba1e78df5f575c9f7ae7f37941c14f 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,16 @@
>+2012-10-29  Nico Weber  <thakis@chromium.org>
>+
>+        Add a test for reading exif orientation off image documents
>+        https://bugs.webkit.org/show_bug.cgi?id=100698
>+
>+        Reviewed by Eric Seidel.
>+
>+        fast/images/exif-orientation.html tests <img> elements, but image documents were untested previously.
>+
>+        * fast/images/exif-orientation-image-document.html: Added.
>+        * platform/chromium/TestExpectations:
>+        * platform/chromium/fast/images/exif-orientation-image-document-expected.txt: Added.
>+
> 2012-10-29  Christophe Dumez  <christophe.dumez@intel.com>
> 
>         [WK2][WKTR] Enable Shadow DOM at runtime if compiled with SHADOW_DOM support
>diff --git a/LayoutTests/fast/images/exif-orientation-image-document.html b/LayoutTests/fast/images/exif-orientation-image-document.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..5de3e9f137859da7cdd96d91368201fe80bc12de
>--- /dev/null
>+++ b/LayoutTests/fast/images/exif-orientation-image-document.html
>@@ -0,0 +1,59 @@
>+<html>
>+<head>
>+<script>
>+if (window.testRunner) {
>+    // Note that this test only passes in DRT. In browsers, the cross-iframe dom inspection usually causes a security exception.
>+    testRunner.dumpAsText(true);
>+}
>+
>+function log(str) {
>+    var li = document.createElement("li");
>+    li.appendChild(document.createTextNode(str));
>+    var console = document.getElementById("console");
>+    console.appendChild(li);
>+}
>+
>+function imageSize(id) {
>+    var img = window.frames[id].document.querySelector('img');
>+    return [img.offsetWidth, img.offsetHeight];
>+}
>+
>+
>+function load() {
>+    var expected = [
>+      [100, 50], [100, 50], [100, 50], [100, 50], 
>+      [50, 100], [50, 100], [50, 100], [50, 100], 
>+      [100, 50],
>+    ];
>+    var success = true;
>+    for(var i = 1; i <= 9; i++) {
>+        var s = imageSize("img" + i);
>+        if (s[0] !== expected[i - 1][0] || s[1] !== expected[i - 1][1])
>+            success = false;
>+    }
>+    log(success ? "PASS" : "FAIL");
>+}
>+
>+</script>
>+<style>
>+iframe { display: inline-block; margin-right: 20px; margin-bottom: 10px; width: 120px; height: 110px; vertical-align: top; border: 1px solid black; }
>+</style>
>+</head>
>+<body onload="load()">
>+<b>The images should be rotated respecting their EXIF orientation. In image documents, this happens independent of WebKitShouldRespectImageOrientation.</b><br><br>
>+<iframe id="img1" src="resources/exif-orientation-1-ul.jpg" frameborder=0></iframe>
>+<iframe id="img2" src="resources/exif-orientation-2-ur.jpg" frameborder=0></iframe>
>+<iframe id="img3" src="resources/exif-orientation-3-lr.jpg" frameborder=0></iframe>
>+<iframe id="img4" src="resources/exif-orientation-4-lol.jpg" frameborder=0></iframe>
>+<br>
>+<iframe id="img5" src="resources/exif-orientation-5-lu.jpg" frameborder=0></iframe>
>+<iframe id="img6" src="resources/exif-orientation-6-ru.jpg" frameborder=0></iframe>
>+<iframe id="img7" src="resources/exif-orientation-7-rl.jpg" frameborder=0></iframe>
>+<iframe id="img8" src="resources/exif-orientation-8-llo.jpg" frameborder=0></iframe>
>+<br>
>+<iframe id="img9" src="resources/exif-orientation-9-u.jpg" frameborder=0></iframe>
>+<br>
>+<ul id="console"></ul>
>+</body>
>+</html>
>+
>diff --git a/LayoutTests/platform/chromium/TestExpectations b/LayoutTests/platform/chromium/TestExpectations
>index 31b4d5b94becb2e18f22ab553eec6e3853194ad1..e60afa4ab583380cf68d477d32d656ec40350f8c 100644
>--- a/LayoutTests/platform/chromium/TestExpectations
>+++ b/LayoutTests/platform/chromium/TestExpectations
>@@ -3825,6 +3825,9 @@ webkit.org/b/96227 fast/js/function-dot-arguments-identity.html [ Skip ]
> webkit.org/b/96835 canvas/philip/tests/2d.text.draw.fontface.notinpage.html [ Failure Pass ]
> webkit.org/b/96835 platform/chromium/virtual/gpu/canvas/philip/tests/2d.text.draw.fontface.notinpage.html [ Failure Pass ]
> 
>+# needs baselines
>+Bug(thakis) fast/images/exif-orientation-image-document.html [ ImageOnlyFailure ] 
>+
> webkit.org/b/96834 platform/chromium/virtual/threaded/compositing/visibility/visibility-image-layers.html [ ImageOnlyFailure Pass ]
> webkit.org/b/98086 platform/chromium/virtual/threaded/compositing/visibility/visibility-composited-transforms.html [ ImageOnlyFailure Pass ]
> webkit.org/b/98086 platform/chromium/virtual/threaded/compositing/visibility/visibility-simple-video-layer.html [ ImageOnlyFailure Pass ]
>@@ -4029,6 +4032,7 @@ webkit.org/b/94240 platform/chromium/virtual/deferred/fast/images/animated-gif-r
> webkit.org/b/94240 [ Linux Win ] platform/chromium/virtual/deferred/fast/images/color-jpeg-with-color-profile.html [ ImageOnlyFailure ]
> webkit.org/b/94240 platform/chromium/virtual/deferred/fast/images/embed-image.html [ Failure ]
> webkit.org/b/94240 platform/chromium/virtual/deferred/fast/images/exif-orientation-css.html [ ImageOnlyFailure ]
>+webkit.org/b/94240 platform/chromium/virtual/deferred/fast/images/exif-orientation-image-document.html [ Failure ImageOnlyFailure ] 
> webkit.org/b/94240 platform/chromium/virtual/deferred/fast/images/exif-orientation.html [ Failure ImageOnlyFailure ]
> webkit.org/b/94240 [ Linux Win SnowLeopard ] platform/chromium/virtual/deferred/fast/images/favicon-as-image.html [ Failure ]
> webkit.org/b/94240 [ Linux Win SnowLeopard MountainLion ] platform/chromium/virtual/deferred/fast/images/gif-large-checkerboard.html [ ImageOnlyFailure ]
>diff --git a/LayoutTests/platform/chromium/fast/images/exif-orientation-image-document-expected.txt b/LayoutTests/platform/chromium/fast/images/exif-orientation-image-document-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..47313be5234f5e2867ad4d56006a535e0efc6f42
>--- /dev/null
>+++ b/LayoutTests/platform/chromium/fast/images/exif-orientation-image-document-expected.txt
>@@ -0,0 +1,6 @@
>+The images should be rotated respecting their EXIF orientation. In image documents, this happens independent of WebKitShouldRespectImageOrientation.
>+
>+    
>+    
>+ 
>+PASS

Actions: View | Formatted Diff | Diff

Attachments on bug 100698: 171313 | 171334 | 171335 | 171364 | 171368