Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / content / browser / renderer_host / pepper / pepper_print_settings_manager.cc

diff --git a/src/content/browser/renderer_host/pepper/pepper_print_settings_manager.cc b/src/content/browser/renderer_host/pepper/pepper_print_settings_manager.cc
index 84aaddf..de5f5fe 100644 (file)
--- a/src/content/browser/renderer_host/pepper/pepper_print_settings_manager.cc
+++ b/src/content/browser/renderer_host/pepper/pepper_print_settings_manager.cc
@@ -17,37 +17,37 @@ namespace {
 // Print units conversion functions.
 int32_t DeviceUnitsInPoints(int32_t device_units,
                             int32_t device_units_per_inch) {
-  return printing::ConvertUnit(device_units, device_units_per_inch,
-                               printing::kPointsPerInch);
+  return printing::ConvertUnit(
+      device_units, device_units_per_inch, printing::kPointsPerInch);
 }
 
 PP_Size PrintSizeToPPPrintSize(const gfx::Size& print_size,
                                int32_t device_units_per_inch) {
   PP_Size result;
   result.width = DeviceUnitsInPoints(print_size.width(), device_units_per_inch);
-  result.height = DeviceUnitsInPoints(print_size.height(),
-                                      device_units_per_inch);
+  result.height =
+      DeviceUnitsInPoints(print_size.height(), device_units_per_inch);
   return result;
 }
 
 PP_Rect PrintAreaToPPPrintArea(const gfx::Rect& print_area,
                                int32_t device_units_per_inch) {
   PP_Rect result;
-  result.point.x = DeviceUnitsInPoints(print_area.origin().x(),
-                                       device_units_per_inch);
-  result.point.y = DeviceUnitsInPoints(print_area.origin().y(),
-                                       device_units_per_inch);
-  result.size = PrintSizeToPPPrintSize(print_area.size(),
-                                       device_units_per_inch);
+  result.point.x =
+      DeviceUnitsInPoints(print_area.origin().x(), device_units_per_inch);
+  result.point.y =
+      DeviceUnitsInPoints(print_area.origin().y(), device_units_per_inch);
+  result.size =
+      PrintSizeToPPPrintSize(print_area.size(), device_units_per_inch);
   return result;
 }
 
 PepperPrintSettingsManager::Result ComputeDefaultPrintSettings() {
   // This function should run on the UI thread because |PrintingContext| methods
   // call into platform APIs.
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   scoped_ptr<printing::PrintingContext> context(
-  printing::PrintingContext::Create(std::string()));
+      printing::PrintingContext::Create(std::string()));
   if (!context.get() ||
       context->UseDefaultSettings() != printing::PrintingContext::OK) {
     return PepperPrintSettingsManager::Result(PP_PrintSettings_Dev(),
@@ -55,19 +55,19 @@ PepperPrintSettingsManager::Result ComputeDefaultPrintSettings() {
   }
   const printing::PrintSettings& print_settings = context->settings();
   const printing::PageSetup& page_setup =
-       print_settings.page_setup_device_units();
+      print_settings.page_setup_device_units();
   int device_units_per_inch = print_settings.device_units_per_inch();
   if (device_units_per_inch <= 0) {
     return PepperPrintSettingsManager::Result(PP_PrintSettings_Dev(),
                                               PP_ERROR_FAILED);
   }
   PP_PrintSettings_Dev settings;
-  settings.printable_area = PrintAreaToPPPrintArea(
-      page_setup.printable_area(), device_units_per_inch);
-  settings.content_area = PrintAreaToPPPrintArea(
-      page_setup.content_area(), device_units_per_inch);
-  settings.paper_size = PrintSizeToPPPrintSize(
-      page_setup.physical_size(), device_units_per_inch);
+  settings.printable_area = PrintAreaToPPPrintArea(page_setup.printable_area(),
+                                                   device_units_per_inch);
+  settings.content_area =
+      PrintAreaToPPPrintArea(page_setup.content_area(), device_units_per_inch);
+  settings.paper_size =
+      PrintSizeToPPPrintSize(page_setup.physical_size(), device_units_per_inch);
   settings.dpi = print_settings.dpi();
 
   // The remainder of the attributes are hard-coded to the defaults as set
@@ -94,8 +94,11 @@ PepperPrintSettingsManager::Result ComputeDefaultPrintSettings() {
 
 void PepperPrintSettingsManagerImpl::GetDefaultPrintSettings(
     PepperPrintSettingsManager::Callback callback) {
-  BrowserThread::PostTaskAndReplyWithResult(BrowserThread::UI, FROM_HERE,
-      base::Bind(ComputeDefaultPrintSettings), callback);
+  BrowserThread::PostTaskAndReplyWithResult(
+      BrowserThread::UI,
+      FROM_HERE,
+      base::Bind(ComputeDefaultPrintSettings),
+      callback);
 }
 
 }  // namespace content