diff options
author | phoglund <phoglund@chromium.org> | 2016-02-16 02:08:54 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-02-16 10:10:15 +0000 |
commit | 51040e9fdca3306a57d1c45b637e6290caef5495 (patch) | |
tree | ad9776f54ddfc9f513de413d73b450b7a02d91b3 /printing | |
parent | 440f20a7611ff629cf55174439c00cf0d4c976f7 (diff) | |
download | chromium_src-51040e9fdca3306a57d1c45b637e6290caef5495.zip chromium_src-51040e9fdca3306a57d1c45b637e6290caef5495.tar.gz chromium_src-51040e9fdca3306a57d1c45b637e6290caef5495.tar.bz2 |
Reland of Cleanup: Remove unused PrintSettings shrink factors. (patchset #1 id:1 of https://codereview.chromium.org/1697183002/ )
Reason for revert:
Unreverting since this patch turned out to be innocent.
Original issue's description:
> Revert of Cleanup: Remove unused PrintSettings shrink factors. (patchset #1 id:1 of https://codereview.chromium.org/1676953003/ )
>
> Reason for revert:
> Seems to break printing WebKit Linux MSAN (test times out): https://build.chromium.org/p/chromium.webkit/builders/WebKit%20Linux%20MSAN/builds/8511
>
> Original issue's description:
> > Cleanup: Remove unused PrintSettings shrink factors.
> >
> > - They have been unused for 7 years.
> > - The copy that is being used eventually moved to
> > third_party/WebKit/Source/core/page/PrintContext.cpp.
> >
> > Committed: https://crrev.com/5e8544fc5972711c5237e3bcd8c018a0b439f4f1
> > Cr-Commit-Position: refs/heads/master@{#374553}
>
> TBR=vitalybuka@chromium.org,tsepez@chromium.org,thestig@chromium.org
> # Not skipping CQ checks because original CL landed more than 1 days ago.
TBR=vitalybuka@chromium.org,tsepez@chromium.org,thestig@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/1701703003
Cr-Commit-Position: refs/heads/master@{#375543}
Diffstat (limited to 'printing')
-rw-r--r-- | printing/print_settings.cc | 2 | ||||
-rw-r--r-- | printing/print_settings.h | 17 | ||||
-rw-r--r-- | printing/print_settings_conversion.cc | 2 |
3 files changed, 0 insertions, 21 deletions
diff --git a/printing/print_settings.cc b/printing/print_settings.cc index 7f555f0..159cfa5 100644 --- a/printing/print_settings.cc +++ b/printing/print_settings.cc @@ -131,8 +131,6 @@ PrintSettings::~PrintSettings() { void PrintSettings::Clear() { ranges_.clear(); margin_type_ = DEFAULT_MARGINS; - min_shrink_ = 1.25; - max_shrink_ = 2.; desired_dpi_ = 72; selection_only_ = false; title_ = base::string16(); diff --git a/printing/print_settings.h b/printing/print_settings.h index 08c7d56..6c4f8e7 100644 --- a/printing/print_settings.h +++ b/printing/print_settings.h @@ -143,10 +143,6 @@ class PRINTING_EXPORT PrintSettings { int desired_dpi() const { return desired_dpi_; } - double max_shrink() const { return max_shrink_; } - - double min_shrink() const { return min_shrink_; } - // Cookie generator. It is used to initialize PrintedDocument with its // associated PrintSettings, to be sure that each generated PrintedPage is // correctly associated with its corresponding PrintedDocument. @@ -157,19 +153,6 @@ class PRINTING_EXPORT PrintSettings { // This permits printing selected pages only. PageRanges ranges_; - // By imaging to a width a little wider than the available pixels, thin pages - // will be scaled down a little, matching the way they print in IE and Camino. - // This lets them use fewer sheets than they would otherwise, which is - // presumably why other browsers do this. Wide pages will be scaled down more - // than this. - double min_shrink_; - - // This number determines how small we are willing to reduce the page content - // in order to accommodate the widest line. If the page would have to be - // reduced smaller to make the widest line fit, we just clip instead (this - // behavior matches MacIE and Mozilla, at least) - double max_shrink_; - // Desired visible dots per inch rendering for output. Printing should be // scaled to ScreenDpi/dpix*desired_dpi. int desired_dpi_; diff --git a/printing/print_settings_conversion.cc b/printing/print_settings_conversion.cc index cd0c059..6200d7c 100644 --- a/printing/print_settings_conversion.cc +++ b/printing/print_settings_conversion.cc @@ -227,8 +227,6 @@ void PrintSettingsToJobSettingsDebug(const PrintSettings& settings, // common public constants. So just serialize in "debug" section. base::DictionaryValue* debug = new base::DictionaryValue; job_settings->Set("debug", debug); - debug->SetDouble("minShrink", settings.min_shrink()); - debug->SetDouble("maxShrink", settings.max_shrink()); debug->SetInteger("desiredDpi", settings.desired_dpi()); debug->SetInteger("dpi", settings.dpi()); debug->SetInteger("deviceUnitsPerInch", settings.device_units_per_inch()); |