143260 2015-03-31 04:10:41 -0700 nullptr cleanup in StyleResolver 2015-04-01 00:24:53 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jh718.park webkit-unassigned commit-queue darin gyuyoung.kim ossy rniwa oldest_to_newest 1081610 0 jh718.park 2015-03-31 04:10:41 -0700 Replace 0 with nullptr in StyleResolver. 1081612 1 249818 jh718.park 2015-03-31 04:14:39 -0700 Created attachment 249818 Patch 1081882 2 gyuyoung.kim 2015-03-31 21:35:15 -0700 Need to check why GTK port is broken with this patch. 1081893 3 249892 jh718.park 2015-03-31 22:07:52 -0700 Created attachment 249892 For check of GTK port build 1081908 4 249892 ossy 2015-03-31 23:39:20 -0700 Comment on attachment 249892 For check of GTK port build The fail on GTK EWS seems to be unrelated. 1081909 5 jh718.park 2015-03-31 23:40:59 -0700 Thank you for your review :) 1081926 6 249892 commit-queue 2015-04-01 00:24:49 -0700 Comment on attachment 249892 For check of GTK port build Clearing flags on attachment: 249892 Committed r182224: <http://trac.webkit.org/changeset/182224> 1081927 7 commit-queue 2015-04-01 00:24:53 -0700 All reviewed patches have been landed. Closing bug. 249818 2015-03-31 04:14:39 -0700 2015-03-31 22:07:43 -0700 Patch bug-143260-20150331201356.patch text/plain 9095 jh718.park U3VidmVyc2lvbiBSZXZpc2lvbjogMTgyMTczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTVmY2U1YzgwMWJkOGI1 NTU5NzExZWY0NDBmMTE1MDFlYTA4Mjc5OS4uNzY1NTNlZGRmZGQ3OTQ1N2I1NmI1NTc0NjhhZDdk YzYyOGQ2OTNiNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE1LTAzLTMxICBKb29u Z2h1biBQYXJrICA8amg3MTgucGFya0BzYW1zdW5nLmNvbT4KKworICAgICAgICBudWxscHRyIGNs ZWFudXAgaW4gU3R5bGVSZXNvbHZlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTQzMjYwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBubyBiZWhhdmlvciBjaGFuZ2VzCisKKyAgICAg ICAgKiBjc3MvU3R5bGVSZXNvbHZlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZVJlc29s dmVyOjpTdGF0ZTo6aW5pdEZvclN0eWxlUmVzb2x2ZSk6CisgICAgICAgIChXZWJDb3JlOjpTdHls ZVJlc29sdmVyOjpsb2NhdGVDb3VzaW5MaXN0KToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlUmVz b2x2ZXI6OmxvY2F0ZVNoYXJlZFN0eWxlKToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlUmVzb2x2 ZXI6OmtleWZyYW1lU3R5bGVzRm9yQW5pbWF0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxl UmVzb2x2ZXI6OnBzZXVkb1N0eWxlRm9yRWxlbWVudCk6CisgICAgICAgIChXZWJDb3JlOjpTdHls ZVJlc29sdmVyOjpwc2V1ZG9TdHlsZVJ1bGVzRm9yRWxlbWVudCk6CisgICAgICAgIChXZWJDb3Jl OjpTdHlsZVJlc29sdmVyOjpmaW5kRnJvbU1hdGNoZWRQcm9wZXJ0aWVzQ2FjaGUpOgorICAgICAg ICAoV2ViQ29yZTo6U3R5bGVSZXNvbHZlcjo6YXBwbHlNYXRjaGVkUHJvcGVydGllcyk6CisgICAg ICAgIChXZWJDb3JlOjpTdHlsZVJlc29sdmVyOjphcHBseVByb3BlcnR5VG9TdHlsZSk6CisgICAg ICAgIChXZWJDb3JlOjpTdHlsZVJlc29sdmVyOjpNYXRjaGVkUHJvcGVydGllczo6TWF0Y2hlZFBy b3BlcnRpZXMpOgorICAgICAgICAqIGNzcy9TdHlsZVJlc29sdmVyLmg6CisgICAgICAgIChXZWJD b3JlOjpQc2V1ZG9TdHlsZVJlcXVlc3Q6OlBzZXVkb1N0eWxlUmVxdWVzdCk6CisgICAgICAgIChX ZWJDb3JlOjpTdHlsZVJlc29sdmVyUGFyZW50UHVzaGVyOjpTdHlsZVJlc29sdmVyUGFyZW50UHVz aGVyKToKKwogMjAxNS0wMy0zMCAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJr aXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQgYnVpbGQgZml4IGFmdGVyIHIxODIxNjguCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSZXNvbHZlci5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9jc3MvU3R5bGVSZXNvbHZlci5jcHAKaW5kZXggMWE4ZmY5YTE0ZTUwNGRjM2RjNTdm NGE0NjQ0ZjMzYmQ4ZTg5NjMzNy4uNTM3ZWIwMDgyZTdjZDNkM2U4MDVjYjU0ZDcxZjg2NDNkMzA5 M2RlMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUmVzb2x2ZXIuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJlc29sdmVyLmNwcApAQCAtNDQ2LDcgKzQ0Niw3 IEBAIGlubGluZSB2b2lkIFN0eWxlUmVzb2x2ZXI6OlN0YXRlOjppbml0Rm9yU3R5bGVSZXNvbHZl KERvY3VtZW50JiBkb2N1bWVudCwgRWxlbWVuCiAgICAgfSBlbHNlCiAgICAgICAgIG1fcGFyZW50 U3R5bGUgPSBwYXJlbnRTdHlsZTsKIAotICAgIE5vZGUqIGRvY0VsZW1lbnQgPSBlID8gZS0+ZG9j dW1lbnQoKS5kb2N1bWVudEVsZW1lbnQoKSA6IDA7CisgICAgTm9kZSogZG9jRWxlbWVudCA9IGUg PyBlLT5kb2N1bWVudCgpLmRvY3VtZW50RWxlbWVudCgpIDogbnVsbHB0cjsKICAgICBSZW5kZXJT dHlsZSogZG9jU3R5bGUgPSBkb2N1bWVudC5yZW5kZXJTdHlsZSgpOwogICAgIG1fcm9vdEVsZW1l bnRTdHlsZSA9IGRvY0VsZW1lbnQgJiYgZSAhPSBkb2NFbGVtZW50ID8gZG9jRWxlbWVudC0+cmVu ZGVyU3R5bGUoKSA6IGRvY1N0eWxlOwogCkBAIC01MDYsMTQgKzUwNiwxNCBAQCBOb2RlKiBTdHls ZVJlc29sdmVyOjpsb2NhdGVDb3VzaW5MaXN0KEVsZW1lbnQqIHBhcmVudCwgdW5zaWduZWQmIHZp c2l0ZWROb2RlQ291bgogICAgICAgICAgICAgICAgIHJldHVybiBjdXJyZW50Tm9kZS0+bGFzdENo aWxkKCk7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBpZiAoc3ViY291bnQgPj0gY1N0eWxl U2VhcmNoVGhyZXNob2xkKQotICAgICAgICAgICAgICAgIHJldHVybiAwOworICAgICAgICAgICAg ICAgIHJldHVybiBudWxscHRyOwogICAgICAgICAgICAgY3VycmVudE5vZGUgPSBjdXJyZW50Tm9k ZS0+cHJldmlvdXNTaWJsaW5nKCk7CiAgICAgICAgIH0KICAgICAgICAgY3VycmVudE5vZGUgPSBs b2NhdGVDb3VzaW5MaXN0KHRoaXNDb3VzaW4tPnBhcmVudEVsZW1lbnQoKSwgdmlzaXRlZE5vZGVD b3VudCk7CiAgICAgICAgIHRoaXNDb3VzaW4gPSBjdXJyZW50Tm9kZTsKICAgICB9CiAKLSAgICBy ZXR1cm4gMDsKKyAgICByZXR1cm4gbnVsbHB0cjsKIH0KIAogYm9vbCBTdHlsZVJlc29sdmVyOjpz dHlsZVNoYXJpbmdDYW5kaWRhdGVNYXRjaGVzUnVsZVNldChSdWxlU2V0KiBydWxlU2V0KQpAQCAt NzM1LDcgKzczNSw3IEBAIFJlbmRlclN0eWxlKiBTdHlsZVJlc29sdmVyOjpsb2NhdGVTaGFyZWRT dHlsZSgpCiAgICAgLy8gQ2hlY2sgcHJldmlvdXMgc2libGluZ3MgYW5kIHRoZWlyIGNvdXNpbnMu CiAgICAgdW5zaWduZWQgY291bnQgPSAwOwogICAgIHVuc2lnbmVkIHZpc2l0ZWROb2RlQ291bnQg PSAwOwotICAgIFN0eWxlZEVsZW1lbnQqIHNoYXJlRWxlbWVudCA9IDA7CisgICAgU3R5bGVkRWxl bWVudCogc2hhcmVFbGVtZW50ID0gbnVsbHB0cjsKICAgICBOb2RlKiBjb3VzaW5MaXN0ID0gc3Rh dGUuc3R5bGVkRWxlbWVudCgpLT5wcmV2aW91c1NpYmxpbmcoKTsKICAgICB3aGlsZSAoY291c2lu TGlzdCkgewogICAgICAgICBzaGFyZUVsZW1lbnQgPSBmaW5kU2libGluZ0ZvclN0eWxlU2hhcmlu Zyhjb3VzaW5MaXN0LCBjb3VudCk7CkBAIC05MjEsNyArOTIxLDcgQEAgdm9pZCBTdHlsZVJlc29s dmVyOjprZXlmcmFtZVN0eWxlc0ZvckFuaW1hdGlvbihFbGVtZW50KiBlLCBjb25zdCBSZW5kZXJT dHlsZSogZWwKIAogICAgICAgICBjb25zdCBTdHlsZUtleWZyYW1lKiBrZXlmcmFtZSA9IGtleWZy YW1lc1tpXS5nZXQoKTsKIAotICAgICAgICBLZXlmcmFtZVZhbHVlIGtleWZyYW1lVmFsdWUoMCwg MCk7CisgICAgICAgIEtleWZyYW1lVmFsdWUga2V5ZnJhbWVWYWx1ZSgwLCBudWxscHRyKTsKICAg ICAgICAga2V5ZnJhbWVWYWx1ZS5zZXRTdHlsZShzdHlsZUZvcktleWZyYW1lKGVsZW1lbnRTdHls ZSwga2V5ZnJhbWUsIGtleWZyYW1lVmFsdWUpKTsKIAogICAgICAgICAvLyBBZGQgdGhpcyBrZXlm cmFtZSBzdHlsZSB0byBhbGwgdGhlIGluZGljYXRlZCBrZXkgdGltZXMKQEAgLTkzOSw3ICs5Mzks NyBAQCB2b2lkIFN0eWxlUmVzb2x2ZXI6OmtleWZyYW1lU3R5bGVzRm9yQW5pbWF0aW9uKEVsZW1l bnQqIGUsIGNvbnN0IFJlbmRlclN0eWxlKiBlbAogICAgICAgICAgICAgemVyb1BlcmNlbnRLZXlm cmFtZSA9IFN0eWxlS2V5ZnJhbWU6OmNyZWF0ZShNdXRhYmxlU3R5bGVQcm9wZXJ0aWVzOjpjcmVh dGUoKSkubGVha1JlZigpOwogICAgICAgICAgICAgemVyb1BlcmNlbnRLZXlmcmFtZS0+c2V0S2V5 VGV4dCgiMCUiKTsKICAgICAgICAgfQotICAgICAgICBLZXlmcmFtZVZhbHVlIGtleWZyYW1lVmFs dWUoMCwgMCk7CisgICAgICAgIEtleWZyYW1lVmFsdWUga2V5ZnJhbWVWYWx1ZSgwLCBudWxscHRy KTsKICAgICAgICAga2V5ZnJhbWVWYWx1ZS5zZXRTdHlsZShzdHlsZUZvcktleWZyYW1lKGVsZW1l bnRTdHlsZSwgemVyb1BlcmNlbnRLZXlmcmFtZSwga2V5ZnJhbWVWYWx1ZSkpOwogICAgICAgICBs aXN0Lmluc2VydChrZXlmcmFtZVZhbHVlKTsKICAgICB9CkBAIC05NTEsNyArOTUxLDcgQEAgdm9p ZCBTdHlsZVJlc29sdmVyOjprZXlmcmFtZVN0eWxlc0ZvckFuaW1hdGlvbihFbGVtZW50KiBlLCBj b25zdCBSZW5kZXJTdHlsZSogZWwKICAgICAgICAgICAgIGh1bmRyZWRQZXJjZW50S2V5ZnJhbWUg PSBTdHlsZUtleWZyYW1lOjpjcmVhdGUoTXV0YWJsZVN0eWxlUHJvcGVydGllczo6Y3JlYXRlKCkp LmxlYWtSZWYoKTsKICAgICAgICAgICAgIGh1bmRyZWRQZXJjZW50S2V5ZnJhbWUtPnNldEtleVRl eHQoIjEwMCUiKTsKICAgICAgICAgfQotICAgICAgICBLZXlmcmFtZVZhbHVlIGtleWZyYW1lVmFs dWUoMSwgMCk7CisgICAgICAgIEtleWZyYW1lVmFsdWUga2V5ZnJhbWVWYWx1ZSgxLCBudWxscHRy KTsKICAgICAgICAga2V5ZnJhbWVWYWx1ZS5zZXRTdHlsZShzdHlsZUZvcktleWZyYW1lKGVsZW1l bnRTdHlsZSwgaHVuZHJlZFBlcmNlbnRLZXlmcmFtZSwga2V5ZnJhbWVWYWx1ZSkpOwogICAgICAg ICBsaXN0Lmluc2VydChrZXlmcmFtZVZhbHVlKTsKICAgICB9CkBAIC05NjEsNyArOTYxLDcgQEAg UGFzc1JlZlB0cjxSZW5kZXJTdHlsZT4gU3R5bGVSZXNvbHZlcjo6cHNldWRvU3R5bGVGb3JFbGVt ZW50KEVsZW1lbnQqIGVsZW1lbnQsIGMKIHsKICAgICBBU1NFUlQocGFyZW50U3R5bGUpOwogICAg IGlmICghZWxlbWVudCkKLSAgICAgICAgcmV0dXJuIDA7CisgICAgICAgIHJldHVybiBudWxscHRy OwogCiAgICAgU3RhdGUmIHN0YXRlID0gbV9zdGF0ZTsKIApAQCAtOTkyLDE0ICs5OTIsMTQgQEAg UGFzc1JlZlB0cjxSZW5kZXJTdHlsZT4gU3R5bGVSZXNvbHZlcjo6cHNldWRvU3R5bGVGb3JFbGVt ZW50KEVsZW1lbnQqIGVsZW1lbnQsIGMKICAgICB9CiAKICAgICBpZiAoY29sbGVjdG9yLm1hdGNo ZWRSZXN1bHQoKS5tYXRjaGVkUHJvcGVydGllcygpLmlzRW1wdHkoKSkKLSAgICAgICAgcmV0dXJu IDA7CisgICAgICAgIHJldHVybiBudWxscHRyOwogCiAgICAgc3RhdGUuc3R5bGUoKS0+c2V0U3R5 bGVUeXBlKHBzZXVkb1N0eWxlUmVxdWVzdC5wc2V1ZG9JZCk7CiAKICAgICBhcHBseU1hdGNoZWRQ cm9wZXJ0aWVzKGNvbGxlY3Rvci5tYXRjaGVkUmVzdWx0KCksIGVsZW1lbnQpOwogCiAgICAgLy8g Q2xlYW4gdXAgb3VyIHN0eWxlIG9iamVjdCdzIGRpc3BsYXkgYW5kIHRleHQgZGVjb3JhdGlvbnMg KGFtb25nIG90aGVyIGZpeHVwcykuCi0gICAgYWRqdXN0UmVuZGVyU3R5bGUoKnN0YXRlLnN0eWxl KCksICptX3N0YXRlLnBhcmVudFN0eWxlKCksIDApOworICAgIGFkanVzdFJlbmRlclN0eWxlKCpz dGF0ZS5zdHlsZSgpLCAqbV9zdGF0ZS5wYXJlbnRTdHlsZSgpLCBudWxscHRyKTsKIAogICAgIGlm IChzdGF0ZS5zdHlsZSgpLT5oYXNWaWV3cG9ydFVuaXRzKCkpCiAgICAgICAgIGRvY3VtZW50KCku c2V0SGFzU3R5bGVXaXRoVmlld3BvcnRVbml0cygpOwpAQCAtMTUwMyw3ICsxNTAzLDcgQEAgVmVj dG9yPFJlZlB0cjxTdHlsZVJ1bGU+PiBTdHlsZVJlc29sdmVyOjpwc2V1ZG9TdHlsZVJ1bGVzRm9y RWxlbWVudChFbGVtZW50KiBlbGUKICAgICAgICAgcmV0dXJuIFZlY3RvcjxSZWZQdHI8U3R5bGVS dWxlPj4oKTsKIAogICAgIGluaXRFbGVtZW50KGVsZW1lbnQpOwotICAgIG1fc3RhdGUuaW5pdEZv clN0eWxlUmVzb2x2ZShkb2N1bWVudCgpLCBlbGVtZW50LCAwKTsKKyAgICBtX3N0YXRlLmluaXRG b3JTdHlsZVJlc29sdmUoZG9jdW1lbnQoKSwgZWxlbWVudCwgbnVsbHB0cik7CiAKICAgICBFbGVt ZW50UnVsZUNvbGxlY3RvciBjb2xsZWN0b3IoKmVsZW1lbnQsIG1fc3RhdGUuc3R5bGUoKSwgbV9y dWxlU2V0cywgbV9zZWxlY3RvckZpbHRlcik7CiAgICAgY29sbGVjdG9yLnNldE1vZGUoU2VsZWN0 b3JDaGVja2VyOjpNb2RlOjpDb2xsZWN0aW5nUnVsZXMpOwpAQCAtMTYxNiwxOCArMTYxNiwxOCBA QCBjb25zdCBTdHlsZVJlc29sdmVyOjpNYXRjaGVkUHJvcGVydGllc0NhY2hlSXRlbSogU3R5bGVS ZXNvbHZlcjo6ZmluZEZyb21NYXRjaGVkUAogCiAgICAgTWF0Y2hlZFByb3BlcnRpZXNDYWNoZTo6 aXRlcmF0b3IgaXQgPSBtX21hdGNoZWRQcm9wZXJ0aWVzQ2FjaGUuZmluZChoYXNoKTsKICAgICBp ZiAoaXQgPT0gbV9tYXRjaGVkUHJvcGVydGllc0NhY2hlLmVuZCgpKQotICAgICAgICByZXR1cm4g MDsKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgTWF0Y2hlZFByb3BlcnRpZXNDYWNoZUl0 ZW0mIGNhY2hlSXRlbSA9IGl0LT52YWx1ZTsKIAogICAgIHNpemVfdCBzaXplID0gbWF0Y2hSZXN1 bHQubWF0Y2hlZFByb3BlcnRpZXMoKS5zaXplKCk7CiAgICAgaWYgKHNpemUgIT0gY2FjaGVJdGVt Lm1hdGNoZWRQcm9wZXJ0aWVzLnNpemUoKSkKLSAgICAgICAgcmV0dXJuIDA7CisgICAgICAgIHJl dHVybiBudWxscHRyOwogICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgc2l6ZTsgKytpKSB7CiAg ICAgICAgIGlmIChtYXRjaFJlc3VsdC5tYXRjaGVkUHJvcGVydGllcygpW2ldICE9IGNhY2hlSXRl bS5tYXRjaGVkUHJvcGVydGllc1tpXSkKLSAgICAgICAgICAgIHJldHVybiAwOworICAgICAgICAg ICAgcmV0dXJuIG51bGxwdHI7CiAgICAgfQogICAgIGlmIChjYWNoZUl0ZW0ucmFuZ2VzICE9IG1h dGNoUmVzdWx0LnJhbmdlcykKLSAgICAgICAgcmV0dXJuIDA7CisgICAgICAgIHJldHVybiBudWxs cHRyOwogICAgIHJldHVybiAmY2FjaGVJdGVtOwogfQogCkBAIC0xNzI1LDcgKzE3MjUsNyBAQCB2 b2lkIFN0eWxlUmVzb2x2ZXI6OmFwcGx5TWF0Y2hlZFByb3BlcnRpZXMoY29uc3QgTWF0Y2hSZXN1 bHQmIG1hdGNoUmVzdWx0LCBjb25zdAogICAgIFN0YXRlJiBzdGF0ZSA9IG1fc3RhdGU7CiAgICAg dW5zaWduZWQgY2FjaGVIYXNoID0gc2hvdWxkVXNlTWF0Y2hlZFByb3BlcnRpZXNDYWNoZSAmJiBt YXRjaFJlc3VsdC5pc0NhY2hlYWJsZSA/IGNvbXB1dGVNYXRjaGVkUHJvcGVydGllc0hhc2gobWF0 Y2hSZXN1bHQubWF0Y2hlZFByb3BlcnRpZXMoKS5kYXRhKCksIG1hdGNoUmVzdWx0Lm1hdGNoZWRQ cm9wZXJ0aWVzKCkuc2l6ZSgpKSA6IDA7CiAgICAgYm9vbCBhcHBseUluaGVyaXRlZE9ubHkgPSBm YWxzZTsKLSAgICBjb25zdCBNYXRjaGVkUHJvcGVydGllc0NhY2hlSXRlbSogY2FjaGVJdGVtID0g MDsKKyAgICBjb25zdCBNYXRjaGVkUHJvcGVydGllc0NhY2hlSXRlbSogY2FjaGVJdGVtID0gbnVs bHB0cjsKICAgICBpZiAoY2FjaGVIYXNoICYmIChjYWNoZUl0ZW0gPSBmaW5kRnJvbU1hdGNoZWRQ cm9wZXJ0aWVzQ2FjaGUoY2FjaGVIYXNoLCBtYXRjaFJlc3VsdCkpCiAgICAgICAgICYmIGlzQ2Fj aGVhYmxlSW5NYXRjaGVkUHJvcGVydGllc0NhY2hlKGVsZW1lbnQsIHN0YXRlLnN0eWxlKCksIHN0 YXRlLnBhcmVudFN0eWxlKCkpKSB7CiAgICAgICAgIC8vIFdlIGNhbiBidWlsZCB1cCB0aGUgc3R5 bGUgYnkgY29weWluZyBub24taW5oZXJpdGVkIHByb3BlcnRpZXMgZnJvbSBhbiBlYXJsaWVyIHN0 eWxlIG9iamVjdCBidWlsdCB1c2luZyB0aGUgc2FtZSBleGFjdApAQCAtMTgyMSw3ICsxODIxLDcg QEAgdm9pZCBTdHlsZVJlc29sdmVyOjphcHBseU1hdGNoZWRQcm9wZXJ0aWVzKGNvbnN0IE1hdGNo UmVzdWx0JiBtYXRjaFJlc3VsdCwgY29uc3QKIAogdm9pZCBTdHlsZVJlc29sdmVyOjphcHBseVBy b3BlcnR5VG9TdHlsZShDU1NQcm9wZXJ0eUlEIGlkLCBDU1NWYWx1ZSogdmFsdWUsIFJlbmRlclN0 eWxlKiBzdHlsZSkKIHsKLSAgICBpbml0RWxlbWVudCgwKTsKKyAgICBpbml0RWxlbWVudChudWxs cHRyKTsKICAgICBtX3N0YXRlLmluaXRGb3JTdHlsZVJlc29sdmUoZG9jdW1lbnQoKSwgbnVsbHB0 ciwgc3R5bGUpOwogICAgIG1fc3RhdGUuc2V0U3R5bGUoKnN0eWxlKTsKICAgICBhcHBseVByb3Bl cnR5VG9DdXJyZW50U3R5bGUoaWQsIHZhbHVlKTsKQEAgLTI1NjcsNyArMjU2Nyw3IEBAIHZvaWQg U3R5bGVSZXNvbHZlcjo6bG9hZFBlbmRpbmdSZXNvdXJjZXMoKQogfQogCiBpbmxpbmUgU3R5bGVS ZXNvbHZlcjo6TWF0Y2hlZFByb3BlcnRpZXM6Ok1hdGNoZWRQcm9wZXJ0aWVzKCkKLSAgICA6IHBv c3NpYmx5UGFkZGVkTWVtYmVyKDApCisgICAgOiBwb3NzaWJseVBhZGRlZE1lbWJlcihudWxscHRy KQogewogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSZXNvbHZlci5o IGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUmVzb2x2ZXIuaAppbmRleCBlNDQyMmUwYTdjN2Y3 ZWJmNGM2OGM1YzU5ZmQ5OWM5YzE1Y2UxYWRkLi5iZjgzZTQ1NmYzYTdkZjNkMjUxYmViNmZlNjZh N2ExMzZhNWQ4MjQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSZXNvbHZl ci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJlc29sdmVyLmgKQEAgLTEyMyw3ICsx MjMsNyBAQCBlbnVtIFJ1bGVNYXRjaGluZ0JlaGF2aW9yIHsKIAogY2xhc3MgUHNldWRvU3R5bGVS ZXF1ZXN0IHsKIHB1YmxpYzoKLSAgICBQc2V1ZG9TdHlsZVJlcXVlc3QoUHNldWRvSWQgcHNldWRv SWQsIFJlbmRlclNjcm9sbGJhciogc2Nyb2xsYmFyID0gMCwgU2Nyb2xsYmFyUGFydCBzY3JvbGxi YXJQYXJ0ID0gTm9QYXJ0KQorICAgIFBzZXVkb1N0eWxlUmVxdWVzdChQc2V1ZG9JZCBwc2V1ZG9J ZCwgUmVuZGVyU2Nyb2xsYmFyKiBzY3JvbGxiYXIgPSBudWxscHRyLCBTY3JvbGxiYXJQYXJ0IHNj cm9sbGJhclBhcnQgPSBOb1BhcnQpCiAgICAgICAgIDogcHNldWRvSWQocHNldWRvSWQpCiAgICAg ICAgICwgc2Nyb2xsYmFyUGFydChzY3JvbGxiYXJQYXJ0KQogICAgICAgICAsIHNjcm9sbGJhcihz Y3JvbGxiYXIpCkBAIC01NzYsNyArNTc2LDcgQEAgY2xhc3MgU3R5bGVSZXNvbHZlclBhcmVudFB1 c2hlciB7CiBwdWJsaWM6CiAgICAgU3R5bGVSZXNvbHZlclBhcmVudFB1c2hlcihFbGVtZW50KiBw YXJlbnQpCiAgICAgICAgIDogbV9wYXJlbnQocGFyZW50KQotICAgICAgICAsIG1fcHVzaGVkU3R5 bGVSZXNvbHZlcigwKQorICAgICAgICAsIG1fcHVzaGVkU3R5bGVSZXNvbHZlcihudWxscHRyKQog ICAgIHsgfQogICAgIHZvaWQgcHVzaCgpCiAgICAgewo= 249892 2015-03-31 22:07:52 -0700 2015-04-01 00:24:49 -0700 For check of GTK port build bug-143260-20150401140708.patch text/plain 9145 jh718.park U3VidmVyc2lvbiBSZXZpc2lvbjogMTgyMjIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGNiZDAzYjFlMjU0ZTQz ODQ4MTIwZDc2M2VjOWE0MWIxYWQ0MDZkMC4uOGM3OGU5NTU1NjFhZmZiZDViMzhjZDA1MzVkMWZk ZDU1MGEwZTJmZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE1LTAzLTMxICBKb29u Z2h1biBQYXJrICA8amg3MTgucGFya0BzYW1zdW5nLmNvbT4KKworICAgICAgICBudWxscHRyIGNs ZWFudXAgaW4gU3R5bGVSZXNvbHZlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTQzMjYwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgUnlvc3VrZSBOaXdh LgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgbm8gYmVoYXZpb3IgY2hhbmdlcworCisgICAgICAg ICogY3NzL1N0eWxlUmVzb2x2ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGVSZXNvbHZl cjo6U3RhdGU6OmluaXRGb3JTdHlsZVJlc29sdmUpOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGVS ZXNvbHZlcjo6bG9jYXRlQ291c2luTGlzdCk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZVJlc29s dmVyOjpsb2NhdGVTaGFyZWRTdHlsZSk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZVJlc29sdmVy OjprZXlmcmFtZVN0eWxlc0ZvckFuaW1hdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZVJl c29sdmVyOjpwc2V1ZG9TdHlsZUZvckVsZW1lbnQpOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGVS ZXNvbHZlcjo6cHNldWRvU3R5bGVSdWxlc0ZvckVsZW1lbnQpOgorICAgICAgICAoV2ViQ29yZTo6 U3R5bGVSZXNvbHZlcjo6ZmluZEZyb21NYXRjaGVkUHJvcGVydGllc0NhY2hlKToKKyAgICAgICAg KFdlYkNvcmU6OlN0eWxlUmVzb2x2ZXI6OmFwcGx5TWF0Y2hlZFByb3BlcnRpZXMpOgorICAgICAg ICAoV2ViQ29yZTo6U3R5bGVSZXNvbHZlcjo6YXBwbHlQcm9wZXJ0eVRvU3R5bGUpOgorICAgICAg ICAoV2ViQ29yZTo6U3R5bGVSZXNvbHZlcjo6TWF0Y2hlZFByb3BlcnRpZXM6Ok1hdGNoZWRQcm9w ZXJ0aWVzKToKKyAgICAgICAgKiBjc3MvU3R5bGVSZXNvbHZlci5oOgorICAgICAgICAoV2ViQ29y ZTo6UHNldWRvU3R5bGVSZXF1ZXN0OjpQc2V1ZG9TdHlsZVJlcXVlc3QpOgorICAgICAgICAoV2Vi Q29yZTo6U3R5bGVSZXNvbHZlclBhcmVudFB1c2hlcjo6U3R5bGVSZXNvbHZlclBhcmVudFB1c2hl cik6CisKIDIwMTUtMDMtMzEgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+ CiAKICAgICAgICAgTWFrZSBpdCBwb3NzaWJsZSB0byBjb21wdXRlIGEgcmVnaW9uIGZvciBlbGVt ZW50cyBvbiB0aGUgcGFnZSB0aGF0IGhhdmUgd2hlZWwgZXZlbnQgaGFuZGxlcnMKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJlc29sdmVyLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2Nzcy9TdHlsZVJlc29sdmVyLmNwcAppbmRleCAxYThmZjlhMTRlNTA0ZGMzZGM1N2Y0YTQ2NDRm MzNiZDhlODk2MzM3Li41MzdlYjAwODJlN2NkM2QzZTgwNWNiNTRkNzFmODY0M2QzMDkzZGUxIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSZXNvbHZlci5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvY3NzL1N0eWxlUmVzb2x2ZXIuY3BwCkBAIC00NDYsNyArNDQ2LDcgQEAgaW5s aW5lIHZvaWQgU3R5bGVSZXNvbHZlcjo6U3RhdGU6OmluaXRGb3JTdHlsZVJlc29sdmUoRG9jdW1l bnQmIGRvY3VtZW50LCBFbGVtZW4KICAgICB9IGVsc2UKICAgICAgICAgbV9wYXJlbnRTdHlsZSA9 IHBhcmVudFN0eWxlOwogCi0gICAgTm9kZSogZG9jRWxlbWVudCA9IGUgPyBlLT5kb2N1bWVudCgp LmRvY3VtZW50RWxlbWVudCgpIDogMDsKKyAgICBOb2RlKiBkb2NFbGVtZW50ID0gZSA/IGUtPmRv Y3VtZW50KCkuZG9jdW1lbnRFbGVtZW50KCkgOiBudWxscHRyOwogICAgIFJlbmRlclN0eWxlKiBk b2NTdHlsZSA9IGRvY3VtZW50LnJlbmRlclN0eWxlKCk7CiAgICAgbV9yb290RWxlbWVudFN0eWxl ID0gZG9jRWxlbWVudCAmJiBlICE9IGRvY0VsZW1lbnQgPyBkb2NFbGVtZW50LT5yZW5kZXJTdHls ZSgpIDogZG9jU3R5bGU7CiAKQEAgLTUwNiwxNCArNTA2LDE0IEBAIE5vZGUqIFN0eWxlUmVzb2x2 ZXI6OmxvY2F0ZUNvdXNpbkxpc3QoRWxlbWVudCogcGFyZW50LCB1bnNpZ25lZCYgdmlzaXRlZE5v ZGVDb3VuCiAgICAgICAgICAgICAgICAgcmV0dXJuIGN1cnJlbnROb2RlLT5sYXN0Q2hpbGQoKTsK ICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGlmIChzdWJjb3VudCA+PSBjU3R5bGVTZWFyY2hU aHJlc2hvbGQpCi0gICAgICAgICAgICAgICAgcmV0dXJuIDA7CisgICAgICAgICAgICAgICAgcmV0 dXJuIG51bGxwdHI7CiAgICAgICAgICAgICBjdXJyZW50Tm9kZSA9IGN1cnJlbnROb2RlLT5wcmV2 aW91c1NpYmxpbmcoKTsKICAgICAgICAgfQogICAgICAgICBjdXJyZW50Tm9kZSA9IGxvY2F0ZUNv dXNpbkxpc3QodGhpc0NvdXNpbi0+cGFyZW50RWxlbWVudCgpLCB2aXNpdGVkTm9kZUNvdW50KTsK ICAgICAgICAgdGhpc0NvdXNpbiA9IGN1cnJlbnROb2RlOwogICAgIH0KIAotICAgIHJldHVybiAw OworICAgIHJldHVybiBudWxscHRyOwogfQogCiBib29sIFN0eWxlUmVzb2x2ZXI6OnN0eWxlU2hh cmluZ0NhbmRpZGF0ZU1hdGNoZXNSdWxlU2V0KFJ1bGVTZXQqIHJ1bGVTZXQpCkBAIC03MzUsNyAr NzM1LDcgQEAgUmVuZGVyU3R5bGUqIFN0eWxlUmVzb2x2ZXI6OmxvY2F0ZVNoYXJlZFN0eWxlKCkK ICAgICAvLyBDaGVjayBwcmV2aW91cyBzaWJsaW5ncyBhbmQgdGhlaXIgY291c2lucy4KICAgICB1 bnNpZ25lZCBjb3VudCA9IDA7CiAgICAgdW5zaWduZWQgdmlzaXRlZE5vZGVDb3VudCA9IDA7Ci0g ICAgU3R5bGVkRWxlbWVudCogc2hhcmVFbGVtZW50ID0gMDsKKyAgICBTdHlsZWRFbGVtZW50KiBz aGFyZUVsZW1lbnQgPSBudWxscHRyOwogICAgIE5vZGUqIGNvdXNpbkxpc3QgPSBzdGF0ZS5zdHls ZWRFbGVtZW50KCktPnByZXZpb3VzU2libGluZygpOwogICAgIHdoaWxlIChjb3VzaW5MaXN0KSB7 CiAgICAgICAgIHNoYXJlRWxlbWVudCA9IGZpbmRTaWJsaW5nRm9yU3R5bGVTaGFyaW5nKGNvdXNp bkxpc3QsIGNvdW50KTsKQEAgLTkyMSw3ICs5MjEsNyBAQCB2b2lkIFN0eWxlUmVzb2x2ZXI6Omtl eWZyYW1lU3R5bGVzRm9yQW5pbWF0aW9uKEVsZW1lbnQqIGUsIGNvbnN0IFJlbmRlclN0eWxlKiBl bAogCiAgICAgICAgIGNvbnN0IFN0eWxlS2V5ZnJhbWUqIGtleWZyYW1lID0ga2V5ZnJhbWVzW2ld LmdldCgpOwogCi0gICAgICAgIEtleWZyYW1lVmFsdWUga2V5ZnJhbWVWYWx1ZSgwLCAwKTsKKyAg ICAgICAgS2V5ZnJhbWVWYWx1ZSBrZXlmcmFtZVZhbHVlKDAsIG51bGxwdHIpOwogICAgICAgICBr ZXlmcmFtZVZhbHVlLnNldFN0eWxlKHN0eWxlRm9yS2V5ZnJhbWUoZWxlbWVudFN0eWxlLCBrZXlm cmFtZSwga2V5ZnJhbWVWYWx1ZSkpOwogCiAgICAgICAgIC8vIEFkZCB0aGlzIGtleWZyYW1lIHN0 eWxlIHRvIGFsbCB0aGUgaW5kaWNhdGVkIGtleSB0aW1lcwpAQCAtOTM5LDcgKzkzOSw3IEBAIHZv aWQgU3R5bGVSZXNvbHZlcjo6a2V5ZnJhbWVTdHlsZXNGb3JBbmltYXRpb24oRWxlbWVudCogZSwg Y29uc3QgUmVuZGVyU3R5bGUqIGVsCiAgICAgICAgICAgICB6ZXJvUGVyY2VudEtleWZyYW1lID0g U3R5bGVLZXlmcmFtZTo6Y3JlYXRlKE11dGFibGVTdHlsZVByb3BlcnRpZXM6OmNyZWF0ZSgpKS5s ZWFrUmVmKCk7CiAgICAgICAgICAgICB6ZXJvUGVyY2VudEtleWZyYW1lLT5zZXRLZXlUZXh0KCIw JSIpOwogICAgICAgICB9Ci0gICAgICAgIEtleWZyYW1lVmFsdWUga2V5ZnJhbWVWYWx1ZSgwLCAw KTsKKyAgICAgICAgS2V5ZnJhbWVWYWx1ZSBrZXlmcmFtZVZhbHVlKDAsIG51bGxwdHIpOwogICAg ICAgICBrZXlmcmFtZVZhbHVlLnNldFN0eWxlKHN0eWxlRm9yS2V5ZnJhbWUoZWxlbWVudFN0eWxl LCB6ZXJvUGVyY2VudEtleWZyYW1lLCBrZXlmcmFtZVZhbHVlKSk7CiAgICAgICAgIGxpc3QuaW5z ZXJ0KGtleWZyYW1lVmFsdWUpOwogICAgIH0KQEAgLTk1MSw3ICs5NTEsNyBAQCB2b2lkIFN0eWxl UmVzb2x2ZXI6OmtleWZyYW1lU3R5bGVzRm9yQW5pbWF0aW9uKEVsZW1lbnQqIGUsIGNvbnN0IFJl bmRlclN0eWxlKiBlbAogICAgICAgICAgICAgaHVuZHJlZFBlcmNlbnRLZXlmcmFtZSA9IFN0eWxl S2V5ZnJhbWU6OmNyZWF0ZShNdXRhYmxlU3R5bGVQcm9wZXJ0aWVzOjpjcmVhdGUoKSkubGVha1Jl ZigpOwogICAgICAgICAgICAgaHVuZHJlZFBlcmNlbnRLZXlmcmFtZS0+c2V0S2V5VGV4dCgiMTAw JSIpOwogICAgICAgICB9Ci0gICAgICAgIEtleWZyYW1lVmFsdWUga2V5ZnJhbWVWYWx1ZSgxLCAw KTsKKyAgICAgICAgS2V5ZnJhbWVWYWx1ZSBrZXlmcmFtZVZhbHVlKDEsIG51bGxwdHIpOwogICAg ICAgICBrZXlmcmFtZVZhbHVlLnNldFN0eWxlKHN0eWxlRm9yS2V5ZnJhbWUoZWxlbWVudFN0eWxl LCBodW5kcmVkUGVyY2VudEtleWZyYW1lLCBrZXlmcmFtZVZhbHVlKSk7CiAgICAgICAgIGxpc3Qu aW5zZXJ0KGtleWZyYW1lVmFsdWUpOwogICAgIH0KQEAgLTk2MSw3ICs5NjEsNyBAQCBQYXNzUmVm UHRyPFJlbmRlclN0eWxlPiBTdHlsZVJlc29sdmVyOjpwc2V1ZG9TdHlsZUZvckVsZW1lbnQoRWxl bWVudCogZWxlbWVudCwgYwogewogICAgIEFTU0VSVChwYXJlbnRTdHlsZSk7CiAgICAgaWYgKCFl bGVtZW50KQotICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAKICAg ICBTdGF0ZSYgc3RhdGUgPSBtX3N0YXRlOwogCkBAIC05OTIsMTQgKzk5MiwxNCBAQCBQYXNzUmVm UHRyPFJlbmRlclN0eWxlPiBTdHlsZVJlc29sdmVyOjpwc2V1ZG9TdHlsZUZvckVsZW1lbnQoRWxl bWVudCogZWxlbWVudCwgYwogICAgIH0KIAogICAgIGlmIChjb2xsZWN0b3IubWF0Y2hlZFJlc3Vs dCgpLm1hdGNoZWRQcm9wZXJ0aWVzKCkuaXNFbXB0eSgpKQotICAgICAgICByZXR1cm4gMDsKKyAg ICAgICAgcmV0dXJuIG51bGxwdHI7CiAKICAgICBzdGF0ZS5zdHlsZSgpLT5zZXRTdHlsZVR5cGUo cHNldWRvU3R5bGVSZXF1ZXN0LnBzZXVkb0lkKTsKIAogICAgIGFwcGx5TWF0Y2hlZFByb3BlcnRp ZXMoY29sbGVjdG9yLm1hdGNoZWRSZXN1bHQoKSwgZWxlbWVudCk7CiAKICAgICAvLyBDbGVhbiB1 cCBvdXIgc3R5bGUgb2JqZWN0J3MgZGlzcGxheSBhbmQgdGV4dCBkZWNvcmF0aW9ucyAoYW1vbmcg b3RoZXIgZml4dXBzKS4KLSAgICBhZGp1c3RSZW5kZXJTdHlsZSgqc3RhdGUuc3R5bGUoKSwgKm1f c3RhdGUucGFyZW50U3R5bGUoKSwgMCk7CisgICAgYWRqdXN0UmVuZGVyU3R5bGUoKnN0YXRlLnN0 eWxlKCksICptX3N0YXRlLnBhcmVudFN0eWxlKCksIG51bGxwdHIpOwogCiAgICAgaWYgKHN0YXRl LnN0eWxlKCktPmhhc1ZpZXdwb3J0VW5pdHMoKSkKICAgICAgICAgZG9jdW1lbnQoKS5zZXRIYXNT dHlsZVdpdGhWaWV3cG9ydFVuaXRzKCk7CkBAIC0xNTAzLDcgKzE1MDMsNyBAQCBWZWN0b3I8UmVm UHRyPFN0eWxlUnVsZT4+IFN0eWxlUmVzb2x2ZXI6OnBzZXVkb1N0eWxlUnVsZXNGb3JFbGVtZW50 KEVsZW1lbnQqIGVsZQogICAgICAgICByZXR1cm4gVmVjdG9yPFJlZlB0cjxTdHlsZVJ1bGU+Pigp OwogCiAgICAgaW5pdEVsZW1lbnQoZWxlbWVudCk7Ci0gICAgbV9zdGF0ZS5pbml0Rm9yU3R5bGVS ZXNvbHZlKGRvY3VtZW50KCksIGVsZW1lbnQsIDApOworICAgIG1fc3RhdGUuaW5pdEZvclN0eWxl UmVzb2x2ZShkb2N1bWVudCgpLCBlbGVtZW50LCBudWxscHRyKTsKIAogICAgIEVsZW1lbnRSdWxl Q29sbGVjdG9yIGNvbGxlY3RvcigqZWxlbWVudCwgbV9zdGF0ZS5zdHlsZSgpLCBtX3J1bGVTZXRz LCBtX3NlbGVjdG9yRmlsdGVyKTsKICAgICBjb2xsZWN0b3Iuc2V0TW9kZShTZWxlY3RvckNoZWNr ZXI6Ok1vZGU6OkNvbGxlY3RpbmdSdWxlcyk7CkBAIC0xNjE2LDE4ICsxNjE2LDE4IEBAIGNvbnN0 IFN0eWxlUmVzb2x2ZXI6Ok1hdGNoZWRQcm9wZXJ0aWVzQ2FjaGVJdGVtKiBTdHlsZVJlc29sdmVy OjpmaW5kRnJvbU1hdGNoZWRQCiAKICAgICBNYXRjaGVkUHJvcGVydGllc0NhY2hlOjppdGVyYXRv ciBpdCA9IG1fbWF0Y2hlZFByb3BlcnRpZXNDYWNoZS5maW5kKGhhc2gpOwogICAgIGlmIChpdCA9 PSBtX21hdGNoZWRQcm9wZXJ0aWVzQ2FjaGUuZW5kKCkpCi0gICAgICAgIHJldHVybiAwOworICAg ICAgICByZXR1cm4gbnVsbHB0cjsKICAgICBNYXRjaGVkUHJvcGVydGllc0NhY2hlSXRlbSYgY2Fj aGVJdGVtID0gaXQtPnZhbHVlOwogCiAgICAgc2l6ZV90IHNpemUgPSBtYXRjaFJlc3VsdC5tYXRj aGVkUHJvcGVydGllcygpLnNpemUoKTsKICAgICBpZiAoc2l6ZSAhPSBjYWNoZUl0ZW0ubWF0Y2hl ZFByb3BlcnRpZXMuc2l6ZSgpKQotICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgcmV0dXJuIG51 bGxwdHI7CiAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBzaXplOyArK2kpIHsKICAgICAgICAg aWYgKG1hdGNoUmVzdWx0Lm1hdGNoZWRQcm9wZXJ0aWVzKClbaV0gIT0gY2FjaGVJdGVtLm1hdGNo ZWRQcm9wZXJ0aWVzW2ldKQotICAgICAgICAgICAgcmV0dXJuIDA7CisgICAgICAgICAgICByZXR1 cm4gbnVsbHB0cjsKICAgICB9CiAgICAgaWYgKGNhY2hlSXRlbS5yYW5nZXMgIT0gbWF0Y2hSZXN1 bHQucmFuZ2VzKQotICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAg ICAgcmV0dXJuICZjYWNoZUl0ZW07CiB9CiAKQEAgLTE3MjUsNyArMTcyNSw3IEBAIHZvaWQgU3R5 bGVSZXNvbHZlcjo6YXBwbHlNYXRjaGVkUHJvcGVydGllcyhjb25zdCBNYXRjaFJlc3VsdCYgbWF0 Y2hSZXN1bHQsIGNvbnN0CiAgICAgU3RhdGUmIHN0YXRlID0gbV9zdGF0ZTsKICAgICB1bnNpZ25l ZCBjYWNoZUhhc2ggPSBzaG91bGRVc2VNYXRjaGVkUHJvcGVydGllc0NhY2hlICYmIG1hdGNoUmVz dWx0LmlzQ2FjaGVhYmxlID8gY29tcHV0ZU1hdGNoZWRQcm9wZXJ0aWVzSGFzaChtYXRjaFJlc3Vs dC5tYXRjaGVkUHJvcGVydGllcygpLmRhdGEoKSwgbWF0Y2hSZXN1bHQubWF0Y2hlZFByb3BlcnRp ZXMoKS5zaXplKCkpIDogMDsKICAgICBib29sIGFwcGx5SW5oZXJpdGVkT25seSA9IGZhbHNlOwot ICAgIGNvbnN0IE1hdGNoZWRQcm9wZXJ0aWVzQ2FjaGVJdGVtKiBjYWNoZUl0ZW0gPSAwOworICAg IGNvbnN0IE1hdGNoZWRQcm9wZXJ0aWVzQ2FjaGVJdGVtKiBjYWNoZUl0ZW0gPSBudWxscHRyOwog ICAgIGlmIChjYWNoZUhhc2ggJiYgKGNhY2hlSXRlbSA9IGZpbmRGcm9tTWF0Y2hlZFByb3BlcnRp ZXNDYWNoZShjYWNoZUhhc2gsIG1hdGNoUmVzdWx0KSkKICAgICAgICAgJiYgaXNDYWNoZWFibGVJ bk1hdGNoZWRQcm9wZXJ0aWVzQ2FjaGUoZWxlbWVudCwgc3RhdGUuc3R5bGUoKSwgc3RhdGUucGFy ZW50U3R5bGUoKSkpIHsKICAgICAgICAgLy8gV2UgY2FuIGJ1aWxkIHVwIHRoZSBzdHlsZSBieSBj b3B5aW5nIG5vbi1pbmhlcml0ZWQgcHJvcGVydGllcyBmcm9tIGFuIGVhcmxpZXIgc3R5bGUgb2Jq ZWN0IGJ1aWx0IHVzaW5nIHRoZSBzYW1lIGV4YWN0CkBAIC0xODIxLDcgKzE4MjEsNyBAQCB2b2lk IFN0eWxlUmVzb2x2ZXI6OmFwcGx5TWF0Y2hlZFByb3BlcnRpZXMoY29uc3QgTWF0Y2hSZXN1bHQm IG1hdGNoUmVzdWx0LCBjb25zdAogCiB2b2lkIFN0eWxlUmVzb2x2ZXI6OmFwcGx5UHJvcGVydHlU b1N0eWxlKENTU1Byb3BlcnR5SUQgaWQsIENTU1ZhbHVlKiB2YWx1ZSwgUmVuZGVyU3R5bGUqIHN0 eWxlKQogewotICAgIGluaXRFbGVtZW50KDApOworICAgIGluaXRFbGVtZW50KG51bGxwdHIpOwog ICAgIG1fc3RhdGUuaW5pdEZvclN0eWxlUmVzb2x2ZShkb2N1bWVudCgpLCBudWxscHRyLCBzdHls ZSk7CiAgICAgbV9zdGF0ZS5zZXRTdHlsZSgqc3R5bGUpOwogICAgIGFwcGx5UHJvcGVydHlUb0N1 cnJlbnRTdHlsZShpZCwgdmFsdWUpOwpAQCAtMjU2Nyw3ICsyNTY3LDcgQEAgdm9pZCBTdHlsZVJl c29sdmVyOjpsb2FkUGVuZGluZ1Jlc291cmNlcygpCiB9CiAKIGlubGluZSBTdHlsZVJlc29sdmVy OjpNYXRjaGVkUHJvcGVydGllczo6TWF0Y2hlZFByb3BlcnRpZXMoKQotICAgIDogcG9zc2libHlQ YWRkZWRNZW1iZXIoMCkKKyAgICA6IHBvc3NpYmx5UGFkZGVkTWVtYmVyKG51bGxwdHIpCiB7CiB9 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJlc29sdmVyLmggYi9Tb3Vy Y2UvV2ViQ29yZS9jc3MvU3R5bGVSZXNvbHZlci5oCmluZGV4IGU0NDIyZTBhN2M3ZjdlYmY0YzY4 YzVjNTlmZDk5YzljMTVjZTFhZGQuLmJmODNlNDU2ZjNhN2RmM2QyNTFiZWI2ZmU2NmE3YTEzNmE1 ZDgyNDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJlc29sdmVyLmgKKysr IGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUmVzb2x2ZXIuaApAQCAtMTIzLDcgKzEyMyw3IEBA IGVudW0gUnVsZU1hdGNoaW5nQmVoYXZpb3IgewogCiBjbGFzcyBQc2V1ZG9TdHlsZVJlcXVlc3Qg ewogcHVibGljOgotICAgIFBzZXVkb1N0eWxlUmVxdWVzdChQc2V1ZG9JZCBwc2V1ZG9JZCwgUmVu ZGVyU2Nyb2xsYmFyKiBzY3JvbGxiYXIgPSAwLCBTY3JvbGxiYXJQYXJ0IHNjcm9sbGJhclBhcnQg PSBOb1BhcnQpCisgICAgUHNldWRvU3R5bGVSZXF1ZXN0KFBzZXVkb0lkIHBzZXVkb0lkLCBSZW5k ZXJTY3JvbGxiYXIqIHNjcm9sbGJhciA9IG51bGxwdHIsIFNjcm9sbGJhclBhcnQgc2Nyb2xsYmFy UGFydCA9IE5vUGFydCkKICAgICAgICAgOiBwc2V1ZG9JZChwc2V1ZG9JZCkKICAgICAgICAgLCBz Y3JvbGxiYXJQYXJ0KHNjcm9sbGJhclBhcnQpCiAgICAgICAgICwgc2Nyb2xsYmFyKHNjcm9sbGJh cikKQEAgLTU3Niw3ICs1NzYsNyBAQCBjbGFzcyBTdHlsZVJlc29sdmVyUGFyZW50UHVzaGVyIHsK IHB1YmxpYzoKICAgICBTdHlsZVJlc29sdmVyUGFyZW50UHVzaGVyKEVsZW1lbnQqIHBhcmVudCkK ICAgICAgICAgOiBtX3BhcmVudChwYXJlbnQpCi0gICAgICAgICwgbV9wdXNoZWRTdHlsZVJlc29s dmVyKDApCisgICAgICAgICwgbV9wdXNoZWRTdHlsZVJlc29sdmVyKG51bGxwdHIpCiAgICAgeyB9 CiAgICAgdm9pZCBwdXNoKCkKICAgICB7Cg==