gfx/skia/patches/archive/0011-Bug-719575-Fix-clang-build.patch@129ffea94266 (annotated)
gfx/skia/patches/archive/0011-Bug-719575-Fix-clang-build.patch
Sat, 03 Jan 2015 20:18:00 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Sat, 03 Jan 2015 20:18:00 +0100
- branch
- TOR_BUG_3246
- changeset 7
- 129ffea94266
- permissions
- -rw-r--r--
Conditionally enable double key logic according to:
private browsing mode or privacy.thirdparty.isolate preference and
implement in GetCookieStringCommon and FindCookie where it counts...
With some reservations of how to convince FindCookie users to test
condition and pass a nullptr when disabling double key logic.
| michael@0 | 1 | From cf855f31194ff071f2c787a7413d70a43f15f204 Mon Sep 17 00:00:00 2001 |
| michael@0 | 2 | From: Ehsan Akhgari <ehsan@mozilla.com> |
| michael@0 | 3 | Date: Tue, 29 May 2012 15:39:55 -0400 |
| michael@0 | 4 | Subject: [PATCH] Bug 755869 - Re-apply patch from bug 719575 to fix clang |
| michael@0 | 5 | builds for the new Skia r=gw280 |
| michael@0 | 6 | |
| michael@0 | 7 | --- |
| michael@0 | 8 | gfx/skia/src/ports/SkFontHost_mac_coretext.cpp | 4 ++-- |
| michael@0 | 9 | 1 files changed, 2 insertions(+), 2 deletions(-) |
| michael@0 | 10 | |
| michael@0 | 11 | diff --git a/gfx/skia/src/ports/SkFontHost_mac_coretext.cpp b/gfx/skia/src/ports/SkFontHost_mac_coretext.cpp |
| michael@0 | 12 | index c43d1a6..ce5f409 100644 |
| michael@0 | 13 | --- a/gfx/skia/src/ports/SkFontHost_mac_coretext.cpp |
| michael@0 | 14 | +++ b/gfx/skia/src/ports/SkFontHost_mac_coretext.cpp |
| michael@0 | 15 | @@ -807,8 +807,8 @@ CGRGBPixel* Offscreen::getCG(const SkScalerContext_Mac& context, const SkGlyph& |
| michael@0 | 16 | void SkScalerContext_Mac::getVerticalOffset(CGGlyph glyphID, SkIPoint* offset) const { |
| michael@0 | 17 | CGSize vertOffset; |
| michael@0 | 18 | CTFontGetVerticalTranslationsForGlyphs(fCTVerticalFont, &glyphID, &vertOffset, 1); |
| michael@0 | 19 | - const SkPoint trans = {SkFloatToScalar(vertOffset.width), |
| michael@0 | 20 | - SkFloatToScalar(vertOffset.height)}; |
| michael@0 | 21 | + const SkPoint trans = {SkScalar(SkFloatToScalar(vertOffset.width)), |
| michael@0 | 22 | + SkScalar(SkFloatToScalar(vertOffset.height))}; |
| michael@0 | 23 | SkPoint floatOffset; |
| michael@0 | 24 | fVerticalMatrix.mapPoints(&floatOffset, &trans, 1); |
| michael@0 | 25 | if (!isSnowLeopard()) { |
| michael@0 | 26 | -- |
| michael@0 | 27 | 1.7.5.4 |
| michael@0 | 28 |
