122067 2013-09-28 12:57:28 -0700 Add first()/last() to ElementIteratorAdapters 2013-09-28 13:20:02 -0700 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 koivisto webkit-unassigned oldest_to_newest 934312 0 koivisto 2013-09-28 12:57:28 -0700 Add a convenient way for getting the first and last element if it exists. 934315 1 212906 koivisto 2013-09-28 13:02:26 -0700 Created attachment 212906 patch 934316 2 212906 darin 2013-09-28 13:04:13 -0700 Comment on attachment 212906 patch View in context: https://bugs.webkit.org/attachment.cgi?id=212906&action=review > Source/WebCore/svg/SVGElement.cpp:957 > + return firstTitle ? const_cast<SVGTitleElement*>(firstTitle)->innerText() : String(); Lame that this const_cast is needed. 934317 3 koivisto 2013-09-28 13:20:02 -0700 https://trac.webkit.org/r156612 212906 2013-09-28 13:02:26 -0700 2013-09-28 13:04:12 -0700 patch elementiteratoradapter-first.patch text/plain 15152 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1NjYxMCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQxIEBACisyMDEzLTA5LTI4ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgZmlyc3QoKS9sYXN0KCkg dG8gRWxlbWVudEl0ZXJhdG9yQWRhcHRlcnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTEyMjA2NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEFkZCBhIGNvbnZlbmllbnQgd2F5IGZvciBnZXR0aW5nIHRoZSBm aXJzdCBhbmQgbGFzdCBlbGVtZW50IGlmIGl0IGV4aXN0cy4KKyAgICAgICAgCisgICAgICAgIFVz ZSBpdCBpbiBzb21lIHBsYWNlcy4KKworICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJp bGl0eU5vZGVPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eU5vZGVP YmplY3Q6OmNhbnZhc0hhc0ZhbGxiYWNrQ29udGVudCk6CisgICAgICAgICogY3NzL0NTU0ZvbnRG YWNlU291cmNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU0ZvbnRGYWNlU291cmNlOjpnZXRG b250RGF0YSk6CisgICAgICAgICogZG9tL0RvY3VtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkRvY3VtZW50OjpjaGlsZHJlbkNoYW5nZWQpOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6 OnJlbW92ZVRpdGxlKToKKyAgICAgICAgKiBkb20vRWxlbWVudENoaWxkSXRlcmF0b3IuaDoKKyAg ICAgICAgKFdlYkNvcmU6Ojo6Zmlyc3QpOgorICAgICAgICAoV2ViQ29yZTo6OjpsYXN0KToKKyAg ICAgICAgKiBkb20vRWxlbWVudERlc2NlbmRhbnRJdGVyYXRvci5oOgorICAgICAgICAoV2ViQ29y ZTo6OjpmaXJzdCk6CisgICAgICAgIChXZWJDb3JlOjo6Omxhc3QpOgorICAgICAgICAqIGh0bWwv SFRNTEZpZWxkU2V0RWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MRmllbGRTZXRF bGVtZW50OjpsZWdlbmQpOgorICAgICAgICAqIGh0bWwvSFRNTExlZ2VuZEVsZW1lbnQuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6SFRNTExlZ2VuZEVsZW1lbnQ6OmFzc29jaWF0ZWRDb250cm9sKToK KyAgICAgICAgKiBodG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 SFRNTE1lZGlhRWxlbWVudDo6ZmluaXNoUGFyc2luZ0NoaWxkcmVuKToKKyAgICAgICAgKFdlYkNv cmU6OkhUTUxNZWRpYUVsZW1lbnQ6OnNlbGVjdE1lZGlhUmVzb3VyY2UpOgorICAgICAgICAqIHN2 Zy9TVkdFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNWR0VsZW1lbnQ6OnRpdGxlKToK KyAgICAgICAgKiBzdmcvU1ZHRm9udEZhY2VFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlNWR0ZvbnRGYWNlRWxlbWVudDo6cmVidWlsZEZvbnRGYWNlKToKKyAgICAgICAgKiBzdmcvZ3Jh cGhpY3MvU1ZHSW1hZ2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U1ZHSW1hZ2U6Omhhc1Npbmds ZVNlY3VyaXR5T3JpZ2luKToKKwogMjAxMy0wOS0yOCAgTWFyayBSb3dlICA8bXJvd2VAYXBwbGUu Y29tPgogCiAgICAgICAgIFRha2UgWGNvZGUncyBhZHZpY2UgYW5kIGVuYWJsZSBzb21lIGV4dHJh IHdhcm5pbmdzLgpJbmRleDogU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmls aXR5Tm9kZU9iamVjdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvYWNjZXNzaWJp bGl0eS9BY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdC5jcHAJKHJldmlzaW9uIDE1NjYwNykKKysrIFNv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU5vZGVPYmplY3QuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC00MjMsNyArNDIzLDcgQEAgYm9vbCBBY2Nlc3NpYmlsaXR5Tm9kZU9i amVjdDo6Y2FudmFzSGFzRgogICAgIC8vIElmIGl0IGhhcyBhbnkgY2hpbGRyZW4gdGhhdCBhcmUg ZWxlbWVudHMsIHdlJ2xsIGFzc3VtZSBpdCBtaWdodCBiZSBmYWxsYmFjawogICAgIC8vIGNvbnRl bnQuIElmIGl0IGhhcyBubyBjaGlsZHJlbiBvciBpdHMgb25seSBjaGlsZHJlbiBhcmUgbm90IGVs ZW1lbnRzCiAgICAgLy8gKGUuZy4ganVzdCB0ZXh0IG5vZGVzKSwgaXQgZG9lc24ndCBoYXZlIGZh bGxiYWNrIGNvbnRlbnQuCi0gICAgcmV0dXJuIGVsZW1lbnRDaGlsZHJlbihjYW52YXNFbGVtZW50 KS5iZWdpbigpICE9IGVsZW1lbnRDaGlsZHJlbihjYW52YXNFbGVtZW50KS5lbmQoKTsKKyAgICBy ZXR1cm4gZWxlbWVudENoaWxkcmVuKGNhbnZhc0VsZW1lbnQpLmZpcnN0KCk7CiB9CiAKIGJvb2wg QWNjZXNzaWJpbGl0eU5vZGVPYmplY3Q6OmlzSW1hZ2VCdXR0b24oKSBjb25zdApJbmRleDogU291 cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRGYWNlU291cmNlLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9jc3MvQ1NTRm9udEZhY2VTb3VyY2UuY3BwCShyZXZpc2lvbiAxNTY2MDcpCisr KyBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTRm9udEZhY2VTb3VyY2UuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0xMzksMTYgKzEzOSwxNCBAQCBQYXNzUmVmUHRyPFNpbXBsZUZvbnREYXRhPiBDU1NGb250 RmFjZVNvCiAgICAgICAgICAgICAgICAgaWYgKCFtX2V4dGVybmFsU1ZHRm9udEVsZW1lbnQpCiAg ICAgICAgICAgICAgICAgICAgIHJldHVybiAwOwogCi0gICAgICAgICAgICAgICAgYXV0byBmb250 RmFjZUNoaWxkcmVuID0gY2hpbGRyZW5PZlR5cGU8U1ZHRm9udEZhY2VFbGVtZW50PihtX2V4dGVy bmFsU1ZHRm9udEVsZW1lbnQuZ2V0KCkpOwotICAgICAgICAgICAgICAgIGF1dG8gZmlyc3RGb250 RmFjZSA9IGZvbnRGYWNlQ2hpbGRyZW4uYmVnaW4oKTsKLSAgICAgICAgICAgICAgICBpZiAoZmly c3RGb250RmFjZSAhPSBmb250RmFjZUNoaWxkcmVuLmVuZCgpKSB7CisgICAgICAgICAgICAgICAg aWYgKGF1dG8gZmlyc3RGb250RmFjZSA9IGNoaWxkcmVuT2ZUeXBlPFNWR0ZvbnRGYWNlRWxlbWVu dD4obV9leHRlcm5hbFNWR0ZvbnRFbGVtZW50LmdldCgpKS5maXJzdCgpKSB7CiAgICAgICAgICAg ICAgICAgICAgIGlmICghbV9zdmdGb250RmFjZUVsZW1lbnQpIHsKICAgICAgICAgICAgICAgICAg ICAgICAgIC8vIFdlJ3JlIGNyZWF0ZWQgdXNpbmcgYSBDU1MgQGZvbnQtZmFjZSBydWxlLCB0aGF0 IG1lYW5zIHdlJ3JlIG5vdCBhc3NvY2lhdGVkIHdpdGggYSBTVkdGb250RmFjZUVsZW1lbnQuCiAg ICAgICAgICAgICAgICAgICAgICAgICAvLyBVc2UgdGhlIGltcG9ydGVkIDxmb250LWZhY2U+IHRh ZyBhcyByZWZlcmVuY2luZyBmb250LWZhY2UgZWxlbWVudCBmb3IgdGhlc2UgY2FzZXMuCi0gICAg ICAgICAgICAgICAgICAgICAgICBtX3N2Z0ZvbnRGYWNlRWxlbWVudCA9ICYqZmlyc3RGb250RmFj ZTsKKyAgICAgICAgICAgICAgICAgICAgICAgIG1fc3ZnRm9udEZhY2VFbGVtZW50ID0gZmlyc3RG b250RmFjZTsKICAgICAgICAgICAgICAgICAgICAgfQogCi0gICAgICAgICAgICAgICAgICAgIGZv bnREYXRhID0gU2ltcGxlRm9udERhdGE6OmNyZWF0ZShTVkdGb250RGF0YTo6Y3JlYXRlKCYqZmly c3RGb250RmFjZSksIGZvbnREZXNjcmlwdGlvbi5jb21wdXRlZFBpeGVsU2l6ZSgpLCBzeW50aGV0 aWNCb2xkLCBzeW50aGV0aWNJdGFsaWMpOworICAgICAgICAgICAgICAgICAgICBmb250RGF0YSA9 IFNpbXBsZUZvbnREYXRhOjpjcmVhdGUoU1ZHRm9udERhdGE6OmNyZWF0ZShmaXJzdEZvbnRGYWNl KSwgZm9udERlc2NyaXB0aW9uLmNvbXB1dGVkUGl4ZWxTaXplKCksIHN5bnRoZXRpY0JvbGQsIHN5 bnRoZXRpY0l0YWxpYyk7CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgfSBlbHNlCiAj ZW5kaWYKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAkocmV2aXNpb24gMTU2NjA3KQorKysg U291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzk0LDEw ICs3OTQsNyBAQCB2b2lkIERvY3VtZW50OjpjaGlsZHJlbkNoYW5nZWQoY29uc3QgQ2hpCiAgICAg fQogI2VuZGlmCiAKLSAgICBFbGVtZW50KiBuZXdEb2N1bWVudEVsZW1lbnQgPSAwOwotICAgIGF1 dG8gZmlyc3RFbGVtZW50Q2hpbGQgPSBlbGVtZW50Q2hpbGRyZW4odGhpcykuYmVnaW4oKTsKLSAg ICBpZiAoZmlyc3RFbGVtZW50Q2hpbGQgIT0gZWxlbWVudENoaWxkcmVuKHRoaXMpLmVuZCgpKQot ICAgICAgICBuZXdEb2N1bWVudEVsZW1lbnQgPSAmKmZpcnN0RWxlbWVudENoaWxkOworICAgIEVs ZW1lbnQqIG5ld0RvY3VtZW50RWxlbWVudCA9IGVsZW1lbnRDaGlsZHJlbih0aGlzKS5maXJzdCgp OwogCiAgICAgaWYgKG5ld0RvY3VtZW50RWxlbWVudCA9PSBtX2RvY3VtZW50RWxlbWVudCkKICAg ICAgICAgcmV0dXJuOwpAQCAtMTU4Niw5ICsxNTgzLDggQEAgdm9pZCBEb2N1bWVudDo6cmVtb3Zl VGl0bGUoRWxlbWVudCogdGl0bAogCiAgICAgLy8gVXBkYXRlIHRpdGxlIGJhc2VkIG9uIGZpcnN0 IHRpdGxlIGVsZW1lbnQgaW4gdGhlIGhlYWQsIGlmIG9uZSBleGlzdHMuCiAgICAgaWYgKEhUTUxF bGVtZW50KiBoZWFkRWxlbWVudCA9IGhlYWQoKSkgewotICAgICAgICBhdXRvIGZpcnN0VGl0bGUg PSBjaGlsZHJlbk9mVHlwZTxIVE1MVGl0bGVFbGVtZW50PihoZWFkRWxlbWVudCkuYmVnaW4oKTsK LSAgICAgICAgaWYgKGZpcnN0VGl0bGUgIT0gY2hpbGRyZW5PZlR5cGU8SFRNTFRpdGxlRWxlbWVu dD4oaGVhZEVsZW1lbnQpLmVuZCgpKQotICAgICAgICAgICAgc2V0VGl0bGVFbGVtZW50KGZpcnN0 VGl0bGUtPnRleHRXaXRoRGlyZWN0aW9uKCksICYqZmlyc3RUaXRsZSk7CisgICAgICAgIGlmIChh dXRvIGZpcnN0VGl0bGUgPSBjaGlsZHJlbk9mVHlwZTxIVE1MVGl0bGVFbGVtZW50PihoZWFkRWxl bWVudCkuZmlyc3QoKSkKKyAgICAgICAgICAgIHNldFRpdGxlRWxlbWVudChmaXJzdFRpdGxlLT50 ZXh0V2l0aERpcmVjdGlvbigpLCBmaXJzdFRpdGxlKTsKICAgICB9CiAKICAgICBpZiAoIW1fdGl0 bGVFbGVtZW50KQpJbmRleDogU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnRDaGlsZEl0ZXJhdG9y LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnRDaGlsZEl0ZXJhdG9y LmgJKHJldmlzaW9uIDE1NjYwNykKKysrIFNvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50Q2hpbGRJ dGVyYXRvci5oCSh3b3JraW5nIGNvcHkpCkBAIC01Miw2ICs1Miw4IEBAIHB1YmxpYzoKICAgICBF bGVtZW50Q2hpbGRJdGVyYXRvckFkYXB0ZXIoQ29udGFpbmVyTm9kZSogcm9vdCk7CiAgICAgRWxl bWVudENoaWxkSXRlcmF0b3I8RWxlbWVudFR5cGU+IGJlZ2luKCk7CiAgICAgRWxlbWVudENoaWxk SXRlcmF0b3I8RWxlbWVudFR5cGU+IGVuZCgpOworICAgIEVsZW1lbnRUeXBlKiBmaXJzdCgpOwor ICAgIEVsZW1lbnRUeXBlKiBsYXN0KCk7CiAKIHByaXZhdGU6CiAgICAgY29uc3QgQ29udGFpbmVy Tm9kZSogbV9yb290OwpAQCAtNjMsNiArNjUsOCBAQCBwdWJsaWM6CiAgICAgRWxlbWVudENoaWxk Q29uc3RJdGVyYXRvckFkYXB0ZXIoY29uc3QgQ29udGFpbmVyTm9kZSogcm9vdCk7CiAgICAgRWxl bWVudENoaWxkQ29uc3RJdGVyYXRvcjxFbGVtZW50VHlwZT4gYmVnaW4oKSBjb25zdDsKICAgICBF bGVtZW50Q2hpbGRDb25zdEl0ZXJhdG9yPEVsZW1lbnRUeXBlPiBlbmQoKSBjb25zdDsKKyAgICBj b25zdCBFbGVtZW50VHlwZSogZmlyc3QoKSBjb25zdDsKKyAgICBjb25zdCBFbGVtZW50VHlwZSog bGFzdCgpIGNvbnN0OwogCiBwcml2YXRlOgogICAgIGNvbnN0IENvbnRhaW5lck5vZGUqIG1fcm9v dDsKQEAgLTEzMyw2ICsxMzcsMTggQEAgaW5saW5lIEVsZW1lbnRDaGlsZEl0ZXJhdG9yPEVsZW1l bnRUeXBlPgogICAgIHJldHVybiBFbGVtZW50Q2hpbGRJdGVyYXRvcjxFbGVtZW50VHlwZT4obV9y b290KTsKIH0KIAordGVtcGxhdGUgPHR5cGVuYW1lIEVsZW1lbnRUeXBlPgoraW5saW5lIEVsZW1l bnRUeXBlKiBFbGVtZW50Q2hpbGRJdGVyYXRvckFkYXB0ZXI8RWxlbWVudFR5cGU+OjpmaXJzdCgp Cit7CisgICAgcmV0dXJuIFRyYXZlcnNhbDxFbGVtZW50VHlwZT46OmZpcnN0Q2hpbGQobV9yb290 KTsKK30KKwordGVtcGxhdGUgPHR5cGVuYW1lIEVsZW1lbnRUeXBlPgoraW5saW5lIEVsZW1lbnRU eXBlKiBFbGVtZW50Q2hpbGRJdGVyYXRvckFkYXB0ZXI8RWxlbWVudFR5cGU+OjpsYXN0KCkKK3sK KyAgICByZXR1cm4gVHJhdmVyc2FsPEVsZW1lbnRUeXBlPjo6bGFzdENoaWxkKG1fcm9vdCk7Cit9 CisKIC8vIEVsZW1lbnRDaGlsZENvbnN0SXRlcmF0b3JBZGFwdGVyCiAKIHRlbXBsYXRlIDx0eXBl bmFtZSBFbGVtZW50VHlwZT4KQEAgLTE1Myw2ICsxNjksMTggQEAgaW5saW5lIEVsZW1lbnRDaGls ZENvbnN0SXRlcmF0b3I8RWxlbWVudAogICAgIHJldHVybiBFbGVtZW50Q2hpbGRDb25zdEl0ZXJh dG9yPEVsZW1lbnRUeXBlPihtX3Jvb3QpOwogfQogCit0ZW1wbGF0ZSA8dHlwZW5hbWUgRWxlbWVu dFR5cGU+CitpbmxpbmUgY29uc3QgRWxlbWVudFR5cGUqIEVsZW1lbnRDaGlsZENvbnN0SXRlcmF0 b3JBZGFwdGVyPEVsZW1lbnRUeXBlPjo6Zmlyc3QoKSBjb25zdAoreworICAgIHJldHVybiBUcmF2 ZXJzYWw8RWxlbWVudFR5cGU+OjpmaXJzdENoaWxkKG1fcm9vdCk7Cit9CisKK3RlbXBsYXRlIDx0 eXBlbmFtZSBFbGVtZW50VHlwZT4KK2lubGluZSBjb25zdCBFbGVtZW50VHlwZSogRWxlbWVudENo aWxkQ29uc3RJdGVyYXRvckFkYXB0ZXI8RWxlbWVudFR5cGU+OjpsYXN0KCkgY29uc3QKK3sKKyAg ICByZXR1cm4gVHJhdmVyc2FsPEVsZW1lbnRUeXBlPjo6bGFzdENoaWxkKG1fcm9vdCk7Cit9CisK IC8vIFN0YW5kYWxvbmUgZnVuY3Rpb25zCiAKIGlubGluZSBFbGVtZW50Q2hpbGRJdGVyYXRvckFk YXB0ZXI8RWxlbWVudD4gZWxlbWVudENoaWxkcmVuKENvbnRhaW5lck5vZGUqIHJvb3QpCkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudERlc2NlbmRhbnRJdGVyYXRvci5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50RGVzY2VuZGFudEl0ZXJhdG9yLmgJKHJl dmlzaW9uIDE1NjYwNykKKysrIFNvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50RGVzY2VuZGFudEl0 ZXJhdG9yLmgJKHdvcmtpbmcgY29weSkKQEAgLTUyLDYgKzUyLDggQEAgcHVibGljOgogICAgIEVs ZW1lbnREZXNjZW5kYW50SXRlcmF0b3JBZGFwdGVyKENvbnRhaW5lck5vZGUqIHJvb3QpOwogICAg IEVsZW1lbnREZXNjZW5kYW50SXRlcmF0b3I8RWxlbWVudFR5cGU+IGJlZ2luKCk7CiAgICAgRWxl bWVudERlc2NlbmRhbnRJdGVyYXRvcjxFbGVtZW50VHlwZT4gZW5kKCk7CisgICAgRWxlbWVudFR5 cGUqIGZpcnN0KCk7CisgICAgRWxlbWVudFR5cGUqIGxhc3QoKTsKIAogcHJpdmF0ZToKICAgICBD b250YWluZXJOb2RlKiBtX3Jvb3Q7CkBAIC02Myw2ICs2NSw4IEBAIHB1YmxpYzoKICAgICBFbGVt ZW50RGVzY2VuZGFudENvbnN0SXRlcmF0b3JBZGFwdGVyKGNvbnN0IENvbnRhaW5lck5vZGUqIHJv b3QpOwogICAgIEVsZW1lbnREZXNjZW5kYW50Q29uc3RJdGVyYXRvcjxFbGVtZW50VHlwZT4gYmVn aW4oKSBjb25zdDsKICAgICBFbGVtZW50RGVzY2VuZGFudENvbnN0SXRlcmF0b3I8RWxlbWVudFR5 cGU+IGVuZCgpIGNvbnN0OworICAgIGNvbnN0IEVsZW1lbnRUeXBlKiBmaXJzdCgpIGNvbnN0Owor ICAgIGNvbnN0IEVsZW1lbnRUeXBlKiBsYXN0KCkgY29uc3Q7CiAKIHByaXZhdGU6CiAgICAgY29u c3QgQ29udGFpbmVyTm9kZSogbV9yb290OwpAQCAtMTM0LDYgKzEzOCwxOCBAQCBpbmxpbmUgRWxl bWVudERlc2NlbmRhbnRJdGVyYXRvcjxFbGVtZW50CiAgICAgcmV0dXJuIEVsZW1lbnREZXNjZW5k YW50SXRlcmF0b3I8RWxlbWVudFR5cGU+KG1fcm9vdCk7CiB9CiAKK3RlbXBsYXRlIDx0eXBlbmFt ZSBFbGVtZW50VHlwZT4KK2lubGluZSBFbGVtZW50VHlwZSogRWxlbWVudERlc2NlbmRhbnRJdGVy YXRvckFkYXB0ZXI8RWxlbWVudFR5cGU+OjpmaXJzdCgpCit7CisgICAgcmV0dXJuIFRyYXZlcnNh bDxFbGVtZW50VHlwZT46OmZpcnN0V2l0aGluKG1fcm9vdCk7Cit9CisKK3RlbXBsYXRlIDx0eXBl bmFtZSBFbGVtZW50VHlwZT4KK2lubGluZSBFbGVtZW50VHlwZSogRWxlbWVudERlc2NlbmRhbnRJ dGVyYXRvckFkYXB0ZXI8RWxlbWVudFR5cGU+OjpsYXN0KCkKK3sKKyAgICByZXR1cm4gVHJhdmVy c2FsPEVsZW1lbnRUeXBlPjo6bGFzdFdpdGhpbihtX3Jvb3QpOworfQorCiAvLyBFbGVtZW50RGVz Y2VuZGFudENvbnN0SXRlcmF0b3JBZGFwdGVyCiAKIHRlbXBsYXRlIDx0eXBlbmFtZSBFbGVtZW50 VHlwZT4KQEAgLTE1NCw2ICsxNzAsMTggQEAgaW5saW5lIEVsZW1lbnREZXNjZW5kYW50Q29uc3RJ dGVyYXRvcjxFbAogICAgIHJldHVybiBFbGVtZW50RGVzY2VuZGFudENvbnN0SXRlcmF0b3I8RWxl bWVudFR5cGU+KG1fcm9vdCk7CiB9CiAKK3RlbXBsYXRlIDx0eXBlbmFtZSBFbGVtZW50VHlwZT4K K2lubGluZSBjb25zdCBFbGVtZW50VHlwZSogRWxlbWVudERlc2NlbmRhbnRDb25zdEl0ZXJhdG9y QWRhcHRlcjxFbGVtZW50VHlwZT46OmZpcnN0KCkgY29uc3QKK3sKKyAgICByZXR1cm4gVHJhdmVy c2FsPEVsZW1lbnRUeXBlPjo6Zmlyc3RXaXRoaW4obV9yb290KTsKK30KKwordGVtcGxhdGUgPHR5 cGVuYW1lIEVsZW1lbnRUeXBlPgoraW5saW5lIGNvbnN0IEVsZW1lbnRUeXBlKiBFbGVtZW50RGVz Y2VuZGFudENvbnN0SXRlcmF0b3JBZGFwdGVyPEVsZW1lbnRUeXBlPjo6bGFzdCgpIGNvbnN0Cit7 CisgICAgcmV0dXJuIFRyYXZlcnNhbDxFbGVtZW50VHlwZT46Omxhc3RXaXRoaW4obV9yb290KTsK K30KKwogLy8gU3RhbmRhbG9uZSBmdW5jdGlvbnMKIAogaW5saW5lIEVsZW1lbnREZXNjZW5kYW50 SXRlcmF0b3JBZGFwdGVyPEVsZW1lbnQ+IGVsZW1lbnREZXNjZW5kYW50cyhDb250YWluZXJOb2Rl KiByb290KQpJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MRmllbGRTZXRFbGVtZW50LmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxGaWVsZFNldEVsZW1lbnQu Y3BwCShyZXZpc2lvbiAxNTY2MDcpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxGaWVsZFNl dEVsZW1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05MCwxMSArOTAsNyBAQCBSZW5kZXJFbGVt ZW50KiBIVE1MRmllbGRTZXRFbGVtZW50OjpjcmVhCiAKIGNvbnN0IEhUTUxMZWdlbmRFbGVtZW50 KiBIVE1MRmllbGRTZXRFbGVtZW50OjpsZWdlbmQoKSBjb25zdAogewotICAgIGF1dG8gbGVnZW5k RGVzY2VuZGFudHMgPSBkZXNjZW5kYW50c09mVHlwZTxIVE1MTGVnZW5kRWxlbWVudD4odGhpcyk7 Ci0gICAgYXV0byBmaXJzdExlZ2VuZCA9IGxlZ2VuZERlc2NlbmRhbnRzLmJlZ2luKCk7Ci0gICAg aWYgKGZpcnN0TGVnZW5kICE9IGxlZ2VuZERlc2NlbmRhbnRzLmVuZCgpKQotICAgICAgICByZXR1 cm4gJipmaXJzdExlZ2VuZDsKLSAgICByZXR1cm4gbnVsbHB0cjsKKyAgICByZXR1cm4gZGVzY2Vu ZGFudHNPZlR5cGU8SFRNTExlZ2VuZEVsZW1lbnQ+KHRoaXMpLmZpcnN0KCk7CiB9CiAKIFBhc3NS ZWZQdHI8SFRNTENvbGxlY3Rpb24+IEhUTUxGaWVsZFNldEVsZW1lbnQ6OmVsZW1lbnRzKCkKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTExlZ2VuZEVsZW1lbnQuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTExlZ2VuZEVsZW1lbnQuY3BwCShyZXZpc2lvbiAx NTY2MDcpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxMZWdlbmRFbGVtZW50LmNwcAkod29y a2luZyBjb3B5KQpAQCAtNTYsOSArNTYsNyBAQCBIVE1MRm9ybUNvbnRyb2xFbGVtZW50KiBIVE1M TGVnZW5kRWxlbWVuCiAKICAgICAvLyBGaW5kIGZpcnN0IGZvcm0gZWxlbWVudCBpbnNpZGUgdGhl IGZpZWxkc2V0IHRoYXQgaXMgbm90IGEgbGVnZW5kIGVsZW1lbnQuCiAgICAgLy8gRklYTUU6IFNo b3VsZCB3ZSBjb25zaWRlciB0YWJpbmRleD8KLSAgICBhdXRvIGZpZWxkc2V0Rm9ybUNvbnRyb2xE ZXNjZW5kYW50cyA9IGRlc2NlbmRhbnRzT2ZUeXBlPEhUTUxGb3JtQ29udHJvbEVsZW1lbnQ+KCYq ZW5jbG9zaW5nRmllbGRzZXQpOwotICAgIGF1dG8gZmlyc3RGb3JtQ29udHJvbCA9IGZpZWxkc2V0 Rm9ybUNvbnRyb2xEZXNjZW5kYW50cy5iZWdpbigpOwotICAgIHJldHVybiBmaXJzdEZvcm1Db250 cm9sICE9IGZpZWxkc2V0Rm9ybUNvbnRyb2xEZXNjZW5kYW50cy5lbmQoKSA/ICYqZmlyc3RGb3Jt Q29udHJvbCA6IG51bGxwdHI7CisgICAgcmV0dXJuIGRlc2NlbmRhbnRzT2ZUeXBlPEhUTUxGb3Jt Q29udHJvbEVsZW1lbnQ+KCYqZW5jbG9zaW5nRmllbGRzZXQpLmZpcnN0KCk7CiB9CiAKIHZvaWQg SFRNTExlZ2VuZEVsZW1lbnQ6OmZvY3VzKGJvb2wsIEZvY3VzRGlyZWN0aW9uIGRpcmVjdGlvbikK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAkocmV2aXNpb24g MTU2NjA3KQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAkod29y a2luZyBjb3B5KQpAQCAtNTQ4LDggKzU0OCw3IEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6Zmlu aXNoUGFyc2luZ0NoaWwKICAgICBpZiAoIVJ1bnRpbWVFbmFibGVkRmVhdHVyZXM6OnNoYXJlZEZl YXR1cmVzKCkud2Via2l0VmlkZW9UcmFja0VuYWJsZWQoKSkKICAgICAgICAgcmV0dXJuOwogCi0g ICAgYXV0byB0cmFja0Rlc2NlbmRhbnRzID0gZGVzY2VuZGFudHNPZlR5cGU8SFRNTFRyYWNrRWxl bWVudD4odGhpcyk7Ci0gICAgaWYgKHRyYWNrRGVzY2VuZGFudHMuYmVnaW4oKSAhPSB0cmFja0Rl c2NlbmRhbnRzLmVuZCgpKQorICAgIGlmIChkZXNjZW5kYW50c09mVHlwZTxIVE1MVHJhY2tFbGVt ZW50Pih0aGlzKS5maXJzdCgpKQogICAgICAgICBzY2hlZHVsZURlbGF5ZWRBY3Rpb24oQ29uZmln dXJlVGV4dFRyYWNrcyk7CiAjZW5kaWYKIH0KQEAgLTkzOSwxMCArOTM4LDkgQEAgdm9pZCBIVE1M TWVkaWFFbGVtZW50OjpzZWxlY3RNZWRpYVJlc291cgogICAgICAgICAvLyBPdGhlcndpc2UsIGlm IHRoZSBtZWRpYSBlbGVtZW50IGRvZXMgbm90IGhhdmUgYSBzcmMgYXR0cmlidXRlIGJ1dCBoYXMg YSBzb3VyY2UgCiAgICAgICAgIC8vIGVsZW1lbnQgY2hpbGQsIHRoZW4gbGV0IG1vZGUgYmUgY2hp bGRyZW4gYW5kIGxldCBjYW5kaWRhdGUgYmUgdGhlIGZpcnN0IHN1Y2ggCiAgICAgICAgIC8vIHNv dXJjZSBlbGVtZW50IGNoaWxkIGluIHRyZWUgb3JkZXIuCi0gICAgICAgIGF1dG8gc291cmNlID0g Y2hpbGRyZW5PZlR5cGU8SFRNTFNvdXJjZUVsZW1lbnQ+KHRoaXMpLmJlZ2luKCk7Ci0gICAgICAg IGlmIChzb3VyY2UgIT0gY2hpbGRyZW5PZlR5cGU8SFRNTFNvdXJjZUVsZW1lbnQ+KHRoaXMpLmVu ZCgpKSB7CisgICAgICAgIGlmIChhdXRvIGZpcnN0U291cmNlID0gY2hpbGRyZW5PZlR5cGU8SFRN TFNvdXJjZUVsZW1lbnQ+KHRoaXMpLmZpcnN0KCkpIHsKICAgICAgICAgICAgIG1vZGUgPSBjaGls ZHJlbjsKLSAgICAgICAgICAgIG1fbmV4dENoaWxkTm9kZVRvQ29uc2lkZXIgPSAmKnNvdXJjZTsK KyAgICAgICAgICAgIG1fbmV4dENoaWxkTm9kZVRvQ29uc2lkZXIgPSBmaXJzdFNvdXJjZTsKICAg ICAgICAgICAgIG1fY3VycmVudFNvdXJjZU5vZGUgPSAwOwogICAgICAgICB9IGVsc2UgewogICAg ICAgICAgICAgLy8gT3RoZXJ3aXNlIHRoZSBtZWRpYSBlbGVtZW50IGhhcyBuZWl0aGVyIGEgc3Jj IGF0dHJpYnV0ZSBub3IgYSBzb3VyY2UgZWxlbWVudCAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3N2 Zy9TVkdFbGVtZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9zdmcvU1ZHRWxl bWVudC5jcHAJKHJldmlzaW9uIDE1NjYwNykKKysrIFNvdXJjZS9XZWJDb3JlL3N2Zy9TVkdFbGVt ZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtOTUzLDE0ICs5NTMsOCBAQCBTdHJpbmcgU1ZHRWxl bWVudDo6dGl0bGUoKSBjb25zdAogCiAgICAgLy8gSWYgd2UgYXJlbid0IGFuIGluc3RhbmNlIGlu IGEgPHVzZT4gb3IgdGhlIDx1c2U+IHRpdGxlIHdhcyBub3QgZm91bmQsIHRoZW4gZmluZCB0aGUg Zmlyc3QKICAgICAvLyA8dGl0bGU+IGNoaWxkIG9mIHRoaXMgZWxlbWVudC4KLSAgICAvLyBJZiBh IHRpdGxlIGNoaWxkIHdhcyBmb3VuZCwgcmV0dXJuIHRoZSB0ZXh0IGNvbnRlbnRzLgotICAgIGF1 dG8gdGl0bGVEZXNjZW5kYW50cyA9IGRlc2NlbmRhbnRzT2ZUeXBlPFNWR1RpdGxlRWxlbWVudD4o dGhpcyk7Ci0gICAgYXV0byBmaXJzdFRpdGxlID0gdGl0bGVEZXNjZW5kYW50cy5iZWdpbigpOwot ICAgIGlmIChmaXJzdFRpdGxlICE9IHRpdGxlRGVzY2VuZGFudHMuZW5kKCkpCi0gICAgICAgIHJl dHVybiBjb25zdF9jYXN0PFNWR1RpdGxlRWxlbWVudCY+KCpmaXJzdFRpdGxlKS5pbm5lclRleHQo KTsKLQotICAgIC8vIE90aGVyd2lzZSByZXR1cm4gYSBudWxsL2VtcHR5IHN0cmluZy4KLSAgICBy ZXR1cm4gU3RyaW5nKCk7CisgICAgYXV0byBmaXJzdFRpdGxlID0gZGVzY2VuZGFudHNPZlR5cGU8 U1ZHVGl0bGVFbGVtZW50Pih0aGlzKS5maXJzdCgpOworICAgIHJldHVybiBmaXJzdFRpdGxlID8g Y29uc3RfY2FzdDxTVkdUaXRsZUVsZW1lbnQqPihmaXJzdFRpdGxlKS0+aW5uZXJUZXh0KCkgOiBT dHJpbmcoKTsKIH0KIAogYm9vbCBTVkdFbGVtZW50OjpyZW5kZXJlcklzTmVlZGVkKGNvbnN0IFJl bmRlclN0eWxlJiBzdHlsZSkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3N2Zy9TVkdGb250RmFjZUVs ZW1lbnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3N2Zy9TVkdGb250RmFjZUVs ZW1lbnQuY3BwCShyZXZpc2lvbiAxNTY2MDcpCisrKyBTb3VyY2UvV2ViQ29yZS9zdmcvU1ZHRm9u dEZhY2VFbGVtZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjI4LDEwICsyMjgsNyBAQCB2b2lk IFNWR0ZvbnRGYWNlRWxlbWVudDo6cmVidWlsZEZvbnRGYWNlCiAgICAgfQogCiAgICAgLy8gd2Ug Y3VycmVudGx5IGlnbm9yZSBhbGwgYnV0IHRoZSBmaXJzdCBzcmMgZWxlbWVudCwgYWx0ZXJuYXRp dmVseSB3ZSBjb3VsZCBjb25jYXQgdGhlbQotICAgIFNWR0ZvbnRGYWNlU3JjRWxlbWVudCogc3Jj RWxlbWVudCA9IDA7Ci0gICAgYXV0byBmaXJzdEZvbnRGYWNlU3JjRWxlbWVudENoaWxkID0gY2hp bGRyZW5PZlR5cGU8U1ZHRm9udEZhY2VTcmNFbGVtZW50Pih0aGlzKS5iZWdpbigpOwotICAgIGlm IChmaXJzdEZvbnRGYWNlU3JjRWxlbWVudENoaWxkICE9IGNoaWxkcmVuT2ZUeXBlPFNWR0ZvbnRG YWNlU3JjRWxlbWVudD4odGhpcykuZW5kKCkpCi0gICAgICAgIHNyY0VsZW1lbnQgPSAmKmZpcnN0 Rm9udEZhY2VTcmNFbGVtZW50Q2hpbGQ7CisgICAgU1ZHRm9udEZhY2VTcmNFbGVtZW50KiBzcmNF bGVtZW50ID0gY2hpbGRyZW5PZlR5cGU8U1ZHRm9udEZhY2VTcmNFbGVtZW50Pih0aGlzKS5maXJz dCgpOwogCiAgICAgYm9vbCBkZXNjcmliZXNQYXJlbnRGb250ID0gaXNTVkdGb250RWxlbWVudChw YXJlbnROb2RlKCkpOwogICAgIFJlZlB0cjxDU1NWYWx1ZUxpc3Q+IGxpc3Q7CkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9zdmcvZ3JhcGhpY3MvU1ZHSW1hZ2UuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL3N2Zy9ncmFwaGljcy9TVkdJbWFnZS5jcHAJKHJldmlzaW9uIDE1NjYwNykKKysr IFNvdXJjZS9XZWJDb3JlL3N2Zy9ncmFwaGljcy9TVkdJbWFnZS5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTc1LDggKzc1LDcgQEAgYm9vbCBTVkdJbWFnZTo6aGFzU2luZ2xlU2VjdXJpdHlPcmlnaW4o KQogICAgICAgICByZXR1cm4gdHJ1ZTsKIAogICAgIC8vIERvbid0IGFsbG93IGZvcmVpZ25PYmpl Y3QgZWxlbWVudHMgc2luY2UgdGhleSBjYW4gbGVhayBpbmZvcm1hdGlvbiB3aXRoIGFyYml0cmFy eSBIVE1MIChsaWtlIHNwZWxsY2hlY2sgb3IgY29udHJvbCB0aGVtZSkuCi0gICAgYXV0byBmb3Jl aWduT2JqZWN0RGVzY2VuZGFudHMgPSBkZXNjZW5kYW50c09mVHlwZTxTVkdGb3JlaWduT2JqZWN0 RWxlbWVudD4ocm9vdEVsZW1lbnQpOwotICAgIGlmIChmb3JlaWduT2JqZWN0RGVzY2VuZGFudHMu YmVnaW4oKSAhPSBmb3JlaWduT2JqZWN0RGVzY2VuZGFudHMuZW5kKCkpCisgICAgaWYgKGRlc2Nl bmRhbnRzT2ZUeXBlPFNWR0ZvcmVpZ25PYmplY3RFbGVtZW50Pihyb290RWxlbWVudCkuZmlyc3Qo KSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgLy8gQmVjYXVzZSBTVkcgaW1hZ2UgcmVu ZGVyaW5nIGRpc2FsbG93cyBleHRlcm5hbCByZXNvdXJjZXMgYW5kIGxpbmtzLAo=