76444 2012-01-17 05:10:04 -0800 CSS Shaders: Add a Settings flag to enable/disable CSS Shaders at runtime 2012-01-20 13:28:27 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 achicu achicu aroben cmarrin dino macpherson simon.fraser webkit.review.bot oldest_to_newest 537029 0 achicu 2012-01-17 05:10:04 -0800 See the summary. We need a new setting to disable the feature at runtime in order to enable CSS Shaders on more platforms. Right now shaders only build on Apple Mac platform. 537106 1 122771 achicu 2012-01-17 07:59:19 -0800 Created attachment 122771 Patch V1 537719 2 122771 zimmermann 2012-01-18 01:52:33 -0800 Comment on attachment 122771 Patch V1 View in context: https://bugs.webkit.org/attachment.cgi?id=122771&action=review Looks sane, r=me with some comments: > Source/WebCore/css/CSSParser.cpp:6914 > + if (findDocument()) { if (Document* document = findDocument()) { Settings* settings = document->settings().... > Source/WebKit2/UIProcess/API/C/WKPreferencesPrivate.h:83 > // Defaults to false. This comment is not correct, eh? Please update it to true. 539305 3 achicu 2012-01-19 23:47:39 -0800 Landed in 105485: http://trac.webkit.org/changeset/105485 Closing bug. 539641 4 122771 aroben 2012-01-20 11:18:48 -0800 Comment on attachment 122771 Patch V1 View in context: https://bugs.webkit.org/attachment.cgi?id=122771&action=review > Source/WebKit/mac/WebView/WebPreferencesPrivate.h:192 > +#if ENABLE(CSS_SHADERS) > +- (BOOL)cssCustomFilterEnabled; > +- (void)setCSSCustomFilterEnabled:(BOOL)enabled; > +#endif We can't expose ENABLE() settings to WebKit clients (even those using private headers). WebKit clients don't have a way of knowing what features were enabled when WebKit was compiled. I think we need to remove the #if and always implement these methods. 539658 5 simon.fraser 2012-01-20 11:44:29 -0800 This (or another filters patch) broke some tests, like css3/filters/custom-filter-property-computed-style.html 539692 6 achicu 2012-01-20 12:17:36 -0800 (In reply to comment #4) > (From update of attachment 122771 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=122771&action=review > > > Source/WebKit/mac/WebView/WebPreferencesPrivate.h:192 > > +#if ENABLE(CSS_SHADERS) > > +- (BOOL)cssCustomFilterEnabled; > > +- (void)setCSSCustomFilterEnabled:(BOOL)enabled; > > +#endif > > We can't expose ENABLE() settings to WebKit clients (even those using private headers). WebKit clients don't have a way of knowing what features were enabled when WebKit was compiled. I think we need to remove the #if and always implement these methods. The methods in Settings.cpp are always compiled, so I just forgot to remove the ifdefs from all the places. Sorry about that, I will fix it tomorrow. 539743 7 simon.fraser 2012-01-20 13:16:32 -0800 Since this is breaking apple-internal builds, it needs to be fixed ASAP. I'll do it. 539746 8 simon.fraser 2012-01-20 13:19:53 -0800 Fixed in http://trac.webkit.org/changeset/105540. 539754 9 achicu 2012-01-20 13:28:27 -0800 (In reply to comment #8) > Fixed in http://trac.webkit.org/changeset/105540. Thanks! 122771 2012-01-17 07:59:19 -0800 2012-01-20 11:18:48 -0800 Patch V1 bug76444.patch text/plain 21027 achicu ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA0ZjNhYzI3Li41ZTc1ZTdlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTItMDEt MTcgIEFsZXhhbmRydSBDaGljdWxpdGEgIDxhY2hpY3VAYWRvYmUuY29tPgorCisgICAgICAgIENT UyBTaGFkZXJzOiBBZGQgYSBTZXR0aW5ncyBmbGFnIHRvIGVuYWJsZS9kaXNhYmxlIENTUyBTaGFk ZXJzIGF0IHJ1bnRpbWUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTc2NDQ0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBjc3MzL2ZpbHRlcnMvZWZmZWN0LWN1c3RvbS1kaXNhYmxlZC1leHBlY3RlZC50eHQ6 IEFkZGVkLgorICAgICAgICAqIGNzczMvZmlsdGVycy9lZmZlY3QtY3VzdG9tLWRpc2FibGVkLmh0 bWw6IEFkZGVkLgorICAgICAgICAqIGNzczMvZmlsdGVycy9zY3JpcHQtdGVzdHMvZWZmZWN0LWN1 c3RvbS1kaXNhYmxlZC5qczogQWRkZWQuCisgICAgICAgICh0ZXN0SW52YWxpZEZpbHRlclJ1bGUp OgorICAgICAgICAqIHBsYXRmb3JtL3drMi9Ta2lwcGVkOgorICAgICAgICAgICAgU2tpcHBlZCBh IGNvdXBsZSBvZiB0ZXN0cyB0aGF0IGNhbGwgb3ZlcnJpZGVQcmVmZXJlbmNlLgorCiAyMDEyLTAx LTE3ICBOaWtvbGFzIFppbW1lcm1hbm4gIDxuemltbWVybWFubkByaW0uY29tPgogCiAgICAgICAg IE5vdCByZXZpZXdlZC4gVXBkYXRlIFF0IHJlc3VsdHMgYWZ0ZXIgcjEwNTE0My4uCmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9jc3MzL2ZpbHRlcnMvZWZmZWN0LWN1c3RvbS1kaXNhYmxlZC1leHBl Y3RlZC50eHQgYi9MYXlvdXRUZXN0cy9jc3MzL2ZpbHRlcnMvZWZmZWN0LWN1c3RvbS1kaXNhYmxl ZC1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNDEzY2U2 NgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2NzczMvZmlsdGVycy9lZmZlY3QtY3Vz dG9tLWRpc2FibGVkLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDE3IEBACitUZXN0IHRoYXQgdGhl IGN1c3RvbSgpIGZ1bmN0aW9uIG9mIHRoZSAtd2Via2l0LWZpbHRlciBwcm9wZXJ0eSBpcyBub3Qg cGFyc2VkIHdoZW4gQ1NTIEN1c3RvbSBGaWx0ZXIgaXMgZGlzYWJsZWQuCisKK09uIHN1Y2Nlc3Ms IHlvdSB3aWxsIHNlZSBhIHNlcmllcyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5ICJU RVNUIENPTVBMRVRFIi4KKworCitDdXN0b20gd2l0aCB2ZXJ0ZXggc2hhZGVyIDogY3VzdG9tKHVy bCh2ZXJ0ZXguc2hhZGVyKSkKK1BBU1MgY3NzUnVsZS50eXBlIGlzIDEKK1BBU1MgZGVjbGFyYXRp b24ubGVuZ3RoIGlzIDAKK1BBU1MgZGVjbGFyYXRpb24uZ2V0UHJvcGVydHlWYWx1ZSgnLXdlYmtp dC1maWx0ZXInKSBpcyBudWxsCitNdWx0aXBsZSB3aXRoIGZyYWdtZW50IHNoYWRlciA6IGdyYXlz Y2FsZSgpIGN1c3RvbShub25lIHVybChmcmFnbWVudC5zaGFkZXIpKSBzZXBpYSgpCitQQVNTIGNz c1J1bGUudHlwZSBpcyAxCitQQVNTIGRlY2xhcmF0aW9uLmxlbmd0aCBpcyAwCitQQVNTIGRlY2xh cmF0aW9uLmdldFByb3BlcnR5VmFsdWUoJy13ZWJraXQtZmlsdGVyJykgaXMgbnVsbAorUEFTUyBz dWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQorCitURVNUIENPTVBMRVRFCisKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2NzczMvZmlsdGVycy9lZmZlY3QtY3VzdG9tLWRpc2FibGVkLmh0bWwgYi9M YXlvdXRUZXN0cy9jc3MzL2ZpbHRlcnMvZWZmZWN0LWN1c3RvbS1kaXNhYmxlZC5odG1sCm5ldyBm aWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjAzZDg0NTkKLS0tIC9kZXYvbnVsbAorKysg Yi9MYXlvdXRUZXN0cy9jc3MzL2ZpbHRlcnMvZWZmZWN0LWN1c3RvbS1kaXNhYmxlZC5odG1sCkBA IC0wLDAgKzEsMTMgQEAKKzwhRE9DVFlQRSBIVE1MIFBVQkxJQyAiLS8vSUVURi8vRFREIEhUTUwv L0VOIj4KKzxodG1sPgorPGhlYWQ+Cis8bGluayByZWw9InN0eWxlc2hlZXQiIGhyZWY9Ii4uLy4u L2Zhc3QvanMvcmVzb3VyY2VzL2pzLXRlc3Qtc3R5bGUuY3NzIj4KKzxzY3JpcHQgc3JjPSIuLi8u Li9mYXN0L2pzL3Jlc291cmNlcy9qcy10ZXN0LXByZS5qcyI+PC9zY3JpcHQ+Cis8L2hlYWQ+Cis8 Ym9keT4KKzxwIGlkPSJkZXNjcmlwdGlvbiI+PC9wPgorPGRpdiBpZD0iY29uc29sZSI+PC9kaXY+ Cis8c2NyaXB0IHNyYz0ic2NyaXB0LXRlc3RzL2VmZmVjdC1jdXN0b20tZGlzYWJsZWQuanMiPjwv c2NyaXB0PgorPHNjcmlwdCBzcmM9Ii4uLy4uL2Zhc3QvanMvcmVzb3VyY2VzL2pzLXRlc3QtcG9z dC5qcyI+PC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+ClwgTm8gbmV3bGluZSBhdCBlbmQgb2Yg ZmlsZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY3NzMy9maWx0ZXJzL3NjcmlwdC10ZXN0cy9l ZmZlY3QtY3VzdG9tLWRpc2FibGVkLmpzIGIvTGF5b3V0VGVzdHMvY3NzMy9maWx0ZXJzL3Njcmlw dC10ZXN0cy9lZmZlY3QtY3VzdG9tLWRpc2FibGVkLmpzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0Cmlu ZGV4IDAwMDAwMDAuLmQwNDU3NDMKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9jc3Mz L2ZpbHRlcnMvc2NyaXB0LXRlc3RzL2VmZmVjdC1jdXN0b20tZGlzYWJsZWQuanMKQEAgLTAsMCAr MSwyNSBAQAorZGVzY3JpcHRpb24oIlRlc3QgdGhhdCB0aGUgY3VzdG9tKCkgZnVuY3Rpb24gb2Yg dGhlIC13ZWJraXQtZmlsdGVyIHByb3BlcnR5IGlzIG5vdCBwYXJzZWQgd2hlbiBDU1MgQ3VzdG9t IEZpbHRlciBpcyBkaXNhYmxlZC4iKTsKKworaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxl cikKKyAgICB3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIub3ZlcnJpZGVQcmVmZXJlbmNlKCJX ZWJLaXRDU1NDdXN0b21GaWx0ZXJFbmFibGVkIiwgZmFsc2UpOworCisvLyBUaGVzZSBoYXZlIHRv IGJlIGdsb2JhbCBmb3IgdGhlIHRlc3QgaGVscGVycyB0byBzZWUgdGhlbS4KK3ZhciBzdHlsZXNo ZWV0LCBjc3NSdWxlLCBkZWNsYXJhdGlvbjsKKworZnVuY3Rpb24gdGVzdEludmFsaWRGaWx0ZXJS dWxlKGRlc2NyaXB0aW9uLCBydWxlKQoreworICAgIGRlYnVnKGRlc2NyaXB0aW9uICsgIiA6ICIg KyBydWxlKTsKKworICAgIHN0eWxlc2hlZXQgPSBkb2N1bWVudC5zdHlsZVNoZWV0cy5pdGVtKDAp OworICAgIHN0eWxlc2hlZXQuaW5zZXJ0UnVsZSgiYm9keSB7IC13ZWJraXQtZmlsdGVyOiAiICsg cnVsZSArICI7IH0iLCAwKTsKKyAgICBjc3NSdWxlID0gc3R5bGVzaGVldC5jc3NSdWxlcy5pdGVt KDApOworICAKKyAgICBzaG91bGRCZSgiY3NzUnVsZS50eXBlIiwgIjEiKTsKKworICAgIGRlY2xh cmF0aW9uID0gY3NzUnVsZS5zdHlsZTsKKyAgICBzaG91bGRCZSgiZGVjbGFyYXRpb24ubGVuZ3Ro IiwgIjAiKTsKKyAgICBzaG91bGRCZSgiZGVjbGFyYXRpb24uZ2V0UHJvcGVydHlWYWx1ZSgnLXdl YmtpdC1maWx0ZXInKSIsICJudWxsIik7Cit9CisKK3Rlc3RJbnZhbGlkRmlsdGVyUnVsZSgiQ3Vz dG9tIHdpdGggdmVydGV4IHNoYWRlciIsICJjdXN0b20odXJsKHZlcnRleC5zaGFkZXIpKSIpOwor dGVzdEludmFsaWRGaWx0ZXJSdWxlKCJNdWx0aXBsZSB3aXRoIGZyYWdtZW50IHNoYWRlciIsICJn cmF5c2NhbGUoKSBjdXN0b20obm9uZSB1cmwoZnJhZ21lbnQuc2hhZGVyKSkgc2VwaWEoKSIsICJn cmF5c2NhbGUoKSBjdXN0b20obm9uZSB1cmwoZnJhZ21lbnQuc2hhZGVyKSkgc2VwaWEoKSIpOwpc IE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRm b3JtL3drMi9Ta2lwcGVkIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vd2syL1NraXBwZWQKaW5kZXgg NWIyNmMzZS4uNWVmZTkyMSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vd2syL1Nr aXBwZWQKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vd2syL1NraXBwZWQKQEAgLTMyMyw2ICsz MjMsMTAgQEAgY3NzMy9maWx0ZXJzL2VmZmVjdC1vcGFjaXR5Lmh0bWwKIGNzczMvZmlsdGVycy9l ZmZlY3Qtc2F0dXJhdGUuaHRtbAogY3NzMy9maWx0ZXJzL2VmZmVjdC1zZXBpYS5odG1sCiBjc3Mz L2ZpbHRlcnMvbWlzc2luZy1jdXN0b20tZmlsdGVyLXNoYWRlci5odG1sCitjc3MzL2ZpbHRlcnMv ZWZmZWN0LWN1c3RvbS5odG1sCitjc3MzL2ZpbHRlcnMvZWZmZWN0LWN1c3RvbS1kaXNhYmxlZC5o dG1sCitjc3MzL2ZpbHRlcnMvZWZmZWN0LWNvbWJpbmVkLmh0bWwKK2NzczMvZmlsdGVycy9maWx0 ZXItcmVwYWludC5odG1sCiAKICMgTGF5b3V0VGVzdENvbnRyb2xsZXI6OmFwcGxpY2F0aW9uQ2Fj aGVEaXNrVXNhZ2VGb3JPcmlnaW4gaXNuJ3QgaW1wbGVtZW50ZWQgLSBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTcxMjcKIGh0dHAvdGVzdHMvYXBwY2FjaGUvb3JpZ2lu LXVzYWdlLmh0bWwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAzMjY2OWJiLi5mNzQ4NjM4IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMzcgQEAKKzIwMTItMDEtMTcgIEFsZXhhbmRydSBDaGljdWxpdGEgIDxhY2hpY3VA YWRvYmUuY29tPgorCisgICAgICAgIENTUyBTaGFkZXJzOiBBZGQgYSBTZXR0aW5ncyBmbGFnIHRv IGVuYWJsZS9kaXNhYmxlIENTUyBTaGFkZXJzIGF0IHJ1bnRpbWUKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc2NDQ0CisgICAgICAgIAorICAgICAgICBB ZGRlZCBzZXRDU1NDdXN0b21GaWx0ZXJFbmFibGVkL2lzQ1NTQ3VzdG9tRmlsdGVyRW5hYmxlZCB0 aGF0IGlzIGZhbHNlIGJ5IGRlZmF1bHQuCisgICAgICAgIEkndmUgZW5hYmxlZCBpdCBieSBkZWZh dWx0IG9uIEFwcGxlIE1hYywgdG8gbWFrZSBzdXJlIHRoZXJlJ3Mgbm8gYmVoYXZpb3IgY2hhbmdl LiBBbnl3YXksIENTUyBzaGFkZXJzIG5lZWQKKyAgICAgICAgV2ViR0wgZW5hYmxlZCwgc28gaXQg ZW5kcyB1cCBiZWluZyBkaXNhYmxlZCBieSBkZWZhdWx0LgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3Q6IGNzczMvZmlsdGVycy9lZmZlY3QtY3Vz dG9tLWRpc2FibGVkLmh0bWwKKworICAgICAgICAqIGNzcy9DU1NQYXJzZXIuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6Q1NTUGFyc2VyOjpwYXJzZUZpbHRlcik6CisgICAgICAgICAgICBEbyBub3Qg cGFyc2UgdGhlIGN1c3RvbSgpIGZ1bmN0aW9uIHdoZW4gc2hhZGVycyBhcmUgZGlzYWJsZWQuCisg ICAgICAgICAgICAKKyAgICAgICAgKiBjc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHA6CisgICAgICAg IChXZWJDb3JlOjpDU1NTdHlsZVNlbGVjdG9yOjphcHBseVByb3BlcnR5KToKKyAgICAgICAgICAg IERvIG5vdCBvdmVyd3JpdGUgdGhlIG9sZCBzdHlsZS0+ZmlsdGVyKCkgaWYgcGFyc2luZyBmYWls cy4KKyAgICAgICAgICAgIAorICAgICAgICAoV2ViQ29yZTo6Q1NTU3R5bGVTZWxlY3Rvcjo6Y3Jl YXRlRmlsdGVyT3BlcmF0aW9ucyk6CisgICAgICAgICAgICBEbyBub3QgY29udGludWUgaWYgb25l IGN1c3RvbSgpIGZpbHRlciBmYWlscyB0byBwYXJzZS4KKyAgICAgICAgICAgIAorICAgICAgICAq IHBhZ2UvU2V0dGluZ3MuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2V0dGluZ3M6OlNldHRpbmdz KToKKyAgICAgICAgKiBwYWdlL1NldHRpbmdzLmg6CisgICAgICAgIChXZWJDb3JlOjpTZXR0aW5n czo6c2V0Q1NTQ3VzdG9tRmlsdGVyRW5hYmxlZCk6CisgICAgICAgIChXZWJDb3JlOjpTZXR0aW5n czo6aXNDU1NDdXN0b21GaWx0ZXJFbmFibGVkKToKKyAgICAgICAgKiByZW5kZXJpbmcvRmlsdGVy RWZmZWN0UmVuZGVyZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6aXNDU1NDdXN0b21GaWx0ZXJF bmFibGVkKToKKyAgICAgICAgKFdlYkNvcmU6OkZpbHRlckVmZmVjdFJlbmRlcmVyOjpidWlsZCk6 CisgICAgICAgICAgICBBdm9pZCBjcmVhdGluZyB0aGUgZmlsdGVyIHdoZW4gc2hhZGVycyBhcmUg ZGlzYWJsZWQuIEl0IG1heSBoYXBwZW4gdG8gZ2V0IGhlcmUgaWYgc2hhZGVycyB3ZXJlIGRpc2Fi bGVkIGJldHdlZW4gcGFyc2luZyBhbmQgcmVuZGVyaW5nLgorICAgICAgICAKIDIwMTItMDEtMTcg IE5pa29sYXMgWmltbWVybWFubiAgPG56aW1tZXJtYW5uQHJpbS5jb20+CiAKICAgICAgICAgTGFy Z2UgU1ZHIHRleHQgbGF5b3V0IHBlcmZvcm1hbmNlIHJlZ3Jlc3Npb24gaW4gcjgxMTY4CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUGFyc2VyLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2Nzcy9DU1NQYXJzZXIuY3BwCmluZGV4IDhlZTA1ZmEuLjA1OGEwZTAgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2Nzcy9DU1NQYXJzZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9D U1NQYXJzZXIuY3BwCkBAIC03Myw2ICs3Myw3IEBACiAjaW5jbHVkZSAiUGFpci5oIgogI2luY2x1 ZGUgIlJlY3QuaCIKICNpbmNsdWRlICJSZW5kZXJUaGVtZS5oIgorI2luY2x1ZGUgIlNldHRpbmdz LmgiCiAjaW5jbHVkZSAiU2hhZG93VmFsdWUuaCIKICNpZiBFTkFCTEUoQ1NTX0ZJTFRFUlMpCiAj aW5jbHVkZSAiV2ViS2l0Q1NTRmlsdGVyVmFsdWUuaCIKQEAgLTY5MDksNiArNjkxMCwxMyBAQCBQ YXNzUmVmUHRyPENTU1ZhbHVlTGlzdD4gQ1NTUGFyc2VyOjpwYXJzZUZpbHRlcigpCiAKICNpZiBF TkFCTEUoQ1NTX1NIQURFUlMpCiAgICAgICAgICAgICBpZiAoZmlsdGVyVHlwZSA9PSBXZWJLaXRD U1NGaWx0ZXJWYWx1ZTo6Q3VzdG9tRmlsdGVyT3BlcmF0aW9uKSB7CisgICAgICAgICAgICAgICAg Ly8gTWFrZSBzdXJlIHBhcnNpbmcgZmFpbHMgaWYgY3VzdG9tIGZpbHRlcnMgYXJlIGRpc2FibGVk LgorICAgICAgICAgICAgICAgIGlmIChmaW5kRG9jdW1lbnQoKSkgeworICAgICAgICAgICAgICAg ICAgICBTZXR0aW5ncyogc2V0dGluZ3MgPSBmaW5kRG9jdW1lbnQoKS0+c2V0dGluZ3MoKTsKKyAg ICAgICAgICAgICAgICAgICAgaWYgKCFzZXR0aW5ncyB8fCAhc2V0dGluZ3MtPmlzQ1NTQ3VzdG9t RmlsdGVyRW5hYmxlZCgpKQorICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIDA7CisgICAg ICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgIFJlZlB0cjxX ZWJLaXRDU1NGaWx0ZXJWYWx1ZT4gZmlsdGVyVmFsdWUgPSBwYXJzZUN1c3RvbUZpbHRlcih2YWx1 ZSk7CiAgICAgICAgICAgICAgICAgaWYgKCFmaWx0ZXJWYWx1ZSkKICAgICAgICAgICAgICAgICAg ICAgcmV0dXJuIDA7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxl Y3Rvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHAKaW5kZXgg MGZiYzkwNC4uMjZlNjhhZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxl U2VsZWN0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmNw cApAQCAtMzY0MSw4ICszNjQxLDggQEAgdm9pZCBDU1NTdHlsZVNlbGVjdG9yOjphcHBseVByb3Bl cnR5KGludCBpZCwgQ1NTVmFsdWUgKnZhbHVlKQogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRG aWx0ZXI6IHsKICAgICAgICAgSEFORExFX0lOSEVSSVRfQU5EX0lOSVRJQUwoZmlsdGVyLCBGaWx0 ZXIpOwogICAgICAgICBGaWx0ZXJPcGVyYXRpb25zIG9wZXJhdGlvbnM7Ci0gICAgICAgIGNyZWF0 ZUZpbHRlck9wZXJhdGlvbnModmFsdWUsIHN0eWxlKCksIG1fcm9vdEVsZW1lbnRTdHlsZSwgb3Bl cmF0aW9ucyk7Ci0gICAgICAgIG1fc3R5bGUtPnNldEZpbHRlcihvcGVyYXRpb25zKTsKKyAgICAg ICAgaWYgKGNyZWF0ZUZpbHRlck9wZXJhdGlvbnModmFsdWUsIHN0eWxlKCksIG1fcm9vdEVsZW1l bnRTdHlsZSwgb3BlcmF0aW9ucykpCisgICAgICAgICAgICBtX3N0eWxlLT5zZXRGaWx0ZXIob3Bl cmF0aW9ucyk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAjZW5kaWYKQEAgLTUxODQsOCArNTE4 NCwxMCBAQCBib29sIENTU1N0eWxlU2VsZWN0b3I6OmNyZWF0ZUZpbHRlck9wZXJhdGlvbnMoQ1NT VmFsdWUqIGluVmFsdWUsIFJlbmRlclN0eWxlKiBzdAogI2lmIEVOQUJMRShDU1NfU0hBREVSUykK ICAgICAgICAgaWYgKG9wZXJhdGlvblR5cGUgPT0gRmlsdGVyT3BlcmF0aW9uOjpDVVNUT00pIHsK ICAgICAgICAgICAgIFJlZlB0cjxDdXN0b21GaWx0ZXJPcGVyYXRpb24+IG9wZXJhdGlvbiA9IGNy ZWF0ZUN1c3RvbUZpbHRlck9wZXJhdGlvbihmaWx0ZXJWYWx1ZSk7Ci0gICAgICAgICAgICBpZiAo b3BlcmF0aW9uKQotICAgICAgICAgICAgICAgIG9wZXJhdGlvbnMub3BlcmF0aW9ucygpLmFwcGVu ZChvcGVyYXRpb24pOworICAgICAgICAgICAgaWYgKCFvcGVyYXRpb24pCisgICAgICAgICAgICAg ICAgcmV0dXJuIGZhbHNlOworICAgICAgICAgICAgCisgICAgICAgICAgICBvcGVyYXRpb25zLm9w ZXJhdGlvbnMoKS5hcHBlbmQob3BlcmF0aW9uKTsKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAg ICAgICB9CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3Mu Y3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5jcHAKaW5kZXggNDAzYjQwOC4uZjYy YTdjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5jcHAKQEAgLTE3Miw2ICsxNzIsNyBAQCBTZXR0 aW5nczo6U2V0dGluZ3MoUGFnZSogcGFnZSkKICAgICAsIG1fY2FudmFzVXNlc0FjY2VsZXJhdGVk RHJhd2luZyhmYWxzZSkKICAgICAsIG1fYWNjZWxlcmF0ZWREcmF3aW5nRW5hYmxlZChmYWxzZSkK ICAgICAsIG1fYWNjZWxlcmF0ZWRGaWx0ZXJzRW5hYmxlZChmYWxzZSkKKyAgICAsIG1faXNDU1ND dXN0b21GaWx0ZXJFbmFibGVkKGZhbHNlKQogICAgIC8vIEZJWE1FOiBUaGlzIHNob3VsZCByZWFs bHkgYmUgZGlzYWJsZWQgYnkgZGVmYXVsdCBhcyBpdCBtYWtlcyBwbGF0Zm9ybXMgdGhhdCBkb24n dCBzdXBwb3J0IHRoZSBmZWF0dXJlIGRvd25sb2FkIGZpbGVzCiAgICAgLy8gdGhleSBjYW4ndCB1 c2UgYnkuIExlYXZpbmcgZW5hYmxlZCBmb3Igbm93IHRvIG5vdCBjaGFuZ2UgZXhpc3RpbmcgYmVo YXZpb3IuCiAgICAgLCBtX2Rvd25sb2FkYWJsZUJpbmFyeUZvbnRzRW5hYmxlZCh0cnVlKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5oIGIvU291cmNlL1dlYkNvcmUv cGFnZS9TZXR0aW5ncy5oCmluZGV4IGVkZWNlMmYuLjdiYWU0MGUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRp bmdzLmgKQEAgLTMwNyw2ICszMDcsOSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHZv aWQgc2V0QWNjZWxlcmF0ZWRGaWx0ZXJzRW5hYmxlZChib29sIGVuYWJsZWQpIHsgbV9hY2NlbGVy YXRlZEZpbHRlcnNFbmFibGVkID0gZW5hYmxlZDsgfQogICAgICAgICBib29sIGFjY2VsZXJhdGVk RmlsdGVyc0VuYWJsZWQoKSBjb25zdCB7IHJldHVybiBtX2FjY2VsZXJhdGVkRmlsdGVyc0VuYWJs ZWQ7IH0KIAorICAgICAgICB2b2lkIHNldENTU0N1c3RvbUZpbHRlckVuYWJsZWQoYm9vbCBlbmFi bGVkKSB7IG1faXNDU1NDdXN0b21GaWx0ZXJFbmFibGVkID0gZW5hYmxlZDsgfQorICAgICAgICBi b29sIGlzQ1NTQ3VzdG9tRmlsdGVyRW5hYmxlZCgpIGNvbnN0IHsgcmV0dXJuIG1faXNDU1NDdXN0 b21GaWx0ZXJFbmFibGVkOyB9CisKICAgICAgICAgdm9pZCBzZXRBY2NlbGVyYXRlZENvbXBvc2l0 aW5nRW5hYmxlZChib29sKTsKICAgICAgICAgYm9vbCBhY2NlbGVyYXRlZENvbXBvc2l0aW5nRW5h YmxlZCgpIGNvbnN0IHsgcmV0dXJuIG1fYWNjZWxlcmF0ZWRDb21wb3NpdGluZ0VuYWJsZWQ7IH0K IApAQCAtNTkxLDYgKzU5NCw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgYm9vbCBt X2NhbnZhc1VzZXNBY2NlbGVyYXRlZERyYXdpbmcgOiAxOwogICAgICAgICBib29sIG1fYWNjZWxl cmF0ZWREcmF3aW5nRW5hYmxlZCA6IDE7CiAgICAgICAgIGJvb2wgbV9hY2NlbGVyYXRlZEZpbHRl cnNFbmFibGVkIDogMTsKKyAgICAgICAgYm9vbCBtX2lzQ1NTQ3VzdG9tRmlsdGVyRW5hYmxlZCA6 IDE7CiAgICAgICAgIGJvb2wgbV9kb3dubG9hZGFibGVCaW5hcnlGb250c0VuYWJsZWQgOiAxOwog ICAgICAgICBib29sIG1feHNzQXVkaXRvckVuYWJsZWQgOiAxOwogICAgICAgICBib29sIG1fYWNj ZWxlcmF0ZWRDb21wb3NpdGluZ0VuYWJsZWQgOiAxOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL0ZpbHRlckVmZmVjdFJlbmRlcmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9GaWx0ZXJFZmZlY3RSZW5kZXJlci5jcHAKaW5kZXggODNlZjIwMy4uMmJjMWQ2OCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0ZpbHRlckVmZmVjdFJlbmRlcmVy LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvRmlsdGVyRWZmZWN0UmVuZGVyZXIu Y3BwCkBAIC02OCwxMSArNjgsMTEgQEAgc3RhdGljIGlubGluZSB2b2lkIGxhc3RNYXRyaXhSb3co VmVjdG9yPGZsb2F0PiYgcGFyYW1ldGVycykKICAgICAKICAgICAKICNpZiBFTkFCTEUoQ1NTX1NI QURFUlMpICYmIEVOQUJMRShXRUJHTCkKLXN0YXRpYyBib29sIGlzV2ViR0xFbmFibGVkKERvY3Vt ZW50KiBkb2N1bWVudCkKK3N0YXRpYyBib29sIGlzQ1NTQ3VzdG9tRmlsdGVyRW5hYmxlZChEb2N1 bWVudCogZG9jdW1lbnQpCiB7CiAgICAgLy8gV2Ugb25seSB3YW50IHRvIGVuYWJsZSBzaGFkZXJz IGlmIFdlYkdMIGlzIGFsc28gZW5hYmxlZCBvbiB0aGlzIHBsYXRmb3JtLgogICAgIFNldHRpbmdz KiBzZXR0aW5ncyA9IGRvY3VtZW50LT5zZXR0aW5ncygpOwotICAgIHJldHVybiBzZXR0aW5ncyAm JiBzZXR0aW5ncy0+d2ViR0xFbmFibGVkKCk7CisgICAgcmV0dXJuIHNldHRpbmdzICYmIHNldHRp bmdzLT5pc0NTU0N1c3RvbUZpbHRlckVuYWJsZWQoKSAmJiBzZXR0aW5ncy0+d2ViR0xFbmFibGVk KCk7CiB9CiAjZW5kaWYKIApAQCAtMjQ5LDcgKzI0OSw3IEBAIHZvaWQgRmlsdGVyRWZmZWN0UmVu ZGVyZXI6OmJ1aWxkKERvY3VtZW50KiBkb2N1bWVudCwgY29uc3QgRmlsdGVyT3BlcmF0aW9ucyYg b3BlCiAjaWYgRU5BQkxFKENTU19TSEFERVJTKQogICAgICAgICBjYXNlIEZpbHRlck9wZXJhdGlv bjo6Q1VTVE9NOiB7CiAjaWYgRU5BQkxFKFdFQkdMKQotICAgICAgICAgICAgaWYgKCFpc1dlYkdM RW5hYmxlZChkb2N1bWVudCkpCisgICAgICAgICAgICBpZiAoIWlzQ1NTQ3VzdG9tRmlsdGVyRW5h YmxlZChkb2N1bWVudCkpCiAgICAgICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgICAgICAK ICAgICAgICAgICAgIEN1c3RvbUZpbHRlck9wZXJhdGlvbiogY3VzdG9tRmlsdGVyT3BlcmF0aW9u ID0gc3RhdGljX2Nhc3Q8Q3VzdG9tRmlsdGVyT3BlcmF0aW9uKj4oZmlsdGVyT3BlcmF0aW9uKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv bWFjL0NoYW5nZUxvZwppbmRleCBmM2JiZGNhLi41N2IzM2FmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L21hYy9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjEgQEAKKzIwMTItMDEtMTcgIEFsZXhhbmRydSBDaGljdWxpdGEgIDxhY2hpY3VA YWRvYmUuY29tPgorCisgICAgICAgIENTUyBTaGFkZXJzOiBBZGQgYSBTZXR0aW5ncyBmbGFnIHRv IGVuYWJsZS9kaXNhYmxlIENTUyBTaGFkZXJzIGF0IHJ1bnRpbWUKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc2NDQ0CisKKyAgICAgICAgQWRkZWQgcHJp dmF0ZSBXZWJQcmVmZXJlbmNlIHByb3BlcnR5IGNhbGxlZCAiV2ViS2l0Q1NTQ3VzdG9tRmlsdGVy RW5hYmxlZCIuCisgICAgICAgIAorICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIFdlYlZpZXcvV2ViUHJlZmVyZW5jZUtleXNQcml2YXRlLmg6CisgICAgICAg ICogV2ViVmlldy9XZWJQcmVmZXJlbmNlcy5tbToKKyAgICAgICAgKCtbV2ViUHJlZmVyZW5jZXMg aW5pdGlhbGl6ZV0pOgorICAgICAgICAoLVtXZWJQcmVmZXJlbmNlcyBjc3NDdXN0b21GaWx0ZXJF bmFibGVkXSk6CisgICAgICAgICgtW1dlYlByZWZlcmVuY2VzIHNldENTU0N1c3RvbUZpbHRlckVu YWJsZWQ6XSk6CisgICAgICAgICogV2ViVmlldy9XZWJQcmVmZXJlbmNlc1ByaXZhdGUuaDoKKyAg ICAgICAgKiBXZWJWaWV3L1dlYlZpZXcubW06CisgICAgICAgICgtW1dlYlZpZXcgX3ByZWZlcmVu Y2VzQ2hhbmdlZDpdKToKKwogMjAxMi0wMS0xNiAgQWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQGFw cGxlLmNvbT4KIAogICAgICAgICBBIGZvbGxvdy11cCBmaXggZm9yOgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlS2V5c1ByaXZhdGUuaCBiL1NvdXJj ZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5jZUtleXNQcml2YXRlLmgKaW5kZXggN2Ri NzQzZi4uMjBlNDJhYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJQ cmVmZXJlbmNlS2V5c1ByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dl YlByZWZlcmVuY2VLZXlzUHJpdmF0ZS5oCkBAIC05NCw2ICs5NCw3IEBACiAjZGVmaW5lIFdlYktp dEFjY2VsZXJhdGVkRHJhd2luZ0VuYWJsZWRQcmVmZXJlbmNlS2V5IEAiV2ViS2l0QWNjZWxlcmF0 ZWREcmF3aW5nRW5hYmxlZCIKICNkZWZpbmUgV2ViS2l0Q2FudmFzVXNlc0FjY2VsZXJhdGVkRHJh d2luZ1ByZWZlcmVuY2VLZXkgQCJXZWJLaXRDYW52YXNVc2VzQWNjZWxlcmF0ZWREcmF3aW5nIgog I2RlZmluZSBXZWJLaXRBY2NlbGVyYXRlZENvbXBvc2l0aW5nRW5hYmxlZFByZWZlcmVuY2VLZXkg QCJXZWJLaXRBY2NlbGVyYXRlZENvbXBvc2l0aW5nRW5hYmxlZCIKKyNkZWZpbmUgV2ViS2l0Q1NT Q3VzdG9tRmlsdGVyRW5hYmxlZFByZWZlcmVuY2VLZXkgQCJXZWJLaXRDU1NDdXN0b21GaWx0ZXJF bmFibGVkIgogI2RlZmluZSBXZWJLaXRTaG93RGVidWdCb3JkZXJzUHJlZmVyZW5jZUtleSBAIldl YktpdFNob3dEZWJ1Z0JvcmRlcnMiCiAjZGVmaW5lIFdlYktpdFNob3dSZXBhaW50Q291bnRlclBy ZWZlcmVuY2VLZXkgQCJXZWJLaXRTaG93UmVwYWludENvdW50ZXIiCiAjZGVmaW5lIFdlYktpdFdl YkF1ZGlvRW5hYmxlZFByZWZlcmVuY2VLZXkgQCJXZWJLaXRXZWJBdWRpb0VuYWJsZWQiCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2VzLm1tIGIvU291 cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlcy5tbQppbmRleCBjOGRjODJiLi43 MDhmZDRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlByZWZlcmVu Y2VzLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5jZXMubW0K QEAgLTM2Niw2ICszNjYsOCBAQCArICh2b2lkKWluaXRpYWxpemUKICAgICAgICAgW05TTnVtYmVy IG51bWJlcldpdGhCb29sOk5PXSwgICBXZWJLaXRKYXZhU2NyaXB0Q2FuQWNjZXNzQ2xpcGJvYXJk UHJlZmVyZW5jZUtleSwKICAgICAgICAgW05TTnVtYmVyIG51bWJlcldpdGhCb29sOllFU10sICBX ZWJLaXRYU1NBdWRpdG9yRW5hYmxlZFByZWZlcmVuY2VLZXksCiAgICAgICAgIFtOU051bWJlciBu dW1iZXJXaXRoQm9vbDpZRVNdLCAgV2ViS2l0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ0VuYWJsZWRQ cmVmZXJlbmNlS2V5LAorICAgICAgICAvLyBDU1MgU2hhZGVycyBhbHNvIG5lZWQgV2ViR0wgZW5h YmxlZCAod2hpY2ggaXMgZGlzYWJsZWQgYnkgZGVmYXVsdCksIHNvIHdlIGNhbiBrZWVwIGl0IGVu YWJsZWQgZm9yIG5vdy4KKyAgICAgICAgW05TTnVtYmVyIG51bWJlcldpdGhCb29sOllFU10sIFdl YktpdENTU0N1c3RvbUZpbHRlckVuYWJsZWRQcmVmZXJlbmNlS2V5LAogICAgICAgICBbTlNOdW1i ZXIgbnVtYmVyV2l0aEJvb2w6Tk9dLCAgV2ViS2l0QWNjZWxlcmF0ZWREcmF3aW5nRW5hYmxlZFBy ZWZlcmVuY2VLZXksCiAgICAgICAgIFtOU051bWJlciBudW1iZXJXaXRoQm9vbDpOT10sICBXZWJL aXRDYW52YXNVc2VzQWNjZWxlcmF0ZWREcmF3aW5nUHJlZmVyZW5jZUtleSwKICAgICAgICAgW05T TnVtYmVyIG51bWJlcldpdGhCb29sOk5PXSwgICBXZWJLaXRTaG93RGVidWdCb3JkZXJzUHJlZmVy ZW5jZUtleSwKQEAgLTEzMjIsNiArMTMyNCwxNSBAQCAtICh2b2lkKXNldEFjY2VsZXJhdGVkQ29t cG9zaXRpbmdFbmFibGVkOihCT09MKWVuYWJsZWQKICAgICBbc2VsZiBfc2V0Qm9vbFZhbHVlOmVu YWJsZWQgZm9yS2V5OldlYktpdEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdFbmFibGVkUHJlZmVyZW5j ZUtleV07CiB9CiAKKy0gKEJPT0wpY3NzQ3VzdG9tRmlsdGVyRW5hYmxlZAoreworICAgIHJldHVy biBbc2VsZiBfYm9vbFZhbHVlRm9yS2V5OldlYktpdENTU0N1c3RvbUZpbHRlckVuYWJsZWRQcmVm ZXJlbmNlS2V5XTsKK30KKy0gKHZvaWQpc2V0Q1NTQ3VzdG9tRmlsdGVyRW5hYmxlZDooQk9PTCll bmFibGVkCit7CisgICAgW3NlbGYgX3NldEJvb2xWYWx1ZTplbmFibGVkIGZvcktleTpXZWJLaXRD U1NDdXN0b21GaWx0ZXJFbmFibGVkUHJlZmVyZW5jZUtleV07Cit9CisKIC0gKEJPT0wpc2hvd0Rl YnVnQm9yZGVycwogewogICAgIHJldHVybiBbc2VsZiBfYm9vbFZhbHVlRm9yS2V5OldlYktpdFNo b3dEZWJ1Z0JvcmRlcnNQcmVmZXJlbmNlS2V5XTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv bWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5jZXNQcml2YXRlLmggYi9Tb3VyY2UvV2ViS2l0L21hYy9X ZWJWaWV3L1dlYlByZWZlcmVuY2VzUHJpdmF0ZS5oCmluZGV4IGZhMjU5OTkuLmU4OTFiYmQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5jZXNQcml2YXRl LmgKKysrIGIvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlc1ByaXZhdGUu aApAQCAtMTg2LDYgKzE4NiwxMSBAQCBleHRlcm4gTlNTdHJpbmcgKldlYlByZWZlcmVuY2VzQ2hh bmdlZEludGVybmFsTm90aWZpY2F0aW9uOwogLSAoQk9PTClhY2NlbGVyYXRlZENvbXBvc2l0aW5n RW5hYmxlZDsKIC0gKHZvaWQpc2V0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ0VuYWJsZWQ6KEJPT0wp ZW5hYmxlZDsKIAorI2lmIEVOQUJMRShDU1NfU0hBREVSUykKKy0gKEJPT0wpY3NzQ3VzdG9tRmls dGVyRW5hYmxlZDsKKy0gKHZvaWQpc2V0Q1NTQ3VzdG9tRmlsdGVyRW5hYmxlZDooQk9PTCllbmFi bGVkOworI2VuZGlmCisKIC0gKEJPT0wpc2hvd0RlYnVnQm9yZGVyczsKIC0gKHZvaWQpc2V0U2hv d0RlYnVnQm9yZGVyczooQk9PTClzaG93OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21h Yy9XZWJWaWV3L1dlYlZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcu bW0KaW5kZXggN2RlZDJhYS4uZDk5NGQ5NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMv V2ViVmlldy9XZWJWaWV3Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmll dy5tbQpAQCAtMTQ3MCw2ICsxNDcwLDkgQEAgLSAodm9pZClfcHJlZmVyZW5jZXNDaGFuZ2VkOihX ZWJQcmVmZXJlbmNlcyAqKXByZWZlcmVuY2VzCiAgICAgc2V0dGluZ3MtPnNldEZyYW1lRmxhdHRl bmluZ0VuYWJsZWQoW3ByZWZlcmVuY2VzIGlzRnJhbWVGbGF0dGVuaW5nRW5hYmxlZF0pOwogICAg IHNldHRpbmdzLT5zZXRTcGF0aWFsTmF2aWdhdGlvbkVuYWJsZWQoW3ByZWZlcmVuY2VzIGlzU3Bh dGlhbE5hdmlnYXRpb25FbmFibGVkXSk7CiAgICAgc2V0dGluZ3MtPnNldFBhZ2luYXRlRHVyaW5n TGF5b3V0RW5hYmxlZChbcHJlZmVyZW5jZXMgcGFnaW5hdGVEdXJpbmdMYXlvdXRFbmFibGVkXSk7 CisjaWYgRU5BQkxFKENTU19TSEFERVJTKQorICAgIHNldHRpbmdzLT5zZXRDU1NDdXN0b21GaWx0 ZXJFbmFibGVkKFtwcmVmZXJlbmNlcyBjc3NDdXN0b21GaWx0ZXJFbmFibGVkXSk7CisjZW5kaWYK ICNpZiBFTkFCTEUoRlVMTFNDUkVFTl9BUEkpCiAgICAgc2V0dGluZ3MtPnNldEZ1bGxTY3JlZW5F bmFibGVkKFtwcmVmZXJlbmNlcyBmdWxsU2NyZWVuRW5hYmxlZF0pOwogI2VuZGlmCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cK aW5kZXggNzQzYjkzYS4uNTQzZDQ4ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEy LTAxLTE3ICBBbGV4YW5kcnUgQ2hpY3VsaXRhICA8YWNoaWN1QGFkb2JlLmNvbT4KKworICAgICAg ICBDU1MgU2hhZGVyczogQWRkIGEgU2V0dGluZ3MgZmxhZyB0byBlbmFibGUvZGlzYWJsZSBDU1Mg U2hhZGVycyBhdCBydW50aW1lCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD03NjQ0NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogU2hhcmVkL1dlYlByZWZlcmVuY2VzU3RvcmUuaDoKKyAgICAgICAgKiBVSVBy b2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlcy5jcHA6CisgICAgICAgIChXS1ByZWZlcmVuY2VzU2V0 Q1NTQ3VzdG9tRmlsdGVyRW5hYmxlZCk6CisgICAgICAgIChXS1ByZWZlcmVuY2VzR2V0Q1NTQ3Vz dG9tRmlsdGVyRW5hYmxlZCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5j ZXNQcml2YXRlLmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgor ICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjp1cGRhdGVQcmVmZXJlbmNlcyk6CisKIDIwMTItMDEt MTYgIERhbiBCZXJuc3RlaW4gIDxtaXR6QGFwcGxlLmNvbT4KIAogICAgICAgICA8cmRhcjovL3By b2JsZW0vMTA3MDI3NTg+IFJFR1JFU1NJT046IEV2ZXJ5IFNhZmFyaSBSZWFkZXIgV0tWaWV3IGxl YWtzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViUHJlZmVyZW5jZXNTdG9y ZS5oIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlByZWZlcmVuY2VzU3RvcmUuaAppbmRleCA2 YjBhMTQzLi5mZWQzZGM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViUHJl ZmVyZW5jZXNTdG9yZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQcmVmZXJlbmNl c1N0b3JlLmgKQEAgLTcwLDYgKzcwLDcgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiAgICAgbWFjcm8o Q2FudmFzVXNlc0FjY2VsZXJhdGVkRHJhd2luZywgY2FudmFzVXNlc0FjY2VsZXJhdGVkRHJhd2lu ZywgQm9vbCwgYm9vbCwgdHJ1ZSkgXAogICAgIG1hY3JvKENvbXBvc2l0aW5nQm9yZGVyc1Zpc2li bGUsIGNvbXBvc2l0aW5nQm9yZGVyc1Zpc2libGUsIEJvb2wsIGJvb2wsIGZhbHNlKSBcCiAgICAg bWFjcm8oQ29tcG9zaXRpbmdSZXBhaW50Q291bnRlcnNWaXNpYmxlLCBjb21wb3NpdGluZ1JlcGFp bnRDb3VudGVyc1Zpc2libGUsIEJvb2wsIGJvb2wsIGZhbHNlKSBcCisgICAgbWFjcm8oQ1NTQ3Vz dG9tRmlsdGVyRW5hYmxlZCwgY3NzQ3VzdG9tRmlsdGVyRW5hYmxlZCwgQm9vbCwgYm9vbCwgdHJ1 ZSkgXAogICAgIG1hY3JvKFdlYkdMRW5hYmxlZCwgd2ViR0xFbmFibGVkLCBCb29sLCBib29sLCBm YWxzZSkgXAogICAgIG1hY3JvKEZvcmNlRlRQRGlyZWN0b3J5TGlzdGluZ3MsIGZvcmNlRlRQRGly ZWN0b3J5TGlzdGluZ3MsIEJvb2wsIGJvb2wsIGZhbHNlKSBcCiAgICAgbWFjcm8oVGFic1RvTGlu a3MsIHRhYnNUb0xpbmtzLCBCb29sLCBib29sLCBERUZBVUxUX1dFQktJVF9UQUJTVE9MSU5LU19F TkFCTEVEKSBcCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQ cmVmZXJlbmNlcy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJl bmNlcy5jcHAKaW5kZXggMzVlYjVkOS4uOTg2MGVkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXMuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzLmNwcApAQCAtMzgyLDYgKzM4MiwxNiBAQCBi b29sIFdLUHJlZmVyZW5jZXNHZXRDb21wb3NpdGluZ1JlcGFpbnRDb3VudGVyc1Zpc2libGUoV0tQ cmVmZXJlbmNlc1JlZiBwcmVmZXJlbgogICAgIHJldHVybiB0b0ltcGwocHJlZmVyZW5jZXNSZWYp LT5jb21wb3NpdGluZ1JlcGFpbnRDb3VudGVyc1Zpc2libGUoKTsKIH0KIAordm9pZCBXS1ByZWZl cmVuY2VzU2V0Q1NTQ3VzdG9tRmlsdGVyRW5hYmxlZChXS1ByZWZlcmVuY2VzUmVmIHByZWZlcmVu Y2VzUmVmLCBib29sIGZsYWcpCit7CisgICAgdG9JbXBsKHByZWZlcmVuY2VzUmVmKS0+c2V0Q1NT Q3VzdG9tRmlsdGVyRW5hYmxlZChmbGFnKTsKK30KKworYm9vbCBXS1ByZWZlcmVuY2VzR2V0Q1NT Q3VzdG9tRmlsdGVyRW5hYmxlZChXS1ByZWZlcmVuY2VzUmVmIHByZWZlcmVuY2VzUmVmKQorewor ICAgIHJldHVybiB0b0ltcGwocHJlZmVyZW5jZXNSZWYpLT5jc3NDdXN0b21GaWx0ZXJFbmFibGVk KCk7Cit9CisKIHZvaWQgV0tQcmVmZXJlbmNlc1NldFdlYkdMRW5hYmxlZChXS1ByZWZlcmVuY2Vz UmVmIHByZWZlcmVuY2VzUmVmLCBib29sIGZsYWcpCiB7CiAgICAgdG9JbXBsKHByZWZlcmVuY2Vz UmVmKS0+c2V0V2ViR0xFbmFibGVkKGZsYWcpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXNQcml2YXRlLmggYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlc1ByaXZhdGUuaAppbmRleCBmMTFmYjNhLi4zODA5 NTVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJl bmNlc1ByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQcmVm ZXJlbmNlc1ByaXZhdGUuaApAQCAtODEsNiArODEsMTAgQEAgV0tfRVhQT1JUIHZvaWQgV0tQcmVm ZXJlbmNlc1NldENvbXBvc2l0aW5nUmVwYWludENvdW50ZXJzVmlzaWJsZShXS1ByZWZlcmVuY2Vz UmUKIFdLX0VYUE9SVCBib29sIFdLUHJlZmVyZW5jZXNHZXRDb21wb3NpdGluZ1JlcGFpbnRDb3Vu dGVyc1Zpc2libGUoV0tQcmVmZXJlbmNlc1JlZik7CiAKIC8vIERlZmF1bHRzIHRvIGZhbHNlLgor V0tfRVhQT1JUIHZvaWQgV0tQcmVmZXJlbmNlc1NldENTU0N1c3RvbUZpbHRlckVuYWJsZWQoV0tQ cmVmZXJlbmNlc1JlZiwgYm9vbCBmbGFnKTsKK1dLX0VYUE9SVCBib29sIFdLUHJlZmVyZW5jZXNH ZXRDU1NDdXN0b21GaWx0ZXJFbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYpOworCisvLyBEZWZhdWx0 cyB0byBmYWxzZS4KIFdLX0VYUE9SVCB2b2lkIFdLUHJlZmVyZW5jZXNTZXRXZWJHTEVuYWJsZWQo V0tQcmVmZXJlbmNlc1JlZiwgYm9vbCk7CiBXS19FWFBPUlQgYm9vbCBXS1ByZWZlcmVuY2VzR2V0 V2ViR0xFbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKaW5kZXggYTFjM2MyYy4uNjg3M2I3NSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcApAQCAtMTg0MCw2 ICsxODQwLDcgQEAgdm9pZCBXZWJQYWdlOjp1cGRhdGVQcmVmZXJlbmNlcyhjb25zdCBXZWJQcmVm ZXJlbmNlc1N0b3JlJiBzdG9yZSkKICAgICBzZXR0aW5ncy0+c2V0Q2FudmFzVXNlc0FjY2VsZXJh dGVkRHJhd2luZyhzdG9yZS5nZXRCb29sVmFsdWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNLZXk6OmNh bnZhc1VzZXNBY2NlbGVyYXRlZERyYXdpbmdLZXkoKSkgJiYgTGF5ZXJUcmVlSG9zdDo6c3VwcG9y dHNBY2NlbGVyYXRlZENvbXBvc2l0aW5nKCkpOwogICAgIHNldHRpbmdzLT5zZXRTaG93RGVidWdC b3JkZXJzKHN0b3JlLmdldEJvb2xWYWx1ZUZvcktleShXZWJQcmVmZXJlbmNlc0tleTo6Y29tcG9z aXRpbmdCb3JkZXJzVmlzaWJsZUtleSgpKSk7CiAgICAgc2V0dGluZ3MtPnNldFNob3dSZXBhaW50 Q291bnRlcihzdG9yZS5nZXRCb29sVmFsdWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNLZXk6OmNvbXBv c2l0aW5nUmVwYWludENvdW50ZXJzVmlzaWJsZUtleSgpKSk7CisgICAgc2V0dGluZ3MtPnNldENT U0N1c3RvbUZpbHRlckVuYWJsZWQoc3RvcmUuZ2V0Qm9vbFZhbHVlRm9yS2V5KFdlYlByZWZlcmVu Y2VzS2V5Ojpjc3NDdXN0b21GaWx0ZXJFbmFibGVkS2V5KCkpKTsKICAgICBzZXR0aW5ncy0+c2V0 V2ViR0xFbmFibGVkKHN0b3JlLmdldEJvb2xWYWx1ZUZvcktleShXZWJQcmVmZXJlbmNlc0tleTo6 d2ViR0xFbmFibGVkS2V5KCkpKTsKICAgICBzZXR0aW5ncy0+c2V0TWVkaWFQbGF5YmFja1JlcXVp cmVzVXNlckdlc3R1cmUoc3RvcmUuZ2V0Qm9vbFZhbHVlRm9yS2V5KFdlYlByZWZlcmVuY2VzS2V5 OjptZWRpYVBsYXliYWNrUmVxdWlyZXNVc2VyR2VzdHVyZUtleSgpKSk7CiAgICAgc2V0dGluZ3Mt PnNldE1lZGlhUGxheWJhY2tBbGxvd3NJbmxpbmUoc3RvcmUuZ2V0Qm9vbFZhbHVlRm9yS2V5KFdl YlByZWZlcmVuY2VzS2V5OjptZWRpYVBsYXliYWNrQWxsb3dzSW5saW5lS2V5KCkpKTsK