Skip to content

Commit

Permalink
Remove implicit conversions from scoped_refptr to T* in printing/
Browse files Browse the repository at this point in the history
This patch was generated by running the rewrite_scoped_refptr clang tool
on a Windows build.

BUG=110610

Review URL: https://codereview.chromium.org/723743003

Cr-Commit-Position: refs/heads/master@{#304105}
  • Loading branch information
zetafunction authored and Commit bot committed Nov 13, 2014
1 parent 51316e4 commit be20825
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 15 deletions.
15 changes: 7 additions & 8 deletions printing/backend/print_backend_win.cc
Original file line number Diff line number Diff line change
Expand Up @@ -304,12 +304,10 @@ bool PrintBackendWin::GetPrinterCapsAndDefaults(
hr = CreateStreamOnHGlobal(NULL, TRUE,
print_capabilities_stream.Receive());
DCHECK(SUCCEEDED(hr));
if (print_capabilities_stream) {
if (print_capabilities_stream.get()) {
base::win::ScopedBstr error;
hr = XPSModule::GetPrintCapabilities(provider,
NULL,
print_capabilities_stream,
error.Receive());
hr = XPSModule::GetPrintCapabilities(
provider, NULL, print_capabilities_stream.get(), error.Receive());
DCHECK(SUCCEEDED(hr));
if (FAILED(hr)) {
return false;
Expand All @@ -329,10 +327,11 @@ bool PrintBackendWin::GetPrinterCapsAndDefaults(
hr = CreateStreamOnHGlobal(NULL, TRUE,
printer_defaults_stream.Receive());
DCHECK(SUCCEEDED(hr));
if (printer_defaults_stream) {
if (printer_defaults_stream.get()) {
DWORD dm_size = devmode_out->dmSize + devmode_out->dmDriverExtra;
hr = XPSModule::ConvertDevModeToPrintTicket(provider, dm_size,
devmode_out.get(), kPTJobScope, printer_defaults_stream);
hr = XPSModule::ConvertDevModeToPrintTicket(
provider, dm_size, devmode_out.get(), kPTJobScope,
printer_defaults_stream.get());
DCHECK(SUCCEEDED(hr));
if (SUCCEEDED(hr)) {
hr = StreamOnHGlobalToString(printer_defaults_stream.get(),
Expand Down
10 changes: 3 additions & 7 deletions printing/backend/win_helper.cc
Original file line number Diff line number Diff line change
Expand Up @@ -410,13 +410,9 @@ scoped_ptr<DEVMODE, base::FreeDeleter> XpsTicketToDevMode(
ULONG size = 0;
DEVMODE* dm = NULL;
// Use kPTJobScope, because kPTDocumentScope breaks duplex.
hr = printing::XPSModule::ConvertPrintTicketToDevMode(provider,
pt_stream,
kUserDefaultDevmode,
kPTJobScope,
&size,
&dm,
NULL);
hr = printing::XPSModule::ConvertPrintTicketToDevMode(
provider, pt_stream.get(), kUserDefaultDevmode, kPTJobScope, &size, &dm,
NULL);
if (SUCCEEDED(hr)) {
// Correct DEVMODE using DocumentProperties. See documentation for
// PTConvertPrintTicketToDevMode.
Expand Down

0 comments on commit be20825

Please sign in to comment.