80480 2012-03-06 20:57:02 -0800 Cleanup of RenderTextControl::adjustControlHeightBasedOnLineHeight() 2012-03-07 01:05:20 -0800 1 1 1 Unclassified WebKit Forms 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 80479 1 tkent tkent morrita webkit.review.bot oldest_to_newest 572491 0 tkent 2012-03-06 20:57:02 -0800 Cleanup of RenderTextControl::adjustControlHeightBasedOnLineHeight() 572500 1 130534 tkent 2012-03-06 21:10:22 -0800 Created attachment 130534 Patch 572506 2 130536 tkent 2012-03-06 21:18:16 -0800 Created attachment 130536 Patch 2 572676 3 130536 webkit.review.bot 2012-03-07 01:05:15 -0800 Comment on attachment 130536 Patch 2 Clearing flags on attachment: 130536 Committed r110034: <http://trac.webkit.org/changeset/110034> 572677 4 webkit.review.bot 2012-03-07 01:05:20 -0800 All reviewed patches have been landed. Closing bug. 130534 2012-03-06 21:10:22 -0800 2012-03-06 21:18:11 -0800 Patch bug-80480-20120307141020.patch text/plain 9507 tkent U3VidmVyc2lvbiBSZXZpc2lvbjogMTA5OTg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTRlNWVkYTM3YjUzZWYy OGZjZmYzYTY5ZWE5MWJlY2U0YmExNjgwZC4uOGNiYmVjMDBhNjk0MjI3NTZiMmZjM2RmMjQ1MmMx OWE2NmZlNTk4NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5IEBACisyMDEyLTAzLTA2ICBLZW50 IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KKworICAgICAgICBDbGVhbnVwIG9mIFJlbmRl clRleHRDb250cm9sOjphZGp1c3RDb250cm9sSGVpZ2h0QmFzZWRPbkxpbmVIZWlnaHQoKQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODA0ODAKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgY2FsbHNpdGUg b2YgYWRqdXN0Q29udHJvbEhlaWdodEJhc2VkT25MaW5lSGVpZ2h0KCkgc3RvcmVkCisgICAgICAg IHBhZGRpbmcrYm9yZGVyK21hcmdpbiBoZWlnaHQgb2YgdGhlIGlubmVyIHRleHQgaW4gaGVpZ2h0 KCksIGFuZAorICAgICAgICBhZGp1c3RDb250cm9sSGVpZ2h0QmFzZWRPbkxpbmVIZWlnaHQoKSBp bXBsZW1lbnRhdGlvbnMgcmVmZXJlZCBpdC4gSXQKKyAgICAgICAgd2FzIHVucmVhc29uYWJsZSBh bmQgaGFyZCB0byB1bmRlcnN0YW5kLgorCisgICAgICAgIFRoZSBwdXJwb3NlIG9mIGFkanVzdENv bnRyb2xIZWlnaHRCYXNlZE9uTGluZUhlaWdodCgpIGlzIHRvIGNvbXB1dGUKKyAgICAgICAgLSB0 aGUgbWF4aW11bSBoZWlnaHQgb2YgbGluZS1oZWlnaHRzIG9mIHRoZSBpbm5lciB0ZXh0IGFuZCBk ZWNvcmF0aW9ucworICAgICAgICAtIHRoZSBtYXhpbXVtIGhlaWdodCBvZiBwYWRkaW5nK2JvcmRl cittYXJnaW4gaGVpZ2h0cyBvZiB0aGUgaW5uZXIgdGV4dCBhbmQgZGVjb3JhdGlvbnMsCisgICAg ICAgIGFuZCB0byBzdW0gdGhlbSB1cC4gVGhpcyBwYXRjaCByZXdyaXRlcyB0aGUgY29kZSB0byBt YWtlIGl0IHVuZGVyc3Rvb2QgZWFzaWx5LgorCisgICAgICAgIGFkanVzdENvbnRyb2xIZWlnaHRC YXNlZE9uTGluZUhlaWdodCgpIGlzIHJlbmFtZWQgdG8KKyAgICAgICAgYWRqdXN0Q29udHJvbGhl aWdodCgpLCBhbmQgaXQgdGFrZXMgYWRkaXRpb25hbCBwYXJhbWV0ZXIgb2YKKyAgICAgICAgcGFk ZGluZytib2RlcittYXJnaW4gaGVpZ2h0LCBhbmQgcmV0dXJucyB0aGUgc3VtIG9mIHRoZW0uCisK KyAgICAgICAgTm8gYmVoYXZpb3IgY2hhbmdlLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRl clRleHRDb250cm9sLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRleHRDb250cm9sOjpj b21wdXRlTG9naWNhbEhlaWdodCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRleHRDb250 cm9sLmg6CisgICAgICAgIChSZW5kZXJUZXh0Q29udHJvbCk6CisgICAgICAgICogcmVuZGVyaW5n L1JlbmRlclRleHRDb250cm9sTXVsdGlMaW5lLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl clRleHRDb250cm9sTXVsdGlMaW5lOjphZGp1c3RDb250cm9sSGVpZ2h0KToKKyAgICAgICAgKiBy ZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRyb2xNdWx0aUxpbmUuaDoKKyAgICAgICAgKFJlbmRlclRl eHRDb250cm9sTXVsdGlMaW5lKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRy b2xTaW5nbGVMaW5lLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRleHRDb250cm9sU2lu Z2xlTGluZTo6YWRqdXN0Q29udHJvbEhlaWdodCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRl clRleHRDb250cm9sU2luZ2xlTGluZS5oOgorICAgICAgICAoUmVuZGVyVGV4dENvbnRyb2xTaW5n bGVMaW5lKToKKwogMjAxMi0wMy0wNiAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4K IAogICAgICAgICBDYW4ndCBzZWxlY3QgYSBsaW5lIG9mIFJUTCB0ZXh0IG9uIEZhY2Vib29rCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRyb2wuY3Bw IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRDb250cm9sLmNwcAppbmRleCAw ZmVmMDUxNzM1NGEzY2YyOGFiOWIyZDEzMGZjNDk4ODAxODhkZGY2Li42NDA5NDc0NmY3NzEwODhl ODNmODkwYTljZWU4ZmIwZjg5NzAzZDkyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyVGV4dENvbnRyb2wuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJUZXh0Q29udHJvbC5jcHAKQEAgLTE0MiwxNCArMTQyLDkgQEAgdm9pZCBSZW5kZXJU ZXh0Q29udHJvbDo6Y29tcHV0ZUxvZ2ljYWxIZWlnaHQoKQogewogICAgIEhUTUxFbGVtZW50KiBp bm5lclRleHQgPSBpbm5lclRleHRFbGVtZW50KCk7CiAgICAgQVNTRVJUKGlubmVyVGV4dCk7Ci0g ICAgUmVuZGVyQm94KiBpbm5lclRleHRSZW5kZXJCb3ggPSBpbm5lclRleHQtPnJlbmRlckJveCgp OwotCi0gICAgc2V0SGVpZ2h0KGlubmVyVGV4dFJlbmRlckJveC0+Ym9yZGVyVG9wKCkgKyBpbm5l clRleHRSZW5kZXJCb3gtPmJvcmRlckJvdHRvbSgpICsKLSAgICAgICAgICAgICAgaW5uZXJUZXh0 UmVuZGVyQm94LT5wYWRkaW5nVG9wKCkgKyBpbm5lclRleHRSZW5kZXJCb3gtPnBhZGRpbmdCb3R0 b20oKSArCi0gICAgICAgICAgICAgIGlubmVyVGV4dFJlbmRlckJveC0+bWFyZ2luVG9wKCkgKyBp bm5lclRleHRSZW5kZXJCb3gtPm1hcmdpbkJvdHRvbSgpKTsKLQotICAgIGFkanVzdENvbnRyb2xI ZWlnaHRCYXNlZE9uTGluZUhlaWdodChpbm5lclRleHQtPnJlbmRlckJveCgpLT5saW5lSGVpZ2h0 KHRydWUsIEhvcml6b250YWxMaW5lLCBQb3NpdGlvbk9mSW50ZXJpb3JMaW5lQm94ZXMpKTsKLSAg ICBzZXRIZWlnaHQoaGVpZ2h0KCkgKyBib3JkZXJBbmRQYWRkaW5nSGVpZ2h0KCkpOworICAgIFJl bmRlckJveCogaW5uZXJUZXh0Qm94ID0gaW5uZXJUZXh0LT5yZW5kZXJCb3goKTsKKyAgICBMYXlv dXRVbml0IG5vbkNvbnRlbnRIZWlnaHQgPSBpbm5lclRleHRCb3gtPmJvcmRlckFuZFBhZGRpbmdI ZWlnaHQoKSArIGlubmVyVGV4dEJveC0+bWFyZ2luVG9wKCkgKyBpbm5lclRleHRCb3gtPm1hcmdp bkJvdHRvbSgpOworICAgIHNldEhlaWdodChhZGp1c3RDb250cm9sSGVpZ2h0KGlubmVyVGV4dEJv eC0+bGluZUhlaWdodCh0cnVlLCBIb3Jpem9udGFsTGluZSwgUG9zaXRpb25PZkludGVyaW9yTGlu ZUJveGVzKSwgbm9uQ29udGVudEhlaWdodCkgKyBib3JkZXJBbmRQYWRkaW5nSGVpZ2h0KCkpOwog CiAgICAgLy8gV2UgYXJlIGFibGUgdG8gaGF2ZSBhIGhvcml6b250YWwgc2Nyb2xsYmFyIGlmIHRo ZSBvdmVyZmxvdyBzdHlsZSBpcyBzY3JvbGwsIG9yIGlmIGl0cyBhdXRvIGFuZCB0aGVyZSdzIG5v IHdvcmQgd3JhcC4KICAgICBpZiAoc3R5bGUoKS0+b3ZlcmZsb3dYKCkgPT0gT1NDUk9MTCB8fCAg KHN0eWxlKCktPm92ZXJmbG93WCgpID09IE9BVVRPICYmIGlubmVyVGV4dC0+cmVuZGVyZXIoKS0+ c3R5bGUoKS0+d29yZFdyYXAoKSA9PSBOb3JtYWxXb3JkV3JhcCkpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRyb2wuaCBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJUZXh0Q29udHJvbC5oCmluZGV4IGFhOTM2ZTdhMDRhYzMzZDgzMzRm YzE1ZjYyNDc3MWU3NDE1NjU1ZWMuLjRkYWYwMTAxOGU2ZjQzMzdmMDk5ZjYzNjVhOGMwZGEzZTc2 ZTI2ZmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0Q29u dHJvbC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0Q29udHJvbC5o CkBAIC01OCw3ICs1OCw3IEBAIHByb3RlY3RlZDoKICAgICBzdGF0aWMgYm9vbCBoYXNWYWxpZEF2 Z0NoYXJXaWR0aChBdG9taWNTdHJpbmcgZmFtaWx5KTsKICAgICB2aXJ0dWFsIGZsb2F0IGdldEF2 Z0NoYXJXaWR0aChBdG9taWNTdHJpbmcgZmFtaWx5KTsKICAgICB2aXJ0dWFsIExheW91dFVuaXQg cHJlZmVycmVkQ29udGVudFdpZHRoKGZsb2F0IGNoYXJXaWR0aCkgY29uc3QgPSAwOwotICAgIHZp cnR1YWwgdm9pZCBhZGp1c3RDb250cm9sSGVpZ2h0QmFzZWRPbkxpbmVIZWlnaHQoTGF5b3V0VW5p dCBsaW5lSGVpZ2h0KSA9IDA7CisgICAgdmlydHVhbCBMYXlvdXRVbml0IGFkanVzdENvbnRyb2xI ZWlnaHQoTGF5b3V0VW5pdCBsaW5lSGVpZ2h0LCBMYXlvdXRVbml0IG5vbkNvbnRlbnRIZWlnaHQp ID0gMDsKICAgICB2aXJ0dWFsIFJlbmRlclN0eWxlKiB0ZXh0QmFzZVN0eWxlKCkgY29uc3QgPSAw OwogCiAgICAgdmlydHVhbCB2b2lkIHVwZGF0ZUZyb21FbGVtZW50KCk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRyb2xNdWx0aUxpbmUuY3BwIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRDb250cm9sTXVsdGlMaW5lLmNwcApp bmRleCA5ZDkxZjRiOWVhYjcxYWU5ZDI1MTMxZjc4YWFlZTg4MmNiZTY5YjA0Li5lODYxNjgyMDll OWIwMmM5YmNmMWYxMGZkOTc2MWRmZTRmMjZlN2ZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRyb2xNdWx0aUxpbmUuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0Q29udHJvbE11bHRpTGluZS5jcHAKQEAgLTcwLDkg KzcwLDkgQEAgTGF5b3V0VW5pdCBSZW5kZXJUZXh0Q29udHJvbE11bHRpTGluZTo6cHJlZmVycmVk Q29udGVudFdpZHRoKGZsb2F0IGNoYXJXaWR0aCkgY28KICAgICByZXR1cm4gc3RhdGljX2Nhc3Q8 TGF5b3V0VW5pdD4oY2VpbGYoY2hhcldpZHRoICogZmFjdG9yKSkgKyBzY3JvbGxiYXJUaGlja25l c3MoKTsKIH0KIAotdm9pZCBSZW5kZXJUZXh0Q29udHJvbE11bHRpTGluZTo6YWRqdXN0Q29udHJv bEhlaWdodEJhc2VkT25MaW5lSGVpZ2h0KExheW91dFVuaXQgbGluZUhlaWdodCkKK0xheW91dFVu aXQgUmVuZGVyVGV4dENvbnRyb2xNdWx0aUxpbmU6OmFkanVzdENvbnRyb2xIZWlnaHQoTGF5b3V0 VW5pdCBsaW5lSGVpZ2h0LCBMYXlvdXRVbml0IG5vbkNvbnRlbnRIZWlnaHQpCiB7Ci0gICAgc2V0 SGVpZ2h0KGhlaWdodCgpICsgbGluZUhlaWdodCAqIHN0YXRpY19jYXN0PEhUTUxUZXh0QXJlYUVs ZW1lbnQqPihub2RlKCkpLT5yb3dzKCkpOworICAgIHJldHVybiBsaW5lSGVpZ2h0ICogc3RhdGlj X2Nhc3Q8SFRNTFRleHRBcmVhRWxlbWVudCo+KG5vZGUoKSktPnJvd3MoKSArIG5vbkNvbnRlbnRI ZWlnaHQ7CiB9CiAKIExheW91dFVuaXQgUmVuZGVyVGV4dENvbnRyb2xNdWx0aUxpbmU6OmJhc2Vs aW5lUG9zaXRpb24oRm9udEJhc2VsaW5lIGJhc2VsaW5lVHlwZSwgYm9vbCBmaXJzdExpbmUsIExp bmVEaXJlY3Rpb25Nb2RlIGRpcmVjdGlvbiwgTGluZVBvc2l0aW9uTW9kZSBsaW5lUG9zaXRpb25N b2RlKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRl eHRDb250cm9sTXVsdGlMaW5lLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4 dENvbnRyb2xNdWx0aUxpbmUuaAppbmRleCA3NjExNzdhMTY2OGYyOWEwOGJmNWYwMzkzZTJkYmU0 NWZjY2M4MDE4Li42NzU3MGMyNzMzNzIwNWRlZjJhZTIyYTVmNjU3MzBkMTlhMzUyY2MwIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRyb2xNdWx0aUxp bmUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRyb2xNdWx0 aUxpbmUuaApAQCAtMzgsNyArMzgsNyBAQCBwcml2YXRlOgogCiAgICAgdmlydHVhbCBmbG9hdCBn ZXRBdmdDaGFyV2lkdGgoQXRvbWljU3RyaW5nIGZhbWlseSk7CiAgICAgdmlydHVhbCBMYXlvdXRV bml0IHByZWZlcnJlZENvbnRlbnRXaWR0aChmbG9hdCBjaGFyV2lkdGgpIGNvbnN0OwotICAgIHZp cnR1YWwgdm9pZCBhZGp1c3RDb250cm9sSGVpZ2h0QmFzZWRPbkxpbmVIZWlnaHQoTGF5b3V0VW5p dCBsaW5lSGVpZ2h0KTsKKyAgICB2aXJ0dWFsIExheW91dFVuaXQgYWRqdXN0Q29udHJvbEhlaWdo dChMYXlvdXRVbml0IGxpbmVIZWlnaHQsIExheW91dFVuaXQgbm9uQ29udGVudEhlaWdodCkgT1ZF UlJJREU7CiAgICAgdmlydHVhbCBMYXlvdXRVbml0IGJhc2VsaW5lUG9zaXRpb24oRm9udEJhc2Vs aW5lLCBib29sIGZpcnN0TGluZSwgTGluZURpcmVjdGlvbk1vZGUsIExpbmVQb3NpdGlvbk1vZGUg PSBQb3NpdGlvbk9uQ29udGFpbmluZ0xpbmUpIGNvbnN0OwogCiAgICAgdmlydHVhbCBSZW5kZXJT dHlsZSogdGV4dEJhc2VTdHlsZSgpIGNvbnN0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlclRleHRDb250cm9sU2luZ2xlTGluZS5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRyb2xTaW5nbGVMaW5lLmNwcAppbmRleCBjOGI0NGNm ZWJiYjUxMzNlZWExNWQ4ZDc4NDQwYjk5YTU5NDYxNDhiLi41YTAyOTk2Y2JkOGVhOGJjNDZiMTg0 MTNmZGZmMTU4Y2NkZWNiYWI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyVGV4dENvbnRyb2xTaW5nbGVMaW5lLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyVGV4dENvbnRyb2xTaW5nbGVMaW5lLmNwcApAQCAtNDQ5LDI4ICs0NDksMjIg QEAgTGF5b3V0VW5pdCBSZW5kZXJUZXh0Q29udHJvbFNpbmdsZUxpbmU6OnByZWZlcnJlZENvbnRl bnRXaWR0aChmbG9hdCBjaGFyV2lkdGgpIGMKICAgICByZXR1cm4gcmVzdWx0OwogfQogCi12b2lk IFJlbmRlclRleHRDb250cm9sU2luZ2xlTGluZTo6YWRqdXN0Q29udHJvbEhlaWdodEJhc2VkT25M aW5lSGVpZ2h0KExheW91dFVuaXQgbGluZUhlaWdodCkKK0xheW91dFVuaXQgUmVuZGVyVGV4dENv bnRyb2xTaW5nbGVMaW5lOjphZGp1c3RDb250cm9sSGVpZ2h0KExheW91dFVuaXQgbGluZUhlaWdo dCwgTGF5b3V0VW5pdCBub25Db250ZW50SGVpZ2h0KQogewogICAgIEhUTUxFbGVtZW50KiByZXN1 bHRzQnV0dG9uID0gcmVzdWx0c0J1dHRvbkVsZW1lbnQoKTsKICAgICBpZiAoUmVuZGVyQm94KiBy ZXN1bHRzUmVuZGVyZXIgPSByZXN1bHRzQnV0dG9uID8gcmVzdWx0c0J1dHRvbi0+cmVuZGVyQm94 KCkgOiAwKSB7CiAgICAgICAgIHJlc3VsdHNSZW5kZXJlci0+Y29tcHV0ZUxvZ2ljYWxIZWlnaHQo KTsKLSAgICAgICAgc2V0SGVpZ2h0KG1heChoZWlnaHQoKSwKLSAgICAgICAgICAgICAgICAgIHJl c3VsdHNSZW5kZXJlci0+Ym9yZGVyVG9wKCkgKyByZXN1bHRzUmVuZGVyZXItPmJvcmRlckJvdHRv bSgpICsKLSAgICAgICAgICAgICAgICAgIHJlc3VsdHNSZW5kZXJlci0+cGFkZGluZ1RvcCgpICsg cmVzdWx0c1JlbmRlcmVyLT5wYWRkaW5nQm90dG9tKCkgKwotICAgICAgICAgICAgICAgICAgcmVz dWx0c1JlbmRlcmVyLT5tYXJnaW5Ub3AoKSArIHJlc3VsdHNSZW5kZXJlci0+bWFyZ2luQm90dG9t KCkpKTsKKyAgICAgICAgbm9uQ29udGVudEhlaWdodCA9IG1heChub25Db250ZW50SGVpZ2h0LCBy ZXN1bHRzUmVuZGVyZXItPmJvcmRlckFuZFBhZGRpbmdIZWlnaHQoKSArIHJlc3VsdHNSZW5kZXJl ci0+bWFyZ2luVG9wKCkgKyByZXN1bHRzUmVuZGVyZXItPm1hcmdpbkJvdHRvbSgpKTsKICAgICAg ICAgbGluZUhlaWdodCA9IG1heChsaW5lSGVpZ2h0LCByZXN1bHRzUmVuZGVyZXItPmhlaWdodCgp KTsKICAgICB9CiAgICAgSFRNTEVsZW1lbnQqIGNhbmNlbEJ1dHRvbiA9IGNhbmNlbEJ1dHRvbkVs ZW1lbnQoKTsKICAgICBpZiAoUmVuZGVyQm94KiBjYW5jZWxSZW5kZXJlciA9IGNhbmNlbEJ1dHRv biA/IGNhbmNlbEJ1dHRvbi0+cmVuZGVyQm94KCkgOiAwKSB7CiAgICAgICAgIGNhbmNlbFJlbmRl cmVyLT5jb21wdXRlTG9naWNhbEhlaWdodCgpOwotICAgICAgICBzZXRIZWlnaHQobWF4KGhlaWdo dCgpLAotICAgICAgICAgICAgICAgICAgY2FuY2VsUmVuZGVyZXItPmJvcmRlclRvcCgpICsgY2Fu Y2VsUmVuZGVyZXItPmJvcmRlckJvdHRvbSgpICsKLSAgICAgICAgICAgICAgICAgIGNhbmNlbFJl bmRlcmVyLT5wYWRkaW5nVG9wKCkgKyBjYW5jZWxSZW5kZXJlci0+cGFkZGluZ0JvdHRvbSgpICsK LSAgICAgICAgICAgICAgICAgIGNhbmNlbFJlbmRlcmVyLT5tYXJnaW5Ub3AoKSArIGNhbmNlbFJl bmRlcmVyLT5tYXJnaW5Cb3R0b20oKSkpOworICAgICAgICBub25Db250ZW50SGVpZ2h0ID0gbWF4 KG5vbkNvbnRlbnRIZWlnaHQsIGNhbmNlbFJlbmRlcmVyLT5ib3JkZXJBbmRQYWRkaW5nSGVpZ2h0 KCkgKyBjYW5jZWxSZW5kZXJlci0+bWFyZ2luVG9wKCkgKyBjYW5jZWxSZW5kZXJlci0+bWFyZ2lu Qm90dG9tKCkpOwogICAgICAgICBsaW5lSGVpZ2h0ID0gbWF4KGxpbmVIZWlnaHQsIGNhbmNlbFJl bmRlcmVyLT5oZWlnaHQoKSk7CiAgICAgfQogCi0gICAgc2V0SGVpZ2h0KGhlaWdodCgpICsgbGlu ZUhlaWdodCk7CisgICAgcmV0dXJuIGxpbmVIZWlnaHQgKyBub25Db250ZW50SGVpZ2h0OwogfQog CiB2b2lkIFJlbmRlclRleHRDb250cm9sU2luZ2xlTGluZTo6dXBkYXRlRnJvbUVsZW1lbnQoKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRDb250cm9sU2lu Z2xlTGluZS5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRDb250cm9sU2lu Z2xlTGluZS5oCmluZGV4IDQ1ZDE5ZWU5OThlNWM5M2UyY2FhZDNjZjI0MTE5ODM5NGYzZTA2Y2Qu Ljk5YzdmODQxZmU4MWU0ZWNmMTJmNzVjOWVjNDM1MzFhM2JhM2Y2ZGQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0Q29udHJvbFNpbmdsZUxpbmUuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRyb2xTaW5nbGVMaW5lLmgK QEAgLTc4LDggKzc4LDggQEAgcHJpdmF0ZToKICAgICBpbnQgdGV4dEJsb2NrV2lkdGgoKSBjb25z dDsKICAgICB2aXJ0dWFsIGZsb2F0IGdldEF2Z0NoYXJXaWR0aChBdG9taWNTdHJpbmcgZmFtaWx5 KTsKICAgICB2aXJ0dWFsIExheW91dFVuaXQgcHJlZmVycmVkQ29udGVudFdpZHRoKGZsb2F0IGNo YXJXaWR0aCkgY29uc3Q7Ci0gICAgdmlydHVhbCB2b2lkIGFkanVzdENvbnRyb2xIZWlnaHRCYXNl ZE9uTGluZUhlaWdodChMYXlvdXRVbml0IGxpbmVIZWlnaHQpOwotCisgICAgdmlydHVhbCBMYXlv dXRVbml0IGFkanVzdENvbnRyb2xIZWlnaHQoTGF5b3V0VW5pdCBsaW5lSGVpZ2h0LCBMYXlvdXRV bml0IG5vbkNvbnRlbnRIZWlnaHQpIE9WRVJSSURFOworICAgIAogICAgIHZpcnR1YWwgdm9pZCB1 cGRhdGVGcm9tRWxlbWVudCgpOwogICAgIHZpcnR1YWwgdm9pZCBzdHlsZURpZENoYW5nZShTdHls ZURpZmZlcmVuY2UsIGNvbnN0IFJlbmRlclN0eWxlKiBvbGRTdHlsZSk7CiAK 130536 2012-03-06 21:18:16 -0800 2012-03-07 01:05:15 -0800 Patch 2 bug-80480-20120307141814.patch text/plain 9542 tkent U3VidmVyc2lvbiBSZXZpc2lvbjogMTA5OTg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTRlNWVkYTM3YjUzZWYy OGZjZmYzYTY5ZWE5MWJlY2U0YmExNjgwZC4uNDJiY2UzYjI4ZjAxNWE3MDI4NzI0MTVmODVhZjg3 ZmJlNDM0NjRkZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5IEBACisyMDEyLTAzLTA2ICBLZW50 IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KKworICAgICAgICBDbGVhbnVwIG9mIFJlbmRl clRleHRDb250cm9sOjphZGp1c3RDb250cm9sSGVpZ2h0QmFzZWRPbkxpbmVIZWlnaHQoKQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODA0ODAKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgY2FsbHNpdGUg b2YgYWRqdXN0Q29udHJvbEhlaWdodEJhc2VkT25MaW5lSGVpZ2h0KCkgc3RvcmVkCisgICAgICAg IHBhZGRpbmcrYm9yZGVyK21hcmdpbiBoZWlnaHQgb2YgdGhlIGlubmVyIHRleHQgaW4gaGVpZ2h0 KCksIGFuZAorICAgICAgICBhZGp1c3RDb250cm9sSGVpZ2h0QmFzZWRPbkxpbmVIZWlnaHQoKSBp bXBsZW1lbnRhdGlvbnMgcmVmZXJlZCBpdC4gSXQKKyAgICAgICAgd2FzIHVucmVhc29uYWJsZSBh bmQgaGFyZCB0byB1bmRlcnN0YW5kLgorCisgICAgICAgIFRoZSBwdXJwb3NlIG9mIGFkanVzdENv bnRyb2xIZWlnaHRCYXNlZE9uTGluZUhlaWdodCgpIGlzIHRvIGNvbXB1dGUKKyAgICAgICAgLSB0 aGUgbWF4aW11bSBoZWlnaHQgb2YgbGluZS1oZWlnaHRzIG9mIHRoZSBpbm5lciB0ZXh0IGFuZCBk ZWNvcmF0aW9ucworICAgICAgICAtIHRoZSBtYXhpbXVtIGhlaWdodCBvZiBwYWRkaW5nK2JvcmRl cittYXJnaW4gaGVpZ2h0cyBvZiB0aGUgaW5uZXIgdGV4dCBhbmQgZGVjb3JhdGlvbnMsCisgICAg ICAgIGFuZCB0byBzdW0gdGhlbSB1cC4gVGhpcyBwYXRjaCByZXdyaXRlcyB0aGUgY29kZSB0byBt YWtlIGl0IHVuZGVyc3Rvb2QgZWFzaWx5LgorCisgICAgICAgIGFkanVzdENvbnRyb2xIZWlnaHRC YXNlZE9uTGluZUhlaWdodCgpIGlzIHJlbmFtZWQgdG8KKyAgICAgICAgY29tcHV0ZUNvbnRyb2xo ZWlnaHQoKSwgaXQgdGFrZXMgYWRkaXRpb25hbCBwYXJhbWV0ZXIgb2YKKyAgICAgICAgcGFkZGlu Zytib2RlcittYXJnaW4gaGVpZ2h0LCBhbmQgcmV0dXJucyB0aGUgc3VtIG9mIHRoZW0uCisKKyAg ICAgICAgTm8gYmVoYXZpb3IgY2hhbmdlLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRl eHRDb250cm9sLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRleHRDb250cm9sOjpjb21w dXRlTG9naWNhbEhlaWdodCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRleHRDb250cm9s Lmg6CisgICAgICAgIChSZW5kZXJUZXh0Q29udHJvbCk6CisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlclRleHRDb250cm9sTXVsdGlMaW5lLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRl eHRDb250cm9sTXVsdGlMaW5lOjpjb21wdXRlQ29udHJvbEhlaWdodCk6CisgICAgICAgICogcmVu ZGVyaW5nL1JlbmRlclRleHRDb250cm9sTXVsdGlMaW5lLmg6CisgICAgICAgIChSZW5kZXJUZXh0 Q29udHJvbE11bHRpTGluZSk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRleHRDb250cm9s U2luZ2xlTGluZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUZXh0Q29udHJvbFNpbmds ZUxpbmU6OmNvbXB1dGVDb250cm9sSGVpZ2h0KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVy VGV4dENvbnRyb2xTaW5nbGVMaW5lLmg6CisgICAgICAgIChSZW5kZXJUZXh0Q29udHJvbFNpbmds ZUxpbmUpOgorCiAyMDEyLTAzLTA2ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgog CiAgICAgICAgIENhbid0IHNlbGVjdCBhIGxpbmUgb2YgUlRMIHRleHQgb24gRmFjZWJvb2sKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0Q29udHJvbC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRyb2wuY3BwCmluZGV4IDBm ZWYwNTE3MzU0YTNjZjI4YWI5YjJkMTMwZmM0OTg4MDE4OGRkZjYuLjdiNDgwN2I2NmE5MTVkZjhl ZDdjM2ViN2Y1MDUyZDdiYmM4YzIxZDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJUZXh0Q29udHJvbC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlclRleHRDb250cm9sLmNwcApAQCAtMTQyLDE0ICsxNDIsOSBAQCB2b2lkIFJlbmRlclRl eHRDb250cm9sOjpjb21wdXRlTG9naWNhbEhlaWdodCgpCiB7CiAgICAgSFRNTEVsZW1lbnQqIGlu bmVyVGV4dCA9IGlubmVyVGV4dEVsZW1lbnQoKTsKICAgICBBU1NFUlQoaW5uZXJUZXh0KTsKLSAg ICBSZW5kZXJCb3gqIGlubmVyVGV4dFJlbmRlckJveCA9IGlubmVyVGV4dC0+cmVuZGVyQm94KCk7 Ci0KLSAgICBzZXRIZWlnaHQoaW5uZXJUZXh0UmVuZGVyQm94LT5ib3JkZXJUb3AoKSArIGlubmVy VGV4dFJlbmRlckJveC0+Ym9yZGVyQm90dG9tKCkgKwotICAgICAgICAgICAgICBpbm5lclRleHRS ZW5kZXJCb3gtPnBhZGRpbmdUb3AoKSArIGlubmVyVGV4dFJlbmRlckJveC0+cGFkZGluZ0JvdHRv bSgpICsKLSAgICAgICAgICAgICAgaW5uZXJUZXh0UmVuZGVyQm94LT5tYXJnaW5Ub3AoKSArIGlu bmVyVGV4dFJlbmRlckJveC0+bWFyZ2luQm90dG9tKCkpOwotCi0gICAgYWRqdXN0Q29udHJvbEhl aWdodEJhc2VkT25MaW5lSGVpZ2h0KGlubmVyVGV4dC0+cmVuZGVyQm94KCktPmxpbmVIZWlnaHQo dHJ1ZSwgSG9yaXpvbnRhbExpbmUsIFBvc2l0aW9uT2ZJbnRlcmlvckxpbmVCb3hlcykpOwotICAg IHNldEhlaWdodChoZWlnaHQoKSArIGJvcmRlckFuZFBhZGRpbmdIZWlnaHQoKSk7CisgICAgUmVu ZGVyQm94KiBpbm5lclRleHRCb3ggPSBpbm5lclRleHQtPnJlbmRlckJveCgpOworICAgIExheW91 dFVuaXQgbm9uQ29udGVudEhlaWdodCA9IGlubmVyVGV4dEJveC0+Ym9yZGVyQW5kUGFkZGluZ0hl aWdodCgpICsgaW5uZXJUZXh0Qm94LT5tYXJnaW5Ub3AoKSArIGlubmVyVGV4dEJveC0+bWFyZ2lu Qm90dG9tKCk7CisgICAgc2V0SGVpZ2h0KGNvbXB1dGVDb250cm9sSGVpZ2h0KGlubmVyVGV4dEJv eC0+bGluZUhlaWdodCh0cnVlLCBIb3Jpem9udGFsTGluZSwgUG9zaXRpb25PZkludGVyaW9yTGlu ZUJveGVzKSwgbm9uQ29udGVudEhlaWdodCkgKyBib3JkZXJBbmRQYWRkaW5nSGVpZ2h0KCkpOwog CiAgICAgLy8gV2UgYXJlIGFibGUgdG8gaGF2ZSBhIGhvcml6b250YWwgc2Nyb2xsYmFyIGlmIHRo ZSBvdmVyZmxvdyBzdHlsZSBpcyBzY3JvbGwsIG9yIGlmIGl0cyBhdXRvIGFuZCB0aGVyZSdzIG5v IHdvcmQgd3JhcC4KICAgICBpZiAoc3R5bGUoKS0+b3ZlcmZsb3dYKCkgPT0gT1NDUk9MTCB8fCAg KHN0eWxlKCktPm92ZXJmbG93WCgpID09IE9BVVRPICYmIGlubmVyVGV4dC0+cmVuZGVyZXIoKS0+ c3R5bGUoKS0+d29yZFdyYXAoKSA9PSBOb3JtYWxXb3JkV3JhcCkpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRyb2wuaCBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJUZXh0Q29udHJvbC5oCmluZGV4IGFhOTM2ZTdhMDRhYzMzZDgzMzRm YzE1ZjYyNDc3MWU3NDE1NjU1ZWMuLjg1M2UwYzUwNzg0M2I0NDZhNGVmMTMwOGUyNmFlOTY4ODBk YzZlYzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0Q29u dHJvbC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0Q29udHJvbC5o CkBAIC01OCw3ICs1OCw3IEBAIHByb3RlY3RlZDoKICAgICBzdGF0aWMgYm9vbCBoYXNWYWxpZEF2 Z0NoYXJXaWR0aChBdG9taWNTdHJpbmcgZmFtaWx5KTsKICAgICB2aXJ0dWFsIGZsb2F0IGdldEF2 Z0NoYXJXaWR0aChBdG9taWNTdHJpbmcgZmFtaWx5KTsKICAgICB2aXJ0dWFsIExheW91dFVuaXQg cHJlZmVycmVkQ29udGVudFdpZHRoKGZsb2F0IGNoYXJXaWR0aCkgY29uc3QgPSAwOwotICAgIHZp cnR1YWwgdm9pZCBhZGp1c3RDb250cm9sSGVpZ2h0QmFzZWRPbkxpbmVIZWlnaHQoTGF5b3V0VW5p dCBsaW5lSGVpZ2h0KSA9IDA7CisgICAgdmlydHVhbCBMYXlvdXRVbml0IGNvbXB1dGVDb250cm9s SGVpZ2h0KExheW91dFVuaXQgbGluZUhlaWdodCwgTGF5b3V0VW5pdCBub25Db250ZW50SGVpZ2h0 KSBjb25zdCA9IDA7CiAgICAgdmlydHVhbCBSZW5kZXJTdHlsZSogdGV4dEJhc2VTdHlsZSgpIGNv bnN0ID0gMDsKIAogICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVGcm9tRWxlbWVudCgpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRDb250cm9sTXVsdGlMaW5l LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0Q29udHJvbE11bHRpTGlu ZS5jcHAKaW5kZXggOWQ5MWY0YjllYWI3MWFlOWQyNTEzMWY3OGFhZWU4ODJjYmU2OWIwNC4uOWI0 ZmZlNWNmYzk5ZDVmMjA3YzVkZGVkODA5NDcxOTUyY2ZlZGJmMyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRDb250cm9sTXVsdGlMaW5lLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRyb2xNdWx0aUxpbmUuY3BwCkBA IC03MCw5ICs3MCw5IEBAIExheW91dFVuaXQgUmVuZGVyVGV4dENvbnRyb2xNdWx0aUxpbmU6OnBy ZWZlcnJlZENvbnRlbnRXaWR0aChmbG9hdCBjaGFyV2lkdGgpIGNvCiAgICAgcmV0dXJuIHN0YXRp Y19jYXN0PExheW91dFVuaXQ+KGNlaWxmKGNoYXJXaWR0aCAqIGZhY3RvcikpICsgc2Nyb2xsYmFy VGhpY2tuZXNzKCk7CiB9CiAKLXZvaWQgUmVuZGVyVGV4dENvbnRyb2xNdWx0aUxpbmU6OmFkanVz dENvbnRyb2xIZWlnaHRCYXNlZE9uTGluZUhlaWdodChMYXlvdXRVbml0IGxpbmVIZWlnaHQpCitM YXlvdXRVbml0IFJlbmRlclRleHRDb250cm9sTXVsdGlMaW5lOjpjb21wdXRlQ29udHJvbEhlaWdo dChMYXlvdXRVbml0IGxpbmVIZWlnaHQsIExheW91dFVuaXQgbm9uQ29udGVudEhlaWdodCkgY29u c3QKIHsKLSAgICBzZXRIZWlnaHQoaGVpZ2h0KCkgKyBsaW5lSGVpZ2h0ICogc3RhdGljX2Nhc3Q8 SFRNTFRleHRBcmVhRWxlbWVudCo+KG5vZGUoKSktPnJvd3MoKSk7CisgICAgcmV0dXJuIGxpbmVI ZWlnaHQgKiBzdGF0aWNfY2FzdDxIVE1MVGV4dEFyZWFFbGVtZW50Kj4obm9kZSgpKS0+cm93cygp ICsgbm9uQ29udGVudEhlaWdodDsKIH0KIAogTGF5b3V0VW5pdCBSZW5kZXJUZXh0Q29udHJvbE11 bHRpTGluZTo6YmFzZWxpbmVQb3NpdGlvbihGb250QmFzZWxpbmUgYmFzZWxpbmVUeXBlLCBib29s IGZpcnN0TGluZSwgTGluZURpcmVjdGlvbk1vZGUgZGlyZWN0aW9uLCBMaW5lUG9zaXRpb25Nb2Rl IGxpbmVQb3NpdGlvbk1vZGUpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyVGV4dENvbnRyb2xNdWx0aUxpbmUuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJUZXh0Q29udHJvbE11bHRpTGluZS5oCmluZGV4IDc2MTE3N2ExNjY4ZjI5YTA4 YmY1ZjAzOTNlMmRiZTQ1ZmNjYzgwMTguLjNhZTFlYTIxMGFlOTk4NjM1MmJiNzg4YWE2MDI3NWRj OGY0MDJmNDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0 Q29udHJvbE11bHRpTGluZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJU ZXh0Q29udHJvbE11bHRpTGluZS5oCkBAIC0zOCw3ICszOCw3IEBAIHByaXZhdGU6CiAKICAgICB2 aXJ0dWFsIGZsb2F0IGdldEF2Z0NoYXJXaWR0aChBdG9taWNTdHJpbmcgZmFtaWx5KTsKICAgICB2 aXJ0dWFsIExheW91dFVuaXQgcHJlZmVycmVkQ29udGVudFdpZHRoKGZsb2F0IGNoYXJXaWR0aCkg Y29uc3Q7Ci0gICAgdmlydHVhbCB2b2lkIGFkanVzdENvbnRyb2xIZWlnaHRCYXNlZE9uTGluZUhl aWdodChMYXlvdXRVbml0IGxpbmVIZWlnaHQpOworICAgIHZpcnR1YWwgTGF5b3V0VW5pdCBjb21w dXRlQ29udHJvbEhlaWdodChMYXlvdXRVbml0IGxpbmVIZWlnaHQsIExheW91dFVuaXQgbm9uQ29u dGVudEhlaWdodCkgY29uc3QgT1ZFUlJJREU7CiAgICAgdmlydHVhbCBMYXlvdXRVbml0IGJhc2Vs aW5lUG9zaXRpb24oRm9udEJhc2VsaW5lLCBib29sIGZpcnN0TGluZSwgTGluZURpcmVjdGlvbk1v ZGUsIExpbmVQb3NpdGlvbk1vZGUgPSBQb3NpdGlvbk9uQ29udGFpbmluZ0xpbmUpIGNvbnN0Owog CiAgICAgdmlydHVhbCBSZW5kZXJTdHlsZSogdGV4dEJhc2VTdHlsZSgpIGNvbnN0OwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRDb250cm9sU2luZ2xlTGlu ZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRyb2xTaW5nbGVM aW5lLmNwcAppbmRleCBjOGI0NGNmZWJiYjUxMzNlZWExNWQ4ZDc4NDQwYjk5YTU5NDYxNDhiLi4x NmNhMWVkMzg4NWYzYjY1Mzg5YjVkMThlM2UyM2FiZDU4MmNiZGViIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRyb2xTaW5nbGVMaW5lLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRyb2xTaW5nbGVMaW5lLmNw cApAQCAtNDQ5LDI4ICs0NDksMjIgQEAgTGF5b3V0VW5pdCBSZW5kZXJUZXh0Q29udHJvbFNpbmds ZUxpbmU6OnByZWZlcnJlZENvbnRlbnRXaWR0aChmbG9hdCBjaGFyV2lkdGgpIGMKICAgICByZXR1 cm4gcmVzdWx0OwogfQogCi12b2lkIFJlbmRlclRleHRDb250cm9sU2luZ2xlTGluZTo6YWRqdXN0 Q29udHJvbEhlaWdodEJhc2VkT25MaW5lSGVpZ2h0KExheW91dFVuaXQgbGluZUhlaWdodCkKK0xh eW91dFVuaXQgUmVuZGVyVGV4dENvbnRyb2xTaW5nbGVMaW5lOjpjb21wdXRlQ29udHJvbEhlaWdo dChMYXlvdXRVbml0IGxpbmVIZWlnaHQsIExheW91dFVuaXQgbm9uQ29udGVudEhlaWdodCkgY29u c3QKIHsKICAgICBIVE1MRWxlbWVudCogcmVzdWx0c0J1dHRvbiA9IHJlc3VsdHNCdXR0b25FbGVt ZW50KCk7CiAgICAgaWYgKFJlbmRlckJveCogcmVzdWx0c1JlbmRlcmVyID0gcmVzdWx0c0J1dHRv biA/IHJlc3VsdHNCdXR0b24tPnJlbmRlckJveCgpIDogMCkgewogICAgICAgICByZXN1bHRzUmVu ZGVyZXItPmNvbXB1dGVMb2dpY2FsSGVpZ2h0KCk7Ci0gICAgICAgIHNldEhlaWdodChtYXgoaGVp Z2h0KCksCi0gICAgICAgICAgICAgICAgICByZXN1bHRzUmVuZGVyZXItPmJvcmRlclRvcCgpICsg cmVzdWx0c1JlbmRlcmVyLT5ib3JkZXJCb3R0b20oKSArCi0gICAgICAgICAgICAgICAgICByZXN1 bHRzUmVuZGVyZXItPnBhZGRpbmdUb3AoKSArIHJlc3VsdHNSZW5kZXJlci0+cGFkZGluZ0JvdHRv bSgpICsKLSAgICAgICAgICAgICAgICAgIHJlc3VsdHNSZW5kZXJlci0+bWFyZ2luVG9wKCkgKyBy ZXN1bHRzUmVuZGVyZXItPm1hcmdpbkJvdHRvbSgpKSk7CisgICAgICAgIG5vbkNvbnRlbnRIZWln aHQgPSBtYXgobm9uQ29udGVudEhlaWdodCwgcmVzdWx0c1JlbmRlcmVyLT5ib3JkZXJBbmRQYWRk aW5nSGVpZ2h0KCkgKyByZXN1bHRzUmVuZGVyZXItPm1hcmdpblRvcCgpICsgcmVzdWx0c1JlbmRl cmVyLT5tYXJnaW5Cb3R0b20oKSk7CiAgICAgICAgIGxpbmVIZWlnaHQgPSBtYXgobGluZUhlaWdo dCwgcmVzdWx0c1JlbmRlcmVyLT5oZWlnaHQoKSk7CiAgICAgfQogICAgIEhUTUxFbGVtZW50KiBj YW5jZWxCdXR0b24gPSBjYW5jZWxCdXR0b25FbGVtZW50KCk7CiAgICAgaWYgKFJlbmRlckJveCog Y2FuY2VsUmVuZGVyZXIgPSBjYW5jZWxCdXR0b24gPyBjYW5jZWxCdXR0b24tPnJlbmRlckJveCgp IDogMCkgewogICAgICAgICBjYW5jZWxSZW5kZXJlci0+Y29tcHV0ZUxvZ2ljYWxIZWlnaHQoKTsK LSAgICAgICAgc2V0SGVpZ2h0KG1heChoZWlnaHQoKSwKLSAgICAgICAgICAgICAgICAgIGNhbmNl bFJlbmRlcmVyLT5ib3JkZXJUb3AoKSArIGNhbmNlbFJlbmRlcmVyLT5ib3JkZXJCb3R0b20oKSAr Ci0gICAgICAgICAgICAgICAgICBjYW5jZWxSZW5kZXJlci0+cGFkZGluZ1RvcCgpICsgY2FuY2Vs UmVuZGVyZXItPnBhZGRpbmdCb3R0b20oKSArCi0gICAgICAgICAgICAgICAgICBjYW5jZWxSZW5k ZXJlci0+bWFyZ2luVG9wKCkgKyBjYW5jZWxSZW5kZXJlci0+bWFyZ2luQm90dG9tKCkpKTsKKyAg ICAgICAgbm9uQ29udGVudEhlaWdodCA9IG1heChub25Db250ZW50SGVpZ2h0LCBjYW5jZWxSZW5k ZXJlci0+Ym9yZGVyQW5kUGFkZGluZ0hlaWdodCgpICsgY2FuY2VsUmVuZGVyZXItPm1hcmdpblRv cCgpICsgY2FuY2VsUmVuZGVyZXItPm1hcmdpbkJvdHRvbSgpKTsKICAgICAgICAgbGluZUhlaWdo dCA9IG1heChsaW5lSGVpZ2h0LCBjYW5jZWxSZW5kZXJlci0+aGVpZ2h0KCkpOwogICAgIH0KIAot ICAgIHNldEhlaWdodChoZWlnaHQoKSArIGxpbmVIZWlnaHQpOworICAgIHJldHVybiBsaW5lSGVp Z2h0ICsgbm9uQ29udGVudEhlaWdodDsKIH0KIAogdm9pZCBSZW5kZXJUZXh0Q29udHJvbFNpbmds ZUxpbmU6OnVwZGF0ZUZyb21FbGVtZW50KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJUZXh0Q29udHJvbFNpbmdsZUxpbmUuaCBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJUZXh0Q29udHJvbFNpbmdsZUxpbmUuaAppbmRleCA0NWQxOWVlOTk4ZTVj OTNlMmNhYWQzY2YyNDExOTgzOTRmM2UwNmNkLi5mYWRiYWIyMmZhZGFlZjA1ZDY5MTIxZmVjZjUz MTk0MzU2NDI0Y2FjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy VGV4dENvbnRyb2xTaW5nbGVMaW5lLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlclRleHRDb250cm9sU2luZ2xlTGluZS5oCkBAIC03OCw4ICs3OCw4IEBAIHByaXZhdGU6CiAg ICAgaW50IHRleHRCbG9ja1dpZHRoKCkgY29uc3Q7CiAgICAgdmlydHVhbCBmbG9hdCBnZXRBdmdD aGFyV2lkdGgoQXRvbWljU3RyaW5nIGZhbWlseSk7CiAgICAgdmlydHVhbCBMYXlvdXRVbml0IHBy ZWZlcnJlZENvbnRlbnRXaWR0aChmbG9hdCBjaGFyV2lkdGgpIGNvbnN0OwotICAgIHZpcnR1YWwg dm9pZCBhZGp1c3RDb250cm9sSGVpZ2h0QmFzZWRPbkxpbmVIZWlnaHQoTGF5b3V0VW5pdCBsaW5l SGVpZ2h0KTsKLQorICAgIHZpcnR1YWwgTGF5b3V0VW5pdCBjb21wdXRlQ29udHJvbEhlaWdodChM YXlvdXRVbml0IGxpbmVIZWlnaHQsIExheW91dFVuaXQgbm9uQ29udGVudEhlaWdodCkgY29uc3Qg T1ZFUlJJREU7CisgICAgCiAgICAgdmlydHVhbCB2b2lkIHVwZGF0ZUZyb21FbGVtZW50KCk7CiAg ICAgdmlydHVhbCB2b2lkIHN0eWxlRGlkQ2hhbmdlKFN0eWxlRGlmZmVyZW5jZSwgY29uc3QgUmVu ZGVyU3R5bGUqIG9sZFN0eWxlKTsKIAo=