120579 2013-09-01 07:32:06 -0700 HitTestResult should have innerNonSharedElement 2013-09-01 12:11:25 -0700 1 1 1 Unclassified WebKit UI Events 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 darin darin kling oldest_to_newest 923458 0 darin 2013-09-01 07:32:06 -0700 HitTestResult should have innerNonSharedElement 923459 1 darin 2013-09-01 07:36:51 -0700 Mr. Kling encouraged me to do this with a comment on my last patch. 923460 2 210240 darin 2013-09-01 07:37:42 -0700 Created attachment 210240 Patch 923463 3 210240 kling 2013-09-01 07:41:17 -0700 Comment on attachment 210240 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=210240&action=review r=me > Source/WebCore/ChangeLog:14 > + the node and chenking if it's an input element. Also added some missing braces. Typo, checking. > Source/WebCore/page/Chrome.cpp:439 > + if (Node* element = result.innerNonSharedElement()) { You should use an Element* pointer here. 923535 4 darin 2013-09-01 12:11:25 -0700 Committed r154945: <http://trac.webkit.org/changeset/154945> 210240 2013-09-01 07:37:42 -0700 2013-09-01 07:41:17 -0700 Patch bug-120579-20130901073742.patch text/plain 13765 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMTU0OTM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjkzMTAxY2Y3YTI3NDBk OTJmOWExYzU2MWFjN2U5NDEyMDQ1MzQ5My4uZmVjN2ZkOGVmZDY0YzY4ODNjNzRhZGZlNmE1MTY0 MWYyZjM1NjQwNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDEzLTA5LTAxICBEYXJp biBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KKworICAgICAgICBIaXRUZXN0UmVzdWx0IHNob3Vs ZCBoYXZlIGlubmVyTm9uU2hhcmVkRWxlbWVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIwNTc5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBlZGl0aW5nL0VkaXRvci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpFZGl0b3I6OmNvcHlJbWFnZSk6IENhbGwgSGl0VGVzdFJlc3VsdCBtZW1iZXIgZnVuY3Rp b24gdmVyc2lvbiBvZgorICAgICAgICBpbm5lck5vblNoYXJlZEVsZW1lbnQgaW5zdGVhZCBvZiBh IGxvY2FsIGZ1bmN0aW9uIHRoYXQgZG9lcyBpdC4KKworICAgICAgICAqIHBhZ2UvQ2hyb21lLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkNocm9tZTo6c2V0VG9vbFRpcCk6IFVzZSBpbm5lck5vblNo YXJlZEVsZW1lbnQgaW5zdGVhZCBvZiBnZXR0aW5nCisgICAgICAgIHRoZSBub2RlIGFuZCBjaGVu a2luZyBpZiBpdCdzIGFuIGlucHV0IGVsZW1lbnQuIEFsc28gYWRkZWQgc29tZSBtaXNzaW5nIGJy YWNlcy4KKworICAgICAgICAqIHBhZ2UvRXZlbnRIYW5kbGVyLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkV2ZW50SGFuZGxlcjo6c2VsZWN0Q2xvc2VzdFdvcmRGcm9tSGl0VGVzdFJlc3VsdCk6IFVz ZSB0YXJnZXROb2RlIGZvcgorICAgICAgICBsb2NhbCB2YXJpYWJsZXMgaW5zdGVhZCBvZiBpbm5l ck5vZGUgdG8gbWF0Y2ggdGhlIEhpdFRlc3RSZXN1bHQgZnVuY3Rpb24gbmFtZS4KKyAgICAgICAg KFdlYkNvcmU6OkV2ZW50SGFuZGxlcjo6c2VsZWN0Q2xvc2VzdFdvcmRPckxpbmtGcm9tTW91c2VF dmVudCk6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6RXZlbnRIYW5kbGVyOjpoYW5kbGVNb3Vz ZVByZXNzRXZlbnRUcmlwbGVDbGljayk6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6RXZlbnRI YW5kbGVyOjpoYW5kbGVNb3VzZVByZXNzRXZlbnRTaW5nbGVDbGljayk6IERpdHRvLgorICAgICAg ICAoV2ViQ29yZTo6RXZlbnRIYW5kbGVyOjpoYW5kbGVNb3VzZVByZXNzRXZlbnQpOiBEaXR0by4K KworICAgICAgICAqIHJlbmRlcmluZy9IaXRUZXN0UmVzdWx0LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkhpdFRlc3RSZXN1bHQ6OmlubmVyRWxlbWVudCk6IFJld3JvdGUgc28gdGhlcmUgdGhlcmUg aXMgbm8gbG9vcC4KKyAgICAgICAgKFdlYkNvcmU6OkhpdFRlc3RSZXN1bHQ6OmlubmVyTm9uU2hh cmVkRWxlbWVudCk6IERpdHRvLgorCisgICAgICAgICogcmVuZGVyaW5nL0hpdFRlc3RSZXN1bHQu aDogQWRkZWQgaW5uZXJOb25TaGFyZWRFbGVtZW50LiBHZW5lcmFsbHkgc3BlYWtpbmcsCisgICAg ICAgIHdlJ2QgbGlrZSB0byBhdm9pZCB1c2luZyBOb2RlIHVubGVzcyB0aGVyZSBpcyBzb21lIHJl YWwgbmVlZC4KKwogMjAxMy0wOC0zMSAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+CiAK ICAgICAgICAgUmVmYWN0b3IgVVJMIGFuZCBpbWFnZSB3cml0aW5nIHNvIGxheWVyLXZpb2xhdGlu ZyBwYXJ0cyBhcmUgaW4gRWRpdG9yLCBub3QgUGFzdGVib2FyZCAoTWFjLW9ubHkgYXQgZmlyc3Qp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRvci5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9lZGl0aW5nL0VkaXRvci5jcHAKaW5kZXggYzRkNjQxN2U1ODg1ODUzM2E4NDhmNDQz MDIyNWFjZWU1ZWFhNGRjNy4uMmVhMGQ4ZmEyZjc2YWE5OTQ4ZmE5YTVhY2M5NzFmZGUwNDQ1YWZi YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0b3IuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmNwcApAQCAtMTE3MSwyMCArMTE3MSw5IEBAIHZv aWQgRWRpdG9yOjpjb3B5VVJMKGNvbnN0IEtVUkwmIHVybCwgY29uc3QgU3RyaW5nJiB0aXRsZSwg UGFzdGVib2FyZCYgcGFzdGVib2FyCiAjZW5kaWYKIH0KIAotLy8gRklYTUU6IFNob3VsZCB0aGlz IGJlIGEgbWVtYmVyIGZ1bmN0aW9uIG9mIEhpdFRlc3RSZXN1bHQ/Ci1zdGF0aWMgRWxlbWVudCog aW5uZXJOb25TaGFyZWRFbGVtZW50KGNvbnN0IEhpdFRlc3RSZXN1bHQmIHJlc3VsdCkKLXsKLSAg ICBOb2RlKiBub2RlID0gcmVzdWx0LmlubmVyTm9uU2hhcmVkTm9kZSgpOwotICAgIGlmICghbm9k ZSkKLSAgICAgICAgcmV0dXJuIDA7Ci0gICAgaWYgKG5vZGUtPmlzRWxlbWVudE5vZGUoKSkKLSAg ICAgICAgcmV0dXJuIHRvRWxlbWVudChub2RlKTsKLSAgICByZXR1cm4gbm9kZS0+cGFyZW50RWxl bWVudCgpOwotfQotCiB2b2lkIEVkaXRvcjo6Y29weUltYWdlKGNvbnN0IEhpdFRlc3RSZXN1bHQm IHJlc3VsdCkKIHsKLSAgICBFbGVtZW50KiBlbGVtZW50ID0gaW5uZXJOb25TaGFyZWRFbGVtZW50 KHJlc3VsdCk7CisgICAgRWxlbWVudCogZWxlbWVudCA9IHJlc3VsdC5pbm5lck5vblNoYXJlZEVs ZW1lbnQoKTsKICAgICBpZiAoIWVsZW1lbnQpCiAgICAgICAgIHJldHVybjsKIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGFnZS9DaHJvbWUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9D aHJvbWUuY3BwCmluZGV4IGFmOWUxZGEzN2UyMzhkNGUxZWY1YzVhZmU1ZjY5ZTZkNDNmYjRhZDMu Ljc2NDFiOTRhOGFhNjBmNWJmZGRjODNmM2JiYzYyNzJkOWYxNTExZDEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvQ2hyb21lLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0No cm9tZS5jcHAKQEAgLTQwMiwxMSArNDAyLDExIEBAIHZvaWQgQ2hyb21lOjpzZXRUb29sVGlwKGNv bnN0IEhpdFRlc3RSZXN1bHQmIHJlc3VsdCkKIAogICAgIC8vIE5leHQgcHJpb3JpdHkgaXMgYSB0 b29sVGlwIGZyb20gYSBVUkwgYmVuZWF0aCB0aGUgbW91c2UgKGlmIHByZWZlcmVuY2UgaXMgc2V0 IHRvIHNob3cgdGhvc2UpLgogICAgIGlmICh0b29sVGlwLmlzRW1wdHkoKSAmJiBtX3BhZ2UtPnNl dHRpbmdzKCkuc2hvd3NVUkxzSW5Ub29sVGlwcygpKSB7Ci0gICAgICAgIGlmIChOb2RlKiBub2Rl ID0gcmVzdWx0LmlubmVyTm9uU2hhcmVkTm9kZSgpKSB7CisgICAgICAgIGlmIChFbGVtZW50KiBl bGVtZW50ID0gcmVzdWx0LmlubmVyTm9uU2hhcmVkRWxlbWVudCgpKSB7CiAgICAgICAgICAgICAv LyBHZXQgdG9vbHRpcCByZXByZXNlbnRpbmcgZm9ybSBhY3Rpb24sIGlmIHJlbGV2YW50Ci0gICAg ICAgICAgICBpZiAoaXNIVE1MSW5wdXRFbGVtZW50KG5vZGUpKSB7Ci0gICAgICAgICAgICAgICAg SFRNTElucHV0RWxlbWVudCogaW5wdXQgPSB0b0hUTUxJbnB1dEVsZW1lbnQobm9kZSk7Ci0gICAg ICAgICAgICAgICAgaWYgKGlucHV0LT5pc1N1Ym1pdEJ1dHRvbigpKQorICAgICAgICAgICAgaWYg KGlzSFRNTElucHV0RWxlbWVudChlbGVtZW50KSkgeworICAgICAgICAgICAgICAgIEhUTUxJbnB1 dEVsZW1lbnQqIGlucHV0ID0gdG9IVE1MSW5wdXRFbGVtZW50KGVsZW1lbnQpOworICAgICAgICAg ICAgICAgIGlmIChpbnB1dC0+aXNTdWJtaXRCdXR0b24oKSkgewogICAgICAgICAgICAgICAgICAg ICBpZiAoSFRNTEZvcm1FbGVtZW50KiBmb3JtID0gaW5wdXQtPmZvcm0oKSkgewogICAgICAgICAg ICAgICAgICAgICAgICAgdG9vbFRpcCA9IGZvcm0tPmFjdGlvbigpOwogICAgICAgICAgICAgICAg ICAgICAgICAgaWYgKGZvcm0tPnJlbmRlcmVyKCkpCkBAIC00MTQsNiArNDE0LDcgQEAgdm9pZCBD aHJvbWU6OnNldFRvb2xUaXAoY29uc3QgSGl0VGVzdFJlc3VsdCYgcmVzdWx0KQogICAgICAgICAg ICAgICAgICAgICAgICAgZWxzZQogICAgICAgICAgICAgICAgICAgICAgICAgICAgIHRvb2xUaXBE aXJlY3Rpb24gPSBMVFI7CiAgICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICB9 CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KIApAQCAtNDM1LDEwICs0MzYsOSBAQCB2b2lkIENo cm9tZTo6c2V0VG9vbFRpcChjb25zdCBIaXRUZXN0UmVzdWx0JiByZXN1bHQpCiAKICAgICAvLyBM YXN0bHksIGZvciA8aW5wdXQgdHlwZT0iZmlsZSI+IHRoYXQgYWxsb3cgbXVsdGlwbGUgZmlsZXMs IHdlJ2xsIGNvbnNpZGVyIGEgdG9vbHRpcCBmb3IgdGhlIHNlbGVjdGVkIGZpbGVuYW1lcwogICAg IGlmICh0b29sVGlwLmlzRW1wdHkoKSkgewotICAgICAgICBpZiAoTm9kZSogbm9kZSA9IHJlc3Vs dC5pbm5lck5vblNoYXJlZE5vZGUoKSkgewotICAgICAgICAgICAgaWYgKGlzSFRNTElucHV0RWxl bWVudChub2RlKSkgewotICAgICAgICAgICAgICAgIEhUTUxJbnB1dEVsZW1lbnQqIGlucHV0ID0g dG9IVE1MSW5wdXRFbGVtZW50KG5vZGUpOwotICAgICAgICAgICAgICAgIHRvb2xUaXAgPSBpbnB1 dC0+ZGVmYXVsdFRvb2xUaXAoKTsKKyAgICAgICAgaWYgKE5vZGUqIGVsZW1lbnQgPSByZXN1bHQu aW5uZXJOb25TaGFyZWRFbGVtZW50KCkpIHsKKyAgICAgICAgICAgIGlmIChpc0hUTUxJbnB1dEVs ZW1lbnQoZWxlbWVudCkpIHsKKyAgICAgICAgICAgICAgICB0b29sVGlwID0gdG9IVE1MSW5wdXRF bGVtZW50KGVsZW1lbnQpLT5kZWZhdWx0VG9vbFRpcCgpOwogCiAgICAgICAgICAgICAgICAgLy8g RklYTUU6IFdlIHNob3VsZCBvYnRhaW4gdGV4dCBkaXJlY3Rpb24gb2YgdG9vbHRpcCBmcm9tCiAg ICAgICAgICAgICAgICAgLy8gQ2hyb21lQ2xpZW50IG9yIHBsYXRmb3JtLiBBcyBvZiBPY3RvYmVy IDIwMTEsIGFsbCBjbGllbnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRI YW5kbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcAppbmRleCA0 ODNjOWJhMDQ2ZjM4MzkzYTA0MjY4YTZjNjI4YWEwNDgxNTI0YTNlLi44ZmM5NWUwZWQxZmZkYjFj ZDJmMjNiMWM0NGNmMWVjMDcwOGExNWQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdl L0V2ZW50SGFuZGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIu Y3BwCkBAIC00ODUsMTEgKzQ4NSwxMSBAQCBib29sIEV2ZW50SGFuZGxlcjo6dXBkYXRlU2VsZWN0 aW9uRm9yTW91c2VEb3duRGlzcGF0Y2hpbmdTZWxlY3RTdGFydChOb2RlKiB0YXJnZQogCiB2b2lk IEV2ZW50SGFuZGxlcjo6c2VsZWN0Q2xvc2VzdFdvcmRGcm9tSGl0VGVzdFJlc3VsdChjb25zdCBI aXRUZXN0UmVzdWx0JiByZXN1bHQsIEFwcGVuZFRyYWlsaW5nV2hpdGVzcGFjZSBhcHBlbmRUcmFp bGluZ1doaXRlc3BhY2UpCiB7Ci0gICAgTm9kZSogaW5uZXJOb2RlID0gcmVzdWx0LnRhcmdldE5v ZGUoKTsKKyAgICBOb2RlKiB0YXJnZXROb2RlID0gcmVzdWx0LnRhcmdldE5vZGUoKTsKICAgICBW aXNpYmxlU2VsZWN0aW9uIG5ld1NlbGVjdGlvbjsKIAotICAgIGlmIChpbm5lck5vZGUgJiYgaW5u ZXJOb2RlLT5yZW5kZXJlcigpKSB7Ci0gICAgICAgIFZpc2libGVQb3NpdGlvbiBwb3MoaW5uZXJO b2RlLT5yZW5kZXJlcigpLT5wb3NpdGlvbkZvclBvaW50KHJlc3VsdC5sb2NhbFBvaW50KCkpKTsK KyAgICBpZiAodGFyZ2V0Tm9kZSAmJiB0YXJnZXROb2RlLT5yZW5kZXJlcigpKSB7CisgICAgICAg IFZpc2libGVQb3NpdGlvbiBwb3ModGFyZ2V0Tm9kZS0+cmVuZGVyZXIoKS0+cG9zaXRpb25Gb3JQ b2ludChyZXN1bHQubG9jYWxQb2ludCgpKSk7CiAgICAgICAgIGlmIChwb3MuaXNOb3ROdWxsKCkp IHsKICAgICAgICAgICAgIG5ld1NlbGVjdGlvbiA9IFZpc2libGVTZWxlY3Rpb24ocG9zKTsKICAg ICAgICAgICAgIG5ld1NlbGVjdGlvbi5leHBhbmRVc2luZ0dyYW51bGFyaXR5KFdvcmRHcmFudWxh cml0eSk7CkBAIC00OTgsNyArNDk4LDcgQEAgdm9pZCBFdmVudEhhbmRsZXI6OnNlbGVjdENsb3Nl c3RXb3JkRnJvbUhpdFRlc3RSZXN1bHQoY29uc3QgSGl0VGVzdFJlc3VsdCYgcmVzdWwKICAgICAg ICAgaWYgKGFwcGVuZFRyYWlsaW5nV2hpdGVzcGFjZSA9PSBTaG91bGRBcHBlbmRUcmFpbGluZ1do aXRlc3BhY2UgJiYgbmV3U2VsZWN0aW9uLmlzUmFuZ2UoKSkKICAgICAgICAgICAgIG5ld1NlbGVj dGlvbi5hcHBlbmRUcmFpbGluZ1doaXRlc3BhY2UoKTsKIAotICAgICAgICB1cGRhdGVTZWxlY3Rp b25Gb3JNb3VzZURvd25EaXNwYXRjaGluZ1NlbGVjdFN0YXJ0KGlubmVyTm9kZSwgZXhwYW5kU2Vs ZWN0aW9uVG9SZXNwZWN0VXNlclNlbGVjdEFsbChpbm5lck5vZGUsIG5ld1NlbGVjdGlvbiksIFdv cmRHcmFudWxhcml0eSk7CisgICAgICAgIHVwZGF0ZVNlbGVjdGlvbkZvck1vdXNlRG93bkRpc3Bh dGNoaW5nU2VsZWN0U3RhcnQodGFyZ2V0Tm9kZSwgZXhwYW5kU2VsZWN0aW9uVG9SZXNwZWN0VXNl clNlbGVjdEFsbCh0YXJnZXROb2RlLCBuZXdTZWxlY3Rpb24pLCBXb3JkR3JhbnVsYXJpdHkpOwog ICAgIH0KIH0KIApAQCAtNTE1LDE2ICs1MTUsMTYgQEAgdm9pZCBFdmVudEhhbmRsZXI6OnNlbGVj dENsb3Nlc3RXb3JkT3JMaW5rRnJvbU1vdXNlRXZlbnQoY29uc3QgTW91c2VFdmVudFdpdGhIaXQK ICAgICBpZiAoIXJlc3VsdC5oaXRUZXN0UmVzdWx0KCkuaXNMaXZlTGluaygpKQogICAgICAgICBy ZXR1cm4gc2VsZWN0Q2xvc2VzdFdvcmRGcm9tTW91c2VFdmVudChyZXN1bHQpOwogCi0gICAgTm9k ZSogaW5uZXJOb2RlID0gcmVzdWx0LnRhcmdldE5vZGUoKTsKKyAgICBOb2RlKiB0YXJnZXROb2Rl ID0gcmVzdWx0LnRhcmdldE5vZGUoKTsKIAotICAgIGlmIChpbm5lck5vZGUgJiYgaW5uZXJOb2Rl LT5yZW5kZXJlcigpICYmIG1fbW91c2VEb3duTWF5U3RhcnRTZWxlY3QpIHsKKyAgICBpZiAodGFy Z2V0Tm9kZSAmJiB0YXJnZXROb2RlLT5yZW5kZXJlcigpICYmIG1fbW91c2VEb3duTWF5U3RhcnRT ZWxlY3QpIHsKICAgICAgICAgVmlzaWJsZVNlbGVjdGlvbiBuZXdTZWxlY3Rpb247CiAgICAgICAg IEVsZW1lbnQqIFVSTEVsZW1lbnQgPSByZXN1bHQuaGl0VGVzdFJlc3VsdCgpLlVSTEVsZW1lbnQo KTsKLSAgICAgICAgVmlzaWJsZVBvc2l0aW9uIHBvcyhpbm5lck5vZGUtPnJlbmRlcmVyKCktPnBv c2l0aW9uRm9yUG9pbnQocmVzdWx0LmxvY2FsUG9pbnQoKSkpOworICAgICAgICBWaXNpYmxlUG9z aXRpb24gcG9zKHRhcmdldE5vZGUtPnJlbmRlcmVyKCktPnBvc2l0aW9uRm9yUG9pbnQocmVzdWx0 LmxvY2FsUG9pbnQoKSkpOwogICAgICAgICBpZiAocG9zLmlzTm90TnVsbCgpICYmIHBvcy5kZWVw RXF1aXZhbGVudCgpLmRlcHJlY2F0ZWROb2RlKCktPmlzRGVzY2VuZGFudE9mKFVSTEVsZW1lbnQp KQogICAgICAgICAgICAgbmV3U2VsZWN0aW9uID0gVmlzaWJsZVNlbGVjdGlvbjo6c2VsZWN0aW9u RnJvbUNvbnRlbnRzT2ZOb2RlKFVSTEVsZW1lbnQpOwogCi0gICAgICAgIHVwZGF0ZVNlbGVjdGlv bkZvck1vdXNlRG93bkRpc3BhdGNoaW5nU2VsZWN0U3RhcnQoaW5uZXJOb2RlLCBleHBhbmRTZWxl Y3Rpb25Ub1Jlc3BlY3RVc2VyU2VsZWN0QWxsKGlubmVyTm9kZSwgbmV3U2VsZWN0aW9uKSwgV29y ZEdyYW51bGFyaXR5KTsKKyAgICAgICAgdXBkYXRlU2VsZWN0aW9uRm9yTW91c2VEb3duRGlzcGF0 Y2hpbmdTZWxlY3RTdGFydCh0YXJnZXROb2RlLCBleHBhbmRTZWxlY3Rpb25Ub1Jlc3BlY3RVc2Vy U2VsZWN0QWxsKHRhcmdldE5vZGUsIG5ld1NlbGVjdGlvbiksIFdvcmRHcmFudWxhcml0eSk7CiAg ICAgfQogfQogCkBAIC01NTEsMTggKzU1MSwxOCBAQCBib29sIEV2ZW50SGFuZGxlcjo6aGFuZGxl TW91c2VQcmVzc0V2ZW50VHJpcGxlQ2xpY2soY29uc3QgTW91c2VFdmVudFdpdGhIaXRUZXN0Ugog ICAgIGlmIChldmVudC5ldmVudCgpLmJ1dHRvbigpICE9IExlZnRCdXR0b24pCiAgICAgICAgIHJl dHVybiBmYWxzZTsKICAgICAKLSAgICBOb2RlKiBpbm5lck5vZGUgPSBldmVudC50YXJnZXROb2Rl KCk7Ci0gICAgaWYgKCEoaW5uZXJOb2RlICYmIGlubmVyTm9kZS0+cmVuZGVyZXIoKSAmJiBtX21v dXNlRG93bk1heVN0YXJ0U2VsZWN0KSkKKyAgICBOb2RlKiB0YXJnZXROb2RlID0gZXZlbnQudGFy Z2V0Tm9kZSgpOworICAgIGlmICghKHRhcmdldE5vZGUgJiYgdGFyZ2V0Tm9kZS0+cmVuZGVyZXIo KSAmJiBtX21vdXNlRG93bk1heVN0YXJ0U2VsZWN0KSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwog CiAgICAgVmlzaWJsZVNlbGVjdGlvbiBuZXdTZWxlY3Rpb247Ci0gICAgVmlzaWJsZVBvc2l0aW9u IHBvcyhpbm5lck5vZGUtPnJlbmRlcmVyKCktPnBvc2l0aW9uRm9yUG9pbnQoZXZlbnQubG9jYWxQ b2ludCgpKSk7CisgICAgVmlzaWJsZVBvc2l0aW9uIHBvcyh0YXJnZXROb2RlLT5yZW5kZXJlcigp LT5wb3NpdGlvbkZvclBvaW50KGV2ZW50LmxvY2FsUG9pbnQoKSkpOwogICAgIGlmIChwb3MuaXNO b3ROdWxsKCkpIHsKICAgICAgICAgbmV3U2VsZWN0aW9uID0gVmlzaWJsZVNlbGVjdGlvbihwb3Mp OwogICAgICAgICBuZXdTZWxlY3Rpb24uZXhwYW5kVXNpbmdHcmFudWxhcml0eShQYXJhZ3JhcGhH cmFudWxhcml0eSk7CiAgICAgfQogCi0gICAgcmV0dXJuIHVwZGF0ZVNlbGVjdGlvbkZvck1vdXNl RG93bkRpc3BhdGNoaW5nU2VsZWN0U3RhcnQoaW5uZXJOb2RlLCBleHBhbmRTZWxlY3Rpb25Ub1Jl c3BlY3RVc2VyU2VsZWN0QWxsKGlubmVyTm9kZSwgbmV3U2VsZWN0aW9uKSwgUGFyYWdyYXBoR3Jh bnVsYXJpdHkpOworICAgIHJldHVybiB1cGRhdGVTZWxlY3Rpb25Gb3JNb3VzZURvd25EaXNwYXRj aGluZ1NlbGVjdFN0YXJ0KHRhcmdldE5vZGUsIGV4cGFuZFNlbGVjdGlvblRvUmVzcGVjdFVzZXJT ZWxlY3RBbGwodGFyZ2V0Tm9kZSwgbmV3U2VsZWN0aW9uKSwgUGFyYWdyYXBoR3JhbnVsYXJpdHkp OwogfQogCiBzdGF0aWMgaW50IHRleHREaXN0YW5jZShjb25zdCBQb3NpdGlvbiYgc3RhcnQsIGNv bnN0IFBvc2l0aW9uJiBlbmQpCkBAIC01NzQsOCArNTc0LDggQEAgc3RhdGljIGludCB0ZXh0RGlz dGFuY2UoY29uc3QgUG9zaXRpb24mIHN0YXJ0LCBjb25zdCBQb3NpdGlvbiYgZW5kKQogYm9vbCBF dmVudEhhbmRsZXI6OmhhbmRsZU1vdXNlUHJlc3NFdmVudFNpbmdsZUNsaWNrKGNvbnN0IE1vdXNl RXZlbnRXaXRoSGl0VGVzdFJlc3VsdHMmIGV2ZW50KQogewogICAgIG1fZnJhbWUtPmRvY3VtZW50 KCktPnVwZGF0ZUxheW91dElnbm9yZVBlbmRpbmdTdHlsZXNoZWV0cygpOwotICAgIE5vZGUqIGlu bmVyTm9kZSA9IGV2ZW50LnRhcmdldE5vZGUoKTsKLSAgICBpZiAoIShpbm5lck5vZGUgJiYgaW5u ZXJOb2RlLT5yZW5kZXJlcigpICYmIG1fbW91c2VEb3duTWF5U3RhcnRTZWxlY3QpKQorICAgIE5v ZGUqIHRhcmdldE5vZGUgPSBldmVudC50YXJnZXROb2RlKCk7CisgICAgaWYgKCEodGFyZ2V0Tm9k ZSAmJiB0YXJnZXROb2RlLT5yZW5kZXJlcigpICYmIG1fbW91c2VEb3duTWF5U3RhcnRTZWxlY3Qp KQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICAvLyBFeHRlbmQgdGhlIHNlbGVjdGlvbiBp ZiB0aGUgU2hpZnQga2V5IGlzIGRvd24sIHVubGVzcyB0aGUgY2xpY2sgaXMgaW4gYSBsaW5rLgpA QCAtNTkxLDE2ICs1OTEsMTYgQEAgYm9vbCBFdmVudEhhbmRsZXI6OmhhbmRsZU1vdXNlUHJlc3NF dmVudFNpbmdsZUNsaWNrKGNvbnN0IE1vdXNlRXZlbnRXaXRoSGl0VGVzdFIKICAgICAgICAgfQog ICAgIH0KIAotICAgIFZpc2libGVQb3NpdGlvbiB2aXNpYmxlUG9zKGlubmVyTm9kZS0+cmVuZGVy ZXIoKS0+cG9zaXRpb25Gb3JQb2ludChldmVudC5sb2NhbFBvaW50KCkpKTsKKyAgICBWaXNpYmxl UG9zaXRpb24gdmlzaWJsZVBvcyh0YXJnZXROb2RlLT5yZW5kZXJlcigpLT5wb3NpdGlvbkZvclBv aW50KGV2ZW50LmxvY2FsUG9pbnQoKSkpOwogICAgIGlmICh2aXNpYmxlUG9zLmlzTnVsbCgpKQot ICAgICAgICB2aXNpYmxlUG9zID0gVmlzaWJsZVBvc2l0aW9uKGZpcnN0UG9zaXRpb25Jbk9yQmVm b3JlTm9kZShpbm5lck5vZGUpLCBET1dOU1RSRUFNKTsKKyAgICAgICAgdmlzaWJsZVBvcyA9IFZp c2libGVQb3NpdGlvbihmaXJzdFBvc2l0aW9uSW5PckJlZm9yZU5vZGUodGFyZ2V0Tm9kZSksIERP V05TVFJFQU0pOwogICAgIFBvc2l0aW9uIHBvcyA9IHZpc2libGVQb3MuZGVlcEVxdWl2YWxlbnQo KTsKIAogICAgIFZpc2libGVTZWxlY3Rpb24gbmV3U2VsZWN0aW9uID0gbV9mcmFtZS0+c2VsZWN0 aW9uKCkuc2VsZWN0aW9uKCk7CiAgICAgVGV4dEdyYW51bGFyaXR5IGdyYW51bGFyaXR5ID0gQ2hh cmFjdGVyR3JhbnVsYXJpdHk7CiAKICAgICBpZiAoZXh0ZW5kU2VsZWN0aW9uICYmIG5ld1NlbGVj dGlvbi5pc0NhcmV0T3JSYW5nZSgpKSB7Ci0gICAgICAgIFZpc2libGVTZWxlY3Rpb24gc2VsZWN0 aW9uSW5Vc2VyU2VsZWN0QWxsID0gZXhwYW5kU2VsZWN0aW9uVG9SZXNwZWN0VXNlclNlbGVjdEFs bChpbm5lck5vZGUsIFZpc2libGVTZWxlY3Rpb24ocG9zKSk7CisgICAgICAgIFZpc2libGVTZWxl Y3Rpb24gc2VsZWN0aW9uSW5Vc2VyU2VsZWN0QWxsID0gZXhwYW5kU2VsZWN0aW9uVG9SZXNwZWN0 VXNlclNlbGVjdEFsbCh0YXJnZXROb2RlLCBWaXNpYmxlU2VsZWN0aW9uKHBvcykpOwogICAgICAg ICBpZiAoc2VsZWN0aW9uSW5Vc2VyU2VsZWN0QWxsLmlzUmFuZ2UoKSkgewogICAgICAgICAgICAg aWYgKGNvbXBhcmVQb3NpdGlvbnMoc2VsZWN0aW9uSW5Vc2VyU2VsZWN0QWxsLnN0YXJ0KCksIG5l d1NlbGVjdGlvbi5zdGFydCgpKSA8IDApCiAgICAgICAgICAgICAgICAgcG9zID0gc2VsZWN0aW9u SW5Vc2VyU2VsZWN0QWxsLnN0YXJ0KCk7CkBAIC02MjcsOSArNjI3LDkgQEAgYm9vbCBFdmVudEhh bmRsZXI6OmhhbmRsZU1vdXNlUHJlc3NFdmVudFNpbmdsZUNsaWNrKGNvbnN0IE1vdXNlRXZlbnRX aXRoSGl0VGVzdFIKICAgICAgICAgICAgIG5ld1NlbGVjdGlvbi5leHBhbmRVc2luZ0dyYW51bGFy aXR5KG1fZnJhbWUtPnNlbGVjdGlvbigpLmdyYW51bGFyaXR5KCkpOwogICAgICAgICB9CiAgICAg fSBlbHNlCi0gICAgICAgIG5ld1NlbGVjdGlvbiA9IGV4cGFuZFNlbGVjdGlvblRvUmVzcGVjdFVz ZXJTZWxlY3RBbGwoaW5uZXJOb2RlLCB2aXNpYmxlUG9zKTsKKyAgICAgICAgbmV3U2VsZWN0aW9u ID0gZXhwYW5kU2VsZWN0aW9uVG9SZXNwZWN0VXNlclNlbGVjdEFsbCh0YXJnZXROb2RlLCB2aXNp YmxlUG9zKTsKIAotICAgIGJvb2wgaGFuZGxlZCA9IHVwZGF0ZVNlbGVjdGlvbkZvck1vdXNlRG93 bkRpc3BhdGNoaW5nU2VsZWN0U3RhcnQoaW5uZXJOb2RlLCBuZXdTZWxlY3Rpb24sIGdyYW51bGFy aXR5KTsKKyAgICBib29sIGhhbmRsZWQgPSB1cGRhdGVTZWxlY3Rpb25Gb3JNb3VzZURvd25EaXNw YXRjaGluZ1NlbGVjdFN0YXJ0KHRhcmdldE5vZGUsIG5ld1NlbGVjdGlvbiwgZ3JhbnVsYXJpdHkp OwogCiAgICAgaWYgKGV2ZW50LmV2ZW50KCkuYnV0dG9uKCkgPT0gTWlkZGxlQnV0dG9uKSB7CiAg ICAgICAgIC8vIElnbm9yZSBoYW5kbGVkLCBzaW5jZSB3ZSB3YW50IHRvIHBhc3RlIHRvIHdoZXJl IHRoZSBjYXJldCB3YXMgcGxhY2VkIGFueXdheS4KQEAgLTY5Niw5ICs2OTYsNyBAQCBib29sIEV2 ZW50SGFuZGxlcjo6aGFuZGxlTW91c2VQcmVzc0V2ZW50KGNvbnN0IE1vdXNlRXZlbnRXaXRoSGl0 VGVzdFJlc3VsdHMmIGV2ZQogICAgIGlmIChzaW5nbGVDbGljaykKICAgICAgICAgZm9jdXNEb2N1 bWVudFZpZXcoKTsKIAotICAgIE5vZGUqIGlubmVyTm9kZSA9IGV2ZW50LnRhcmdldE5vZGUoKTsK LQotICAgIG1fbW91c2VQcmVzc05vZGUgPSBpbm5lck5vZGU7CisgICAgbV9tb3VzZVByZXNzTm9k ZSA9IGV2ZW50LnRhcmdldE5vZGUoKTsKICNpZiBFTkFCTEUoRFJBR19TVVBQT1JUKQogICAgIG1f ZHJhZ1N0YXJ0UG9zID0gZXZlbnQuZXZlbnQoKS5wb3NpdGlvbigpOwogI2VuZGlmCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSGl0VGVzdFJlc3VsdC5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvSGl0VGVzdFJlc3VsdC5jcHAKaW5kZXggZDk0MWVkNGRhMDNiYzky N2U4ODYwNTczMzk2MTYxMTE4NmNiZjhjNC4uMjY5OTQwYzEyOWJkYTMzMWViYzdmZDBiY2U1NTVh YzZjNzZlZTM5OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0hpdFRlc3RS ZXN1bHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9IaXRUZXN0UmVzdWx0LmNw cApAQCAtNjkwLDEyICs2OTAsMjIgQEAgTm9kZSogSGl0VGVzdFJlc3VsdDo6dGFyZ2V0Tm9kZSgp IGNvbnN0CiAKIEVsZW1lbnQqIEhpdFRlc3RSZXN1bHQ6OmlubmVyRWxlbWVudCgpIGNvbnN0CiB7 Ci0gICAgZm9yIChOb2RlKiBub2RlID0gbV9pbm5lck5vZGUuZ2V0KCk7IG5vZGU7IG5vZGUgPSBu b2RlLT5wYXJlbnROb2RlKCkpIHsKLSAgICAgICAgaWYgKG5vZGUtPmlzRWxlbWVudE5vZGUoKSkK LSAgICAgICAgICAgIHJldHVybiB0b0VsZW1lbnQobm9kZSk7Ci0gICAgfQorICAgIE5vZGUqIG5v ZGUgPSBtX2lubmVyTm9kZS5nZXQoKTsKKyAgICBpZiAoIW5vZGUpCisgICAgICAgIHJldHVybiAw OworICAgIGlmIChub2RlLT5pc0VsZW1lbnROb2RlKCkpCisgICAgICAgIHJldHVybiB0b0VsZW1l bnQobm9kZSk7CisgICAgcmV0dXJuIG5vZGUtPnBhcmVudEVsZW1lbnQoKTsKK30KIAotICAgIHJl dHVybiAwOworRWxlbWVudCogSGl0VGVzdFJlc3VsdDo6aW5uZXJOb25TaGFyZWRFbGVtZW50KCkg Y29uc3QKK3sKKyAgICBOb2RlKiBub2RlID0gbV9pbm5lck5vblNoYXJlZE5vZGUuZ2V0KCk7Cisg ICAgaWYgKCFub2RlKQorICAgICAgICByZXR1cm4gMDsKKyAgICBpZiAobm9kZS0+aXNFbGVtZW50 Tm9kZSgpKQorICAgICAgICByZXR1cm4gdG9FbGVtZW50KG5vZGUpOworICAgIHJldHVybiBub2Rl LT5wYXJlbnRFbGVtZW50KCk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9IaXRUZXN0UmVzdWx0LmggYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvSGl0VGVzdFJlc3VsdC5oCmluZGV4IGI2Zjc3MDM0NTdjMWEzYTJiOGE5 MDg4N2UzYjBmNThlYTRhNTJiMzAuLmQxM2RiYTM4YzQ4MzcyNjU4OWQ4ZWMwMzE0NmM4MjZkMWIy N2QzMmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9IaXRUZXN0UmVzdWx0 LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0hpdFRlc3RSZXN1bHQuaApAQCAtNjIs NiArNjIsNyBAQCBwdWJsaWM6CiAgICAgTm9kZSogaW5uZXJOb2RlKCkgY29uc3QgeyByZXR1cm4g bV9pbm5lck5vZGUuZ2V0KCk7IH0KICAgICBFbGVtZW50KiBpbm5lckVsZW1lbnQoKSBjb25zdDsK ICAgICBOb2RlKiBpbm5lck5vblNoYXJlZE5vZGUoKSBjb25zdCB7IHJldHVybiBtX2lubmVyTm9u U2hhcmVkTm9kZS5nZXQoKTsgfQorICAgIEVsZW1lbnQqIGlubmVyTm9uU2hhcmVkRWxlbWVudCgp IGNvbnN0OwogICAgIEVsZW1lbnQqIFVSTEVsZW1lbnQoKSBjb25zdCB7IHJldHVybiBtX2lubmVy VVJMRWxlbWVudC5nZXQoKTsgfQogICAgIFNjcm9sbGJhciogc2Nyb2xsYmFyKCkgY29uc3QgeyBy ZXR1cm4gbV9zY3JvbGxiYXIuZ2V0KCk7IH0KICAgICBib29sIGlzT3ZlcldpZGdldCgpIGNvbnN0 IHsgcmV0dXJuIG1faXNPdmVyV2lkZ2V0OyB9Cg==