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