chrome/browser/resources/file_manager/js/image_editor/image_encoder.js - Issue 8394046: [filebrowser] More reliable file saving in Photo Editor

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/resources/file_manager/js/image_editor/image_encoder.js

Issue 8394046: [filebrowser] More reliable file saving in Photo Editor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/resources/file_manager/js/id3_parser.js ('k') | chrome/browser/resources/file_manager/js/image_parsers.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/file_manager/js/image_editor/image_encoder.js

diff --git a/chrome/browser/resources/file_manager/js/image_editor/image_encoder.js b/chrome/browser/resources/file_manager/js/image_editor/image_encoder.js

index 90ab8e88d046767c6f54b19566909af321cf6c87..fc36748d60a11f0bdbccc71cb7350ed91b4ff08e 100644

--- a/chrome/browser/resources/file_manager/js/image_editor/image_encoder.js

+++ b/chrome/browser/resources/file_manager/js/image_editor/image_encoder.js

@@ -157,9 +157,9 @@ ImageEncoder.stringToArrayBuffer = function(string, from, to) {

ImageEncoder.MetadataEncoder = function(original_metadata) {

this.metadata_ = ImageUtil.deepCopy(original_metadata) || {};

- if (!this.metadata_.mimeType) {

- // For the purposes saving to a file and thumbnail generation we assume

- // it is a png.

+ if (this.metadata_.mimeType != 'image/jpeg') {

+ // Chrome can only encode JPEG and PNG. Force PNG mime type so that we

+ // can save to file and generate a thumbnail.

this.metadata_.mimeType = 'image/png';

}

};