122143 2013-10-01 00:59:18 -0700 Document::dispatchFullScreenChangeOrErrorEvent repeats the same loop twice 2013-10-01 14:10:51 -0700 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 122144 1 rniwa rniwa benjamin commit-queue eric.carlson esprehn+autocc jer.noble kangil.han kling koivisto sam oldest_to_newest 934924 0 rniwa 2013-10-01 00:59:18 -0700 Cleanup Document::dispatchFullScreenChangeOrErrorEvent 934925 1 213063 rniwa 2013-10-01 00:59:55 -0700 Created attachment 213063 Cleanup 934930 2 213063 darin 2013-10-01 01:16:44 -0700 Comment on attachment 213063 Cleanup View in context: https://bugs.webkit.org/attachment.cgi?id=213063&action=review > Source/WebCore/dom/Document.cpp:5405 > - if (!contains(node.get()) && !node->inDocument()) > + if (!node->inDocument() && &node->document() == this) This new code is very different from the old. I don’t understand this change at all. 934933 3 rniwa 2013-10-01 01:42:10 -0700 (In reply to comment #2) > (From update of attachment 213063 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=213063&action=review > > > Source/WebCore/dom/Document.cpp:5405 > > - if (!contains(node.get()) && !node->inDocument()) > > + if (!node->inDocument() && &node->document() == this) > > This new code is very different from the old. I don’t understand this change at all. Not really. We're looking for a node that is detached from a document that hasn't been inserted into any other document yet. 934977 4 213063 abucur 2013-10-01 04:42:17 -0700 Comment on attachment 213063 Cleanup View in context: https://bugs.webkit.org/attachment.cgi?id=213063&action=review >>> Source/WebCore/dom/Document.cpp:5405 >>> + if (!node->inDocument() && &node->document() == this) >> >> This new code is very different from the old. I don’t understand this change at all. > > Not really. We're looking for a node that is detached from a document that hasn't been inserted into any other document yet. Not convinced it's the same. Correct me if I'm wrong (I'm not familiar with the spec): Before the change, the code was taking a snapshot of the change queue, a snapshot of the error queue and then it dispatched the events to the change queue and then to the error queue. After the change, you snapshot the change queue, dispatch the events, snapshot the error queue and dispatch the events. Is it possible to change the error queue while dispatching the change events? If true, with the initial code this was invisible to the error queue because it was copied before any dispatch took place. 935108 5 rniwa 2013-10-01 11:41:03 -0700 (In reply to comment #4) > Not convinced it's the same. Correct me if I'm wrong (I'm not familiar with the spec): > Before the change, the code was taking a snapshot of the change queue, a snapshot of the error queue and then it dispatched the events to the change queue and then to the error queue. > After the change, you snapshot the change queue, dispatch the events, snapshot the error queue and dispatch the events. Is it possible to change the error queue while dispatching the change events? > If true, with the initial code this was invisible to the error queue because it was copied before any dispatch took place. That's a separate concern than the one Darin pointed out but it's a valid one. Will fix. 935113 6 213103 rniwa 2013-10-01 11:46:08 -0700 Created attachment 213103 Updated per comments 935190 7 213103 commit-queue 2013-10-01 14:10:47 -0700 Comment on attachment 213103 Updated per comments Clearing flags on attachment: 213103 Committed r156733: <http://trac.webkit.org/changeset/156733> 935191 8 commit-queue 2013-10-01 14:10:51 -0700 All reviewed patches have been landed. Closing bug. 213063 2013-10-01 00:59:55 -0700 2013-10-01 11:46:05 -0700 Cleanup bug-122143-20131001005954.patch text/plain 4411 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1NjcwMCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDEzLTEwLTAxICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIENsZWFudXAgRG9jdW1lbnQ6OmRp c3BhdGNoRnVsbFNjcmVlbkNoYW5nZU9yRXJyb3JFdmVudAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIyMTQzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVkdWNlIHRoZSBjb2RlIGR1cGxpY2F0aW9uIGJ5 IGV4dHJhY3RpbmcgZGlzcGF0Y2hGdWxsU2NyZWVuQ2hhbmdlT3JFcnJvckV2ZW50LgorCisgICAg ICAgICogZG9tL0RvY3VtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50OjpmdWxs U2NyZWVuQ2hhbmdlRGVsYXlUaW1lckZpcmVkKToKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50 OjpkaXNwYXRjaEZ1bGxTY3JlZW5DaGFuZ2VPckVycm9yRXZlbnQpOiBFeHRyYWN0ZWQuCisgICAg ICAgICogZG9tL0RvY3VtZW50Lmg6CisKIDIwMTMtMDktMzAgIFJ5dWFuIENob2kgIDxyeXVhbi5j aG9pQHNhbXN1bmcuY29tPgogCiAgICAgICAgIEJ1aWxkIGZpeCBmb3IgRUZMLCBRdCwgR3RrIHBv cnQgYWZ0ZXIgcjE1NjY4OApJbmRleDogU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCShyZXZpc2lvbiAx NTY3MDApCisrKyBTb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC01MzgzLDEwICs1MzgzLDE0IEBAIHZvaWQgRG9jdW1lbnQ6OmZ1bGxTY3JlZW5DaGFuZ2VE ZWxheVRpbWUKICAgICAvLyBkb2N1bWVudCB3aWxsIGJlIGRldGFjaGVkIGFuZCBHQydkLiBXZSBw cm90ZWN0IGl0IGhlcmUgdG8gbWFrZSBzdXJlIHdlCiAgICAgLy8gY2FuIGZpbmlzaCB0aGUgZnVu Y3Rpb24gc3VjY2Vzc2Z1bGx5LgogICAgIFJlZjxEb2N1bWVudD4gcHJvdGVjdCgqdGhpcyk7Ci0g ICAgRGVxdWU8UmVmUHRyPE5vZGU+ID4gY2hhbmdlUXVldWU7Ci0gICAgbV9mdWxsU2NyZWVuQ2hh bmdlRXZlbnRUYXJnZXRRdWV1ZS5zd2FwKGNoYW5nZVF1ZXVlKTsKLSAgICBEZXF1ZTxSZWZQdHI8 Tm9kZT4gPiBlcnJvclF1ZXVlOwotICAgIG1fZnVsbFNjcmVlbkVycm9yRXZlbnRUYXJnZXRRdWV1 ZS5zd2FwKGVycm9yUXVldWUpOworICAgIGRpc3BhdGNoRnVsbFNjcmVlbkNoYW5nZU9yRXJyb3JF dmVudChtX2Z1bGxTY3JlZW5DaGFuZ2VFdmVudFRhcmdldFF1ZXVlLCBldmVudE5hbWVzKCkud2Vi a2l0ZnVsbHNjcmVlbmNoYW5nZUV2ZW50KTsKKyAgICBkaXNwYXRjaEZ1bGxTY3JlZW5DaGFuZ2VP ckVycm9yRXZlbnQobV9mdWxsU2NyZWVuRXJyb3JFdmVudFRhcmdldFF1ZXVlLCBldmVudE5hbWVz KCkud2Via2l0ZnVsbHNjcmVlbmVycm9yRXZlbnQpOworfQorCit2b2lkIERvY3VtZW50OjpkaXNw YXRjaEZ1bGxTY3JlZW5DaGFuZ2VPckVycm9yRXZlbnQoRGVxdWU8UmVmUHRyPE5vZGU+PiYgbGl2 ZVF1ZXVlLCBjb25zdCBBdG9taWNTdHJpbmcmIGV2ZW50TmFtZSkKK3sKKyAgICBEZXF1ZTxSZWZQ dHI8Tm9kZT4+IGNoYW5nZVF1ZXVlOworICAgIGNoYW5nZVF1ZXVlLnN3YXAobGl2ZVF1ZXVlKTsK IAogICAgIHdoaWxlICghY2hhbmdlUXVldWUuaXNFbXB0eSgpKSB7CiAgICAgICAgIFJlZlB0cjxO b2RlPiBub2RlID0gY2hhbmdlUXVldWUudGFrZUZpcnN0KCk7CkBAIC01Mzk4LDI2ICs1NDAyLDEw IEBAIHZvaWQgRG9jdW1lbnQ6OmZ1bGxTY3JlZW5DaGFuZ2VEZWxheVRpbWUKIAogICAgICAgICAv LyBJZiB0aGUgZWxlbWVudCB3YXMgcmVtb3ZlZCBmcm9tIG91ciB0cmVlLCBhbHNvIG1lc3NhZ2Ug dGhlIGRvY3VtZW50RWxlbWVudC4gU2luY2Ugd2UgbWF5CiAgICAgICAgIC8vIGhhdmUgYSBkb2N1 bWVudCBoaWVyYXJjaHksIGNoZWNrIHRoYXQgbm9kZSBpc24ndCBpbiBhbm90aGVyIGRvY3VtZW50 LgotICAgICAgICBpZiAoIWNvbnRhaW5zKG5vZGUuZ2V0KCkpICYmICFub2RlLT5pbkRvY3VtZW50 KCkpCisgICAgICAgIGlmICghbm9kZS0+aW5Eb2N1bWVudCgpICYmICZub2RlLT5kb2N1bWVudCgp ID09IHRoaXMpCiAgICAgICAgICAgICBjaGFuZ2VRdWV1ZS5hcHBlbmQoZG9jdW1lbnRFbGVtZW50 KCkpOwotICAgICAgICAKLSAgICAgICAgbm9kZS0+ZGlzcGF0Y2hFdmVudChFdmVudDo6Y3JlYXRl KGV2ZW50TmFtZXMoKS53ZWJraXRmdWxsc2NyZWVuY2hhbmdlRXZlbnQsIHRydWUsIGZhbHNlKSk7 Ci0gICAgfQogCi0gICAgd2hpbGUgKCFlcnJvclF1ZXVlLmlzRW1wdHkoKSkgewotICAgICAgICBS ZWZQdHI8Tm9kZT4gbm9kZSA9IGVycm9yUXVldWUudGFrZUZpcnN0KCk7Ci0gICAgICAgIGlmICgh bm9kZSkKLSAgICAgICAgICAgIG5vZGUgPSBkb2N1bWVudEVsZW1lbnQoKTsKLSAgICAgICAgLy8g VGhlIGRpc3BhdGNoRXZlbnQgYmVsb3cgbWF5IGhhdmUgYmxvd24gYXdheSBvdXIgZG9jdW1lbnRF bGVtZW50LgotICAgICAgICBpZiAoIW5vZGUpCi0gICAgICAgICAgICBjb250aW51ZTsKLSAgICAg ICAgCi0gICAgICAgIC8vIElmIHRoZSBlbGVtZW50IHdhcyByZW1vdmVkIGZyb20gb3VyIHRyZWUs IGFsc28gbWVzc2FnZSB0aGUgZG9jdW1lbnRFbGVtZW50LiBTaW5jZSB3ZSBtYXkKLSAgICAgICAg Ly8gaGF2ZSBhIGRvY3VtZW50IGhpZXJhcmNoeSwgY2hlY2sgdGhhdCBub2RlIGlzbid0IGluIGFu b3RoZXIgZG9jdW1lbnQuCi0gICAgICAgIGlmICghY29udGFpbnMobm9kZS5nZXQoKSkgJiYgIW5v ZGUtPmluRG9jdW1lbnQoKSkKLSAgICAgICAgICAgIGVycm9yUXVldWUuYXBwZW5kKGRvY3VtZW50 RWxlbWVudCgpKTsKLSAgICAgICAgCi0gICAgICAgIG5vZGUtPmRpc3BhdGNoRXZlbnQoRXZlbnQ6 OmNyZWF0ZShldmVudE5hbWVzKCkud2Via2l0ZnVsbHNjcmVlbmVycm9yRXZlbnQsIHRydWUsIGZh bHNlKSk7CisgICAgICAgIG5vZGUtPmRpc3BhdGNoRXZlbnQoRXZlbnQ6OmNyZWF0ZShldmVudE5h bWUsIHRydWUsIGZhbHNlKSk7CiAgICAgfQogfQogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9kb20v RG9jdW1lbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuaAko cmV2aXNpb24gMTU2NzAwKQorKysgU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmgJKHdvcmtp bmcgY29weSkKQEAgLTEyNTMsNiArMTI1Myw3IEBAIHByaXZhdGU6CiAgICAgUGFzc1JlZlB0cjxI VE1MQ29sbGVjdGlvbj4gZW5zdXJlQ2FjaGVkQ29sbGVjdGlvbihDb2xsZWN0aW9uVHlwZSk7CiAK ICNpZiBFTkFCTEUoRlVMTFNDUkVFTl9BUEkpCisgICAgdm9pZCBkaXNwYXRjaEZ1bGxTY3JlZW5D aGFuZ2VPckVycm9yRXZlbnQoRGVxdWU8UmVmUHRyPE5vZGU+PiYsIGNvbnN0IEF0b21pY1N0cmlu ZyYgZXZlbnROYW1lKTsKICAgICB2b2lkIGNsZWFyRnVsbHNjcmVlbkVsZW1lbnRTdGFjaygpOwog ICAgIHZvaWQgcG9wRnVsbHNjcmVlbkVsZW1lbnRTdGFjaygpOwogICAgIHZvaWQgcHVzaEZ1bGxz Y3JlZW5FbGVtZW50U3RhY2soRWxlbWVudCopOwpAQCAtMTQ3Myw4ICsxNDc0LDggQEAgcHJpdmF0 ZToKICAgICBWZWN0b3I8UmVmUHRyPEVsZW1lbnQ+ID4gbV9mdWxsU2NyZWVuRWxlbWVudFN0YWNr OwogICAgIFJlbmRlckZ1bGxTY3JlZW4qIG1fZnVsbFNjcmVlblJlbmRlcmVyOwogICAgIFRpbWVy PERvY3VtZW50PiBtX2Z1bGxTY3JlZW5DaGFuZ2VEZWxheVRpbWVyOwotICAgIERlcXVlPFJlZlB0 cjxOb2RlPiA+IG1fZnVsbFNjcmVlbkNoYW5nZUV2ZW50VGFyZ2V0UXVldWU7Ci0gICAgRGVxdWU8 UmVmUHRyPE5vZGU+ID4gbV9mdWxsU2NyZWVuRXJyb3JFdmVudFRhcmdldFF1ZXVlOworICAgIERl cXVlPFJlZlB0cjxOb2RlPj4gbV9mdWxsU2NyZWVuQ2hhbmdlRXZlbnRUYXJnZXRRdWV1ZTsKKyAg ICBEZXF1ZTxSZWZQdHI8Tm9kZT4+IG1fZnVsbFNjcmVlbkVycm9yRXZlbnRUYXJnZXRRdWV1ZTsK ICAgICBib29sIG1faXNBbmltYXRpbmdGdWxsU2NyZWVuOwogICAgIExheW91dFJlY3QgbV9zYXZl ZFBsYWNlaG9sZGVyRnJhbWVSZWN0OwogICAgIFJlZlB0cjxSZW5kZXJTdHlsZT4gbV9zYXZlZFBs YWNlaG9sZGVyUmVuZGVyU3R5bGU7Cg== 213103 2013-10-01 11:46:08 -0700 2013-10-01 14:10:47 -0700 Updated per comments bug-122143-20131001114609.patch text/plain 4320 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1NjcwMCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDEzLTEwLTAxICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIENsZWFudXAgRG9jdW1lbnQ6OmRp c3BhdGNoRnVsbFNjcmVlbkNoYW5nZU9yRXJyb3JFdmVudAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIyMTQzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVkdWNlIHRoZSBjb2RlIGR1cGxpY2F0aW9uIGJ5 IGV4dHJhY3RpbmcgZGlzcGF0Y2hGdWxsU2NyZWVuQ2hhbmdlT3JFcnJvckV2ZW50LgorCisgICAg ICAgICogZG9tL0RvY3VtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50OjpmdWxs U2NyZWVuQ2hhbmdlRGVsYXlUaW1lckZpcmVkKToKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50 OjpkaXNwYXRjaEZ1bGxTY3JlZW5DaGFuZ2VPckVycm9yRXZlbnQpOiBFeHRyYWN0ZWQuCisgICAg ICAgICogZG9tL0RvY3VtZW50Lmg6CisKIDIwMTMtMDktMzAgIFJ5dWFuIENob2kgIDxyeXVhbi5j aG9pQHNhbXN1bmcuY29tPgogCiAgICAgICAgIEJ1aWxkIGZpeCBmb3IgRUZMLCBRdCwgR3RrIHBv cnQgYWZ0ZXIgcjE1NjY4OApJbmRleDogU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCShyZXZpc2lvbiAx NTY3MDApCisrKyBTb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC01Mzg3LDkgKzUzODcsMTQgQEAgdm9pZCBEb2N1bWVudDo6ZnVsbFNjcmVlbkNoYW5nZURl bGF5VGltZQogICAgIG1fZnVsbFNjcmVlbkNoYW5nZUV2ZW50VGFyZ2V0UXVldWUuc3dhcChjaGFu Z2VRdWV1ZSk7CiAgICAgRGVxdWU8UmVmUHRyPE5vZGU+ID4gZXJyb3JRdWV1ZTsKICAgICBtX2Z1 bGxTY3JlZW5FcnJvckV2ZW50VGFyZ2V0UXVldWUuc3dhcChlcnJvclF1ZXVlKTsKKyAgICBkaXNw YXRjaEZ1bGxTY3JlZW5DaGFuZ2VPckVycm9yRXZlbnQoY2hhbmdlUXVldWUsIGV2ZW50TmFtZXMo KS53ZWJraXRmdWxsc2NyZWVuY2hhbmdlRXZlbnQpOworICAgIGRpc3BhdGNoRnVsbFNjcmVlbkNo YW5nZU9yRXJyb3JFdmVudChlcnJvclF1ZXVlLCBldmVudE5hbWVzKCkud2Via2l0ZnVsbHNjcmVl bmVycm9yRXZlbnQpOworfQogCi0gICAgd2hpbGUgKCFjaGFuZ2VRdWV1ZS5pc0VtcHR5KCkpIHsK LSAgICAgICAgUmVmUHRyPE5vZGU+IG5vZGUgPSBjaGFuZ2VRdWV1ZS50YWtlRmlyc3QoKTsKK3Zv aWQgRG9jdW1lbnQ6OmRpc3BhdGNoRnVsbFNjcmVlbkNoYW5nZU9yRXJyb3JFdmVudChEZXF1ZTxS ZWZQdHI8Tm9kZT4+JiBxdWV1ZSwgY29uc3QgQXRvbWljU3RyaW5nJiBldmVudE5hbWUpCit7Cisg ICAgd2hpbGUgKCFxdWV1ZS5pc0VtcHR5KCkpIHsKKyAgICAgICAgUmVmUHRyPE5vZGU+IG5vZGUg PSBxdWV1ZS50YWtlRmlyc3QoKTsKICAgICAgICAgaWYgKCFub2RlKQogICAgICAgICAgICAgbm9k ZSA9IGRvY3VtZW50RWxlbWVudCgpOwogICAgICAgICAvLyBUaGUgZGlzcGF0Y2hFdmVudCBiZWxv dyBtYXkgaGF2ZSBibG93biBhd2F5IG91ciBkb2N1bWVudEVsZW1lbnQuCkBAIC01Mzk4LDI2ICs1 NDAzLDEwIEBAIHZvaWQgRG9jdW1lbnQ6OmZ1bGxTY3JlZW5DaGFuZ2VEZWxheVRpbWUKIAogICAg ICAgICAvLyBJZiB0aGUgZWxlbWVudCB3YXMgcmVtb3ZlZCBmcm9tIG91ciB0cmVlLCBhbHNvIG1l c3NhZ2UgdGhlIGRvY3VtZW50RWxlbWVudC4gU2luY2Ugd2UgbWF5CiAgICAgICAgIC8vIGhhdmUg YSBkb2N1bWVudCBoaWVyYXJjaHksIGNoZWNrIHRoYXQgbm9kZSBpc24ndCBpbiBhbm90aGVyIGRv Y3VtZW50LgotICAgICAgICBpZiAoIWNvbnRhaW5zKG5vZGUuZ2V0KCkpICYmICFub2RlLT5pbkRv Y3VtZW50KCkpCi0gICAgICAgICAgICBjaGFuZ2VRdWV1ZS5hcHBlbmQoZG9jdW1lbnRFbGVtZW50 KCkpOwotICAgICAgICAKLSAgICAgICAgbm9kZS0+ZGlzcGF0Y2hFdmVudChFdmVudDo6Y3JlYXRl KGV2ZW50TmFtZXMoKS53ZWJraXRmdWxsc2NyZWVuY2hhbmdlRXZlbnQsIHRydWUsIGZhbHNlKSk7 Ci0gICAgfQorICAgICAgICBpZiAoIW5vZGUtPmluRG9jdW1lbnQoKSkKKyAgICAgICAgICAgIHF1 ZXVlLmFwcGVuZChkb2N1bWVudEVsZW1lbnQoKSk7CiAKLSAgICB3aGlsZSAoIWVycm9yUXVldWUu aXNFbXB0eSgpKSB7Ci0gICAgICAgIFJlZlB0cjxOb2RlPiBub2RlID0gZXJyb3JRdWV1ZS50YWtl Rmlyc3QoKTsKLSAgICAgICAgaWYgKCFub2RlKQotICAgICAgICAgICAgbm9kZSA9IGRvY3VtZW50 RWxlbWVudCgpOwotICAgICAgICAvLyBUaGUgZGlzcGF0Y2hFdmVudCBiZWxvdyBtYXkgaGF2ZSBi bG93biBhd2F5IG91ciBkb2N1bWVudEVsZW1lbnQuCi0gICAgICAgIGlmICghbm9kZSkKLSAgICAg ICAgICAgIGNvbnRpbnVlOwotICAgICAgICAKLSAgICAgICAgLy8gSWYgdGhlIGVsZW1lbnQgd2Fz IHJlbW92ZWQgZnJvbSBvdXIgdHJlZSwgYWxzbyBtZXNzYWdlIHRoZSBkb2N1bWVudEVsZW1lbnQu IFNpbmNlIHdlIG1heQotICAgICAgICAvLyBoYXZlIGEgZG9jdW1lbnQgaGllcmFyY2h5LCBjaGVj ayB0aGF0IG5vZGUgaXNuJ3QgaW4gYW5vdGhlciBkb2N1bWVudC4KLSAgICAgICAgaWYgKCFjb250 YWlucyhub2RlLmdldCgpKSAmJiAhbm9kZS0+aW5Eb2N1bWVudCgpKQotICAgICAgICAgICAgZXJy b3JRdWV1ZS5hcHBlbmQoZG9jdW1lbnRFbGVtZW50KCkpOwotICAgICAgICAKLSAgICAgICAgbm9k ZS0+ZGlzcGF0Y2hFdmVudChFdmVudDo6Y3JlYXRlKGV2ZW50TmFtZXMoKS53ZWJraXRmdWxsc2Ny ZWVuZXJyb3JFdmVudCwgdHJ1ZSwgZmFsc2UpKTsKKyAgICAgICAgbm9kZS0+ZGlzcGF0Y2hFdmVu dChFdmVudDo6Y3JlYXRlKGV2ZW50TmFtZSwgdHJ1ZSwgZmFsc2UpKTsKICAgICB9CiB9CiAKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL2RvbS9Eb2N1bWVudC5oCShyZXZpc2lvbiAxNTY3MDApCisrKyBTb3VyY2UvV2ViQ29y ZS9kb20vRG9jdW1lbnQuaAkod29ya2luZyBjb3B5KQpAQCAtMTI1Myw2ICsxMjUzLDcgQEAgcHJp dmF0ZToKICAgICBQYXNzUmVmUHRyPEhUTUxDb2xsZWN0aW9uPiBlbnN1cmVDYWNoZWRDb2xsZWN0 aW9uKENvbGxlY3Rpb25UeXBlKTsKIAogI2lmIEVOQUJMRShGVUxMU0NSRUVOX0FQSSkKKyAgICB2 b2lkIGRpc3BhdGNoRnVsbFNjcmVlbkNoYW5nZU9yRXJyb3JFdmVudChEZXF1ZTxSZWZQdHI8Tm9k ZT4+JiwgY29uc3QgQXRvbWljU3RyaW5nJiBldmVudE5hbWUpOwogICAgIHZvaWQgY2xlYXJGdWxs c2NyZWVuRWxlbWVudFN0YWNrKCk7CiAgICAgdm9pZCBwb3BGdWxsc2NyZWVuRWxlbWVudFN0YWNr KCk7CiAgICAgdm9pZCBwdXNoRnVsbHNjcmVlbkVsZW1lbnRTdGFjayhFbGVtZW50Kik7CkBAIC0x NDczLDggKzE0NzQsOCBAQCBwcml2YXRlOgogICAgIFZlY3RvcjxSZWZQdHI8RWxlbWVudD4gPiBt X2Z1bGxTY3JlZW5FbGVtZW50U3RhY2s7CiAgICAgUmVuZGVyRnVsbFNjcmVlbiogbV9mdWxsU2Ny ZWVuUmVuZGVyZXI7CiAgICAgVGltZXI8RG9jdW1lbnQ+IG1fZnVsbFNjcmVlbkNoYW5nZURlbGF5 VGltZXI7Ci0gICAgRGVxdWU8UmVmUHRyPE5vZGU+ID4gbV9mdWxsU2NyZWVuQ2hhbmdlRXZlbnRU YXJnZXRRdWV1ZTsKLSAgICBEZXF1ZTxSZWZQdHI8Tm9kZT4gPiBtX2Z1bGxTY3JlZW5FcnJvckV2 ZW50VGFyZ2V0UXVldWU7CisgICAgRGVxdWU8UmVmUHRyPE5vZGU+PiBtX2Z1bGxTY3JlZW5DaGFu Z2VFdmVudFRhcmdldFF1ZXVlOworICAgIERlcXVlPFJlZlB0cjxOb2RlPj4gbV9mdWxsU2NyZWVu RXJyb3JFdmVudFRhcmdldFF1ZXVlOwogICAgIGJvb2wgbV9pc0FuaW1hdGluZ0Z1bGxTY3JlZW47 CiAgICAgTGF5b3V0UmVjdCBtX3NhdmVkUGxhY2Vob2xkZXJGcmFtZVJlY3Q7CiAgICAgUmVmUHRy PFJlbmRlclN0eWxlPiBtX3NhdmVkUGxhY2Vob2xkZXJSZW5kZXJTdHlsZTsK