134352 2014-06-26 11:21:48 -0700 [MSE] Refactoring: Use C++11 for-loops in SourceBuffer. 2014-06-27 00:30:49 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jer.noble jer.noble bunhere calvaris cdumez commit-queue eric.carlson glenn gyuyoung.kim ltilve philipj sergio oldest_to_newest 1018682 0 jer.noble 2014-06-26 11:21:48 -0700 [MSE] Refactoring: Use C++11 for-loops in SourceBuffer. 1018685 1 233918 jer.noble 2014-06-26 11:28:18 -0700 Created attachment 233918 Patch 1018689 2 233918 darin 2014-06-26 11:35:57 -0700 Comment on attachment 233918 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=233918&action=review > Source/WebCore/Modules/mediasource/SourceBuffer.cpp:316 > + AtomicString trackID = trackBufferPair.key; Wasting a little performance here by using AtomicString instead of const AtomicString& or auto&. 1018695 3 jer.noble 2014-06-26 11:45:17 -0700 (In reply to comment #2) > (From update of attachment 233918 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=233918&action=review > > > Source/WebCore/Modules/mediasource/SourceBuffer.cpp:316 > > + AtomicString trackID = trackBufferPair.key; > > Wasting a little performance here by using AtomicString instead of const AtomicString& or auto&. Good point. Will fix that (as well as a compilation error) before landing. 1018696 4 jer.noble 2014-06-26 11:50:57 -0700 Committed r170488: <http://trac.webkit.org/changeset/170488> 233918 2014-06-26 11:28:18 -0700 2014-06-26 11:35:56 -0700 Patch bug-134352-20140626112757.patch text/plain 13935 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTcwNDU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTZlYTQ0NDc3YzEzZGM0 ZWRmYmI2OGUwMjMyNzBkOWExNGQxMTNkYS4uZDAxYTYyNjk0YThhZWUwZjQwZDA0YmQ0Y2JlMWRl YmU2NWQ4ZGYzMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIzIEBACiAyMDE0LTA2LTI2ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCisgICAgICAgIFtNU0VdIFJlZmFjdG9yaW5n OiBVc2UgQysrMTEgZm9yLWxvb3BzIGluIFNvdXJjZUJ1ZmZlci4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNDM1MgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVzZSBDKysxMSBzdHlsZSBmb3ItbG9vcHMg d2hlcmUgYXBwcm9wcmlhdGUgaW4gU291cmNlQnVmZmVyIG5vdyB0aGF0IHRoZQorICAgICAgICBT YW1wbGVNYXAgb3JkZXJlZCBvYmplY3RzIHN1cHBvcnQgdGhlbS4KKworICAgICAgICAqIE1vZHVs ZXMvbWVkaWFzb3VyY2UvU291cmNlQnVmZmVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNvdXJj ZUJ1ZmZlcjo6c291cmNlQnVmZmVyUHJpdmF0ZVNlZWtUb1RpbWUpOgorICAgICAgICAoV2ViQ29y ZTo6U291cmNlQnVmZmVyOjpzb3VyY2VCdWZmZXJQcml2YXRlRmFzdFNlZWtUaW1lRm9yTWVkaWFU aW1lKToKKyAgICAgICAgKFdlYkNvcmU6OlNvdXJjZUJ1ZmZlcjo6c291cmNlQnVmZmVyUHJpdmF0 ZUFwcGVuZENvbXBsZXRlKToKKyAgICAgICAgKFdlYkNvcmU6OlNvdXJjZUJ1ZmZlcjo6c291cmNl QnVmZmVyUHJpdmF0ZURpZFJlY2VpdmVJbml0aWFsaXphdGlvblNlZ21lbnQpOgorICAgICAgICAo V2ViQ29yZTo6U291cmNlQnVmZmVyOjp2YWxpZGF0ZUluaXRpYWxpemF0aW9uU2VnbWVudCk6Cisg ICAgICAgIChXZWJDb3JlOjpTb3VyY2VCdWZmZXI6OnNvdXJjZUJ1ZmZlclByaXZhdGVEaWRSZWNl aXZlU2FtcGxlKToKKworMjAxNC0wNi0yNiAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNv bT4KKwogICAgICAgICBbTVNFXSBSZWZhY3RvcmluZzogRGlmZmVyZW50aWF0ZSBiZXR3ZWVuIFNh bXBsZU1hcCBkZWNvZGUgYW5kIHByZXNlbnRhdGlvbiBvcmRlciBtZXRob2RzCiAgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzQzNDkKIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNvdXJjZS9Tb3VyY2VCdWZmZXIuY3BwIGIv U291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNvdXJjZS9Tb3VyY2VCdWZmZXIuY3BwCmluZGV4 IGY1ZjNkMzJhODJkNmU1YzdjYTY2YjcyNDMzM2FhZjI1ZjQxNmE2MDIuLjRiYTQzYjJmNjAxNWFj NDYxODQ0YjIzNGNlYzRkOWMzYzE3YzZmZTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvbWVkaWFzb3VyY2UvU291cmNlQnVmZmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL21lZGlhc291cmNlL1NvdXJjZUJ1ZmZlci5jcHAKQEAgLTMxMSw5ICszMTEsOSBAQCB2 b2lkIFNvdXJjZUJ1ZmZlcjo6c291cmNlQnVmZmVyUHJpdmF0ZVNlZWtUb1RpbWUoU291cmNlQnVm ZmVyUHJpdmF0ZSosIGNvbnN0IE1lZAogewogICAgIExPRyhNZWRpYSwgIlNvdXJjZUJ1ZmZlcjo6 c291cmNlQnVmZmVyUHJpdmF0ZVNlZWtUb1RpbWUoJXApIiwgdGhpcyk7CiAKLSAgICBmb3IgKGF1 dG8gdHJhY2tCdWZmZXJJdGVyYXRvciA9IG1fdHJhY2tCdWZmZXJNYXAuYmVnaW4oKTsgdHJhY2tC dWZmZXJJdGVyYXRvciAhPSBtX3RyYWNrQnVmZmVyTWFwLmVuZCgpOyArK3RyYWNrQnVmZmVySXRl cmF0b3IpIHsKLSAgICAgICAgVHJhY2tCdWZmZXImIHRyYWNrQnVmZmVyID0gdHJhY2tCdWZmZXJJ dGVyYXRvci0+dmFsdWU7Ci0gICAgICAgIEF0b21pY1N0cmluZyB0cmFja0lEID0gdHJhY2tCdWZm ZXJJdGVyYXRvci0+a2V5OworICAgIGZvciAoYXV0byYgdHJhY2tCdWZmZXJQYWlyIDogbV90cmFj a0J1ZmZlck1hcCkgeworICAgICAgICBUcmFja0J1ZmZlciYgdHJhY2tCdWZmZXIgPSB0cmFja0J1 ZmZlclBhaXIudmFsdWU7CisgICAgICAgIEF0b21pY1N0cmluZyB0cmFja0lEID0gdHJhY2tCdWZm ZXJQYWlyLmtleTsKIAogICAgICAgICAvLyBGaW5kIHRoZSBzYW1wbGUgd2hpY2ggY29udGFpbnMg dGhlIGN1cnJlbnQgcHJlc2VudGF0aW9uIHRpbWUuCiAgICAgICAgIGF1dG8gY3VycmVudFNhbXBs ZVBUU0l0ZXJhdG9yID0gdHJhY2tCdWZmZXIuc2FtcGxlcy5wcmVzZW50YXRpb25PcmRlcigpLmZp bmRTYW1wbGVDb250YWluaW5nUHJlc2VudGF0aW9uVGltZSh0aW1lKTsKQEAgLTM2MCw5ICszNjAs NyBAQCBNZWRpYVRpbWUgU291cmNlQnVmZmVyOjpzb3VyY2VCdWZmZXJQcml2YXRlRmFzdFNlZWtU aW1lRm9yTWVkaWFUaW1lKFNvdXJjZUJ1ZmZlcgogICAgIE1lZGlhVGltZSBsb3dlckJvdW5kVGlt ZSA9IHRhcmdldFRpbWUgLSBuZWdhdGl2ZVRocmVzaG9sZDsKICAgICBNZWRpYVRpbWUgdXBwZXJC b3VuZFRpbWUgPSB0YXJnZXRUaW1lICsgcG9zaXRpdmVUaHJlc2hvbGQ7CiAKLSAgICBmb3IgKGF1 dG8gdHJhY2tCdWZmZXJJdGVyYXRvciA9IG1fdHJhY2tCdWZmZXJNYXAuYmVnaW4oKTsgdHJhY2tC dWZmZXJJdGVyYXRvciAhPSBtX3RyYWNrQnVmZmVyTWFwLmVuZCgpOyArK3RyYWNrQnVmZmVySXRl cmF0b3IpIHsKLSAgICAgICAgVHJhY2tCdWZmZXImIHRyYWNrQnVmZmVyID0gdHJhY2tCdWZmZXJJ dGVyYXRvci0+dmFsdWU7Ci0KKyAgICBmb3IgKGF1dG8mIHRyYWNrQnVmZmVyIDogbV90cmFja0J1 ZmZlck1hcC52YWx1ZXMoKSkgewogICAgICAgICAvLyBGaW5kIHRoZSBzYW1wbGUgd2hpY2ggY29u dGFpbnMgdGhlIHRhcmdldCB0aW1lIHRpbWUuCiAgICAgICAgIGF1dG8gZnV0dXJlU3luY1NhbXBs ZUl0ZXJhdG9yID0gdHJhY2tCdWZmZXIuc2FtcGxlcy5kZWNvZGVPcmRlcigpLmZpbmRTeW5jU2Ft cGxlQWZ0ZXJQcmVzZW50YXRpb25UaW1lKHRhcmdldFRpbWUsIHBvc2l0aXZlVGhyZXNob2xkKTsK ICAgICAgICAgYXV0byBwYXN0U3luY1NhbXBsZUl0ZXJhdG9yID0gdHJhY2tCdWZmZXIuc2FtcGxl cy5kZWNvZGVPcmRlcigpLmZpbmRTeW5jU2FtcGxlUHJpb3JUb1ByZXNlbnRhdGlvblRpbWUodGFy Z2V0VGltZSwgbmVnYXRpdmVUaHJlc2hvbGQpOwpAQCAtNTMyLDggKzUzMCw4IEBAIHZvaWQgU291 cmNlQnVmZmVyOjpzb3VyY2VCdWZmZXJQcml2YXRlQXBwZW5kQ29tcGxldGUoU291cmNlQnVmZmVy UHJpdmF0ZSosIEFwcGVuCiAKICAgICBpZiAobV9zb3VyY2UpCiAgICAgICAgIG1fc291cmNlLT5t b25pdG9yU291cmNlQnVmZmVycygpOwotICAgIGZvciAoYXV0byBpdGVyID0gbV90cmFja0J1ZmZl ck1hcC5iZWdpbigpLCBlbmQgPSBtX3RyYWNrQnVmZmVyTWFwLmVuZCgpOyBpdGVyICE9IGVuZDsg KytpdGVyKQotICAgICAgICBwcm92aWRlTWVkaWFEYXRhKGl0ZXItPnZhbHVlLCBpdGVyLT5rZXkp OworICAgIGZvciAoYXV0byYgdHJhY2tCdWZmZXJQYWlyIDogbV90cmFja0J1ZmZlck1hcCkKKyAg ICAgICAgcHJvdmlkZU1lZGlhRGF0YSh0cmFja0J1ZmZlclBhaXIudmFsdWUsIHRyYWNrQnVmZmVy UGFpci5rZXkpOwogCiAgICAgcmVwb3J0RXh0cmFNZW1vcnlDb3N0KCk7CiB9CkBAIC03NjEsOCAr NzU5LDggQEAgdm9pZCBTb3VyY2VCdWZmZXI6OnNvdXJjZUJ1ZmZlclByaXZhdGVEaWRSZWNlaXZl SW5pdGlhbGl6YXRpb25TZWdtZW50KFNvdXJjZUJ1ZmYKICAgICAgICAgLy8gTk9URTogVGhpcyBj aGVjayBpcyB0aGUgcmVzcG9uc2liaWxpdHkgb2YgdGhlIFNvdXJjZUJ1ZmZlclByaXZhdGUuCiAK ICAgICAgICAgLy8gNS4yIEZvciBlYWNoIGF1ZGlvIHRyYWNrIGluIHRoZSBpbml0aWFsaXphdGlv biBzZWdtZW50LCBydW4gZm9sbG93aW5nIHN0ZXBzOgotICAgICAgICBmb3IgKGF1dG8gaXQgPSBz ZWdtZW50LmF1ZGlvVHJhY2tzLmJlZ2luKCk7IGl0ICE9IHNlZ21lbnQuYXVkaW9UcmFja3MuZW5k KCk7ICsraXQpIHsKLSAgICAgICAgICAgIEF1ZGlvVHJhY2tQcml2YXRlKiBhdWRpb1RyYWNrUHJp dmF0ZSA9IGl0LT50cmFjay5nZXQoKTsKKyAgICAgICAgZm9yIChhdXRvJiBhdWRpb1RyYWNrSW5m byA6IHNlZ21lbnQuYXVkaW9UcmFja3MpIHsKKyAgICAgICAgICAgIEF1ZGlvVHJhY2tQcml2YXRl KiBhdWRpb1RyYWNrUHJpdmF0ZSA9IGF1ZGlvVHJhY2tJbmZvLnRyYWNrLmdldCgpOwogCiAgICAg ICAgICAgICAvLyA1LjIuMSBMZXQgbmV3IGF1ZGlvIHRyYWNrIGJlIGEgbmV3IEF1ZGlvVHJhY2sg b2JqZWN0LgogICAgICAgICAgICAgLy8gNS4yLjIgR2VuZXJhdGUgYSB1bmlxdWUgSUQgYW5kIGFz c2lnbiBpdCB0byB0aGUgaWQgcHJvcGVydHkgb24gbmV3IHZpZGVvIHRyYWNrLgpAQCAtNzk1LDE0 ICs3OTMsMTQgQEAgdm9pZCBTb3VyY2VCdWZmZXI6OnNvdXJjZUJ1ZmZlclByaXZhdGVEaWRSZWNl aXZlSW5pdGlhbGl6YXRpb25TZWdtZW50KFNvdXJjZUJ1ZmYKICAgICAgICAgICAgIFRyYWNrQnVm ZmVyJiB0cmFja0J1ZmZlciA9IG1fdHJhY2tCdWZmZXJNYXAuYWRkKG5ld0F1ZGlvVHJhY2stPmlk KCksIFRyYWNrQnVmZmVyKCkpLml0ZXJhdG9yLT52YWx1ZTsKIAogICAgICAgICAgICAgLy8gNS4y LjkgQWRkIHRoZSB0cmFjayBkZXNjcmlwdGlvbiBmb3IgdGhpcyB0cmFjayB0byB0aGUgdHJhY2sg YnVmZmVyLgotICAgICAgICAgICAgdHJhY2tCdWZmZXIuZGVzY3JpcHRpb24gPSBpdC0+ZGVzY3Jp cHRpb247CisgICAgICAgICAgICB0cmFja0J1ZmZlci5kZXNjcmlwdGlvbiA9IGF1ZGlvVHJhY2tJ bmZvLmRlc2NyaXB0aW9uOwogCiAgICAgICAgICAgICBtX2F1ZGlvQ29kZWNzLmFwcGVuZCh0cmFj a0J1ZmZlci5kZXNjcmlwdGlvbi0+Y29kZWMoKSk7CiAgICAgICAgIH0KIAogICAgICAgICAvLyA1 LjMgRm9yIGVhY2ggdmlkZW8gdHJhY2sgaW4gdGhlIGluaXRpYWxpemF0aW9uIHNlZ21lbnQsIHJ1 biBmb2xsb3dpbmcgc3RlcHM6Ci0gICAgICAgIGZvciAoYXV0byBpdCA9IHNlZ21lbnQudmlkZW9U cmFja3MuYmVnaW4oKTsgaXQgIT0gc2VnbWVudC52aWRlb1RyYWNrcy5lbmQoKTsgKytpdCkgewot ICAgICAgICAgICAgVmlkZW9UcmFja1ByaXZhdGUqIHZpZGVvVHJhY2tQcml2YXRlID0gaXQtPnRy YWNrLmdldCgpOworICAgICAgICBmb3IgKGF1dG8mIHZpZGVvVHJhY2tJbmZvIDogc2VnbWVudC52 aWRlb1RyYWNrcykgeworICAgICAgICAgICAgVmlkZW9UcmFja1ByaXZhdGUqIHZpZGVvVHJhY2tQ cml2YXRlID0gdmlkZW9UcmFja0luZm8udHJhY2suZ2V0KCk7CiAKICAgICAgICAgICAgIC8vIDUu My4xIExldCBuZXcgdmlkZW8gdHJhY2sgYmUgYSBuZXcgVmlkZW9UcmFjayBvYmplY3QuCiAgICAg ICAgICAgICAvLyA1LjMuMiBHZW5lcmF0ZSBhIHVuaXF1ZSBJRCBhbmQgYXNzaWduIGl0IHRvIHRo ZSBpZCBwcm9wZXJ0eSBvbiBuZXcgdmlkZW8gdHJhY2suCkBAIC04MzUsMTQgKzgzMywxNCBAQCB2 b2lkIFNvdXJjZUJ1ZmZlcjo6c291cmNlQnVmZmVyUHJpdmF0ZURpZFJlY2VpdmVJbml0aWFsaXph dGlvblNlZ21lbnQoU291cmNlQnVmZgogICAgICAgICAgICAgVHJhY2tCdWZmZXImIHRyYWNrQnVm ZmVyID0gbV90cmFja0J1ZmZlck1hcC5hZGQobmV3VmlkZW9UcmFjay0+aWQoKSwgVHJhY2tCdWZm ZXIoKSkuaXRlcmF0b3ItPnZhbHVlOwogCiAgICAgICAgICAgICAvLyA1LjMuOSBBZGQgdGhlIHRy YWNrIGRlc2NyaXB0aW9uIGZvciB0aGlzIHRyYWNrIHRvIHRoZSB0cmFjayBidWZmZXIuCi0gICAg ICAgICAgICB0cmFja0J1ZmZlci5kZXNjcmlwdGlvbiA9IGl0LT5kZXNjcmlwdGlvbjsKKyAgICAg ICAgICAgIHRyYWNrQnVmZmVyLmRlc2NyaXB0aW9uID0gdmlkZW9UcmFja0luZm8uZGVzY3JpcHRp b247CiAKICAgICAgICAgICAgIG1fdmlkZW9Db2RlY3MuYXBwZW5kKHRyYWNrQnVmZmVyLmRlc2Ny aXB0aW9uLT5jb2RlYygpKTsKICAgICAgICAgfQogCiAgICAgICAgIC8vIDUuNCBGb3IgZWFjaCB0 ZXh0IHRyYWNrIGluIHRoZSBpbml0aWFsaXphdGlvbiBzZWdtZW50LCBydW4gZm9sbG93aW5nIHN0 ZXBzOgotICAgICAgICBmb3IgKGF1dG8gaXQgPSBzZWdtZW50LnRleHRUcmFja3MuYmVnaW4oKTsg aXQgIT0gc2VnbWVudC50ZXh0VHJhY2tzLmVuZCgpOyArK2l0KSB7Ci0gICAgICAgICAgICBJbmJh bmRUZXh0VHJhY2tQcml2YXRlKiB0ZXh0VHJhY2tQcml2YXRlID0gaXQtPnRyYWNrLmdldCgpOwor ICAgICAgICBmb3IgKGF1dG8mIHRleHRUcmFja0luZm8gOiBzZWdtZW50LnRleHRUcmFja3MpIHsK KyAgICAgICAgICAgIEluYmFuZFRleHRUcmFja1ByaXZhdGUqIHRleHRUcmFja1ByaXZhdGUgPSB0 ZXh0VHJhY2tJbmZvLnRyYWNrLmdldCgpOwogCiAgICAgICAgICAgICAvLyA1LjQuMSBMZXQgbmV3 IHRleHQgdHJhY2sgYmUgYSBuZXcgVGV4dFRyYWNrIG9iamVjdCB3aXRoIGl0cyBwcm9wZXJ0aWVz IHBvcHVsYXRlZCB3aXRoIHRoZQogICAgICAgICAgICAgLy8gYXBwcm9wcmlhdGUgaW5mb3JtYXRp b24gZnJvbSB0aGUgaW5pdGlhbGl6YXRpb24gc2VnbWVudC4KQEAgLTg4OCw4ICs4ODYsOCBAQCB2 b2lkIFNvdXJjZUJ1ZmZlcjo6c291cmNlQnVmZmVyUHJpdmF0ZURpZFJlY2VpdmVJbml0aWFsaXph dGlvblNlZ21lbnQoU291cmNlQnVmZgogICAgIC8vIDYuIElmIHRoZSBIVE1MTWVkaWFFbGVtZW50 LnJlYWR5U3RhdGUgYXR0cmlidXRlIGlzIEhBVkVfTk9USElORywgdGhlbiBydW4gdGhlIGZvbGxv d2luZyBzdGVwczoKICAgICBpZiAobV9wcml2YXRlLT5yZWFkeVN0YXRlKCkgPT0gTWVkaWFQbGF5 ZXI6OkhhdmVOb3RoaW5nKSB7CiAgICAgICAgIC8vIDYuMSBJZiBvbmUgb3IgbW9yZSBvYmplY3Rz IGluIHNvdXJjZUJ1ZmZlcnMgaGF2ZSBmaXJzdCBpbml0aWFsaXphdGlvbiBzZWdtZW50IGZsYWcg c2V0IHRvIGZhbHNlLCB0aGVuIGFib3J0IHRoZXNlIHN0ZXBzLgotICAgICAgICBmb3IgKHVuc2ln bmVkIGxvbmcgaSA9IDA7IGkgPCBtX3NvdXJjZS0+c291cmNlQnVmZmVycygpLT5sZW5ndGgoKTsg KytpKSB7Ci0gICAgICAgICAgICBpZiAoIW1fc291cmNlLT5zb3VyY2VCdWZmZXJzKCktPml0ZW0o aSktPm1fcmVjZWl2ZWRGaXJzdEluaXRpYWxpemF0aW9uU2VnbWVudCkKKyAgICAgICAgZm9yIChh dXRvJiBzb3VyY2VCdWZmZXIgOiAqbV9zb3VyY2UtPnNvdXJjZUJ1ZmZlcnMoKSkgeworICAgICAg ICAgICAgaWYgKCFzb3VyY2VCdWZmZXItPm1fcmVjZWl2ZWRGaXJzdEluaXRpYWxpemF0aW9uU2Vn bWVudCkKICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KIApAQCAtOTE5LDQwICs5 MTcsNDAgQEAgYm9vbCBTb3VyY2VCdWZmZXI6OnZhbGlkYXRlSW5pdGlhbGl6YXRpb25TZWdtZW50 KGNvbnN0IEluaXRpYWxpemF0aW9uU2VnbWVudCYgc2UKICAgICAgICAgcmV0dXJuIGZhbHNlOwog CiAgICAgLy8gICAqIFRoZSBjb2RlY3MgZm9yIGVhY2ggdHJhY2ssIG1hdGNoIHdoYXQgd2FzIHNw ZWNpZmllZCBpbiB0aGUgZmlyc3QgaW5pdGlhbGl6YXRpb24gc2VnbWVudC4KLSAgICBmb3IgKGF1 dG8gaXQgPSBzZWdtZW50LmF1ZGlvVHJhY2tzLmJlZ2luKCk7IGl0ICE9IHNlZ21lbnQuYXVkaW9U cmFja3MuZW5kKCk7ICsraXQpIHsKLSAgICAgICAgaWYgKCFtX2F1ZGlvQ29kZWNzLmNvbnRhaW5z KGl0LT5kZXNjcmlwdGlvbi0+Y29kZWMoKSkpCisgICAgZm9yIChhdXRvJiBhdWRpb1RyYWNrSW5m byA6IHNlZ21lbnQuYXVkaW9UcmFja3MpIHsKKyAgICAgICAgaWYgKCFtX2F1ZGlvQ29kZWNzLmNv bnRhaW5zKGF1ZGlvVHJhY2tJbmZvLmRlc2NyaXB0aW9uLT5jb2RlYygpKSkKICAgICAgICAgICAg IHJldHVybiBmYWxzZTsKICAgICB9CiAKLSAgICBmb3IgKGF1dG8gaXQgPSBzZWdtZW50LnZpZGVv VHJhY2tzLmJlZ2luKCk7IGl0ICE9IHNlZ21lbnQudmlkZW9UcmFja3MuZW5kKCk7ICsraXQpIHsK LSAgICAgICAgaWYgKCFtX3ZpZGVvQ29kZWNzLmNvbnRhaW5zKGl0LT5kZXNjcmlwdGlvbi0+Y29k ZWMoKSkpCisgICAgZm9yIChhdXRvJiB2aWRlb1RyYWNrSW5mbyA6IHNlZ21lbnQudmlkZW9UcmFj a3MpIHsKKyAgICAgICAgaWYgKCFtX3ZpZGVvQ29kZWNzLmNvbnRhaW5zKHZpZGVvVHJhY2tJbmZv LmRlc2NyaXB0aW9uLT5jb2RlYygpKSkKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9 CiAKLSAgICBmb3IgKGF1dG8gaXQgPSBzZWdtZW50LnRleHRUcmFja3MuYmVnaW4oKTsgaXQgIT0g c2VnbWVudC50ZXh0VHJhY2tzLmVuZCgpOyArK2l0KSB7Ci0gICAgICAgIGlmICghbV90ZXh0Q29k ZWNzLmNvbnRhaW5zKGl0LT5kZXNjcmlwdGlvbi0+Y29kZWMoKSkpCisgICAgZm9yIChhdXRvJiB0 ZXh0VHJhY2tJbmZvIDogc2VnbWVudC50ZXh0VHJhY2tzKSB7CisgICAgICAgIGlmICghbV90ZXh0 Q29kZWNzLmNvbnRhaW5zKHRleHRUcmFja0luZm8uZGVzY3JpcHRpb24tPmNvZGVjKCkpKQogICAg ICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KIAogICAgIC8vICAgKiBJZiBtb3JlIHRoYW4g b25lIHRyYWNrIGZvciBhIHNpbmdsZSB0eXBlIGFyZSBwcmVzZW50IChpZSAyIGF1ZGlvIHRyYWNr cyksIHRoZW4gdGhlIFRyYWNrCiAgICAgLy8gICBJRHMgbWF0Y2ggdGhlIG9uZXMgaW4gdGhlIGZp cnN0IGluaXRpYWxpemF0aW9uIHNlZ21lbnQuCiAgICAgaWYgKHNlZ21lbnQuYXVkaW9UcmFja3Mu c2l6ZSgpID49IDIpIHsKLSAgICAgICAgZm9yIChhdXRvIGl0ID0gc2VnbWVudC5hdWRpb1RyYWNr cy5iZWdpbigpOyBpdCAhPSBzZWdtZW50LmF1ZGlvVHJhY2tzLmVuZCgpOyArK2l0KSB7Ci0gICAg ICAgICAgICBpZiAoIW1fdHJhY2tCdWZmZXJNYXAuY29udGFpbnMoaXQtPnRyYWNrLT5pZCgpKSkK KyAgICAgICAgZm9yIChhdXRvJiBhdWRpb1RyYWNrSW5mbyA6IHNlZ21lbnQuYXVkaW9UcmFja3Mp IHsKKyAgICAgICAgICAgIGlmICghbV90cmFja0J1ZmZlck1hcC5jb250YWlucyhhdWRpb1RyYWNr SW5mby50cmFjay0+aWQoKSkpCiAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAg ICB9CiAgICAgfQogCiAgICAgaWYgKHNlZ21lbnQudmlkZW9UcmFja3Muc2l6ZSgpID49IDIpIHsK LSAgICAgICAgZm9yIChhdXRvIGl0ID0gc2VnbWVudC52aWRlb1RyYWNrcy5iZWdpbigpOyBpdCAh PSBzZWdtZW50LnZpZGVvVHJhY2tzLmVuZCgpOyArK2l0KSB7Ci0gICAgICAgICAgICBpZiAoIW1f dHJhY2tCdWZmZXJNYXAuY29udGFpbnMoaXQtPnRyYWNrLT5pZCgpKSkKKyAgICAgICAgZm9yIChh dXRvJiB2aWRlb1RyYWNrSW5mbyA6IHNlZ21lbnQudmlkZW9UcmFja3MpIHsKKyAgICAgICAgICAg IGlmICghbV90cmFja0J1ZmZlck1hcC5jb250YWlucyh2aWRlb1RyYWNrSW5mby50cmFjay0+aWQo KSkpCiAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICB9CiAgICAgfQogCiAg ICAgaWYgKHNlZ21lbnQudGV4dFRyYWNrcy5zaXplKCkgPj0gMikgewotICAgICAgICBmb3IgKGF1 dG8gaXQgPSBzZWdtZW50LnZpZGVvVHJhY2tzLmJlZ2luKCk7IGl0ICE9IHNlZ21lbnQudmlkZW9U cmFja3MuZW5kKCk7ICsraXQpIHsKLSAgICAgICAgICAgIGlmICghbV90cmFja0J1ZmZlck1hcC5j b250YWlucyhpdC0+dHJhY2stPmlkKCkpKQorICAgICAgICBmb3IgKGF1dG8mIHRleHRUcmFja0lu Zm8gOiBzZWdtZW50LnZpZGVvVHJhY2tzKSB7CisgICAgICAgICAgICBpZiAoIW1fdHJhY2tCdWZm ZXJNYXAuY29udGFpbnModGV4dFRyYWNrSW5mby50cmFjay0+aWQoKSkpCiAgICAgICAgICAgICAg ICAgcmV0dXJuIGZhbHNlOwogICAgICAgICB9CiAgICAgfQpAQCAtMTA0NiwxNSArMTA0NCwxNSBA QCB2b2lkIFNvdXJjZUJ1ZmZlcjo6c291cmNlQnVmZmVyUHJpdmF0ZURpZFJlY2VpdmVTYW1wbGUo U291cmNlQnVmZmVyUHJpdmF0ZSosIFBhcwogICAgICAgICAgICAgLy8gU2V0IGdyb3VwIHN0YXJ0 IHRpbWVzdGFtcCBlcXVhbCB0byB0aGUgaGlnaGVzdCBwcmVzZW50YXRpb24gZW5kIHRpbWVzdGFt cC4KICAgICAgICAgICAgIC8vIEZJWE1FOiBBZGQgc3VwcG9ydCBmb3IgInNlcXVlbmNlIiBtb2Rl LgogCi0gICAgICAgICAgICBmb3IgKGF1dG8gaSA9IG1fdHJhY2tCdWZmZXJNYXAudmFsdWVzKCku YmVnaW4oKTsgaSAhPSBtX3RyYWNrQnVmZmVyTWFwLnZhbHVlcygpLmVuZCgpOyArK2kpIHsKKyAg ICAgICAgICAgIGZvciAoYXV0byYgdHJhY2tCdWZmZXIgOiBtX3RyYWNrQnVmZmVyTWFwLnZhbHVl cygpKSB7CiAgICAgICAgICAgICAgICAgLy8gMS43LjIgVW5zZXQgdGhlIGxhc3QgZGVjb2RlIHRp bWVzdGFtcCBvbiBhbGwgdHJhY2sgYnVmZmVycy4KLSAgICAgICAgICAgICAgICBpLT5sYXN0RGVj b2RlVGltZXN0YW1wID0gTWVkaWFUaW1lOjppbnZhbGlkVGltZSgpOworICAgICAgICAgICAgICAg IHRyYWNrQnVmZmVyLmxhc3REZWNvZGVUaW1lc3RhbXAgPSBNZWRpYVRpbWU6OmludmFsaWRUaW1l KCk7CiAgICAgICAgICAgICAgICAgLy8gMS43LjMgVW5zZXQgdGhlIGxhc3QgZnJhbWUgZHVyYXRp b24gb24gYWxsIHRyYWNrIGJ1ZmZlcnMuCi0gICAgICAgICAgICAgICAgaS0+bGFzdEZyYW1lRHVy YXRpb24gPSBNZWRpYVRpbWU6OmludmFsaWRUaW1lKCk7CisgICAgICAgICAgICAgICAgdHJhY2tC dWZmZXIubGFzdEZyYW1lRHVyYXRpb24gPSBNZWRpYVRpbWU6OmludmFsaWRUaW1lKCk7CiAgICAg ICAgICAgICAgICAgLy8gMS43LjQgVW5zZXQgdGhlIGhpZ2hlc3QgcHJlc2VudGF0aW9uIHRpbWVz dGFtcCBvbiBhbGwgdHJhY2sgYnVmZmVycy4KLSAgICAgICAgICAgICAgICBpLT5oaWdoZXN0UHJl c2VudGF0aW9uVGltZXN0YW1wID0gTWVkaWFUaW1lOjppbnZhbGlkVGltZSgpOworICAgICAgICAg ICAgICAgIHRyYWNrQnVmZmVyLmhpZ2hlc3RQcmVzZW50YXRpb25UaW1lc3RhbXAgPSBNZWRpYVRp bWU6OmludmFsaWRUaW1lKCk7CiAgICAgICAgICAgICAgICAgLy8gMS43LjUgU2V0IHRoZSBuZWVk IHJhbmRvbSBhY2Nlc3MgcG9pbnQgZmxhZyBvbiBhbGwgdHJhY2sgYnVmZmVycyB0byB0cnVlLgot ICAgICAgICAgICAgICAgIGktPm5lZWRSYW5kb21BY2Nlc3NGbGFnID0gdHJ1ZTsKKyAgICAgICAg ICAgICAgICB0cmFja0J1ZmZlci5uZWVkUmFuZG9tQWNjZXNzRmxhZyA9IHRydWU7CiAgICAgICAg ICAgICB9CiAKICAgICAgICAgICAgIC8vIDEuNy42IEp1bXAgdG8gdGhlIExvb3AgVG9wIHN0ZXAg YWJvdmUgdG8gcmVzdGFydCBwcm9jZXNzaW5nIG9mIHRoZSBjdXJyZW50IGNvZGVkIGZyYW1lLgpA QCAtMTE1NSwyNiArMTE1MywyNiBAQCB2b2lkIFNvdXJjZUJ1ZmZlcjo6c291cmNlQnVmZmVyUHJp dmF0ZURpZFJlY2VpdmVTYW1wbGUoU291cmNlQnVmZmVyUHJpdmF0ZSosIFBhcwogCiAgICAgICAg ICAgICAvLyBPdGhlcndpc2U6IFJlbW92ZSBhbGwgY29kZWQgZnJhbWVzIGJldHdlZW4gdGhlIGNv ZGVkIGZyYW1lcyByZW1vdmVkIGluIHRoZSBwcmV2aW91cyBzdGVwCiAgICAgICAgICAgICAvLyBh bmQgdGhlIG5leHQgcmFuZG9tIGFjY2VzcyBwb2ludCBhZnRlciB0aG9zZSByZW1vdmVkIGZyYW1l cy4KLSAgICAgICAgICAgIGZvciAoYXV0byBlcmFzZWRJdCA9IGVyYXNlZFNhbXBsZXMuYmVnaW4o KSwgZW5kID0gZXJhc2VkU2FtcGxlcy5lbmQoKTsgZXJhc2VkSXQgIT0gZW5kOyArK2VyYXNlZEl0 KSB7Ci0gICAgICAgICAgICAgICAgYXV0byBjdXJyZW50RGVjb2RlSXRlciA9IHRyYWNrQnVmZmVy LnNhbXBsZXMuZGVjb2RlT3JkZXIoKS5maW5kU2FtcGxlV2l0aERlY29kZVRpbWUoZXJhc2VkSXQt PnNlY29uZC0+ZGVjb2RlVGltZSgpKTsKKyAgICAgICAgICAgIGZvciAoYXV0byYgc2FtcGxlUGFp ciA6IGVyYXNlZFNhbXBsZXMpIHsKKyAgICAgICAgICAgICAgICBhdXRvIGN1cnJlbnREZWNvZGVJ dGVyID0gdHJhY2tCdWZmZXIuc2FtcGxlcy5kZWNvZGVPcmRlcigpLmZpbmRTYW1wbGVXaXRoRGVj b2RlVGltZShzYW1wbGVQYWlyLnNlY29uZC0+ZGVjb2RlVGltZSgpKTsKICAgICAgICAgICAgICAg ICBhdXRvIG5leHRTeW5jSXRlciA9IHRyYWNrQnVmZmVyLnNhbXBsZXMuZGVjb2RlT3JkZXIoKS5m aW5kU3luY1NhbXBsZUFmdGVyRGVjb2RlSXRlcmF0b3IoY3VycmVudERlY29kZUl0ZXIpOwogICAg ICAgICAgICAgICAgIGRlcGVuZGVudFNhbXBsZXMuaW5zZXJ0KGN1cnJlbnREZWNvZGVJdGVyLCBu ZXh0U3luY0l0ZXIpOwogICAgICAgICAgICAgfQogCiAKICAgICAgICAgICAgIFJlZlB0cjxUaW1l UmFuZ2VzPiBlcmFzZWRSYW5nZXMgPSBUaW1lUmFuZ2VzOjpjcmVhdGUoKTsKLSAgICAgICAgICAg IGZvciAoYXV0byBlcmFzZWRJdCA9IGVyYXNlZFNhbXBsZXMuYmVnaW4oKSwgZW5kID0gZXJhc2Vk U2FtcGxlcy5lbmQoKTsgZXJhc2VkSXQgIT0gZW5kOyArK2VyYXNlZEl0KSB7Ci0gICAgICAgICAg ICAgICAgTWVkaWFUaW1lIHN0YXJ0VGltZSA9IGVyYXNlZEl0LT5zZWNvbmQtPnByZXNlbnRhdGlv blRpbWUoKTsKLSAgICAgICAgICAgICAgICBNZWRpYVRpbWUgZW5kVGltZSA9IHN0YXJ0VGltZSAr IGVyYXNlZEl0LT5zZWNvbmQtPmR1cmF0aW9uKCkgKyBtaWNyb3NlY29uZDsKKyAgICAgICAgICAg IGZvciAoYXV0byYgc2FtcGxlUGFpciA6IGVyYXNlZFNhbXBsZXMpIHsKKyAgICAgICAgICAgICAg ICBNZWRpYVRpbWUgc3RhcnRUaW1lID0gc2FtcGxlUGFpci5zZWNvbmQtPnByZXNlbnRhdGlvblRp bWUoKTsKKyAgICAgICAgICAgICAgICBNZWRpYVRpbWUgZW5kVGltZSA9IHN0YXJ0VGltZSArIHNh bXBsZVBhaXIuc2Vjb25kLT5kdXJhdGlvbigpICsgbWljcm9zZWNvbmQ7CiAgICAgICAgICAgICAg ICAgZXJhc2VkUmFuZ2VzLT5hZGQoc3RhcnRUaW1lLnRvRG91YmxlKCksIGVuZFRpbWUudG9Eb3Vi bGUoKSk7Ci0gICAgICAgICAgICAgICAgdHJhY2tCdWZmZXIuc2FtcGxlcy5yZW1vdmVTYW1wbGUo ZXJhc2VkSXQtPnNlY29uZC5nZXQoKSk7CisgICAgICAgICAgICAgICAgdHJhY2tCdWZmZXIuc2Ft cGxlcy5yZW1vdmVTYW1wbGUoc2FtcGxlUGFpci5zZWNvbmQuZ2V0KCkpOwogICAgICAgICAgICAg fQogCi0gICAgICAgICAgICBmb3IgKGF1dG8gZGVwZW5kZW50SXQgPSBkZXBlbmRlbnRTYW1wbGVz LmJlZ2luKCksIGVuZCA9IGRlcGVuZGVudFNhbXBsZXMuZW5kKCk7IGRlcGVuZGVudEl0ICE9IGVu ZDsgKytkZXBlbmRlbnRJdCkgewotICAgICAgICAgICAgICAgIE1lZGlhVGltZSBzdGFydFRpbWUg PSBkZXBlbmRlbnRJdC0+c2Vjb25kLT5wcmVzZW50YXRpb25UaW1lKCk7Ci0gICAgICAgICAgICAg ICAgTWVkaWFUaW1lIGVuZFRpbWUgPSBzdGFydFRpbWUgKyBkZXBlbmRlbnRJdC0+c2Vjb25kLT5k dXJhdGlvbigpICsgbWljcm9zZWNvbmQ7CisgICAgICAgICAgICBmb3IgKGF1dG8mIHNhbXBsZVBh aXIgOiBkZXBlbmRlbnRTYW1wbGVzKSB7CisgICAgICAgICAgICAgICAgTWVkaWFUaW1lIHN0YXJ0 VGltZSA9IHNhbXBsZVBhaXIuc2Vjb25kLT5wcmVzZW50YXRpb25UaW1lKCk7CisgICAgICAgICAg ICAgICAgTWVkaWFUaW1lIGVuZFRpbWUgPSBzdGFydFRpbWUgKyBzYW1wbGVQYWlyLnNlY29uZC0+ ZHVyYXRpb24oKSArIG1pY3Jvc2Vjb25kOwogICAgICAgICAgICAgICAgIGVyYXNlZFJhbmdlcy0+ YWRkKHN0YXJ0VGltZS50b0RvdWJsZSgpLCBlbmRUaW1lLnRvRG91YmxlKCkpOwotICAgICAgICAg ICAgICAgIHRyYWNrQnVmZmVyLnNhbXBsZXMucmVtb3ZlU2FtcGxlKGRlcGVuZGVudEl0LT5zZWNv bmQuZ2V0KCkpOworICAgICAgICAgICAgICAgIHRyYWNrQnVmZmVyLnNhbXBsZXMucmVtb3ZlU2Ft cGxlKHNhbXBsZVBhaXIuc2Vjb25kLmdldCgpKTsKICAgICAgICAgICAgIH0KIAogICAgICAgICAg ICAgZXJhc2VkUmFuZ2VzLT5pbnZlcnQoKTsK