diff options
| author | kaznacheev@chromium.org <kaznacheev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-02 14:33:31 +0000 |
|---|---|---|
| committer | kaznacheev@chromium.org <kaznacheev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-02 14:33:31 +0000 |
| commit | 769036bc3fcadcf58fb9a0ea2b09fee47af4b8a4 (patch) | |
| tree | ad7b7c3940db213f473a7e0c7f12d1143a3f6e4f /chrome | |
| parent | ed966587d28db59eb131487bc097d0f4a19a47a4 (diff) | |
| download | chromium_src-769036bc3fcadcf58fb9a0ea2b09fee47af4b8a4.zip chromium_src-769036bc3fcadcf58fb9a0ea2b09fee47af4b8a4.tar.gz chromium_src-769036bc3fcadcf58fb9a0ea2b09fee47af4b8a4.tar.bz2 | |
Photo Editor async processing fix
BUG=chromium-os:23613
TEST=
Review URL: http://codereview.chromium.org/8769036
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112694 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/resources/file_manager/js/image_editor/image_editor.js | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/browser/resources/file_manager/js/image_editor/image_editor.js b/chrome/browser/resources/file_manager/js/image_editor/image_editor.js index c9de33d..6512053 100644 --- a/chrome/browser/resources/file_manager/js/image_editor/image_editor.js +++ b/chrome/browser/resources/file_manager/js/image_editor/image_editor.js @@ -332,7 +332,14 @@ ImageEditor.prototype.enterMode = function(mode, event) { } this.leaveModeGently(); + // The above call could have caused a commit which might have initiated + // an asynchronous command execution. Wait for it to complete, then proceed + // with the mode set up. + this.commandQueue_.requestCurrentImage( + this.setUpMode_.bind(this, mode, event)); +}; +ImageEditor.prototype.setUpMode_ = function(mode, event) { this.currentTool_ = event.target; ImageUtil.setAttribute(this.currentTool_, 'pressed', true); |