Restored partial rasterization for AlphaBlend.

chrome/browser/printing/print_view_manager.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/printing/print_view_manager.h"
 
 #include <map>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 242 matching lines @@
     if (!metafile->InitFromData(shared_buf.memory(), params.data_size)) {
       NOTREACHED() << "Invalid metafile header";
       web_contents()->Stop();
       return;
     }
   }
 
 #if defined(OS_WIN)
   bool big_emf = (params.data_size && params.data_size >= kMetafileMaxSize);
   const CommandLine* cmdline = CommandLine::ForCurrentProcess();
-  if (big_emf ||
-      (cmdline && cmdline->HasSwitch(switches::kPrintRaster)) ||
-      (!print_job_->settings().supports_alpha_blend() &&
-       metafile->IsAlphaBlendUsed())) {
-    int raster_size = std::min(params.page_size.GetArea(),
-                               kMaxRasterSizeInPixels);
+  int raster_size = std::min(params.page_size.GetArea(),
+                             kMaxRasterSizeInPixels);
+  if (big_emf || (cmdline && cmdline->HasSwitch(switches::kPrintRaster))) {
     scoped_ptr<NativeMetafile> raster_metafile(
         metafile->RasterizeMetafile(raster_size));
     if (raster_metafile.get()) {
       metafile.swap(raster_metafile);
     } else if (big_emf) {
       // Don't fall back to emf here.
       NOTREACHED() << "size:" << params.data_size;
       TerminatePrintJob(true);
       web_contents()->Stop();
       return;
     }
+  } else if (!print_job_->settings().supports_alpha_blend() &&
+             metafile->IsAlphaBlendUsed()) {
+    scoped_ptr<NativeMetafile> raster_metafile(
+        metafile->RasterizeAlphaBlend());
+    if (raster_metafile.get())
+      metafile.swap(raster_metafile);
   }
 
 #endif
 
   // Update the rendered document. It will send notifications to the listener.
   document->SetPage(params.page_number,
                     metafile.release(),
                     params.actual_shrink,
                     params.page_size,
                     params.content_area);
@@ skipping 393 matching lines @@
   scoped_refptr<printing::PrinterQuery> printer_query;
   print_job_manager->PopPrinterQuery(cookie, &printer_query);
   if (!printer_query.get())
     return;
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&PrinterQuery::StopWorker, printer_query.get()));
 }
 
 }  // namespace printing