115655 2013-05-06 09:48:14 -0700 Use OwnPtr instead of deleteAllValues in DocumentMarkerController 2019-02-06 09:03:34 -0800 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 73757 1 darin darin cdumez commit-queue esprehn+autocc oldest_to_newest 885077 0 darin 2013-05-06 09:48:14 -0700 Use OwnPtr instead of deleteAllValues in DocumentMarkerController 885086 1 200715 darin 2013-05-06 09:55:43 -0700 Created attachment 200715 Patch 885401 2 200715 kling 2013-05-06 14:53:04 -0700 Comment on attachment 200715 Patch r=me 885530 3 commit-queue 2013-05-06 17:43:28 -0700 The commit-queue encountered the following flaky tests while processing attachment 200715: svg/custom/empty-clip-path.svg bug 114453 (author: rwlbuis@gmail.com) The commit-queue is continuing to process your patch. 885531 4 200715 commit-queue 2013-05-06 17:44:46 -0700 Comment on attachment 200715 Patch Clearing flags on attachment: 200715 Committed r149654: <http://trac.webkit.org/changeset/149654> 885532 5 commit-queue 2013-05-06 17:44:48 -0700 All reviewed patches have been landed. Closing bug. 1502995 6 lforschler 2019-02-06 09:03:34 -0800 Mass moving XML DOM bugs to the "DOM" Component. 200715 2013-05-06 09:55:43 -0700 2013-05-06 17:44:46 -0700 Patch bug-115655-20130506095451.patch text/plain 12610 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ5NjAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDZhODE5MjU5YjMwMzIy YmE1Njk2N2JjNjEwMWIwNDRlOWExY2NlZi4uYTBlMGQ2NGJmMTk0MzgzMjk1MzkyZGFkMTE3ZDU3 OTBiODE5ZTEwNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQzIEBACisyMDEzLTA1LTA2ICBEYXJp biBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KKworICAgICAgICBVc2UgT3duUHRyIGluc3RlYWQg b2YgZGVsZXRlQWxsVmFsdWVzIGluIERvY3VtZW50TWFya2VyQ29udHJvbGxlcgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE1NjU1CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBkb20vRG9jdW1lbnRNYXJr ZXJDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50TWFya2VyQ29udHJv bGxlcjo6fkRvY3VtZW50TWFya2VyQ29udHJvbGxlcik6IEFkZGVkIGhlcmUKKyAgICAgICAgc28g dGhlIGRlc3RydWN0b3IgaXNuJ3QgaW1wbGljaXRseSBpbmxpbmUuCisgICAgICAgIChXZWJDb3Jl OjpEb2N1bWVudE1hcmtlckNvbnRyb2xsZXI6OmRldGFjaCk6IFJlbW92ZWQgbm93LXVubmVlZGVk IGNvZGUgdG8KKyAgICAgICAgY2FsbCBkZWxldGVBbGxWYWx1ZXMuIEFsc28gbW92ZWQgY29kZSB0 byBzZXQgbV9wb3NzaWJseUV4aXN0aW5nTWFya2VyVHlwZXMKKyAgICAgICAgdG8gYWZ0ZXIgY2xl YXJpbmcgbV9tYXJrZXJzIHRvIGJlIGNvbnNpc3RlbnQgd2l0aCBob3cgb3RoZXIgZnVuY3Rpb25z IGRvIGl0LgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnRNYXJrZXJDb250cm9sbGVyOjphZGRN YXJrZXIpOiBDaGFuZ2VkIGNvZGUgdG8gdXNlIHRoZQorICAgICAgICBhZGQgaWRpb20gdG8gYXZv aWQgZG91YmxlIGhhc2ggdGFibGUgbG9va3VwLiBDaGFuZ2VkIHRvIHVzZSBhZG9wdFB0ciBzaW5j ZQorICAgICAgICB0aGUgbWFwIG5vdyBjb250YWlucyBPd25QdHIuCisgICAgICAgIChXZWJDb3Jl OjpEb2N1bWVudE1hcmtlckNvbnRyb2xsZXI6OnJlbW92ZU1hcmtlcnMpOiBSZW1vdmVkIGV4cGxp Y2l0IGNhbGxzCisgICAgICAgIHRvIGRlbGV0ZSBsaXN0IHNpbmNlIHJlbW92aW5nIHRoZSBlbnRy eSBmcm9tIHRoZSBtYXAgbm93IGRlbGV0ZXMgdGhlIGxpc3QuCisgICAgICAgIE1vdmVkIHRoZSBj b2RlIHRvIGNoZWNrIGlmIG1fbWFya2VycyBoYXMgYmVjb21lIGVtcHR5IHNvIGl0J3Mgb25seSBj YWxsZWQKKyAgICAgICAgd2hlbiB3ZSBhY3R1YWxseSByZW1vdmUgc29tZXRoaW5nIGZyb20gbV9t YXJrZXJzLgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnRNYXJrZXJDb250cm9sbGVyOjptYXJr ZXJDb250YWluaW5nUG9pbnQpOiBBZGRlZCBnZXQoKS4KKyAgICAgICAgKFdlYkNvcmU6OkRvY3Vt ZW50TWFya2VyQ29udHJvbGxlcjo6cmVuZGVyZWRSZWN0c0Zvck1hcmtlcnMpOiBBZGRlZCBnZXQo KS4KKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50TWFya2VyQ29udHJvbGxlcjo6cmVtb3ZlTWFy a2Vycyk6IENoYW5nZWQgdG8gdXNlIGEgbmV3CisgICAgICAgIGludGVyZmFjZSB0byByZW1vdmVN YXJrZXJzRnJvbUxpc3QuIFRoaXMgZWxpbWluYXRlZCB0aGUgbmVlZCB0byBjb3B5IHRoZQorICAg ICAgICBlbnRpcmUgbWFwIHdoZW4gcmVtb3ZpbmcgbWFya2VyczsgaW5zdGVhZCB3ZSBjYW4ganVz dCBjb3B5IHRoZSBrZXlzLgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnRNYXJrZXJDb250cm9s bGVyOjpyZW1vdmVNYXJrZXJzRnJvbUxpc3QpOiBDaGFuZ2VkIHRvIHVzZQorICAgICAgICBhbiBp dGVyYXRvciBpbnN0ZWFkIG9mIGJlaW5nIHBhc3NlZCB0aGUga2V5L3ZhbHVlIHBhaXIgZnJvbSB0 aGUgbWFwLiBBbHNvCisgICAgICAgIHJlYXJyYW5nZWQgdGhlIGxvZ2ljIHNvIHRoZXJlIGlzIGxl c3MgcmVwZWF0ZWQgY29kZSBhbmQgcmVtb3ZlZCBzb21lIG5vdy0KKyAgICAgICAgdW5uZWVkZWQg Y29tbWVudHMuCisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudE1hcmtlckNvbnRyb2xsZXI6OnJl cGFpbnRNYXJrZXJzKTogQWRkZWQgZ2V0KCkuCisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudE1h cmtlckNvbnRyb2xsZXI6OmludmFsaWRhdGVSZW5kZXJlZFJlY3RzRm9yTWFya2Vyc0luUmVjdCk6 CisgICAgICAgIEFkZGVkIGdldCgpLgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnRNYXJrZXJD b250cm9sbGVyOjpzaG93TWFya2Vycyk6IEFkZGVkIGdldCgpLgorCisgICAgICAgICogZG9tL0Rv Y3VtZW50TWFya2VyQ29udHJvbGxlci5oOiBSZW1vdmVkIGltcGxlbWVudGF0aW9uIG9mIHRoZSBk ZXN0cnVjdG9yCisgICAgICAgIHRoYXQgY2FsbGVkIHRoZSBkZXRhY2ggZnVuY3Rpb247IHRoYXQg d2FzIGp1c3Qgc2hhcmluZyB0aGUgbm93LXVubmVlZGVkCisgICAgICAgIGNhbGwgdG8gZGVsZXRl QWxsVmFsdWVzLiBDaGFuZ2VkIHRoZSB0eXBlIG9mIHRoZSBtYXAgdG8gdXNlIGFuIE93blB0ciBm b3IKKyAgICAgICAgdGhlIHZhbHVlLiBDaGFuZ2VkIHRoZSBpbnRlcmZhY2Ugb2YgcmVtb3ZlTWFy a2Vyc0Zyb21MaXN0IHRvIHRha2UgYSBtYXAKKyAgICAgICAgaXRlcmF0b3IgaW5zdGVhZCBvZiBh IGtleS92YWx1ZSBwYWlyLgorCiAyMDEzLTA1LTA2ICBWw61jdG9yIE1hbnVlbCBKw6FxdWV6IExl YWwgIDx2amFxdWV6QGlnYWxpYS5jb20+CiAKICAgICAgICAgW3RleG1hcF0gZHJhdyBjb250ZW50 IGlmIGdyYXBoaWNzIGxheWVyIGRpc3BsYXlzIGEgdmlkZW8KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2RvbS9Eb2N1bWVudE1hcmtlckNvbnRyb2xsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUv ZG9tL0RvY3VtZW50TWFya2VyQ29udHJvbGxlci5jcHAKaW5kZXggMTI2YzE3OWI2YTM0YzViZDdm MmQ1NGQ4MDZjM2FjOTM1NTJjM2Y3Yi4uMGNhYmFjM2VlOTc3YTFmOWU1MTZhNjJhNTMwZDhhZmIy ZGExMGQ4MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50TWFya2VyQ29u dHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50TWFya2VyQ29udHJv bGxlci5jcHAKQEAgLTMzLDEwICszMyw3IEBACiAjaW5jbHVkZSAiUmVuZGVyT2JqZWN0LmgiCiAj aW5jbHVkZSAiUmVuZGVyZWREb2N1bWVudE1hcmtlci5oIgogI2luY2x1ZGUgIlRleHRJdGVyYXRv ci5oIgotCi0jaWZuZGVmIE5ERUJVRwogI2luY2x1ZGUgPHN0ZGlvLmg+Ci0jZW5kaWYKIAogbmFt ZXNwYWNlIFdlYkNvcmUgewogCkBAIC01MCwxMyArNDcsMTQgQEAgRG9jdW1lbnRNYXJrZXJDb250 cm9sbGVyOjpEb2N1bWVudE1hcmtlckNvbnRyb2xsZXIoKQogewogfQogCitEb2N1bWVudE1hcmtl ckNvbnRyb2xsZXI6On5Eb2N1bWVudE1hcmtlckNvbnRyb2xsZXIoKQoreworfQorCiB2b2lkIERv Y3VtZW50TWFya2VyQ29udHJvbGxlcjo6ZGV0YWNoKCkKIHsKLSAgICBtX3Bvc3NpYmx5RXhpc3Rp bmdNYXJrZXJUeXBlcyA9IDA7Ci0gICAgaWYgKG1fbWFya2Vycy5pc0VtcHR5KCkpCi0gICAgICAg IHJldHVybjsKLSAgICBkZWxldGVBbGxWYWx1ZXMobV9tYXJrZXJzKTsKICAgICBtX21hcmtlcnMu Y2xlYXIoKTsKKyAgICBtX3Bvc3NpYmx5RXhpc3RpbmdNYXJrZXJUeXBlcyA9IDA7CiB9CiAKIHZv aWQgRG9jdW1lbnRNYXJrZXJDb250cm9sbGVyOjphZGRNYXJrZXIoUmFuZ2UqIHJhbmdlLCBEb2N1 bWVudE1hcmtlcjo6TWFya2VyVHlwZSB0eXBlLCBjb25zdCBTdHJpbmcmIGRlc2NyaXB0aW9uKQpA QCAtMTM0LDEyICsxMzIsMTEgQEAgdm9pZCBEb2N1bWVudE1hcmtlckNvbnRyb2xsZXI6OmFkZE1h cmtlcihOb2RlKiBub2RlLCBjb25zdCBEb2N1bWVudE1hcmtlciYgbmV3TWEKIAogICAgIG1fcG9z c2libHlFeGlzdGluZ01hcmtlclR5cGVzLmFkZChuZXdNYXJrZXIudHlwZSgpKTsKIAotICAgIE1h cmtlckxpc3QqIGxpc3QgPSBtX21hcmtlcnMuZ2V0KG5vZGUpOworICAgIE93blB0cjxNYXJrZXJM aXN0PiYgbGlzdCA9IG1fbWFya2Vycy5hZGQobm9kZSwgbnVsbHB0cikuaXRlcmF0b3ItPnZhbHVl OwogCiAgICAgaWYgKCFsaXN0KSB7Ci0gICAgICAgIGxpc3QgPSBuZXcgTWFya2VyTGlzdDsKKyAg ICAgICAgbGlzdCA9IGFkb3B0UHRyKG5ldyBNYXJrZXJMaXN0KTsKICAgICAgICAgbGlzdC0+YXBw ZW5kKFJlbmRlcmVkRG9jdW1lbnRNYXJrZXIobmV3TWFya2VyKSk7Ci0gICAgICAgIG1fbWFya2Vy cy5zZXQobm9kZSwgbGlzdCk7CiAgICAgfSBlbHNlIHsKICAgICAgICAgUmVuZGVyZWREb2N1bWVu dE1hcmtlciB0b0luc2VydChuZXdNYXJrZXIpOwogICAgICAgICBzaXplX3QgbnVtTWFya2VycyA9 IGxpc3QtPnNpemUoKTsKQEAgLTI4NiwxMSArMjgzLDkgQEAgdm9pZCBEb2N1bWVudE1hcmtlckNv bnRyb2xsZXI6OnJlbW92ZU1hcmtlcnMoTm9kZSogbm9kZSwgdW5zaWduZWQgc3RhcnRPZmZzZXQs IGkKIAogICAgIGlmIChsaXN0LT5pc0VtcHR5KCkpIHsKICAgICAgICAgbV9tYXJrZXJzLnJlbW92 ZShub2RlKTsKLSAgICAgICAgZGVsZXRlIGxpc3Q7CisgICAgICAgIGlmIChtX21hcmtlcnMuaXNF bXB0eSgpKQorICAgICAgICAgICAgbV9wb3NzaWJseUV4aXN0aW5nTWFya2VyVHlwZXMgPSAwOwog ICAgIH0KLSAgICAKLSAgICBpZiAobV9tYXJrZXJzLmlzRW1wdHkoKSkKLSAgICAgICAgbV9wb3Nz aWJseUV4aXN0aW5nTWFya2VyVHlwZXMgPSAwOwogCiAgICAgLy8gcmVwYWludCB0aGUgYWZmZWN0 ZWQgbm9kZQogICAgIGlmIChkb2NEaXJ0eSAmJiBub2RlLT5yZW5kZXJlcigpKQpAQCAtMzA3LDcg KzMwMiw3IEBAIERvY3VtZW50TWFya2VyKiBEb2N1bWVudE1hcmtlckNvbnRyb2xsZXI6Om1hcmtl ckNvbnRhaW5pbmdQb2ludChjb25zdCBMYXlvdXRQb2luCiAgICAgTWFya2VyTWFwOjppdGVyYXRv ciBlbmQgPSBtX21hcmtlcnMuZW5kKCk7CiAgICAgZm9yIChNYXJrZXJNYXA6Oml0ZXJhdG9yIG5v ZGVJdGVyYXRvciA9IG1fbWFya2Vycy5iZWdpbigpOyBub2RlSXRlcmF0b3IgIT0gZW5kOyArK25v ZGVJdGVyYXRvcikgewogICAgICAgICAvLyBpbm5lciBsb29wOyBwcm9jZXNzIGVhY2ggbWFya2Vy IGluIHRoaXMgbm9kZQotICAgICAgICBNYXJrZXJMaXN0KiBsaXN0ID0gbm9kZUl0ZXJhdG9yLT52 YWx1ZTsKKyAgICAgICAgTWFya2VyTGlzdCogbGlzdCA9IG5vZGVJdGVyYXRvci0+dmFsdWUuZ2V0 KCk7CiAgICAgICAgIHVuc2lnbmVkIG1hcmtlckNvdW50ID0gbGlzdC0+c2l6ZSgpOwogICAgICAg ICBmb3IgKHVuc2lnbmVkIG1hcmtlckluZGV4ID0gMDsgbWFya2VySW5kZXggPCBtYXJrZXJDb3Vu dDsgKyttYXJrZXJJbmRleCkgewogICAgICAgICAgICAgUmVuZGVyZWREb2N1bWVudE1hcmtlciYg bWFya2VyID0gbGlzdC0+YXQobWFya2VySW5kZXgpOwpAQCAtMzk1LDcgKzM5MCw3IEBAIFZlY3Rv cjxJbnRSZWN0PiBEb2N1bWVudE1hcmtlckNvbnRyb2xsZXI6OnJlbmRlcmVkUmVjdHNGb3JNYXJr ZXJzKERvY3VtZW50TWFya2VyCiAgICAgTWFya2VyTWFwOjppdGVyYXRvciBlbmQgPSBtX21hcmtl cnMuZW5kKCk7CiAgICAgZm9yIChNYXJrZXJNYXA6Oml0ZXJhdG9yIG5vZGVJdGVyYXRvciA9IG1f bWFya2Vycy5iZWdpbigpOyBub2RlSXRlcmF0b3IgIT0gZW5kOyArK25vZGVJdGVyYXRvcikgewog ICAgICAgICAvLyBpbm5lciBsb29wOyBwcm9jZXNzIGVhY2ggbWFya2VyIGluIHRoaXMgbm9kZQot ICAgICAgICBNYXJrZXJMaXN0KiBsaXN0ID0gbm9kZUl0ZXJhdG9yLT52YWx1ZTsKKyAgICAgICAg TWFya2VyTGlzdCogbGlzdCA9IG5vZGVJdGVyYXRvci0+dmFsdWUuZ2V0KCk7CiAgICAgICAgIHVu c2lnbmVkIG1hcmtlckNvdW50ID0gbGlzdC0+c2l6ZSgpOwogICAgICAgICBmb3IgKHVuc2lnbmVk IG1hcmtlckluZGV4ID0gMDsgbWFya2VySW5kZXggPCBtYXJrZXJDb3VudDsgKyttYXJrZXJJbmRl eCkgewogICAgICAgICAgICAgY29uc3QgUmVuZGVyZWREb2N1bWVudE1hcmtlciYgbWFya2VyID0g bGlzdC0+YXQobWFya2VySW5kZXgpOwpAQCAtNDIyLDcgKzQxNyw3IEBAIHZvaWQgRG9jdW1lbnRN YXJrZXJDb250cm9sbGVyOjpyZW1vdmVNYXJrZXJzKE5vZGUqIG5vZGUsIERvY3VtZW50TWFya2Vy OjpNYXJrZXJUCiAgICAgCiAgICAgTWFya2VyTWFwOjppdGVyYXRvciBpdGVyYXRvciA9IG1fbWFy a2Vycy5maW5kKG5vZGUpOwogICAgIGlmIChpdGVyYXRvciAhPSBtX21hcmtlcnMuZW5kKCkpCi0g ICAgICAgIHJlbW92ZU1hcmtlcnNGcm9tTGlzdChub2RlLCBpdGVyYXRvci0+dmFsdWUsIG1hcmtl clR5cGVzKTsKKyAgICAgICAgcmVtb3ZlTWFya2Vyc0Zyb21MaXN0KGl0ZXJhdG9yLCBtYXJrZXJU eXBlcyk7CiB9CiAKIHZvaWQgRG9jdW1lbnRNYXJrZXJDb250cm9sbGVyOjpyZW1vdmVNYXJrZXJz KERvY3VtZW50TWFya2VyOjpNYXJrZXJUeXBlcyBtYXJrZXJUeXBlcykKQEAgLTQzMSwyNSArNDI2 LDMwIEBAIHZvaWQgRG9jdW1lbnRNYXJrZXJDb250cm9sbGVyOjpyZW1vdmVNYXJrZXJzKERvY3Vt ZW50TWFya2VyOjpNYXJrZXJUeXBlcyBtYXJrZXJUCiAgICAgICAgIHJldHVybjsKICAgICBBU1NF UlQoIW1fbWFya2Vycy5pc0VtcHR5KCkpOwogCi0gICAgLy8gb3V0ZXIgbG9vcDogcHJvY2VzcyBl YWNoIG1hcmtlcmVkIG5vZGUgaW4gdGhlIGRvY3VtZW50Ci0gICAgTWFya2VyTWFwIG1hcmtlck1h cENvcHkgPSBtX21hcmtlcnM7Ci0gICAgTWFya2VyTWFwOjppdGVyYXRvciBlbmQgPSBtYXJrZXJN YXBDb3B5LmVuZCgpOwotICAgIGZvciAoTWFya2VyTWFwOjppdGVyYXRvciBpID0gbWFya2VyTWFw Q29weS5iZWdpbigpOyBpICE9IGVuZDsgKytpKQotICAgICAgICByZW1vdmVNYXJrZXJzRnJvbUxp c3QoaS0+a2V5LmdldCgpLCBpLT52YWx1ZSwgbWFya2VyVHlwZXMpOworICAgIFZlY3RvcjxSZWZQ dHI8Tm9kZT4gPiBub2Rlc1dpdGhNYXJrZXJzOworICAgIGNvcHlLZXlzVG9WZWN0b3IobV9tYXJr ZXJzLCBub2Rlc1dpdGhNYXJrZXJzKTsKKyAgICB1bnNpZ25lZCBzaXplID0gbm9kZXNXaXRoTWFy a2Vycy5zaXplKCk7CisgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IHNpemU7ICsraSkgewor ICAgICAgICBNYXJrZXJNYXA6Oml0ZXJhdG9yIGl0ZXJhdG9yID0gbV9tYXJrZXJzLmZpbmQobm9k ZXNXaXRoTWFya2Vyc1tpXSk7CisgICAgICAgIGlmIChpdGVyYXRvciAhPSBtX21hcmtlcnMuZW5k KCkpCisgICAgICAgICAgICByZW1vdmVNYXJrZXJzRnJvbUxpc3QoaXRlcmF0b3IsIG1hcmtlclR5 cGVzKTsKKyAgICB9CisKICAgICBtX3Bvc3NpYmx5RXhpc3RpbmdNYXJrZXJUeXBlcy5yZW1vdmUo bWFya2VyVHlwZXMpOwogfQogCi0vLyBUaGlzIGZ1bmN0aW9uIG1heSByZWxlYXNlIG5vZGUgYW5k IHZlY3RvclBhaXIuCi12b2lkIERvY3VtZW50TWFya2VyQ29udHJvbGxlcjo6cmVtb3ZlTWFya2Vy c0Zyb21MaXN0KE5vZGUqIG5vZGUsIE1hcmtlckxpc3QqIGxpc3QsIERvY3VtZW50TWFya2VyOjpN YXJrZXJUeXBlcyBtYXJrZXJUeXBlcykKK3ZvaWQgRG9jdW1lbnRNYXJrZXJDb250cm9sbGVyOjpy ZW1vdmVNYXJrZXJzRnJvbUxpc3QoTWFya2VyTWFwOjppdGVyYXRvciBpdGVyYXRvciwgRG9jdW1l bnRNYXJrZXI6Ok1hcmtlclR5cGVzIG1hcmtlclR5cGVzKQogeworICAgIGJvb2wgbmVlZHNSZXBh aW50aW5nID0gZmFsc2U7CisgICAgYm9vbCBsaXN0Q2FuQmVSZW1vdmVkOworCiAgICAgaWYgKG1h cmtlclR5cGVzID09IERvY3VtZW50TWFya2VyOjpBbGxNYXJrZXJzKCkpIHsKLSAgICAgICAgZGVs ZXRlIGxpc3Q7Ci0gICAgICAgIG1fbWFya2Vycy5yZW1vdmUobm9kZSk7Ci0gICAgICAgIGlmIChS ZW5kZXJPYmplY3QqIHJlbmRlcmVyID0gbm9kZS0+cmVuZGVyZXIoKSkKLSAgICAgICAgICAgIHJl bmRlcmVyLT5yZXBhaW50KCk7CisgICAgICAgIG5lZWRzUmVwYWludGluZyA9IHRydWU7CisgICAg ICAgIGxpc3RDYW5CZVJlbW92ZWQgPSB0cnVlOwogICAgIH0gZWxzZSB7Ci0gICAgICAgIGJvb2wg bmVlZHNSZXBhaW50ID0gZmFsc2U7Ci0gICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpICE9IGxp c3QtPnNpemUoKTspIHsKKyAgICAgICAgTWFya2VyTGlzdCogbGlzdCA9IGl0ZXJhdG9yLT52YWx1 ZS5nZXQoKTsKKworICAgICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSAhPSBsaXN0LT5zaXplKCk7 ICkgewogICAgICAgICAgICAgRG9jdW1lbnRNYXJrZXIgbWFya2VyID0gbGlzdC0+YXQoaSk7CiAK ICAgICAgICAgICAgIC8vIHNraXAgbm9kZXMgdGhhdCBhcmUgbm90IG9mIHRoZSBzcGVjaWZpZWQg dHlwZQpAQCAtNDYwLDI2ICs0NjAsMjMgQEAgdm9pZCBEb2N1bWVudE1hcmtlckNvbnRyb2xsZXI6 OnJlbW92ZU1hcmtlcnNGcm9tTGlzdChOb2RlKiBub2RlLCBNYXJrZXJMaXN0KiBsaXMKIAogICAg ICAgICAgICAgLy8gcGl0Y2ggdGhlIG9sZCBtYXJrZXIKICAgICAgICAgICAgIGxpc3QtPnJlbW92 ZShpKTsKLSAgICAgICAgICAgIG5lZWRzUmVwYWludCA9IHRydWU7CisgICAgICAgICAgICBuZWVk c1JlcGFpbnRpbmcgPSB0cnVlOwogICAgICAgICAgICAgLy8gaSBub3cgaXMgdGhlIGluZGV4IG9m IHRoZSBuZXh0IG1hcmtlcgogICAgICAgICB9CiAKLSAgICAgICAgLy8gUmVkcmF3IHRoZSBub2Rl IGlmIGl0IGNoYW5nZWQuIERvIHRoaXMgYmVmb3JlIHRoZSBub2RlIGlzIHJlbW92ZWQgZnJvbSBt X21hcmtlcnMsIHNpbmNlCi0gICAgICAgIC8vIG1fbWFya2VycyBtaWdodCBjb250YWluIHRoZSBs YXN0IHJlZmVyZW5jZSB0byB0aGUgbm9kZS4KLSAgICAgICAgaWYgKG5lZWRzUmVwYWludCkgewot ICAgICAgICAgICAgUmVuZGVyT2JqZWN0KiByZW5kZXJlciA9IG5vZGUtPnJlbmRlcmVyKCk7Ci0g ICAgICAgICAgICBpZiAocmVuZGVyZXIpCi0gICAgICAgICAgICAgICAgcmVuZGVyZXItPnJlcGFp bnQoKTsKLSAgICAgICAgfQorICAgICAgICBsaXN0Q2FuQmVSZW1vdmVkID0gbGlzdC0+aXNFbXB0 eSgpOworICAgIH0KIAotICAgICAgICAvLyBkZWxldGUgdGhlIG5vZGUncyBsaXN0IGlmIGl0IGlz IG5vdyBlbXB0eQotICAgICAgICBpZiAobGlzdC0+aXNFbXB0eSgpKSB7Ci0gICAgICAgICAgICBt X21hcmtlcnMucmVtb3ZlKG5vZGUpOwotICAgICAgICAgICAgZGVsZXRlIGxpc3Q7Ci0gICAgICAg IH0KKyAgICBpZiAobmVlZHNSZXBhaW50aW5nKSB7CisgICAgICAgIGlmIChSZW5kZXJPYmplY3Qq IHJlbmRlcmVyID0gaXRlcmF0b3ItPmtleS0+cmVuZGVyZXIoKSkKKyAgICAgICAgICAgIHJlbmRl cmVyLT5yZXBhaW50KCk7CisgICAgfQorCisgICAgaWYgKGxpc3RDYW5CZVJlbW92ZWQpIHsKKyAg ICAgICAgbV9tYXJrZXJzLnJlbW92ZShpdGVyYXRvcik7CisgICAgICAgIGlmIChtX21hcmtlcnMu aXNFbXB0eSgpKQorICAgICAgICAgICAgbV9wb3NzaWJseUV4aXN0aW5nTWFya2VyVHlwZXMgPSAw OwogICAgIH0KLSAgICBpZiAobV9tYXJrZXJzLmlzRW1wdHkoKSkKLSAgICAgICAgbV9wb3NzaWJs eUV4aXN0aW5nTWFya2VyVHlwZXMgPSAwOwogfQogCiB2b2lkIERvY3VtZW50TWFya2VyQ29udHJv bGxlcjo6cmVwYWludE1hcmtlcnMoRG9jdW1lbnRNYXJrZXI6Ok1hcmtlclR5cGVzIG1hcmtlclR5 cGVzKQpAQCAtNDk0LDcgKzQ5MSw3IEBAIHZvaWQgRG9jdW1lbnRNYXJrZXJDb250cm9sbGVyOjpy ZXBhaW50TWFya2VycyhEb2N1bWVudE1hcmtlcjo6TWFya2VyVHlwZXMgbWFya2VyCiAgICAgICAg IE5vZGUqIG5vZGUgPSBpLT5rZXkuZ2V0KCk7CiAKICAgICAgICAgLy8gaW5uZXIgbG9vcDogcHJv Y2VzcyBlYWNoIG1hcmtlciBpbiB0aGUgY3VycmVudCBub2RlCi0gICAgICAgIE1hcmtlckxpc3Qq IGxpc3QgPSBpLT52YWx1ZTsKKyAgICAgICAgTWFya2VyTGlzdCogbGlzdCA9IGktPnZhbHVlLmdl dCgpOwogICAgICAgICBib29sIG5vZGVOZWVkc1JlcGFpbnQgPSBmYWxzZTsKICAgICAgICAgZm9y IChzaXplX3QgaSA9IDA7IGkgIT0gbGlzdC0+c2l6ZSgpOyArK2kpIHsKICAgICAgICAgICAgIERv Y3VtZW50TWFya2VyIG1hcmtlciA9IGxpc3QtPmF0KGkpOwpAQCAtNTIyLDcgKzUxOSw3IEBAIHZv aWQgRG9jdW1lbnRNYXJrZXJDb250cm9sbGVyOjppbnZhbGlkYXRlUmVuZGVyZWRSZWN0c0Zvck1h cmtlcnNJblJlY3QoY29uc3QgTGF5CiAgICAgZm9yIChNYXJrZXJNYXA6Oml0ZXJhdG9yIGkgPSBt X21hcmtlcnMuYmVnaW4oKTsgaSAhPSBlbmQ7ICsraSkgewogCiAgICAgICAgIC8vIGlubmVyIGxv b3A6IHByb2Nlc3MgZWFjaCByZWN0IGluIHRoZSBjdXJyZW50IG5vZGUKLSAgICAgICAgTWFya2Vy TGlzdCogbGlzdCA9IGktPnZhbHVlOworICAgICAgICBNYXJrZXJMaXN0KiBsaXN0ID0gaS0+dmFs dWUuZ2V0KCk7CiAgICAgICAgIGZvciAoc2l6ZV90IGxpc3RJbmRleCA9IDA7IGxpc3RJbmRleCA8 IGxpc3QtPnNpemUoKTsgKytsaXN0SW5kZXgpCiAgICAgICAgICAgICBsaXN0LT5hdChsaXN0SW5k ZXgpLmludmFsaWRhdGUocik7CiAgICAgfQpAQCAtNjczLDcgKzY3MCw3IEBAIHZvaWQgRG9jdW1l bnRNYXJrZXJDb250cm9sbGVyOjpzaG93TWFya2VycygpIGNvbnN0CiAgICAgZm9yIChNYXJrZXJN YXA6OmNvbnN0X2l0ZXJhdG9yIG5vZGVJdGVyYXRvciA9IG1fbWFya2Vycy5iZWdpbigpOyBub2Rl SXRlcmF0b3IgIT0gZW5kOyArK25vZGVJdGVyYXRvcikgewogICAgICAgICBOb2RlKiBub2RlID0g bm9kZUl0ZXJhdG9yLT5rZXkuZ2V0KCk7CiAgICAgICAgIGZwcmludGYoc3RkZXJyLCAiJXAiLCBu b2RlKTsKLSAgICAgICAgTWFya2VyTGlzdCogbGlzdCA9IG5vZGVJdGVyYXRvci0+dmFsdWU7Cisg ICAgICAgIE1hcmtlckxpc3QqIGxpc3QgPSBub2RlSXRlcmF0b3ItPnZhbHVlLmdldCgpOwogICAg ICAgICBmb3IgKHVuc2lnbmVkIG1hcmtlckluZGV4ID0gMDsgbWFya2VySW5kZXggPCBsaXN0LT5z aXplKCk7ICsrbWFya2VySW5kZXgpIHsKICAgICAgICAgICAgIGNvbnN0IERvY3VtZW50TWFya2Vy JiBtYXJrZXIgPSBsaXN0LT5hdChtYXJrZXJJbmRleCk7CiAgICAgICAgICAgICBmcHJpbnRmKHN0 ZGVyciwgIiAlZDpbJWQ6JWRdKCVkKSIsIG1hcmtlci50eXBlKCksIG1hcmtlci5zdGFydE9mZnNl dCgpLCBtYXJrZXIuZW5kT2Zmc2V0KCksIG1hcmtlci5hY3RpdmVNYXRjaCgpKTsKQEAgLTY4Niw3 ICs2ODMsNiBAQCB2b2lkIERvY3VtZW50TWFya2VyQ29udHJvbGxlcjo6c2hvd01hcmtlcnMoKSBj b25zdAogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCiAKLQogI2lmbmRlZiBOREVCVUcKIHZvaWQg c2hvd0RvY3VtZW50TWFya2Vycyhjb25zdCBXZWJDb3JlOjpEb2N1bWVudE1hcmtlckNvbnRyb2xs ZXIqIGNvbnRyb2xsZXIpCiB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1l bnRNYXJrZXJDb250cm9sbGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnRNYXJrZXJD b250cm9sbGVyLmgKaW5kZXggYTk0NDljMGRjNDVhNDJhNTRlZDg1ZDkxMzI5YzMwNzZkYWNlNjY5 Ni4uNDczMDk5MjlkYzZkYjZmNmUxMTI3ZjQzMmIxYzg3MTljNjk3YWU0NyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50TWFya2VyQ29udHJvbGxlci5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2RvbS9Eb2N1bWVudE1hcmtlckNvbnRyb2xsZXIuaApAQCAtNDUsNyArNDUsNyBA QCBjbGFzcyBEb2N1bWVudE1hcmtlckNvbnRyb2xsZXIgewogcHVibGljOgogCiAgICAgRG9jdW1l bnRNYXJrZXJDb250cm9sbGVyKCk7Ci0gICAgfkRvY3VtZW50TWFya2VyQ29udHJvbGxlcigpIHsg ZGV0YWNoKCk7IH0KKyAgICB+RG9jdW1lbnRNYXJrZXJDb250cm9sbGVyKCk7CiAKICAgICB2b2lk IGRldGFjaCgpOwogICAgIHZvaWQgYWRkTWFya2VyKFJhbmdlKiwgRG9jdW1lbnRNYXJrZXI6Ok1h cmtlclR5cGUpOwpAQCAtODcsOSArODcsOSBAQCBwcml2YXRlOgogICAgIHZvaWQgYWRkTWFya2Vy KE5vZGUqLCBjb25zdCBEb2N1bWVudE1hcmtlciYpOwogCiAgICAgdHlwZWRlZiBWZWN0b3I8UmVu ZGVyZWREb2N1bWVudE1hcmtlcj4gTWFya2VyTGlzdDsKLSAgICB0eXBlZGVmIEhhc2hNYXA8UmVm UHRyPE5vZGU+LCBNYXJrZXJMaXN0Kj4gTWFya2VyTWFwOworICAgIHR5cGVkZWYgSGFzaE1hcDxS ZWZQdHI8Tm9kZT4sIE93blB0cjxNYXJrZXJMaXN0PiA+IE1hcmtlck1hcDsKICAgICBib29sIHBv c3NpYmx5SGFzTWFya2VycyhEb2N1bWVudE1hcmtlcjo6TWFya2VyVHlwZXMpOwotICAgIHZvaWQg cmVtb3ZlTWFya2Vyc0Zyb21MaXN0KE5vZGUqLCBNYXJrZXJMaXN0KiwgRG9jdW1lbnRNYXJrZXI6 Ok1hcmtlclR5cGVzKTsKKyAgICB2b2lkIHJlbW92ZU1hcmtlcnNGcm9tTGlzdChNYXJrZXJNYXA6 Oml0ZXJhdG9yLCBEb2N1bWVudE1hcmtlcjo6TWFya2VyVHlwZXMpOwogCiAgICAgTWFya2VyTWFw IG1fbWFya2VyczsKICAgICAvLyBQcm92aWRlIGEgcXVpY2sgd2F5IHRvIGRldGVybWluZSB3aGV0 aGVyIGEgcGFydGljdWxhciBtYXJrZXIgdHlwZSBpcyBhYnNlbnQgd2l0aG91dCBnb2luZyB0aHJv dWdoIHRoZSBtYXAuCg==