Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(460)

Unified Diff: content/child/browser_font_resource_trusted.cc

Issue 1428653002: PPAPI: Remove PPB_Font_Dev. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/common/ppapi_utils.cc ('k') | content/renderer/pepper/plugin_module.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/child/browser_font_resource_trusted.cc
diff --git a/content/child/browser_font_resource_trusted.cc b/content/child/browser_font_resource_trusted.cc
index d9ca6d6bce841b8774049246f8e478673776eda0..769006d3d1fe3fadf28aab06e05f7ee8dc7ee7d0 100644
--- a/content/child/browser_font_resource_trusted.cc
+++ b/content/child/browser_font_resource_trusted.cc
@@ -7,7 +7,6 @@
#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"
@@ -98,7 +97,7 @@ class TextRunCollection {
}
// 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_;
@@ -150,18 +149,22 @@ WebFontDescription PPFontDescToWebFontDesc(
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.
« no previous file with comments | « chrome/common/ppapi_utils.cc ('k') | content/renderer/pepper/plugin_module.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698