25239 2009-04-16 11:39:57 -0700 Add a settings entry to en/disable web font support 2009-05-15 17:17:13 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) PC All RESOLVED FIXED P2 Minor --- 1 jshin jshin ddkilzer emacemac7 ifette koivisto mal mitz sam oldest_to_newest 117763 0 jshin 2009-04-16 11:39:57 -0700 There's a concern about the security implication of remote web font support on Windows. Chromium wants to disable it by default by adding a command line switch. For that, I'm proposing to add an entry to Settings (remote_font_enabled) that will be true by default. Each 'embedder' of Webkit can do whichever default it wants to set. 117764 1 eric 2009-04-16 11:42:53 -0700 It seems it would make the most sense to fix the security concern. Or at least file a WebKit bug about it and list the bug URL here. 117765 2 eric 2009-04-16 11:43:38 -0700 Unless of course the security concern is chromium only, in which case it would make sense to reference the Chromium bug here. 117771 3 29542 jshin 2009-04-16 12:01:30 -0700 Created attachment 29542 patch This patch works, but I'm afraid the check for 'remote_font_enabled' is done too late (and perhaps more often than necessary). I'm looking for a better place to add the check. 117776 4 mrowe 2009-04-16 12:21:57 -0700 The changelog mentions "remote_font_enabled" yet the code uses remoteFontEnabled. 117777 5 sam 2009-04-16 12:22:51 -0700 I agree with Eric. Without understanding the specific concerns, it is hard to evaluate the necessity for this. 117782 6 29546 jshin 2009-04-16 13:18:47 -0700 Created attachment 29546 patch 2 with the check moved upstream I moved the check for 'remote font support' 'upstream'. I think it's logically better that way On the other hand, the check may be done more often than before this way. I revised ChangeLog to refer to the actual member variable added to |Settings|. I'll answer to questions about the security shortly. 117789 7 jshin 2009-04-16 13:47:40 -0700 As far as I know, there is not any known risk, but Chromium team feels a bit nervous about relying on t2embed.dll as a black box. So, we decided to turn that off by default ( http://crbug.com/9633). Personally, I hate to see it go off :-) Windows ports of Webkit uses 3 functions in t2embed.dll : TTLoadEmbeddedFont, TTGetNewFontName, TTDeleteEmbeddedFont. t2embed.dll did have a security issue in the past (buffer overrun in the decompression of compressed EOT fonts), but that API is not used by Safari-Win and Chromium-Win because Webkit does not support EOT. http://www.microsoft.com/technet/security/Bulletin/MS06-002.mspx http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2006-0010 http://www.securityfocus.com/archive/1/archive/1/421885/100/0/threaded 117794 8 eric 2009-04-16 14:11:47 -0700 Further security sensitive discussion should probably be done in a Security bug. This bug is not marked for security, thus it's world readable. 117806 9 jshin 2009-04-16 15:01:51 -0700 Filed bug 25249. I thought what's in comment #7 is public already, but even if so, I guess it'd have been better to add that to bug 25249 than here. 117811 10 jshin 2009-04-16 15:05:02 -0700 (In reply to comment #9) > Filed bug 25249. I thought what's in comment #7 is public already, but even if > so, I guess it'd have been better to add that to bug 25249 than here. Oops. It's bug 25245. 117963 11 29546 jshin 2009-04-17 13:14:34 -0700 Comment on attachment 29546 patch 2 with the check moved upstream I'm not sure if you want to wait until there's a conclusion in bug 25245. If not, would you review the patch? 119230 12 jshin 2009-04-28 17:29:24 -0700 Dan, can you review the patch? Chromium wants to have this flag and set it off by default (can be enabled by a command line switch). Thanks 119267 13 29546 mitz 2009-04-28 21:50:20 -0700 Comment on attachment 29546 patch 2 with the check moved upstream Please rename the instance variable, setter and getter to *remoteFontsEnabled* (in plural). I don't think "remote" is the best way to characterize these fonts (they may come from file: or data: URLs) but I could not think of a better name, and they are the opposite of local() fonts, I guess. > + There's no behavior change. So, no new test is necessary. You could have added WebKit SPI for changing the setting and a DumpRenderTree LayoutTestController function for controlling it, making it testable. It is fine if you don't want to do that, but I don't think you should make that comment in the change log. r=me with the renames. 119337 14 29894 jshin 2009-04-29 14:10:31 -0700 Created attachment 29894 patch updated addressing mitz' comments I addressed Dan's concerns and am transferring his r+ here. This patch is ready for check-in. BTW, this does not add a symbol to WebCore.base.exp because a new setRemoteFontsEabled is not called outside Webcore. 119401 15 29894 eric 2009-04-29 17:05:15 -0700 Comment on attachment 29894 patch updated addressing mitz' comments I would prefer this to actually go through a real second review. If I were reviewing this, I would probably ask for tests. :) I can't remember if DRT supports testing preferences yet or not. I know gwilson was working on a patch for that long ago. 119481 16 jshin 2009-04-30 09:55:44 -0700 (In reply to comment #15) > (From update of attachment 29894 [review]) > I would prefer this to actually go through a real second review. Ok. Dan, can you take another look? > If I were reviewing this, I would probably ask for tests. :) I can't remember > if DRT supports testing preferences yet or not. I know gwilson was working on > a patch for that long ago. It's bug 20534 and is not yet resolved. However, Dan seems to imply that a test can be added without that bug fixed (by tweaking LayoutTestController). Anyway, I'd rather add a test separately if it's ok. 120066 17 29546 eric 2009-05-05 22:48:22 -0700 Comment on attachment 29546 patch 2 with the check moved upstream Clearing flag on old patch. 120977 18 eric 2009-05-12 21:52:30 -0700 Mitz? Can I assume this patch is still OK with you? -eric 121487 19 ddkilzer 2009-05-15 04:37:06 -0700 See also Bug 25815. 121545 20 jshin 2009-05-15 11:15:13 -0700 Should I revise the patch to do what's suggested in bug 25815? That can be done by changing the check to if (item->isSupportedFormat() && (foundSVGFont || (m_document && m_document->settings()->remoteFontEnabled()))) { from if (item->isSupportedFormat() && m_document && m_document->settings()->remoteFontEnabled()) { 121548 21 jshin 2009-05-15 11:20:54 -0700 (In reply to comment #20) > if (item->isSupportedFormat() && (foundSVGFont || (m_document && > m_document->settings()->remoteFontEnabled()))) { s/remoteFont/remoteFonts/ 121551 22 ddkilzer 2009-05-15 11:52:47 -0700 (In reply to comment #20) > Should I revise the patch to do what's suggested in bug 25815? Yes, please do. Thanks! 121558 23 29894 koivisto 2009-05-15 12:57:35 -0700 Comment on attachment 29894 patch updated addressing mitz' comments clearing the review flag 121561 24 30397 koivisto 2009-05-15 13:02:48 -0700 Created attachment 30397 my patch for this I didn't realize there was a patch attempt for this already so I wrote one. This includes Mac WebKit bits too and differentiates between SVG fonts and binary fonts. 121563 25 koivisto 2009-05-15 13:05:06 -0700 *** Bug 25815 has been marked as a duplicate of this bug. *** 121565 26 30397 mitz 2009-05-15 13:08:04 -0700 Comment on attachment 30397 my patch for this I think m_downloadableBinaryFontsEnabled should default to true. Otherwise your patch will change the behavior for platforms whose WebKit layer you did not change. 121567 27 koivisto 2009-05-15 13:11:00 -0700 (In reply to comment #26) > (From update of attachment 30397 [review]) > I think m_downloadableBinaryFontsEnabled should default to true. Otherwise your > patch will change the behavior for platforms whose WebKit layer you did not > change. I don't agree. Settings disables everything else by default. Platforms should opt in. 121568 28 30397 ddkilzer 2009-05-15 13:13:31 -0700 Comment on attachment 30397 my patch for this >+ Settings* settings = m_document ? m_document->frame() ? m_document->frame()->settings() : 0 : 0; I think it's easier to read if you do: Settings* settings = m_document && m_document->frame() ? m_document->frame()->settings() : 0; r=me Dave 121570 29 mitz 2009-05-15 13:21:24 -0700 (In reply to comment #27) > I don't agree. Settings disables everything else by default. Platforms should > opt in. Please don't land this without the changes to all existing platforms that are necessary to prevent regressions. Thanks! 121585 30 koivisto 2009-05-15 14:56:06 -0700 Sending WebCore/ChangeLog Sending WebCore/WebCore.base.exp Sending WebCore/css/CSSFontSelector.cpp Sending WebCore/page/Settings.cpp Sending WebCore/page/Settings.h Transmitting file data ..... Committed revision 43783. I left the feature enabled by default to avoid changing the behavior, as suggested by Mitz. 121604 31 eric 2009-05-15 17:17:13 -0700 Thank you Antti & Mitz. Looks like this was intended to be closed since it's now landing. Closing. 29542 2009-04-16 12:01:30 -0700 2009-04-16 13:18:47 -0700 patch 25239.patch text/plain 3686 jshin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0MjU4NCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjIgQEAKKzIwMDktMDQtMTYgIEp1bmdzaGlrIFNoaW4gPGpzaGluQGNocm9taXVt Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjUyMzkKKyAgICAgICAgQWRk ICdyZW1vdGVfZm9udF9lbmFibGVkJyB0byBTZXR0aW5ncyBjbGFzcyB0byBlbi9kaXNhYmxlCisg ICAgICAgIHJlbW90ZSB3ZWIgZm9udCBzdXBwb3J0LiBJdCdzIHRydWUgYnkgZGVmYXVsdCAoaW4g U2V0dGluZ3MKKyAgICAgICAgY2xhc3MgY29uc3RydWN0b3IpLgorCisgICAgICAgIFRoZXJlJ3Mg bm8gY2hhbmdlIGluIGxheW91dC4gU28sIG5vIG5ldyB0ZXN0IGlzIG5lY2Vzc2FyeS4KKworICAg ICAgICAqIGNzcy9DU1NGb250RmFjZVNvdXJjZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDU1NG b250RmFjZVNvdXJjZTo6Z2V0Rm9udERhdGEpOgorICAgICAgICAqIHBhZ2UvU2V0dGluZ3MuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6U2V0dGluZ3M6OlNldHRpbmdzKToKKyAgICAgICAgKFdlYkNv cmU6OlNldHRpbmdzOjpzZXRSZW1vdGVGb250RW5hYmxlZCk6CisgICAgICAgICogcGFnZS9TZXR0 aW5ncy5oOgorICAgICAgICAoV2ViQ29yZTo6U2V0dGluZ3M6OnJlbW90ZUZvbnRFbmFibGVkKToK KwogMjAwOS0wNC0xNiAgSnVzdGluIEdhcmNpYSAgPGp1c3Rpbi5nYXJjaWFAYXBwbGUuY29tPgog CiAgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEZyYXNlci4KSW5kZXg6IFdlYkNvcmUvY3NzL0NT U0ZvbnRGYWNlU291cmNlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2Nzcy9DU1NGb250RmFj ZVNvdXJjZS5jcHAJKHJldmlzaW9uIDQyNTg0KQorKysgV2ViQ29yZS9jc3MvQ1NTRm9udEZhY2VT b3VyY2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNCw2ICszNCw3IEBACiAjaW5jbHVkZSAiRm9u dERlc2NyaXB0aW9uLmgiCiAjaW5jbHVkZSAiR2x5cGhQYWdlVHJlZU5vZGUuaCIKICNpbmNsdWRl ICJTaW1wbGVGb250RGF0YS5oIgorI2luY2x1ZGUgIlNldHRpbmdzLmgiCiAKICNpZiBFTkFCTEUo U1ZHX0ZPTlRTKQogI2luY2x1ZGUgIkZvbnRDdXN0b21QbGF0Zm9ybURhdGEuaCIKQEAgLTE1OSw2 ICsxNjAsMTUgQEAgU2ltcGxlRm9udERhdGEqIENTU0ZvbnRGYWNlU291cmNlOjpnZXRGbwogICAg ICAgICAgICAgfSBlbHNlCiAjZW5kaWYKICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICBE b2NMb2FkZXIqIGRvY0xvYWRlciA9IGZvbnRTZWxlY3Rvci0+ZG9jTG9hZGVyKCk7CisgICAgICAg ICAgICAgICAgaWYgKCFkb2NMb2FkZXIpCisgICAgICAgICAgICAgICAgICAgIHJldHVybiAwOwor ICAgICAgICAgICAgICAgIERvY3VtZW50KiBkb2N1bWVudCA9IGRvY0xvYWRlci0+ZG9jKCk7Cisg ICAgICAgICAgICAgICAgaWYgKCFkb2N1bWVudCkKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJu IDA7CisgICAgICAgICAgICAgICAgU2V0dGluZ3MqIHNldHRpbmdzID0gZG9jdW1lbnQtPnNldHRp bmdzKCk7CisgICAgICAgICAgICAgICAgaWYgKCFzZXR0aW5ncyB8fCAhc2V0dGluZ3MtPnJlbW90 ZUZvbnRFbmFibGVkKCkpCisgICAgICAgICAgICAgICAgICAgIHJldHVybiAwOwogICAgICAgICAg ICAgICAgIC8vIENyZWF0ZSBuZXcgRm9udFBsYXRmb3JtRGF0YSBmcm9tIG91ciBDR0ZvbnRSZWYs IHBvaW50IHNpemUgYW5kIEFUU0ZvbnRSZWYuCiAgICAgICAgICAgICAgICAgaWYgKCFtX2ZvbnQt PmVuc3VyZUN1c3RvbUZvbnREYXRhKCkpCiAgICAgICAgICAgICAgICAgICAgIHJldHVybiAwOwpJ bmRleDogV2ViQ29yZS9wYWdlL1NldHRpbmdzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3Bh Z2UvU2V0dGluZ3MuY3BwCShyZXZpc2lvbiA0MjU4NCkKKysrIFdlYkNvcmUvcGFnZS9TZXR0aW5n cy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTkwLDYgKzkwLDcgQEAgU2V0dGluZ3M6OlNldHRpbmdz KFBhZ2UqIHBhZ2UpCiAgICAgLCBtX3VzZXNFbmNvZGluZ0RldGVjdG9yKGZhbHNlKQogICAgICwg bV9tYXhpbXVtRGVjb2RlZEltYWdlU2l6ZShzdGQ6Om51bWVyaWNfbGltaXRzPHNpemVfdD46Om1h eCgpKQogICAgICwgbV9hbGxvd1NjcmlwdHNUb0Nsb3NlV2luZG93cyhmYWxzZSkKKyAgICAsIG1f cmVtb3RlRm9udEVuYWJsZWQodHJ1ZSkKIHsKICAgICAvLyBBIEZyYW1lIG1heSBub3QgaGF2ZSBi ZWVuIGNyZWF0ZWQgeWV0LCBzbyB3ZSBpbml0aWFsaXplIHRoZSBBdG9taWNTdHJpbmcgCiAgICAg Ly8gaGFzaCBiZWZvcmUgdHJ5aW5nIHRvIHVzZSBpdC4KQEAgLTQzNSw0ICs0MzYsOSBAQCB2b2lk IFNldHRpbmdzOjpzZXRBbGxvd1NjcmlwdHNUb0Nsb3NlV2luCiAgICAgbV9hbGxvd1NjcmlwdHNU b0Nsb3NlV2luZG93cyA9IGFsbG93U2NyaXB0c1RvQ2xvc2VXaW5kb3dzOwogfQogCit2b2lkIFNl dHRpbmdzOjpzZXRSZW1vdGVGb250RW5hYmxlZChib29sIHJlbW90ZUZvbnRFbmFibGVkKQorewor ICAgIG1fcmVtb3RlRm9udEVuYWJsZWQgPSByZW1vdGVGb250RW5hYmxlZDsKK30KKwogfSAvLyBu YW1lc3BhY2UgV2ViQ29yZQpJbmRleDogV2ViQ29yZS9wYWdlL1NldHRpbmdzLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViQ29yZS9wYWdlL1NldHRpbmdzLmgJKHJldmlzaW9uIDQyNTg0KQorKysgV2ViQ29y ZS9wYWdlL1NldHRpbmdzLmgJKHdvcmtpbmcgY29weSkKQEAgLTIxNCw2ICsyMTQsOSBAQCBuYW1l c3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHZvaWQgc2V0QWxsb3dTY3JpcHRzVG9DbG9zZVdpbmRv d3MoYm9vbCk7CiAgICAgICAgIGJvb2wgYWxsb3dTY3JpcHRzVG9DbG9zZVdpbmRvd3MoKSBjb25z dCB7IHJldHVybiBtX2FsbG93U2NyaXB0c1RvQ2xvc2VXaW5kb3dzOyB9CiAKKyAgICAgICAgdm9p ZCBzZXRSZW1vdGVGb250RW5hYmxlZChib29sKTsKKyAgICAgICAgYm9vbCByZW1vdGVGb250RW5h YmxlZCgpIGNvbnN0IHsgcmV0dXJuIG1fcmVtb3RlRm9udEVuYWJsZWQ7IH0KKwogICAgIHByaXZh dGU6CiAgICAgICAgIFBhZ2UqIG1fcGFnZTsKICAgICAgICAgCkBAIC0yNzAsNiArMjczLDcgQEAg bmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBib29sIG1fdXNlc0VuY29kaW5nRGV0ZWN0b3Ig OiAxOwogICAgICAgICBzaXplX3QgbV9tYXhpbXVtRGVjb2RlZEltYWdlU2l6ZTsKICAgICAgICAg Ym9vbCBtX2FsbG93U2NyaXB0c1RvQ2xvc2VXaW5kb3dzIDogMTsKKyAgICAgICAgYm9vbCBtX3Jl bW90ZUZvbnRFbmFibGVkIDogMTsKIAogI2lmIFVTRShTQUZBUklfVEhFTUUpCiAgICAgICAgIHN0 YXRpYyBib29sIGdTaG91bGRQYWludE5hdGl2ZUNvbnRyb2xzOwo= 29546 2009-04-16 13:18:47 -0700 2009-05-05 22:48:22 -0700 patch 2 with the check moved upstream 25239.patch.2 text/plain 3222 jshin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0MjU4NCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjMgQEAKKzIwMDktMDQtMTYgIEp1bmdzaGlrIFNoaW4gPGpzaGluQGNocm9taXVt Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjUyMzkKKworICAgICAgICBB ZGQgJ21fcmVtb3RlRm9udEVuYWJsZWQnIHRvIFNldHRpbmdzIGNsYXNzIHRvIGVuL2Rpc2FibGUK KyAgICAgICAgcmVtb3RlIHdlYiBmb250IHN1cHBvcnQuIEl0J3MgdHJ1ZSBieSBkZWZhdWx0IChp biBTZXR0aW5ncworICAgICAgICBjbGFzcyBjb25zdHJ1Y3RvcikuCisKKyAgICAgICAgVGhlcmUn cyBubyBiZWhhdmlvciBjaGFuZ2UuIFNvLCBubyBuZXcgdGVzdCBpcyBuZWNlc3NhcnkuCisKKyAg ICAgICAgKiBjc3MvQ1NTRm9udFNlbGVjdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU0Zv bnRTZWxlY3Rvcjo6YWRkRm9udEZhY2VSdWxlKToKKyAgICAgICAgKiBwYWdlL1NldHRpbmdzLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlNldHRpbmdzOjpTZXR0aW5ncyk6CisgICAgICAgIChXZWJD b3JlOjpTZXR0aW5nczo6c2V0UmVtb3RlRm9udEVuYWJsZWQpOgorICAgICAgICAqIHBhZ2UvU2V0 dGluZ3MuaDoKKyAgICAgICAgKFdlYkNvcmU6OlNldHRpbmdzOjpyZW1vdGVGb250RW5hYmxlZCk6 CisKIDIwMDktMDQtMTYgIEp1c3RpbiBHYXJjaWEgIDxqdXN0aW4uZ2FyY2lhQGFwcGxlLmNvbT4K IAogICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBGcmFzZXIuCkluZGV4OiBXZWJDb3JlL2Nzcy9D U1NGb250U2VsZWN0b3IuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvY3NzL0NTU0ZvbnRTZWxl Y3Rvci5jcHAJKHJldmlzaW9uIDQyNTg0KQorKysgV2ViQ29yZS9jc3MvQ1NTRm9udFNlbGVjdG9y LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjQ4LDcgKzI0OCw3IEBAIHZvaWQgQ1NTRm9udFNlbGVj dG9yOjphZGRGb250RmFjZVJ1bGUoY28KICNlbmRpZgogCiAgICAgICAgIGlmICghaXRlbS0+aXNM b2NhbCgpKSB7Ci0gICAgICAgICAgICBpZiAoaXRlbS0+aXNTdXBwb3J0ZWRGb3JtYXQoKSAmJiBt X2RvY3VtZW50KSB7CisgICAgICAgICAgICBpZiAoaXRlbS0+aXNTdXBwb3J0ZWRGb3JtYXQoKSAm JiBtX2RvY3VtZW50ICYmIG1fZG9jdW1lbnQtPnNldHRpbmdzKCktPnJlbW90ZUZvbnRFbmFibGVk KCkpIHsKICAgICAgICAgICAgICAgICBDYWNoZWRGb250KiBjYWNoZWRGb250ID0gbV9kb2N1bWVu dC0+ZG9jTG9hZGVyKCktPnJlcXVlc3RGb250KGl0ZW0tPnJlc291cmNlKCkpOwogICAgICAgICAg ICAgICAgIGlmIChjYWNoZWRGb250KSB7CiAjaWYgRU5BQkxFKFNWR19GT05UUykKSW5kZXg6IFdl YkNvcmUvcGFnZS9TZXR0aW5ncy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wYWdlL1NldHRp bmdzLmNwcAkocmV2aXNpb24gNDI1ODQpCisrKyBXZWJDb3JlL3BhZ2UvU2V0dGluZ3MuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC05MCw2ICs5MCw3IEBAIFNldHRpbmdzOjpTZXR0aW5ncyhQYWdlKiBw YWdlKQogICAgICwgbV91c2VzRW5jb2RpbmdEZXRlY3RvcihmYWxzZSkKICAgICAsIG1fbWF4aW11 bURlY29kZWRJbWFnZVNpemUoc3RkOjpudW1lcmljX2xpbWl0czxzaXplX3Q+OjptYXgoKSkKICAg ICAsIG1fYWxsb3dTY3JpcHRzVG9DbG9zZVdpbmRvd3MoZmFsc2UpCisgICAgLCBtX3JlbW90ZUZv bnRFbmFibGVkKHRydWUpCiB7CiAgICAgLy8gQSBGcmFtZSBtYXkgbm90IGhhdmUgYmVlbiBjcmVh dGVkIHlldCwgc28gd2UgaW5pdGlhbGl6ZSB0aGUgQXRvbWljU3RyaW5nIAogICAgIC8vIGhhc2gg YmVmb3JlIHRyeWluZyB0byB1c2UgaXQuCkBAIC00MzUsNCArNDM2LDkgQEAgdm9pZCBTZXR0aW5n czo6c2V0QWxsb3dTY3JpcHRzVG9DbG9zZVdpbgogICAgIG1fYWxsb3dTY3JpcHRzVG9DbG9zZVdp bmRvd3MgPSBhbGxvd1NjcmlwdHNUb0Nsb3NlV2luZG93czsKIH0KIAordm9pZCBTZXR0aW5nczo6 c2V0UmVtb3RlRm9udEVuYWJsZWQoYm9vbCByZW1vdGVGb250RW5hYmxlZCkKK3sKKyAgICBtX3Jl bW90ZUZvbnRFbmFibGVkID0gcmVtb3RlRm9udEVuYWJsZWQ7Cit9CisKIH0gLy8gbmFtZXNwYWNl IFdlYkNvcmUKSW5kZXg6IFdlYkNvcmUvcGFnZS9TZXR0aW5ncy5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YkNvcmUvcGFnZS9TZXR0aW5ncy5oCShyZXZpc2lvbiA0MjU4NCkKKysrIFdlYkNvcmUvcGFnZS9T ZXR0aW5ncy5oCSh3b3JraW5nIGNvcHkpCkBAIC0yMTQsNiArMjE0LDkgQEAgbmFtZXNwYWNlIFdl YkNvcmUgewogICAgICAgICB2b2lkIHNldEFsbG93U2NyaXB0c1RvQ2xvc2VXaW5kb3dzKGJvb2wp OwogICAgICAgICBib29sIGFsbG93U2NyaXB0c1RvQ2xvc2VXaW5kb3dzKCkgY29uc3QgeyByZXR1 cm4gbV9hbGxvd1NjcmlwdHNUb0Nsb3NlV2luZG93czsgfQogCisgICAgICAgIHZvaWQgc2V0UmVt b3RlRm9udEVuYWJsZWQoYm9vbCk7CisgICAgICAgIGJvb2wgcmVtb3RlRm9udEVuYWJsZWQoKSBj b25zdCB7IHJldHVybiBtX3JlbW90ZUZvbnRFbmFibGVkOyB9CisKICAgICBwcml2YXRlOgogICAg ICAgICBQYWdlKiBtX3BhZ2U7CiAgICAgICAgIApAQCAtMjcwLDYgKzI3Myw3IEBAIG5hbWVzcGFj ZSBXZWJDb3JlIHsKICAgICAgICAgYm9vbCBtX3VzZXNFbmNvZGluZ0RldGVjdG9yIDogMTsKICAg ICAgICAgc2l6ZV90IG1fbWF4aW11bURlY29kZWRJbWFnZVNpemU7CiAgICAgICAgIGJvb2wgbV9h bGxvd1NjcmlwdHNUb0Nsb3NlV2luZG93cyA6IDE7CisgICAgICAgIGJvb2wgbV9yZW1vdGVGb250 RW5hYmxlZCA6IDE7CiAKICNpZiBVU0UoU0FGQVJJX1RIRU1FKQogICAgICAgICBzdGF0aWMgYm9v bCBnU2hvdWxkUGFpbnROYXRpdmVDb250cm9sczsK 29894 2009-04-29 14:10:31 -0700 2009-05-15 12:57:35 -0700 patch updated addressing mitz' comments 25239.patch.2 text/plain 3156 jshin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0Mjk0NCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjEgQEAKKzIwMDktMDQtMjkgIEp1bmdzaGlrIFNoaW4gPGpzaGluQGNocm9taXVt Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBEYW4gQmVybnN0ZWluCisKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI1MjM5CisKKyAgICAgICAgQWRk ICdtX3JlbW90ZUZvbnRzRW5hYmxlZCcgdG8gU2V0dGluZ3MgY2xhc3MgdG8gZW4vZGlzYWJsZQor ICAgICAgICByZW1vdGUgd2ViIGZvbnQgc3VwcG9ydC4gSXQncyB0cnVlIGJ5IGRlZmF1bHQgKGlu IFNldHRpbmdzCisgICAgICAgIGNsYXNzIGNvbnN0cnVjdG9yKS4KKworICAgICAgICAqIGNzcy9D U1NGb250U2VsZWN0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NTRm9udFNlbGVjdG9yOjph ZGRGb250RmFjZVJ1bGUpOgorICAgICAgICAqIHBhZ2UvU2V0dGluZ3MuY3BwOgorICAgICAgICAo V2ViQ29yZTo6U2V0dGluZ3M6OlNldHRpbmdzKToKKyAgICAgICAgKFdlYkNvcmU6OlNldHRpbmdz OjpzZXRSZW1vdGVGb250c0VuYWJsZWQpOgorICAgICAgICAqIHBhZ2UvU2V0dGluZ3MuaDoKKyAg ICAgICAgKFdlYkNvcmU6OlNldHRpbmdzOjpyZW1vdGVGb250c0VuYWJsZWQpOgorCiAyMDA5LTA0 LTI4ICBTdGV2ZSBGYWxrZW5idXJnICA8c2ZhbGtlbkBhcHBsZS5jb20+CiAKICAgICAgICAgRml4 IGxpbmtlciB3YXJuaW5nIGJ5IHNwZWNpZnlpbmcgL05PREVGQVVMVExJQjpMSUJDTVQgZm9yIFFU TW92aWVXaW4uCkluZGV4OiBXZWJDb3JlL2Nzcy9DU1NGb250U2VsZWN0b3IuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYkNvcmUvY3NzL0NTU0ZvbnRTZWxlY3Rvci5jcHAJKHJldmlzaW9uIDQyOTQ0KQor KysgV2ViQ29yZS9jc3MvQ1NTRm9udFNlbGVjdG9yLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjQ4 LDcgKzI0OCw3IEBAIHZvaWQgQ1NTRm9udFNlbGVjdG9yOjphZGRGb250RmFjZVJ1bGUoY28KICNl bmRpZgogCiAgICAgICAgIGlmICghaXRlbS0+aXNMb2NhbCgpKSB7Ci0gICAgICAgICAgICBpZiAo aXRlbS0+aXNTdXBwb3J0ZWRGb3JtYXQoKSAmJiBtX2RvY3VtZW50KSB7CisgICAgICAgICAgICBp ZiAoaXRlbS0+aXNTdXBwb3J0ZWRGb3JtYXQoKSAmJiBtX2RvY3VtZW50ICYmIG1fZG9jdW1lbnQt PnNldHRpbmdzKCktPnJlbW90ZUZvbnRzRW5hYmxlZCgpKSB7CiAgICAgICAgICAgICAgICAgQ2Fj aGVkRm9udCogY2FjaGVkRm9udCA9IG1fZG9jdW1lbnQtPmRvY0xvYWRlcigpLT5yZXF1ZXN0Rm9u dChpdGVtLT5yZXNvdXJjZSgpKTsKICAgICAgICAgICAgICAgICBpZiAoY2FjaGVkRm9udCkgewog I2lmIEVOQUJMRShTVkdfRk9OVFMpCkluZGV4OiBXZWJDb3JlL3BhZ2UvU2V0dGluZ3MuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYkNvcmUvcGFnZS9TZXR0aW5ncy5jcHAJKHJldmlzaW9uIDQyOTQ0KQor KysgV2ViQ29yZS9wYWdlL1NldHRpbmdzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTAwLDYgKzEw MCw3IEBAIFNldHRpbmdzOjpTZXR0aW5ncyhQYWdlKiBwYWdlKQogICAgICAgICBFZGl0aW5nV2lu ZG93c0JlaGF2aW9yCiAjZW5kaWYKICAgICAgICAgKQorICAgICwgbV9yZW1vdGVGb250c0VuYWJs ZWQodHJ1ZSkKIHsKICAgICAvLyBBIEZyYW1lIG1heSBub3QgaGF2ZSBiZWVuIGNyZWF0ZWQgeWV0 LCBzbyB3ZSBpbml0aWFsaXplIHRoZSBBdG9taWNTdHJpbmcgCiAgICAgLy8gaGFzaCBiZWZvcmUg dHJ5aW5nIHRvIHVzZSBpdC4KQEAgLTQ1MCw0ICs0NTEsOSBAQCB2b2lkIFNldHRpbmdzOjpzZXRD YXJldEJyb3dzaW5nRW5hYmxlZChiCiAgICAgbV9jYXJldEJyb3dzaW5nRW5hYmxlZCA9IGNhcmV0 QnJvd3NpbmdFbmFibGVkOwogfQogCit2b2lkIFNldHRpbmdzOjpzZXRSZW1vdGVGb250c0VuYWJs ZWQoYm9vbCByZW1vdGVGb250c0VuYWJsZWQpCit7CisgICAgbV9yZW1vdGVGb250c0VuYWJsZWQg PSByZW1vdGVGb250c0VuYWJsZWQ7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKSW5kZXg6 IFdlYkNvcmUvcGFnZS9TZXR0aW5ncy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGFnZS9TZXR0 aW5ncy5oCShyZXZpc2lvbiA0Mjk0NCkKKysrIFdlYkNvcmUvcGFnZS9TZXR0aW5ncy5oCSh3b3Jr aW5nIGNvcHkpCkBAIC0yMzUsNiArMjM1LDkgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAg ICB2b2lkIHNldEVkaXRpbmdCZWhhdmlvcihFZGl0aW5nQmVoYXZpb3IgYmVoYXZpb3IpIHsgbV9l ZGl0aW5nQmVoYXZpb3IgPSBiZWhhdmlvcjsgfQogICAgICAgICBFZGl0aW5nQmVoYXZpb3IgZWRp dGluZ0JlaGF2aW9yKCkgY29uc3QgeyByZXR1cm4gc3RhdGljX2Nhc3Q8RWRpdGluZ0JlaGF2aW9y PihtX2VkaXRpbmdCZWhhdmlvcik7IH0KIAorICAgICAgICB2b2lkIHNldFJlbW90ZUZvbnRzRW5h YmxlZChib29sKTsKKyAgICAgICAgYm9vbCByZW1vdGVGb250c0VuYWJsZWQoKSBjb25zdCB7IHJl dHVybiBtX3JlbW90ZUZvbnRzRW5hYmxlZDsgfQorCiAgICAgcHJpdmF0ZToKICAgICAgICAgUGFn ZSogbV9wYWdlOwogICAgICAgICAKQEAgLTI5Myw2ICsyOTYsNyBAQCBuYW1lc3BhY2UgV2ViQ29y ZSB7CiAgICAgICAgIGJvb2wgbV91c2VzRW5jb2RpbmdEZXRlY3RvciA6IDE7CiAgICAgICAgIGJv b2wgbV9hbGxvd1NjcmlwdHNUb0Nsb3NlV2luZG93cyA6IDE7CiAgICAgICAgIHVuc2lnbmVkIG1f ZWRpdGluZ0JlaGF2aW9yIDogMTsKKyAgICAgICAgYm9vbCBtX3JlbW90ZUZvbnRzRW5hYmxlZCA6 IDE7CiAKICNpZiBVU0UoU0FGQVJJX1RIRU1FKQogICAgICAgICBzdGF0aWMgYm9vbCBnU2hvdWxk UGFpbnROYXRpdmVDb250cm9sczsK 30397 2009-05-15 13:02:48 -0700 2009-05-15 13:13:31 -0700 my patch for this downloadable-fonts-disable-2.patch text/plain 8904 koivisto SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0Mzc2MSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTMgQEAKKzIwMDktMDUtMTUgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFk ZCBhIHNldHRpbmdzIGVudHJ5IHRvIGVuL2Rpc2FibGUgd2ViIGZvbnQgc3VwcG9ydAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjUyMzkKKworICAgICAg ICAqIGNzcy9DU1NGb250U2VsZWN0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NTRm9udFNl bGVjdG9yOjphZGRGb250RmFjZVJ1bGUpOgorCiAyMDA5LTA1LTE1ICBMYXN6bG8gR29tYm9zICA8 bGFzemxvLjEuZ29tYm9zQG5va2lhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBB ZGxlci4KSW5kZXg6IFdlYkNvcmUvV2ViQ29yZS5iYXNlLmV4cAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJD b3JlL1dlYkNvcmUuYmFzZS5leHAJKHJldmlzaW9uIDQzNzU1KQorKysgV2ViQ29yZS9XZWJDb3Jl LmJhc2UuZXhwCSh3b3JraW5nIGNvcHkpCkBAIC02NTUsNiArNjU1LDcgQEAgX19aTjdXZWJDb3Jl OFNldHRpbmdzMzZzZXRPZmZsaW5lV2ViQXBwbAogX19aTjdXZWJDb3JlOFNldHRpbmdzNDBzZXRK YXZhU2NyaXB0Q2FuT3BlbldpbmRvd3NBdXRvbWF0aWNhbGx5RWIKIF9fWk43V2ViQ29yZThTZXR0 aW5nczQwc2V0VGV4dERpcmVjdGlvblN1Ym1lbnVJbmNsdXNpb25CZWhhdmlvckVOU18zN1RleHRE aXJlY3Rpb25TdWJtZW51SW5jbHVzaW9uQmVoYXZpb3JFCiBfX1pON1dlYkNvcmU4U2V0dGluZ3M0 MXNldE5lZWRzS2V5Ym9hcmRFdmVudERpc2FtYmlndWF0aW9uUXVpcmtzRWIKK19fWk43V2ViQ29y ZThTZXR0aW5nczMzc2V0RG93bmxvYWRhYmxlQmluYXJ5Rm9udHNFbmFibGVkRWIKIF9fWk43V2Vi Q29yZThibGFua1VSTEV2CiBfX1pON1dlYkNvcmU4cGFyc2VVUkxFUktOU182U3RyaW5nRQogX19a TjdXZWJDb3JlOURPTVdpbmRvdzMwZGlzcGF0Y2hBbGxQZW5kaW5nVW5sb2FkRXZlbnRzRXYKSW5k ZXg6IFdlYkNvcmUvY3NzL0NTU0ZvbnRTZWxlY3Rvci5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29y ZS9jc3MvQ1NTRm9udFNlbGVjdG9yLmNwcAkocmV2aXNpb24gNDM3NTUpCisrKyBXZWJDb3JlL2Nz cy9DU1NGb250U2VsZWN0b3IuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMzMsMTAgKzIzMyw3IEBA IHZvaWQgQ1NTRm9udFNlbGVjdG9yOjphZGRGb250RmFjZVJ1bGUoY28KICAgICBpbnQgc3JjTGVu Z3RoID0gc3JjTGlzdC0+bGVuZ3RoKCk7CiAKICAgICBib29sIGZvdW5kTG9jYWwgPSBmYWxzZTsK LQotI2lmIEVOQUJMRShTVkdfRk9OVFMpCiAgICAgYm9vbCBmb3VuZFNWR0ZvbnQgPSBmYWxzZTsK LSNlbmRpZgogCiAgICAgZm9yIChpbnQgaSA9IDA7IGkgPCBzcmNMZW5ndGg7IGkrKykgewogICAg ICAgICAvLyBBbiBpdGVtIGluIHRoZSBsaXN0IGVpdGhlciBzcGVjaWZpZXMgYSBzdHJpbmcgKGxv Y2FsIGZvbnQgbmFtZSkgb3IgYSBVUkwgKHJlbW90ZSBmb250IHRvIGRvd25sb2FkKS4KQEAgLTI0 Niw5ICsyNDMsMTAgQEAgdm9pZCBDU1NGb250U2VsZWN0b3I6OmFkZEZvbnRGYWNlUnVsZShjbwog I2lmIEVOQUJMRShTVkdfRk9OVFMpCiAgICAgICAgIGZvdW5kU1ZHRm9udCA9IGl0ZW0tPmlzU1ZH Rm9udEZhY2VTcmMoKSB8fCBpdGVtLT5zdmdGb250RmFjZUVsZW1lbnQoKTsKICNlbmRpZgotCiAg ICAgICAgIGlmICghaXRlbS0+aXNMb2NhbCgpKSB7Ci0gICAgICAgICAgICBpZiAoaXRlbS0+aXNT dXBwb3J0ZWRGb3JtYXQoKSAmJiBtX2RvY3VtZW50KSB7CisgICAgICAgICAgICBTZXR0aW5ncyog c2V0dGluZ3MgPSBtX2RvY3VtZW50ID8gbV9kb2N1bWVudC0+ZnJhbWUoKSA/IG1fZG9jdW1lbnQt PmZyYW1lKCktPnNldHRpbmdzKCkgOiAwIDogMDsKKyAgICAgICAgICAgIGJvb2wgYWxsb3dEb3du bG9hZGluZyA9IGZvdW5kU1ZHRm9udCB8fCAoc2V0dGluZ3MgJiYgc2V0dGluZ3MtPmRvd25sb2Fk YWJsZUJpbmFyeUZvbnRzRW5hYmxlZCgpKTsKKyAgICAgICAgICAgIGlmIChhbGxvd0Rvd25sb2Fk aW5nICYmIGl0ZW0tPmlzU3VwcG9ydGVkRm9ybWF0KCkgJiYgbV9kb2N1bWVudCkgewogICAgICAg ICAgICAgICAgIENhY2hlZEZvbnQqIGNhY2hlZEZvbnQgPSBtX2RvY3VtZW50LT5kb2NMb2FkZXIo KS0+cmVxdWVzdEZvbnQoaXRlbS0+cmVzb3VyY2UoKSk7CiAgICAgICAgICAgICAgICAgaWYgKGNh Y2hlZEZvbnQpIHsKICNpZiBFTkFCTEUoU1ZHX0ZPTlRTKQpJbmRleDogV2ViQ29yZS9wYWdlL1Nl dHRpbmdzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BhZ2UvU2V0dGluZ3MuY3BwCShyZXZp c2lvbiA0Mzc1NSkKKysrIFdlYkNvcmUvcGFnZS9TZXR0aW5ncy5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTEwMCw2ICsxMDAsNyBAQCBTZXR0aW5nczo6U2V0dGluZ3MoUGFnZSogcGFnZSkKICAgICAg ICAgRWRpdGluZ1dpbmRvd3NCZWhhdmlvcgogI2VuZGlmCiAgICAgICAgICkKKyAgICAsIG1fZG93 bmxvYWRhYmxlQmluYXJ5Rm9udHNFbmFibGVkKGZhbHNlKQogewogICAgIC8vIEEgRnJhbWUgbWF5 IG5vdCBoYXZlIGJlZW4gY3JlYXRlZCB5ZXQsIHNvIHdlIGluaXRpYWxpemUgdGhlIEF0b21pY1N0 cmluZyAKICAgICAvLyBoYXNoIGJlZm9yZSB0cnlpbmcgdG8gdXNlIGl0LgpAQCAtNDUwLDQgKzQ1 MSw5IEBAIHZvaWQgU2V0dGluZ3M6OnNldENhcmV0QnJvd3NpbmdFbmFibGVkKGIKICAgICBtX2Nh cmV0QnJvd3NpbmdFbmFibGVkID0gY2FyZXRCcm93c2luZ0VuYWJsZWQ7CiB9CiAKK3ZvaWQgU2V0 dGluZ3M6OnNldERvd25sb2FkYWJsZUJpbmFyeUZvbnRzRW5hYmxlZChib29sIGRvd25sb2FkYWJs ZUJpbmFyeUZvbnRzRW5hYmxlZCkKK3sKKyAgICBtX2Rvd25sb2FkYWJsZUJpbmFyeUZvbnRzRW5h YmxlZCA9IGRvd25sb2FkYWJsZUJpbmFyeUZvbnRzRW5hYmxlZDsKK30KKwogfSAvLyBuYW1lc3Bh Y2UgV2ViQ29yZQpJbmRleDogV2ViQ29yZS9wYWdlL1NldHRpbmdzLmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViQ29yZS9wYWdlL1NldHRpbmdzLmgJKHJldmlzaW9uIDQzNzU1KQorKysgV2ViQ29yZS9wYWdl L1NldHRpbmdzLmgJKHdvcmtpbmcgY29weSkKQEAgLTIzNCw2ICsyMzQsOSBAQCBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAKICAgICAgICAgdm9pZCBzZXRFZGl0aW5nQmVoYXZpb3IoRWRpdGluZ0JlaGF2 aW9yIGJlaGF2aW9yKSB7IG1fZWRpdGluZ0JlaGF2aW9yID0gYmVoYXZpb3I7IH0KICAgICAgICAg RWRpdGluZ0JlaGF2aW9yIGVkaXRpbmdCZWhhdmlvcigpIGNvbnN0IHsgcmV0dXJuIHN0YXRpY19j YXN0PEVkaXRpbmdCZWhhdmlvcj4obV9lZGl0aW5nQmVoYXZpb3IpOyB9CisgICAgICAgIAorICAg ICAgICB2b2lkIHNldERvd25sb2FkYWJsZUJpbmFyeUZvbnRzRW5hYmxlZChib29sKTsKKyAgICAg ICAgYm9vbCBkb3dubG9hZGFibGVCaW5hcnlGb250c0VuYWJsZWQoKSBjb25zdCB7IHJldHVybiBt X2Rvd25sb2FkYWJsZUJpbmFyeUZvbnRzRW5hYmxlZDsgfQogCiAgICAgcHJpdmF0ZToKICAgICAg ICAgUGFnZSogbV9wYWdlOwpAQCAtMjkzLDYgKzI5Niw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsK ICAgICAgICAgYm9vbCBtX3VzZXNFbmNvZGluZ0RldGVjdG9yIDogMTsKICAgICAgICAgYm9vbCBt X2FsbG93U2NyaXB0c1RvQ2xvc2VXaW5kb3dzIDogMTsKICAgICAgICAgdW5zaWduZWQgbV9lZGl0 aW5nQmVoYXZpb3IgOiAxOworICAgICAgICBib29sIG1fZG93bmxvYWRhYmxlQmluYXJ5Rm9udHNF bmFibGVkIDogMTsKIAogI2lmIFVTRShTQUZBUklfVEhFTUUpCiAgICAgICAgIHN0YXRpYyBib29s IGdTaG91bGRQYWludE5hdGl2ZUNvbnRyb2xzOwpJbmRleDogV2ViS2l0L21hYy9DaGFuZ2VMb2cK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViS2l0L21hYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDQzNzc4KQorKysg V2ViS2l0L21hYy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxOSBAQAorMjAw OS0wNS0xNSAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGEgc2V0dGluZ3MgZW50cnkg dG8gZW4vZGlzYWJsZSB3ZWIgZm9udCBzdXBwb3J0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNTIzOQorCisgICAgICAgICogV2ViVmlldy9XZWJQcmVm ZXJlbmNlS2V5c1ByaXZhdGUuaDoKKyAgICAgICAgKiBXZWJWaWV3L1dlYlByZWZlcmVuY2VzLm1t OgorICAgICAgICAoK1tXZWJQcmVmZXJlbmNlcyBpbml0aWFsaXplXSk6CisgICAgICAgICgtW1dl YlByZWZlcmVuY2VzIGRvd25sb2FkYWJsZUJpbmFyeUZvbnRzRW5hYmxlZF0pOgorICAgICAgICAo LVtXZWJQcmVmZXJlbmNlcyBzZXREb3dubG9hZGFibGVCaW5hcnlGb250c0VuYWJsZWQ6XSk6Cisg ICAgICAgICogV2ViVmlldy9XZWJQcmVmZXJlbmNlc1ByaXZhdGUuaDoKKyAgICAgICAgKiBXZWJW aWV3L1dlYlZpZXcubW06CisgICAgICAgICgtW1dlYlZpZXcgX3ByZWZlcmVuY2VzQ2hhbmdlZE5v dGlmaWNhdGlvbjpdKToKKwogMjAwOS0wNS0xNSAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5j b20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQW5kZXJzIENhcmxzc29uLgpJbmRleDogV2ViS2l0 L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2VLZXlzUHJpdmF0ZS5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YktpdC9tYWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlS2V5c1ByaXZhdGUuaAkocmV2aXNpb24gNDM3 NTUpCisrKyBXZWJLaXQvbWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5jZUtleXNQcml2YXRlLmgJKHdv cmtpbmcgY29weSkKQEAgLTkyLDYgKzkyLDcgQEAKICNkZWZpbmUgV2ViS2l0RWRpdGFibGVMaW5r QmVoYXZpb3JQcmVmZXJlbmNlS2V5IEAiV2ViS2l0RWRpdGFibGVMaW5rQmVoYXZpb3IiCiAjZGVm aW5lIFdlYktpdENhY2hlTW9kZWxQcmVmZXJlbmNlS2V5IEAiV2ViS2l0Q2FjaGVNb2RlbFByZWZl cmVuY2VLZXkiCiAjZGVmaW5lIFdlYktpdFRleHREaXJlY3Rpb25TdWJtZW51SW5jbHVzaW9uQmVo YXZpb3JQcmVmZXJlbmNlS2V5IEAiV2ViS2l0VGV4dERpcmVjdGlvblN1Ym1lbnVJbmNsdXNpb25C ZWhhdmlvclByZWZlcmVuY2VLZXkiCisjZGVmaW5lIFdlYktpdERvd25sb2FkYWJsZUJpbmFyeUZv bnRzRW5hYmxlZFByZWZlcmVuY2VLZXkgQCJXZWJLaXREb3dubG9hZGFibGVCaW5hcnlGb250c0Vu YWJsZWRQcmVmZXJlbmNlS2V5IgogCiAvLyBDb3JlR3JhcGhpY3MgZGVmZXJyZWQgdXBkYXRlcyBh cmUgZGlzYWJsZWQgaWYgV2ViS2l0RW5hYmxlQ29hbGVzY2VkVXBkYXRlc1ByZWZlcmVuY2VLZXkg aXMgc2V0CiAvLyB0byBOTywgb3IgaGFzIG5vIHZhbHVlLiAgRm9yIGNvbXBhdGliaWxpdHkgd2l0 aCBNYWMgT1MgWCAxMC40LjYsIGRlZmVycmVkIHVwZGF0ZXMgYXJlIE9GRiBieQpJbmRleDogV2Vi S2l0L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2VzLm1tCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9t YWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlcy5tbQkocmV2aXNpb24gNDM3NTUpCisrKyBXZWJLaXQv bWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5jZXMubW0JKHdvcmtpbmcgY29weSkKQEAgLTM0Nyw2ICsz NDcsNyBAQCBzdGF0aWMgV2ViQ2FjaGVNb2RlbCBjYWNoZU1vZGVsRm9yTWFpbkJ1CiAgICAgICAg IFtOU051bWJlciBudW1iZXJXaXRoQm9vbDpOT10sICAgV2ViS2l0V2ViQXJjaGl2ZURlYnVnTW9k ZUVuYWJsZWRQcmVmZXJlbmNlS2V5LAogICAgICAgICBbTlNOdW1iZXIgbnVtYmVyV2l0aEJvb2w6 Tk9dLCAgIFdlYktpdE9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlRW5hYmxlZFByZWZlcmVuY2VL ZXksCiAgICAgICAgIFtOU051bWJlciBudW1iZXJXaXRoQm9vbDpZRVNdLCAgV2ViS2l0Wm9vbXNU ZXh0T25seVByZWZlcmVuY2VLZXksCisgICAgICAgIFtOU051bWJlciBudW1iZXJXaXRoQm9vbDpZ RVNdLCAgV2ViS2l0RG93bmxvYWRhYmxlQmluYXJ5Rm9udHNFbmFibGVkUHJlZmVyZW5jZUtleSwK ICAgICAgICAgbmlsXTsKIAogICAgIC8vIFRoaXMgdmFsdWUgc2hvdWxkbid0IGV2ZXIgY2hhbmdl LCB3aGljaCBpcyBhc3N1bWVkIGluIHRoZSBpbml0aWFsaXphdGlvbiBvZiBXZWJLaXRQREZEaXNw bGF5TW9kZVByZWZlcmVuY2VLZXkgYWJvdmUKQEAgLTk4OCw2ICs5ODksMTYgQEAgc3RhdGljIFdl YkNhY2hlTW9kZWwgY2FjaGVNb2RlbEZvck1haW5CdQogICAgIFtzZWxmIF9zZXRCb29sVmFsdWU6 bG9jYWxTdG9yYWdlRW5hYmxlZCBmb3JLZXk6V2ViS2l0TG9jYWxTdG9yYWdlRW5hYmxlZFByZWZl cmVuY2VLZXldOwogfQogCistIChCT09MKWRvd25sb2FkYWJsZUJpbmFyeUZvbnRzRW5hYmxlZAor eworICAgIHJldHVybiBbc2VsZiBfYm9vbFZhbHVlRm9yS2V5OldlYktpdERvd25sb2FkYWJsZUJp bmFyeUZvbnRzRW5hYmxlZFByZWZlcmVuY2VLZXldOworfQorCistICh2b2lkKXNldERvd25sb2Fk YWJsZUJpbmFyeUZvbnRzRW5hYmxlZDooQk9PTClkb3dubG9hZGFibGVCaW5hcnlGb250c0VuYWJs ZWQKK3sKKyAgICBbc2VsZiBfc2V0Qm9vbFZhbHVlOmRvd25sb2FkYWJsZUJpbmFyeUZvbnRzRW5h YmxlZCBmb3JLZXk6V2ViS2l0RG93bmxvYWRhYmxlQmluYXJ5Rm9udHNFbmFibGVkUHJlZmVyZW5j ZUtleV07Cit9CisKICsgKFdlYlByZWZlcmVuY2VzICopX2dldEluc3RhbmNlRm9ySWRlbnRpZmll cjooTlNTdHJpbmcgKilpZGVudAogewogICAgIExPRyhFbmNvZGluZywgInJlcXVlc3RpbmcgZm9y ICVAXG4iLCBpZGVudCk7CkluZGV4OiBXZWJLaXQvbWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5jZXNQ cml2YXRlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2Vz UHJpdmF0ZS5oCShyZXZpc2lvbiA0Mzc1NSkKKysrIFdlYktpdC9tYWMvV2ViVmlldy9XZWJQcmVm ZXJlbmNlc1ByaXZhdGUuaAkod29ya2luZyBjb3B5KQpAQCAtMTExLDYgKzExMSw5IEBAIGV4dGVy biBOU1N0cmluZyAqV2ViUHJlZmVyZW5jZXNSZW1vdmVkTm8KIC0gKFdlYlRleHREaXJlY3Rpb25T dWJtZW51SW5jbHVzaW9uQmVoYXZpb3IpdGV4dERpcmVjdGlvblN1Ym1lbnVJbmNsdXNpb25CZWhh dmlvcjsKIC0gKHZvaWQpc2V0VGV4dERpcmVjdGlvblN1Ym1lbnVJbmNsdXNpb25CZWhhdmlvcjoo V2ViVGV4dERpcmVjdGlvblN1Ym1lbnVJbmNsdXNpb25CZWhhdmlvciliZWhhdmlvcjsKIAorLSAo Qk9PTClkb3dubG9hZGFibGVCaW5hcnlGb250c0VuYWJsZWQ7CistICh2b2lkKXNldERvd25sb2Fk YWJsZUJpbmFyeUZvbnRzRW5hYmxlZDooQk9PTClmbGFnOworCiAvLyBJZiBzaXRlLXNwZWNpZmlj IHNwb29maW5nIGlzIGVuYWJsZWQsIHNvbWUgcGFnZXMgdGhhdCBkbyBpbmFwcHJvcHJpYXRlIHVz ZXItYWdlbnQgc3RyaW5nIGNoZWNrcyB3aWxsIGJlCiAvLyBwYXNzZWQgYSBub25zdGFuZGFyZCB1 c2VyLWFnZW50IHN0cmluZyB0byBnZXQgdGhlbSB0byB3b3JrIGNvcnJlY3RseS4gVGhpcyBtZXRo b2QgbWlnaHQgYmUgcmVtb3ZlZCBpbgogLy8gdGhlIGZ1dHVyZSB3aGVuIHRoZXJlJ3Mgbm8gbW9y ZSBuZWVkIGZvciBpdC4KSW5kZXg6IFdlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCShyZXZpc2lvbiA0Mzc1NSkK KysrIFdlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xNDYx LDYgKzE0NjEsNyBAQCBzdGF0aWMgYm9vbCBmYXN0RG9jdW1lbnRUZWFyZG93bkVuYWJsZWQoCiAg ICAgc2V0dGluZ3MtPnNldE9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlRW5hYmxlZChbcHJlZmVy ZW5jZXMgb2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2FjaGVFbmFibGVkXSk7CiAgICAgc2V0dGluZ3Mt PnNldFpvb21zVGV4dE9ubHkoW3ByZWZlcmVuY2VzIHpvb21zVGV4dE9ubHldKTsKICAgICBzZXR0 aW5ncy0+c2V0RW5mb3JjZUNTU01JTUVUeXBlSW5TdHJpY3RNb2RlKCFXS0FwcFZlcnNpb25DaGVj a0xlc3NUaGFuKEAiY29tLmFwcGxlLmlXZWIiLCAtMSwgMi4xKSk7CisgICAgc2V0dGluZ3MtPnNl dERvd25sb2FkYWJsZUJpbmFyeUZvbnRzRW5hYmxlZChbcHJlZmVyZW5jZXMgZG93bmxvYWRhYmxl QmluYXJ5Rm9udHNFbmFibGVkXSk7CiB9CiAKIHN0YXRpYyBpbmxpbmUgSU1QIGdldE1ldGhvZChp ZCBvLCBTRUwgcykK