64209 2011-07-08 15:46:29 -0700 Switch updateHitTestResult to to new layout types 2011-07-10 12:20:56 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 63567 1 eae eae eric leviw webkit.review.bot oldest_to_newest 434342 0 eae 2011-07-08 15:46:29 -0700 Convert updateHitTestResult to new layout abstraction. 434343 1 100172 eae 2011-07-08 15:47:53 -0700 Created attachment 100172 Patch 434562 2 100172 abarth 2011-07-10 08:52:57 -0700 Comment on attachment 100172 Patch This patch has not been reviewed, so it's not ready to commit. Clearing the cq+. 434594 3 100172 eric 2011-07-10 11:59:41 -0700 Comment on attachment 100172 Patch LGTM. 434604 4 100172 webkit.review.bot 2011-07-10 12:20:52 -0700 Comment on attachment 100172 Patch Clearing flags on attachment: 100172 Committed r90698: <http://trac.webkit.org/changeset/90698> 434605 5 webkit.review.bot 2011-07-10 12:20:56 -0700 All reviewed patches have been landed. Closing bug. 100172 2011-07-08 15:47:53 -0700 2011-07-10 12:20:52 -0700 Patch bug-64209-20110708154752.patch text/plain 13076 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDkwNjcwKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzggQEAKKzIwMTEtMDctMDggIEVtaWwgQSBF a2x1bmQgIDxlYWVAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFN3aXRjaCB1cGRhdGVIaXRUZXN0 UmVzdWx0IHRvIHRvIG5ldyBsYXlvdXQgdHlwZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTY0MjA5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBubyBmdW5jdGlvbmFsaXR5IGNoYW5n ZXMuCisKKyAgICAgICAgKiByZW5kZXJpbmcvRWxsaXBzaXNCb3guY3BwOgorICAgICAgICAoV2Vi Q29yZTo6RWxsaXBzaXNCb3g6Om5vZGVBdFBvaW50KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVu ZGVyQmxvY2suY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OmhpdFRlc3RGbG9h dHMpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OnVwZGF0ZUhpdFRlc3RSZXN1bHQp OgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9jay5oOgorICAgICAgICAqIHJlbmRlcmlu Zy9SZW5kZXJJbmxpbmUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVySW5saW5lOjp1cGRh dGVIaXRUZXN0UmVzdWx0KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVySW5saW5lLmg6Cisg ICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxpbmVCb3hMaXN0LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlckxpbmVCb3hMaXN0OjpoaXRUZXN0KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVu ZGVyT2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck9iamVjdDo6dXBkYXRlSGl0 VGVzdFJlc3VsdCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oOgorICAgICAg ICAqIHJlbmRlcmluZy9SZW5kZXJWaWV3LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclZp ZXc6OnVwZGF0ZUhpdFRlc3RSZXN1bHQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJWaWV3 Lmg6CisgICAgICAgICogcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdDb250YWluZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyU1ZHQ29udGFpbmVyOjpub2RlQXRGbG9hdFBvaW50KToKKyAg ICAgICAgKiByZW5kZXJpbmcvc3ZnL1JlbmRlclNWR0ltYWdlLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlclNWR0ltYWdlOjpub2RlQXRGbG9hdFBvaW50KToKKyAgICAgICAgKiByZW5kZXJp bmcvc3ZnL1JlbmRlclNWR1BhdGguY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU1ZHUGF0 aDo6bm9kZUF0RmxvYXRQb2ludCk6CisgICAgICAgICogcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdS b290LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclNWR1Jvb3Q6Om5vZGVBdFBvaW50KToK KwogMjAxMS0wNy0wOCAgQnJpYW4gU2Fsb21vbiAgPGJzYWxvbW9uQGdvb2dsZS5jb20+CiAKICAg ICAgICAgTWFrZSBHTCBjb250ZXh0IGN1cnJlbnQgYmVmb3JlIHVwZGF0aW5nIGxheWVyIHRleHR1 cmUgdXNpbmcgc2tpYS1ncHUKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9FbGxpcHNp c0JveC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0VsbGlwc2lz Qm94LmNwcAkocmV2aXNpb24gOTA2NjcpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvRWxs aXBzaXNCb3guY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMDQsMTUgKzEwNCwxNSBAQCB2b2lkIEVs bGlwc2lzQm94OjpwYWludFNlbGVjdGlvbihHcmFwaGljCiAKIGJvb2wgRWxsaXBzaXNCb3g6Om5v ZGVBdFBvaW50KGNvbnN0IEhpdFRlc3RSZXF1ZXN0JiByZXF1ZXN0LCBIaXRUZXN0UmVzdWx0JiBy ZXN1bHQsIGNvbnN0IExheW91dFBvaW50JiBwb2ludEluQ29udGFpbmVyLCBjb25zdCBMYXlvdXRQ b2ludCYgYWNjdW11bGF0ZWRPZmZzZXQsIGludCBsaW5lVG9wLCBpbnQgbGluZUJvdHRvbSkKIHsK LSAgICBMYXlvdXRQb2ludCBhZGp1c3RlZExvY2F0aW9uID0gYWNjdW11bGF0ZWRPZmZzZXQgKyBy b3VuZGVkSW50UG9pbnQodG9wTGVmdCgpKTsKKyAgICBMYXlvdXRQb2ludCBhZGp1c3RlZExvY2F0 aW9uID0gYWNjdW11bGF0ZWRPZmZzZXQgKyByb3VuZGVkTGF5b3V0UG9pbnQodG9wTGVmdCgpKTsK IAogICAgIC8vIEhpdCB0ZXN0IHRoZSBtYXJrdXAgYm94LgogICAgIGlmIChtX21hcmt1cEJveCkg ewogICAgICAgICBSZW5kZXJTdHlsZSogc3R5bGUgPSBtX3JlbmRlcmVyLT5zdHlsZShtX2ZpcnN0 TGluZSk7CiAgICAgICAgIExheW91dFVuaXQgbXR4ID0gYWRqdXN0ZWRMb2NhdGlvbi54KCkgKyBt X2xvZ2ljYWxXaWR0aCAtIG1fbWFya3VwQm94LT54KCk7CiAgICAgICAgIExheW91dFVuaXQgbXR5 ID0gYWRqdXN0ZWRMb2NhdGlvbi55KCkgKyBzdHlsZS0+Zm9udE1ldHJpY3MoKS5hc2NlbnQoKSAt IChtX21hcmt1cEJveC0+eSgpICsgbV9tYXJrdXBCb3gtPnJlbmRlcmVyKCktPnN0eWxlKG1fZmly c3RMaW5lKS0+Zm9udE1ldHJpY3MoKS5hc2NlbnQoKSk7Ci0gICAgICAgIGlmIChtX21hcmt1cEJv eC0+bm9kZUF0UG9pbnQocmVxdWVzdCwgcmVzdWx0LCBwb2ludEluQ29udGFpbmVyLCBJbnRQb2lu dChtdHgsIG10eSksIGxpbmVUb3AsIGxpbmVCb3R0b20pKSB7Ci0gICAgICAgICAgICByZW5kZXJl cigpLT51cGRhdGVIaXRUZXN0UmVzdWx0KHJlc3VsdCwgcG9pbnRJbkNvbnRhaW5lciAtIEludFNp emUobXR4LCBtdHkpKTsKKyAgICAgICAgaWYgKG1fbWFya3VwQm94LT5ub2RlQXRQb2ludChyZXF1 ZXN0LCByZXN1bHQsIHBvaW50SW5Db250YWluZXIsIExheW91dFBvaW50KG10eCwgbXR5KSwgbGlu ZVRvcCwgbGluZUJvdHRvbSkpIHsKKyAgICAgICAgICAgIHJlbmRlcmVyKCktPnVwZGF0ZUhpdFRl c3RSZXN1bHQocmVzdWx0LCBwb2ludEluQ29udGFpbmVyIC0gTGF5b3V0U2l6ZShtdHgsIG10eSkp OwogICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgIH0KICAgICB9CkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAJKHJldmlzaW9uIDkwNjY3KQorKysg U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAkod29ya2luZyBjb3B5KQpA QCAtNDAyMyw3ICs0MDIzLDcgQEAgYm9vbCBSZW5kZXJCbG9jazo6aGl0VGVzdEZsb2F0cyhjb25z dCBIaQogICAgICAgICAgICAgTGF5b3V0VW5pdCB5T2Zmc2V0ID0geVBvc2l0aW9uRm9yRmxvYXRJ bmNsdWRpbmdNYXJnaW4oZmxvYXRpbmdPYmplY3QpIC0gZmxvYXRpbmdPYmplY3QtPm1fcmVuZGVy ZXItPnkoKTsKICAgICAgICAgICAgIExheW91dFBvaW50IGNoaWxkUG9pbnQgPSBmbGlwRmxvYXRG b3JXcml0aW5nTW9kZShmbG9hdGluZ09iamVjdCwgYWRqdXN0ZWRMb2NhdGlvbiArIExheW91dFNp emUoeE9mZnNldCwgeU9mZnNldCkpOwogICAgICAgICAgICAgaWYgKGZsb2F0aW5nT2JqZWN0LT5t X3JlbmRlcmVyLT5oaXRUZXN0KHJlcXVlc3QsIHJlc3VsdCwgcG9pbnRJbkNvbnRhaW5lciwgY2hp bGRQb2ludCkpIHsKLSAgICAgICAgICAgICAgICB1cGRhdGVIaXRUZXN0UmVzdWx0KHJlc3VsdCwg cG9pbnRJbkNvbnRhaW5lciAtIHRvU2l6ZShjaGlsZFBvaW50KSk7CisgICAgICAgICAgICAgICAg dXBkYXRlSGl0VGVzdFJlc3VsdChyZXN1bHQsIHBvaW50SW5Db250YWluZXIgLSB0b0xheW91dFNp emUoY2hpbGRQb2ludCkpOwogICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAgICAgICAg ICAgfQogICAgICAgICB9CkBAIC01Nzc4LDcgKzU3NzgsNyBAQCB2b2lkIFJlbmRlckJsb2NrOjpj aGlsZEJlY2FtZU5vbklubGluZShSCiAgICAgLy8gfHRoaXN8IG1heSBiZSBkZWFkIGhlcmUKIH0K IAotdm9pZCBSZW5kZXJCbG9jazo6dXBkYXRlSGl0VGVzdFJlc3VsdChIaXRUZXN0UmVzdWx0JiBy ZXN1bHQsIGNvbnN0IEludFBvaW50JiBwb2ludCkKK3ZvaWQgUmVuZGVyQmxvY2s6OnVwZGF0ZUhp dFRlc3RSZXN1bHQoSGl0VGVzdFJlc3VsdCYgcmVzdWx0LCBjb25zdCBMYXlvdXRQb2ludCYgcG9p bnQpCiB7CiAgICAgaWYgKHJlc3VsdC5pbm5lck5vZGUoKSkKICAgICAgICAgcmV0dXJuOwpJbmRl eDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgJKHJldmlzaW9uIDkwNjY3KQor KysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgJKHdvcmtpbmcgY29weSkK QEAgLTMxMSw3ICszMTEsNyBAQCBwcm90ZWN0ZWQ6CiAgICAgdmlydHVhbCBpbnQgZmlyc3RMaW5l Qm94QmFzZWxpbmUoKSBjb25zdDsKICAgICB2aXJ0dWFsIGludCBsYXN0TGluZUJveEJhc2VsaW5l KCkgY29uc3Q7CiAKLSAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlSGl0VGVzdFJlc3VsdChIaXRUZXN0 UmVzdWx0JiwgY29uc3QgSW50UG9pbnQmKTsKKyAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlSGl0VGVz dFJlc3VsdChIaXRUZXN0UmVzdWx0JiwgY29uc3QgTGF5b3V0UG9pbnQmKTsKIAogICAgIC8vIERl bGF5IHVwZGF0ZSBzY3JvbGxiYXIgdW50aWwgZmluaXNoRGVsYXlSZXBhaW50KCkgd2lsbCBiZQog ICAgIC8vIGNhbGxlZC4gVGhpcyBmdW5jdGlvbiBpcyB1c2VkIHdoZW4gYSBmbGV4Ym94IGlzIGxh eWluZyBvdXQgaXRzCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW5saW5l LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW5saW5l LmNwcAkocmV2aXNpb24gOTA2NjcpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy SW5saW5lLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTE5NSwxMyArMTE5NSwxMyBAQCB2b2lkIFJl bmRlcklubGluZTo6Y2hpbGRCZWNhbWVOb25JbmxpbmUoCiAgICAgc3BsaXRGbG93KGJlZm9yZUNo aWxkLCBuZXdCb3gsIGNoaWxkLCBvbGRDb250aW51YXRpb24pOwogfQogCi12b2lkIFJlbmRlcklu bGluZTo6dXBkYXRlSGl0VGVzdFJlc3VsdChIaXRUZXN0UmVzdWx0JiByZXN1bHQsIGNvbnN0IElu dFBvaW50JiBwb2ludCkKK3ZvaWQgUmVuZGVySW5saW5lOjp1cGRhdGVIaXRUZXN0UmVzdWx0KEhp dFRlc3RSZXN1bHQmIHJlc3VsdCwgY29uc3QgTGF5b3V0UG9pbnQmIHBvaW50KQogewogICAgIGlm IChyZXN1bHQuaW5uZXJOb2RlKCkpCiAgICAgICAgIHJldHVybjsKIAogICAgIE5vZGUqIG4gPSBu b2RlKCk7Ci0gICAgSW50UG9pbnQgbG9jYWxQb2ludChwb2ludCk7CisgICAgTGF5b3V0UG9pbnQg bG9jYWxQb2ludChwb2ludCk7CiAgICAgaWYgKG4pIHsKICAgICAgICAgaWYgKGlzSW5saW5lRWxl bWVudENvbnRpbnVhdGlvbigpKSB7CiAgICAgICAgICAgICAvLyBXZSdyZSBpbiB0aGUgY29udGlu dWF0aW9uIG9mIGEgc3BsaXQgaW5saW5lLiAgQWRqdXN0IG91ciBsb2NhbCBwb2ludCB0byBiZSBp biB0aGUgY29vcmRpbmF0ZSBzcGFjZQpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlcklubGluZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJJbmxpbmUuaAkocmV2aXNpb24gOTA2NjcpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVySW5saW5lLmgJKHdvcmtpbmcgY29weSkKQEAgLTE1MCw3ICsxNTAsNyBAQCBwcml2YXRl OgogICAgIAogICAgIHZpcnR1YWwgdm9pZCBjaGlsZEJlY2FtZU5vbklubGluZShSZW5kZXJPYmpl Y3QqIGNoaWxkKTsKIAotICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVIaXRUZXN0UmVzdWx0KEhpdFRl c3RSZXN1bHQmLCBjb25zdCBJbnRQb2ludCYpOworICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVIaXRU ZXN0UmVzdWx0KEhpdFRlc3RSZXN1bHQmLCBjb25zdCBMYXlvdXRQb2ludCYpOwogCiAgICAgdmly dHVhbCB2b2lkIGltYWdlQ2hhbmdlZChXcmFwcGVkSW1hZ2VQdHIsIGNvbnN0IEludFJlY3QqID0g MCk7CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMaW5lQm94TGlzdC5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpbmVCb3hM aXN0LmNwcAkocmV2aXNpb24gOTA2NjcpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyTGluZUJveExpc3QuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMDAsNyArMzAwLDcgQEAgYm9v bCBSZW5kZXJMaW5lQm94TGlzdDo6aGl0VGVzdChSZW5kZXJCbwogICAgICAgICBpZiAocmFuZ2VJ bnRlcnNlY3RzUmVjdChyZW5kZXJlciwgY3Vyci0+bG9naWNhbFRvcFZpc3VhbE92ZXJmbG93KHJv b3QtPmxpbmVUb3AoKSksIGN1cnItPmxvZ2ljYWxCb3R0b21WaXN1YWxPdmVyZmxvdyhyb290LT5s aW5lQm90dG9tKCkpLCByZWN0LCBhY2N1bXVsYXRlZE9mZnNldCkpIHsKICAgICAgICAgICAgIGJv b2wgaW5zaWRlID0gY3Vyci0+bm9kZUF0UG9pbnQocmVxdWVzdCwgcmVzdWx0LCBwb2ludEluQ29u dGFpbmVyLCBhY2N1bXVsYXRlZE9mZnNldCwgcm9vdC0+bGluZVRvcCgpLCByb290LT5saW5lQm90 dG9tKCkpOwogICAgICAgICAgICAgaWYgKGluc2lkZSkgewotICAgICAgICAgICAgICAgIHJlbmRl cmVyLT51cGRhdGVIaXRUZXN0UmVzdWx0KHJlc3VsdCwgdG9Qb2ludChwb2ludEluQ29udGFpbmVy IC0gYWNjdW11bGF0ZWRPZmZzZXQpKTsKKyAgICAgICAgICAgICAgICByZW5kZXJlci0+dXBkYXRl SGl0VGVzdFJlc3VsdChyZXN1bHQsIHBvaW50SW5Db250YWluZXIgLSB0b0xheW91dFNpemUoYWNj dW11bGF0ZWRPZmZzZXQpKTsKICAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAg ICAgIH0KICAgICAgICAgfQpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9i amVjdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9i amVjdC5jcHAJKHJldmlzaW9uIDkwNjY3KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlck9iamVjdC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIxNjgsNyArMjE2OCw3IEBAIGJvb2wg UmVuZGVyT2JqZWN0OjpoaXRUZXN0KGNvbnN0IEhpdFRlc3QKICAgICByZXR1cm4gaW5zaWRlOwog fQogCi12b2lkIFJlbmRlck9iamVjdDo6dXBkYXRlSGl0VGVzdFJlc3VsdChIaXRUZXN0UmVzdWx0 JiByZXN1bHQsIGNvbnN0IEludFBvaW50JiBwb2ludCkKK3ZvaWQgUmVuZGVyT2JqZWN0Ojp1cGRh dGVIaXRUZXN0UmVzdWx0KEhpdFRlc3RSZXN1bHQmIHJlc3VsdCwgY29uc3QgTGF5b3V0UG9pbnQm IHBvaW50KQogewogICAgIGlmIChyZXN1bHQuaW5uZXJOb2RlKCkpCiAgICAgICAgIHJldHVybjsK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmgJKHJldmlzaW9uIDkw NjY3KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oCSh3b3JraW5n IGNvcHkpCkBAIC01NTAsNyArNTUwLDcgQEAgcHVibGljOgogCiAgICAgYm9vbCBoaXRUZXN0KGNv bnN0IEhpdFRlc3RSZXF1ZXN0JiwgSGl0VGVzdFJlc3VsdCYsIGNvbnN0IExheW91dFBvaW50JiBw b2ludEluQ29udGFpbmVyLCBjb25zdCBMYXlvdXRQb2ludCYgYWNjdW11bGF0ZWRPZmZzZXQsIEhp dFRlc3RGaWx0ZXIgPSBIaXRUZXN0QWxsKTsKICAgICB2aXJ0dWFsIGJvb2wgbm9kZUF0UG9pbnQo Y29uc3QgSGl0VGVzdFJlcXVlc3QmLCBIaXRUZXN0UmVzdWx0JiwgY29uc3QgTGF5b3V0UG9pbnQm IHBvaW50SW5Db250YWluZXIsIGNvbnN0IExheW91dFBvaW50JiBhY2N1bXVsYXRlZE9mZnNldCwg SGl0VGVzdEFjdGlvbik7Ci0gICAgdmlydHVhbCB2b2lkIHVwZGF0ZUhpdFRlc3RSZXN1bHQoSGl0 VGVzdFJlc3VsdCYsIGNvbnN0IEludFBvaW50Jik7CisgICAgdmlydHVhbCB2b2lkIHVwZGF0ZUhp dFRlc3RSZXN1bHQoSGl0VGVzdFJlc3VsdCYsIGNvbnN0IExheW91dFBvaW50Jik7CiAKICAgICB2 aXJ0dWFsIFZpc2libGVQb3NpdGlvbiBwb3NpdGlvbkZvclBvaW50KGNvbnN0IEludFBvaW50Jik7 CiAgICAgVmlzaWJsZVBvc2l0aW9uIGNyZWF0ZVZpc2libGVQb3NpdGlvbihpbnQgb2Zmc2V0LCBF QWZmaW5pdHkpOwpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3LmNwcAko cmV2aXNpb24gOTA2NjcpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTcwOCw3ICs3MDgsNyBAQCBib29sIFJlbmRlclZpZXc6OnNo b3VsZERpc2FibGVMYXlvdXRTdGF0CiAgICAgcmV0dXJuIGZhbHNlOwogfQogCi12b2lkIFJlbmRl clZpZXc6OnVwZGF0ZUhpdFRlc3RSZXN1bHQoSGl0VGVzdFJlc3VsdCYgcmVzdWx0LCBjb25zdCBJ bnRQb2ludCYgcG9pbnQpCit2b2lkIFJlbmRlclZpZXc6OnVwZGF0ZUhpdFRlc3RSZXN1bHQoSGl0 VGVzdFJlc3VsdCYgcmVzdWx0LCBjb25zdCBMYXlvdXRQb2ludCYgcG9pbnQpCiB7CiAgICAgaWYg KHJlc3VsdC5pbm5lck5vZGUoKSkKICAgICAgICAgcmV0dXJuOwpJbmRleDogU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyVmlldy5oCShyZXZpc2lvbiA5MDY2NykKKysrIFNvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJWaWV3LmgJKHdvcmtpbmcgY29weSkKQEAgLTEyNSw3ICsxMjUsNyBA QCBwdWJsaWM6CiAgICAgYm9vbCBsYXlvdXRTdGF0ZUVuYWJsZWQoKSBjb25zdCB7IHJldHVybiBt X2xheW91dFN0YXRlRGlzYWJsZUNvdW50ID09IDAgJiYgbV9sYXlvdXRTdGF0ZTsgfQogICAgIExh eW91dFN0YXRlKiBsYXlvdXRTdGF0ZSgpIGNvbnN0IHsgcmV0dXJuIG1fbGF5b3V0U3RhdGU7IH0K IAotICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVIaXRUZXN0UmVzdWx0KEhpdFRlc3RSZXN1bHQmLCBj b25zdCBJbnRQb2ludCYpOworICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVIaXRUZXN0UmVzdWx0KEhp dFRlc3RSZXN1bHQmLCBjb25zdCBMYXlvdXRQb2ludCYpOwogCiAgICAgdW5zaWduZWQgcGFnZUxv Z2ljYWxIZWlnaHQoKSBjb25zdCB7IHJldHVybiBtX3BhZ2VMb2dpY2FsSGVpZ2h0OyB9CiAgICAg dm9pZCBzZXRQYWdlTG9naWNhbEhlaWdodCh1bnNpZ25lZCBoZWlnaHQpCkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR0NvbnRhaW5lci5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdDb250YWluZXIuY3BwCShy ZXZpc2lvbiA5MDY2NykKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZH Q29udGFpbmVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTY5LDcgKzE2OSw3IEBAIGJvb2wgUmVu ZGVyU1ZHQ29udGFpbmVyOjpub2RlQXRGbG9hdFBvaW4KICAgICAgICAgICAgICAgICAKICAgICBm b3IgKFJlbmRlck9iamVjdCogY2hpbGQgPSBsYXN0Q2hpbGQoKTsgY2hpbGQ7IGNoaWxkID0gY2hp bGQtPnByZXZpb3VzU2libGluZygpKSB7CiAgICAgICAgIGlmIChjaGlsZC0+bm9kZUF0RmxvYXRQ b2ludChyZXF1ZXN0LCByZXN1bHQsIGxvY2FsUG9pbnQsIGhpdFRlc3RBY3Rpb24pKSB7Ci0gICAg ICAgICAgICB1cGRhdGVIaXRUZXN0UmVzdWx0KHJlc3VsdCwgcm91bmRlZEludFBvaW50KGxvY2Fs UG9pbnQpKTsKKyAgICAgICAgICAgIHVwZGF0ZUhpdFRlc3RSZXN1bHQocmVzdWx0LCByb3VuZGVk TGF5b3V0UG9pbnQobG9jYWxQb2ludCkpOwogICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAg ICAgIH0KICAgICB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNW R0ltYWdlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1Jl bmRlclNWR0ltYWdlLmNwcAkocmV2aXNpb24gOTA2NjcpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvc3ZnL1JlbmRlclNWR0ltYWdlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTU3LDcgKzE1 Nyw3IEBAIGJvb2wgUmVuZGVyU1ZHSW1hZ2U6Om5vZGVBdEZsb2F0UG9pbnQoY28KIAogICAgICAg ICBpZiAoaGl0UnVsZXMuY2FuSGl0RmlsbCkgewogICAgICAgICAgICAgaWYgKG1fb2JqZWN0Qm91 bmRpbmdCb3guY29udGFpbnMobG9jYWxQb2ludCkpIHsKLSAgICAgICAgICAgICAgICB1cGRhdGVI aXRUZXN0UmVzdWx0KHJlc3VsdCwgcm91bmRlZEludFBvaW50KGxvY2FsUG9pbnQpKTsKKyAgICAg ICAgICAgICAgICB1cGRhdGVIaXRUZXN0UmVzdWx0KHJlc3VsdCwgcm91bmRlZExheW91dFBvaW50 KGxvY2FsUG9pbnQpKTsKICAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAgICAg IH0KICAgICAgICAgfQpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJT VkdQYXRoLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1Jl bmRlclNWR1BhdGguY3BwCShyZXZpc2lvbiA5MDY2NykKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9zdmcvUmVuZGVyU1ZHUGF0aC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI2Myw3ICsyNjMs NyBAQCBib29sIFJlbmRlclNWR1BhdGg6Om5vZGVBdEZsb2F0UG9pbnQoY29uCiAgICAgICAgICAg ICBmaWxsUnVsZSA9IHN2Z1N0eWxlLT5jbGlwUnVsZSgpOwogICAgICAgICBpZiAoKGhpdFJ1bGVz LmNhbkhpdFN0cm9rZSAmJiAoc3ZnU3R5bGUtPmhhc1N0cm9rZSgpIHx8ICFoaXRSdWxlcy5yZXF1 aXJlU3Ryb2tlKSAmJiBzdHJva2VDb250YWlucyhsb2NhbFBvaW50LCBoaXRSdWxlcy5yZXF1aXJl U3Ryb2tlKSkKICAgICAgICAgICAgIHx8IChoaXRSdWxlcy5jYW5IaXRGaWxsICYmIChzdmdTdHls ZS0+aGFzRmlsbCgpIHx8ICFoaXRSdWxlcy5yZXF1aXJlRmlsbCkgJiYgZmlsbENvbnRhaW5zKGxv Y2FsUG9pbnQsIGhpdFJ1bGVzLnJlcXVpcmVGaWxsLCBmaWxsUnVsZSkpKSB7Ci0gICAgICAgICAg ICB1cGRhdGVIaXRUZXN0UmVzdWx0KHJlc3VsdCwgcm91bmRlZEludFBvaW50KGxvY2FsUG9pbnQp KTsKKyAgICAgICAgICAgIHVwZGF0ZUhpdFRlc3RSZXN1bHQocmVzdWx0LCByb3VuZGVkTGF5b3V0 UG9pbnQobG9jYWxQb2ludCkpOwogICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgIH0K ICAgICB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jvb3Qu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZH Um9vdC5jcHAJKHJldmlzaW9uIDkwNjY3KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2 Zy9SZW5kZXJTVkdSb290LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDY0LDcgKzQ2NCw3IEBAIGJv b2wgUmVuZGVyU1ZHUm9vdDo6bm9kZUF0UG9pbnQoY29uc3QgSGkKICAgICAgICAgLy8gaGl0IHRl c3Rpbmcgd291bGQgc3RvcCBpbW1lZGlhdGVseS4gRm9yIFNWRyBvbmx5IHRyZWVzIHRoaXMgZG9l c24ndCBtYXR0ZXIuIFRob3VnaCB3aGVuIHdlIGhhdmUgYSA8Zm9yZWlnbk9iamVjdD4gc3VidHJl ZSB3ZSBuZWVkCiAgICAgICAgIC8vIHRvIGJlIGFibGUgdG8gZGV0ZWN0IGhpdHMgb24gdGhlIGJh Y2tncm91bmQgb2YgYSA8ZGl2PiBlbGVtZW50LiBJZiB3ZSdkIHJldHVybiB0cnVlIGhlcmUgaW4g dGhlICdGb3JlZ3JvdW5kJyBwaGFzZSwgd2UgYXJlIG5vdCBhYmxlIAogICAgICAgICAvLyB0byBk ZXRlY3QgdGhlc2UgaGl0cyBhbnltb3JlLgotICAgICAgICB1cGRhdGVIaXRUZXN0UmVzdWx0KHJl c3VsdCwgcm91bmRlZEludFBvaW50KGxvY2FsUG9pbnQpKTsKKyAgICAgICAgdXBkYXRlSGl0VGVz dFJlc3VsdChyZXN1bHQsIHJvdW5kZWRMYXlvdXRQb2ludChsb2NhbFBvaW50KSk7CiAgICAgICAg IHJldHVybiB0cnVlOwogICAgIH0KIAo=