139635 2014-12-14 21:03:48 -0800 Move 'counter-increment' / 'counter-reset' to the new StyleBuilder 2014-12-15 01:49:44 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 137910 1 cdumez cdumez commit-queue kling koivisto sam oldest_to_newest 1055553 0 cdumez 2014-12-14 21:03:48 -0800 Move 'counter-increment' / 'counter-reset' to the new StyleBuilder 1055560 1 243281 cdumez 2014-12-14 21:41:39 -0800 Created attachment 243281 Patch 1055577 2 243281 koivisto 2014-12-15 01:16:20 -0800 Comment on attachment 243281 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=243281&action=review > Source/WebCore/css/StyleBuilderCustom.h:159 > + template <CounterBehavior counterBehavior> > + static void applyInheritCounter(StyleResolver&); I would put template arguments on the same line in headers. 1055579 3 243281 commit-queue 2014-12-15 01:49:40 -0800 Comment on attachment 243281 Patch Clearing flags on attachment: 243281 Committed r177274: <http://trac.webkit.org/changeset/177274> 1055580 4 commit-queue 2014-12-15 01:49:44 -0800 All reviewed patches have been landed. Closing bug. 243281 2014-12-14 21:41:39 -0800 2014-12-15 01:49:40 -0800 Patch bug-139635-20141214214226.patch text/plain 11421 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3MjcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTdjNTk4ZmNiMTNiNDcw YjBiOWQ4OWYyM2JlMjc0N2JhZjgzZGI0Mi4uMzNhNGQ1ZTdhOWFhMWM5NWE0MDA0YTU1Mzk1YjVl NGRlY2U4ZTZjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDE0LTEyLTE0ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgTW92ZSAnY291bnRlci1pbmNy ZW1lbnQnIC8gJ2NvdW50ZXItcmVzZXQnIHRvIHRoZSBuZXcgU3R5bGVCdWlsZGVyCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzk2MzUKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb3ZlICdjb3VudGVyLWlu Y3JlbWVudCcgLyAnY291bnRlci1yZXNldCcgdG8gdGhlIG5ldyBTdHlsZUJ1aWxkZXIgYnkKKyAg ICAgICAgdXNpbmcgY3VzdG9tIGNvZGUuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBubyBiZWhh dmlvciBjaGFuZ2UuCisKKyAgICAgICAgKiBjc3MvQ1NTUHJvcGVydHlOYW1lcy5pbjoKKyAgICAg ICAgKiBjc3MvRGVwcmVjYXRlZFN0eWxlQnVpbGRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpE ZXByZWNhdGVkU3R5bGVCdWlsZGVyOjpEZXByZWNhdGVkU3R5bGVCdWlsZGVyKToKKyAgICAgICAg KFdlYkNvcmU6OkFwcGx5UHJvcGVydHlDb3VudGVyOjplbXB0eUZ1bmN0aW9uKTogRGVsZXRlZC4K KyAgICAgICAgKFdlYkNvcmU6OkFwcGx5UHJvcGVydHlDb3VudGVyOjphcHBseUluaGVyaXRWYWx1 ZSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpBcHBseVByb3BlcnR5Q291bnRlcjo6YXBw bHlWYWx1ZSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpBcHBseVByb3BlcnR5Q291bnRl cjo6Y3JlYXRlSGFuZGxlcik6IERlbGV0ZWQuCisgICAgICAgICogY3NzL1N0eWxlQnVpbGRlckN1 c3RvbS5oOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGVCdWlsZGVyQ3VzdG9tOjphcHBseUluaXRp YWxDb3VudGVySW5jcmVtZW50KToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlQnVpbGRlckN1c3Rv bTo6YXBwbHlJbml0aWFsQ291bnRlclJlc2V0KToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlQnVp bGRlckN1c3RvbTo6YXBwbHlJbmhlcml0Q291bnRlcik6CisgICAgICAgIChXZWJDb3JlOjpTdHls ZUJ1aWxkZXJDdXN0b206OmFwcGx5VmFsdWVDb3VudGVyKToKKyAgICAgICAgKFdlYkNvcmU6OlN0 eWxlQnVpbGRlckN1c3RvbTo6YXBwbHlJbmhlcml0Q291bnRlckluY3JlbWVudCk6CisgICAgICAg IChXZWJDb3JlOjpTdHlsZUJ1aWxkZXJDdXN0b206OmFwcGx5VmFsdWVDb3VudGVySW5jcmVtZW50 KToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlQnVpbGRlckN1c3RvbTo6YXBwbHlJbmhlcml0Q291 bnRlclJlc2V0KToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlQnVpbGRlckN1c3RvbTo6YXBwbHlW YWx1ZUNvdW50ZXJSZXNldCk6CisKIDIwMTQtMTItMTQgIENvbW1pdCBRdWV1ZSAgPGNvbW1pdC1x dWV1ZUB3ZWJraXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIxNzcy MzggYW5kIHIxNzcyNDQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJvcGVy dHlOYW1lcy5pbiBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcm9wZXJ0eU5hbWVzLmluCmluZGV4 IGRmYzdjYjMyMDAzODI2NWRjOTYwYWM4NThmOTk3NGZjNjE3OGE0MzEuLjkzZGU1MzY0Y2I4MzJm N2EyMDg0ZDExNWFlNDI4OTQ0MDdmOWZjMjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nz cy9DU1NQcm9wZXJ0eU5hbWVzLmluCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcm9wZXJ0 eU5hbWVzLmluCkBAIC0xNjYsOCArMTY2LDggQEAgY2xlYXIKIGNsaXAgW0N1c3RvbT1BbGxdCiAt d2Via2l0LWNsaXAtcGF0aCBbQ29udmVydGVyPUNsaXBQYXRoXQogY29udGVudCBbTGVnYWN5U3R5 bGVCdWlsZGVyXQotY291bnRlci1pbmNyZW1lbnQgW0xlZ2FjeVN0eWxlQnVpbGRlcl0KLWNvdW50 ZXItcmVzZXQgW0xlZ2FjeVN0eWxlQnVpbGRlcl0KK2NvdW50ZXItaW5jcmVtZW50IFtDdXN0b209 QWxsXQorY291bnRlci1yZXNldCBbQ3VzdG9tPUFsbF0KIGN1cnNvciBbSW5oZXJpdGVkLCBMZWdh Y3lTdHlsZUJ1aWxkZXJdCiAjaWYgZGVmaW5lZChFTkFCTEVfQ1VSU09SX1ZJU0lCSUxJVFkpICYm IEVOQUJMRV9DVVJTT1JfVklTSUJJTElUWQogLXdlYmtpdC1jdXJzb3ItdmlzaWJpbGl0eSBbSW5o ZXJpdGVkLCBUeXBlTmFtZT1DdXJzb3JWaXNpYmlsaXR5XQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvY3NzL0RlcHJlY2F0ZWRTdHlsZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvY3Nz L0RlcHJlY2F0ZWRTdHlsZUJ1aWxkZXIuY3BwCmluZGV4IDk4YTUyNWZiMzljNjJhZjJhNWVhZWMx YmQyZDI2MGFkYzdjODkxMTEuLmYxODFiYjAzYWZkZmMyZmIyOWM3MjgzZjk3YThkZGViY2RhZTQx MGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9EZXByZWNhdGVkU3R5bGVCdWlsZGVy LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvRGVwcmVjYXRlZFN0eWxlQnVpbGRlci5jcHAK QEAgLTYyNiw3MiArNjI2LDYgQEAgcHVibGljOgogICAgIH0KIH07CiAKLWVudW0gQ291bnRlckJl aGF2aW9yIHtJbmNyZW1lbnQgPSAwLCBSZXNldH07Ci10ZW1wbGF0ZSA8Q291bnRlckJlaGF2aW9y IGNvdW50ZXJCZWhhdmlvcj4KLWNsYXNzIEFwcGx5UHJvcGVydHlDb3VudGVyIHsKLXB1YmxpYzoK LSAgICBzdGF0aWMgdm9pZCBlbXB0eUZ1bmN0aW9uKENTU1Byb3BlcnR5SUQsIFN0eWxlUmVzb2x2 ZXIqKSB7IH0KLSAgICBzdGF0aWMgdm9pZCBhcHBseUluaGVyaXRWYWx1ZShDU1NQcm9wZXJ0eUlE LCBTdHlsZVJlc29sdmVyKiBzdHlsZVJlc29sdmVyKQotICAgIHsKLSAgICAgICAgQ291bnRlckRp cmVjdGl2ZU1hcCYgbWFwID0gc3R5bGVSZXNvbHZlci0+c3R5bGUoKS0+YWNjZXNzQ291bnRlckRp cmVjdGl2ZXMoKTsKLSAgICAgICAgQ291bnRlckRpcmVjdGl2ZU1hcCYgcGFyZW50TWFwID0gc3R5 bGVSZXNvbHZlci0+cGFyZW50U3R5bGUoKS0+YWNjZXNzQ291bnRlckRpcmVjdGl2ZXMoKTsKLQot ICAgICAgICB0eXBlZGVmIENvdW50ZXJEaXJlY3RpdmVNYXA6Oml0ZXJhdG9yIEl0ZXJhdG9yOwot ICAgICAgICBJdGVyYXRvciBlbmQgPSBwYXJlbnRNYXAuZW5kKCk7Ci0gICAgICAgIGZvciAoSXRl cmF0b3IgaXQgPSBwYXJlbnRNYXAuYmVnaW4oKTsgaXQgIT0gZW5kOyArK2l0KSB7Ci0gICAgICAg ICAgICBDb3VudGVyRGlyZWN0aXZlcyYgZGlyZWN0aXZlcyA9IG1hcC5hZGQoaXQtPmtleSwgQ291 bnRlckRpcmVjdGl2ZXMoKSkuaXRlcmF0b3ItPnZhbHVlOwotICAgICAgICAgICAgaWYgKGNvdW50 ZXJCZWhhdmlvciA9PSBSZXNldCkgewotICAgICAgICAgICAgICAgIGRpcmVjdGl2ZXMuaW5oZXJp dFJlc2V0KGl0LT52YWx1ZSk7Ci0gICAgICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgICAg IGRpcmVjdGl2ZXMuaW5oZXJpdEluY3JlbWVudChpdC0+dmFsdWUpOwotICAgICAgICAgICAgfQot ICAgICAgICB9Ci0gICAgfQotICAgIHN0YXRpYyB2b2lkIGFwcGx5VmFsdWUoQ1NTUHJvcGVydHlJ RCwgU3R5bGVSZXNvbHZlciogc3R5bGVSZXNvbHZlciwgQ1NTVmFsdWUqIHZhbHVlKQotICAgIHsK LSAgICAgICAgYm9vbCBzZXRDb3VudGVySW5jcmVtZW50VG9Ob25lID0gY291bnRlckJlaGF2aW9y ID09IEluY3JlbWVudCAmJiBpczxDU1NQcmltaXRpdmVWYWx1ZT4oKnZhbHVlKSAmJiBkb3duY2Fz dDxDU1NQcmltaXRpdmVWYWx1ZT4oKnZhbHVlKS5nZXRWYWx1ZUlEKCkgPT0gQ1NTVmFsdWVOb25l OwotCi0gICAgICAgIGlmICghaXM8Q1NTVmFsdWVMaXN0PigqdmFsdWUpICYmICFzZXRDb3VudGVy SW5jcmVtZW50VG9Ob25lKQotICAgICAgICAgICAgcmV0dXJuOwotCi0gICAgICAgIENvdW50ZXJE aXJlY3RpdmVNYXAmIG1hcCA9IHN0eWxlUmVzb2x2ZXItPnN0eWxlKCktPmFjY2Vzc0NvdW50ZXJE aXJlY3RpdmVzKCk7Ci0gICAgICAgIHR5cGVkZWYgQ291bnRlckRpcmVjdGl2ZU1hcDo6aXRlcmF0 b3IgSXRlcmF0b3I7Ci0KLSAgICAgICAgSXRlcmF0b3IgZW5kID0gbWFwLmVuZCgpOwotICAgICAg ICBmb3IgKEl0ZXJhdG9yIGl0ID0gbWFwLmJlZ2luKCk7IGl0ICE9IGVuZDsgKytpdCkKLSAgICAg ICAgICAgIGlmIChjb3VudGVyQmVoYXZpb3IgPT0gUmVzZXQpCi0gICAgICAgICAgICAgICAgaXQt PnZhbHVlLmNsZWFyUmVzZXQoKTsKLSAgICAgICAgICAgIGVsc2UKLSAgICAgICAgICAgICAgICBp dC0+dmFsdWUuY2xlYXJJbmNyZW1lbnQoKTsKLSAgICAgICAgCi0gICAgICAgIGlmIChzZXRDb3Vu dGVySW5jcmVtZW50VG9Ob25lKQotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICAKLSAgICAg ICAgQ1NTVmFsdWVMaXN0JiBsaXN0ID0gZG93bmNhc3Q8Q1NTVmFsdWVMaXN0PigqdmFsdWUpOwot ICAgICAgICBpbnQgbGVuZ3RoID0gbGlzdC5sZW5ndGgoKTsKLSAgICAgICAgZm9yIChpbnQgaSA9 IDA7IGkgPCBsZW5ndGg7ICsraSkgewotICAgICAgICAgICAgQ1NTVmFsdWUqIGN1cnJWYWx1ZSA9 IGxpc3QuaXRlbVdpdGhvdXRCb3VuZHNDaGVjayhpKTsKLSAgICAgICAgICAgIGlmICghaXM8Q1NT UHJpbWl0aXZlVmFsdWU+KCpjdXJyVmFsdWUpKQotICAgICAgICAgICAgICAgIGNvbnRpbnVlOwot Ci0gICAgICAgICAgICBQYWlyKiBwYWlyID0gZG93bmNhc3Q8Q1NTUHJpbWl0aXZlVmFsdWU+KCpj dXJyVmFsdWUpLmdldFBhaXJWYWx1ZSgpOwotICAgICAgICAgICAgaWYgKCFwYWlyIHx8ICFwYWly LT5maXJzdCgpIHx8ICFwYWlyLT5zZWNvbmQoKSkKLSAgICAgICAgICAgICAgICBjb250aW51ZTsK LQotICAgICAgICAgICAgQXRvbWljU3RyaW5nIGlkZW50aWZpZXIgPSBzdGF0aWNfY2FzdDxDU1NQ cmltaXRpdmVWYWx1ZSo+KHBhaXItPmZpcnN0KCkpLT5nZXRTdHJpbmdWYWx1ZSgpOwotICAgICAg ICAgICAgaW50IHZhbHVlID0gc3RhdGljX2Nhc3Q8Q1NTUHJpbWl0aXZlVmFsdWUqPihwYWlyLT5z ZWNvbmQoKSktPmdldEludFZhbHVlKCk7Ci0gICAgICAgICAgICBDb3VudGVyRGlyZWN0aXZlcyYg ZGlyZWN0aXZlcyA9IG1hcC5hZGQoaWRlbnRpZmllciwgQ291bnRlckRpcmVjdGl2ZXMoKSkuaXRl cmF0b3ItPnZhbHVlOwotICAgICAgICAgICAgaWYgKGNvdW50ZXJCZWhhdmlvciA9PSBSZXNldCkg ewotICAgICAgICAgICAgICAgIGRpcmVjdGl2ZXMuc2V0UmVzZXRWYWx1ZSh2YWx1ZSk7Ci0gICAg ICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgICAgIGRpcmVjdGl2ZXMuYWRkSW5jcmVtZW50 VmFsdWUodmFsdWUpOwotICAgICAgICAgICAgfQotICAgICAgICB9Ci0gICAgfQotICAgIHN0YXRp YyBQcm9wZXJ0eUhhbmRsZXIgY3JlYXRlSGFuZGxlcigpIHsgcmV0dXJuIFByb3BlcnR5SGFuZGxl cigmYXBwbHlJbmhlcml0VmFsdWUsICZlbXB0eUZ1bmN0aW9uLCAmYXBwbHlWYWx1ZSk7IH0KLX07 Ci0KLQogY2xhc3MgQXBwbHlQcm9wZXJ0eUN1cnNvciB7CiBwdWJsaWM6CiAgICAgc3RhdGljIHZv aWQgYXBwbHlJbmhlcml0VmFsdWUoQ1NTUHJvcGVydHlJRCwgU3R5bGVSZXNvbHZlciogc3R5bGVS ZXNvbHZlcikKQEAgLTg4NCw4ICs4MTgsNiBAQCBEZXByZWNhdGVkU3R5bGVCdWlsZGVyOjpEZXBy ZWNhdGVkU3R5bGVCdWlsZGVyKCkKICAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlC b3JkZXJSaWdodENvbG9yLCBBcHBseVByb3BlcnR5Q29sb3I8Tm9Jbmhlcml0RnJvbVBhcmVudCwg JlJlbmRlclN0eWxlOjpib3JkZXJSaWdodENvbG9yLCAmUmVuZGVyU3R5bGU6OnNldEJvcmRlclJp Z2h0Q29sb3IsICZSZW5kZXJTdHlsZTo6c2V0VmlzaXRlZExpbmtCb3JkZXJSaWdodENvbG9yLCAm UmVuZGVyU3R5bGU6OmNvbG9yPjo6Y3JlYXRlSGFuZGxlcigpKTsKICAgICBzZXRQcm9wZXJ0eUhh bmRsZXIoQ1NTUHJvcGVydHlCb3JkZXJUb3BDb2xvciwgQXBwbHlQcm9wZXJ0eUNvbG9yPE5vSW5o ZXJpdEZyb21QYXJlbnQsICZSZW5kZXJTdHlsZTo6Ym9yZGVyVG9wQ29sb3IsICZSZW5kZXJTdHls ZTo6c2V0Qm9yZGVyVG9wQ29sb3IsICZSZW5kZXJTdHlsZTo6c2V0VmlzaXRlZExpbmtCb3JkZXJU b3BDb2xvciwgJlJlbmRlclN0eWxlOjpjb2xvcj46OmNyZWF0ZUhhbmRsZXIoKSk7CiAgICAgc2V0 UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5Q29sb3IsIEFwcGx5UHJvcGVydHlDb2xvcjxJbmhl cml0RnJvbVBhcmVudCwgJlJlbmRlclN0eWxlOjpjb2xvciwgJlJlbmRlclN0eWxlOjpzZXRDb2xv ciwgJlJlbmRlclN0eWxlOjpzZXRWaXNpdGVkTGlua0NvbG9yLCAmUmVuZGVyU3R5bGU6OmludmFs aWRDb2xvciwgUmVuZGVyU3R5bGU6OmluaXRpYWxDb2xvcj46OmNyZWF0ZUhhbmRsZXIoKSk7Ci0g ICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5Q291bnRlckluY3JlbWVudCwgQXBwbHlQ cm9wZXJ0eUNvdW50ZXI8SW5jcmVtZW50Pjo6Y3JlYXRlSGFuZGxlcigpKTsKLSAgICBzZXRQcm9w ZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlDb3VudGVyUmVzZXQsIEFwcGx5UHJvcGVydHlDb3VudGVy PFJlc2V0Pjo6Y3JlYXRlSGFuZGxlcigpKTsKICAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJv cGVydHlDdXJzb3IsIEFwcGx5UHJvcGVydHlDdXJzb3I6OmNyZWF0ZUhhbmRsZXIoKSk7CiAgICAg c2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5Rm9udFNpemUsIEFwcGx5UHJvcGVydHlGb250 U2l6ZTo6Y3JlYXRlSGFuZGxlcigpKTsKICAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVy dHlGb250U3R5bGUsIEFwcGx5UHJvcGVydHlGb250PEZvbnRJdGFsaWMsICZGb250RGVzY3JpcHRp b246Oml0YWxpYywgJkZvbnREZXNjcmlwdGlvbjo6c2V0SXRhbGljLCBGb250SXRhbGljT2ZmPjo6 Y3JlYXRlSGFuZGxlcigpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZUJ1 aWxkZXJDdXN0b20uaCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZUJ1aWxkZXJDdXN0b20uaApp bmRleCBlY2M1NzQ0MTkxM2ZkYzM3NTRmZTVhYjk1MzRmMDM1ZjA5NDA2NzkwLi45YjM0ZjEyZGIw MjI0NWVjZmNlNGIyM2I3OWZhYmZkYjM2MzQ2NzhmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9jc3MvU3R5bGVCdWlsZGVyQ3VzdG9tLmgKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxl QnVpbGRlckN1c3RvbS5oCkBAIC0xMzQsNiArMTM0LDEzIEBAIHB1YmxpYzoKICAgICBzdGF0aWMg dm9pZCBhcHBseUluaGVyaXRXZWJraXRUZXh0RW1waGFzaXNTdHlsZShTdHlsZVJlc29sdmVyJik7 CiAgICAgc3RhdGljIHZvaWQgYXBwbHlWYWx1ZVdlYmtpdFRleHRFbXBoYXNpc1N0eWxlKFN0eWxl UmVzb2x2ZXImLCBDU1NWYWx1ZSYpOwogCisgICAgc3RhdGljIHZvaWQgYXBwbHlJbml0aWFsQ291 bnRlckluY3JlbWVudChTdHlsZVJlc29sdmVyJikgeyB9CisgICAgc3RhdGljIHZvaWQgYXBwbHlJ bmhlcml0Q291bnRlckluY3JlbWVudChTdHlsZVJlc29sdmVyJik7CisgICAgc3RhdGljIHZvaWQg YXBwbHlWYWx1ZUNvdW50ZXJJbmNyZW1lbnQoU3R5bGVSZXNvbHZlciYsIENTU1ZhbHVlJik7Cisg ICAgc3RhdGljIHZvaWQgYXBwbHlJbml0aWFsQ291bnRlclJlc2V0KFN0eWxlUmVzb2x2ZXImKSB7 IH0KKyAgICBzdGF0aWMgdm9pZCBhcHBseUluaGVyaXRDb3VudGVyUmVzZXQoU3R5bGVSZXNvbHZl ciYpOworICAgIHN0YXRpYyB2b2lkIGFwcGx5VmFsdWVDb3VudGVyUmVzZXQoU3R5bGVSZXNvbHZl ciYsIENTU1ZhbHVlJik7CisKIHByaXZhdGU6CiAgICAgc3RhdGljIHZvaWQgcmVzZXRFZmZlY3Rp dmVab29tKFN0eWxlUmVzb2x2ZXImKTsKICAgICBzdGF0aWMgQ1NTVG9MZW5ndGhDb252ZXJzaW9u RGF0YSBjc3N0b0xlbmd0aENvbnZlcnNpb25EYXRhV2l0aFRleHRab29tRmFjdG9yKFN0eWxlUmVz b2x2ZXImKTsKQEAgLTE0Niw2ICsxNTMsMTIgQEAgcHJpdmF0ZToKICAgICB0ZW1wbGF0ZSA8Q1NT UHJvcGVydHlJRCBpZD4KICAgICBzdGF0aWMgdm9pZCBhcHBseVRleHRPckJveFNoYWRvd1ZhbHVl KFN0eWxlUmVzb2x2ZXImLCBDU1NWYWx1ZSYpOwogICAgIHN0YXRpYyBib29sIGlzVmFsaWREaXNw bGF5VmFsdWUoU3R5bGVSZXNvbHZlciYsIEVEaXNwbGF5KTsKKworICAgIGVudW0gQ291bnRlckJl aGF2aW9yIHtJbmNyZW1lbnQgPSAwLCBSZXNldH07CisgICAgdGVtcGxhdGUgPENvdW50ZXJCZWhh dmlvciBjb3VudGVyQmVoYXZpb3I+CisgICAgc3RhdGljIHZvaWQgYXBwbHlJbmhlcml0Q291bnRl cihTdHlsZVJlc29sdmVyJik7CisgICAgdGVtcGxhdGUgPENvdW50ZXJCZWhhdmlvciBjb3VudGVy QmVoYXZpb3I+CisgICAgc3RhdGljIHZvaWQgYXBwbHlWYWx1ZUNvdW50ZXIoU3R5bGVSZXNvbHZl ciYsIENTU1ZhbHVlJik7CiB9OwogCiBpbmxpbmUgdm9pZCBTdHlsZUJ1aWxkZXJDdXN0b206OmFw cGx5VmFsdWVXZWJraXRNYXJxdWVlSW5jcmVtZW50KFN0eWxlUmVzb2x2ZXImIHN0eWxlUmVzb2x2 ZXIsIENTU1ZhbHVlJiB2YWx1ZSkKQEAgLTExMDAsNiArMTExMyw3MyBAQCBpbmxpbmUgdm9pZCBT dHlsZUJ1aWxkZXJDdXN0b206OmFwcGx5VmFsdWVXZWJraXRUZXh0RW1waGFzaXNTdHlsZShTdHls ZVJlc29sdmVyJgogICAgIH0KIH0KIAordGVtcGxhdGUgPFN0eWxlQnVpbGRlckN1c3RvbTo6Q291 bnRlckJlaGF2aW9yIGNvdW50ZXJCZWhhdmlvcj4KK2lubGluZSB2b2lkIFN0eWxlQnVpbGRlckN1 c3RvbTo6YXBwbHlJbmhlcml0Q291bnRlcihTdHlsZVJlc29sdmVyJiBzdHlsZVJlc29sdmVyKQor eworICAgIENvdW50ZXJEaXJlY3RpdmVNYXAmIG1hcCA9IHN0eWxlUmVzb2x2ZXIuc3R5bGUoKS0+ YWNjZXNzQ291bnRlckRpcmVjdGl2ZXMoKTsKKyAgICBmb3IgKGF1dG8mIGtleVZhbHVlIDogc3R5 bGVSZXNvbHZlci5wYXJlbnRTdHlsZSgpLT5hY2Nlc3NDb3VudGVyRGlyZWN0aXZlcygpKSB7Cisg ICAgICAgIENvdW50ZXJEaXJlY3RpdmVzJiBkaXJlY3RpdmVzID0gbWFwLmFkZChrZXlWYWx1ZS5r ZXksIENvdW50ZXJEaXJlY3RpdmVzKCkpLml0ZXJhdG9yLT52YWx1ZTsKKyAgICAgICAgaWYgKGNv dW50ZXJCZWhhdmlvciA9PSBSZXNldCkKKyAgICAgICAgICAgIGRpcmVjdGl2ZXMuaW5oZXJpdFJl c2V0KGtleVZhbHVlLnZhbHVlKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgZGlyZWN0aXZl cy5pbmhlcml0SW5jcmVtZW50KGtleVZhbHVlLnZhbHVlKTsKKyAgICB9Cit9CisKK3RlbXBsYXRl IDxTdHlsZUJ1aWxkZXJDdXN0b206OkNvdW50ZXJCZWhhdmlvciBjb3VudGVyQmVoYXZpb3I+Citp bmxpbmUgdm9pZCBTdHlsZUJ1aWxkZXJDdXN0b206OmFwcGx5VmFsdWVDb3VudGVyKFN0eWxlUmVz b2x2ZXImIHN0eWxlUmVzb2x2ZXIsIENTU1ZhbHVlJiB2YWx1ZSkKK3sKKyAgICBib29sIHNldENv dW50ZXJJbmNyZW1lbnRUb05vbmUgPSBjb3VudGVyQmVoYXZpb3IgPT0gSW5jcmVtZW50ICYmIGlz PENTU1ByaW1pdGl2ZVZhbHVlPih2YWx1ZSkgJiYgZG93bmNhc3Q8Q1NTUHJpbWl0aXZlVmFsdWU+ KHZhbHVlKS5nZXRWYWx1ZUlEKCkgPT0gQ1NTVmFsdWVOb25lOworCisgICAgaWYgKCFpczxDU1NW YWx1ZUxpc3Q+KHZhbHVlKSAmJiAhc2V0Q291bnRlckluY3JlbWVudFRvTm9uZSkKKyAgICAgICAg cmV0dXJuOworCisgICAgQ291bnRlckRpcmVjdGl2ZU1hcCYgbWFwID0gc3R5bGVSZXNvbHZlci5z dHlsZSgpLT5hY2Nlc3NDb3VudGVyRGlyZWN0aXZlcygpOworICAgIGZvciAoYXV0byYga2V5VmFs dWUgOiBtYXApIHsKKyAgICAgICAgaWYgKGNvdW50ZXJCZWhhdmlvciA9PSBSZXNldCkKKyAgICAg ICAgICAgIGtleVZhbHVlLnZhbHVlLmNsZWFyUmVzZXQoKTsKKyAgICAgICAgZWxzZQorICAgICAg ICAgICAga2V5VmFsdWUudmFsdWUuY2xlYXJJbmNyZW1lbnQoKTsKKyAgICB9CisKKyAgICBpZiAo c2V0Q291bnRlckluY3JlbWVudFRvTm9uZSkKKyAgICAgICAgcmV0dXJuOworCisgICAgZm9yIChh dXRvJiBpdGVtIDogZG93bmNhc3Q8Q1NTVmFsdWVMaXN0Pih2YWx1ZSkpIHsKKyAgICAgICAgUGFp ciogcGFpciA9IGRvd25jYXN0PENTU1ByaW1pdGl2ZVZhbHVlPihpdGVtLmdldCgpKS5nZXRQYWly VmFsdWUoKTsKKyAgICAgICAgaWYgKCFwYWlyIHx8ICFwYWlyLT5maXJzdCgpIHx8ICFwYWlyLT5z ZWNvbmQoKSkKKyAgICAgICAgICAgIGNvbnRpbnVlOworCisgICAgICAgIEF0b21pY1N0cmluZyBp ZGVudGlmaWVyID0gcGFpci0+Zmlyc3QoKS0+Z2V0U3RyaW5nVmFsdWUoKTsKKyAgICAgICAgaW50 IHZhbHVlID0gcGFpci0+c2Vjb25kKCktPmdldEludFZhbHVlKCk7CisgICAgICAgIENvdW50ZXJE aXJlY3RpdmVzJiBkaXJlY3RpdmVzID0gbWFwLmFkZChpZGVudGlmaWVyLCBDb3VudGVyRGlyZWN0 aXZlcygpKS5pdGVyYXRvci0+dmFsdWU7CisgICAgICAgIGlmIChjb3VudGVyQmVoYXZpb3IgPT0g UmVzZXQpCisgICAgICAgICAgICBkaXJlY3RpdmVzLnNldFJlc2V0VmFsdWUodmFsdWUpOworICAg ICAgICBlbHNlCisgICAgICAgICAgICBkaXJlY3RpdmVzLmFkZEluY3JlbWVudFZhbHVlKHZhbHVl KTsKKyAgICB9Cit9CisKK2lubGluZSB2b2lkIFN0eWxlQnVpbGRlckN1c3RvbTo6YXBwbHlJbmhl cml0Q291bnRlckluY3JlbWVudChTdHlsZVJlc29sdmVyJiBzdHlsZVJlc29sdmVyKQoreworICAg IGFwcGx5SW5oZXJpdENvdW50ZXI8SW5jcmVtZW50PihzdHlsZVJlc29sdmVyKTsKK30KKworaW5s aW5lIHZvaWQgU3R5bGVCdWlsZGVyQ3VzdG9tOjphcHBseVZhbHVlQ291bnRlckluY3JlbWVudChT dHlsZVJlc29sdmVyJiBzdHlsZVJlc29sdmVyLCBDU1NWYWx1ZSYgdmFsdWUpCit7CisgICAgYXBw bHlWYWx1ZUNvdW50ZXI8SW5jcmVtZW50PihzdHlsZVJlc29sdmVyLCB2YWx1ZSk7Cit9CisKK2lu bGluZSB2b2lkIFN0eWxlQnVpbGRlckN1c3RvbTo6YXBwbHlJbmhlcml0Q291bnRlclJlc2V0KFN0 eWxlUmVzb2x2ZXImIHN0eWxlUmVzb2x2ZXIpCit7CisgICAgYXBwbHlJbmhlcml0Q291bnRlcjxS ZXNldD4oc3R5bGVSZXNvbHZlcik7Cit9CisKK2lubGluZSB2b2lkIFN0eWxlQnVpbGRlckN1c3Rv bTo6YXBwbHlWYWx1ZUNvdW50ZXJSZXNldChTdHlsZVJlc29sdmVyJiBzdHlsZVJlc29sdmVyLCBD U1NWYWx1ZSYgdmFsdWUpCit7CisgICAgYXBwbHlWYWx1ZUNvdW50ZXI8UmVzZXQ+KHN0eWxlUmVz b2x2ZXIsIHZhbHVlKTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCiAjZW5kaWYgLy8g U3R5bGVCdWlsZGVyQ3VzdG9tX2gK