Merge pull request #13100 from lightsofapollo/revert-4c652c5

Revert "Merge pull request #13097 from dmarcos/bug928614"

apps/camera/js/filmstrip.js

@@ -241,28 +241,25 @@ var Filmstrip = (function() {
         var previewBlob = blob.slice(metadata.preview.start,
                                      metadata.preview.end,
                                      'image/jpeg');
-        parseJPEGMetadata(previewBlob, function (thumbnailMetadata) {
-          metadata.preview.width = thumbnailMetadata.width;
-          metadata.preview.height = thumbnailMetadata.height;
-          createThumbnail(
-            previewBlob,
-            false,
-            metadata.rotation,
-            metadata.mirrored,
-            function(thumbnail) {
-              addItem({
-                isImage: true,
-                filename: filename,
-                thumbnail: thumbnail,
-                blob: blob,
-                width: metadata.width,
-                height: metadata.height,
-                preview: metadata.preview,
-                rotation: metadata.rotation,
-                mirrored: metadata.mirrored
-              });
-          });
-        });
+        createThumbnail(
+          previewBlob,
+          false,
+          metadata.rotation,
+          metadata.mirrored,
+          function(thumbnail) {
+            addItem({
+              isImage: true,
+              filename: filename,
+              thumbnail: thumbnail,
+              blob: blob,
+              width: metadata.width,
+              height: metadata.height,
+              preview: metadata.preview,
+              rotation: metadata.rotation,
+              mirrored: metadata.mirrored
+            });
+          }
+        );
       }
     }, function logerr(msg) { console.warn(msg); });
   }
@@ -387,7 +384,7 @@ var Filmstrip = (function() {
   // Create a thumbnail size canvas, copy the <img> or <video> into it
   // cropping the edges as needed to make it fit, and then extract the
   // thumbnail image as a blob and pass it to the callback.
-  function createThumbnail(imageBlob, video, rotation, mirrored, callback)
+  function createThumbnail(imageBlob, video, rotation, mirrored, callback) 
   {
     offscreenImage.src = URL.createObjectURL(imageBlob);
     offscreenImage.onload = function() {

shared/js/media/media_frame.js

@@ -61,7 +61,6 @@ MediaFrame.prototype.displayImage = function displayImage(blob,
                                                           rotation,
                                                           mirrored)
 {
-  var previewSizeFillsScreen;
   this.clear();  // Reset everything
 
   // Remember what we're displaying
@@ -78,34 +77,23 @@ MediaFrame.prototype.displayImage = function displayImage(blob,
   // Keep track of what kind of content we have
   this.displayingImage = true;
 
-  function isPreviewBigEnough(preview) {
-
+  function bigEnough(preview) {
     if (!preview.width || !preview.height)
       return false;
 
     // A preview is big enough if at least one dimension is >= the
     // screen size in both portait and landscape mode.
-    var screenWidth = window.innerWidth;
-    var screenHeight = window.innerHeight;
+    var sw = window.innerWidth;
+    var sh = window.innerHeight;
 
-    return ((preview.width >= screenWidth ||
-             preview.height >= screenHeight) && // portrait
-            (preview.width >= screenHeight ||
-             preview.height >= screenWidth));  // landscape
+    return ((preview.width >= sw || preview.height >= sh) && // portrait
+            (preview.width >= sh || preview.height >= sw));  // landscape
   }
 
-  previewSizeFillsScreen = isPreviewBigEnough(preview);
-
-  if (!previewSizeFillsScreen) {
-    console.error('The thumbnail contained in the jpeg doesn\'t fit' +
-                  'the device screen. The full size image is rendered.' +
-                  'This might cause out of memory errors');
-  }
 
   // If the preview is at least as big as the screen, display that.
   // Otherwise, display the full-size image.
-  if (preview && (preview.start || preview.filename) &&
-      previewSizeFillsScreen) {
+  if (preview && (preview.start || preview.filename) && bigEnough(preview)) {
     this.displayingPreview = true;
     if (preview.start) {
       this.previewblob = blob.slice(preview.start, preview.end, 'image/jpeg');