third_party/WebKit/Source/platform/fonts/SimpleFontData.cpp - Issue 1450303002: (DO NOT LAND, EXPERIMENTAL) os/2

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/platform/fonts/SimpleFontData.cpp

Issue 1450303002: (DO NOT LAND, EXPERIMENTAL) os/2 Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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:

Index: third_party/WebKit/Source/platform/fonts/SimpleFontData.cpp

diff --git a/third_party/WebKit/Source/platform/fonts/SimpleFontData.cpp b/third_party/WebKit/Source/platform/fonts/SimpleFontData.cpp

index 6d297e9356bb5d445c511a4526d09a0c2074836b..c1d14ab0a4127c2190d5599bd80550f3c96b2606 100644

--- a/third_party/WebKit/Source/platform/fonts/SimpleFontData.cpp

+++ b/third_party/WebKit/Source/platform/fonts/SimpleFontData.cpp

@@ -37,6 +37,7 @@

#include "SkUtils.h"

#include "platform/fonts/FontDescription.h"

#include "platform/fonts/GlyphPage.h"

+#include "platform/fonts/OpenType/OpenTypeOS2Table.h"

#include "platform/fonts/VDMXParser.h"

#include "platform/geometry/FloatRect.h"

#include "wtf/MathExtras.h"

@@ -100,6 +101,9 @@ void SimpleFontData::platformInit()

SkTypeface* face = paint.getTypeface();

ASSERT(face);

+ int16_t ascentInUnits, descentInUnits;

+ getAscentDescentFromOS2Table(face, ascentInUnits, descentInUnits);

int vdmxAscent = 0, vdmxDescent = 0;

bool isVDMXValid = false;