Skip to content

Commit

Permalink
Removed unnecessary comparison checking bits in DEVMODE::dmFields.
Browse files Browse the repository at this point in the history
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
  • Loading branch information
vitalybuka@chromium.org committed Feb 18, 2014
1 parent b53ac71 commit fe6a215
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 10 deletions.
17 changes: 8 additions & 9 deletions printing/backend/print_backend_win.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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()) {
Expand Down Expand Up @@ -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);
}
}
Expand Down Expand Up @@ -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;
Expand All @@ -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.";
Expand Down
2 changes: 1 addition & 1 deletion printing/backend/win_helper.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand Down

0 comments on commit fe6a215

Please sign in to comment.