94087 2012-08-15 02:00:35 -0700 [Chromium] Refactoring: Introduce a new function for some part of PopupContainer::layoutAndCalculateWidgetRect() 2012-08-15 23:01:53 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 94086 1 tkent tkent apavlov morrita webkit.review.bot oldest_to_newest 695846 0 tkent 2012-08-15 02:00:35 -0700 Refactoring: Introduce a new function for some part of PopupContainer::layoutAndCalculateWidgetRect() 695856 1 158530 tkent 2012-08-15 02:21:04 -0700 Created attachment 158530 Patch 696733 2 158530 morrita 2012-08-15 22:02:37 -0700 Comment on attachment 158530 Patch The code move itself looks sane. Please explain the intention behind this change if there is any. 696736 3 158708 tkent 2012-08-15 22:10:29 -0700 Created attachment 158708 Patch for landing Update ChangeLog 696769 4 158708 webkit.review.bot 2012-08-15 23:01:49 -0700 Comment on attachment 158708 Patch for landing Clearing flags on attachment: 158708 Committed r125749: <http://trac.webkit.org/changeset/125749> 696770 5 webkit.review.bot 2012-08-15 23:01:53 -0700 All reviewed patches have been landed. Closing bug. 158530 2012-08-15 02:21:04 -0700 2012-08-15 22:10:24 -0700 Patch bug-94087-20120815182030.patch text/plain 11642 tkent U3VidmVyc2lvbiBSZXZpc2lvbjogMTI1NjI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDI5ZDlmMDg0Nzc4ZGEx NzkxNjFhNDg2ODk3ODBkZjFiZTZkOGQ4Zi4uNjcyOTZlMWU2YmEzYjBjYTIzODk2OThiMGZmYjBk ZjIyOWVlMjFlMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDEyLTA4LTE1ICBLZW50 IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KKworICAgICAgICBbQ2hyb21pdW1dIFJlZmFj dG9yaW5nOiBJbnRyb2R1Y2UgYSBuZXcgZnVuY3Rpb24gZm9yIHNvbWUgcGFydCBvZiBQb3B1cENv bnRhaW5lcjo6bGF5b3V0QW5kQ2FsY3VsYXRlV2lkZ2V0UmVjdCgpCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NDA4NworCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1vdmUgc29tZSBwYXJ0IG9mIFBvcHVwQ29u dGFpbmVyOjpsYXlvdXRBbmRDYWxjdWxhdGVXaWRnZXRSZWN0KCkKKyAgICAgICAgdG8gYSBuZXcg ZnVuY3Rpb24gd2hpY2ggaXMgbm90IGEgbWVtYmVyIG9mIFBvcHVwQ29udGFpbmVyLgorCisgICAg ICAgIE5vIG5ldyB0ZXN0cy4gUG9wdXAgcG9zaXRpb25pbmcgY29kZSBpcyBub3QgdGVzdGFibGUg aW4gV2ViS2l0LgorCisgICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0vUG9wdXBDb250YWluZXIu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6bGF5b3V0QW5kQ2FsY3VsYXRlV2lkZ2V0UmVjdEludGVy bmFsKToKKyAgICAgICAgQWRkZWQuIE1vdmUgdGhlIGNvZGUgZnJvbSBQb3B1cENvbnRhaW5lcjo6 bGF5b3V0QW5kQ2FsY3VsYXRlV2lkZ2V0UmVjdC4KKyAgICAgICAgSW4gb3JkZXIgdG8gYXZvaWQg dG8gY2FsbCBtZW1iZXIgZnVuY3Rpb25zIG9mIFBvcHVwQ29udGFpbmVyLCB3ZQorICAgICAgICBk b24ndCBjYWxsIGxheW91dEFuZEdldFJUTE9mZnNldCgpIGFuZCBoZWlnaHQoKS4gVXNlCisgICAg ICAgIFBvcHVwTGlzdEJveDo6bGF5b3V0KCkgdG8gcmVjYWxjIHRoZSBwb3B1cCBjb250ZW50IHNp emUsIGFuZCB1c2UKKyAgICAgICAgUG9wdXBMaXN0Qm94OjpoZWlnaHQoKSArIGtCb3JkZXJTaXpl ICogMiBpbnN0ZWFkIG9mIGhlaWdodCgpLiBXZQorICAgICAgICByZXNpemUgdGhlIHZpZXcgYWZ0 ZXIgZmluaXNoaW5nCisgICAgICAgIGxheW91dEFuZENhbGN1bGF0ZVdpZGdldFJlY3RJbnRlcm5h bCBpbgorICAgICAgICBQb3B1cENvbnRhaW5lcjo6bGF5b3V0QW5kQ2FsY3VsYXRlV2lkZ2V0UmVj dC4KKyAgICAgICAgKFdlYkNvcmU6OlBvcHVwQ29udGFpbmVyOjpsYXlvdXRBbmRDYWxjdWxhdGVX aWRnZXRSZWN0KToKKyAgICAgICAgTW92ZSBzb21lIGNvZGUgdG8gbGF5b3V0QW5kQ2FsY3VsYXRl V2lkZ2V0UmVjdEludGVybmFsLgorICAgICAgICAoV2ViQ29yZTo6UG9wdXBDb250YWluZXI6OmZp dFRvTGlzdEJveCk6CisgICAgICAgIEFkZGVkLiBNb3ZlIHRoZSBjb2RlIGZyb20gUG9wdXBDb250 YWluZXI6OmxheW91dEFuZEdldFJUTE9mZnNldC4KKyAgICAgICAgKFdlYkNvcmU6OlBvcHVwQ29u dGFpbmVyOjpsYXlvdXRBbmRHZXRSVExPZmZzZXQpOgorICAgICAgICBNb3ZlIHNvbWUgY29kZSB0 byBmaXRUb0xpc3RCb3guCisgICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0vUG9wdXBDb250YWlu ZXIuaDoKKyAgICAgICAgKFBvcHVwQ29udGFpbmVyKTogQWRkZWQgZml0VG9MaXN0Qm94LgorCiAy MDEyLTA4LTE0ICBIYXlhdG8gSXRvICA8aGF5YXRvQGNocm9taXVtLm9yZz4KIAogICAgICAgICBS ZWZhY3RvciBFdmVudERpc3BhdGNoZXIsIG1vdmluZyBjb2RlIHRvIG1ha2UgYWN0dWFsIGNoYW5n ZXMgZWFzaWVyIHRvIHJldmlldyBsYXRlci4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2Nocm9taXVtL1BvcHVwQ29udGFpbmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2Nocm9taXVtL1BvcHVwQ29udGFpbmVyLmNwcAppbmRleCBiODA2YjNjNTU4NTZlZmI0YWZh NTRlMTAyYTAzOWE2NzNiZGI2MWNiLi45ZGFlOWY1M2VjZGM3ZmY2NTg3OWVmZjkzNThhZDdjNWFm NzQ0ZWVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9Qb3B1 cENvbnRhaW5lci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUG9w dXBDb250YWluZXIuY3BwCkBAIC0xMTcsNiArMTE3LDU5IEBAIFBvcHVwQ29udGFpbmVyOjp+UG9w dXBDb250YWluZXIoKQogICAgICAgICByZW1vdmVDaGlsZChtX2xpc3RCb3guZ2V0KCkpOwogfQog CitzdGF0aWMgSW50UmVjdCBsYXlvdXRBbmRDYWxjdWxhdGVXaWRnZXRSZWN0SW50ZXJuYWwoSW50 UmVjdCB3aWRnZXRSZWN0SW5TY3JlZW4sIGludCB0YXJnZXRDb250cm9sSGVpZ2h0LCBjb25zdCBG bG9hdFJlY3QmIHdpbmRvd1JlY3QsIGNvbnN0IEZsb2F0UmVjdCYgc2NyZWVuLCBib29sIGlzUlRM LCBjb25zdCBpbnQgcnRsT2Zmc2V0LCBQb3B1cExpc3RCb3gqIGxpc3RCb3gsIGJvb2wmIG5lZWRU b1Jlc2l6ZVZpZXcpCit7CisgICAgQVNTRVJUKGxpc3RCb3gpOworICAgIGlmICh3aW5kb3dSZWN0 LngoKSA+PSBzY3JlZW4ueCgpICYmIHdpbmRvd1JlY3QubWF4WCgpIDw9IHNjcmVlbi5tYXhYKCkg JiYgKHdpZGdldFJlY3RJblNjcmVlbi54KCkgPCBzY3JlZW4ueCgpIHx8IHdpZGdldFJlY3RJblNj cmVlbi5tYXhYKCkgPiBzY3JlZW4ubWF4WCgpKSkgeworICAgICAgICAvLyBGaXJzdCwgaW52ZXJz ZSB0aGUgcG9wdXAgYWxpZ25tZW50IGlmIGl0IGRvZXMgbm90IGZpdCB0aGUgc2NyZWVuIC0KKyAg ICAgICAgLy8gdGhpcyBtaWdodCBmaXggdGhpbmdzIChvciBtYWtlIHRoZW0gYmV0dGVyKS4KKyAg ICAgICAgSW50UmVjdCBpbnZlcnNlV2lkZ2V0UmVjdEluU2NyZWVuID0gd2lkZ2V0UmVjdEluU2Ny ZWVuOworICAgICAgICBpbnZlcnNlV2lkZ2V0UmVjdEluU2NyZWVuLnNldFgoaW52ZXJzZVdpZGdl dFJlY3RJblNjcmVlbi54KCkgKyAoaXNSVEwgPyAtcnRsT2Zmc2V0IDogcnRsT2Zmc2V0KSk7Cisg ICAgICAgIEludFJlY3QgZW5jbG9zaW5nU2NyZWVuID0gZW5jbG9zaW5nSW50UmVjdChzY3JlZW4p OworICAgICAgICB1bnNpZ25lZCBvcmlnaW5hbEN1dG9mZiA9IHN0ZDo6bWF4KGVuY2xvc2luZ1Nj cmVlbi54KCkgLSB3aWRnZXRSZWN0SW5TY3JlZW4ueCgpLCAwKSArIHN0ZDo6bWF4KHdpZGdldFJl Y3RJblNjcmVlbi5tYXhYKCkgLSBlbmNsb3NpbmdTY3JlZW4ubWF4WCgpLCAwKTsKKyAgICAgICAg dW5zaWduZWQgaW52ZXJzZUN1dG9mZiA9IHN0ZDo6bWF4KGVuY2xvc2luZ1NjcmVlbi54KCkgLSBp bnZlcnNlV2lkZ2V0UmVjdEluU2NyZWVuLngoKSwgMCkgKyBzdGQ6Om1heChpbnZlcnNlV2lkZ2V0 UmVjdEluU2NyZWVuLm1heFgoKSAtIGVuY2xvc2luZ1NjcmVlbi5tYXhYKCksIDApOworCisgICAg ICAgIC8vIEFjY2VwdCB0aGUgaW52ZXJzZSBwb3B1cCBhbGlnbm1lbnQgaWYgdGhlIHRyaW1tZWQg Y29udGVudCBnZXRzCisgICAgICAgIC8vIHNob3J0ZXIgdGhhbiB0aGF0IGluIHRoZSBvcmlnaW5h bCBhbGlnbm1lbnQgY2FzZS4KKyAgICAgICAgaWYgKGludmVyc2VDdXRvZmYgPCBvcmlnaW5hbEN1 dG9mZikKKyAgICAgICAgICAgIHdpZGdldFJlY3RJblNjcmVlbiA9IGludmVyc2VXaWRnZXRSZWN0 SW5TY3JlZW47CisKKyAgICAgICAgaWYgKHdpZGdldFJlY3RJblNjcmVlbi54KCkgPCBzY3JlZW4u eCgpKSB7CisgICAgICAgICAgICB1bnNpZ25lZCB3aWRnZXRSaWdodCA9IHdpZGdldFJlY3RJblNj cmVlbi5tYXhYKCk7CisgICAgICAgICAgICB3aWRnZXRSZWN0SW5TY3JlZW4uc2V0V2lkdGgod2lk Z2V0UmVjdEluU2NyZWVuLm1heFgoKSAtIHNjcmVlbi54KCkpOworICAgICAgICAgICAgd2lkZ2V0 UmVjdEluU2NyZWVuLnNldFgod2lkZ2V0UmlnaHQgLSB3aWRnZXRSZWN0SW5TY3JlZW4ud2lkdGgo KSk7CisgICAgICAgICAgICBsaXN0Qm94LT5zZXRNYXhXaWR0aEFuZExheW91dChzdGQ6Om1heCh3 aWRnZXRSZWN0SW5TY3JlZW4ud2lkdGgoKSAtIGtCb3JkZXJTaXplICogMiwgMCkpOworICAgICAg ICB9IGVsc2UgaWYgKHdpZGdldFJlY3RJblNjcmVlbi5tYXhYKCkgPiBzY3JlZW4ubWF4WCgpKSB7 CisgICAgICAgICAgICB3aWRnZXRSZWN0SW5TY3JlZW4uc2V0V2lkdGgoc2NyZWVuLm1heFgoKSAt IHdpZGdldFJlY3RJblNjcmVlbi54KCkpOworICAgICAgICAgICAgbGlzdEJveC0+c2V0TWF4V2lk dGhBbmRMYXlvdXQoc3RkOjptYXgod2lkZ2V0UmVjdEluU2NyZWVuLndpZHRoKCkgLSBrQm9yZGVy U2l6ZSAqIDIsIDApKTsKKyAgICAgICAgfQorICAgIH0KKworICAgIC8vIENhbGN1bGF0ZSBZIGF4 aXMgc2l6ZS4KKyAgICBpZiAod2lkZ2V0UmVjdEluU2NyZWVuLm1heFkoKSA+IHN0YXRpY19jYXN0 PGludD4oc2NyZWVuLm1heFkoKSkpIHsKKyAgICAgICAgaWYgKHdpZGdldFJlY3RJblNjcmVlbi55 KCkgLSB3aWRnZXRSZWN0SW5TY3JlZW4uaGVpZ2h0KCkgLSB0YXJnZXRDb250cm9sSGVpZ2h0ID4g MCkgeworICAgICAgICAgICAgLy8gVGhlcmUgaXMgZW5vdWdoIHJvb20gdG8gb3BlbiB1cHdhcmRz LgorICAgICAgICAgICAgd2lkZ2V0UmVjdEluU2NyZWVuLm1vdmUoMCwgLSh3aWRnZXRSZWN0SW5T Y3JlZW4uaGVpZ2h0KCkgKyB0YXJnZXRDb250cm9sSGVpZ2h0KSk7CisgICAgICAgIH0gZWxzZSB7 CisgICAgICAgICAgICAvLyBGaWd1cmUgd2hldGhlciB1cHdhcmRzIG9yIGRvd253YXJkcyBoYXMg bW9yZSByb29tIGFuZCBzZXQgdGhlCisgICAgICAgICAgICAvLyBtYXhpbXVtIG51bWJlciBvZiBp dGVtcy4KKyAgICAgICAgICAgIGludCBzcGFjZUFib3ZlID0gd2lkZ2V0UmVjdEluU2NyZWVuLnko KSAtIHRhcmdldENvbnRyb2xIZWlnaHQ7CisgICAgICAgICAgICBpbnQgc3BhY2VCZWxvdyA9IHNj cmVlbi5tYXhZKCkgLSB3aWRnZXRSZWN0SW5TY3JlZW4ueSgpOworICAgICAgICAgICAgaWYgKHNw YWNlQWJvdmUgPiBzcGFjZUJlbG93KQorICAgICAgICAgICAgICAgIGxpc3RCb3gtPnNldE1heEhl aWdodChzcGFjZUFib3ZlKTsKKyAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICBsaXN0 Qm94LT5zZXRNYXhIZWlnaHQoc3BhY2VCZWxvdyk7CisgICAgICAgICAgICBsaXN0Qm94LT5sYXlv dXQoKTsKKyAgICAgICAgICAgIG5lZWRUb1Jlc2l6ZVZpZXcgPSB0cnVlOworICAgICAgICAgICAg d2lkZ2V0UmVjdEluU2NyZWVuLnNldEhlaWdodChsaXN0Qm94LT5oZWlnaHQoKSArIGtCb3JkZXJT aXplICogMik7CisgICAgICAgICAgICAvLyBNb3ZlIFdlYldpZGdldCB1cHdhcmRzIGlmIG5lY2Vz c2FyeS4KKyAgICAgICAgICAgIGlmIChzcGFjZUFib3ZlID4gc3BhY2VCZWxvdykKKyAgICAgICAg ICAgICAgICB3aWRnZXRSZWN0SW5TY3JlZW4ubW92ZSgwLCAtKHdpZGdldFJlY3RJblNjcmVlbi5o ZWlnaHQoKSArIHRhcmdldENvbnRyb2xIZWlnaHQpKTsKKyAgICAgICAgfQorICAgIH0KKyAgICBy ZXR1cm4gd2lkZ2V0UmVjdEluU2NyZWVuOworfQorCiBJbnRSZWN0IFBvcHVwQ29udGFpbmVyOjps YXlvdXRBbmRDYWxjdWxhdGVXaWRnZXRSZWN0KGludCB0YXJnZXRDb250cm9sSGVpZ2h0LCBjb25z dCBJbnRQb2ludCYgcG9wdXBJbml0aWFsQ29vcmRpbmF0ZSkKIHsKICAgICAvLyBSZXNldCB0aGUg bWF4IHdpZHRoIGFuZCBoZWlnaHQgdG8gdGhlaXIgZGVmYXVsdCB2YWx1ZXMsIHRoZXkgd2lsbCBi ZSByZWNvbXB1dGVkIGJlbG93CkBAIC0xNDgsNTEgKzIwMSwxMSBAQCBJbnRSZWN0IFBvcHVwQ29u dGFpbmVyOjpsYXlvdXRBbmRDYWxjdWxhdGVXaWRnZXRSZWN0KGludCB0YXJnZXRDb250cm9sSGVp Z2h0LCBjbwogICAgICAgICAvLyB0byBjbGlwIHRoZSB3aW5kb3cgd2lkdGggdG8gdGhlIHNjcmVl biB3aWR0aC4KICAgICAgICAgLy8gV2hlbiBjbGlwcGluZywgd2UgYWxzbyBuZWVkIHRvIHNldCBh IG1heGltdW0gd2lkdGggZm9yIHRoZSBsaXN0IGJveC4KICAgICAgICAgRmxvYXRSZWN0IHdpbmRv d1JlY3QgPSBjaHJvbWVDbGllbnQtPndpbmRvd1JlY3QoKTsKLSAgICAgICAgaWYgKHdpbmRvd1Jl Y3QueCgpID49IHNjcmVlbi54KCkgJiYgd2luZG93UmVjdC5tYXhYKCkgPD0gc2NyZWVuLm1heFgo KSAmJiAod2lkZ2V0UmVjdEluU2NyZWVuLngoKSA8IHNjcmVlbi54KCkgfHwgd2lkZ2V0UmVjdElu U2NyZWVuLm1heFgoKSA+IHNjcmVlbi5tYXhYKCkpKSB7Ci0gICAgICAgICAgICAvLyBGaXJzdCwg aW52ZXJzZSB0aGUgcG9wdXAgYWxpZ25tZW50IGlmIGl0IGRvZXMgbm90IGZpdCB0aGUgc2NyZWVu IC0gdGhpcyBtaWdodCBmaXggdGhpbmdzIChvciBtYWtlIHRoZW0gYmV0dGVyKS4KLSAgICAgICAg ICAgIEludFJlY3QgaW52ZXJzZVdpZGdldFJlY3RJblNjcmVlbiA9IGNocm9tZUNsaWVudC0+cm9v dFZpZXdUb1NjcmVlbihJbnRSZWN0KHBvcHVwSW5pdGlhbENvb3JkaW5hdGUueCgpICsgKGlzUlRM ID8gMCA6IHJ0bE9mZnNldCksIHBvcHVwSW5pdGlhbENvb3JkaW5hdGUueSgpLCB0YXJnZXRTaXpl LndpZHRoKCksIHRhcmdldFNpemUuaGVpZ2h0KCkpKTsKLSAgICAgICAgICAgIEludFJlY3QgZW5j bG9zaW5nU2NyZWVuID0gZW5jbG9zaW5nSW50UmVjdChzY3JlZW4pOwotICAgICAgICAgICAgdW5z aWduZWQgb3JpZ2luYWxDdXRvZmYgPSBtYXgoZW5jbG9zaW5nU2NyZWVuLngoKSAtIHdpZGdldFJl Y3RJblNjcmVlbi54KCksIDApICsgbWF4KHdpZGdldFJlY3RJblNjcmVlbi5tYXhYKCkgLSBlbmNs b3NpbmdTY3JlZW4ubWF4WCgpLCAwKTsKLSAgICAgICAgICAgIHVuc2lnbmVkIGludmVyc2VDdXRv ZmYgPSBtYXgoZW5jbG9zaW5nU2NyZWVuLngoKSAtIGludmVyc2VXaWRnZXRSZWN0SW5TY3JlZW4u eCgpLCAwKSArIG1heChpbnZlcnNlV2lkZ2V0UmVjdEluU2NyZWVuLm1heFgoKSAtIGVuY2xvc2lu Z1NjcmVlbi5tYXhYKCksIDApOwotCi0gICAgICAgICAgICAvLyBBY2NlcHQgdGhlIGludmVyc2Ug cG9wdXAgYWxpZ25tZW50IGlmIHRoZSB0cmltbWVkIGNvbnRlbnQgZ2V0cyBzaG9ydGVyIHRoYW4g dGhhdCBpbiB0aGUgb3JpZ2luYWwgYWxpZ25tZW50IGNhc2UuCi0gICAgICAgICAgICBpZiAoaW52 ZXJzZUN1dG9mZiA8IG9yaWdpbmFsQ3V0b2ZmKQotICAgICAgICAgICAgICB3aWRnZXRSZWN0SW5T Y3JlZW4gPSBpbnZlcnNlV2lkZ2V0UmVjdEluU2NyZWVuOwotCi0gICAgICAgICAgICBpZiAod2lk Z2V0UmVjdEluU2NyZWVuLngoKSA8IHNjcmVlbi54KCkpIHsKLSAgICAgICAgICAgICAgICB1bnNp Z25lZCB3aWRnZXRSaWdodCA9IHdpZGdldFJlY3RJblNjcmVlbi5tYXhYKCk7Ci0gICAgICAgICAg ICAgICAgd2lkZ2V0UmVjdEluU2NyZWVuLnNldFdpZHRoKHdpZGdldFJlY3RJblNjcmVlbi5tYXhY KCkgLSBzY3JlZW4ueCgpKTsKLSAgICAgICAgICAgICAgICB3aWRnZXRSZWN0SW5TY3JlZW4uc2V0 WCh3aWRnZXRSaWdodCAtIHdpZGdldFJlY3RJblNjcmVlbi53aWR0aCgpKTsKLSAgICAgICAgICAg ICAgICBsaXN0Qm94KCktPnNldE1heFdpZHRoQW5kTGF5b3V0KG1heCh3aWRnZXRSZWN0SW5TY3Jl ZW4ud2lkdGgoKSAtIGtCb3JkZXJTaXplICogMiwgMCkpOwotICAgICAgICAgICAgfSBlbHNlIGlm ICh3aWRnZXRSZWN0SW5TY3JlZW4ubWF4WCgpID4gc2NyZWVuLm1heFgoKSkgewotICAgICAgICAg ICAgICAgIHdpZGdldFJlY3RJblNjcmVlbi5zZXRXaWR0aChzY3JlZW4ubWF4WCgpIC0gd2lkZ2V0 UmVjdEluU2NyZWVuLngoKSk7Ci0gICAgICAgICAgICAgICAgbGlzdEJveCgpLT5zZXRNYXhXaWR0 aEFuZExheW91dChtYXgod2lkZ2V0UmVjdEluU2NyZWVuLndpZHRoKCkgLSBrQm9yZGVyU2l6ZSAq IDIsIDApKTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgfQogCi0gICAgICAgIC8vIENhbGN1bGF0 ZSBZIGF4aXMgc2l6ZS4KLSAgICAgICAgaWYgKHdpZGdldFJlY3RJblNjcmVlbi5tYXhZKCkgPiBz dGF0aWNfY2FzdDxpbnQ+KHNjcmVlbi5tYXhZKCkpKSB7Ci0gICAgICAgICAgICBpZiAod2lkZ2V0 UmVjdEluU2NyZWVuLnkoKSAtIHdpZGdldFJlY3RJblNjcmVlbi5oZWlnaHQoKSAtIHRhcmdldENv bnRyb2xIZWlnaHQgPiAwKSB7Ci0gICAgICAgICAgICAgICAgLy8gVGhlcmUgaXMgZW5vdWdoIHJv b20gdG8gb3BlbiB1cHdhcmRzLgotICAgICAgICAgICAgICAgIHdpZGdldFJlY3RJblNjcmVlbi5t b3ZlKDAsIC0od2lkZ2V0UmVjdEluU2NyZWVuLmhlaWdodCgpICsgdGFyZ2V0Q29udHJvbEhlaWdo dCkpOwotICAgICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgICAgICAvLyBGaWd1cmUgd2hl dGhlciB1cHdhcmRzIG9yIGRvd253YXJkcyBoYXMgbW9yZSByb29tIGFuZCBzZXQgdGhlCi0gICAg ICAgICAgICAgICAgLy8gbWF4aW11bSBudW1iZXIgb2YgaXRlbXMuCi0gICAgICAgICAgICAgICAg aW50IHNwYWNlQWJvdmUgPSB3aWRnZXRSZWN0SW5TY3JlZW4ueSgpIC0gdGFyZ2V0Q29udHJvbEhl aWdodDsKLSAgICAgICAgICAgICAgICBpbnQgc3BhY2VCZWxvdyA9IHNjcmVlbi5tYXhZKCkgLSB3 aWRnZXRSZWN0SW5TY3JlZW4ueSgpOwotICAgICAgICAgICAgICAgIGlmIChzcGFjZUFib3ZlID4g c3BhY2VCZWxvdykKLSAgICAgICAgICAgICAgICAgICAgbV9saXN0Qm94LT5zZXRNYXhIZWlnaHQo c3BhY2VBYm92ZSk7Ci0gICAgICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAgICAgICBt X2xpc3RCb3gtPnNldE1heEhlaWdodChzcGFjZUJlbG93KTsKLSAgICAgICAgICAgICAgICBsYXlv dXRBbmRHZXRSVExPZmZzZXQoKTsKLSAgICAgICAgICAgICAgICAvLyBDb250YWluZXIgaGVpZ2h0 IG1heSBoYXZlIGNoYW5nZWQgaW4gbGF5b3V0QW5kR2V0UlRMT2Zmc2V0KCksCi0gICAgICAgICAg ICAgICAgLy8gc28gc2V0IHRoZSBXZWJXaWRnZXQgaGVpZ2h0IHRvIHRoZSBjb250YWluZXIgaGVp Z2h0LgotICAgICAgICAgICAgICAgIHdpZGdldFJlY3RJblNjcmVlbi5zZXRIZWlnaHQoaGVpZ2h0 KCkpOwotICAgICAgICAgICAgICAgIC8vIE1vdmUgV2ViV2lkZ2V0IHVwd2FyZHMgaWYgbmVjZXNz YXJ5LgotICAgICAgICAgICAgICAgIGlmIChzcGFjZUFib3ZlID4gc3BhY2VCZWxvdykKLSAgICAg ICAgICAgICAgICAgICAgd2lkZ2V0UmVjdEluU2NyZWVuLm1vdmUoMCwgLSh3aWRnZXRSZWN0SW5T Y3JlZW4uaGVpZ2h0KCkgKyB0YXJnZXRDb250cm9sSGVpZ2h0KSk7Ci0gICAgICAgICAgICB9Ci0g ICAgICAgIH0KKyAgICAgICAgYm9vbCBuZWVkVG9SZXNpemVWaWV3ID0gZmFsc2U7CisgICAgICAg IHdpZGdldFJlY3RJblNjcmVlbiA9IGxheW91dEFuZENhbGN1bGF0ZVdpZGdldFJlY3RJbnRlcm5h bCh3aWRnZXRSZWN0SW5TY3JlZW4sIHRhcmdldENvbnRyb2xIZWlnaHQsIHdpbmRvd1JlY3QsIHNj cmVlbiwgaXNSVEwsIHJ0bE9mZnNldCwgbV9saXN0Qm94LmdldCgpLCBuZWVkVG9SZXNpemVWaWV3 KTsKKyAgICAgICAgaWYgKG5lZWRUb1Jlc2l6ZVZpZXcpCisgICAgICAgICAgICBmaXRUb0xpc3RC b3goKTsKICAgICB9CiAKICAgICByZXR1cm4gd2lkZ2V0UmVjdEluU2NyZWVuOwpAQCAtMjM1LDIz ICsyNDgsMjYgQEAgdm9pZCBQb3B1cENvbnRhaW5lcjo6bm90aWZ5UG9wdXBIaWRkZW4oKQogICAg IGNocm9tZUNsaWVudENocm9taXVtKCktPnBvcHVwQ2xvc2VkKHRoaXMpOwogfQogCi1pbnQgUG9w dXBDb250YWluZXI6OmxheW91dEFuZEdldFJUTE9mZnNldCgpCit2b2lkIFBvcHVwQ29udGFpbmVy OjpmaXRUb0xpc3RCb3goKQogewotICAgIG1fbGlzdEJveC0+bGF5b3V0KCk7Ci0KICAgICAvLyBQ bGFjZSB0aGUgbGlzdGJveCB3aXRoaW4gb3VyIGJvcmRlci4KICAgICBtX2xpc3RCb3gtPm1vdmUo a0JvcmRlclNpemUsIGtCb3JkZXJTaXplKTsKIAogICAgIC8vIFNpemUgb3Vyc2VsdmVzIHRvIGNv bnRhaW4gbGlzdGJveCArIGJvcmRlci4KLSAgICBpbnQgbGlzdEJveFdpZHRoID0gbV9saXN0Qm94 LT53aWR0aCgpICsga0JvcmRlclNpemUgKiAyOwotICAgIHJlc2l6ZShsaXN0Qm94V2lkdGgsIG1f bGlzdEJveC0+aGVpZ2h0KCkgKyBrQm9yZGVyU2l6ZSAqIDIpOworICAgIHJlc2l6ZShtX2xpc3RC b3gtPndpZHRoKCkgKyBrQm9yZGVyU2l6ZSAqIDIsIG1fbGlzdEJveC0+aGVpZ2h0KCkgKyBrQm9y ZGVyU2l6ZSAqIDIpOwogICAgIGludmFsaWRhdGUoKTsKK30KKworaW50IFBvcHVwQ29udGFpbmVy OjpsYXlvdXRBbmRHZXRSVExPZmZzZXQoKQoreworICAgIG1fbGlzdEJveC0+bGF5b3V0KCk7Cisg ICAgZml0VG9MaXN0Qm94KCk7CiAKICAgICAvLyBDb21wdXRlIHRoZSBzdGFydGluZyB4LWF4aXMg Zm9yIGEgbm9ybWFsIFJUTCBvciByaWdodC1hbGlnbmVkIExUUiBkcm9wZG93bi4gRm9yIHRob3Nl LAogICAgIC8vIHRoZSByaWdodCBlZGdlIG9mIGRyb3Bkb3duIGJveCBzaG91bGQgYmUgYWxpZ25l ZCB3aXRoIHRoZSByaWdodCBlZGdlIG9mIDxzZWxlY3Q+LzxpbnB1dD4gZWxlbWVudCBib3gsCiAg ICAgLy8gYW5kIHRoZSBkcm9wZG93biBib3ggc2hvdWxkIGJlIGV4cGFuZGVkIHRvIHRoZSBsZWZ0 IGlmIG1vcmUgc3BhY2UgaXMgbmVlZGVkLgogICAgIC8vIG1fb3JpZ2luYWxGcmFtZVJlY3Qud2lk dGgoKSBpcyB0aGUgd2lkdGggb2YgdGhlIHRhcmdldCA8c2VsZWN0Pi88aW5wdXQ+IGVsZW1lbnQu Ci0gICAgcmV0dXJuIG1fb3JpZ2luYWxGcmFtZVJlY3Qud2lkdGgoKSAtIGxpc3RCb3hXaWR0aDsK KyAgICByZXR1cm4gbV9vcmlnaW5hbEZyYW1lUmVjdC53aWR0aCgpIC0gKG1fbGlzdEJveC0+d2lk dGgoKSArIGtCb3JkZXJTaXplICogMik7CiB9CiAKIGJvb2wgUG9wdXBDb250YWluZXI6OmhhbmRs ZU1vdXNlRG93bkV2ZW50KGNvbnN0IFBsYXRmb3JtTW91c2VFdmVudCYgZXZlbnQpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9Qb3B1cENvbnRhaW5lci5oIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUG9wdXBDb250YWluZXIuaAppbmRleCAw YzdkMTg0M2QzZmVmNmEzNTk0YWQ2MjgwOWU2NWM0N2FhNTE0YjM4Li4yMTg4NWMzOWEyZGMxYmZj YTM1MjhmNWZkMzg0NmNlYzZiODdjNmYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9jaHJvbWl1bS9Qb3B1cENvbnRhaW5lci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2Nocm9taXVtL1BvcHVwQ29udGFpbmVyLmgKQEAgLTEzMCw2ICsxMzAsOCBAQCBwcml2YXRl OgogICAgIC8vIExheW91dCBhbmQgY2FsY3VsYXRlIHBvcHVwIHdpZGdldCBzaXplIGFuZCBsb2Nh dGlvbiBhbmQgcmV0dXJucyBpdCBhcyBJbnRSZWN0LgogICAgIEludFJlY3QgbGF5b3V0QW5kQ2Fs Y3VsYXRlV2lkZ2V0UmVjdChpbnQgdGFyZ2V0Q29udHJvbEhlaWdodCwgY29uc3QgSW50UG9pbnQm IHBvcHVwSW5pdGlhbENvb3JkaW5hdGUpOwogCisgICAgdm9pZCBmaXRUb0xpc3RCb3goKTsKKwog ICAgIC8vIFJldHVybnMgdGhlIENocm9tZUNsaWVudCBvZiB0aGUgcGFnZSB0aGlzIHBvcHVwIGlz IGFzc29jaWF0ZWQgd2l0aC4KICAgICBDaHJvbWVDbGllbnRDaHJvbWl1bSogY2hyb21lQ2xpZW50 Q2hyb21pdW0oKTsKIAo= 158708 2012-08-15 22:10:29 -0700 2012-08-15 23:01:49 -0700 Patch for landing bug-94087-20120816140954.patch text/plain 11716 tkent U3VidmVyc2lvbiBSZXZpc2lvbjogMTI1NzQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTFlM2JhMzcxMDZlMDMz ZDQ1MjU4NGYxNDU3MjVmYTI3Y2JlZTg3OS4uNGFkNzc1ZjBhZjU1MzFhYjdiY2E4YjQ0OGVlMjhk MDhmYWIzYmI1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDEyLTA4LTE1ICBLZW50 IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KKworICAgICAgICBbQ2hyb21pdW1dIFJlZmFj dG9yaW5nOiBJbnRyb2R1Y2UgYSBuZXcgZnVuY3Rpb24gZm9yIHNvbWUgcGFydCBvZiBQb3B1cENv bnRhaW5lcjo6bGF5b3V0QW5kQ2FsY3VsYXRlV2lkZ2V0UmVjdCgpCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NDA4NworCisgICAgICAgIFJldmlld2Vk IGJ5IEhhamltZSBNb3JpdGEuCisKKyAgICAgICAgTW92ZSBzb21lIHBhcnQgb2YgUG9wdXBDb250 YWluZXI6OmxheW91dEFuZENhbGN1bGF0ZVdpZGdldFJlY3QoKSB0byBhCisgICAgICAgIG5ldyBm dW5jdGlvbiB3aGljaCBpcyBub3QgYSBtZW1iZXIgb2YgUG9wdXBDb250YWluZXIgYmVjYXVzZSB3 ZSdkIGxpa2UKKyAgICAgICAgdG8gYWRkIGEgdW5pdCB0ZXN0IGZvciB0aGUgcG9zaXRpb24gY2Fs Y3VsYXRpb24gY29kZSwgYW5kIHRvIHJlZHVjZSB0aGUKKyAgICAgICAgZGVwZW5kZW5jeS4KKwor ICAgICAgICBObyBuZXcgdGVzdHMuIFBvcHVwIHBvc2l0aW9uaW5nIGNvZGUgaXMgbm90IHRlc3Rh YmxlIGluIFdlYktpdC4KKworICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVtL1BvcHVwQ29udGFp bmVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmxheW91dEFuZENhbGN1bGF0ZVdpZGdldFJlY3RJ bnRlcm5hbCk6CisgICAgICAgIEFkZGVkLiBNb3ZlIHRoZSBjb2RlIGZyb20gUG9wdXBDb250YWlu ZXI6OmxheW91dEFuZENhbGN1bGF0ZVdpZGdldFJlY3QuCisgICAgICAgIEluIG9yZGVyIHRvIGF2 b2lkIHRvIGNhbGwgbWVtYmVyIGZ1bmN0aW9ucyBvZiBQb3B1cENvbnRhaW5lciwgd2UKKyAgICAg ICAgZG9uJ3QgY2FsbCBsYXlvdXRBbmRHZXRSVExPZmZzZXQoKSBhbmQgaGVpZ2h0KCkuIFVzZQor ICAgICAgICBQb3B1cExpc3RCb3g6OmxheW91dCgpIHRvIHJlY2FsY3VsYXRlIHRoZSBwb3B1cCBj b250ZW50IHNpemUsIGFuZCB1c2UKKyAgICAgICAgUG9wdXBMaXN0Qm94OjpoZWlnaHQoKSArIGtC b3JkZXJTaXplICogMiBpbnN0ZWFkIG9mIGhlaWdodCgpLiBXZQorICAgICAgICByZXNpemUgdGhl IHZpZXcgYWZ0ZXIgZmluaXNoaW5nIGxheW91dEFuZENhbGN1bGF0ZVdpZGdldFJlY3RJbnRlcm5h bAorICAgICAgICBpbiBQb3B1cENvbnRhaW5lcjo6bGF5b3V0QW5kQ2FsY3VsYXRlV2lkZ2V0UmVj dC4KKyAgICAgICAgKFdlYkNvcmU6OlBvcHVwQ29udGFpbmVyOjpsYXlvdXRBbmRDYWxjdWxhdGVX aWRnZXRSZWN0KToKKyAgICAgICAgTW92ZSBzb21lIGNvZGUgdG8gbGF5b3V0QW5kQ2FsY3VsYXRl V2lkZ2V0UmVjdEludGVybmFsLgorICAgICAgICAoV2ViQ29yZTo6UG9wdXBDb250YWluZXI6OmZp dFRvTGlzdEJveCk6CisgICAgICAgIEFkZGVkLiBNb3ZlIHRoZSBjb2RlIGZyb20gUG9wdXBDb250 YWluZXI6OmxheW91dEFuZEdldFJUTE9mZnNldC4KKyAgICAgICAgKFdlYkNvcmU6OlBvcHVwQ29u dGFpbmVyOjpsYXlvdXRBbmRHZXRSVExPZmZzZXQpOgorICAgICAgICBNb3ZlIHNvbWUgY29kZSB0 byBmaXRUb0xpc3RCb3guCisgICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0vUG9wdXBDb250YWlu ZXIuaDoKKyAgICAgICAgKFBvcHVwQ29udGFpbmVyKTogQWRkZWQgZml0VG9MaXN0Qm94LgorCiAy MDEyLTA4LTE1ICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVm9p ZENhbGxiYWNrIHNob3VsZCBub3QgYmUgYSBzcGVjaWFsIHNub3dmbGFrZQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUG9wdXBDb250YWluZXIuY3BwIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUG9wdXBDb250YWluZXIuY3BwCmluZGV4IGI4 MDZiM2M1NTg1NmVmYjRhZmE1NGUxMDJhMDM5YTY3M2JkYjYxY2IuLjlkYWU5ZjUzZWNkYzdmZjY1 ODc5ZWZmOTM1OGFkN2M1YWY3NDRlZWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2Nocm9taXVtL1BvcHVwQ29udGFpbmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9jaHJvbWl1bS9Qb3B1cENvbnRhaW5lci5jcHAKQEAgLTExNyw2ICsxMTcsNTkgQEAgUG9w dXBDb250YWluZXI6On5Qb3B1cENvbnRhaW5lcigpCiAgICAgICAgIHJlbW92ZUNoaWxkKG1fbGlz dEJveC5nZXQoKSk7CiB9CiAKK3N0YXRpYyBJbnRSZWN0IGxheW91dEFuZENhbGN1bGF0ZVdpZGdl dFJlY3RJbnRlcm5hbChJbnRSZWN0IHdpZGdldFJlY3RJblNjcmVlbiwgaW50IHRhcmdldENvbnRy b2xIZWlnaHQsIGNvbnN0IEZsb2F0UmVjdCYgd2luZG93UmVjdCwgY29uc3QgRmxvYXRSZWN0JiBz Y3JlZW4sIGJvb2wgaXNSVEwsIGNvbnN0IGludCBydGxPZmZzZXQsIFBvcHVwTGlzdEJveCogbGlz dEJveCwgYm9vbCYgbmVlZFRvUmVzaXplVmlldykKK3sKKyAgICBBU1NFUlQobGlzdEJveCk7Cisg ICAgaWYgKHdpbmRvd1JlY3QueCgpID49IHNjcmVlbi54KCkgJiYgd2luZG93UmVjdC5tYXhYKCkg PD0gc2NyZWVuLm1heFgoKSAmJiAod2lkZ2V0UmVjdEluU2NyZWVuLngoKSA8IHNjcmVlbi54KCkg fHwgd2lkZ2V0UmVjdEluU2NyZWVuLm1heFgoKSA+IHNjcmVlbi5tYXhYKCkpKSB7CisgICAgICAg IC8vIEZpcnN0LCBpbnZlcnNlIHRoZSBwb3B1cCBhbGlnbm1lbnQgaWYgaXQgZG9lcyBub3QgZml0 IHRoZSBzY3JlZW4gLQorICAgICAgICAvLyB0aGlzIG1pZ2h0IGZpeCB0aGluZ3MgKG9yIG1ha2Ug dGhlbSBiZXR0ZXIpLgorICAgICAgICBJbnRSZWN0IGludmVyc2VXaWRnZXRSZWN0SW5TY3JlZW4g PSB3aWRnZXRSZWN0SW5TY3JlZW47CisgICAgICAgIGludmVyc2VXaWRnZXRSZWN0SW5TY3JlZW4u c2V0WChpbnZlcnNlV2lkZ2V0UmVjdEluU2NyZWVuLngoKSArIChpc1JUTCA/IC1ydGxPZmZzZXQg OiBydGxPZmZzZXQpKTsKKyAgICAgICAgSW50UmVjdCBlbmNsb3NpbmdTY3JlZW4gPSBlbmNsb3Np bmdJbnRSZWN0KHNjcmVlbik7CisgICAgICAgIHVuc2lnbmVkIG9yaWdpbmFsQ3V0b2ZmID0gc3Rk OjptYXgoZW5jbG9zaW5nU2NyZWVuLngoKSAtIHdpZGdldFJlY3RJblNjcmVlbi54KCksIDApICsg c3RkOjptYXgod2lkZ2V0UmVjdEluU2NyZWVuLm1heFgoKSAtIGVuY2xvc2luZ1NjcmVlbi5tYXhY KCksIDApOworICAgICAgICB1bnNpZ25lZCBpbnZlcnNlQ3V0b2ZmID0gc3RkOjptYXgoZW5jbG9z aW5nU2NyZWVuLngoKSAtIGludmVyc2VXaWRnZXRSZWN0SW5TY3JlZW4ueCgpLCAwKSArIHN0ZDo6 bWF4KGludmVyc2VXaWRnZXRSZWN0SW5TY3JlZW4ubWF4WCgpIC0gZW5jbG9zaW5nU2NyZWVuLm1h eFgoKSwgMCk7CisKKyAgICAgICAgLy8gQWNjZXB0IHRoZSBpbnZlcnNlIHBvcHVwIGFsaWdubWVu dCBpZiB0aGUgdHJpbW1lZCBjb250ZW50IGdldHMKKyAgICAgICAgLy8gc2hvcnRlciB0aGFuIHRo YXQgaW4gdGhlIG9yaWdpbmFsIGFsaWdubWVudCBjYXNlLgorICAgICAgICBpZiAoaW52ZXJzZUN1 dG9mZiA8IG9yaWdpbmFsQ3V0b2ZmKQorICAgICAgICAgICAgd2lkZ2V0UmVjdEluU2NyZWVuID0g aW52ZXJzZVdpZGdldFJlY3RJblNjcmVlbjsKKworICAgICAgICBpZiAod2lkZ2V0UmVjdEluU2Ny ZWVuLngoKSA8IHNjcmVlbi54KCkpIHsKKyAgICAgICAgICAgIHVuc2lnbmVkIHdpZGdldFJpZ2h0 ID0gd2lkZ2V0UmVjdEluU2NyZWVuLm1heFgoKTsKKyAgICAgICAgICAgIHdpZGdldFJlY3RJblNj cmVlbi5zZXRXaWR0aCh3aWRnZXRSZWN0SW5TY3JlZW4ubWF4WCgpIC0gc2NyZWVuLngoKSk7Cisg ICAgICAgICAgICB3aWRnZXRSZWN0SW5TY3JlZW4uc2V0WCh3aWRnZXRSaWdodCAtIHdpZGdldFJl Y3RJblNjcmVlbi53aWR0aCgpKTsKKyAgICAgICAgICAgIGxpc3RCb3gtPnNldE1heFdpZHRoQW5k TGF5b3V0KHN0ZDo6bWF4KHdpZGdldFJlY3RJblNjcmVlbi53aWR0aCgpIC0ga0JvcmRlclNpemUg KiAyLCAwKSk7CisgICAgICAgIH0gZWxzZSBpZiAod2lkZ2V0UmVjdEluU2NyZWVuLm1heFgoKSA+ IHNjcmVlbi5tYXhYKCkpIHsKKyAgICAgICAgICAgIHdpZGdldFJlY3RJblNjcmVlbi5zZXRXaWR0 aChzY3JlZW4ubWF4WCgpIC0gd2lkZ2V0UmVjdEluU2NyZWVuLngoKSk7CisgICAgICAgICAgICBs aXN0Qm94LT5zZXRNYXhXaWR0aEFuZExheW91dChzdGQ6Om1heCh3aWRnZXRSZWN0SW5TY3JlZW4u d2lkdGgoKSAtIGtCb3JkZXJTaXplICogMiwgMCkpOworICAgICAgICB9CisgICAgfQorCisgICAg Ly8gQ2FsY3VsYXRlIFkgYXhpcyBzaXplLgorICAgIGlmICh3aWRnZXRSZWN0SW5TY3JlZW4ubWF4 WSgpID4gc3RhdGljX2Nhc3Q8aW50PihzY3JlZW4ubWF4WSgpKSkgeworICAgICAgICBpZiAod2lk Z2V0UmVjdEluU2NyZWVuLnkoKSAtIHdpZGdldFJlY3RJblNjcmVlbi5oZWlnaHQoKSAtIHRhcmdl dENvbnRyb2xIZWlnaHQgPiAwKSB7CisgICAgICAgICAgICAvLyBUaGVyZSBpcyBlbm91Z2ggcm9v bSB0byBvcGVuIHVwd2FyZHMuCisgICAgICAgICAgICB3aWRnZXRSZWN0SW5TY3JlZW4ubW92ZSgw LCAtKHdpZGdldFJlY3RJblNjcmVlbi5oZWlnaHQoKSArIHRhcmdldENvbnRyb2xIZWlnaHQpKTsK KyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIC8vIEZpZ3VyZSB3aGV0aGVyIHVwd2FyZHMg b3IgZG93bndhcmRzIGhhcyBtb3JlIHJvb20gYW5kIHNldCB0aGUKKyAgICAgICAgICAgIC8vIG1h eGltdW0gbnVtYmVyIG9mIGl0ZW1zLgorICAgICAgICAgICAgaW50IHNwYWNlQWJvdmUgPSB3aWRn ZXRSZWN0SW5TY3JlZW4ueSgpIC0gdGFyZ2V0Q29udHJvbEhlaWdodDsKKyAgICAgICAgICAgIGlu dCBzcGFjZUJlbG93ID0gc2NyZWVuLm1heFkoKSAtIHdpZGdldFJlY3RJblNjcmVlbi55KCk7Cisg ICAgICAgICAgICBpZiAoc3BhY2VBYm92ZSA+IHNwYWNlQmVsb3cpCisgICAgICAgICAgICAgICAg bGlzdEJveC0+c2V0TWF4SGVpZ2h0KHNwYWNlQWJvdmUpOworICAgICAgICAgICAgZWxzZQorICAg ICAgICAgICAgICAgIGxpc3RCb3gtPnNldE1heEhlaWdodChzcGFjZUJlbG93KTsKKyAgICAgICAg ICAgIGxpc3RCb3gtPmxheW91dCgpOworICAgICAgICAgICAgbmVlZFRvUmVzaXplVmlldyA9IHRy dWU7CisgICAgICAgICAgICB3aWRnZXRSZWN0SW5TY3JlZW4uc2V0SGVpZ2h0KGxpc3RCb3gtPmhl aWdodCgpICsga0JvcmRlclNpemUgKiAyKTsKKyAgICAgICAgICAgIC8vIE1vdmUgV2ViV2lkZ2V0 IHVwd2FyZHMgaWYgbmVjZXNzYXJ5LgorICAgICAgICAgICAgaWYgKHNwYWNlQWJvdmUgPiBzcGFj ZUJlbG93KQorICAgICAgICAgICAgICAgIHdpZGdldFJlY3RJblNjcmVlbi5tb3ZlKDAsIC0od2lk Z2V0UmVjdEluU2NyZWVuLmhlaWdodCgpICsgdGFyZ2V0Q29udHJvbEhlaWdodCkpOworICAgICAg ICB9CisgICAgfQorICAgIHJldHVybiB3aWRnZXRSZWN0SW5TY3JlZW47Cit9CisKIEludFJlY3Qg UG9wdXBDb250YWluZXI6OmxheW91dEFuZENhbGN1bGF0ZVdpZGdldFJlY3QoaW50IHRhcmdldENv bnRyb2xIZWlnaHQsIGNvbnN0IEludFBvaW50JiBwb3B1cEluaXRpYWxDb29yZGluYXRlKQogewog ICAgIC8vIFJlc2V0IHRoZSBtYXggd2lkdGggYW5kIGhlaWdodCB0byB0aGVpciBkZWZhdWx0IHZh bHVlcywgdGhleSB3aWxsIGJlIHJlY29tcHV0ZWQgYmVsb3cKQEAgLTE0OCw1MSArMjAxLDExIEBA IEludFJlY3QgUG9wdXBDb250YWluZXI6OmxheW91dEFuZENhbGN1bGF0ZVdpZGdldFJlY3QoaW50 IHRhcmdldENvbnRyb2xIZWlnaHQsIGNvCiAgICAgICAgIC8vIHRvIGNsaXAgdGhlIHdpbmRvdyB3 aWR0aCB0byB0aGUgc2NyZWVuIHdpZHRoLgogICAgICAgICAvLyBXaGVuIGNsaXBwaW5nLCB3ZSBh bHNvIG5lZWQgdG8gc2V0IGEgbWF4aW11bSB3aWR0aCBmb3IgdGhlIGxpc3QgYm94LgogICAgICAg ICBGbG9hdFJlY3Qgd2luZG93UmVjdCA9IGNocm9tZUNsaWVudC0+d2luZG93UmVjdCgpOwotICAg ICAgICBpZiAod2luZG93UmVjdC54KCkgPj0gc2NyZWVuLngoKSAmJiB3aW5kb3dSZWN0Lm1heFgo KSA8PSBzY3JlZW4ubWF4WCgpICYmICh3aWRnZXRSZWN0SW5TY3JlZW4ueCgpIDwgc2NyZWVuLngo KSB8fCB3aWRnZXRSZWN0SW5TY3JlZW4ubWF4WCgpID4gc2NyZWVuLm1heFgoKSkpIHsKLSAgICAg ICAgICAgIC8vIEZpcnN0LCBpbnZlcnNlIHRoZSBwb3B1cCBhbGlnbm1lbnQgaWYgaXQgZG9lcyBu b3QgZml0IHRoZSBzY3JlZW4gLSB0aGlzIG1pZ2h0IGZpeCB0aGluZ3MgKG9yIG1ha2UgdGhlbSBi ZXR0ZXIpLgotICAgICAgICAgICAgSW50UmVjdCBpbnZlcnNlV2lkZ2V0UmVjdEluU2NyZWVuID0g Y2hyb21lQ2xpZW50LT5yb290Vmlld1RvU2NyZWVuKEludFJlY3QocG9wdXBJbml0aWFsQ29vcmRp bmF0ZS54KCkgKyAoaXNSVEwgPyAwIDogcnRsT2Zmc2V0KSwgcG9wdXBJbml0aWFsQ29vcmRpbmF0 ZS55KCksIHRhcmdldFNpemUud2lkdGgoKSwgdGFyZ2V0U2l6ZS5oZWlnaHQoKSkpOwotICAgICAg ICAgICAgSW50UmVjdCBlbmNsb3NpbmdTY3JlZW4gPSBlbmNsb3NpbmdJbnRSZWN0KHNjcmVlbik7 Ci0gICAgICAgICAgICB1bnNpZ25lZCBvcmlnaW5hbEN1dG9mZiA9IG1heChlbmNsb3NpbmdTY3Jl ZW4ueCgpIC0gd2lkZ2V0UmVjdEluU2NyZWVuLngoKSwgMCkgKyBtYXgod2lkZ2V0UmVjdEluU2Ny ZWVuLm1heFgoKSAtIGVuY2xvc2luZ1NjcmVlbi5tYXhYKCksIDApOwotICAgICAgICAgICAgdW5z aWduZWQgaW52ZXJzZUN1dG9mZiA9IG1heChlbmNsb3NpbmdTY3JlZW4ueCgpIC0gaW52ZXJzZVdp ZGdldFJlY3RJblNjcmVlbi54KCksIDApICsgbWF4KGludmVyc2VXaWRnZXRSZWN0SW5TY3JlZW4u bWF4WCgpIC0gZW5jbG9zaW5nU2NyZWVuLm1heFgoKSwgMCk7Ci0KLSAgICAgICAgICAgIC8vIEFj Y2VwdCB0aGUgaW52ZXJzZSBwb3B1cCBhbGlnbm1lbnQgaWYgdGhlIHRyaW1tZWQgY29udGVudCBn ZXRzIHNob3J0ZXIgdGhhbiB0aGF0IGluIHRoZSBvcmlnaW5hbCBhbGlnbm1lbnQgY2FzZS4KLSAg ICAgICAgICAgIGlmIChpbnZlcnNlQ3V0b2ZmIDwgb3JpZ2luYWxDdXRvZmYpCi0gICAgICAgICAg ICAgIHdpZGdldFJlY3RJblNjcmVlbiA9IGludmVyc2VXaWRnZXRSZWN0SW5TY3JlZW47Ci0KLSAg ICAgICAgICAgIGlmICh3aWRnZXRSZWN0SW5TY3JlZW4ueCgpIDwgc2NyZWVuLngoKSkgewotICAg ICAgICAgICAgICAgIHVuc2lnbmVkIHdpZGdldFJpZ2h0ID0gd2lkZ2V0UmVjdEluU2NyZWVuLm1h eFgoKTsKLSAgICAgICAgICAgICAgICB3aWRnZXRSZWN0SW5TY3JlZW4uc2V0V2lkdGgod2lkZ2V0 UmVjdEluU2NyZWVuLm1heFgoKSAtIHNjcmVlbi54KCkpOwotICAgICAgICAgICAgICAgIHdpZGdl dFJlY3RJblNjcmVlbi5zZXRYKHdpZGdldFJpZ2h0IC0gd2lkZ2V0UmVjdEluU2NyZWVuLndpZHRo KCkpOwotICAgICAgICAgICAgICAgIGxpc3RCb3goKS0+c2V0TWF4V2lkdGhBbmRMYXlvdXQobWF4 KHdpZGdldFJlY3RJblNjcmVlbi53aWR0aCgpIC0ga0JvcmRlclNpemUgKiAyLCAwKSk7Ci0gICAg ICAgICAgICB9IGVsc2UgaWYgKHdpZGdldFJlY3RJblNjcmVlbi5tYXhYKCkgPiBzY3JlZW4ubWF4 WCgpKSB7Ci0gICAgICAgICAgICAgICAgd2lkZ2V0UmVjdEluU2NyZWVuLnNldFdpZHRoKHNjcmVl bi5tYXhYKCkgLSB3aWRnZXRSZWN0SW5TY3JlZW4ueCgpKTsKLSAgICAgICAgICAgICAgICBsaXN0 Qm94KCktPnNldE1heFdpZHRoQW5kTGF5b3V0KG1heCh3aWRnZXRSZWN0SW5TY3JlZW4ud2lkdGgo KSAtIGtCb3JkZXJTaXplICogMiwgMCkpOwotICAgICAgICAgICAgfQotICAgICAgICB9CiAKLSAg ICAgICAgLy8gQ2FsY3VsYXRlIFkgYXhpcyBzaXplLgotICAgICAgICBpZiAod2lkZ2V0UmVjdElu U2NyZWVuLm1heFkoKSA+IHN0YXRpY19jYXN0PGludD4oc2NyZWVuLm1heFkoKSkpIHsKLSAgICAg ICAgICAgIGlmICh3aWRnZXRSZWN0SW5TY3JlZW4ueSgpIC0gd2lkZ2V0UmVjdEluU2NyZWVuLmhl aWdodCgpIC0gdGFyZ2V0Q29udHJvbEhlaWdodCA+IDApIHsKLSAgICAgICAgICAgICAgICAvLyBU aGVyZSBpcyBlbm91Z2ggcm9vbSB0byBvcGVuIHVwd2FyZHMuCi0gICAgICAgICAgICAgICAgd2lk Z2V0UmVjdEluU2NyZWVuLm1vdmUoMCwgLSh3aWRnZXRSZWN0SW5TY3JlZW4uaGVpZ2h0KCkgKyB0 YXJnZXRDb250cm9sSGVpZ2h0KSk7Ci0gICAgICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAg ICAgIC8vIEZpZ3VyZSB3aGV0aGVyIHVwd2FyZHMgb3IgZG93bndhcmRzIGhhcyBtb3JlIHJvb20g YW5kIHNldCB0aGUKLSAgICAgICAgICAgICAgICAvLyBtYXhpbXVtIG51bWJlciBvZiBpdGVtcy4K LSAgICAgICAgICAgICAgICBpbnQgc3BhY2VBYm92ZSA9IHdpZGdldFJlY3RJblNjcmVlbi55KCkg LSB0YXJnZXRDb250cm9sSGVpZ2h0OwotICAgICAgICAgICAgICAgIGludCBzcGFjZUJlbG93ID0g c2NyZWVuLm1heFkoKSAtIHdpZGdldFJlY3RJblNjcmVlbi55KCk7Ci0gICAgICAgICAgICAgICAg aWYgKHNwYWNlQWJvdmUgPiBzcGFjZUJlbG93KQotICAgICAgICAgICAgICAgICAgICBtX2xpc3RC b3gtPnNldE1heEhlaWdodChzcGFjZUFib3ZlKTsKLSAgICAgICAgICAgICAgICBlbHNlCi0gICAg ICAgICAgICAgICAgICAgIG1fbGlzdEJveC0+c2V0TWF4SGVpZ2h0KHNwYWNlQmVsb3cpOwotICAg ICAgICAgICAgICAgIGxheW91dEFuZEdldFJUTE9mZnNldCgpOwotICAgICAgICAgICAgICAgIC8v IENvbnRhaW5lciBoZWlnaHQgbWF5IGhhdmUgY2hhbmdlZCBpbiBsYXlvdXRBbmRHZXRSVExPZmZz ZXQoKSwKLSAgICAgICAgICAgICAgICAvLyBzbyBzZXQgdGhlIFdlYldpZGdldCBoZWlnaHQgdG8g dGhlIGNvbnRhaW5lciBoZWlnaHQuCi0gICAgICAgICAgICAgICAgd2lkZ2V0UmVjdEluU2NyZWVu LnNldEhlaWdodChoZWlnaHQoKSk7Ci0gICAgICAgICAgICAgICAgLy8gTW92ZSBXZWJXaWRnZXQg dXB3YXJkcyBpZiBuZWNlc3NhcnkuCi0gICAgICAgICAgICAgICAgaWYgKHNwYWNlQWJvdmUgPiBz cGFjZUJlbG93KQotICAgICAgICAgICAgICAgICAgICB3aWRnZXRSZWN0SW5TY3JlZW4ubW92ZSgw LCAtKHdpZGdldFJlY3RJblNjcmVlbi5oZWlnaHQoKSArIHRhcmdldENvbnRyb2xIZWlnaHQpKTsK LSAgICAgICAgICAgIH0KLSAgICAgICAgfQorICAgICAgICBib29sIG5lZWRUb1Jlc2l6ZVZpZXcg PSBmYWxzZTsKKyAgICAgICAgd2lkZ2V0UmVjdEluU2NyZWVuID0gbGF5b3V0QW5kQ2FsY3VsYXRl V2lkZ2V0UmVjdEludGVybmFsKHdpZGdldFJlY3RJblNjcmVlbiwgdGFyZ2V0Q29udHJvbEhlaWdo dCwgd2luZG93UmVjdCwgc2NyZWVuLCBpc1JUTCwgcnRsT2Zmc2V0LCBtX2xpc3RCb3guZ2V0KCks IG5lZWRUb1Jlc2l6ZVZpZXcpOworICAgICAgICBpZiAobmVlZFRvUmVzaXplVmlldykKKyAgICAg ICAgICAgIGZpdFRvTGlzdEJveCgpOwogICAgIH0KIAogICAgIHJldHVybiB3aWRnZXRSZWN0SW5T Y3JlZW47CkBAIC0yMzUsMjMgKzI0OCwyNiBAQCB2b2lkIFBvcHVwQ29udGFpbmVyOjpub3RpZnlQ b3B1cEhpZGRlbigpCiAgICAgY2hyb21lQ2xpZW50Q2hyb21pdW0oKS0+cG9wdXBDbG9zZWQodGhp cyk7CiB9CiAKLWludCBQb3B1cENvbnRhaW5lcjo6bGF5b3V0QW5kR2V0UlRMT2Zmc2V0KCkKK3Zv aWQgUG9wdXBDb250YWluZXI6OmZpdFRvTGlzdEJveCgpCiB7Ci0gICAgbV9saXN0Qm94LT5sYXlv dXQoKTsKLQogICAgIC8vIFBsYWNlIHRoZSBsaXN0Ym94IHdpdGhpbiBvdXIgYm9yZGVyLgogICAg IG1fbGlzdEJveC0+bW92ZShrQm9yZGVyU2l6ZSwga0JvcmRlclNpemUpOwogCiAgICAgLy8gU2l6 ZSBvdXJzZWx2ZXMgdG8gY29udGFpbiBsaXN0Ym94ICsgYm9yZGVyLgotICAgIGludCBsaXN0Qm94 V2lkdGggPSBtX2xpc3RCb3gtPndpZHRoKCkgKyBrQm9yZGVyU2l6ZSAqIDI7Ci0gICAgcmVzaXpl KGxpc3RCb3hXaWR0aCwgbV9saXN0Qm94LT5oZWlnaHQoKSArIGtCb3JkZXJTaXplICogMik7Cisg ICAgcmVzaXplKG1fbGlzdEJveC0+d2lkdGgoKSArIGtCb3JkZXJTaXplICogMiwgbV9saXN0Qm94 LT5oZWlnaHQoKSArIGtCb3JkZXJTaXplICogMik7CiAgICAgaW52YWxpZGF0ZSgpOworfQorCitp bnQgUG9wdXBDb250YWluZXI6OmxheW91dEFuZEdldFJUTE9mZnNldCgpCit7CisgICAgbV9saXN0 Qm94LT5sYXlvdXQoKTsKKyAgICBmaXRUb0xpc3RCb3goKTsKIAogICAgIC8vIENvbXB1dGUgdGhl IHN0YXJ0aW5nIHgtYXhpcyBmb3IgYSBub3JtYWwgUlRMIG9yIHJpZ2h0LWFsaWduZWQgTFRSIGRy b3Bkb3duLiBGb3IgdGhvc2UsCiAgICAgLy8gdGhlIHJpZ2h0IGVkZ2Ugb2YgZHJvcGRvd24gYm94 IHNob3VsZCBiZSBhbGlnbmVkIHdpdGggdGhlIHJpZ2h0IGVkZ2Ugb2YgPHNlbGVjdD4vPGlucHV0 PiBlbGVtZW50IGJveCwKICAgICAvLyBhbmQgdGhlIGRyb3Bkb3duIGJveCBzaG91bGQgYmUgZXhw YW5kZWQgdG8gdGhlIGxlZnQgaWYgbW9yZSBzcGFjZSBpcyBuZWVkZWQuCiAgICAgLy8gbV9vcmln aW5hbEZyYW1lUmVjdC53aWR0aCgpIGlzIHRoZSB3aWR0aCBvZiB0aGUgdGFyZ2V0IDxzZWxlY3Q+ LzxpbnB1dD4gZWxlbWVudC4KLSAgICByZXR1cm4gbV9vcmlnaW5hbEZyYW1lUmVjdC53aWR0aCgp IC0gbGlzdEJveFdpZHRoOworICAgIHJldHVybiBtX29yaWdpbmFsRnJhbWVSZWN0LndpZHRoKCkg LSAobV9saXN0Qm94LT53aWR0aCgpICsga0JvcmRlclNpemUgKiAyKTsKIH0KIAogYm9vbCBQb3B1 cENvbnRhaW5lcjo6aGFuZGxlTW91c2VEb3duRXZlbnQoY29uc3QgUGxhdGZvcm1Nb3VzZUV2ZW50 JiBldmVudCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1Bv cHVwQ29udGFpbmVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9Qb3B1cENv bnRhaW5lci5oCmluZGV4IDBjN2QxODQzZDNmZWY2YTM1OTRhZDYyODA5ZTY1YzQ3YWE1MTRiMzgu LjIxODg1YzM5YTJkYzFiZmNhMzUyOGY1ZmQzODQ2Y2VjNmI4N2M2ZjIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1BvcHVwQ29udGFpbmVyLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUG9wdXBDb250YWluZXIuaApAQCAtMTMwLDYg KzEzMCw4IEBAIHByaXZhdGU6CiAgICAgLy8gTGF5b3V0IGFuZCBjYWxjdWxhdGUgcG9wdXAgd2lk Z2V0IHNpemUgYW5kIGxvY2F0aW9uIGFuZCByZXR1cm5zIGl0IGFzIEludFJlY3QuCiAgICAgSW50 UmVjdCBsYXlvdXRBbmRDYWxjdWxhdGVXaWRnZXRSZWN0KGludCB0YXJnZXRDb250cm9sSGVpZ2h0 LCBjb25zdCBJbnRQb2ludCYgcG9wdXBJbml0aWFsQ29vcmRpbmF0ZSk7CiAKKyAgICB2b2lkIGZp dFRvTGlzdEJveCgpOworCiAgICAgLy8gUmV0dXJucyB0aGUgQ2hyb21lQ2xpZW50IG9mIHRoZSBw YWdlIHRoaXMgcG9wdXAgaXMgYXNzb2NpYXRlZCB3aXRoLgogICAgIENocm9tZUNsaWVudENocm9t aXVtKiBjaHJvbWVDbGllbnRDaHJvbWl1bSgpOwogCg==