99615 2012-10-17 10:50:27 -0700 Add diagnostic logging to track per-page media engine usage. 2012-10-18 11:13:06 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jer.noble jer.noble abarth eric.carlson feature-media-reviews japhet webkit.review.bot oldest_to_newest 744400 0 jer.noble 2012-10-17 10:50:27 -0700 Add diagnostic logging to track per-page media engine usage. 744413 1 jer.noble 2012-10-17 10:59:31 -0700 <rdar://problem/12476473> 744423 2 169218 jer.noble 2012-10-17 11:04:10 -0700 Created attachment 169218 Patch 744587 3 169254 jer.noble 2012-10-17 13:59:22 -0700 Created attachment 169254 Patch Filled in ChangeLog boilerplate; changed parameter names in new Page methods. 744596 4 169254 eric.carlson 2012-10-17 14:03:45 -0700 Comment on attachment 169254 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=169254&action=review > Source/WebCore/html/HTMLMediaElement.cpp:1539 > + page->sawMediaEngine(mediaEngine); Do you want to call this when "mediaEngine" is empty? 745385 5 jer.noble 2012-10-18 10:57:44 -0700 (In reply to comment #4) > (From update of attachment 169254 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=169254&action=review > > > Source/WebCore/html/HTMLMediaElement.cpp:1539 > > + page->sawMediaEngine(mediaEngine); > > Do you want to call this when "mediaEngine" is empty? There's an early return above when loading fails (and thus mediaEngine is empty). Thanks! 745398 6 169254 webkit.review.bot 2012-10-18 11:13:03 -0700 Comment on attachment 169254 Patch Clearing flags on attachment: 169254 Committed r131779: <http://trac.webkit.org/changeset/131779> 745399 7 webkit.review.bot 2012-10-18 11:13:06 -0700 All reviewed patches have been landed. Closing bug. 169218 2012-10-17 11:04:10 -0700 2012-10-17 13:59:20 -0700 Patch bug-99615-20121017110257.patch text/plain 8511 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTMxNDk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTM1NmIwNTg2MWVlMjU0 YzFlNTFjY2YwYzM5NzgxZGRiODg2MTNiYy4uYjZjMGUyODJmNmY3NzNmZTllOTJlNjNhY2IwOTUz OTZhZjcwNDYzNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDEyLTEwLTE3ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBkaWFnbm9zdGljIGxv Z2dpbmcgdG8gdHJhY2sgcGVyLXBhZ2UgbWVkaWEgZW5naW5lIHVzYWdlLgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTk2MTUKKyAgICAgICAgPHJkYXI6 Ly9wcm9ibGVtLzEyNDc2NDczPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEFkZGl0aW9uYWwgaW5mb3JtYXRpb24gb2YgdGhlIGNoYW5nZSBzdWNoIGFz IGFwcHJvYWNoLCByYXRpb25hbGUuIFBsZWFzZSBhZGQgcGVyLWZ1bmN0aW9uIGRlc2NyaXB0aW9u cyBiZWxvdyAoT09QUyEpLgorCisgICAgICAgICogaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OmxvZ01lZGlhTG9hZFJlcXVlc3QpOiBFbmNhcHN1bGF0ZSBkaWFn bm9zdGljIGxvZ2dpbmcgaW50byBzaW5nbGUgc3RhdGljIG1ldGhvZC4KKyAgICAgICAgKFdlYkNv cmU6OkhUTUxNZWRpYUVsZW1lbnQ6Om1lZGlhTG9hZGluZ0ZhaWxlZCk6IENhbGwgbG9nTWVkaWFM b2FkUmVxdWVzdC4KKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6OnNldFJlYWR5 U3RhdGUpOiBEaXR0by4KKyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OmRpc3BhdGNoRGlkQ29tbWl0TG9hZCk6IFJlc2V0IHRo ZSBzZXQgb2Ygc2VlbiBtZWRpYSBlbmdpbmVzLgorCisgICAgICAgIEFkZCBuZXcgbWV0aG9kcyB0 byBQYWdlIHRvIHRyYWNrIHBlci1wYWdlIG1lZGlhIGVuZ2luZSBkaWFnbm9zdGljIGluZm8sIHNp bWlsYXIgdG8gcGx1Z2luIGRpYWdub3N0aWMgaW5mby4KKyAgICAgICAgKiBwYWdlL1BhZ2UuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6UGFnZTo6aGFzU2VlbkFueU1lZGlhRW5naW5lKToKKyAgICAg ICAgKFdlYkNvcmU6OlBhZ2U6Omhhc1NlZW5NZWRpYUVuZ2luZSk6CisgICAgICAgIChXZWJDb3Jl OjpQYWdlOjpzYXdNZWRpYUVuZ2luZSk6CisgICAgICAgIChXZWJDb3JlOjpQYWdlOjpyZXNldFNl ZW5NZWRpYUVuZ2luZXMpOgorICAgICAgICAqIHBhZ2UvUGFnZS5oOgorCisgICAgICAgIEFkZCBu ZXcgc3RhdGljIGxvZ2dpbmcga2V5IGRlZmluaXRpb25zOgorICAgICAgICAqIHBhZ2UvRGlhZ25v c3RpY0xvZ2dpbmdLZXlzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRpYWdub3N0aWNMb2dnaW5n S2V5czo6cGFnZUNvbnRhaW5zTWVkaWFFbmdpbmVLZXkpOgorICAgICAgICAoV2ViQ29yZTo6RGlh Z25vc3RpY0xvZ2dpbmdLZXlzOjpwYWdlQ29udGFpbnNBdExlYXN0T25lTWVkaWFFbmdpbmVLZXkp OgorICAgICAgICAqIHBhZ2UvRGlhZ25vc3RpY0xvZ2dpbmdLZXlzLmg6CisKIDIwMTItMTAtMTYg IFRvbW15IFdpZGVuZmx5Y2h0ICA8dG9tbXl3QGdvb2dsZS5jb20+CiAKICAgICAgICAgTWVkaWFT dHJlYW0gQVBJOiBBZGQgdGhlIGNocm9taXVtIEFQSSBmb3IgUlRDRGF0YUNoYW5uZWwKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCmluZGV4IGViZWVlMWI0MDU4MGQyYmVl ODc2NTQ0Y2MyOGE5YjU4ZTUxZjY1ODkuLjc1MzI0MjExMGQ2NTI4NjI4MTc5MTRiYzNlZTlmOTFl N2Q1MWIyYjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVu dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcApAQCAt MTUxNiw2ICsxNTE2LDI5IEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6bWVkaWFQbGF5ZXJOZXR3 b3JrU3RhdGVDaGFuZ2VkKE1lZGlhUGxheWVyKikKICAgICBlbmRQcm9jZXNzaW5nTWVkaWFQbGF5 ZXJDYWxsYmFjaygpOwogfQogCitzdGF0aWMgdm9pZCBsb2dNZWRpYUxvYWRSZXF1ZXN0KFBhZ2Uq IHBhZ2UsIGNvbnN0IFN0cmluZyYgbWVkaWFFbmdpbmUsIGNvbnN0IFN0cmluZyYgZXJyb3JNZXNz YWdlLCBib29sIHN1Y2NlZWRlZCkKK3sKKyAgICBpZiAoIXBhZ2UgfHwgIXBhZ2UtPnNldHRpbmdz KCktPmRpYWdub3N0aWNMb2dnaW5nRW5hYmxlZCgpKQorICAgICAgICByZXR1cm47CisKKyAgICBD aHJvbWVDbGllbnQqIGNsaWVudCA9IHBhZ2UtPmNocm9tZSgpLT5jbGllbnQoKTsKKworICAgIGlm ICghc3VjY2VlZGVkKSB7CisgICAgICAgIGNsaWVudC0+bG9nRGlhZ25vc3RpY01lc3NhZ2UoRGlh Z25vc3RpY0xvZ2dpbmdLZXlzOjptZWRpYUxvYWRpbmdGYWlsZWRLZXkoKSwgZXJyb3JNZXNzYWdl LCBEaWFnbm9zdGljTG9nZ2luZ0tleXM6OmZhaWxLZXkoKSk7CisgICAgICAgIHJldHVybjsKKyAg ICB9CisKKyAgICBjbGllbnQtPmxvZ0RpYWdub3N0aWNNZXNzYWdlKERpYWdub3N0aWNMb2dnaW5n S2V5czo6bWVkaWFMb2FkZWRLZXkoKSwgbWVkaWFFbmdpbmUsIERpYWdub3N0aWNMb2dnaW5nS2V5 czo6bm9vcEtleSgpKTsKKworICAgIGlmICghcGFnZS0+aGFzU2VlbkFueU1lZGlhRW5naW5lKCkp CisgICAgICAgIGNsaWVudC0+bG9nRGlhZ25vc3RpY01lc3NhZ2UoRGlhZ25vc3RpY0xvZ2dpbmdL ZXlzOjpwYWdlQ29udGFpbnNBdExlYXN0T25lTWVkaWFFbmdpbmVLZXkoKSwgZW1wdHlTdHJpbmco KSwgRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpub29wS2V5KCkpOworCisgICAgaWYgKCFwYWdlLT5o YXNTZWVuTWVkaWFFbmdpbmUobWVkaWFFbmdpbmUpKQorICAgICAgICBjbGllbnQtPmxvZ0RpYWdu b3N0aWNNZXNzYWdlKERpYWdub3N0aWNMb2dnaW5nS2V5czo6cGFnZUNvbnRhaW5zTWVkaWFFbmdp bmVLZXkoKSwgbWVkaWFFbmdpbmUsIERpYWdub3N0aWNMb2dnaW5nS2V5czo6bm9vcEtleSgpKTsK KworICAgIHBhZ2UtPnNhd01lZGlhRW5naW5lKG1lZGlhRW5naW5lKTsKK30KKwogc3RhdGljIFN0 cmluZyBzdHJpbmdGb3JOZXR3b3JrU3RhdGUoTWVkaWFQbGF5ZXI6Ok5ldHdvcmtTdGF0ZSBzdGF0 ZSkKIHsKICAgICBzd2l0Y2ggKHN0YXRlKSB7CkBAIC0xNTY3LDggKzE1OTAsNyBAQCB2b2lkIEhU TUxNZWRpYUVsZW1lbnQ6Om1lZGlhTG9hZGluZ0ZhaWxlZChNZWRpYVBsYXllcjo6TmV0d29ya1N0 YXRlIGVycm9yKQogICAgICAgICBtZWRpYUNvbnRyb2xzKCktPnJlcG9ydGVkRXJyb3IoKTsKICAg ICB9CiAKLSAgICBpZiAoZG9jdW1lbnQoKS0+cGFnZSgpICYmIGRvY3VtZW50KCktPnBhZ2UoKS0+ c2V0dGluZ3MoKS0+ZGlhZ25vc3RpY0xvZ2dpbmdFbmFibGVkKCkpCi0gICAgICAgIGRvY3VtZW50 KCktPnBhZ2UoKS0+Y2hyb21lKCktPmNsaWVudCgpLT5sb2dEaWFnbm9zdGljTWVzc2FnZShEaWFn bm9zdGljTG9nZ2luZ0tleXM6Om1lZGlhTG9hZGluZ0ZhaWxlZEtleSgpLCBzdHJpbmdGb3JOZXR3 b3JrU3RhdGUoZXJyb3IpLCBEaWFnbm9zdGljTG9nZ2luZ0tleXM6OmZhaWxLZXkoKSk7CisgICAg bG9nTWVkaWFMb2FkUmVxdWVzdChkb2N1bWVudCgpLT5wYWdlKCksIFN0cmluZygpLCBzdHJpbmdG b3JOZXR3b3JrU3RhdGUoZXJyb3IpLCBmYWxzZSk7CiB9CiAKIHZvaWQgSFRNTE1lZGlhRWxlbWVu dDo6c2V0TmV0d29ya1N0YXRlKE1lZGlhUGxheWVyOjpOZXR3b3JrU3RhdGUgc3RhdGUpCkBAIC0x Njk4LDggKzE3MjAsNyBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OnNldFJlYWR5U3RhdGUoTWVk aWFQbGF5ZXI6OlJlYWR5U3RhdGUgc3RhdGUpCiAgICAgICAgIGlmIChyZW5kZXJlcigpKQogICAg ICAgICAgICAgcmVuZGVyZXIoKS0+dXBkYXRlRnJvbUVsZW1lbnQoKTsKIAotICAgICAgICBpZiAo ZG9jdW1lbnQoKS0+cGFnZSgpICYmIGRvY3VtZW50KCktPnBhZ2UoKS0+c2V0dGluZ3MoKS0+ZGlh Z25vc3RpY0xvZ2dpbmdFbmFibGVkKCkpCi0gICAgICAgICAgICBkb2N1bWVudCgpLT5wYWdlKCkt PmNocm9tZSgpLT5jbGllbnQoKS0+bG9nRGlhZ25vc3RpY01lc3NhZ2UoRGlhZ25vc3RpY0xvZ2dp bmdLZXlzOjptZWRpYUxvYWRlZEtleSgpLCBtX3BsYXllci0+ZW5naW5lRGVzY3JpcHRpb24oKSwg RGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpub29wS2V5KCkpOworICAgICAgICBsb2dNZWRpYUxvYWRS ZXF1ZXN0KGRvY3VtZW50KCktPnBhZ2UoKSwgbV9wbGF5ZXItPmVuZ2luZURlc2NyaXB0aW9uKCks IFN0cmluZygpLCB0cnVlKTsKICAgICB9CiAKICAgICBib29sIHNob3VsZFVwZGF0ZURpc3BsYXlT dGF0ZSA9IGZhbHNlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9h ZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKaW5kZXggOGFi M2Q4OTIyOWRjOWQxMjlkOTc3ZGNlMWVjMDczYWMxMDA2NmViMy4uMzUyNTAyMTU0ZmUyMzg4MTU1 YmVjNTBlODM2MWVhYzJkNTkwYzc0YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVy L0ZyYW1lTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIu Y3BwCkBAIC0zMjM2LDggKzMyMzYsMTAgQEAgdm9pZCBGcmFtZUxvYWRlcjo6ZGlzcGF0Y2hEaWRD b21taXRMb2FkKCkKIAogICAgIG1fY2xpZW50LT5kaXNwYXRjaERpZENvbW1pdExvYWQoKTsKIAot ICAgIGlmIChpc0xvYWRpbmdNYWluRnJhbWUoKSkKKyAgICBpZiAoaXNMb2FkaW5nTWFpbkZyYW1l KCkpIHsKICAgICAgICAgbV9mcmFtZS0+cGFnZSgpLT5yZXNldFNlZW5QbHVnaW5zKCk7CisgICAg ICAgIG1fZnJhbWUtPnBhZ2UoKS0+cmVzZXRTZWVuTWVkaWFFbmdpbmVzKCk7CisgICAgfQogCiAg ICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRDb21taXRMb2FkKG1fZnJhbWUsIG1fZG9j dW1lbnRMb2FkZXIuZ2V0KCkpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9E aWFnbm9zdGljTG9nZ2luZ0tleXMuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9EaWFnbm9zdGlj TG9nZ2luZ0tleXMuY3BwCmluZGV4IGNhNTQ1NDdiMDM3YjBkN2Y0ZTZkNzYxNmM3YjZjYjZhMTk4 OWJmM2IuLjhmM2I0ZDYwM2UyNzQyNjBiODcyYTViNTRhYWRjN2Y5MDRkYTE3YjMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRGlhZ25vc3RpY0xvZ2dpbmdLZXlzLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wYWdlL0RpYWdub3N0aWNMb2dnaW5nS2V5cy5jcHAKQEAgLTY0LDYgKzY0 LDE4IEBAIGNvbnN0IFN0cmluZyYgRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpwYWdlQ29udGFpbnNB dExlYXN0T25lUGx1Z2luS2V5KCkKICAgICByZXR1cm4ga2V5OwogfQogCitjb25zdCBTdHJpbmcm IERpYWdub3N0aWNMb2dnaW5nS2V5czo6cGFnZUNvbnRhaW5zTWVkaWFFbmdpbmVLZXkoKQorewor ICAgIERFRklORV9TVEFUSUNfTE9DQUwoY29uc3QgU3RyaW5nLCBrZXksIChBU0NJSUxpdGVyYWwo InBhZ2VDb250YWluc01lZGlhRW5naW5lIikpKTsKKyAgICByZXR1cm4ga2V5OworfQorCitjb25z dCBTdHJpbmcmIERpYWdub3N0aWNMb2dnaW5nS2V5czo6cGFnZUNvbnRhaW5zQXRMZWFzdE9uZU1l ZGlhRW5naW5lS2V5KCkKK3sKKyAgICBERUZJTkVfU1RBVElDX0xPQ0FMKGNvbnN0IFN0cmluZywg a2V5LCAoQVNDSUlMaXRlcmFsKCJwYWdlQ29udGFpbnNBdExlYXN0T25lTWVkaWFFbmdpbmUiKSkp OworICAgIHJldHVybiBrZXk7Cit9CisKIGNvbnN0IFN0cmluZyYgRGlhZ25vc3RpY0xvZ2dpbmdL ZXlzOjpwYXNzS2V5KCkKIHsKICAgICBERUZJTkVfU1RBVElDX0xPQ0FMKGNvbnN0IFN0cmluZywg a2V5LCAoQVNDSUlMaXRlcmFsKCJwYXNzIikpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvRGlhZ25vc3RpY0xvZ2dpbmdLZXlzLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RpYWdu b3N0aWNMb2dnaW5nS2V5cy5oCmluZGV4IDk1MTgwNmU1N2YwMjViYjkwZjhjNmQxNzViYjUzNjYy NjE5M2IzNzkuLjUyZTg5NjRjOTdhNTFlOTgwNzVlOWQzZjdlZjQ2MWU1MWEzNjliYzUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRGlhZ25vc3RpY0xvZ2dpbmdLZXlzLmgKKysrIGIv U291cmNlL1dlYkNvcmUvcGFnZS9EaWFnbm9zdGljTG9nZ2luZ0tleXMuaApAQCAtMzksNyArMzks OSBAQCBwdWJsaWM6CiAgICAgc3RhdGljIGNvbnN0IFN0cmluZyYgcGx1Z2luTG9hZGluZ0ZhaWxl ZEtleSgpOwogICAgIHN0YXRpYyBjb25zdCBTdHJpbmcmIHBhZ2VDb250YWluc1BsdWdpbktleSgp OwogICAgIHN0YXRpYyBjb25zdCBTdHJpbmcmIHBhZ2VDb250YWluc0F0TGVhc3RPbmVQbHVnaW5L ZXkoKTsKLSAgICAKKyAgICBzdGF0aWMgY29uc3QgU3RyaW5nJiBwYWdlQ29udGFpbnNNZWRpYUVu Z2luZUtleSgpOworICAgIHN0YXRpYyBjb25zdCBTdHJpbmcmIHBhZ2VDb250YWluc0F0TGVhc3RP bmVNZWRpYUVuZ2luZUtleSgpOworCiAgICAgLy8gU3VjY2VzcyBrZXlzCiAgICAgc3RhdGljIGNv bnN0IFN0cmluZyYgcGFzc0tleSgpOwogICAgIHN0YXRpYyBjb25zdCBTdHJpbmcmIGZhaWxLZXko KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9wYWdlL1BhZ2UuY3BwCmluZGV4IDQ4NGExZWI5OTIwNmVkNTg2NzcwM2ZkNDgzNTM0NzQ1 MzU3NDgzYjguLmNjZTM1Y2IxYjE1M2M1MTcxZWQzZGIxMmIyMWEwNmFjYjM0YjRiYmUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cGFnZS9QYWdlLmNwcApAQCAtMTI2MCw2ICsxMjYwLDI2IEBAIHZvaWQgUGFnZTo6cmVzZXRTZWVu UGx1Z2lucygpCiAgICAgbV9zZWVuUGx1Z2lucy5jbGVhcigpOwogfQogCitib29sIFBhZ2U6Omhh c1NlZW5BbnlNZWRpYUVuZ2luZSgpIGNvbnN0Cit7CisgICAgcmV0dXJuICFtX3NlZW5NZWRpYUVu Z2luZXMuaXNFbXB0eSgpOworfQorCitib29sIFBhZ2U6Omhhc1NlZW5NZWRpYUVuZ2luZShjb25z dCBTdHJpbmcmIHNlcnZpY2VUeXBlKSBjb25zdAoreworICAgIHJldHVybiBtX3NlZW5NZWRpYUVu Z2luZXMuY29udGFpbnMoc2VydmljZVR5cGUpOworfQorCit2b2lkIFBhZ2U6OnNhd01lZGlhRW5n aW5lKGNvbnN0IFN0cmluZyYgc2VydmljZVR5cGUpCit7CisgICAgbV9zZWVuTWVkaWFFbmdpbmVz LmFkZChzZXJ2aWNlVHlwZSk7Cit9CisKK3ZvaWQgUGFnZTo6cmVzZXRTZWVuTWVkaWFFbmdpbmVz KCkKK3sKKyAgICBtX3NlZW5NZWRpYUVuZ2luZXMuY2xlYXIoKTsKK30KKwogdm9pZCBQYWdlOjpy ZXBvcnRNZW1vcnlVc2FnZShNZW1vcnlPYmplY3RJbmZvKiBtZW1vcnlPYmplY3RJbmZvKSBjb25z dAogewogICAgIE1lbW9yeUNsYXNzSW5mbyBpbmZvKG1lbW9yeU9iamVjdEluZm8sIHRoaXMsIFdl YkNvcmVNZW1vcnlUeXBlczo6UGFnZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdl L1BhZ2UuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5oCmluZGV4IDc2ZDlhYzdlZDJlNTY2 ZTc1NjcyNTM0ZjhkMGM1NTRkNmUyMWU1YTEuLjEzNjFhY2RkZjdjODA5YzhhNjY5ZmM3YzEzMjk2 ZWZjMmFiNTE4M2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5oCkBAIC0zNTIsNiArMzUyLDExIEBAIG5hbWVzcGFj ZSBXZWJDb3JlIHsKICAgICAgICAgdm9pZCBzYXdQbHVnaW4oY29uc3QgU3RyaW5nJiBzZXJ2aWNl VHlwZSk7CiAgICAgICAgIHZvaWQgcmVzZXRTZWVuUGx1Z2lucygpOwogCisgICAgICAgIGJvb2wg aGFzU2Vlbk1lZGlhRW5naW5lKGNvbnN0IFN0cmluZyYgZW5naW5lTmFtZSkgY29uc3Q7CisgICAg ICAgIGJvb2wgaGFzU2VlbkFueU1lZGlhRW5naW5lKCkgY29uc3Q7CisgICAgICAgIHZvaWQgc2F3 TWVkaWFFbmdpbmUoY29uc3QgU3RyaW5nJiBlbmdpbmVOYW1lKTsKKyAgICAgICAgdm9pZCByZXNl dFNlZW5NZWRpYUVuZ2luZXMoKTsKKwogICAgICAgICB2b2lkIHJlcG9ydE1lbW9yeVVzYWdlKE1l bW9yeU9iamVjdEluZm8qKSBjb25zdDsKIAogICAgIHByaXZhdGU6CkBAIC00NzMsNiArNDc4LDcg QEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBib29sIG1fc2NyaXB0ZWRBbmltYXRpb25z U3VzcGVuZGVkOwogCiAgICAgICAgIEhhc2hTZXQ8U3RyaW5nPiBtX3NlZW5QbHVnaW5zOworICAg ICAgICBIYXNoU2V0PFN0cmluZz4gbV9zZWVuTWVkaWFFbmdpbmVzOwogICAgIH07CiAKIH0gLy8g bmFtZXNwYWNlIFdlYkNvcmUK 169254 2012-10-17 13:59:22 -0700 2012-10-18 11:13:03 -0700 Patch bug-99615-20121017135809.patch text/plain 8499 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTMxNDk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTM1NmIwNTg2MWVlMjU0 YzFlNTFjY2YwYzM5NzgxZGRiODg2MTNiYy4uNTE0MzNhMDE2YmI4OGU3MDk2MzM1ODU4YWJmNjlh M2ViOTk1MDJlOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDEyLTEwLTE3ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBkaWFnbm9zdGljIGxv Z2dpbmcgdG8gdHJhY2sgcGVyLXBhZ2UgbWVkaWEgZW5naW5lIHVzYWdlLgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTk2MTUKKyAgICAgICAgPHJkYXI6 Ly9wcm9ibGVtLzEyNDc2NDczPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEFkZCBkaWFnbm9zdGljIGxvZ2dpbmcgdHJpZ2dlcmVkIG9ubHkgb25jZS1w ZXItcGFnZSBhbmQgb25jZS1wZXItcGFnZS1wZXItZW5naW5lLgorCisgICAgICAgICogaHRtbC9I VE1MTWVkaWFFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmxvZ01lZGlhTG9hZFJlcXVl c3QpOiBFbmNhcHN1bGF0ZSBkaWFnbm9zdGljIGxvZ2dpbmcgaW50byBzaW5nbGUgc3RhdGljIG1l dGhvZC4KKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6Om1lZGlhTG9hZGluZ0Zh aWxlZCk6IENhbGwgbG9nTWVkaWFMb2FkUmVxdWVzdC4KKyAgICAgICAgKFdlYkNvcmU6OkhUTUxN ZWRpYUVsZW1lbnQ6OnNldFJlYWR5U3RhdGUpOiBEaXR0by4KKyAgICAgICAgKiBsb2FkZXIvRnJh bWVMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OmRpc3BhdGNoRGlk Q29tbWl0TG9hZCk6IFJlc2V0IHRoZSBzZXQgb2Ygc2VlbiBtZWRpYSBlbmdpbmVzLgorCisgICAg ICAgIEFkZCBuZXcgbWV0aG9kcyB0byBQYWdlIHRvIHRyYWNrIHBlci1wYWdlIG1lZGlhIGVuZ2lu ZSBkaWFnbm9zdGljIGluZm8sIHNpbWlsYXIgdG8gcGx1Z2luIGRpYWdub3N0aWMgaW5mby4KKyAg ICAgICAgKiBwYWdlL1BhZ2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGFnZTo6aGFzU2VlbkFu eU1lZGlhRW5naW5lKToKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2U6Omhhc1NlZW5NZWRpYUVuZ2lu ZSk6CisgICAgICAgIChXZWJDb3JlOjpQYWdlOjpzYXdNZWRpYUVuZ2luZSk6CisgICAgICAgIChX ZWJDb3JlOjpQYWdlOjpyZXNldFNlZW5NZWRpYUVuZ2luZXMpOgorICAgICAgICAqIHBhZ2UvUGFn ZS5oOgorCisgICAgICAgIEFkZCBuZXcgc3RhdGljIGxvZ2dpbmcga2V5IGRlZmluaXRpb25zOgor ICAgICAgICAqIHBhZ2UvRGlhZ25vc3RpY0xvZ2dpbmdLZXlzLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkRpYWdub3N0aWNMb2dnaW5nS2V5czo6cGFnZUNvbnRhaW5zTWVkaWFFbmdpbmVLZXkpOgor ICAgICAgICAoV2ViQ29yZTo6RGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpwYWdlQ29udGFpbnNBdExl YXN0T25lTWVkaWFFbmdpbmVLZXkpOgorICAgICAgICAqIHBhZ2UvRGlhZ25vc3RpY0xvZ2dpbmdL ZXlzLmg6CisKIDIwMTItMTAtMTYgIFRvbW15IFdpZGVuZmx5Y2h0ICA8dG9tbXl3QGdvb2dsZS5j b20+CiAKICAgICAgICAgTWVkaWFTdHJlYW0gQVBJOiBBZGQgdGhlIGNocm9taXVtIEFQSSBmb3Ig UlRDRGF0YUNoYW5uZWwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlh RWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCmlu ZGV4IGViZWVlMWI0MDU4MGQyYmVlODc2NTQ0Y2MyOGE5YjU4ZTUxZjY1ODkuLjc1MzI0MjExMGQ2 NTI4NjI4MTc5MTRiYzNlZTlmOTFlN2Q1MWIyYjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1M TWVkaWFFbGVtZW50LmNwcApAQCAtMTUxNiw2ICsxNTE2LDI5IEBAIHZvaWQgSFRNTE1lZGlhRWxl bWVudDo6bWVkaWFQbGF5ZXJOZXR3b3JrU3RhdGVDaGFuZ2VkKE1lZGlhUGxheWVyKikKICAgICBl bmRQcm9jZXNzaW5nTWVkaWFQbGF5ZXJDYWxsYmFjaygpOwogfQogCitzdGF0aWMgdm9pZCBsb2dN ZWRpYUxvYWRSZXF1ZXN0KFBhZ2UqIHBhZ2UsIGNvbnN0IFN0cmluZyYgbWVkaWFFbmdpbmUsIGNv bnN0IFN0cmluZyYgZXJyb3JNZXNzYWdlLCBib29sIHN1Y2NlZWRlZCkKK3sKKyAgICBpZiAoIXBh Z2UgfHwgIXBhZ2UtPnNldHRpbmdzKCktPmRpYWdub3N0aWNMb2dnaW5nRW5hYmxlZCgpKQorICAg ICAgICByZXR1cm47CisKKyAgICBDaHJvbWVDbGllbnQqIGNsaWVudCA9IHBhZ2UtPmNocm9tZSgp LT5jbGllbnQoKTsKKworICAgIGlmICghc3VjY2VlZGVkKSB7CisgICAgICAgIGNsaWVudC0+bG9n RGlhZ25vc3RpY01lc3NhZ2UoRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjptZWRpYUxvYWRpbmdGYWls ZWRLZXkoKSwgZXJyb3JNZXNzYWdlLCBEaWFnbm9zdGljTG9nZ2luZ0tleXM6OmZhaWxLZXkoKSk7 CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBjbGllbnQtPmxvZ0RpYWdub3N0aWNNZXNz YWdlKERpYWdub3N0aWNMb2dnaW5nS2V5czo6bWVkaWFMb2FkZWRLZXkoKSwgbWVkaWFFbmdpbmUs IERpYWdub3N0aWNMb2dnaW5nS2V5czo6bm9vcEtleSgpKTsKKworICAgIGlmICghcGFnZS0+aGFz U2VlbkFueU1lZGlhRW5naW5lKCkpCisgICAgICAgIGNsaWVudC0+bG9nRGlhZ25vc3RpY01lc3Nh Z2UoRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpwYWdlQ29udGFpbnNBdExlYXN0T25lTWVkaWFFbmdp bmVLZXkoKSwgZW1wdHlTdHJpbmcoKSwgRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpub29wS2V5KCkp OworCisgICAgaWYgKCFwYWdlLT5oYXNTZWVuTWVkaWFFbmdpbmUobWVkaWFFbmdpbmUpKQorICAg ICAgICBjbGllbnQtPmxvZ0RpYWdub3N0aWNNZXNzYWdlKERpYWdub3N0aWNMb2dnaW5nS2V5czo6 cGFnZUNvbnRhaW5zTWVkaWFFbmdpbmVLZXkoKSwgbWVkaWFFbmdpbmUsIERpYWdub3N0aWNMb2dn aW5nS2V5czo6bm9vcEtleSgpKTsKKworICAgIHBhZ2UtPnNhd01lZGlhRW5naW5lKG1lZGlhRW5n aW5lKTsKK30KKwogc3RhdGljIFN0cmluZyBzdHJpbmdGb3JOZXR3b3JrU3RhdGUoTWVkaWFQbGF5 ZXI6Ok5ldHdvcmtTdGF0ZSBzdGF0ZSkKIHsKICAgICBzd2l0Y2ggKHN0YXRlKSB7CkBAIC0xNTY3 LDggKzE1OTAsNyBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6Om1lZGlhTG9hZGluZ0ZhaWxlZChN ZWRpYVBsYXllcjo6TmV0d29ya1N0YXRlIGVycm9yKQogICAgICAgICBtZWRpYUNvbnRyb2xzKCkt PnJlcG9ydGVkRXJyb3IoKTsKICAgICB9CiAKLSAgICBpZiAoZG9jdW1lbnQoKS0+cGFnZSgpICYm IGRvY3VtZW50KCktPnBhZ2UoKS0+c2V0dGluZ3MoKS0+ZGlhZ25vc3RpY0xvZ2dpbmdFbmFibGVk KCkpCi0gICAgICAgIGRvY3VtZW50KCktPnBhZ2UoKS0+Y2hyb21lKCktPmNsaWVudCgpLT5sb2dE aWFnbm9zdGljTWVzc2FnZShEaWFnbm9zdGljTG9nZ2luZ0tleXM6Om1lZGlhTG9hZGluZ0ZhaWxl ZEtleSgpLCBzdHJpbmdGb3JOZXR3b3JrU3RhdGUoZXJyb3IpLCBEaWFnbm9zdGljTG9nZ2luZ0tl eXM6OmZhaWxLZXkoKSk7CisgICAgbG9nTWVkaWFMb2FkUmVxdWVzdChkb2N1bWVudCgpLT5wYWdl KCksIFN0cmluZygpLCBzdHJpbmdGb3JOZXR3b3JrU3RhdGUoZXJyb3IpLCBmYWxzZSk7CiB9CiAK IHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6c2V0TmV0d29ya1N0YXRlKE1lZGlhUGxheWVyOjpOZXR3 b3JrU3RhdGUgc3RhdGUpCkBAIC0xNjk4LDggKzE3MjAsNyBAQCB2b2lkIEhUTUxNZWRpYUVsZW1l bnQ6OnNldFJlYWR5U3RhdGUoTWVkaWFQbGF5ZXI6OlJlYWR5U3RhdGUgc3RhdGUpCiAgICAgICAg IGlmIChyZW5kZXJlcigpKQogICAgICAgICAgICAgcmVuZGVyZXIoKS0+dXBkYXRlRnJvbUVsZW1l bnQoKTsKIAotICAgICAgICBpZiAoZG9jdW1lbnQoKS0+cGFnZSgpICYmIGRvY3VtZW50KCktPnBh Z2UoKS0+c2V0dGluZ3MoKS0+ZGlhZ25vc3RpY0xvZ2dpbmdFbmFibGVkKCkpCi0gICAgICAgICAg ICBkb2N1bWVudCgpLT5wYWdlKCktPmNocm9tZSgpLT5jbGllbnQoKS0+bG9nRGlhZ25vc3RpY01l c3NhZ2UoRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjptZWRpYUxvYWRlZEtleSgpLCBtX3BsYXllci0+ ZW5naW5lRGVzY3JpcHRpb24oKSwgRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpub29wS2V5KCkpOwor ICAgICAgICBsb2dNZWRpYUxvYWRSZXF1ZXN0KGRvY3VtZW50KCktPnBhZ2UoKSwgbV9wbGF5ZXIt PmVuZ2luZURlc2NyaXB0aW9uKCksIFN0cmluZygpLCB0cnVlKTsKICAgICB9CiAKICAgICBib29s IHNob3VsZFVwZGF0ZURpc3BsYXlTdGF0ZSA9IGZhbHNlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFt ZUxvYWRlci5jcHAKaW5kZXggOGFiM2Q4OTIyOWRjOWQxMjlkOTc3ZGNlMWVjMDczYWMxMDA2NmVi My4uMzUyNTAyMTU0ZmUyMzg4MTU1YmVjNTBlODM2MWVhYzJkNTkwYzc0YSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCkBAIC0zMjM2LDggKzMyMzYsMTAgQEAgdm9pZCBGcmFt ZUxvYWRlcjo6ZGlzcGF0Y2hEaWRDb21taXRMb2FkKCkKIAogICAgIG1fY2xpZW50LT5kaXNwYXRj aERpZENvbW1pdExvYWQoKTsKIAotICAgIGlmIChpc0xvYWRpbmdNYWluRnJhbWUoKSkKKyAgICBp ZiAoaXNMb2FkaW5nTWFpbkZyYW1lKCkpIHsKICAgICAgICAgbV9mcmFtZS0+cGFnZSgpLT5yZXNl dFNlZW5QbHVnaW5zKCk7CisgICAgICAgIG1fZnJhbWUtPnBhZ2UoKS0+cmVzZXRTZWVuTWVkaWFF bmdpbmVzKCk7CisgICAgfQogCiAgICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRDb21t aXRMb2FkKG1fZnJhbWUsIG1fZG9jdW1lbnRMb2FkZXIuZ2V0KCkpOwogfQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGFnZS9EaWFnbm9zdGljTG9nZ2luZ0tleXMuY3BwIGIvU291cmNlL1dl YkNvcmUvcGFnZS9EaWFnbm9zdGljTG9nZ2luZ0tleXMuY3BwCmluZGV4IGNhNTQ1NDdiMDM3YjBk N2Y0ZTZkNzYxNmM3YjZjYjZhMTk4OWJmM2IuLjhmM2I0ZDYwM2UyNzQyNjBiODcyYTViNTRhYWRj N2Y5MDRkYTE3YjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRGlhZ25vc3RpY0xv Z2dpbmdLZXlzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RpYWdub3N0aWNMb2dnaW5n S2V5cy5jcHAKQEAgLTY0LDYgKzY0LDE4IEBAIGNvbnN0IFN0cmluZyYgRGlhZ25vc3RpY0xvZ2dp bmdLZXlzOjpwYWdlQ29udGFpbnNBdExlYXN0T25lUGx1Z2luS2V5KCkKICAgICByZXR1cm4ga2V5 OwogfQogCitjb25zdCBTdHJpbmcmIERpYWdub3N0aWNMb2dnaW5nS2V5czo6cGFnZUNvbnRhaW5z TWVkaWFFbmdpbmVLZXkoKQoreworICAgIERFRklORV9TVEFUSUNfTE9DQUwoY29uc3QgU3RyaW5n LCBrZXksIChBU0NJSUxpdGVyYWwoInBhZ2VDb250YWluc01lZGlhRW5naW5lIikpKTsKKyAgICBy ZXR1cm4ga2V5OworfQorCitjb25zdCBTdHJpbmcmIERpYWdub3N0aWNMb2dnaW5nS2V5czo6cGFn ZUNvbnRhaW5zQXRMZWFzdE9uZU1lZGlhRW5naW5lS2V5KCkKK3sKKyAgICBERUZJTkVfU1RBVElD X0xPQ0FMKGNvbnN0IFN0cmluZywga2V5LCAoQVNDSUlMaXRlcmFsKCJwYWdlQ29udGFpbnNBdExl YXN0T25lTWVkaWFFbmdpbmUiKSkpOworICAgIHJldHVybiBrZXk7Cit9CisKIGNvbnN0IFN0cmlu ZyYgRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpwYXNzS2V5KCkKIHsKICAgICBERUZJTkVfU1RBVElD X0xPQ0FMKGNvbnN0IFN0cmluZywga2V5LCAoQVNDSUlMaXRlcmFsKCJwYXNzIikpKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRGlhZ25vc3RpY0xvZ2dpbmdLZXlzLmggYi9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL0RpYWdub3N0aWNMb2dnaW5nS2V5cy5oCmluZGV4IDk1MTgwNmU1N2Yw MjViYjkwZjhjNmQxNzViYjUzNjYyNjE5M2IzNzkuLjUyZTg5NjRjOTdhNTFlOTgwNzVlOWQzZjdl ZjQ2MWU1MWEzNjliYzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRGlhZ25vc3Rp Y0xvZ2dpbmdLZXlzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9EaWFnbm9zdGljTG9nZ2lu Z0tleXMuaApAQCAtMzksNyArMzksOSBAQCBwdWJsaWM6CiAgICAgc3RhdGljIGNvbnN0IFN0cmlu ZyYgcGx1Z2luTG9hZGluZ0ZhaWxlZEtleSgpOwogICAgIHN0YXRpYyBjb25zdCBTdHJpbmcmIHBh Z2VDb250YWluc1BsdWdpbktleSgpOwogICAgIHN0YXRpYyBjb25zdCBTdHJpbmcmIHBhZ2VDb250 YWluc0F0TGVhc3RPbmVQbHVnaW5LZXkoKTsKLSAgICAKKyAgICBzdGF0aWMgY29uc3QgU3RyaW5n JiBwYWdlQ29udGFpbnNNZWRpYUVuZ2luZUtleSgpOworICAgIHN0YXRpYyBjb25zdCBTdHJpbmcm IHBhZ2VDb250YWluc0F0TGVhc3RPbmVNZWRpYUVuZ2luZUtleSgpOworCiAgICAgLy8gU3VjY2Vz cyBrZXlzCiAgICAgc3RhdGljIGNvbnN0IFN0cmluZyYgcGFzc0tleSgpOwogICAgIHN0YXRpYyBj b25zdCBTdHJpbmcmIGZhaWxLZXkoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv UGFnZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwCmluZGV4IDQ4NGExZWI5OTIw NmVkNTg2NzcwM2ZkNDgzNTM0NzQ1MzU3NDgzYjguLmY5YWQ2NWIwOGM0MDk2ZGRhMWRjZTFjNmZm OWU0ZmYzZDFlZmFiNWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcApAQCAtMTI2MCw2ICsxMjYwLDI2IEBA IHZvaWQgUGFnZTo6cmVzZXRTZWVuUGx1Z2lucygpCiAgICAgbV9zZWVuUGx1Z2lucy5jbGVhcigp OwogfQogCitib29sIFBhZ2U6Omhhc1NlZW5BbnlNZWRpYUVuZ2luZSgpIGNvbnN0Cit7CisgICAg cmV0dXJuICFtX3NlZW5NZWRpYUVuZ2luZXMuaXNFbXB0eSgpOworfQorCitib29sIFBhZ2U6Omhh c1NlZW5NZWRpYUVuZ2luZShjb25zdCBTdHJpbmcmIGVuZ2luZURlc2NyaXB0aW9uKSBjb25zdAor eworICAgIHJldHVybiBtX3NlZW5NZWRpYUVuZ2luZXMuY29udGFpbnMoZW5naW5lRGVzY3JpcHRp b24pOworfQorCit2b2lkIFBhZ2U6OnNhd01lZGlhRW5naW5lKGNvbnN0IFN0cmluZyYgZW5naW5l RGVzY3JpcHRpb24pCit7CisgICAgbV9zZWVuTWVkaWFFbmdpbmVzLmFkZChlbmdpbmVEZXNjcmlw dGlvbik7Cit9CisKK3ZvaWQgUGFnZTo6cmVzZXRTZWVuTWVkaWFFbmdpbmVzKCkKK3sKKyAgICBt X3NlZW5NZWRpYUVuZ2luZXMuY2xlYXIoKTsKK30KKwogdm9pZCBQYWdlOjpyZXBvcnRNZW1vcnlV c2FnZShNZW1vcnlPYmplY3RJbmZvKiBtZW1vcnlPYmplY3RJbmZvKSBjb25zdAogewogICAgIE1l bW9yeUNsYXNzSW5mbyBpbmZvKG1lbW9yeU9iamVjdEluZm8sIHRoaXMsIFdlYkNvcmVNZW1vcnlU eXBlczo6UGFnZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuaCBiL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5oCmluZGV4IDc2ZDlhYzdlZDJlNTY2ZTc1NjcyNTM0Zjhk MGM1NTRkNmUyMWU1YTEuLjEzNjFhY2RkZjdjODA5YzhhNjY5ZmM3YzEzMjk2ZWZjMmFiNTE4M2Qg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BhZ2UvUGFnZS5oCkBAIC0zNTIsNiArMzUyLDExIEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsK ICAgICAgICAgdm9pZCBzYXdQbHVnaW4oY29uc3QgU3RyaW5nJiBzZXJ2aWNlVHlwZSk7CiAgICAg ICAgIHZvaWQgcmVzZXRTZWVuUGx1Z2lucygpOwogCisgICAgICAgIGJvb2wgaGFzU2Vlbk1lZGlh RW5naW5lKGNvbnN0IFN0cmluZyYgZW5naW5lTmFtZSkgY29uc3Q7CisgICAgICAgIGJvb2wgaGFz U2VlbkFueU1lZGlhRW5naW5lKCkgY29uc3Q7CisgICAgICAgIHZvaWQgc2F3TWVkaWFFbmdpbmUo Y29uc3QgU3RyaW5nJiBlbmdpbmVOYW1lKTsKKyAgICAgICAgdm9pZCByZXNldFNlZW5NZWRpYUVu Z2luZXMoKTsKKwogICAgICAgICB2b2lkIHJlcG9ydE1lbW9yeVVzYWdlKE1lbW9yeU9iamVjdElu Zm8qKSBjb25zdDsKIAogICAgIHByaXZhdGU6CkBAIC00NzMsNiArNDc4LDcgQEAgbmFtZXNwYWNl IFdlYkNvcmUgewogICAgICAgICBib29sIG1fc2NyaXB0ZWRBbmltYXRpb25zU3VzcGVuZGVkOwog CiAgICAgICAgIEhhc2hTZXQ8U3RyaW5nPiBtX3NlZW5QbHVnaW5zOworICAgICAgICBIYXNoU2V0 PFN0cmluZz4gbV9zZWVuTWVkaWFFbmdpbmVzOwogICAgIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdl YkNvcmUK