Reland r285145: Remove RendererPreferences font-rendering enums.

content/public/common/renderer_preferences.h

 // 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.
 //
 // A struct for managing browser's settings that apply to the renderer or its
 // webview.  These differ from WebPreferences since they apply to Chromium's
 // glue layer rather than applying to just WebKit.
 //
 // Adding new values to this class probably involves updating
 // common/view_messages.h, browser/browser.cc, etc.
 
 #ifndef CONTENT_PUBLIC_COMMON_RENDERER_PREFERENCES_H_
 #define CONTENT_PUBLIC_COMMON_RENDERER_PREFERENCES_H_
 
 #include <string>
 #include <vector>
 
 #include "content/common/content_export.h"
 #include "third_party/skia/include/core/SkColor.h"
+#include "ui/gfx/font_render_params.h"
 
 namespace content {
 
-enum RendererPreferencesHintingEnum {
-  RENDERER_PREFERENCES_HINTING_SYSTEM_DEFAULT = 0,
-  RENDERER_PREFERENCES_HINTING_NONE,
-  RENDERER_PREFERENCES_HINTING_SLIGHT,
-  RENDERER_PREFERENCES_HINTING_MEDIUM,
-  RENDERER_PREFERENCES_HINTING_FULL,
-};
-
-enum RendererPreferencesSubpixelRenderingEnum {
-  RENDERER_PREFERENCES_SUBPIXEL_RENDERING_SYSTEM_DEFAULT = 0,
-  RENDERER_PREFERENCES_SUBPIXEL_RENDERING_NONE,
-  RENDERER_PREFERENCES_SUBPIXEL_RENDERING_RGB,
-  RENDERER_PREFERENCES_SUBPIXEL_RENDERING_BGR,
-  RENDERER_PREFERENCES_SUBPIXEL_RENDERING_VRGB,
-  RENDERER_PREFERENCES_SUBPIXEL_RENDERING_VBGR,
-};
-
 enum TapMultipleTargetsStrategy {
   TAP_MULTIPLE_TARGETS_STRATEGY_ZOOM = 0,
   TAP_MULTIPLE_TARGETS_STRATEGY_POPUP,
   TAP_MULTIPLE_TARGETS_STRATEGY_NONE,
 
   TAP_MULTIPLE_TARGETS_STRATEGY_MAX = TAP_MULTIPLE_TARGETS_STRATEGY_NONE,
 };
 
 struct CONTENT_EXPORT RendererPreferences {
   RendererPreferences();
   ~RendererPreferences();
 
   // Whether the renderer's current browser context accept drops from the OS
   // that result in navigations away from the current page.
   bool can_accept_load_drops;
 
   // Whether text should be antialiased.
   // Currently only used by Linux.
   bool should_antialias_text;
 
   // The level of hinting to use when rendering text.
   // Currently only used by Linux.
-  RendererPreferencesHintingEnum hinting;
+  gfx::FontRenderParams::Hinting hinting;
 
   // Whether auto hinter should be used. Currently only used by Linux.
   bool use_autohinter;
 
   // Whether embedded bitmap strikes in fonts should be used.
   // Current only used by Linux.
   bool use_bitmaps;
 
   // The type of subpixel rendering to use for text.
   // Currently only used by Linux.
-  RendererPreferencesSubpixelRenderingEnum subpixel_rendering;
+  gfx::FontRenderParams::SubpixelRendering subpixel_rendering;
 
   // Whether subpixel positioning should be used, permitting fractional X
   // positions for glyphs.  Currently only used by Linux.
   bool use_subpixel_positioning;
 
   // The color of the focus ring. Currently only used on Linux.
   SkColor focus_ring_color;
 
   // The color of different parts of the scrollbar. Currently only used on
   // Linux.
@@ skipping 62 matching lines @@
   bool plugin_fullscreen_allowed;
 
   // Whether video-overlay (hole-punching) should be used for the embedded
   // encrypted video.  Currently only used by Android.
   bool use_video_overlay_for_embedded_encrypted_video;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_COMMON_RENDERER_PREFERENCES_H_