Fixed a few styles issues in skia::PlatformDevice. Made function names consistent. Added Begin/En...

webkit/plugins/ppapi/ppapi_plugin_instance.cc

 // Copyright (c) 2011 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 "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
@@ skipping 1302 matching lines @@
     canvas->drawBitmapRect(*bitmap, &src_rect, dest_rect);
 #endif  // defined(OS_MACOSX)
   return true;
 }
 
 #if defined(OS_WIN)
 bool PluginInstance::DrawJPEGToPlatformDC(
     const SkBitmap& bitmap,
     const gfx::Rect& printable_area,
     WebKit::WebCanvas* canvas) {
-  HDC dc = canvas->beginPlatformPaint();
-  // TODO(sanjeevr): This is a temporary hack. If we output a JPEG
-  // to the EMF, the EnumEnhMetaFile call fails in the browser
-  // process. The failure also happens if we output nothing here.
-  // We need to investigate the reason for this failure and fix it.
-  // In the meantime this temporary hack of drawing an empty
-  // rectangle in the DC gets us by.
-  Rectangle(dc, 0, 0, 0, 0);
-
   // Ideally we should add JPEG compression to the VectorPlatformDevice class
   // However, Skia currently has no JPEG compression code and we cannot
   // depend on gfx/jpeg_codec.h in Skia. So we do the compression here.
   SkAutoLockPixels lock(bitmap);
   DCHECK(bitmap.getConfig() == SkBitmap::kARGB_8888_Config);
   const uint32_t* pixels =
       static_cast<const uint32_t*>(bitmap.getPixels());
   std::vector<unsigned char> compressed_image;
   base::TimeTicks start_time = base::TimeTicks::Now();
   bool encoded = gfx::JPEGCodec::Encode(
       reinterpret_cast<const unsigned char*>(pixels),
       gfx::JPEGCodec::FORMAT_BGRA, bitmap.width(), bitmap.height(),
       static_cast<int>(bitmap.rowBytes()), 100, &compressed_image);
   UMA_HISTOGRAM_TIMES("PepperPluginPrint.RasterBitmapCompressTime",
                       base::TimeTicks::Now() - start_time);
   if (!encoded) {
     NOTREACHED();
     return false;
   }
+
+  HDC dc = canvas->beginPlatformPaint();

[vandebo (ex-Chrome), 2011/04/05 20:38:49]

*B*eginPlatformPaint

[alokp, 2011/04/05 20:49:29]

This is a call on canvas, not device. I am not fixing canvas in this CL. Canvas
will be deprecated soon.

[vandebo (ex-Chrome), 2011/04/05 20:59:09]

Oops, right.

+  // TODO(sanjeevr): This is a temporary hack. If we output a JPEG
+  // to the EMF, the EnumEnhMetaFile call fails in the browser
+  // process. The failure also happens if we output nothing here.
+  // We need to investigate the reason for this failure and fix it.
+  // In the meantime this temporary hack of drawing an empty
+  // rectangle in the DC gets us by.
+  Rectangle(dc, 0, 0, 0, 0);
   BITMAPINFOHEADER bmi = {0};
   gfx::CreateBitmapHeader(bitmap.width(), bitmap.height(), &bmi);
   bmi.biCompression = BI_JPEG;
   bmi.biSizeImage = compressed_image.size();
   bmi.biHeight = -bmi.biHeight;
   StretchDIBits(dc, printable_area.x(), printable_area.y(),
                 printable_area.width(), printable_area.height(),
                 0, 0, bitmap.width(), bitmap.height(),
                 &compressed_image.front(),
                 reinterpret_cast<const BITMAPINFO*>(&bmi),
@@ skipping 107 matching lines @@
   return found->second;
 }
 
 bool PluginInstance::IsFullPagePlugin() const {
   WebFrame* frame = container()->element().document().frame();
   return frame->view()->mainFrame()->document().isPluginDocument();
 }
 
 }  // namespace ppapi
 }  // namespace webkit