PPAPI: Remove PPB_Font_Dev.

content/child/browser_font_resource_trusted.cc

 // Copyright (c) 2012 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 "content/child/browser_font_resource_trusted.h"
 
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/common/web_preferences.h"
-#include "ppapi/c/dev/ppb_font_dev.h"
 #include "ppapi/proxy/connection.h"
 #include "ppapi/shared_impl/ppapi_preferences.h"
 #include "ppapi/shared_impl/var.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/ppb_image_data_api.h"
 #include "ppapi/thunk/thunk.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/WebKit/public/platform/WebCanvas.h"
 #include "third_party/WebKit/public/platform/WebFloatPoint.h"
 #include "third_party/WebKit/public/platform/WebFloatRect.h"
@@ skipping 70 matching lines @@
   // The range covered by the run is in the two output params.
   WebTextRun GetRunAt(int index, int32_t* run_start, int32_t* run_len) const {
     DCHECK(index < num_runs_);
     if (bidi_) {
       bool run_rtl = !!ubidi_getVisualRun(bidi_, index, run_start, run_len);
       return WebTextRun(base::string16(&text_[*run_start], *run_len),
                         run_rtl, true);
     }
 
     // Override run, return the single one.
-    DCHECK(index == 0);
+    DCHECK_EQ(0, index);
     *run_start = 0;
     *run_len = static_cast<int32_t>(text_.size());
     return override_run_;
   }
 
  private:
   // Will be null if we skipped autodetection.
   UBiDi* bidi_;
 
   // Text of all the runs.
@@ skipping 31 matching lines @@
 WebFontDescription PPFontDescToWebFontDesc(
     const PP_BrowserFont_Trusted_Description& font,
     const ppapi::Preferences& prefs) {
   // Verify that the enums match so we can just static cast.
   static_assert(static_cast<int>(WebFontDescription::Weight100) ==
                 static_cast<int>(PP_BROWSERFONT_TRUSTED_WEIGHT_100),
                 "font Weight100");
   static_assert(static_cast<int>(WebFontDescription::Weight900) ==
                 static_cast<int>(PP_BROWSERFONT_TRUSTED_WEIGHT_900),
                 "font Weight900");
-  static_assert(WebFontDescription::GenericFamilyStandard ==
-                PP_FAMILY_TO_WEB_FAMILY(PP_FONTFAMILY_DEFAULT),
-                "FamilyStandard");
-  static_assert(WebFontDescription::GenericFamilySerif ==
-                PP_FAMILY_TO_WEB_FAMILY(PP_FONTFAMILY_SERIF),
-                "FamilySerif");
-  static_assert(WebFontDescription::GenericFamilySansSerif ==
-                PP_FAMILY_TO_WEB_FAMILY(PP_FONTFAMILY_SANSSERIF),
-                "FamilySansSerif");
-  static_assert(WebFontDescription::GenericFamilyMonospace ==
-                PP_FAMILY_TO_WEB_FAMILY(PP_FONTFAMILY_MONOSPACE),
-                "FamilyMonospace");
+  static_assert(
+      WebFontDescription::GenericFamilyStandard ==
+      PP_FAMILY_TO_WEB_FAMILY(PP_BROWSERFONT_TRUSTED_FAMILY_DEFAULT),
+      "FamilyStandard");
+  static_assert(
+      WebFontDescription::GenericFamilySerif ==
+      PP_FAMILY_TO_WEB_FAMILY(PP_BROWSERFONT_TRUSTED_FAMILY_SERIF),
+      "FamilySerif");
+  static_assert(
+      WebFontDescription::GenericFamilySansSerif ==
+      PP_FAMILY_TO_WEB_FAMILY(PP_BROWSERFONT_TRUSTED_FAMILY_SANSSERIF),
+      "FamilySansSerif");
+  static_assert(
+      WebFontDescription::GenericFamilyMonospace ==
+      PP_FAMILY_TO_WEB_FAMILY(PP_BROWSERFONT_TRUSTED_FAMILY_MONOSPACE),
+      "FamilyMonospace");
 
   StringVar* face_name = StringVar::FromPPVar(font.face);  // Possibly null.
 
   WebFontDescription result;
   base::string16 resolved_family;
   if (!face_name || face_name->value().empty()) {
     // Resolve the generic family.
     switch (font.family) {
       case PP_BROWSERFONT_TRUSTED_FAMILY_SERIF:
         resolved_family = GetFontFromMap(prefs.serif_font_family_map,
@@ skipping 263 matching lines @@
 
     // Advance to the next run. Note that we avoid doing this for the last run
     // since it's unnecessary, measuring text is slow, and most of the time
     // there will be only one run anyway.
     if (i != runs.num_runs() - 1)
       web_position.x += font_->calculateWidth(run);
   }
 }
 
 }  // namespace content