diff options
| author | vitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-18 08:01:18 +0000 |
|---|---|---|
| committer | vitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-18 08:01:18 +0000 |
| commit | fe6a2155ab2747e45edb850c1f8b8967b09d6ed9 (patch) | |
| tree | bf689d64d429f330b125c72679eaddec55ba6204 /printing | |
| parent | b53ac7144ed14eebe2552afd240491f61121c58c (diff) | |
| download | chromium_src-fe6a2155ab2747e45edb850c1f8b8967b09d6ed9.zip chromium_src-fe6a2155ab2747e45edb850c1f8b8967b09d6ed9.tar.gz chromium_src-fe6a2155ab2747e45edb850c1f8b8967b09d6ed9.tar.bz2 | |
Removed unnecessary comparison checking bits in DEVMODE::dmFields.
DM_YRESOLUTION check was invalid.
TBR=noamsml
Review URL: https://codereview.chromium.org/170013002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251737 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'printing')
| -rw-r--r-- | printing/backend/print_backend_win.cc | 17 | ||||
| -rw-r--r-- | printing/backend/win_helper.cc | 2 |
2 files changed, 9 insertions, 10 deletions
diff --git a/printing/backend/print_backend_win.cc b/printing/backend/print_backend_win.cc index bb7989f..b23407c 100644 --- a/printing/backend/print_backend_win.cc +++ b/printing/backend/print_backend_win.cc @@ -96,11 +96,11 @@ void LoadPaper(const wchar_t* printer, short default_id = 0; gfx::Size default_size; - if ((devmode->dmFields & DM_PAPERSIZE) == DM_PAPERSIZE) + if (devmode->dmFields & DM_PAPERSIZE) default_id = devmode->dmPaperSize; - if ((devmode->dmFields & DM_PAPERWIDTH) == DM_PAPERWIDTH) + if (devmode->dmFields & DM_PAPERWIDTH) default_size.set_width(devmode->dmPaperWidth * kToUm); - if ((devmode->dmFields & DM_PAPERLENGTH) == DM_PAPERLENGTH) + if (devmode->dmFields & DM_PAPERLENGTH) default_size.set_height(devmode->dmPaperLength * kToUm); if (default_size.IsEmpty()) { @@ -136,11 +136,10 @@ void LoadDpi(const wchar_t* printer, caps->dpis.push_back(gfx::Size(dpis[i].x, dpis[i].y)); if (devmode) { - if ((devmode->dmFields & DM_PRINTQUALITY) == DM_PRINTQUALITY && - devmode->dmPrintQuality > 0) { + if ((devmode->dmFields & DM_PRINTQUALITY) && devmode->dmPrintQuality > 0) { caps->default_dpi.SetSize(devmode->dmPrintQuality, devmode->dmPrintQuality); - if ((devmode->dmFields & DM_YRESOLUTION) == DM_PRINTQUALITY) { + if (devmode->dmFields & DM_YRESOLUTION) { caps->default_dpi.set_height(devmode->dmYResolution); } } @@ -229,10 +228,10 @@ bool PrintBackendWin::GetPrinterSemanticCapsAndDefaults( PrinterSemanticCapsAndDefaults caps; UserDefaultDevMode user_settings; if (user_settings.Init(printer_handle)) { - if ((user_settings.get()->dmFields & DM_COLOR) == DM_COLOR) + if (user_settings.get()->dmFields & DM_COLOR) caps.color_default = (user_settings.get()->dmColor == DMCOLOR_COLOR); - if ((user_settings.get()->dmFields & DM_DUPLEX) == DM_DUPLEX) { + if (user_settings.get()->dmFields & DM_DUPLEX) { switch (user_settings.get()->dmDuplex) { case DMDUP_SIMPLEX: caps.duplex_default = SIMPLEX; @@ -248,7 +247,7 @@ bool PrintBackendWin::GetPrinterSemanticCapsAndDefaults( } } - if ((user_settings.get()->dmFields & DM_COLLATE) == DM_COLLATE) + if (user_settings.get()->dmFields & DM_COLLATE) caps.collate_default = (user_settings.get()->dmCollate == DMCOLLATE_TRUE); } else { LOG(WARNING) << "Fallback to color/simplex mode."; diff --git a/printing/backend/win_helper.cc b/printing/backend/win_helper.cc index 6710c2c..cfc1a58 100644 --- a/printing/backend/win_helper.cc +++ b/printing/backend/win_helper.cc @@ -432,7 +432,7 @@ scoped_ptr<DEVMODE[]> CreateDevModeWithColor(HANDLE printer, bool color) { scoped_ptr<DEVMODE[]> default = CreateDevMode(printer, NULL); if (default && (default.get()->dmFields & DM_COLOR) && - (default.get()->dmColor == DMCOLOR_COLOR) == color) { + ((default.get()->dmColor == DMCOLOR_COLOR) == color)) { return default.Pass(); } |