gfx/skia/patches/archive/0011-Bug-719575-Fix-clang-build.patch

Wed, 31 Dec 2014 06:09:35 +0100

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Wed, 31 Dec 2014 06:09:35 +0100
changeset 0
6474c204b198
permissions
-rw-r--r--

Cloned upstream origin tor-browser at tor-browser-31.3.0esr-4.5-1-build1
revision ID fc1c9ff7c1b2defdbc039f12214767608f46423f for hacking purpose.

     1 From cf855f31194ff071f2c787a7413d70a43f15f204 Mon Sep 17 00:00:00 2001
     2 From: Ehsan Akhgari <ehsan@mozilla.com>
     3 Date: Tue, 29 May 2012 15:39:55 -0400
     4 Subject: [PATCH] Bug 755869 - Re-apply patch from bug 719575 to fix clang
     5  builds for the new Skia r=gw280
     7 ---
     8  gfx/skia/src/ports/SkFontHost_mac_coretext.cpp |    4 ++--
     9  1 files changed, 2 insertions(+), 2 deletions(-)
    11 diff --git a/gfx/skia/src/ports/SkFontHost_mac_coretext.cpp b/gfx/skia/src/ports/SkFontHost_mac_coretext.cpp
    12 index c43d1a6..ce5f409 100644
    13 --- a/gfx/skia/src/ports/SkFontHost_mac_coretext.cpp
    14 +++ b/gfx/skia/src/ports/SkFontHost_mac_coretext.cpp
    15 @@ -807,8 +807,8 @@ CGRGBPixel* Offscreen::getCG(const SkScalerContext_Mac& context, const SkGlyph&
    16  void SkScalerContext_Mac::getVerticalOffset(CGGlyph glyphID, SkIPoint* offset) const {
    17      CGSize vertOffset;
    18      CTFontGetVerticalTranslationsForGlyphs(fCTVerticalFont, &glyphID, &vertOffset, 1);
    19 -    const SkPoint trans = {SkFloatToScalar(vertOffset.width),
    20 -                           SkFloatToScalar(vertOffset.height)};
    21 +    const SkPoint trans = {SkScalar(SkFloatToScalar(vertOffset.width)),
    22 +                           SkScalar(SkFloatToScalar(vertOffset.height))};
    23      SkPoint floatOffset;
    24      fVerticalMatrix.mapPoints(&floatOffset, &trans, 1);
    25      if (!isSnowLeopard()) {
    26 -- 
    27 1.7.5.4

mercurial