109410 2013-02-11 01:31:49 -0800 Move WebVTTToken off of MarkupTokenBase 2013-02-11 10:43:35 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 107522 1 eric eric abarth dgorbik eric.carlson ojan.autocc tonyg webkit.review.bot oldest_to_newest 829496 0 eric 2013-02-11 01:31:49 -0800 Move WebVTTToken off of MarkupTokenBase 829497 1 187525 eric 2013-02-11 01:33:28 -0800 Created attachment 187525 Patch 829498 2 eric 2013-02-11 01:34:58 -0800 After this lands, MarkupTokenBase will only be used by HTMLToken and thus can just be moved into HTMLToken. 829505 3 187527 eric 2013-02-11 01:43:05 -0800 Created attachment 187527 Patch 829805 4 187527 tonyg 2013-02-11 09:48:11 -0800 Comment on attachment 187527 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=187527&action=review > Source/WebCore/html/track/WebVTTToken.h:70 > + return m_data; Do we need to ASSERT the type is start or end tag here? 829808 5 187527 eric 2013-02-11 09:51:20 -0800 Comment on attachment 187527 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=187527&action=review >> Source/WebCore/html/track/WebVTTToken.h:70 >> + return m_data; > > Do we need to ASSERT the type is start or end tag here? The old impl didn't, so I'm inclined to leave it off for now. The goal was to maintain compat with the previous impl (while removing the dead code). 829811 6 tonyg 2013-02-11 09:52:17 -0800 (In reply to comment #5) > (From update of attachment 187527 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=187527&action=review > > >> Source/WebCore/html/track/WebVTTToken.h:70 > >> + return m_data; > > > > Do we need to ASSERT the type is start or end tag here? > > The old impl didn't, so I'm inclined to leave it off for now. The goal was to maintain compat with the previous impl (while removing the dead code). OK 829814 7 187527 webkit.review.bot 2013-02-11 09:56:32 -0800 Comment on attachment 187527 Patch Clearing flags on attachment: 187527 Committed r142484: <http://trac.webkit.org/changeset/142484> 829815 8 webkit.review.bot 2013-02-11 09:56:35 -0800 All reviewed patches have been landed. Closing bug. 829872 9 187527 abarth 2013-02-11 10:43:35 -0800 Comment on attachment 187527 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=187527&action=review > Source/WebCore/html/track/WebVTTToken.h:206 > + DataVector m_data; > DataVector m_annotation; > DataVector m_classes; > DataVector m_currentBuffer; Wow that's a lot of storage! 187525 2013-02-11 01:33:28 -0800 2013-02-11 01:43:02 -0800 Patch bug-109410-20130211013016.patch text/plain 5025 eric U3VidmVyc2lvbiBSZXZpc2lvbjogMTQyNDI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2U3NzcwZGQ2NTE0ZTY3 NzRhMDViOTUwZDQzZmE2NzE0ZGI3NzVmZS4uMjI4MDk0MjRiZjAyYzI1MDUzZmFjYjRhZmIzYmYz ODM5NmEyZTNiZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDEzLTAyLTExICBFcmlj IFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KKworICAgICAgICBNb3ZlIFdlYlZUVFRva2VuIG9m ZiBvZiBNYXJrdXBUb2tlbkJhc2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEwOTQxMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFRoaXMgaW50cm9kdWNlcyBhIHNtYWxsIGFtb3VudCBvZiAiY29weS9wYXN0 ZSIgY29kZQorICAgICAgICBidXQgYWN0dWFsbHkgbWFrZXMgV2ViVlRUVG9rZW4gbXVjaCBzbWFs bGVyIGFuZCBzaW1wbGVyIQorICAgICAgICBUaGlzIGFsc28gZnJlZXMgdGhlIEhUTUxQYXJzZXIg dG8gaGF2ZSBpdHMgVG9rZW4gY2xhc3MKKyAgICAgICAgYmFjayB0byBpdHNlbGYgc28gd2UgY2Fu IHR1bmUgaXQgdG8gbWFrZSBIVE1MIGZhc3Rlci4KKworICAgICAgICAqIGh0bWwvdHJhY2svV2Vi VlRUVG9rZW4uaDoKKyAgICAgICAgKFdlYlZUVFRva2VuKToKKyAgICAgICAgKFdlYkNvcmU6Oldl YlZUVFRva2VuOjpXZWJWVFRUb2tlbik6CisgICAgICAgIChXZWJDb3JlOjpXZWJWVFRUb2tlbjo6 YXBwZW5kVG9OYW1lKToKKyAgICAgICAgKFdlYkNvcmU6OldlYlZUVFRva2VuOjp0eXBlKToKKyAg ICAgICAgKFdlYkNvcmU6OldlYlZUVFRva2VuOjpuYW1lKToKKyAgICAgICAgKFdlYkNvcmU6Oldl YlZUVFRva2VuOjplbnN1cmVJc0NoYXJhY3RlclRva2VuKToKKyAgICAgICAgKFdlYkNvcmU6Oldl YlZUVFRva2VuOjphcHBlbmRUb0NoYXJhY3Rlcik6CisgICAgICAgIChXZWJDb3JlOjpXZWJWVFRU b2tlbjo6YmVnaW5FbXB0eVN0YXJ0VGFnKToKKyAgICAgICAgKFdlYkNvcmU6OldlYlZUVFRva2Vu OjpiZWdpblN0YXJ0VGFnKToKKyAgICAgICAgKFdlYkNvcmU6OldlYlZUVFRva2VuOjpiZWdpbkVu ZFRhZyk6CisgICAgICAgIChXZWJDb3JlOjpXZWJWVFRUb2tlbjo6YmVnaW5UaW1lc3RhbXBUYWcp OgorICAgICAgICAoV2ViQ29yZTo6V2ViVlRUVG9rZW46Om1ha2VFbmRPZkZpbGUpOgorICAgICAg ICAoV2ViQ29yZTo6V2ViVlRUVG9rZW46OmNsZWFyKToKKwogMjAxMy0wMi0xMCAgRXJpYyBTZWlk ZWwgIDxlcmljQHdlYmtpdC5vcmc+CiAKICAgICAgICAgTWFrZSB0aGUgZXhpc3RpbmcgSFRNTFBy ZWxvYWRTY2FubmVyIHRocmVhZGluZy1hd2FyZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aHRtbC90cmFjay9XZWJWVFRUb2tlbi5oIGIvU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9XZWJW VFRUb2tlbi5oCmluZGV4IDU4NjhmY2ViM2JiMTk2YTMzZmM2ZGUyYTkzMjBiNDMyNmJkN2QxYTAu LjQ3NWY5MjBlOTZjMGU1M2VhM2FhNTE1MjdhZjAzYWMxZDQwNTk0ZGMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svV2ViVlRUVG9rZW4uaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9odG1sL3RyYWNrL1dlYlZUVFRva2VuLmgKQEAgLTQ5LDQwICs0OSw4OCBAQCBwdWJsaWM6CiAg ICAgfTsKIH07CiAKLWNsYXNzIFdlYlZUVFRva2VuIDogcHVibGljIE1hcmt1cFRva2VuQmFzZTxX ZWJWVFRUb2tlblR5cGVzPiB7CitjbGFzcyBXZWJWVFRUb2tlbiB7CisgICAgV1RGX01BS0VfTk9O Q09QWUFCTEUoV2ViVlRUVG9rZW4pOworICAgIFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVEOwogcHVi bGljOgorICAgIHR5cGVkZWYgV2ViVlRUVG9rZW5UeXBlcyBUeXBlOworICAgIHR5cGVkZWYgV1RG OjpWZWN0b3I8VUNoYXIsIDEwMjQ+IERhdGFWZWN0b3I7IC8vIEZJWE1FOiBJcyB0aGlzIHRvbyBs YXJnZSBmb3IgV2ViVlRUPworCisgICAgV2ViVlRUVG9rZW4oKSB7IGNsZWFyKCk7IH0KKwogICAg IHZvaWQgYXBwZW5kVG9OYW1lKFVDaGFyIGNoYXJhY3RlcikKICAgICB7CiAgICAgICAgIEFTU0VS VChtX3R5cGUgPT0gV2ViVlRUVG9rZW5UeXBlczo6U3RhcnRUYWcgfHwgbV90eXBlID09IFdlYlZU VFRva2VuVHlwZXM6OkVuZFRhZyk7Ci0gICAgICAgIE1hcmt1cFRva2VuQmFzZTxXZWJWVFRUb2tl blR5cGVzPjo6YXBwZW5kVG9OYW1lKGNoYXJhY3Rlcik7CisgICAgICAgIEFTU0VSVChjaGFyYWN0 ZXIpOworICAgICAgICBtX2RhdGEuYXBwZW5kKGNoYXJhY3Rlcik7CiAgICAgfQotICAgIAorCisg ICAgVHlwZTo6VHlwZSB0eXBlKCkgY29uc3QgeyByZXR1cm4gbV90eXBlOyB9CisKICAgICBjb25z dCBEYXRhVmVjdG9yJiBuYW1lKCkgY29uc3QKICAgICB7Ci0gICAgICAgIHJldHVybiBNYXJrdXBU b2tlbkJhc2U8V2ViVlRUVG9rZW5UeXBlcz46Om5hbWUoKTsKKyAgICAgICAgcmV0dXJuIG1fZGF0 YTsKICAgICB9Ci0gICAgCisKICAgICBjb25zdCBEYXRhVmVjdG9yJiBjaGFyYWN0ZXJzKCkgY29u c3QKICAgICB7CiAgICAgICAgIEFTU0VSVChtX3R5cGUgPT0gVHlwZTo6Q2hhcmFjdGVyIHx8IG1f dHlwZSA9PSBUeXBlOjpUaW1lc3RhbXBUYWcpOwogICAgICAgICByZXR1cm4gbV9kYXRhOwogICAg IH0KLSAgICAKKworICAgIC8vIFN0YXJ0aW5nIGEgY2hhcmFjdGVyIHRva2VuIHdvcmtzIHNsaWdo dGx5IGRpZmZlcmVudGx5IHRoYW4gc3RhcnRpbmcKKyAgICAvLyBvdGhlciB0eXBlcyBvZiB0b2tl bnMgYmVjYXVzZSB3ZSB3YW50IHRvIHNhdmUgYSBwZXItY2hhcmFjdGVyIGJyYW5jaC4KKyAgICB2 b2lkIGVuc3VyZUlzQ2hhcmFjdGVyVG9rZW4oKQorICAgIHsKKyAgICAgICAgQVNTRVJUKG1fdHlw ZSA9PSBUeXBlOjpVbmluaXRpYWxpemVkIHx8IG1fdHlwZSA9PSBUeXBlOjpDaGFyYWN0ZXIpOwor ICAgICAgICBtX3R5cGUgPSBUeXBlOjpDaGFyYWN0ZXI7CisgICAgfQorCisgICAgdm9pZCBhcHBl bmRUb0NoYXJhY3RlcihjaGFyIGNoYXJhY3RlcikKKyAgICB7CisgICAgICAgIEFTU0VSVChtX3R5 cGUgPT0gVHlwZTo6Q2hhcmFjdGVyKTsKKyAgICAgICAgbV9kYXRhLmFwcGVuZChjaGFyYWN0ZXIp OworICAgIH0KKworICAgIHZvaWQgYXBwZW5kVG9DaGFyYWN0ZXIoVUNoYXIgY2hhcmFjdGVyKQor ICAgIHsKKyAgICAgICAgQVNTRVJUKG1fdHlwZSA9PSBUeXBlOjpDaGFyYWN0ZXIpOworICAgICAg ICBtX2RhdGEuYXBwZW5kKGNoYXJhY3Rlcik7CisgICAgfQorCisgICAgdm9pZCBhcHBlbmRUb0No YXJhY3Rlcihjb25zdCBWZWN0b3I8TENoYXIsIDMyPiYgY2hhcmFjdGVycykKKyAgICB7CisgICAg ICAgIEFTU0VSVChtX3R5cGUgPT0gVHlwZTo6Q2hhcmFjdGVyKTsKKyAgICAgICAgbV9kYXRhLmFw cGVuZFZlY3RvcihjaGFyYWN0ZXJzKTsKKyAgICB9CisKICAgICB2b2lkIGJlZ2luRW1wdHlTdGFy dFRhZygpCiAgICAgewogICAgICAgICBBU1NFUlQobV90eXBlID09IFR5cGU6OlVuaW5pdGlhbGl6 ZWQpOwogICAgICAgICBtX3R5cGUgPSBUeXBlOjpTdGFydFRhZzsKLSAgICAgICAgbV9jdXJyZW50 QXR0cmlidXRlID0gMDsKLSAgICAgICAgbV9hdHRyaWJ1dGVzLmNsZWFyKCk7CiAgICAgICAgIG1f ZGF0YS5jbGVhcigpOwogICAgIH0KICAKKyAgICB2b2lkIGJlZ2luU3RhcnRUYWcoVUNoYXIgY2hh cmFjdGVyKQorICAgIHsKKyAgICAgICAgQVNTRVJUKGNoYXJhY3Rlcik7CisgICAgICAgIEFTU0VS VChtX3R5cGUgPT0gVHlwZTo6VW5pbml0aWFsaXplZCk7CisgICAgICAgIG1fdHlwZSA9IFR5cGU6 OlN0YXJ0VGFnOworICAgICAgICBtX2RhdGEuYXBwZW5kKGNoYXJhY3Rlcik7CisgICAgfQorCisg ICAgdm9pZCBiZWdpbkVuZFRhZyhMQ2hhciBjaGFyYWN0ZXIpCisgICAgeworICAgICAgICBBU1NF UlQobV90eXBlID09IFR5cGU6OlVuaW5pdGlhbGl6ZWQpOworICAgICAgICBtX3R5cGUgPSBUeXBl OjpFbmRUYWc7CisgICAgICAgIG1fZGF0YS5hcHBlbmQoY2hhcmFjdGVyKTsKKyAgICB9CisKICAg ICB2b2lkIGJlZ2luVGltZXN0YW1wVGFnKFVDaGFyIGNoYXJhY3RlcikKICAgICB7CiAgICAgICAg IEFTU0VSVChjaGFyYWN0ZXIpOwogICAgICAgICBBU1NFUlQobV90eXBlID09IFR5cGU6OlVuaW5p dGlhbGl6ZWQpOwogICAgICAgICBtX3R5cGUgPSBUeXBlOjpUaW1lc3RhbXBUYWc7Ci0gICAgICAg IG1fc2VsZkNsb3NpbmcgPSB0cnVlOwogICAgICAgICBtX2RhdGEuYXBwZW5kKGNoYXJhY3Rlcik7 CiAgICAgfQogICAgIApAQCAtMTI5LDEzICsxNzcsMjAgQEAgcHVibGljOgogICAgIHsKICAgICAg ICAgcmV0dXJuIG1fYW5ub3RhdGlvbjsKICAgICB9CisKKyAgICB2b2lkIG1ha2VFbmRPZkZpbGUo KQorICAgIHsKKyAgICAgICAgQVNTRVJUKG1fdHlwZSA9PSBUeXBlOjpVbmluaXRpYWxpemVkKTsK KyAgICAgICAgbV90eXBlID0gVHlwZTo6RW5kT2ZGaWxlOworICAgIH0KICAgICAKICAgICB2b2lk IGNsZWFyKCkKICAgICB7CisgICAgICAgIG1fdHlwZSA9IFR5cGU6OlVuaW5pdGlhbGl6ZWQ7Cisg ICAgICAgIG1fZGF0YS5jbGVhcigpOwogICAgICAgICBtX2Fubm90YXRpb24uY2xlYXIoKTsKICAg ICAgICAgbV9jbGFzc2VzLmNsZWFyKCk7CiAgICAgICAgIG1fY3VycmVudEJ1ZmZlci5jbGVhcigp OwotICAgICAgICBNYXJrdXBUb2tlbkJhc2U8V2ViVlRUVG9rZW5UeXBlcz46OmNsZWFyKCk7CiAg ICAgfQogCiBwcml2YXRlOgpAQCAtMTQ2LDYgKzIwMSw4IEBAIHByaXZhdGU6CiAgICAgICAgIG1f Y3VycmVudEJ1ZmZlci5hcHBlbmQoY2hhcmFjdGVyKTsKICAgICB9CiAKKyAgICBUeXBlOjpUeXBl IG1fdHlwZTsKKyAgICBEYXRhVmVjdG9yIG1fZGF0YTsKICAgICBEYXRhVmVjdG9yIG1fYW5ub3Rh dGlvbjsKICAgICBEYXRhVmVjdG9yIG1fY2xhc3NlczsKICAgICBEYXRhVmVjdG9yIG1fY3VycmVu dEJ1ZmZlcjsK 187527 2013-02-11 01:43:05 -0800 2013-02-11 10:43:35 -0800 Patch bug-109410-20130211013954.patch text/plain 5153 eric U3VidmVyc2lvbiBSZXZpc2lvbjogMTQyNDI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2U3NzcwZGQ2NTE0ZTY3 NzRhMDViOTUwZDQzZmE2NzE0ZGI3NzVmZS4uMjI4MDk0MjRiZjAyYzI1MDUzZmFjYjRhZmIzYmYz ODM5NmEyZTNiZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDEzLTAyLTExICBFcmlj IFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KKworICAgICAgICBNb3ZlIFdlYlZUVFRva2VuIG9m ZiBvZiBNYXJrdXBUb2tlbkJhc2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEwOTQxMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFRoaXMgaW50cm9kdWNlcyBhIHNtYWxsIGFtb3VudCBvZiAiY29weS9wYXN0 ZSIgY29kZQorICAgICAgICBidXQgYWN0dWFsbHkgbWFrZXMgV2ViVlRUVG9rZW4gbXVjaCBzbWFs bGVyIGFuZCBzaW1wbGVyIQorICAgICAgICBUaGlzIGFsc28gZnJlZXMgdGhlIEhUTUxQYXJzZXIg dG8gaGF2ZSBpdHMgVG9rZW4gY2xhc3MKKyAgICAgICAgYmFjayB0byBpdHNlbGYgc28gd2UgY2Fu IHR1bmUgaXQgdG8gbWFrZSBIVE1MIGZhc3Rlci4KKworICAgICAgICAqIGh0bWwvdHJhY2svV2Vi VlRUVG9rZW4uaDoKKyAgICAgICAgKFdlYlZUVFRva2VuKToKKyAgICAgICAgKFdlYkNvcmU6Oldl YlZUVFRva2VuOjpXZWJWVFRUb2tlbik6CisgICAgICAgIChXZWJDb3JlOjpXZWJWVFRUb2tlbjo6 YXBwZW5kVG9OYW1lKToKKyAgICAgICAgKFdlYkNvcmU6OldlYlZUVFRva2VuOjp0eXBlKToKKyAg ICAgICAgKFdlYkNvcmU6OldlYlZUVFRva2VuOjpuYW1lKToKKyAgICAgICAgKFdlYkNvcmU6Oldl YlZUVFRva2VuOjplbnN1cmVJc0NoYXJhY3RlclRva2VuKToKKyAgICAgICAgKFdlYkNvcmU6Oldl YlZUVFRva2VuOjphcHBlbmRUb0NoYXJhY3Rlcik6CisgICAgICAgIChXZWJDb3JlOjpXZWJWVFRU b2tlbjo6YmVnaW5FbXB0eVN0YXJ0VGFnKToKKyAgICAgICAgKFdlYkNvcmU6OldlYlZUVFRva2Vu OjpiZWdpblN0YXJ0VGFnKToKKyAgICAgICAgKFdlYkNvcmU6OldlYlZUVFRva2VuOjpiZWdpbkVu ZFRhZyk6CisgICAgICAgIChXZWJDb3JlOjpXZWJWVFRUb2tlbjo6YmVnaW5UaW1lc3RhbXBUYWcp OgorICAgICAgICAoV2ViQ29yZTo6V2ViVlRUVG9rZW46Om1ha2VFbmRPZkZpbGUpOgorICAgICAg ICAoV2ViQ29yZTo6V2ViVlRUVG9rZW46OmNsZWFyKToKKwogMjAxMy0wMi0xMCAgRXJpYyBTZWlk ZWwgIDxlcmljQHdlYmtpdC5vcmc+CiAKICAgICAgICAgTWFrZSB0aGUgZXhpc3RpbmcgSFRNTFBy ZWxvYWRTY2FubmVyIHRocmVhZGluZy1hd2FyZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aHRtbC90cmFjay9XZWJWVFRUb2tlbi5oIGIvU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9XZWJW VFRUb2tlbi5oCmluZGV4IDU4NjhmY2ViM2JiMTk2YTMzZmM2ZGUyYTkzMjBiNDMyNmJkN2QxYTAu LjdmNmY4NmYzMzk3YjEwMGY1MzljY2JhNWJlZjE5MzFjMDZlNDg5NDcgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svV2ViVlRUVG9rZW4uaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9odG1sL3RyYWNrL1dlYlZUVFRva2VuLmgKQEAgLTMzLDggKzMzLDYgQEAKIAogI2lmIEVOQUJM RShWSURFT19UUkFDSykKIAotI2luY2x1ZGUgIk1hcmt1cFRva2VuQmFzZS5oIgotCiBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiAKIGNsYXNzIFdlYlZUVFRva2VuVHlwZXMgewpAQCAtNDksNDAgKzQ3LDg4 IEBAIHB1YmxpYzoKICAgICB9OwogfTsKIAotY2xhc3MgV2ViVlRUVG9rZW4gOiBwdWJsaWMgTWFy a3VwVG9rZW5CYXNlPFdlYlZUVFRva2VuVHlwZXM+IHsKK2NsYXNzIFdlYlZUVFRva2VuIHsKKyAg ICBXVEZfTUFLRV9OT05DT1BZQUJMRShXZWJWVFRUb2tlbik7CisgICAgV1RGX01BS0VfRkFTVF9B TExPQ0FURUQ7CiBwdWJsaWM6CisgICAgdHlwZWRlZiBXZWJWVFRUb2tlblR5cGVzIFR5cGU7Cisg ICAgdHlwZWRlZiBXVEY6OlZlY3RvcjxVQ2hhciwgMTAyND4gRGF0YVZlY3RvcjsgLy8gRklYTUU6 IElzIHRoaXMgdG9vIGxhcmdlIGZvciBXZWJWVFQ/CisKKyAgICBXZWJWVFRUb2tlbigpIHsgY2xl YXIoKTsgfQorCiAgICAgdm9pZCBhcHBlbmRUb05hbWUoVUNoYXIgY2hhcmFjdGVyKQogICAgIHsK ICAgICAgICAgQVNTRVJUKG1fdHlwZSA9PSBXZWJWVFRUb2tlblR5cGVzOjpTdGFydFRhZyB8fCBt X3R5cGUgPT0gV2ViVlRUVG9rZW5UeXBlczo6RW5kVGFnKTsKLSAgICAgICAgTWFya3VwVG9rZW5C YXNlPFdlYlZUVFRva2VuVHlwZXM+OjphcHBlbmRUb05hbWUoY2hhcmFjdGVyKTsKKyAgICAgICAg QVNTRVJUKGNoYXJhY3Rlcik7CisgICAgICAgIG1fZGF0YS5hcHBlbmQoY2hhcmFjdGVyKTsKICAg ICB9Ci0gICAgCisKKyAgICBUeXBlOjpUeXBlIHR5cGUoKSBjb25zdCB7IHJldHVybiBtX3R5cGU7 IH0KKwogICAgIGNvbnN0IERhdGFWZWN0b3ImIG5hbWUoKSBjb25zdAogICAgIHsKLSAgICAgICAg cmV0dXJuIE1hcmt1cFRva2VuQmFzZTxXZWJWVFRUb2tlblR5cGVzPjo6bmFtZSgpOworICAgICAg ICByZXR1cm4gbV9kYXRhOwogICAgIH0KLSAgICAKKwogICAgIGNvbnN0IERhdGFWZWN0b3ImIGNo YXJhY3RlcnMoKSBjb25zdAogICAgIHsKICAgICAgICAgQVNTRVJUKG1fdHlwZSA9PSBUeXBlOjpD aGFyYWN0ZXIgfHwgbV90eXBlID09IFR5cGU6OlRpbWVzdGFtcFRhZyk7CiAgICAgICAgIHJldHVy biBtX2RhdGE7CiAgICAgfQotICAgIAorCisgICAgLy8gU3RhcnRpbmcgYSBjaGFyYWN0ZXIgdG9r ZW4gd29ya3Mgc2xpZ2h0bHkgZGlmZmVyZW50bHkgdGhhbiBzdGFydGluZworICAgIC8vIG90aGVy IHR5cGVzIG9mIHRva2VucyBiZWNhdXNlIHdlIHdhbnQgdG8gc2F2ZSBhIHBlci1jaGFyYWN0ZXIg YnJhbmNoLgorICAgIHZvaWQgZW5zdXJlSXNDaGFyYWN0ZXJUb2tlbigpCisgICAgeworICAgICAg ICBBU1NFUlQobV90eXBlID09IFR5cGU6OlVuaW5pdGlhbGl6ZWQgfHwgbV90eXBlID09IFR5cGU6 OkNoYXJhY3Rlcik7CisgICAgICAgIG1fdHlwZSA9IFR5cGU6OkNoYXJhY3RlcjsKKyAgICB9CisK KyAgICB2b2lkIGFwcGVuZFRvQ2hhcmFjdGVyKGNoYXIgY2hhcmFjdGVyKQorICAgIHsKKyAgICAg ICAgQVNTRVJUKG1fdHlwZSA9PSBUeXBlOjpDaGFyYWN0ZXIpOworICAgICAgICBtX2RhdGEuYXBw ZW5kKGNoYXJhY3Rlcik7CisgICAgfQorCisgICAgdm9pZCBhcHBlbmRUb0NoYXJhY3RlcihVQ2hh ciBjaGFyYWN0ZXIpCisgICAgeworICAgICAgICBBU1NFUlQobV90eXBlID09IFR5cGU6OkNoYXJh Y3Rlcik7CisgICAgICAgIG1fZGF0YS5hcHBlbmQoY2hhcmFjdGVyKTsKKyAgICB9CisKKyAgICB2 b2lkIGFwcGVuZFRvQ2hhcmFjdGVyKGNvbnN0IFZlY3RvcjxMQ2hhciwgMzI+JiBjaGFyYWN0ZXJz KQorICAgIHsKKyAgICAgICAgQVNTRVJUKG1fdHlwZSA9PSBUeXBlOjpDaGFyYWN0ZXIpOworICAg ICAgICBtX2RhdGEuYXBwZW5kVmVjdG9yKGNoYXJhY3RlcnMpOworICAgIH0KKwogICAgIHZvaWQg YmVnaW5FbXB0eVN0YXJ0VGFnKCkKICAgICB7CiAgICAgICAgIEFTU0VSVChtX3R5cGUgPT0gVHlw ZTo6VW5pbml0aWFsaXplZCk7CiAgICAgICAgIG1fdHlwZSA9IFR5cGU6OlN0YXJ0VGFnOwotICAg ICAgICBtX2N1cnJlbnRBdHRyaWJ1dGUgPSAwOwotICAgICAgICBtX2F0dHJpYnV0ZXMuY2xlYXIo KTsKICAgICAgICAgbV9kYXRhLmNsZWFyKCk7CiAgICAgfQogIAorICAgIHZvaWQgYmVnaW5TdGFy dFRhZyhVQ2hhciBjaGFyYWN0ZXIpCisgICAgeworICAgICAgICBBU1NFUlQoY2hhcmFjdGVyKTsK KyAgICAgICAgQVNTRVJUKG1fdHlwZSA9PSBUeXBlOjpVbmluaXRpYWxpemVkKTsKKyAgICAgICAg bV90eXBlID0gVHlwZTo6U3RhcnRUYWc7CisgICAgICAgIG1fZGF0YS5hcHBlbmQoY2hhcmFjdGVy KTsKKyAgICB9CisKKyAgICB2b2lkIGJlZ2luRW5kVGFnKExDaGFyIGNoYXJhY3RlcikKKyAgICB7 CisgICAgICAgIEFTU0VSVChtX3R5cGUgPT0gVHlwZTo6VW5pbml0aWFsaXplZCk7CisgICAgICAg IG1fdHlwZSA9IFR5cGU6OkVuZFRhZzsKKyAgICAgICAgbV9kYXRhLmFwcGVuZChjaGFyYWN0ZXIp OworICAgIH0KKwogICAgIHZvaWQgYmVnaW5UaW1lc3RhbXBUYWcoVUNoYXIgY2hhcmFjdGVyKQog ICAgIHsKICAgICAgICAgQVNTRVJUKGNoYXJhY3Rlcik7CiAgICAgICAgIEFTU0VSVChtX3R5cGUg PT0gVHlwZTo6VW5pbml0aWFsaXplZCk7CiAgICAgICAgIG1fdHlwZSA9IFR5cGU6OlRpbWVzdGFt cFRhZzsKLSAgICAgICAgbV9zZWxmQ2xvc2luZyA9IHRydWU7CiAgICAgICAgIG1fZGF0YS5hcHBl bmQoY2hhcmFjdGVyKTsKICAgICB9CiAgICAgCkBAIC0xMjksMTMgKzE3NSwyMCBAQCBwdWJsaWM6 CiAgICAgewogICAgICAgICByZXR1cm4gbV9hbm5vdGF0aW9uOwogICAgIH0KKworICAgIHZvaWQg bWFrZUVuZE9mRmlsZSgpCisgICAgeworICAgICAgICBBU1NFUlQobV90eXBlID09IFR5cGU6OlVu aW5pdGlhbGl6ZWQpOworICAgICAgICBtX3R5cGUgPSBUeXBlOjpFbmRPZkZpbGU7CisgICAgfQog ICAgIAogICAgIHZvaWQgY2xlYXIoKQogICAgIHsKKyAgICAgICAgbV90eXBlID0gVHlwZTo6VW5p bml0aWFsaXplZDsKKyAgICAgICAgbV9kYXRhLmNsZWFyKCk7CiAgICAgICAgIG1fYW5ub3RhdGlv bi5jbGVhcigpOwogICAgICAgICBtX2NsYXNzZXMuY2xlYXIoKTsKICAgICAgICAgbV9jdXJyZW50 QnVmZmVyLmNsZWFyKCk7Ci0gICAgICAgIE1hcmt1cFRva2VuQmFzZTxXZWJWVFRUb2tlblR5cGVz Pjo6Y2xlYXIoKTsKICAgICB9CiAKIHByaXZhdGU6CkBAIC0xNDYsNiArMTk5LDggQEAgcHJpdmF0 ZToKICAgICAgICAgbV9jdXJyZW50QnVmZmVyLmFwcGVuZChjaGFyYWN0ZXIpOwogICAgIH0KIAor ICAgIFR5cGU6OlR5cGUgbV90eXBlOworICAgIERhdGFWZWN0b3IgbV9kYXRhOwogICAgIERhdGFW ZWN0b3IgbV9hbm5vdGF0aW9uOwogICAgIERhdGFWZWN0b3IgbV9jbGFzc2VzOwogICAgIERhdGFW ZWN0b3IgbV9jdXJyZW50QnVmZmVyOwo=