Commit 4bf59d9c authored by Daniel Hosseinian's avatar Daniel Hosseinian Committed by Commit Bot

Print Preview: Hide scaling setting for Flash content.

Flash isn't able to handle scaling, and currently changing the scaling
settings for Flash content has no effect on the print preview.
Effectively, we're hiding a stale setting.

Bug: 989978
Change-Id: I1da86b3f1d517b6733946e7a26ba5504c3d4042a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1824131
Commit-Queue: Daniel Hosseinian <dhoss@chromium.org>
Reviewed-by: default avatarRebekah Potter <rbpotter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#700851}
parent b2fde55c
...@@ -709,8 +709,12 @@ Polymer({ ...@@ -709,8 +709,12 @@ Polymer({
this.setSettingPath_('fitToPage.unavailableValue', !isSaveAsPDF); this.setSettingPath_('fitToPage.unavailableValue', !isSaveAsPDF);
this.setSettingPath_( this.setSettingPath_(
'fitToPage.available', 'fitToPage.available',
!knownSizeToSaveAsPdf && !this.documentSettings.isModifiable); !knownSizeToSaveAsPdf && this.documentSettings.isPdf);
this.setSettingPath_('scaling.available', !knownSizeToSaveAsPdf); this.setSettingPath_(
'scaling.available',
!knownSizeToSaveAsPdf &&
(this.documentSettings.isModifiable ||
this.documentSettings.isPdf));
const caps = this.destination && this.destination.capabilities ? const caps = this.destination && this.destination.capabilities ?
this.destination.capabilities.printer : this.destination.capabilities.printer :
null; null;
......
...@@ -322,12 +322,23 @@ cr.define('model_settings_availability_test', function() { ...@@ -322,12 +322,23 @@ cr.define('model_settings_availability_test', function() {
// PDF -> Save as PDF // PDF -> Save as PDF
model.set('documentSettings.isModifiable', false); model.set('documentSettings.isModifiable', false);
model.set('documentSettings.isPdf', true);
assertFalse(model.settings.scaling.available); assertFalse(model.settings.scaling.available);
// PDF -> printer // PDF -> printer
model.set('destination', defaultDestination); model.set('destination', defaultDestination);
assertTrue(model.settings.scaling.available); assertTrue(model.settings.scaling.available);
assertFalse(model.settings.scaling.setFromUi); assertFalse(model.settings.scaling.setFromUi);
// Non-PDF Plugin -> Save as PDF
setSaveAsPdfDestination();
model.set('documentSettings.isPdf', false);
assertFalse(model.settings.scaling.available);
// Non-PDF Plugin -> printer
model.set('destination', defaultDestination);
assertFalse(model.settings.scaling.available);
}); });
test('fit to page', function() { test('fit to page', function() {
...@@ -341,12 +352,22 @@ cr.define('model_settings_availability_test', function() { ...@@ -341,12 +352,22 @@ cr.define('model_settings_availability_test', function() {
// PDF -> Save as PDF // PDF -> Save as PDF
model.set('documentSettings.isModifiable', false); model.set('documentSettings.isModifiable', false);
model.set('documentSettings.isPdf', true);
assertFalse(model.settings.fitToPage.available); assertFalse(model.settings.fitToPage.available);
// PDF -> printer // PDF -> printer
model.set('destination', defaultDestination); model.set('destination', defaultDestination);
assertTrue(model.settings.fitToPage.available); assertTrue(model.settings.fitToPage.available);
assertFalse(model.settings.fitToPage.setFromUi); assertFalse(model.settings.fitToPage.setFromUi);
// Non-PDF Plugin -> Save as PDF
setSaveAsPdfDestination();
model.set('documentSettings.isPdf', false);
assertFalse(model.settings.fitToPage.available);
// Non-PDF Plugin -> printer
model.set('destination', defaultDestination);
assertFalse(model.settings.fitToPage.available);
}); });
test('header footer', function() { test('header footer', function() {
......
...@@ -132,6 +132,7 @@ cr.define('preview_generation_test', function() { ...@@ -132,6 +132,7 @@ cr.define('preview_generation_test', function() {
test(assert(TestNames.FitToPage), function() { test(assert(TestNames.FitToPage), function() {
// Set PDF document so setting is available. // Set PDF document so setting is available.
initialSettings.previewModifiable = false; initialSettings.previewModifiable = false;
initialSettings.previewIsPdf = true;
return testSimpleSetting( return testSimpleSetting(
'fitToPage', false, true, 'fitToPageEnabled', false, true); 'fitToPage', false, true, 'fitToPageEnabled', false, true);
}); });
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment