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

Unified Diff: content/renderer/render_view_linux.cc

Issue 10544103: Chromium change of sharing some WebKit API between Android/Linux. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: For landing Created 8 years, 5 months 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 | « content/renderer/render_view_impl.h ('k') | ui/gfx/font_render_params_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_view_linux.cc
diff --git a/content/renderer/render_view_linux.cc b/content/renderer/render_view_linux.cc
index ca35529cd6ea91bd4652d895e235c020fdcfc2a2..f41fa616a210582e8b323880d5718b7d889eceed 100644
--- a/content/renderer/render_view_linux.cc
+++ b/content/renderer/render_view_linux.cc
@@ -5,10 +5,8 @@
#include "content/renderer/render_view_impl.h"
#include "content/public/common/renderer_preferences.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/linux/WebFontInfo.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/linux/WebFontRendering.h"
-using WebKit::WebFontInfo;
using WebKit::WebFontRendering;
static SkPaint::Hinting RendererPreferencesToSkiaHinting(
@@ -102,6 +100,8 @@ static bool RendererPreferencesToSubpixelRenderingFlag(
void RenderViewImpl::UpdateFontRenderingFromRendererPrefs() {
const content::RendererPreferences& prefs = renderer_preferences_;
WebFontRendering::setHinting(RendererPreferencesToSkiaHinting(prefs));
+ WebFontRendering::setAutoHint(prefs.use_autohinter);
+ WebFontRendering::setUseBitmaps(prefs.use_bitmaps);
WebFontRendering::setLCDOrder(
RendererPreferencesToSkiaLCDOrder(prefs.subpixel_rendering));
WebFontRendering::setLCDOrientation(
@@ -110,5 +110,4 @@ void RenderViewImpl::UpdateFontRenderingFromRendererPrefs() {
WebFontRendering::setSubpixelRendering(
RendererPreferencesToSubpixelRenderingFlag(prefs));
WebFontRendering::setSubpixelPositioning(prefs.use_subpixel_positioning);
- WebFontInfo::setSubpixelPositioning(prefs.use_subpixel_positioning);
}
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | ui/gfx/font_render_params_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698