diff --git a/gfx/layers/composite/ConsolasFontData.h b/gfx/layers/composite/ConsolasFontData.h deleted file mode 100644 index a01c417f14a1..000000000000 --- a/gfx/layers/composite/ConsolasFontData.h +++ /dev/null @@ -1,457 +0,0 @@ -/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* vim: set ts=8 sts=2 et sw=2 tw=80: */ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -// This is explicitly not guarded as we want only 1 file to include this and -// it's good if things break if someone else does. - -namespace mozilla { -namespace layers { -namespace consolas_font { -const unsigned char sFontPNG[] = { - 0x89, 0x50, 0x4e, 0x47, 0xd, 0xa, 0x1a, 0xa, 0x0, 0x0, 0x0, 0xd, - 0x49, 0x48, 0x44, 0x52, 0x0, 0x0, 0x1, 0x0, 0x0, 0x0, 0x1, 0x0, - 0x8, 0x0, 0x0, 0x0, 0x0, 0x79, 0x19, 0xf7, 0xba, 0x0, 0x0, 0x0, - 0x4, 0x67, 0x41, 0x4d, 0x41, 0x0, 0x0, 0xb1, 0x8f, 0xb, 0xfc, 0x61, - 0x5, 0x0, 0x0, 0x0, 0x20, 0x63, 0x48, 0x52, 0x4d, 0x0, 0x0, 0x7a, - 0x26, 0x0, 0x0, 0x80, 0x84, 0x0, 0x0, 0xfa, 0x0, 0x0, 0x0, 0x80, - 0xe8, 0x0, 0x0, 0x75, 0x30, 0x0, 0x0, 0xea, 0x60, 0x0, 0x0, 0x3a, - 0x98, 0x0, 0x0, 0x17, 0x70, 0x9c, 0xba, 0x51, 0x3c, 0x0, 0x0, 0x0, - 0x2, 0x62, 0x4b, 0x47, 0x44, 0x0, 0xff, 0x87, 0x8f, 0xcc, 0xbf, 0x0, - 0x0, 0x0, 0x9, 0x70, 0x48, 0x59, 0x73, 0x0, 0x0, 0x19, 0xd6, 0x0, - 0x0, 0x19, 0xd6, 0x1, 0x18, 0xd1, 0xca, 0xed, 0x0, 0x0, 0x0, 0x7, - 0x74, 0x49, 0x4d, 0x45, 0x7, 0xe1, 0x4, 0x2, 0x12, 0x27, 0x25, 0xc0, - 0x26, 0x1d, 0xf0, 0x0, 0x0, 0x12, 0x53, 0x49, 0x44, 0x41, 0x54, 0x78, - 0xda, 0xed, 0x9d, 0x3d, 0x9a, 0xe4, 0xaa, 0xe, 0x86, 0xb5, 0x41, 0xf6, - 0xc1, 0x22, 0x58, 0x2, 0x2b, 0xf0, 0x6, 0x9c, 0x3b, 0x27, 0x76, 0x4a, - 0xea, 0x90, 0xd0, 0x19, 0x3b, 0xf0, 0x1, 0x5c, 0x75, 0xee, 0x3d, 0xa5, - 0x4f, 0x65, 0xe8, 0xb2, 0x87, 0x9e, 0x6e, 0xeb, 0x99, 0xe9, 0xc0, 0xe5, - 0xc2, 0xf2, 0x5b, 0xfc, 0x4a, 0x42, 0xd0, 0xf6, 0xcb, 0x85, 0x7a, 0x2b, - 0xd0, 0x5b, 0x6e, 0x0, 0x7f, 0xe2, 0x21, 0xd1, 0xc5, 0xab, 0x9f, 0x50, - 0x7d, 0xb1, 0x5, 0x80, 0xb7, 0x13, 0xba, 0x6c, 0xed, 0x36, 0x59, 0xdf, - 0xa2, 0x5e, 0xa0, 0x95, 0x5f, 0x1c, 0xd5, 0x50, 0x9e, 0xc1, 0xef, 0x9e, - 0x86, 0xb9, 0x45, 0x9f, 0x52, 0x16, 0x78, 0x80, 0x41, 0x17, 0x9b, 0x0, - 0x38, 0xb2, 0xf0, 0x2b, 0xb4, 0xd, 0x4, 0x54, 0xf4, 0x76, 0xdd, 0x6, - 0xa0, 0xa2, 0x1f, 0x34, 0x71, 0x60, 0x4e, 0x39, 0x35, 0x6e, 0x51, 0xb9, - 0xd7, 0xf, 0x16, 0x4a, 0x62, 0xd0, 0x83, 0x67, 0xac, 0x4f, 0x56, 0x14, - 0xdd, 0xef, 0x49, 0x5f, 0x6, 0xc0, 0x51, 0x40, 0xb7, 0xa7, 0xcf, 0x6, - 0x76, 0x79, 0xcc, 0x2f, 0xc4, 0x4b, 0x4a, 0xf5, 0x28, 0xff, 0xe3, 0x3a, - 0xea, 0x54, 0x5d, 0xc, 0x2a, 0x3f, 0x55, 0x24, 0xc, 0x20, 0x8, 0x6f, - 0x3a, 0x1, 0x6d, 0x9a, 0x0, 0x78, 0x1, 0x80, 0x81, 0x0, 0xc2, 0x40, - 0x21, 0xd0, 0xf8, 0xfa, 0x41, 0x24, 0x5a, 0xd3, 0x9b, 0xb2, 0xf6, 0x38, - 0xea, 0xa8, 0x87, 0x19, 0x94, 0x93, 0xf8, 0x26, 0x0, 0xa8, 0xf6, 0x6, - 0xc2, 0x4d, 0xc0, 0x42, 0x5c, 0x85, 0xa5, 0xf0, 0x41, 0x25, 0x0, 0x81, - 0xb8, 0xf7, 0x5b, 0xe0, 0xbd, 0x5a, 0xa0, 0x87, 0xf0, 0xeb, 0xab, 0x6, - 0x8a, 0xaf, 0x8a, 0xd4, 0xa2, 0xc0, 0x7, 0x3, 0x4d, 0x13, 0x7e, 0x70, - 0x74, 0xf0, 0x7d, 0x56, 0xdc, 0x60, 0xb6, 0xdc, 0x66, 0xc6, 0x2b, 0x0, - 0x48, 0x77, 0x1b, 0x13, 0x66, 0x9a, 0x99, 0x8e, 0x3a, 0x41, 0x81, 0x7a, - 0x4, 0xd4, 0x0, 0xd2, 0x6b, 0x2a, 0xaa, 0xd0, 0xfb, 0xff, 0xc4, 0x91, - 0x13, 0x3e, 0x89, 0xa4, 0x3e, 0x4, 0xd0, 0xa4, 0x48, 0xc2, 0xe5, 0x41, - 0x9d, 0x8b, 0x36, 0x11, 0x50, 0x68, 0xd4, 0x98, 0x61, 0xd, 0x4d, 0x7d, - 0x86, 0x5a, 0x57, 0xb1, 0xc3, 0xe7, 0x62, 0xe5, 0x8a, 0x4e, 0xc7, 0xa3, - 0xfc, 0x7b, 0x0, 0xee, 0xf0, 0xfb, 0xff, 0xca, 0x1a, 0x68, 0x8, 0x23, - 0xcd, 0x60, 0xf0, 0x4d, 0xdd, 0x31, 0x21, 0x32, 0x6a, 0x72, 0x4a, 0x2f, - 0xec, 0x66, 0x9b, 0x3a, 0xf5, 0x85, 0x4e, 0x1, 0x60, 0x3f, 0x3, 0xb0, - 0xb6, 0x8c, 0xf6, 0xf6, 0xd1, 0x5, 0x0, 0x66, 0x69, 0x78, 0x30, 0xe0, - 0xfa, 0xa0, 0x13, 0x61, 0xab, 0x58, 0x39, 0x4b, 0x19, 0x38, 0xea, 0x1f, - 0xfd, 0x6, 0x80, 0xfa, 0xc, 0xc0, 0xe6, 0x1b, 0x26, 0x70, 0xeb, 0x4c, - 0x53, 0x48, 0xc3, 0x17, 0xfb, 0x4a, 0xdc, 0x46, 0x93, 0x0, 0xb0, 0x89, - 0xc3, 0x42, 0x8b, 0xa3, 0x32, 0x76, 0xbe, 0xbc, 0x8e, 0xcf, 0xa3, 0xc0, - 0x71, 0xe3, 0xfd, 0x57, 0xe4, 0x3e, 0x60, 0xfb, 0xb0, 0xf, 0x98, 0xab, - 0x66, 0x12, 0x4f, 0x9, 0xe9, 0x87, 0xb0, 0x60, 0x5e, 0x47, 0x5a, 0x29, - 0x5, 0x3a, 0xea, 0x34, 0x11, 0xf4, 0xb4, 0x8c, 0xaf, 0x2a, 0xce, 0x94, - 0x5a, 0x86, 0x6e, 0xa9, 0x1, 0x8b, 0x38, 0xa, 0xf8, 0xf, 0x47, 0x81, - 0x59, 0x2c, 0x19, 0x49, 0x9e, 0x1b, 0x28, 0xe, 0x60, 0xcd, 0x6d, 0x3, - 0x8c, 0x83, 0x43, 0x7e, 0x73, 0x3, 0x5e, 0x74, 0xca, 0xf7, 0x27, 0xc, - 0x35, 0xf3, 0xd8, 0x5d, 0xf4, 0x55, 0xf3, 0x80, 0xad, 0x5e, 0x87, 0xf7, - 0xcf, 0x98, 0xc5, 0x8f, 0xe0, 0x13, 0x42, 0xe3, 0x73, 0x17, 0xa1, 0xa6, - 0xce, 0x35, 0xc3, 0xf8, 0x1f, 0x58, 0xd, 0x86, 0x8a, 0xdf, 0xe1, 0x33, - 0x19, 0xe1, 0x9c, 0x37, 0x54, 0x75, 0x24, 0x3f, 0xc3, 0x1e, 0x0, 0xd7, - 0xe, 0xf6, 0xe3, 0xd5, 0xe0, 0x5f, 0x24, 0x78, 0x8e, 0x5c, 0xf3, 0xcd, - 0x1f, 0x2, 0xe0, 0xeb, 0x72, 0x3, 0xe8, 0xad, 0x40, 0x6f, 0xb9, 0x1, - 0xf4, 0x56, 0xa0, 0xb7, 0xdc, 0x0, 0x7a, 0x2b, 0xd0, 0x5b, 0x6e, 0x0, - 0x5b, 0xe3, 0xba, 0xff, 0x5c, 0x99, 0xec, 0xd5, 0x2e, 0x93, 0x63, 0x0, - 0x31, 0x6c, 0x69, 0x41, 0xdd, 0x7, 0x41, 0x44, 0xcb, 0x98, 0x25, 0x2d, - 0x86, 0x7, 0xc4, 0xc5, 0x61, 0xfb, 0xc6, 0xa8, 0x48, 0x81, 0x65, 0xaf, - 0x4f, 0xc5, 0xa8, 0x63, 0xbb, 0x52, 0x76, 0x72, 0x4c, 0x34, 0xa9, 0x6, - 0x3, 0xc4, 0x89, 0x32, 0x81, 0x65, 0x7f, 0x5a, 0x9, 0x5b, 0xd, 0xc0, - 0xe4, 0x17, 0x42, 0x0, 0x2c, 0x69, 0x8b, 0xcc, 0xa8, 0x4e, 0x5b, 0xab, - 0x8e, 0xd, 0x2, 0xb4, 0x97, 0x3c, 0x22, 0xe2, 0x82, 0x19, 0xfa, 0x44, - 0x41, 0xdc, 0x55, 0xf6, 0x9, 0x58, 0xbe, 0x84, 0x36, 0xca, 0x41, 0x0, - 0xeb, 0x9c, 0xa1, 0xe1, 0xbe, 0x6c, 0x39, 0x5e, 0x10, 0xd2, 0x16, 0x8a, - 0xc5, 0x2, 0x35, 0x81, 0x26, 0xa3, 0xe8, 0x57, 0xc4, 0x3, 0xd3, 0xe7, - 0x52, 0x16, 0xf1, 0x86, 0x2f, 0xe5, 0x43, 0x94, 0x8d, 0xbc, 0x41, 0x4, - 0x70, 0x68, 0x11, 0xa0, 0xd4, 0xb2, 0x2, 0x79, 0x68, 0xa1, 0xbf, 0x1c, - 0x80, 0x26, 0x5e, 0xf1, 0xb2, 0x85, 0x2f, 0x28, 0x82, 0x36, 0xe, 0x11, - 0x80, 0x47, 0xb6, 0xab, 0xe0, 0x9c, 0x52, 0x87, 0x75, 0xb8, 0x14, 0x99, - 0x9e, 0xc9, 0x35, 0x9, 0x61, 0xa6, 0x31, 0x34, 0x58, 0x67, 0x5c, 0x96, - 0x96, 0x4e, 0x3d, 0x20, 0x3b, 0x46, 0x2, 0x30, 0x91, 0x50, 0xdb, 0x25, - 0x0, 0x51, 0xd1, 0x82, 0x4a, 0x22, 0x32, 0x55, 0x0, 0x60, 0x5b, 0x7f, - 0xba, 0xba, 0xea, 0x9d, 0x43, 0xe5, 0xf6, 0x96, 0x5e, 0x63, 0xc0, 0x2e, - 0xd6, 0xfc, 0xcc, 0xd0, 0x54, 0x3, 0xc, 0xec, 0xeb, 0x62, 0x8, 0xa9, - 0xb0, 0xa3, 0x5f, 0x44, 0x9e, 0x8, 0x5d, 0x5e, 0x3, 0xe0, 0x18, 0x98, - 0xfb, 0xb3, 0x59, 0x6a, 0xbc, 0x2, 0x0, 0x23, 0xf7, 0xf5, 0xf6, 0xb0, - 0x15, 0x7f, 0xc5, 0x33, 0x34, 0xb5, 0xb9, 0xcc, 0xd2, 0xfd, 0x6, 0x5f, - 0x46, 0x3d, 0xef, 0xee, 0xcf, 0xb3, 0xd0, 0x90, 0x8a, 0x1, 0x98, 0x37, - 0x5e, 0x24, 0x7d, 0x68, 0x5e, 0xff, 0xa, 0x80, 0x34, 0x6c, 0x34, 0xd9, - 0x6d, 0x85, 0x96, 0x21, 0xcc, 0x3d, 0x6, 0xd2, 0x6e, 0x0, 0xc8, 0x26, - 0x9b, 0x9e, 0x6b, 0xf9, 0xa4, 0xd5, 0x8, 0x1e, 0xa9, 0xc9, 0xb9, 0x49, - 0xd7, 0xc, 0x83, 0xb2, 0x48, 0xf3, 0x80, 0xb5, 0xad, 0xa9, 0xa7, 0x9f, - 0x1a, 0xd5, 0x75, 0x2f, 0xfd, 0x70, 0xd9, 0x31, 0x6, 0x66, 0xc8, 0x56, - 0x78, 0x51, 0xc9, 0x25, 0x57, 0xee, 0x1f, 0xf, 0x9b, 0xe4, 0x97, 0x16, - 0x43, 0x2d, 0x8e, 0xab, 0x42, 0xc, 0x5d, 0xd4, 0x72, 0xff, 0x74, 0xce, - 0xfc, 0x2b, 0x86, 0x9a, 0xe, 0xa9, 0x1d, 0x40, 0x74, 0xb6, 0xc1, 0x6f, - 0x25, 0x17, 0xd3, 0xe0, 0x0, 0xbf, 0x52, 0xda, 0x1, 0x4, 0x3d, 0x5c, - 0x3d, 0x43, 0xfe, 0xde, 0x0, 0x7e, 0x98, 0xdc, 0x0, 0x7a, 0x2b, 0xd0, - 0x5b, 0x6e, 0x0, 0xbd, 0x15, 0xe8, 0x2d, 0x37, 0x80, 0xde, 0xa, 0xf4, - 0x96, 0x1b, 0x40, 0x6f, 0x5, 0x7a, 0xcb, 0xd, 0x20, 0xff, 0x49, 0x2b, - 0x4d, 0xbe, 0x5e, 0xf1, 0x36, 0xb, 0x9a, 0xb0, 0x87, 0x11, 0x5c, 0x5f, - 0xed, 0x2e, 0x7c, 0x99, 0xe0, 0x54, 0x5a, 0xdd, 0x81, 0xf5, 0xd0, 0x84, - 0xed, 0xf9, 0x1d, 0x0, 0x4, 0xb8, 0x60, 0x77, 0x92, 0x45, 0x6c, 0x84, - 0xd7, 0x83, 0xb4, 0x2c, 0x4d, 0x8b, 0x61, 0x37, 0x82, 0xf5, 0x63, 0xb6, - 0xe7, 0xab, 0xa6, 0x70, 0xec, 0xcb, 0x0, 0x68, 0x1a, 0x20, 0x0, 0x6c, - 0xe, 0xf1, 0x6f, 0x2c, 0x8d, 0x11, 0xd8, 0xe0, 0x8a, 0x3b, 0x87, 0x87, - 0xb3, 0xae, 0x99, 0x49, 0xc4, 0xa6, 0x15, 0xc9, 0x1f, 0x21, 0xfa, 0x29, - 0xe6, 0x86, 0xa8, 0x42, 0xe, 0x20, 0xbd, 0xa9, 0x6b, 0x0, 0x60, 0x90, - 0x5, 0xf6, 0x21, 0x23, 0x30, 0x96, 0x95, 0x28, 0x59, 0xc5, 0xc0, 0xec, - 0xdb, 0x51, 0xe0, 0xca, 0x7a, 0x10, 0x4c, 0x99, 0xd2, 0xf5, 0xf4, 0xd8, - 0x63, 0xf3, 0xb7, 0xc, 0x20, 0x2a, 0xbd, 0x61, 0x0, 0xda, 0x8e, 0x40, - 0x3d, 0xa2, 0xd9, 0x5a, 0x6c, 0x69, 0x41, 0x15, 0x20, 0xef, 0x1, 0xb2, - 0xc0, 0x34, 0xb7, 0x47, 0x37, 0xa2, 0x20, 0xea, 0xfc, 0xa2, 0x50, 0x57, - 0xe9, 0xba, 0x25, 0x3, 0x2a, 0xc0, 0xa3, 0x49, 0x1e, 0x91, 0xa1, 0x52, - 0x3b, 0x9d, 0xd8, 0x7, 0xb0, 0x5f, 0xf4, 0xd1, 0xd6, 0x15, 0x22, 0x30, - 0xc2, 0x26, 0x9d, 0xb, 0xd2, 0xfc, 0xf6, 0xd4, 0x5, 0xa6, 0x3e, 0x0, - 0x56, 0xb3, 0x59, 0xd0, 0x1a, 0x5e, 0x5f, 0xd, 0xee, 0x48, 0x1e, 0x9d, - 0xf2, 0x51, 0xdb, 0xa0, 0x25, 0xbf, 0xa3, 0x13, 0x40, 0x79, 0xde, 0x46, - 0x3, 0xed, 0xbe, 0x3b, 0x34, 0x3c, 0x28, 0x54, 0x8c, 0x27, 0x3d, 0x23, - 0xe3, 0x64, 0x1c, 0xb5, 0x1a, 0x8e, 0xad, 0xb6, 0x87, 0xa2, 0x9b, 0x42, - 0xba, 0x39, 0x80, 0x67, 0x9c, 0xbf, 0x64, 0x72, 0x7, 0x9b, 0xa0, 0x36, - 0x61, 0x43, 0x19, 0xde, 0x65, 0x56, 0x9a, 0xbf, 0x11, 0xe2, 0x85, 0x75, - 0x9b, 0x7d, 0x19, 0x49, 0x34, 0xd8, 0xea, 0x5e, 0x5b, 0x3, 0xa6, 0x7c, - 0x97, 0x22, 0x83, 0xc7, 0x23, 0xc5, 0x15, 0x2c, 0x6e, 0xa8, 0x11, 0xd5, - 0x0, 0x58, 0x1, 0x76, 0xbf, 0xe5, 0x84, 0x7b, 0x54, 0xbc, 0x3b, 0x2a, - 0x58, 0xdc, 0xfd, 0x3a, 0x21, 0x7a, 0x7d, 0x80, 0xa1, 0xe5, 0xd5, 0x7d, - 0x40, 0xa1, 0x5, 0xee, 0x9b, 0x26, 0x37, 0x2a, 0xe0, 0xbd, 0x73, 0xa4, - 0xa6, 0x91, 0xa0, 0x5b, 0x13, 0x42, 0x4c, 0x65, 0xb8, 0x89, 0x8f, 0x2, - 0x79, 0xf6, 0xa5, 0x70, 0x50, 0xbc, 0xe4, 0x77, 0x18, 0xa4, 0xd7, 0x99, - 0xf0, 0x9e, 0xa4, 0x2a, 0x91, 0x1, 0x94, 0xbd, 0x4e, 0xe8, 0xa7, 0x28, - 0x1, 0xfd, 0x40, 0x13, 0x85, 0xd5, 0x5b, 0xb3, 0xe7, 0x42, 0xf3, 0xa1, - 0x33, 0x95, 0x6f, 0x26, 0x38, 0x98, 0x8, 0x9e, 0xa4, 0xbc, 0xd3, 0x4e, - 0xf8, 0x3d, 0xfd, 0x47, 0xf3, 0x0, 0x51, 0x44, 0xbb, 0x7a, 0x95, 0xc1, - 0xfd, 0x83, 0xfb, 0xa5, 0xb7, 0x31, 0x87, 0xae, 0xce, 0x73, 0x1, 0x7c, - 0x2f, 0x89, 0x6e, 0x68, 0xd8, 0x4a, 0xf6, 0x3, 0x1, 0x4, 0x35, 0x2c, - 0x9f, 0x97, 0xf2, 0x17, 0x3, 0xb8, 0x48, 0x6e, 0x0, 0xbd, 0x15, 0xe8, - 0x2d, 0x37, 0x80, 0xde, 0xa, 0xf4, 0x96, 0x1b, 0x40, 0x6f, 0x5, 0x7a, - 0xcb, 0xd, 0xa0, 0xb7, 0x2, 0xbd, 0xe5, 0xd, 0x80, 0xc9, 0x4e, 0x78, - 0xea, 0xe5, 0xd, 0xfd, 0x9c, 0x20, 0x91, 0x37, 0x0, 0xac, 0x10, 0x27, - 0x3a, 0x92, 0x75, 0xd0, 0x90, 0x31, 0x40, 0xf3, 0x43, 0x31, 0x4b, 0x40, - 0x1b, 0xe2, 0xa8, 0x89, 0x5b, 0xf3, 0x8a, 0x7f, 0x61, 0x0, 0xab, 0xdb, - 0xdd, 0x4f, 0x61, 0xab, 0xaf, 0x6f, 0x6b, 0x5a, 0xcd, 0x93, 0x39, 0x9a, - 0x3e, 0xbf, 0x1, 0xb0, 0x6, 0x8f, 0xe2, 0xed, 0x8b, 0xd, 0x6d, 0x53, - 0xdc, 0x50, 0x10, 0x71, 0xfe, 0x88, 0x1c, 0xdc, 0xa7, 0x50, 0x5c, 0x59, - 0x5a, 0x26, 0x5b, 0x6e, 0x71, 0xa, 0xbb, 0xa9, 0x10, 0xd9, 0x21, 0xb0, - 0xe1, 0x4a, 0xba, 0xbe, 0xaa, 0x52, 0x7e, 0x45, 0xa4, 0xa8, 0x91, 0x9d, - 0x13, 0xb, 0x28, 0x58, 0x17, 0x13, 0xdc, 0xc8, 0x3f, 0x98, 0x9, 0x1a, - 0xa7, 0x4a, 0x11, 0x60, 0x25, 0x3f, 0x92, 0x41, 0xd5, 0xa2, 0xa4, 0xae, - 0x9, 0x8a, 0xdb, 0xa, 0x25, 0x33, 0xbd, 0x74, 0x5d, 0xef, 0x3f, 0xde, - 0xa1, 0x49, 0x2c, 0xff, 0x12, 0x46, 0x5a, 0x66, 0x3, 0x0, 0x2b, 0xcd, - 0x8b, 0xb5, 0x66, 0xe2, 0x6f, 0x64, 0x9, 0x86, 0xed, 0xd3, 0xee, 0x7b, - 0x59, 0xf9, 0x75, 0x58, 0x3b, 0xf7, 0xdc, 0x3d, 0x20, 0x9, 0x54, 0x23, - 0x80, 0x8a, 0xbd, 0x12, 0x4f, 0x0, 0xd9, 0xaf, 0x0, 0x39, 0x39, 0xa7, - 0x79, 0x13, 0x70, 0x94, 0x93, 0x62, 0xd0, 0xc2, 0x1, 0xa4, 0x27, 0x22, - 0x3f, 0x7, 0x51, 0x58, 0x6, 0x68, 0x5e, 0x87, 0xa, 0xed, 0x0, 0x40, - 0x4e, 0x4, 0x97, 0xba, 0x1e, 0xe7, 0x80, 0xeb, 0x31, 0x87, 0x74, 0xf3, - 0x98, 0x6e, 0x97, 0x11, 0xa6, 0xf, 0xaa, 0xa2, 0xc5, 0x67, 0x9c, 0xb2, - 0x23, 0xb5, 0x2c, 0x6e, 0x81, 0xb0, 0x6a, 0xa6, 0xc5, 0x2a, 0x9e, 0x15, - 0x21, 0xf7, 0xd, 0x33, 0x68, 0xbb, 0x82, 0xcb, 0xf0, 0x3d, 0x0, 0xf0, - 0xa9, 0xe4, 0xab, 0x14, 0xae, 0x97, 0x8d, 0x17, 0xb8, 0x57, 0xe2, 0x0, - 0xb2, 0xbf, 0x13, 0xd4, 0x1, 0x8d, 0x54, 0x34, 0x76, 0xa2, 0x4d, 0x5b, - 0x9e, 0x32, 0x69, 0x4c, 0x10, 0x57, 0x50, 0xef, 0x52, 0xd, 0xc8, 0xbd, - 0xe9, 0xab, 0x59, 0xfc, 0xa8, 0x6, 0xb0, 0xde, 0x44, 0xf8, 0xa5, 0xa5, - 0x9a, 0xe1, 0xd2, 0x8f, 0x97, 0x83, 0x5a, 0xab, 0x0, 0x38, 0x6c, 0x55, - 0x9d, 0x60, 0xcc, 0xbe, 0xb5, 0xb4, 0xe5, 0x64, 0x47, 0xaf, 0x75, 0x2b, - 0x9b, 0xd6, 0x2d, 0x68, 0xd8, 0x82, 0x1f, 0x41, 0xf0, 0x8b, 0x9e, 0xd6, - 0x7, 0xec, 0x19, 0x60, 0x5c, 0x15, 0x0, 0xa9, 0xf, 0x58, 0x60, 0xbb, - 0xb0, 0x3, 0xad, 0xe9, 0xcf, 0xeb, 0x4f, 0x9d, 0x7e, 0xfc, 0x34, 0x1a, - 0x6b, 0xde, 0x68, 0x68, 0xf7, 0xe, 0xb3, 0x4e, 0x40, 0x63, 0x2b, 0xfa, - 0x73, 0x14, 0x60, 0x5d, 0x4c, 0x23, 0x80, 0x58, 0x9a, 0x75, 0xd, 0x0, - 0xc9, 0xb3, 0x92, 0xa3, 0xe2, 0x1, 0x1, 0x63, 0x53, 0x8f, 0x1, 0x7c, - 0x7a, 0xbb, 0xeb, 0x3, 0x24, 0x31, 0xcc, 0xf3, 0x0, 0x94, 0x4a, 0x2b, - 0x8d, 0x30, 0x9, 0x19, 0x9c, 0x7, 0x18, 0xb8, 0xf, 0x90, 0x34, 0x9c, - 0xf0, 0x38, 0x71, 0x5b, 0x47, 0xaa, 0x92, 0xba, 0x6a, 0x1e, 0x20, 0x84, - 0x69, 0x44, 0x85, 0x53, 0x93, 0x6c, 0xf3, 0xbc, 0x3a, 0xbe, 0xad, 0x6f, - 0xaf, 0xd1, 0xbc, 0x62, 0x17, 0x57, 0x2a, 0x9a, 0x3a, 0x87, 0xe2, 0x30, - 0x0, 0xbe, 0x47, 0x22, 0xb4, 0x97, 0x57, 0x9e, 0x8, 0x9, 0xef, 0x98, - 0x23, 0x53, 0x48, 0x7d, 0x30, 0x13, 0xc4, 0x59, 0x49, 0x67, 0x3a, 0xd1, - 0x36, 0x7b, 0xf1, 0x8a, 0x62, 0xad, 0x70, 0x48, 0x34, 0xaf, 0x6, 0x63, - 0xd9, 0x8b, 0xe7, 0x4f, 0xca, 0xb1, 0xd4, 0x5f, 0xda, 0x97, 0xc3, 0xbe, - 0xd4, 0xc4, 0x5f, 0xc, 0x60, 0x8b, 0xb3, 0x6b, 0x49, 0x33, 0xf7, 0xcd, - 0xe5, 0x36, 0x88, 0xf4, 0x56, 0xa0, 0xb7, 0xdc, 0x0, 0x7a, 0x2b, 0xd0, - 0x5b, 0x6e, 0x0, 0xbd, 0x15, 0xe8, 0x2d, 0x37, 0x80, 0xde, 0xa, 0xf4, - 0x96, 0x1b, 0xc0, 0x9e, 0xc4, 0xda, 0xf3, 0xf5, 0xd7, 0xf4, 0xd6, 0xe, - 0xcf, 0x97, 0x6b, 0xc5, 0x29, 0x30, 0xf0, 0xf, 0xa4, 0x2c, 0xd9, 0xd6, - 0x86, 0xfc, 0xc7, 0xb3, 0xdb, 0xf3, 0x25, 0xf4, 0xa5, 0x39, 0xe7, 0x17, - 0x5a, 0x41, 0x39, 0x49, 0x60, 0xc0, 0x2d, 0xbe, 0xff, 0x15, 0xc0, 0x6e, - 0x81, 0x1, 0x6b, 0xca, 0x29, 0x2d, 0xcb, 0x95, 0x0, 0x0, 0x2d, 0xb3, - 0xa9, 0xc4, 0x1c, 0xf3, 0xb0, 0xd5, 0x20, 0x19, 0x3e, 0xd2, 0x9a, 0xdf, - 0x73, 0xbb, 0x42, 0x28, 0xf9, 0x53, 0xc0, 0x97, 0xd2, 0xfa, 0x3e, 0xfb, - 0x17, 0xd8, 0x24, 0x3c, 0x2d, 0xfb, 0xd, 0xca, 0xb9, 0x92, 0x96, 0xcf, - 0x46, 0xe1, 0x98, 0xe6, 0x3a, 0x0, 0xef, 0xb2, 0xcb, 0x3b, 0xc, 0x60, - 0x45, 0x8b, 0x24, 0x11, 0x80, 0x56, 0xd9, 0x37, 0x4, 0x0, 0x90, 0x7, - 0x5f, 0xda, 0x4d, 0x68, 0x6, 0x59, 0x9c, 0xc2, 0x16, 0x35, 0xb3, 0x39, - 0x3e, 0xef, 0x3f, 0xda, 0x93, 0x72, 0x2a, 0x0, 0xd3, 0x50, 0x4a, 0xa0, - 0x91, 0x82, 0x9a, 0x0, 0x80, 0x9c, 0x86, 0x9a, 0x7f, 0x69, 0x37, 0x38, - 0x43, 0x8b, 0x53, 0x40, 0x36, 0x47, 0xf1, 0x7e, 0xe, 0x40, 0x3b, 0x87, - 0xad, 0xa7, 0xad, 0x0, 0x2c, 0x8e, 0xfc, 0x95, 0x0, 0x2c, 0xe9, 0xb, - 0x2b, 0xfb, 0x30, 0x64, 0xab, 0x6b, 0xe0, 0x5f, 0x1a, 0xcb, 0x23, 0x81, - 0x2d, 0xb9, 0x0, 0xe0, 0xb1, 0xcb, 0xe2, 0xfd, 0x1c, 0x80, 0x98, 0x15, - 0xbe, 0x15, 0x0, 0xf6, 0xf5, 0x88, 0x0, 0x52, 0x85, 0xd1, 0x1b, 0x2, - 0xe0, 0xc9, 0xf2, 0x2f, 0x59, 0x19, 0xc0, 0x9c, 0xd3, 0xe5, 0x84, 0xda, - 0xfb, 0x39, 0x0, 0x13, 0x42, 0x18, 0xcf, 0x0, 0x30, 0x40, 0x6f, 0x94, - 0x50, 0x8a, 0xa3, 0x9c, 0xa6, 0x7, 0x2, 0xc8, 0xb9, 0x5f, 0xd8, 0xf5, - 0x41, 0x6, 0x40, 0x28, 0x1b, 0x7f, 0x3, 0x80, 0xf3, 0xfa, 0x0, 0x8b, - 0x52, 0x43, 0xc9, 0x0, 0xd6, 0x34, 0x10, 0x42, 0x0, 0x33, 0x71, 0x9b, - 0x79, 0x71, 0x75, 0x21, 0x97, 0x59, 0x1a, 0x4d, 0x90, 0x81, 0xe6, 0x79, - 0xff, 0x51, 0x7e, 0xf8, 0xaf, 0x1, 0x40, 0x69, 0x7e, 0xf6, 0x51, 0x60, - 0xa9, 0x2d, 0xe5, 0xb1, 0x49, 0x5, 0x2, 0xd8, 0x14, 0xf7, 0x75, 0x2d, - 0x65, 0x44, 0xb3, 0x78, 0x14, 0x0, 0xf2, 0xbc, 0xff, 0xd0, 0x2c, 0xde, - 0x3c, 0xf, 0x70, 0x26, 0x75, 0x99, 0x20, 0x6c, 0x7b, 0x9f, 0x7, 0xf0, - 0x46, 0x10, 0x8a, 0xc7, 0x84, 0x85, 0x4e, 0x3c, 0x0, 0x30, 0xf7, 0x5b, - 0xd1, 0xc7, 0xa1, 0x83, 0x89, 0x8a, 0xc3, 0x0, 0xba, 0xde, 0xe0, 0x9b, - 0x19, 0xe1, 0xfe, 0x6a, 0x0, 0x56, 0xb0, 0xc3, 0x7b, 0x1c, 0xfe, 0xbf, - 0x2b, 0xa2, 0x79, 0x23, 0x8, 0x78, 0xe7, 0xc6, 0xc3, 0xb7, 0x66, 0x21, - 0x80, 0x88, 0xbc, 0xa0, 0x25, 0x62, 0x85, 0xcf, 0x33, 0xc4, 0x4d, 0x21, - 0xc2, 0xfd, 0xaf, 0x5f, 0x3f, 0xba, 0x1, 0x48, 0x6b, 0xf8, 0xff, 0x69, - 0xd2, 0xf8, 0xe0, 0xf0, 0xe9, 0x49, 0x53, 0x7f, 0xbb, 0xa4, 0x7a, 0x34, - 0x8c, 0x87, 0x13, 0xa1, 0xde, 0x5a, 0x5e, 0x29, 0x5e, 0xc1, 0xa4, 0x5c, - 0xbf, 0x7, 0x40, 0xcd, 0x91, 0x83, 0x3f, 0x1c, 0xc0, 0xb1, 0xdc, 0x0, - 0x7a, 0x2b, 0xd0, 0x5b, 0x6e, 0x0, 0xbd, 0x15, 0xe8, 0x2d, 0x37, 0x80, - 0xde, 0xa, 0xf4, 0x96, 0x1b, 0x40, 0x6f, 0x5, 0xae, 0x13, 0x27, 0x66, - 0x45, 0xf8, 0x2f, 0x0, 0xd1, 0xae, 0xee, 0x60, 0x82, 0xfe, 0x67, 0xbe, - 0xa0, 0x89, 0x5d, 0xdf, 0xfd, 0xb, 0xcc, 0x36, 0x67, 0xcb, 0xca, 0xd1, - 0xbe, 0x4e, 0x49, 0x1f, 0x51, 0x98, 0x2c, 0x18, 0x73, 0xb1, 0x79, 0x5, - 0xe3, 0x98, 0x46, 0xce, 0x66, 0x13, 0x44, 0xe4, 0xeb, 0x73, 0x39, 0x7f, - 0x51, 0xe, 0x21, 0xad, 0x0, 0x50, 0x72, 0x9c, 0x80, 0xd5, 0xe7, 0x54, - 0x2, 0xfc, 0xd8, 0xf5, 0x35, 0x7b, 0x5, 0x14, 0x7, 0xf0, 0x5c, 0x56, - 0x73, 0x63, 0x66, 0x7e, 0x21, 0x1e, 0x43, 0x3b, 0x8, 0xcb, 0xe1, 0x2d, - 0x47, 0xca, 0x47, 0x42, 0xf1, 0x83, 0x1b, 0x4c, 0x53, 0x23, 0xda, 0x34, - 0x8f, 0x83, 0x24, 0x9f, 0x0, 0x4a, 0x4c, 0x24, 0x70, 0x38, 0x48, 0xf1, - 0x70, 0x30, 0x53, 0x82, 0x4, 0x60, 0xf, 0x5b, 0x77, 0x4c, 0xf1, 0x87, - 0x41, 0x84, 0x3, 0xc8, 0xc7, 0x3c, 0xa2, 0x74, 0x3c, 0xd9, 0xb8, 0x23, - 0x1d, 0x23, 0x8b, 0x1c, 0x32, 0x4d, 0x0, 0x40, 0x7c, 0xe3, 0x46, 0xe2, - 0x31, 0x81, 0x4d, 0x0, 0xf6, 0xbd, 0x12, 0x3c, 0xf9, 0x50, 0x6, 0xe0, - 0xc2, 0x66, 0xf9, 0x1b, 0x69, 0x82, 0x39, 0xd1, 0x73, 0x15, 0x18, 0xf1, - 0x3b, 0xe1, 0x4c, 0xcf, 0xd, 0x0, 0xe2, 0x8, 0x8, 0xe6, 0xc, 0xf, - 0x18, 0x41, 0x1b, 0x80, 0xb2, 0xeb, 0x1f, 0x45, 0xbf, 0x87, 0x6c, 0xb0, - 0x0, 0x36, 0xb7, 0x45, 0x8, 0x72, 0xb7, 0x34, 0xb, 0x15, 0x0, 0x67, - 0x17, 0xaf, 0x7, 0x20, 0xa4, 0xa0, 0x16, 0xcf, 0xb, 0x6e, 0x3, 0x90, - 0xf, 0x3f, 0xf0, 0x28, 0xf8, 0x3b, 0xa4, 0x5e, 0x6, 0x1, 0xc8, 0x26, - 0x51, 0x7c, 0xf2, 0xb6, 0x10, 0xfd, 0xef, 0xb0, 0xfb, 0xa7, 0x1e, 0x80, - 0x13, 0x3c, 0x68, 0x71, 0xc2, 0xaa, 0xb4, 0x1, 0x48, 0xf, 0x88, 0x23, - 0xb7, 0xdb, 0x7b, 0xa, 0xda, 0x10, 0x4a, 0xa3, 0xef, 0xa5, 0xa3, 0xaa, - 0x2d, 0xae, 0x0, 0x52, 0xaa, 0xf3, 0x96, 0x3e, 0x40, 0xc9, 0xc7, 0x96, - 0xc2, 0x73, 0x84, 0xdf, 0x0, 0xe0, 0xf7, 0x5b, 0xf2, 0x20, 0x8f, 0x78, - 0x48, 0x15, 0xda, 0x13, 0xca, 0x3d, 0xa5, 0xc8, 0xe1, 0x57, 0x12, 0xd2, - 0xd4, 0x48, 0xe9, 0xf5, 0x5b, 0x0, 0x4c, 0x92, 0x7, 0x0, 0x66, 0x7a, - 0x82, 0x8a, 0xac, 0x8f, 0x61, 0x8a, 0x77, 0x1b, 0x78, 0x37, 0x59, 0xf1, - 0xe, 0xf, 0x60, 0x7f, 0x81, 0x2b, 0xa3, 0x0, 0xf2, 0x67, 0x60, 0x0, - 0x52, 0x76, 0xa1, 0x26, 0x0, 0x70, 0xdc, 0x35, 0x65, 0xc4, 0xaf, 0x56, - 0x44, 0x93, 0x81, 0x79, 0x3, 0xcb, 0x7e, 0x42, 0x8e, 0x45, 0x8a, 0xf, - 0x28, 0xaa, 0x44, 0xaa, 0x6, 0x9f, 0x6e, 0xd5, 0xd2, 0x44, 0xa8, 0x61, - 0x18, 0xe4, 0x55, 0x31, 0xef, 0x3b, 0x14, 0xec, 0xea, 0x18, 0xc0, 0x7e, - 0xc0, 0x30, 0xba, 0x5f, 0xe3, 0xb0, 0x81, 0x34, 0x32, 0x46, 0xe, 0x60, - 0xd7, 0x4, 0x92, 0x14, 0x9a, 0xde, 0xa7, 0x13, 0x21, 0x59, 0x42, 0x6b, - 0x38, 0x7f, 0x37, 0x87, 0x1, 0x94, 0xcf, 0x1, 0xfc, 0xe5, 0x52, 0xb6, - 0x99, 0xfd, 0x6e, 0x0, 0x75, 0xab, 0xc1, 0x1f, 0x2b, 0x31, 0x84, 0xdf, - 0x5d, 0x3, 0xea, 0xe4, 0x6, 0xd0, 0x5b, 0x81, 0xde, 0x72, 0x3, 0xe8, - 0xad, 0x40, 0x6f, 0xb9, 0x1, 0xf4, 0x56, 0xa0, 0xb7, 0xdc, 0x0, 0xb6, - 0x51, 0x8e, 0x85, 0x3b, 0xce, 0xbf, 0x50, 0x21, 0x53, 0xe3, 0x99, 0x5a, - 0xd3, 0x71, 0x60, 0xd3, 0x49, 0x5f, 0x7a, 0x0, 0x10, 0xd7, 0xc, 0xde, - 0x9, 0x36, 0xc8, 0xc5, 0x36, 0x71, 0x69, 0x3c, 0x9e, 0xd0, 0xb6, 0x1d, - 0x65, 0xf7, 0xc1, 0x97, 0x1e, 0x0, 0x36, 0x39, 0xa0, 0x5a, 0x38, 0x70, - 0x50, 0xab, 0xb6, 0xc7, 0x2d, 0xae, 0xe5, 0xe7, 0xf9, 0xf3, 0x0, 0x46, - 0x31, 0xbf, 0x37, 0x6, 0xe0, 0x68, 0xd5, 0x47, 0x1, 0xa8, 0x35, 0xe2, - 0x61, 0x52, 0x98, 0xfc, 0x2e, 0xde, 0x41, 0x73, 0x74, 0xc4, 0x5f, 0xc8, - 0x5, 0x69, 0x98, 0xd5, 0xdc, 0x55, 0x1c, 0x9c, 0x5c, 0xbc, 0x22, 0x52, - 0x2f, 0x0, 0x1, 0xc4, 0x7c, 0x50, 0xb7, 0xe8, 0x33, 0xa8, 0x17, 0x21, - 0x7b, 0x7d, 0x2, 0x90, 0x3b, 0x1f, 0x40, 0x78, 0x92, 0x33, 0x46, 0xc1, - 0x14, 0xda, 0x86, 0x24, 0xeb, 0xea, 0xb, 0x80, 0xf4, 0x48, 0xa1, 0x8a, - 0x42, 0x0, 0xc5, 0x95, 0x61, 0xf, 0xb7, 0xa2, 0x1c, 0x4a, 0x4e, 0x8, - 0x83, 0x3c, 0x52, 0x96, 0x94, 0xf, 0x7c, 0x7, 0x48, 0x76, 0x17, 0xb8, - 0x10, 0x78, 0x87, 0x5a, 0x72, 0x1d, 0x19, 0x94, 0xa9, 0x6a, 0xae, 0x49, - 0xde, 0x9e, 0x1, 0x78, 0x89, 0x13, 0x4, 0x50, 0xaa, 0xd5, 0x7a, 0xca, - 0xa9, 0xdc, 0x21, 0x18, 0x94, 0x90, 0xca, 0x3f, 0x63, 0xbd, 0xff, 0x23, - 0x42, 0x5a, 0xe5, 0xf5, 0x71, 0x48, 0x2b, 0xcf, 0xeb, 0x44, 0x69, 0x35, - 0x3c, 0xd4, 0xa5, 0xd1, 0xd1, 0xc2, 0x6c, 0xe0, 0xd2, 0xa3, 0xa7, 0xe3, - 0x80, 0xab, 0xae, 0xc5, 0x5b, 0x60, 0x36, 0x8d, 0xfb, 0xb9, 0xf0, 0x38, - 0xaa, 0x83, 0x9f, 0x61, 0x22, 0x6e, 0x4, 0xe1, 0x0, 0xa4, 0x91, 0xf0, - 0x52, 0x0, 0x39, 0x29, 0x21, 0xae, 0x1, 0x1, 0xd6, 0x0, 0x83, 0xfb, - 0x6a, 0x9, 0x40, 0x2c, 0x35, 0xa0, 0x32, 0x95, 0x96, 0x34, 0x12, 0x5e, - 0xa, 0xe0, 0x91, 0x64, 0xd, 0x3, 0x0, 0x1b, 0x12, 0x6, 0x6c, 0xff, - 0x2f, 0x4d, 0xc0, 0x83, 0x9a, 0xa4, 0xea, 0xd2, 0x7c, 0x3c, 0x53, 0x69, - 0x9, 0x74, 0x2f, 0x4, 0x90, 0xcf, 0x1d, 0x50, 0xb0, 0x9, 0x8c, 0xce, - 0xc2, 0xfd, 0x87, 0xd9, 0x1, 0x80, 0x9c, 0xc9, 0x76, 0x22, 0x98, 0x78, - 0x49, 0x4d, 0xce, 0x1d, 0xc6, 0x8b, 0xd3, 0x3, 0xa3, 0xb0, 0xb1, 0xe9, - 0x42, 0x0, 0xc5, 0x5, 0x8, 0xb2, 0xf2, 0x95, 0xd1, 0xe, 0x85, 0x38, - 0xa7, 0xa1, 0x1, 0x6d, 0x90, 0x5c, 0xd3, 0xe5, 0x9, 0x1d, 0x92, 0x32, - 0x95, 0x3c, 0x42, 0x75, 0x0, 0x84, 0x91, 0xf0, 0x52, 0x0, 0x72, 0x16, - 0xa1, 0x18, 0xda, 0xbe, 0x21, 0x9f, 0x83, 0x50, 0x31, 0x54, 0x3d, 0x0, - 0x2c, 0x96, 0xcf, 0x6c, 0xd6, 0x30, 0x37, 0x0, 0x8, 0x4f, 0xb9, 0x84, - 0xd5, 0x75, 0x72, 0x90, 0x54, 0xb5, 0x1e, 0xc0, 0xf3, 0xb0, 0x9a, 0x2f, - 0x4f, 0xca, 0xbf, 0x1f, 0x80, 0xb5, 0x62, 0x10, 0xf9, 0x9f, 0xb8, 0xa7, - 0x7c, 0x2b, 0xf7, 0xd8, 0x47, 0x0, 0x7e, 0x87, 0xdc, 0x0, 0x7a, 0x2b, - 0xd0, 0x5b, 0x6e, 0x0, 0xbd, 0x15, 0xe8, 0x2d, 0x37, 0x80, 0xde, 0xa, - 0xf4, 0x96, 0x1b, 0x40, 0xfe, 0xb3, 0x58, 0x65, 0xaa, 0x8d, 0xf7, 0xb2, - 0x9, 0x3e, 0x88, 0x9b, 0xf5, 0xd, 0x38, 0x13, 0x54, 0x2a, 0xc7, 0xe3, - 0x64, 0xf9, 0x57, 0x2, 0xc8, 0xa7, 0x82, 0xda, 0x8a, 0x7d, 0xc6, 0xbb, - 0xc8, 0x16, 0x68, 0x27, 0x45, 0xa4, 0x44, 0x14, 0x27, 0x27, 0x95, 0xe3, - 0x73, 0x56, 0xdd, 0x3f, 0xb, 0xc0, 0x36, 0x9d, 0x7b, 0xf9, 0xc6, 0x4, - 0xef, 0xa4, 0x0, 0xfb, 0xc5, 0xb5, 0x94, 0x73, 0x9c, 0xf7, 0xe2, 0x64, - 0x0, 0xc2, 0x2, 0x26, 0x96, 0xa9, 0x3d, 0x48, 0xce, 0x81, 0xed, 0xf6, - 0x21, 0xdf, 0xd, 0x8a, 0xf1, 0xc2, 0xa, 0xa1, 0x0, 0x98, 0x11, 0x33, - 0x8, 0x20, 0xb8, 0x98, 0x9e, 0x3a, 0x3b, 0x50, 0xfe, 0x26, 0xf8, 0x11, - 0x66, 0xe7, 0x8e, 0x53, 0x0, 0x53, 0x5a, 0xc7, 0xe6, 0x3c, 0x2c, 0x7c, - 0xd9, 0xb3, 0x2a, 0x82, 0x87, 0x6c, 0x58, 0x7c, 0x59, 0xc, 0xca, 0xb2, - 0xc2, 0x1a, 0x31, 0x3, 0xc0, 0x47, 0x2b, 0x42, 0x0, 0x8e, 0xf2, 0x89, - 0x14, 0xc0, 0xd0, 0x6f, 0xf3, 0x7, 0x40, 0x9f, 0xdd, 0x5f, 0x70, 0xec, - 0x17, 0x10, 0x23, 0x2d, 0xf3, 0x69, 0xd4, 0x2b, 0x48, 0x41, 0x90, 0xed, - 0xf6, 0xb, 0xb0, 0xe7, 0xc7, 0x30, 0x43, 0x0, 0x79, 0x51, 0x69, 0x30, - 0x0, 0x8f, 0x33, 0x5d, 0x9, 0x0, 0x6c, 0xde, 0x32, 0x1, 0x53, 0x6b, - 0x40, 0x7d, 0x34, 0x8d, 0x61, 0x51, 0x87, 0xad, 0x5b, 0xae, 0x1, 0x65, - 0x33, 0xb, 0x3c, 0x33, 0xdc, 0xb, 0xd, 0x58, 0x6e, 0xbb, 0xf8, 0x48, - 0xcf, 0x59, 0x48, 0xea, 0x2e, 0x0, 0x58, 0x2, 0x4d, 0x10, 0x0, 0xd4, - 0x27, 0x14, 0xeb, 0xd9, 0xb1, 0x63, 0x56, 0xee, 0x3, 0xd2, 0x77, 0xc3, - 0x4, 0x5d, 0x57, 0xe1, 0x24, 0x0, 0x24, 0x5a, 0xe3, 0x21, 0x80, 0x90, - 0x2d, 0x74, 0x8, 0x0, 0xd4, 0x67, 0x7e, 0x9c, 0x53, 0x70, 0x34, 0xa2, - 0xca, 0x0, 0x66, 0xe1, 0xf0, 0xf9, 0xf3, 0x0, 0xcc, 0xe2, 0x11, 0x3, - 0x27, 0x0, 0xd8, 0x53, 0x31, 0xcd, 0x1f, 0x0, 0x50, 0x1a, 0x5b, 0x1b, - 0xcf, 0x3, 0x10, 0x1c, 0x36, 0xda, 0x9e, 0x2, 0x60, 0x77, 0x3b, 0xda, - 0x43, 0x2f, 0xee, 0x1b, 0x0, 0x64, 0x47, 0x7, 0x3c, 0xfb, 0x12, 0x80, - 0x1c, 0x4f, 0x41, 0x82, 0x43, 0x5a, 0x0, 0x90, 0x7b, 0xf0, 0xad, 0xb2, - 0x9c, 0x56, 0x0, 0xe9, 0x92, 0x9e, 0x6c, 0x9d, 0x59, 0x5c, 0xda, 0xa0, - 0x42, 0x30, 0x3f, 0x9a, 0xfc, 0x40, 0xd9, 0x17, 0x27, 0x1, 0xd8, 0x14, - 0x1a, 0xd6, 0x60, 0x39, 0xcd, 0x0, 0x3e, 0xcd, 0x23, 0xb4, 0x96, 0x5e, - 0xf4, 0xb8, 0xd, 0x55, 0x89, 0xe9, 0x63, 0x2b, 0xae, 0xb1, 0xe9, 0x8a, - 0x0, 0xf6, 0x61, 0x64, 0x68, 0x8b, 0xef, 0x41, 0x32, 0x85, 0x30, 0x57, - 0x1e, 0x7a, 0xd4, 0x43, 0xe4, 0x59, 0xb7, 0x11, 0xce, 0xf5, 0x69, 0x7e, - 0x82, 0xb4, 0xfd, 0xf0, 0x7b, 0xc8, 0x9b, 0x65, 0x47, 0x9a, 0xdc, 0xcf, - 0x27, 0x9c, 0xa3, 0xb0, 0xe2, 0xc0, 0x9e, 0xef, 0x22, 0xb7, 0x41, 0xa4, - 0xb7, 0x2, 0xbd, 0xe5, 0x6, 0xd0, 0x5b, 0x81, 0xde, 0x72, 0x3, 0xe8, - 0xad, 0x40, 0x6f, 0xb9, 0x1, 0xf4, 0x56, 0xa0, 0xb7, 0xdc, 0x0, 0xae, - 0x7f, 0xc4, 0x6a, 0xfe, 0xa0, 0x9f, 0xe3, 0x3b, 0x2, 0x8, 0xe7, 0xac, - 0x28, 0x2f, 0x3, 0x20, 0xdb, 0xd5, 0x7d, 0x9a, 0xc5, 0xcf, 0x3c, 0xf7, - 0x85, 0x8b, 0xc1, 0xc1, 0x2d, 0x10, 0xb3, 0x3, 0xd7, 0x83, 0x1b, 0x4b, - 0xfe, 0x7a, 0x50, 0x7a, 0x7c, 0xfc, 0x79, 0xb9, 0x5c, 0x56, 0xce, 0xec, - 0xb, 0x8f, 0xb, 0xe1, 0xf5, 0xb, 0x6b, 0xf9, 0x80, 0x1f, 0x80, 0x28, - 0x95, 0xc3, 0x1, 0xec, 0x76, 0x75, 0x6e, 0x99, 0x91, 0xe2, 0xf0, 0x5d, - 0xf1, 0xb, 0xa8, 0x88, 0xef, 0x77, 0xfc, 0x76, 0x21, 0x41, 0xb3, 0x68, - 0xcc, 0xcc, 0xaa, 0x78, 0xa6, 0x90, 0x7d, 0x66, 0x9e, 0x7a, 0x7d, 0x70, - 0x49, 0x21, 0xa2, 0xaa, 0xcb, 0x41, 0x0, 0x70, 0x7c, 0xbe, 0x14, 0x87, - 0xef, 0x72, 0xd2, 0x9d, 0x1, 0xf9, 0x11, 0xb2, 0x7f, 0x15, 0xba, 0xb, - 0xc, 0xa, 0x1f, 0x94, 0x2c, 0x39, 0xc5, 0x96, 0x37, 0x30, 0x7d, 0x6, - 0x29, 0xf3, 0x54, 0x4e, 0x22, 0x83, 0x42, 0xe9, 0x1f, 0xe5, 0x1c, 0xfb, - 0x5, 0x84, 0xf8, 0x7c, 0x31, 0xe, 0xbf, 0xdc, 0xa, 0xe, 0x65, 0x49, - 0x35, 0x1d, 0x3f, 0x4c, 0xe8, 0x3, 0x24, 0x0, 0xa3, 0x94, 0x78, 0xc9, - 0x2f, 0xe9, 0xc9, 0x60, 0xb3, 0xce, 0x4c, 0xa, 0x5, 0x7b, 0xb, 0xe5, - 0x20, 0x0, 0x30, 0x3e, 0x5f, 0xa, 0x43, 0x17, 0x63, 0xeb, 0x73, 0xcc, - 0x2e, 0xd, 0x28, 0xc6, 0xb7, 0xd, 0x40, 0x36, 0x45, 0xcd, 0xdc, 0x10, - 0xe5, 0x29, 0x1b, 0x4b, 0x37, 0x54, 0x96, 0x21, 0x6c, 0xa3, 0x86, 0xe5, - 0x88, 0x0, 0x6, 0xf6, 0xfd, 0x46, 0x0, 0x49, 0xc7, 0x11, 0xfe, 0x14, - 0x8d, 0x0, 0x72, 0x8, 0xbd, 0x41, 0x5c, 0x46, 0x95, 0x1a, 0x2a, 0x78, - 0x78, 0xee, 0x7c, 0x50, 0x74, 0x3, 0x2e, 0x47, 0x0, 0xc0, 0xed, 0xe7, - 0x62, 0x1c, 0xfe, 0xbb, 0xdc, 0x24, 0x2b, 0xf4, 0xeb, 0xe2, 0xdd, 0x8, - 0xf9, 0xb9, 0xa8, 0xfc, 0x6c, 0x88, 0x45, 0xdf, 0x48, 0x15, 0xdd, 0xa7, - 0xff, 0xfc, 0xe1, 0xa9, 0x17, 0x54, 0x28, 0xf3, 0x9d, 0x50, 0xe, 0x0, - 0x80, 0xe3, 0xf3, 0x4b, 0x1c, 0x7e, 0x3, 0x80, 0x71, 0x9a, 0x97, 0x1, - 0x3e, 0x31, 0x87, 0xb3, 0xf3, 0x9f, 0x68, 0x20, 0x3, 0xe3, 0xfc, 0x8b, - 0x15, 0x71, 0x86, 0x57, 0xd3, 0x77, 0x50, 0x9f, 0x91, 0x8f, 0xa4, 0x40, - 0x56, 0x57, 0xa2, 0x8a, 0xcd, 0x6d, 0xb4, 0xdb, 0xe1, 0x41, 0x7c, 0x7e, - 0x89, 0xc3, 0x6f, 0x68, 0x2, 0x65, 0xb, 0x90, 0x41, 0xf3, 0x83, 0x9c, - 0xe3, 0x1c, 0x6c, 0x77, 0x93, 0xe2, 0xfc, 0xf3, 0x49, 0xe8, 0xa0, 0x94, - 0x7c, 0x7e, 0x87, 0xe7, 0xce, 0x34, 0xff, 0x38, 0x49, 0xc2, 0xd6, 0x96, - 0x3, 0x0, 0x2c, 0x42, 0x43, 0x9, 0xb1, 0x6d, 0x47, 0xa6, 0x1c, 0x2a, - 0x8f, 0x3f, 0xb9, 0x3a, 0xed, 0x90, 0xad, 0xb1, 0xe9, 0xd3, 0xfb, 0x77, - 0xfc, 0xfa, 0x96, 0xd4, 0xde, 0x12, 0xc3, 0x58, 0xe5, 0x8d, 0xf8, 0xb1, - 0x0, 0xd2, 0x7c, 0x4d, 0xd5, 0x18, 0xf5, 0x69, 0x5b, 0xdf, 0xbd, 0xe2, - 0xfa, 0xb7, 0xbe, 0x7f, 0x5a, 0x34, 0xd4, 0x79, 0x23, 0x6e, 0x7b, 0x40, - 0x6f, 0x5, 0x7a, 0xcb, 0xd, 0xa0, 0xb7, 0x2, 0xbd, 0xe5, 0x6, 0xd0, - 0x5b, 0x81, 0xde, 0xf2, 0x15, 0x0, 0xf1, 0x94, 0xe4, 0x1, 0xdf, 0x44, - 0xbe, 0x74, 0xd4, 0xd6, 0xb5, 0x3b, 0x6a, 0xbf, 0x11, 0x0, 0xaf, 0xe0, - 0xab, 0x6, 0xe1, 0x6a, 0x53, 0x38, 0xd, 0x9, 0xa1, 0xc5, 0xa7, 0xca, - 0x68, 0xf4, 0xb1, 0x49, 0x4c, 0x96, 0x95, 0x14, 0xac, 0xec, 0x18, 0x40, - 0x74, 0xc7, 0x47, 0xbc, 0xfe, 0x7, 0x80, 0x68, 0xaf, 0x5a, 0xcc, 0x49, - 0x41, 0x35, 0x69, 0x95, 0x6f, 0x3f, 0x1, 0xe0, 0x48, 0x32, 0xf2, 0x9, - 0x4d, 0xa0, 0xc2, 0xfe, 0x50, 0x1, 0xc0, 0xe7, 0x44, 0x1, 0xea, 0x84, - 0x56, 0x16, 0x6b, 0x56, 0x43, 0xf4, 0x88, 0xe7, 0xc7, 0x9, 0x83, 0x84, - 0xed, 0xea, 0x22, 0x80, 0x86, 0x3a, 0x2d, 0x3, 0x50, 0xc5, 0x8c, 0x71, - 0xc2, 0x52, 0xb9, 0xca, 0x23, 0x43, 0xe2, 0xc1, 0x8a, 0x9d, 0x0, 0xac, - 0x8e, 0x54, 0x8, 0x27, 0x4, 0x67, 0xa1, 0x53, 0x1d, 0x20, 0x80, 0x1c, - 0xcf, 0xaf, 0xe0, 0xad, 0x63, 0x2b, 0x0, 0x98, 0x8d, 0x26, 0xce, 0xb0, - 0x21, 0x49, 0x0, 0xec, 0x49, 0xd1, 0x79, 0x5b, 0x4e, 0xc, 0xae, 0xed, - 0x61, 0xa8, 0x68, 0xd1, 0x1, 0x6e, 0xdc, 0xf0, 0xa3, 0xe4, 0x55, 0x11, - 0x1, 0x38, 0xd2, 0xec, 0x93, 0xa8, 0x8a, 0xdb, 0x89, 0x39, 0x34, 0xc4, - 0x26, 0x70, 0x7c, 0x4e, 0x6a, 0x9d, 0x54, 0xa6, 0x33, 0xd8, 0x13, 0x29, - 0x21, 0xd3, 0x81, 0x15, 0xf, 0x19, 0x11, 0x1, 0x64, 0x33, 0xdf, 0xeb, - 0xb5, 0x99, 0xdc, 0x94, 0xb8, 0xb0, 0xdf, 0x54, 0x2, 0x30, 0xa9, 0xfc, - 0xbb, 0xb5, 0x65, 0xe0, 0x13, 0xa4, 0xca, 0x9a, 0x43, 0xc5, 0xae, 0xe, - 0x2b, 0x69, 0x4, 0xa7, 0x2, 0xbc, 0x7, 0x30, 0x0, 0x64, 0xde, 0xee, - 0xf9, 0x52, 0x5e, 0x3f, 0x91, 0x0, 0x78, 0x9b, 0x6, 0xdf, 0x73, 0x42, - 0x2b, 0xab, 0x12, 0xe9, 0x90, 0x7c, 0x40, 0xc1, 0x89, 0x9d, 0x60, 0xe4, - 0xf6, 0x4f, 0xb1, 0x9, 0xac, 0xcd, 0x59, 0x38, 0xa4, 0x7d, 0x31, 0x55, - 0x7d, 0x32, 0x65, 0xe3, 0xb1, 0xb0, 0x57, 0xb3, 0xd3, 0x30, 0x68, 0xf3, - 0x59, 0xa9, 0xa6, 0xa1, 0x23, 0xb0, 0x78, 0xe7, 0x49, 0xd5, 0x34, 0xa0, - 0xe7, 0x30, 0x28, 0x4e, 0x85, 0x47, 0x78, 0x98, 0xb8, 0x2c, 0x42, 0x9d, - 0xf1, 0x35, 0xa7, 0xee, 0x1e, 0xcc, 0x4, 0x71, 0x2f, 0x28, 0x3, 0x38, - 0x2b, 0x2a, 0xbe, 0x71, 0x1e, 0x80, 0x9e, 0x6b, 0xad, 0xa2, 0xe3, 0x6d, - 0x93, 0xef, 0x1, 0x2c, 0x64, 0x16, 0xbc, 0xaf, 0xf, 0x2, 0x8, 0x43, - 0x15, 0xf2, 0xb3, 0x25, 0x3a, 0xb8, 0xf5, 0x57, 0x93, 0xa9, 0xaa, 0x44, - 0x6f, 0x2b, 0xed, 0x48, 0x6d, 0xab, 0x41, 0xdd, 0x23, 0x85, 0x4e, 0xd0, - 0xc3, 0x27, 0xe6, 0x89, 0xf7, 0xad, 0x36, 0x42, 0xef, 0x95, 0x60, 0x10, - 0xf9, 0xeb, 0x92, 0x48, 0x55, 0x0, 0xf8, 0x5, 0x72, 0x3, 0xe8, 0xad, - 0x40, 0x6f, 0xb9, 0x1, 0xf4, 0x56, 0xa0, 0xb7, 0xdc, 0x0, 0x7a, 0x2b, - 0xd0, 0x5b, 0x6e, 0x0, 0xbd, 0x15, 0xe8, 0x2d, 0x37, 0x80, 0xde, 0xa, - 0xf4, 0x96, 0x1b, 0x40, 0x6f, 0x5, 0x7a, 0xcb, 0xd, 0xa0, 0xb7, 0x2, - 0xbd, 0xe5, 0x6, 0xd0, 0x5b, 0x81, 0xde, 0x72, 0x3, 0xe8, 0xad, 0x40, - 0x6f, 0xf9, 0xf5, 0x0, 0xfe, 0x1, 0x35, 0x69, 0x45, 0xec, 0xa0, 0xf0, - 0xdf, 0x8c, 0x0, 0x0, 0x0, 0x25, 0x74, 0x45, 0x58, 0x74, 0x64, 0x61, - 0x74, 0x65, 0x3a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x0, 0x32, 0x30, - 0x31, 0x37, 0x2d, 0x30, 0x34, 0x2d, 0x30, 0x32, 0x54, 0x31, 0x38, 0x3a, - 0x33, 0x39, 0x3a, 0x33, 0x37, 0x2b, 0x30, 0x30, 0x3a, 0x30, 0x30, 0x98, - 0xbb, 0xf, 0xb3, 0x0, 0x0, 0x0, 0x25, 0x74, 0x45, 0x58, 0x74, 0x64, - 0x61, 0x74, 0x65, 0x3a, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x0, 0x32, - 0x30, 0x31, 0x37, 0x2d, 0x30, 0x34, 0x2d, 0x30, 0x32, 0x54, 0x31, 0x38, - 0x3a, 0x33, 0x39, 0x3a, 0x33, 0x37, 0x2b, 0x30, 0x30, 0x3a, 0x30, 0x30, - 0xe9, 0xe6, 0xb7, 0xf, 0x0, 0x0, 0x0, 0x11, 0x74, 0x45, 0x58, 0x74, - 0x70, 0x72, 0x65, 0x76, 0x69, 0x65, 0x77, 0x0, 0x55, 0x6e, 0x64, 0x65, - 0x66, 0x69, 0x6e, 0x65, 0x64, 0xdb, 0xa5, 0x33, 0x1b, 0x0, 0x0, 0x0, - 0x4a, 0x74, 0x45, 0x58, 0x74, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, - 0x72, 0x65, 0x0, 0x65, 0x34, 0x39, 0x30, 0x38, 0x64, 0x62, 0x62, 0x30, - 0x62, 0x64, 0x38, 0x62, 0x36, 0x62, 0x66, 0x64, 0x32, 0x38, 0x39, 0x33, - 0x34, 0x39, 0x38, 0x39, 0x35, 0x39, 0x39, 0x62, 0x66, 0x32, 0x66, 0x61, - 0x39, 0x38, 0x63, 0x63, 0x33, 0x64, 0x35, 0x36, 0x35, 0x31, 0x39, 0x66, - 0x36, 0x66, 0x36, 0x35, 0x31, 0x64, 0x61, 0x32, 0x65, 0x34, 0x36, 0x30, - 0x34, 0x38, 0x38, 0x38, 0x33, 0x34, 0x35, 0xfb, 0xa7, 0xec, 0xfc, 0x0, - 0x0, 0x0, 0x0, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82}; -} // namespace consolas_font -const unsigned int sGlyphWidth = 9; -const unsigned int sTextureWidth = 256; -const unsigned int sTextureHeight = 256; -const unsigned int sCellWidth = 24; -const unsigned int sCellHeight = 24; -const unsigned int sFirstChar = 32; - -const FontBitmapInfo sFixedWidthCompositorFont = { - mozilla::Some(9), - mozilla::Nothing(), - 256, - 256, - 24, - 24, - 32, - consolas_font::sFontPNG, - sizeof(consolas_font::sFontPNG)}; - -} // namespace layers -} // namespace mozilla diff --git a/gfx/layers/composite/TextRenderer.cpp b/gfx/layers/composite/TextRenderer.cpp deleted file mode 100644 index 3bd1a7d9b376..000000000000 --- a/gfx/layers/composite/TextRenderer.cpp +++ /dev/null @@ -1,245 +0,0 @@ -/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* vim: set ts=8 sts=2 et sw=2 tw=80: */ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#include "TextRenderer.h" -#include "FontData.h" -#include "ConsolasFontData.h" -#include "png.h" -#include "mozilla/Base64.h" -#include "mozilla/layers/Compositor.h" -#include "mozilla/layers/TextureHost.h" -#include "mozilla/layers/Effects.h" - -namespace mozilla { -namespace layers { - -using namespace gfx; - -const Float sBackgroundOpacity = 0.8f; -const SurfaceFormat sTextureFormat = SurfaceFormat::B8G8R8A8; - -static void PNGAPI info_callback(png_structp png_ptr, png_infop info_ptr) { - png_read_update_info(png_ptr, info_ptr); -} - -static void PNGAPI row_callback(png_structp png_ptr, png_bytep new_row, - png_uint_32 row_num, int pass) { - MOZ_ASSERT(sTextureFormat == SurfaceFormat::B8G8R8A8); - - TextRenderer::FontCache* cache = - static_cast(png_get_progressive_ptr(png_ptr)); - - uint32_t* dst = - (uint32_t*)(cache->mMap.mData + cache->mMap.mStride * row_num); - - for (uint32_t x = 0; x < cache->mInfo->mTextureWidth; x++) { - // We blend to a transparent white background, this will make text readable - // even if it's on a dark background. Without hurting our ability to - // interact with the content behind the text. - Float alphaValue = Float(0xFF - new_row[x]) / 255.0f; - Float baseValue = sBackgroundOpacity * (1.0f - alphaValue); - // FIXME(aosmond): PNGs may have color profiles. Should we be checking for - // that and performing color management? - sRGBColor pixelColor(baseValue, baseValue, baseValue, - baseValue + alphaValue); - dst[x] = pixelColor.ToABGR(); - } -} - -TextRenderer::~TextRenderer() = default; - -TextRenderer::FontCache::~FontCache() { mGlyphBitmaps->Unmap(); } - -void TextRenderer::RenderText(Compositor* aCompositor, const std::string& aText, - const IntPoint& aOrigin, - const Matrix4x4& aTransform, uint32_t aTextSize, - uint32_t aTargetPixelWidth, FontType aFontType) { - const FontBitmapInfo* info = GetFontInfo(aFontType); - - // For now we only have a bitmap font with a 24px cell size, so we just - // scale it up if the user wants larger text. - Float scaleFactor = Float(aTextSize) / Float(info->mCellHeight); - aTargetPixelWidth /= scaleFactor; - - RefPtr src = - RenderText(aCompositor, aText, aTargetPixelWidth, aFontType); - if (!src) { - return; - } - - RefPtr effect = new EffectRGB(src, true, SamplingFilter::LINEAR); - EffectChain chain; - chain.mPrimaryEffect = effect; - - Matrix4x4 transform = aTransform; - transform.PreScale(scaleFactor, scaleFactor, 1.0f); - - IntRect drawRect(aOrigin, src->GetSize()); - IntRect clip(-10000, -10000, 20000, 20000); - aCompositor->DrawQuad(Rect(drawRect), clip, chain, 1.0f, transform); -} - -IntSize TextRenderer::ComputeSurfaceSize(const std::string& aText, - uint32_t aTargetPixelWidth, - FontType aFontType) { - if (!EnsureInitialized(aFontType)) { - return IntSize(); - } - - FontCache* cache = mFonts[aFontType].get(); - const FontBitmapInfo* info = cache->mInfo; - - uint32_t numLines = 1; - uint32_t maxWidth = 0; - uint32_t lineWidth = 0; - // Calculate the size of the surface needed to draw all the glyphs. - for (uint32_t i = 0; i < aText.length(); i++) { - // Insert a line break if we go past the TargetPixelWidth. - // XXX - this has the downside of overrunning the intended width, causing - // things at the edge of a window to be cut off. - if (aText[i] == '\n' || - (aText[i] == ' ' && lineWidth > aTargetPixelWidth)) { - numLines++; - lineWidth = 0; - continue; - } - - lineWidth += info->GetGlyphWidth(aText[i]); - maxWidth = std::max(lineWidth, maxWidth); - } - - return IntSize(maxWidth, numLines * info->mCellHeight); -} - -RefPtr TextRenderer::RenderText(TextureSourceProvider* aProvider, - const std::string& aText, - uint32_t aTargetPixelWidth, - FontType aFontType) { - if (!EnsureInitialized(aFontType)) { - return nullptr; - } - - IntSize size = ComputeSurfaceSize(aText, aTargetPixelWidth, aFontType); - - // Create a DrawTarget to draw our glyphs to. - RefPtr dt = - Factory::CreateDrawTarget(BackendType::SKIA, size, sTextureFormat); - - RenderTextToDrawTarget(dt, aText, aTargetPixelWidth, aFontType); - RefPtr surf = dt->Snapshot(); - RefPtr dataSurf = surf->GetDataSurface(); - RefPtr src = aProvider->CreateDataTextureSource(); - - if (!src->Update(dataSurf)) { - // Upload failed. - return nullptr; - } - - return src; -} - -void TextRenderer::RenderTextToDrawTarget(DrawTarget* aDrawTarget, - const std::string& aText, - uint32_t aTargetPixelWidth, - FontType aFontType) { - if (!EnsureInitialized(aFontType)) { - return; - } - - // Initialize the DrawTarget to transparent white. - // FIXME(aosmond): Should the background be color managed if we color manage - // the glyphs or is this part of a mask? - IntSize size = aDrawTarget->GetSize(); - aDrawTarget->FillRect( - Rect(0, 0, size.width, size.height), - ColorPattern(DeviceColor(1.0, 1.0, 1.0, sBackgroundOpacity)), - DrawOptions(1.0, CompositionOp::OP_SOURCE)); - - IntPoint currentPos; - - FontCache* cache = mFonts[aFontType].get(); - const FontBitmapInfo* info = cache->mInfo; - - const unsigned int kGlyphsPerLine = info->mTextureWidth / info->mCellWidth; - - // Copy our glyphs onto the DrawTarget. - for (uint32_t i = 0; i < aText.length(); i++) { - if (aText[i] == '\n' || - (aText[i] == ' ' && currentPos.x > int32_t(aTargetPixelWidth))) { - currentPos.y += info->mCellHeight; - currentPos.x = 0; - continue; - } - - uint32_t index = aText[i] - info->mFirstChar; - uint32_t cellIndexY = index / kGlyphsPerLine; - uint32_t cellIndexX = index - (cellIndexY * kGlyphsPerLine); - uint32_t glyphWidth = info->GetGlyphWidth(aText[i]); - IntRect srcRect(cellIndexX * info->mCellWidth, - cellIndexY * info->mCellHeight, glyphWidth, - info->mCellHeight); - - aDrawTarget->CopySurface(cache->mGlyphBitmaps, srcRect, currentPos); - - currentPos.x += glyphWidth; - } -} - -/* static */ const FontBitmapInfo* TextRenderer::GetFontInfo(FontType aType) { - switch (aType) { - case FontType::Default: - return &sDefaultCompositorFont; - case FontType::FixedWidth: - return &sFixedWidthCompositorFont; - default: - MOZ_ASSERT_UNREACHABLE("unknown font type"); - return nullptr; - } -} - -bool TextRenderer::EnsureInitialized(FontType aType) { - if (mFonts[aType]) { - return true; - } - - const FontBitmapInfo* info = GetFontInfo(aType); - - IntSize size(info->mTextureWidth, info->mTextureHeight); - RefPtr surface = - Factory::CreateDataSourceSurface(size, sTextureFormat); - if (NS_WARN_IF(!surface)) { - return false; - } - - DataSourceSurface::MappedSurface map; - if (NS_WARN_IF(!surface->Map(DataSourceSurface::MapType::READ_WRITE, &map))) { - return false; - } - - UniquePtr cache = MakeUnique(); - cache->mGlyphBitmaps = surface; - cache->mMap = map; - cache->mInfo = info; - - png_structp png_ptr = NULL; - png_ptr = - png_create_read_struct(PNG_LIBPNG_VER_STRING, nullptr, nullptr, nullptr); - - png_set_progressive_read_fn(png_ptr, cache.get(), info_callback, row_callback, - nullptr); - png_infop info_ptr = NULL; - info_ptr = png_create_info_struct(png_ptr); - - png_process_data(png_ptr, info_ptr, (uint8_t*)info->mPNG, info->mPNGLength); - - png_destroy_read_struct(&png_ptr, &info_ptr, nullptr); - - mFonts[aType] = std::move(cache); - return true; -} - -} // namespace layers -} // namespace mozilla diff --git a/gfx/layers/composite/TextRenderer.h b/gfx/layers/composite/TextRenderer.h deleted file mode 100644 index e88fc1d8f582..000000000000 --- a/gfx/layers/composite/TextRenderer.h +++ /dev/null @@ -1,95 +0,0 @@ -/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* vim: set ts=8 sts=2 et sw=2 tw=80: */ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#ifndef GFX_TextRenderer_H -#define GFX_TextRenderer_H - -#include "mozilla/EnumeratedArray.h" -#include "mozilla/gfx/2D.h" -#include "mozilla/UniquePtr.h" -#include "nsISupportsImpl.h" -#include - -namespace mozilla { -namespace layers { - -class Compositor; -class TextureSource; -class TextureSourceProvider; -struct FontBitmapInfo; - -class TextRenderer final { - ~TextRenderer(); - - public: - NS_INLINE_DECL_REFCOUNTING(TextRenderer) - - enum class FontType { Default, FixedWidth, NumTypes }; - - TextRenderer() = default; - - RefPtr RenderText(TextureSourceProvider* aProvider, - const std::string& aText, - uint32_t aTargetPixelWidth, - FontType aFontType); - - void RenderText(Compositor* aCompositor, const std::string& aText, - const gfx::IntPoint& aOrigin, - const gfx::Matrix4x4& aTransform, uint32_t aTextSize, - uint32_t aTargetPixelWidth, - FontType aFontType = FontType::Default); - - gfx::IntSize ComputeSurfaceSize(const std::string& aText, - uint32_t aTargetPixelWidth, - FontType aFontType = FontType::Default); - - void RenderTextToDrawTarget(gfx::DrawTarget* aDrawTarget, - const std::string& aText, - uint32_t aTargetPixelWidth, - FontType aFontType = FontType::Default); - - struct FontCache { - ~FontCache(); - RefPtr mGlyphBitmaps; - gfx::DataSourceSurface::MappedSurface mMap; - const FontBitmapInfo* mInfo; - }; - - protected: - // Note that this may still fail to set mGlyphBitmaps to a valid value - // if the underlying CreateDataSourceSurface fails for some reason. - bool EnsureInitialized(FontType aType); - - static const FontBitmapInfo* GetFontInfo(FontType aType); - - private: - EnumeratedArray> mFonts; -}; - -struct FontBitmapInfo { - Maybe mGlyphWidth; - Maybe mGlyphWidths; - unsigned int mTextureWidth; - unsigned int mTextureHeight; - unsigned int mCellWidth; - unsigned int mCellHeight; - unsigned int mFirstChar; - const unsigned char* mPNG; - size_t mPNGLength; - - unsigned int GetGlyphWidth(char aGlyph) const { - if (mGlyphWidth) { - return mGlyphWidth.value(); - } - MOZ_ASSERT(unsigned(aGlyph) >= mFirstChar); - return mGlyphWidths.value()[unsigned(aGlyph) - mFirstChar]; - } -}; - -} // namespace layers -} // namespace mozilla - -#endif diff --git a/gfx/layers/moz.build b/gfx/layers/moz.build index d8fe393a4134..cefea3a22d45 100755 --- a/gfx/layers/moz.build +++ b/gfx/layers/moz.build @@ -134,7 +134,6 @@ EXPORTS.mozilla.layers += [ "composite/FrameUniformityData.h", "composite/GPUVideoTextureHost.h", "composite/ImageComposite.h", - "composite/TextRenderer.h", "composite/TextureHost.h", "CompositionRecorder.h", "Compositor.h", @@ -375,7 +374,6 @@ UNIFIED_SOURCES += [ "composite/FrameUniformityData.cpp", "composite/GPUVideoTextureHost.cpp", "composite/ImageComposite.cpp", - "composite/TextRenderer.cpp", "composite/TextureHost.cpp", "CompositionRecorder.cpp", "Compositor.cpp",