qtwebengine: 5.9.1 -> 5.9.2
This commit is contained in:
Danny Rawlins
parent
eab00a737d
commit
360a01690b
@ -2,28 +2,28 @@ drwxr-xr-x root/root usr/
|
||||
drwxr-xr-x root/root usr/include/
|
||||
drwxr-xr-x root/root usr/include/qt5/
|
||||
drwxr-xr-x root/root usr/include/qt5/QtWebEngine/
|
||||
drwxr-xr-x root/root usr/include/qt5/QtWebEngine/5.9.1/
|
||||
drwxr-xr-x root/root usr/include/qt5/QtWebEngine/5.9.1/QtWebEngine/
|
||||
drwxr-xr-x root/root usr/include/qt5/QtWebEngine/5.9.1/QtWebEngine/private/
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.9.1/QtWebEngine/private/qquickwebenginecertificateerror_p.h
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.9.1/QtWebEngine/private/qquickwebenginecontextmenurequest_p.h
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.9.1/QtWebEngine/private/qquickwebenginedialogrequests_p.h
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.9.1/QtWebEngine/private/qquickwebenginedownloaditem_p.h
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.9.1/QtWebEngine/private/qquickwebenginedownloaditem_p_p.h
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.9.1/QtWebEngine/private/qquickwebenginefaviconprovider_p_p.h
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.9.1/QtWebEngine/private/qquickwebenginehistory_p.h
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.9.1/QtWebEngine/private/qquickwebenginehistory_p_p.h
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.9.1/QtWebEngine/private/qquickwebengineloadrequest_p.h
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.9.1/QtWebEngine/private/qquickwebenginenavigationrequest_p.h
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.9.1/QtWebEngine/private/qquickwebenginenewviewrequest_p.h
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.9.1/QtWebEngine/private/qquickwebengineprofile_p.h
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.9.1/QtWebEngine/private/qquickwebenginescript_p.h
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.9.1/QtWebEngine/private/qquickwebenginesettings_p.h
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.9.1/QtWebEngine/private/qquickwebenginesingleton_p.h
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.9.1/QtWebEngine/private/qquickwebenginetestsupport_p.h
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.9.1/QtWebEngine/private/qquickwebengineview_p.h
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.9.1/QtWebEngine/private/qquickwebengineview_p_p.h
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.9.1/QtWebEngine/private/qtwebengineglobal_p.h
|
||||
drwxr-xr-x root/root usr/include/qt5/QtWebEngine/5.9.2/
|
||||
drwxr-xr-x root/root usr/include/qt5/QtWebEngine/5.9.2/QtWebEngine/
|
||||
drwxr-xr-x root/root usr/include/qt5/QtWebEngine/5.9.2/QtWebEngine/private/
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.9.2/QtWebEngine/private/qquickwebenginecertificateerror_p.h
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.9.2/QtWebEngine/private/qquickwebenginecontextmenurequest_p.h
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.9.2/QtWebEngine/private/qquickwebenginedialogrequests_p.h
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.9.2/QtWebEngine/private/qquickwebenginedownloaditem_p.h
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.9.2/QtWebEngine/private/qquickwebenginedownloaditem_p_p.h
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.9.2/QtWebEngine/private/qquickwebenginefaviconprovider_p_p.h
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.9.2/QtWebEngine/private/qquickwebenginehistory_p.h
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.9.2/QtWebEngine/private/qquickwebenginehistory_p_p.h
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.9.2/QtWebEngine/private/qquickwebengineloadrequest_p.h
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.9.2/QtWebEngine/private/qquickwebenginenavigationrequest_p.h
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.9.2/QtWebEngine/private/qquickwebenginenewviewrequest_p.h
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.9.2/QtWebEngine/private/qquickwebengineprofile_p.h
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.9.2/QtWebEngine/private/qquickwebenginescript_p.h
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.9.2/QtWebEngine/private/qquickwebenginesettings_p.h
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.9.2/QtWebEngine/private/qquickwebenginesingleton_p.h
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.9.2/QtWebEngine/private/qquickwebenginetestsupport_p.h
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.9.2/QtWebEngine/private/qquickwebengineview_p.h
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.9.2/QtWebEngine/private/qquickwebengineview_p_p.h
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.9.2/QtWebEngine/private/qtwebengineglobal_p.h
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/QQuickWebEngineProfile
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/QQuickWebEngineScript
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/QtWebEngine
|
||||
@ -34,13 +34,13 @@ drwxr-xr-x root/root usr/include/qt5/QtWebEngine/5.9.1/QtWebEngine/private/
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/qtwebengineglobal.h
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/qtwebengineversion.h
|
||||
drwxr-xr-x root/root usr/include/qt5/QtWebEngineCore/
|
||||
drwxr-xr-x root/root usr/include/qt5/QtWebEngineCore/5.9.1/
|
||||
drwxr-xr-x root/root usr/include/qt5/QtWebEngineCore/5.9.1/QtWebEngineCore/
|
||||
drwxr-xr-x root/root usr/include/qt5/QtWebEngineCore/5.9.1/QtWebEngineCore/private/
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngineCore/5.9.1/QtWebEngineCore/private/qtwebenginecoreglobal_p.h
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngineCore/5.9.1/QtWebEngineCore/private/qwebenginecallback_p.h
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngineCore/5.9.1/QtWebEngineCore/private/qwebenginecookiestore_p.h
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngineCore/5.9.1/QtWebEngineCore/private/qwebengineurlrequestinfo_p.h
|
||||
drwxr-xr-x root/root usr/include/qt5/QtWebEngineCore/5.9.2/
|
||||
drwxr-xr-x root/root usr/include/qt5/QtWebEngineCore/5.9.2/QtWebEngineCore/
|
||||
drwxr-xr-x root/root usr/include/qt5/QtWebEngineCore/5.9.2/QtWebEngineCore/private/
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngineCore/5.9.2/QtWebEngineCore/private/qtwebenginecoreglobal_p.h
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngineCore/5.9.2/QtWebEngineCore/private/qwebenginecallback_p.h
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngineCore/5.9.2/QtWebEngineCore/private/qwebenginecookiestore_p.h
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngineCore/5.9.2/QtWebEngineCore/private/qwebengineurlrequestinfo_p.h
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngineCore/QWebEngineCallback
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngineCore/QWebEngineCookieStore
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngineCore/QWebEngineHttpRequest
|
||||
@ -61,15 +61,15 @@ drwxr-xr-x root/root usr/include/qt5/QtWebEngineCore/5.9.1/QtWebEngineCore/priva
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngineCore/qwebengineurlrequestjob.h
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngineCore/qwebengineurlschemehandler.h
|
||||
drwxr-xr-x root/root usr/include/qt5/QtWebEngineWidgets/
|
||||
drwxr-xr-x root/root usr/include/qt5/QtWebEngineWidgets/5.9.1/
|
||||
drwxr-xr-x root/root usr/include/qt5/QtWebEngineWidgets/5.9.1/QtWebEngineWidgets/
|
||||
drwxr-xr-x root/root usr/include/qt5/QtWebEngineWidgets/5.9.1/QtWebEngineWidgets/private/
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngineWidgets/5.9.1/QtWebEngineWidgets/private/qwebenginedownloaditem_p.h
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngineWidgets/5.9.1/QtWebEngineWidgets/private/qwebenginehistory_p.h
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngineWidgets/5.9.1/QtWebEngineWidgets/private/qwebenginepage_p.h
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngineWidgets/5.9.1/QtWebEngineWidgets/private/qwebengineprofile_p.h
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngineWidgets/5.9.1/QtWebEngineWidgets/private/qwebenginescriptcollection_p.h
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngineWidgets/5.9.1/QtWebEngineWidgets/private/qwebengineview_p.h
|
||||
drwxr-xr-x root/root usr/include/qt5/QtWebEngineWidgets/5.9.2/
|
||||
drwxr-xr-x root/root usr/include/qt5/QtWebEngineWidgets/5.9.2/QtWebEngineWidgets/
|
||||
drwxr-xr-x root/root usr/include/qt5/QtWebEngineWidgets/5.9.2/QtWebEngineWidgets/private/
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngineWidgets/5.9.2/QtWebEngineWidgets/private/qwebenginedownloaditem_p.h
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngineWidgets/5.9.2/QtWebEngineWidgets/private/qwebenginehistory_p.h
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngineWidgets/5.9.2/QtWebEngineWidgets/private/qwebenginepage_p.h
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngineWidgets/5.9.2/QtWebEngineWidgets/private/qwebengineprofile_p.h
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngineWidgets/5.9.2/QtWebEngineWidgets/private/qwebenginescriptcollection_p.h
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngineWidgets/5.9.2/QtWebEngineWidgets/private/qwebengineview_p.h
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngineWidgets/QWebEngineCertificateError
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngineWidgets/QWebEngineContextMenuData
|
||||
-rw-rw-r-- root/root usr/include/qt5/QtWebEngineWidgets/QWebEngineDownloadItem
|
||||
@ -113,22 +113,22 @@ drwxr-xr-x root/root usr/lib/cmake/Qt5WebEngineWidgets/
|
||||
-rw-r--r-- root/root usr/lib/cmake/Qt5WebEngineWidgets/Qt5WebEngineWidgetsConfigVersion.cmake
|
||||
-rw-r--r-- root/root usr/lib/libQt5WebEngine.la
|
||||
-rw-r--r-- root/root usr/lib/libQt5WebEngine.prl
|
||||
lrwxrwxrwx root/root usr/lib/libQt5WebEngine.so -> libQt5WebEngine.so.5.9.1
|
||||
lrwxrwxrwx root/root usr/lib/libQt5WebEngine.so.5 -> libQt5WebEngine.so.5.9.1
|
||||
lrwxrwxrwx root/root usr/lib/libQt5WebEngine.so.5.9 -> libQt5WebEngine.so.5.9.1
|
||||
-rwxr-xr-x root/root usr/lib/libQt5WebEngine.so.5.9.1
|
||||
lrwxrwxrwx root/root usr/lib/libQt5WebEngine.so -> libQt5WebEngine.so.5.9.2
|
||||
lrwxrwxrwx root/root usr/lib/libQt5WebEngine.so.5 -> libQt5WebEngine.so.5.9.2
|
||||
lrwxrwxrwx root/root usr/lib/libQt5WebEngine.so.5.9 -> libQt5WebEngine.so.5.9.2
|
||||
-rwxr-xr-x root/root usr/lib/libQt5WebEngine.so.5.9.2
|
||||
-rw-r--r-- root/root usr/lib/libQt5WebEngineCore.la
|
||||
-rw-r--r-- root/root usr/lib/libQt5WebEngineCore.prl
|
||||
lrwxrwxrwx root/root usr/lib/libQt5WebEngineCore.so -> libQt5WebEngineCore.so.5.9.1
|
||||
lrwxrwxrwx root/root usr/lib/libQt5WebEngineCore.so.5 -> libQt5WebEngineCore.so.5.9.1
|
||||
lrwxrwxrwx root/root usr/lib/libQt5WebEngineCore.so.5.9 -> libQt5WebEngineCore.so.5.9.1
|
||||
-rwxr-xr-x root/root usr/lib/libQt5WebEngineCore.so.5.9.1
|
||||
lrwxrwxrwx root/root usr/lib/libQt5WebEngineCore.so -> libQt5WebEngineCore.so.5.9.2
|
||||
lrwxrwxrwx root/root usr/lib/libQt5WebEngineCore.so.5 -> libQt5WebEngineCore.so.5.9.2
|
||||
lrwxrwxrwx root/root usr/lib/libQt5WebEngineCore.so.5.9 -> libQt5WebEngineCore.so.5.9.2
|
||||
-rwxr-xr-x root/root usr/lib/libQt5WebEngineCore.so.5.9.2
|
||||
-rw-r--r-- root/root usr/lib/libQt5WebEngineWidgets.la
|
||||
-rw-r--r-- root/root usr/lib/libQt5WebEngineWidgets.prl
|
||||
lrwxrwxrwx root/root usr/lib/libQt5WebEngineWidgets.so -> libQt5WebEngineWidgets.so.5.9.1
|
||||
lrwxrwxrwx root/root usr/lib/libQt5WebEngineWidgets.so.5 -> libQt5WebEngineWidgets.so.5.9.1
|
||||
lrwxrwxrwx root/root usr/lib/libQt5WebEngineWidgets.so.5.9 -> libQt5WebEngineWidgets.so.5.9.1
|
||||
-rwxr-xr-x root/root usr/lib/libQt5WebEngineWidgets.so.5.9.1
|
||||
lrwxrwxrwx root/root usr/lib/libQt5WebEngineWidgets.so -> libQt5WebEngineWidgets.so.5.9.2
|
||||
lrwxrwxrwx root/root usr/lib/libQt5WebEngineWidgets.so.5 -> libQt5WebEngineWidgets.so.5.9.2
|
||||
lrwxrwxrwx root/root usr/lib/libQt5WebEngineWidgets.so.5.9 -> libQt5WebEngineWidgets.so.5.9.2
|
||||
-rwxr-xr-x root/root usr/lib/libQt5WebEngineWidgets.so.5.9.2
|
||||
drwxr-xr-x root/root usr/lib/pkgconfig/
|
||||
-rw-r--r-- root/root usr/lib/pkgconfig/Qt5WebEngine.pc
|
||||
-rw-r--r-- root/root usr/lib/pkgconfig/Qt5WebEngineCore.pc
|
||||
|
||||
@ -1,2 +1,3 @@
|
||||
bae366f6797eaf6679e99575932a9758 harmony-fix.patch
|
||||
2b8336d205219ae66f67423aa9d267b8 last-commit-position.patch
|
||||
d4ad2f5df86c8483c06b3fe14c30136a qtwebengine-opensource-src-5.9.1.tar.xz
|
||||
366bb699788c79c92787b38c60cbf5db qtwebengine-opensource-src-5.9.2.tar.xz
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
untrusted comment: verify with /etc/ports/opt.pub
|
||||
RWSE3ohX2g5d/e32IIiZ9dBdv5v8upvY+/aRzDfV63JwDUbOE4NzI3qo6/ahVjeYK2Rv5vI1BUiQezf3h+/tuJrN6x7zB2caZQY=
|
||||
SHA256 (Pkgfile) = aaacdff1f2c0f44944c240bb9ce3d0c7ace97ec644078c42c9676b2f75e3ff85
|
||||
SHA256 (.footprint) = a1bcf93be991ef775351dd731bbfeaaf3791d4181e4595245fc78e38a3b1b8d5
|
||||
SHA256 (qtwebengine-opensource-src-5.9.1.tar.xz) = f6a37eeb9188474a16d29ede498fce959396ab80329a0a83eaeb925251686401
|
||||
RWSE3ohX2g5d/c3cw2J0rREDVpLWFt/KmleQz48+yGKiqy5Dkn2Dj8XdTZOMLgtqSU1F59744Zki7Z04M7By8Cec84LyXYf5uAI=
|
||||
SHA256 (Pkgfile) = f052910fd24bfa3f7919d78dcc7e5b928c7e9a5e4cc50078a7f0b9302a0d8b97
|
||||
SHA256 (.footprint) = b5f4ff427ae4acd53f36010669d1e9aa0811b87ccb4d7a3a1e1c82f3cc9ebad3
|
||||
SHA256 (qtwebengine-opensource-src-5.9.2.tar.xz) = cab069e4589f806640bebe4077c70e5cd5ffeb146c6e8caca6c4454fc0c4a108
|
||||
SHA256 (last-commit-position.patch) = 4f9d9bbde39013061bf9d003af67aff81bb7be3f42f0723e87c308425d8ead97
|
||||
SHA256 (harmony-fix.patch) = 2c309c0f6978e6a399422319b5034b01881d5526cf48b2ee5fcc7f418029a344
|
||||
|
||||
@ -5,10 +5,11 @@
|
||||
# Depends on: qt5 xorg-libxscrnsaver xorg-libxtst nss ninja
|
||||
|
||||
name=qtwebengine
|
||||
version=5.9.1
|
||||
version=5.9.2
|
||||
release=1
|
||||
source=(http://download.qt.io/official_releases/qt/${version::3}/$version/submodules/$name-opensource-src-$version.tar.xz
|
||||
last-commit-position.patch)
|
||||
last-commit-position.patch
|
||||
harmony-fix.patch)
|
||||
|
||||
build() {
|
||||
cd $name-opensource-src-$version
|
||||
@ -16,6 +17,9 @@ build() {
|
||||
# we don't use git sources
|
||||
patch -p1 -i $SRC/last-commit-position.patch
|
||||
|
||||
# FreeType 2.8.1
|
||||
patch -p1 -i $SRC/harmony-fix.patch
|
||||
|
||||
# Ninja, by default, sets the number of jobs to the number of availalble threads
|
||||
local JOBS=$(awk 'BEGIN{RS="-j|--jobs="} NR==2 {print $1}' <<< $MAKEFLAGS)
|
||||
test -n "$JOBS" && export NINJAFLAGS+=" -j $JOBS"
|
||||
|
||||
69
qtwebengine/harmony-fix.patch
Normal file
69
qtwebengine/harmony-fix.patch
Normal file
@ -0,0 +1,69 @@
|
||||
diff -u -r qtwebengine-opensource-src-5.9.1/src/3rdparty/chromium/third_party/skia/src/ports/SkFontHost_FreeType.cpp qtwebengine-opensource-src-5.9.1-ftfixes/src/3rdparty/chromium/third_party/skia/src/ports/SkFontHost_FreeType.cpp
|
||||
--- qtwebengine-opensource-src-5.9.1/src/3rdparty/chromium/third_party/skia/src/ports/SkFontHost_FreeType.cpp 2017-09-19 17:38:43.659642835 +0200
|
||||
+++ qtwebengine-opensource-src-5.9.1-ftfixes/src/3rdparty/chromium/third_party/skia/src/ports/SkFontHost_FreeType.cpp 2017-09-19 17:38:50.492991631 +0200
|
||||
@@ -80,7 +80,7 @@
|
||||
|
||||
class FreeTypeLibrary : SkNoncopyable {
|
||||
public:
|
||||
- FreeTypeLibrary() : fLibrary(nullptr), fIsLCDSupported(false), fLCDExtra(0) {
|
||||
+ FreeTypeLibrary() : fLibrary(nullptr) {
|
||||
if (FT_New_Library(&gFTMemory, &fLibrary)) {
|
||||
return;
|
||||
}
|
||||
@@ -90,8 +90,6 @@
|
||||
// Default { 0x10, 0x40, 0x70, 0x40, 0x10 } adds up to 0x110, simulating ink spread.
|
||||
// SetLcdFilter must be called before SetLcdFilterWeights.
|
||||
if (FT_Library_SetLcdFilter(fLibrary, FT_LCD_FILTER_DEFAULT) == 0) {
|
||||
- fIsLCDSupported = true;
|
||||
- fLCDExtra = 2; //Using a filter adds one full pixel to each side.
|
||||
|
||||
#ifdef SK_FONTHOST_FREETYPE_USE_NORMAL_LCD_FILTER
|
||||
// Adds to 0x110 simulating ink spread, but provides better results than default.
|
||||
@@ -124,13 +122,9 @@
|
||||
}
|
||||
|
||||
FT_Library library() { return fLibrary; }
|
||||
- bool isLCDSupported() { return fIsLCDSupported; }
|
||||
- int lcdExtra() { return fLCDExtra; }
|
||||
|
||||
private:
|
||||
FT_Library fLibrary;
|
||||
- bool fIsLCDSupported;
|
||||
- int fLCDExtra;
|
||||
|
||||
// FT_Library_SetLcdFilterWeights was introduced in FreeType 2.4.0.
|
||||
// The following platforms provide FreeType of at least 2.4.0.
|
||||
@@ -633,17 +627,6 @@
|
||||
rec->fTextSize = SkIntToScalar(1 << 14);
|
||||
}
|
||||
|
||||
- if (isLCD(*rec)) {
|
||||
- // TODO: re-work so that FreeType is set-up and selected by the SkFontMgr.
|
||||
- SkAutoMutexAcquire ama(gFTMutex);
|
||||
- ref_ft_library();
|
||||
- if (!gFTLibrary->isLCDSupported()) {
|
||||
- // If the runtime Freetype library doesn't support LCD, disable it here.
|
||||
- rec->fMaskFormat = SkMask::kA8_Format;
|
||||
- }
|
||||
- unref_ft_library();
|
||||
- }
|
||||
-
|
||||
SkPaint::Hinting h = rec->getHinting();
|
||||
if (SkPaint::kFull_Hinting == h && !isLCD(*rec)) {
|
||||
// collapse full->normal hinting if we're not doing LCD
|
||||
@@ -1046,11 +1029,11 @@
|
||||
void SkScalerContext_FreeType::updateGlyphIfLCD(SkGlyph* glyph) {
|
||||
if (isLCD(fRec)) {
|
||||
if (fLCDIsVert) {
|
||||
- glyph->fHeight += gFTLibrary->lcdExtra();
|
||||
- glyph->fTop -= gFTLibrary->lcdExtra() >> 1;
|
||||
+ glyph->fHeight += 2;
|
||||
+ glyph->fTop -= 1;
|
||||
} else {
|
||||
- glyph->fWidth += gFTLibrary->lcdExtra();
|
||||
- glyph->fLeft -= gFTLibrary->lcdExtra() >> 1;
|
||||
+ glyph->fWidth += 2;
|
||||
+ glyph->fLeft -= 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user