Add media size capability to PDF printer.

components/cloud_devices/common/printer_description.cc

 // Copyright 2014 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 "components/cloud_devices/common/printer_description.h"
 
 #include <algorithm>
 
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
@@ skipping 144 matching lines @@
 const int32 kInchToUm = 25400;
 const int32 kMmToUm = 1000;
 const int32 kSizeTrasholdUm = 1000;
 
 #define MAP_CLOUD_PRINT_MEDIA_TYPE(type, width, height, unit_um) \
   {                                                              \
     type, #type, static_cast<int>(width* unit_um + 0.5),         \
         static_cast<int>(height* unit_um + 0.5)                  \
   }
 
-const struct MadiaDefinition {
+const struct MediaDefinition {
   MediaType id;
   const char* const json_name;
   int width_um;
   int height_um;
 } kMediaDefinitions[] = {
       {CUSTOM_MEDIA, "CUSTOM", 0, 0},
       MAP_CLOUD_PRINT_MEDIA_TYPE(NA_INDEX_3X5, 3, 5, kInchToUm),
       MAP_CLOUD_PRINT_MEDIA_TYPE(NA_PERSONAL, 3.625f, 6.5f, kInchToUm),
       MAP_CLOUD_PRINT_MEDIA_TYPE(NA_MONARCH, 3.875f, 7.5f, kInchToUm),
       MAP_CLOUD_PRINT_MEDIA_TYPE(NA_NUMBER_9, 3.875f, 8.875f, kInchToUm),
@@ skipping 152 matching lines @@
       MAP_CLOUD_PRINT_MEDIA_TYPE(JPN_KAKU2, 240, 332, kMmToUm),
       MAP_CLOUD_PRINT_MEDIA_TYPE(OM_SMALL_PHOTO, 100, 150, kMmToUm),
       MAP_CLOUD_PRINT_MEDIA_TYPE(OM_ITALIAN, 110, 230, kMmToUm),
       MAP_CLOUD_PRINT_MEDIA_TYPE(OM_POSTFIX, 114, 229, kMmToUm),
       MAP_CLOUD_PRINT_MEDIA_TYPE(OM_LARGE_PHOTO, 200, 300, kMmToUm),
       MAP_CLOUD_PRINT_MEDIA_TYPE(OM_FOLIO, 210, 330, kMmToUm),
       MAP_CLOUD_PRINT_MEDIA_TYPE(OM_FOLIO_SP, 215, 315, kMmToUm),
       MAP_CLOUD_PRINT_MEDIA_TYPE(OM_INVITE, 220, 220, kMmToUm)};
 #undef MAP_CLOUD_PRINT_MEDIA_TYPE
 
-const MadiaDefinition* FindMediaBySize(int32 width_um, int32 height_um) {
-  const MadiaDefinition* result = NULL;
+const MediaDefinition* FindMediaByType(MediaType type) {
+  for (size_t i = 0; i < arraysize(kMediaDefinitions); ++i) {
+    if (kMediaDefinitions[i].id == type)
+      return &kMediaDefinitions[i];
+  }
+  return NULL;

[Vitaly Buka (NO REVIEWS), 2014/05/22 01:11:21]

NOTREACHED here

[Aleksey Shlyapnikov, 2014/05/22 03:51:18]

Done.

+}
+
+const MediaDefinition* FindMediaBySize(int32 width_um, int32 height_um) {
+  const MediaDefinition* result = NULL;
   for (size_t i = 0; i < arraysize(kMediaDefinitions); ++i) {
     int32 diff = std::max(std::abs(width_um - kMediaDefinitions[i].width_um),
                           std::abs(height_um - kMediaDefinitions[i].height_um));
     if (diff < kSizeTrasholdUm)
       result = &kMediaDefinitions[i];
   }
   return result;
 }
 
 template <class T, class IdType>
@@ skipping 75 matching lines @@
 }
 
 bool Dpi::operator==(const Dpi& other) const {
   return horizontal == other.horizontal && vertical == other.vertical;
 }
 
 Media::Media()
     : type(CUSTOM_MEDIA), width_um(0), height_um(0), is_continuous_feed(false) {
 }
 
+Media::Media(MediaType type)
+    : type(type),
+      width_um(0),

[Vitaly Buka (NO REVIEWS), 2014/05/22 01:11:21]

just call MatchByType() here

[Aleksey Shlyapnikov, 2014/05/22 03:51:18]

Done.

+      height_um(0),
+      is_continuous_feed(false) {
+}
+
 Media::Media(MediaType type, int32 width_um, int32 height_um)
     : type(type),
       width_um(width_um),
       height_um(height_um),
       is_continuous_feed(width_um <= 0 || height_um <= 0) {
 }
 
 Media::Media(const std::string& custom_display_name,
              int32 width_um,
              int32 height_um)
     : type(CUSTOM_MEDIA),
       width_um(width_um),
       height_um(height_um),
       is_continuous_feed(width_um <= 0 || height_um <= 0),
       custom_display_name(custom_display_name) {
 }
 
+bool Media::MatchByType() {
+  const MediaDefinition* media = FindMediaByType(type);
+  if (!media)
+    return false;
+  width_um = media->width_um;
+  height_um = media->height_um;
+  is_continuous_feed = width_um <= 0 || height_um <= 0;
+  custom_display_name.clear();
+  return true;
+}
+
 bool Media::MatchBySize() {
-  const MadiaDefinition* media = FindMediaBySize(width_um, height_um);
+  const MediaDefinition* media = FindMediaBySize(width_um, height_um);
   if (!media)
     return false;
   type = media->id;
   custom_display_name.clear();
   return true;
 }
 
 bool Media::IsValid() const {
   if (is_continuous_feed) {
     if (width_um <= 0 && height_um <= 0)
@@ skipping 344 matching lines @@
 template class TicketItem<Margins, MarginsTraits>;
 template class TicketItem<Dpi, DpiTraits>;
 template class TicketItem<FitToPageType, FitToPageTraits>;
 template class TicketItem<Media, MediaTraits>;
 template class TicketItem<int32, CopiesTraits>;
 template class TicketItem<PageRange, PageRangeTraits>;
 template class TicketItem<bool, CollateTraits>;
 template class TicketItem<bool, ReverseTraits>;
 
 }  // namespace cloud_devices