gfx/skia/patches/0001-Bug-895086-Remove-unused-find_from_uniqueID-function.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.

     1 From 58861c38751adf1f4ef3f67f8e85f5c36f1c43a5 Mon Sep 17 00:00:00 2001
     2 From: George Wright <gw@gwright.org.uk>
     3 Date: Wed, 17 Jul 2013 16:28:07 -0400
     4 Subject: [PATCH] Bug 895086 - Remove unused find_from_uniqueID() function from
     5  SkFontHost_linux
     7 ---
     8  gfx/skia/src/ports/SkFontHost_linux.cpp | 14 --------------
     9  1 file changed, 14 deletions(-)
    11 diff --git a/gfx/skia/src/ports/SkFontHost_linux.cpp b/gfx/skia/src/ports/SkFontHost_linux.cpp
    12 index df21014..05b73dc 100644
    13 --- a/gfx/skia/src/ports/SkFontHost_linux.cpp
    14 +++ b/gfx/skia/src/ports/SkFontHost_linux.cpp
    15 @@ -117,20 +117,6 @@ static FamilyRec* find_family(const SkTypeface* member) {
    16      return NULL;
    17  }
    19 -static SkTypeface* find_from_uniqueID(uint32_t uniqueID) {
    20 -    FamilyRec* curr = gFamilyHead;
    21 -    while (curr != NULL) {
    22 -        for (int i = 0; i < 4; i++) {
    23 -            SkTypeface* face = curr->fFaces[i];
    24 -            if (face != NULL && face->uniqueID() == uniqueID) {
    25 -                return face;
    26 -            }
    27 -        }
    28 -        curr = curr->fNext;
    29 -    }
    30 -    return NULL;
    31 -}
    32 -
    33  /*  Remove reference to this face from its family. If the resulting family
    34   is empty (has no faces), return that family, otherwise return NULL
    35   */
    36 -- 
    37 1.8.3.1

mercurial