Pull PPAPI and get support for average char width. Hook it up to "0" for now...

webkit/glue/plugins/pepper_font.cc

 // Copyright (c) 2010 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/glue/plugins/pepper_font.h"
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "third_party/ppapi/c/pp_rect.h"
 #include "third_party/ppapi/c/ppb_font.h"
@@ skipping 18 matching lines @@
 
 namespace pepper {
 
 namespace {
 
 bool IsPPFontDescriptionValid(const PP_FontDescription& desc) {
   // Check validity of UTF-8.
   if (desc.face.type != PP_VARTYPE_STRING && desc.face.type != PP_VARTYPE_VOID)
     return false;
 
+  // Check enum ranges.
   if (static_cast<int>(desc.family) < PP_FONTFAMILY_DEFAULT ||
       static_cast<int>(desc.family) > PP_FONTFAMILY_MONOSPACE)
     return false;
   if (static_cast<int>(desc.weight) < PP_FONTWEIGHT_100 ||
       static_cast<int>(desc.weight) > PP_FONTWEIGHT_900)
     return false;
 
+  // Check for excessive sizes which may cause layout to get confused.
+  if (desc.size() > 200)
+    return false;
+
   return true;
 }
 
 // The PP_* version lacks "None", so is just one value shifted from the
 // WebFontDescription version. These values are checked in
 // PPFontDescToWebFontDesc to make sure the conversion is correct. This is a
 // macro so it can also be used in the COMPILE_ASSERTS.
 #define PP_FONTFAMILY_TO_WEB_FONTFAMILY(f) \
   static_cast<WebFontDescription::GenericFamily>(f + 1)
 
@@ skipping 220 matching lines @@
     return -1;
   if (char_offset >= run.text.length())
     return -1;
 
   WebFloatRect rect = font_->selectionRectForText(
       run, WebFloatPoint(0.0f, 0.0f), font_->height(), 0, char_offset);
   return static_cast<int>(rect.width);
 }
 
 }  // namespace pepper