Revert 54173 - Hook up the new font API to WebKit. This moves the existing Ge...

webkit/glue/plugins/pepper_font.cc

Index: webkit/glue/plugins/pepper_font.cc
===================================================================
--- webkit/glue/plugins/pepper_font.cc	(revision 54178)
+++ webkit/glue/plugins/pepper_font.cc	(working copy)
@@ -2,188 +2,79 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "build/build_config.h"
+
 #include "webkit/glue/plugins/pepper_font.h"
 
+#if defined(OS_LINUX)
+#include <unistd.h>
+#endif
+
 #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"
-#include "third_party/WebKit/WebKit/chromium/public/WebFont.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebFontDescription.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebRect.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebFloatPoint.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebFloatRect.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebTextRun.h"
-#include "webkit/glue/plugins/pepper_image_data.h"
 #include "webkit/glue/plugins/pepper_plugin_module.h"
-#include "webkit/glue/plugins/pepper_string.h"
-#include "webkit/glue/plugins/pepper_var.h"
 #include "webkit/glue/webkit_glue.h"
 
-using WebKit::WebFloatPoint;
-using WebKit::WebFloatRect;
-using WebKit::WebFont;
-using WebKit::WebFontDescription;
-using WebKit::WebRect;
-using WebKit::WebTextRun;
-
 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;
-
-  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;
-
-  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)
-
-// Assumes the given PP_FontDescription has been validated.
-WebFontDescription PPFontDescToWebFontDesc(const PP_FontDescription& font) {
-  // Verify that the enums match so we can just static cast.
-  COMPILE_ASSERT(static_cast<int>(WebFontDescription::Weight100) ==
-                 static_cast<int>(PP_FONTWEIGHT_100),
-                 FontWeight100);
-  COMPILE_ASSERT(static_cast<int>(WebFontDescription::Weight900) ==
-                 static_cast<int>(PP_FONTWEIGHT_900),
-                 FontWeight900);
-  COMPILE_ASSERT(WebFontDescription::GenericFamilyStandard ==
-                 PP_FONTFAMILY_TO_WEB_FONTFAMILY(PP_FONTFAMILY_DEFAULT),
-                 StandardFamily);
-  COMPILE_ASSERT(WebFontDescription::GenericFamilySerif ==
-                 PP_FONTFAMILY_TO_WEB_FONTFAMILY(PP_FONTFAMILY_SERIF),
-                 SerifFamily);
-  COMPILE_ASSERT(WebFontDescription::GenericFamilySansSerif ==
-                 PP_FONTFAMILY_TO_WEB_FONTFAMILY(PP_FONTFAMILY_SANSSERIF),
-                 SansSerifFamily);
-  COMPILE_ASSERT(WebFontDescription::GenericFamilyMonospace ==
-                 PP_FONTFAMILY_TO_WEB_FONTFAMILY(PP_FONTFAMILY_MONOSPACE),
-                 MonospaceFamily);
-
-  WebFontDescription result;
-  String* face_name = GetString(font.face);
-  if (face_name)
-    result.family = UTF8ToUTF16(face_name->value());
-  result.genericFamily = PP_FONTFAMILY_TO_WEB_FONTFAMILY(font.family);
-  result.size = static_cast<float>(font.size);
-  result.italic = font.italic;
-  result.smallCaps = font.small_caps;
-  result.weight = static_cast<WebFontDescription::Weight>(font.weight);
-  result.letterSpacing = static_cast<short>(font.letter_spacing);
-  result.wordSpacing = static_cast<short>(font.word_spacing);
-  return result;
-}
-
-// Converts the given PP_TextRun to a WebTextRun, returning true on success.
-// False means the input was invalid.
-bool PPTextRunToWebTextRun(const PP_TextRun* run, WebTextRun* output) {
-  String* text_string = GetString(run->text);
-  if (!text_string)
-    return false;
-  *output = WebTextRun(UTF8ToUTF16(text_string->value()),
-                       run->rtl, run->override_direction);
-  return true;
-}
-
-PP_Resource Create(PP_Module module_id,
-                   const PP_FontDescription* description) {
+PP_Resource MatchFontWithFallback(PP_Module module_id,
+                                  const PP_FontDescription* description) {
+#if defined(OS_LINUX)
   PluginModule* module = PluginModule::FromPPModule(module_id);
   if (!module)
     return 0;
 
-  if (!IsPPFontDescriptionValid(*description))
+  int fd = webkit_glue::MatchFontWithFallback(description->face,
+                                              description->weight >= 700,
+                                              description->italic,
+                                              description->charset);
+  if (fd == -1)
     return 0;
 
-  scoped_refptr<Font> font(new Font(module, *description));
+  scoped_refptr<Font> font(new Font(module, fd));
+
   return font->GetReference();
+#else
+  // For trusted pepper plugins, this is only needed in Linux since font loading
+  // on Windows and Mac works through the renderer sandbox.
+  return false;
+#endif
 }
 
 bool IsFont(PP_Resource resource) {
-  return !!Resource::GetAs<Font>(resource).get();
+  return !!Resource::GetAs<Font>(resource);
 }
 
-bool Describe(PP_Resource font_id,
-              PP_FontDescription* description,
-              PP_FontMetrics* metrics) {
+bool GetFontTable(PP_Resource font_id,
+                  uint32_t table,
+                  void* output,
+                  uint32_t* output_length) {
   scoped_refptr<Font> font(Resource::GetAs<Font>(font_id));
   if (!font.get())
     return false;
-  return font->Describe(description, metrics);
-}
 
-bool DrawTextAt(PP_Resource font_id,
-                PP_Resource image_data,
-                const PP_TextRun* text,
-                const PP_Point* position,
-                uint32_t color,
-                const PP_Rect* clip,
-                bool image_data_is_opaque) {
-  scoped_refptr<Font> font(Resource::GetAs<Font>(font_id));
-  if (!font.get())
-    return false;
-  return font->DrawTextAt(image_data, text, position, color, clip,
-                          image_data_is_opaque);
+  return font->GetFontTable(table, output, output_length);
 }
 
-int32_t MeasureText(PP_Resource font_id, const PP_TextRun* text) {
-  scoped_refptr<Font> font(Resource::GetAs<Font>(font_id));
-  if (!font.get())
-    return -1;
-  return font->MeasureText(text);
-}
-
-uint32_t CharacterOffsetForPixel(PP_Resource font_id,
-                                 const PP_TextRun* text,
-                                 int32_t pixel_position) {
-  scoped_refptr<Font> font(Resource::GetAs<Font>(font_id));
-  if (!font.get())
-    return false;
-  return font->CharacterOffsetForPixel(text, pixel_position);
-}
-
-int32_t PixelOffsetForCharacter(PP_Resource font_id,
-                                const PP_TextRun* text,
-                                uint32_t char_offset) {
-  scoped_refptr<Font> font(Resource::GetAs<Font>(font_id));
-  if (!font.get())
-    return false;
-  return font->PixelOffsetForCharacter(text, char_offset);
-}
-
 const PPB_Font ppb_font = {
-  &Create,
+  &MatchFontWithFallback,
   &IsFont,
-  &Describe,
-  &DrawTextAt,
-  &MeasureText,
-  &CharacterOffsetForPixel,
-  &PixelOffsetForCharacter
+  &GetFontTable,
 };
 
 }  // namespace
 
-Font::Font(PluginModule* module, const PP_FontDescription& desc)
-    : Resource(module) {
-  WebFontDescription web_font_desc = PPFontDescToWebFontDesc(desc);
-  font_.reset(WebFont::create(web_font_desc));
+Font::Font(PluginModule* module, int fd)
+    : Resource(module),
+      fd_(fd) {
 }
 
 Font::~Font() {
+#if defined (OS_LINUX)
+  close(fd_);
+#endif
 }
 
 // static
@@ -191,95 +82,18 @@
   return &ppb_font;
 }
 
-bool Font::Describe(PP_FontDescription* description,
-                    PP_FontMetrics* metrics) {
-  if (description->face.type != PP_VARTYPE_VOID)
-    return false;
-
-  WebFontDescription web_desc = font_->fontDescription();
-
-  // While converting the other way in PPFontDescToWebFontDesc we validated
-  // that the enums can be casted.
-  description->face = StringToPPVar(UTF16ToUTF8(web_desc.family));
-  description->family = static_cast<PP_FontFamily>(web_desc.genericFamily);
-  description->size = static_cast<uint32_t>(web_desc.size);
-  description->weight = static_cast<PP_FontWeight>(web_desc.weight);
-  description->italic = web_desc.italic;
-  description->small_caps = web_desc.smallCaps;
-
-  metrics->height = font_->height();
-  metrics->ascent = font_->ascent();
-  metrics->descent = font_->descent();
-  metrics->line_spacing = font_->lineSpacing();
-  metrics->x_height = static_cast<int32_t>(font_->xHeight());
-
-  return true;
+bool Font::GetFontTable(uint32_t table,
+                        void* output,
+                        uint32_t* output_length) {
+#if defined(OS_LINUX)
+  size_t temp_size = static_cast<size_t>(*output_length);
+  bool rv = webkit_glue::GetFontTable(
+      fd_, table, static_cast<uint8_t*>(output), &temp_size);
+  *output_length = static_cast<uint32_t>(temp_size);
+  return rv;
+#else
+  return false;
+#endif
 }
 
-bool Font::DrawTextAt(PP_Resource image_data,
-                      const PP_TextRun* text,
-                      const PP_Point* position,
-                      uint32_t color,
-                      const PP_Rect* clip,
-                      bool image_data_is_opaque) {
-  WebTextRun run;
-  if (!PPTextRunToWebTextRun(text, &run))
-    return false;
-
-  // Get and map the image data we're painting to.
-  scoped_refptr<ImageData> image_resource(
-      Resource::GetAs<ImageData>(image_data));
-  if (!image_resource.get())
-    return false;
-  ImageDataAutoMapper mapper(image_resource);
-  if (!mapper.is_valid())
-    return false;
-
-  // Convert position and clip.
-  WebFloatPoint web_position(static_cast<float>(position->x),
-                             static_cast<float>(position->y));
-  WebRect web_clip;
-  if (!clip) {
-    // Use entire canvas.
-    web_clip = WebRect(0, 0, image_resource->width(), image_resource->height());
-  } else {
-    web_clip = WebRect(clip->point.x, clip->point.y,
-                       clip->size.width, clip->size.height);
-  }
-
-  font_->drawText(webkit_glue::ToWebCanvas(image_resource->mapped_canvas()),
-                  run, web_position, color, web_clip, image_data_is_opaque);
-  return true;
-}
-
-int32_t Font::MeasureText(const PP_TextRun* text) {
-  WebTextRun run;
-  if (!PPTextRunToWebTextRun(text, &run))
-    return -1;
-  return font_->calculateWidth(run);
-}
-
-uint32_t Font::CharacterOffsetForPixel(const PP_TextRun* text,
-                                       int32_t pixel_position) {
-  WebTextRun run;
-  if (!PPTextRunToWebTextRun(text, &run))
-    return -1;
-
-  return static_cast<uint32_t>(font_->offsetForPosition(
-      run, static_cast<float>(pixel_position)));
-}
-
-int32_t Font::PixelOffsetForCharacter(const PP_TextRun* text,
-                                      uint32_t char_offset) {
-  WebTextRun run;
-  if (!PPTextRunToWebTextRun(text, &run))
-    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