22190 2008-11-11 16:45:09 -0800 [Transforms] Fix use of absoluteBoundingBoxRect() in RenderThemeMac search field painting 2008-11-20 08:43:10 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser hyatt oldest_to_newest 98392 0 simon.fraser 2008-11-11 16:45:09 -0800 RenderThemeMac::paintSearchFieldResultsDecoration() and RenderThemeMac::paintSearchFieldResultsButton() both call absoluteBoundingBoxRect() to get the bounds of the search field. This is not transform-friendly. 99430 1 25302 simon.fraser 2008-11-19 22:48:41 -0800 Created attachment 25302 Patch, testcase, changelog 99481 2 simon.fraser 2008-11-20 08:43:10 -0800 Committed r38620 M WebCore/ChangeLog M WebCore/rendering/RenderObject.cpp M WebCore/rendering/RenderThemeMac.mm M WebCore/rendering/RenderBox.h M WebCore/rendering/RenderObject.h M WebCore/rendering/RenderTextControl.cpp M WebCore/rendering/RenderThemeMac.h A LayoutTests/platform/mac/fast/forms/search-transformed-expected.png A LayoutTests/platform/mac/fast/forms/search-transformed-expected.checksum A LayoutTests/platform/mac/fast/forms/search-transformed-expected.txt M LayoutTests/ChangeLog A LayoutTests/fast/forms/search-transformed.html r38620 = 13a62b2369cd22dbe5178a26a12e2e0f033ac0c5 (trunk) 25302 2008-11-19 22:48:41 -0800 2008-11-19 22:52:53 -0800 Patch, testcase, changelog 22190_patch.txt text/plain 14635 simon.fraser ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA1NTg2MzEyLi5jOWVhNDU4IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTkgQEAKIDIwMDgtMTEt MTkgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisgICAgICAgIAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIxOTAKKyAgICAgICAgCisgICAgICAgIFRlc3Qg Zm9yIHRoZSBkcmF3aW5nIGFuZCBldmVudCBoYW5kbGluZyBvZiBzZWFyY2ggZmllbGQgcGFydHMg aW4gYSB0cmFuc2Zvcm1lZAorICAgICAgICBzZWFyY2ggZmllbGQuCisKKyAgICAgICAgKiBmYXN0 L2Zvcm1zL3NlYXJjaC10cmFuc2Zvcm1lZC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBwbGF0Zm9y bS9tYWMvZmFzdC9mb3Jtcy9zZWFyY2gtdHJhbnNmb3JtZWQtZXhwZWN0ZWQuY2hlY2tzdW06IEFk ZGVkLgorICAgICAgICAqIHBsYXRmb3JtL21hYy9mYXN0L2Zvcm1zL3NlYXJjaC10cmFuc2Zvcm1l ZC1leHBlY3RlZC5wbmc6IEFkZGVkLgorICAgICAgICAqIHBsYXRmb3JtL21hYy9mYXN0L2Zvcm1z L3NlYXJjaC10cmFuc2Zvcm1lZC1leHBlY3RlZC50eHQ6IEFkZGVkLgorCisyMDA4LTExLTE5ICBT aW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCiAgICAgICAgIFJldmlld2Vk IGJ5IEFudHRpIEtvaXZpc3RvCiAKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIyMTExCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2Zvcm1zL3Nl YXJjaC10cmFuc2Zvcm1lZC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9mb3Jtcy9zZWFyY2gtdHJh bnNmb3JtZWQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi41MzljN2Y2 Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9mb3Jtcy9zZWFyY2gtdHJhbnNm b3JtZWQuaHRtbApAQCAtMCwwICsxLDMzIEBACis8aHRtbD4KKzxoZWFkPgorICAgIDxtZXRhIGh0 dHAtZXF1aXY9ImNvbnRlbnQtdHlwZSIgY29udGVudD0idGV4dC9odG1sOyBjaGFyc2V0PVVURi04 Ij4KKyAgICA8dGl0bGU+U2VhcmNoIEZpZWxkIHdpdGggVHJhbnNmb3JtPC90aXRsZT4KKzwvaGVh ZD4KKzxib2R5PgorICAgIDxwPgorICAgICAgICBUZXN0IGZvciA8YSBocmVmPSJodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIxOTAiPmh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMjE5MDwvYT46PGJyPgorICAgICAgICBUZXN0cyBkcmF3aW5n IGFuZCBldmVudCBoYW5kbGluZyBvbiB0cmFuc2Zvcm1lZCBzZWFyY2ggZmllbGRzLgorICAgIDwv cD4KKyAgICA8cCBzdHlsZT0iLXdlYmtpdC10cmFuc2Zvcm06IHRyYW5zbGF0ZSg1MHB4LCA1MHB4 KTsiPgorICAgICAgICA8aW5wdXQgdHlwZT0ic2VhcmNoIiBpZD0idGFyZ2V0IiByZXN1bHRzPSI1 IiB2YWx1ZT0iU2VhcmNoIG1lIj4KKyAgICA8L3A+CisgICAgPHAgaWQ9InJlc3VsdCIgc3R5bGU9 Im1hcmdpbi10b3A6IDYwcHgiPgorICAgICAgICBDbGlja2luZyB0aGUgKHgpIGJ1dHRvbiBzaG91 bGQgY2xlYXIgdGhlIGZpZWxkLgorICAgIDwvcD4KKyAgICA8c2NyaXB0PgorICAgICAgICBpZiAo d2luZG93LmV2ZW50U2VuZGVyKSB7CisgICAgICAgICAgICB2YXIgdGFyZ2V0ID0gZG9jdW1lbnQu Z2V0RWxlbWVudEJ5SWQoInRhcmdldCIpOworICAgICAgICAgICAgZXZlbnRTZW5kZXIubW91c2VN b3ZlVG8oMjAwLCAxMjIpOworICAgICAgICAgICAgZXZlbnRTZW5kZXIubW91c2VEb3duKCk7Cisg ICAgICAgICAgICBldmVudFNlbmRlci5tb3VzZVVwKCk7CisgICAgICAgICAgICB2YXIgcmVzdWx0 ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInJlc3VsdCIpOworICAgICAgICAgICAgaWYgKHRh cmdldC52YWx1ZSA9PSAiIikKKyAgICAgICAgICAgICAgICByZXN1bHQuaW5uZXJUZXh0ID0gIlBB U1MiOworICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgIHJlc3VsdC5pbm5lclRleHQg PSAiRkFJTCI7CisgICAgICAgICAgICAKKyAgICAgICAgICAgIHRhcmdldC52YWx1ZSA9ICJTb21l IG90aGVyIHRleHQiOworICAgICAgICB9CisgICAgPC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+ CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvZmFzdC9mb3Jtcy9zZWFyY2gt dHJhbnNmb3JtZWQtZXhwZWN0ZWQuY2hlY2tzdW0gYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMv ZmFzdC9mb3Jtcy9zZWFyY2gtdHJhbnNmb3JtZWQtZXhwZWN0ZWQuY2hlY2tzdW0KbmV3IGZpbGUg bW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZGZmNjg2OQotLS0gL2Rldi9udWxsCisrKyBiL0xh eW91dFRlc3RzL3BsYXRmb3JtL21hYy9mYXN0L2Zvcm1zL3NlYXJjaC10cmFuc2Zvcm1lZC1leHBl Y3RlZC5jaGVja3N1bQpAQCAtMCwwICsxIEBACitiMGIwNzRhZDg3ZDM1M2I0OWNhOGI5MmZmZTMz YzI2ZQpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L3BsYXRmb3JtL21hYy9mYXN0L2Zvcm1zL3NlYXJjaC10cmFuc2Zvcm1lZC1leHBlY3RlZC5wbmcg Yi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvZmFzdC9mb3Jtcy9zZWFyY2gtdHJhbnNmb3JtZWQt ZXhwZWN0ZWQucG5nCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmY0ZWRjYzQK QmluYXJ5IGZpbGVzIC9kZXYvbnVsbCBhbmQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvZmFz dC9mb3Jtcy9zZWFyY2gtdHJhbnNmb3JtZWQtZXhwZWN0ZWQucG5nIGRpZmZlcgpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2Zhc3QvZm9ybXMvc2VhcmNoLXRyYW5zZm9ybWVk LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9mYXN0L2Zvcm1zL3NlYXJj aC10cmFuc2Zvcm1lZC1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAw MDAwMC4uNzdkM2E5MAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21h Yy9mYXN0L2Zvcm1zL3NlYXJjaC10cmFuc2Zvcm1lZC1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwz MSBAQAorbGF5ZXIgYXQgKDAsMCkgc2l6ZSA4MDB4NjAwCisgIFJlbmRlclZpZXcgYXQgKDAsMCkg c2l6ZSA4MDB4NjAwCitsYXllciBhdCAoMCwwKSBzaXplIDgwMHg2MDAKKyAgUmVuZGVyQmxvY2sg e0hUTUx9IGF0ICgwLDApIHNpemUgODAweDYwMAorICAgIFJlbmRlckJvZHkge0JPRFl9IGF0ICg4 LDgpIHNpemUgNzg0eDU3NgorICAgICAgUmVuZGVyQmxvY2sge1B9IGF0ICgwLDApIHNpemUgNzg0 eDM2CisgICAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBhdCAoMCwwKSBzaXplIDUzeDE4CisgICAg ICAgICAgdGV4dCBydW4gYXQgKDAsMCkgd2lkdGggNTM6ICJUZXN0IGZvciAiCisgICAgICAgIFJl bmRlcklubGluZSB7QX0gYXQgKDAsMCkgc2l6ZSAzMDV4MTggW2NvbG9yPSMwMDAwRUVdCisgICAg ICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICg1MywwKSBzaXplIDMwNXgxOAorICAgICAgICAg ICAgdGV4dCBydW4gYXQgKDUzLDApIHdpZHRoIDMwNTogImh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMjE5MCIKKyAgICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgz NTgsMCkgc2l6ZSA0eDE4CisgICAgICAgICAgdGV4dCBydW4gYXQgKDM1OCwwKSB3aWR0aCA0OiAi OiIKKyAgICAgICAgUmVuZGVyQlIge0JSfSBhdCAoMzYyLDE0KSBzaXplIDB4MAorICAgICAgICBS ZW5kZXJUZXh0IHsjdGV4dH0gYXQgKDAsMTgpIHNpemUgMzk4eDE4CisgICAgICAgICAgdGV4dCBy dW4gYXQgKDAsMTgpIHdpZHRoIDM5ODogIlRlc3RzIGRyYXdpbmcgYW5kIGV2ZW50IGhhbmRsaW5n IG9uIHRyYW5zZm9ybWVkIHNlYXJjaCBmaWVsZHMuIgorICAgICAgUmVuZGVyQmxvY2sge1B9IGF0 ICgwLDEzNSkgc2l6ZSA3ODR4MTgKKyAgICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgwLDAp IHNpemUgMzl4MTgKKyAgICAgICAgICB0ZXh0IHJ1biBhdCAoMCwwKSB3aWR0aCAzOTogIlBBU1Mi CitsYXllciBhdCAoOCw2MCkgc2l6ZSA3ODR4MjMKKyAgUmVuZGVyQmxvY2sge1B9IGF0ICgwLDUy KSBzaXplIDc4NHgyMworICAgIFJlbmRlclRleHRDb250cm9sIHtJTlBVVH0gYXQgKDIsMikgc2l6 ZSAxNDh4MTkgW2JnY29sb3I9I0ZGRkZGRl0gW2JvcmRlcjogKDJweCBpbnNldCAjMDAwMDAwKV0K KyAgICAgIFJlbmRlckJsb2NrIHtESVZ9IGF0ICgzLDMpIHNpemUgMTQyeDEzCisgICAgICAgIFJl bmRlckJsb2NrIHtESVZ9IGF0ICgwLDApIHNpemUgMjJ4MTEKKyAgICAgICAgUmVuZGVyQmxvY2sg e0RJVn0gYXQgKDEyOSwwKSBzaXplIDEzeDExCisgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgw LDApIHNpemUgMHgwCitsYXllciBhdCAoMzUsNjUpIHNpemUgMTA3eDEzCisgIFJlbmRlckJsb2Nr IHtESVZ9IGF0ICgyMiwwKSBzaXplIDEwN3gxMworICAgIFJlbmRlclRleHQgeyN0ZXh0fSBhdCAo MSwwKSBzaXplIDg3eDEzCisgICAgICB0ZXh0IHJ1biBhdCAoMSwwKSB3aWR0aCA4NzogIlNvbWUg b3RoZXIgdGV4dCIKK2NhcmV0OiBwb3NpdGlvbiAxNSBvZiBjaGlsZCAwIHsjdGV4dH0gb2YgY2hp bGQgMSB7RElWfSBvZiBjaGlsZCAwIHtESVZ9IG9mIGNoaWxkIDEge0lOUFVUfSBvZiBjaGlsZCAz IHtQfSBvZiBjaGlsZCAxIHtCT0RZfSBvZiBjaGlsZCAwIHtIVE1MfSBvZiBkb2N1bWVudApkaWZm IC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAyMmY1 NTA4Li5mODA1ZGQxIDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3Jl L0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDA4LTExLTE5ICBTaW1vbiBGcmFzZXIgIDxz aW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MjE5MAorCisgICAgICAgIEZpeCB0aGUgcGFpbnRpbmcgYW5kIGV2ZW50IGhhbmRsaW5nIGluIHRy YW5zZm9ybWVkIHNlYXJjaCBmaWVsZHMuCisgICAgICAgIFdoZW4gcGFpbnRpbmcgdGhlIGNhbmNl bCBhbmQgcmVzdWx0cyBidXR0b24gcGFydHMsICBnZXQgdGhlIHJlY3QgZnJvbSBBcHBLaXQKKyAg ICAgICAgcmVsYXRpdmUgdG8gdGhlIGlucHV0IGJvdW5kcyAocmF0aGVyIHRoYW4gaW4gYWJzb2x1 dGUgY29vcmRzKSwgdGhlbiBjb252ZXJ0CisgICAgICAgIGl0IGludG8gdGhlIGNvb3JkcyBvZiB0 aGUgcGFydCdzIHJlbmRlcmVyICh3aGljaCBpcyB0aGUgb25lIHRoYXQgaXMgcGFpbnRpbmcpLgor ICAgICAgICBUbyBkbyB0aGlzIHdlIG5lZWQgdG8gY29tcHV0ZSBhbiBvZmZzZXQgcmVsYXRpdmUg dG8gc29tZSBjb250YWluZXIsIHNvIGV4cG9zZQorICAgICAgICBhIG1ldGhvZCBvbiBSZW5kZXJP YmplY3QgZm9yIHRoYXQuCisgICAgICAgIAorICAgICAgICBBbHNvIGZpeCB0aGUgbG9jYXRpb24g YXQgd2hpY2ggdGhlIHNlYXJjaCBwb3B1cCBzaG93cyB1cCB0byB0YWtlIHRyYW5zZm9ybXMKKyAg ICAgICAgaW50byBhY2NvdW50LCBhbmQgZml4IHRoZSBtYXRoIHRoYXQgaXMgdXNlZCB0byBmaWd1 cmUgb3V0IGlmIHRoZSBzZWFyY2gKKyAgICAgICAgcmVzdWx0cyBidXR0b24sIG9yIHRoZSBjYW5j ZWwgYnV0dG9uIHNob3VsZCBnZXQgdGhlIG1vdXNlIGV2ZW50cy4KKyAgICAgICAgCisgICAgICAg IFRlc3Q6IGZhc3QvZm9ybXMvc2VhcmNoLXRyYW5zZm9ybWVkLmh0bWwKKworICAgICAgICAqIHJl bmRlcmluZy9SZW5kZXJCb3guaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck9iamVjdDo6b2Zmc2V0RnJvbUNvbnRhaW5lcik6 CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oOgorICAgICAgICAqIHJlbmRlcmlu Zy9SZW5kZXJUZXh0Q29udHJvbC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUZXh0Q29u dHJvbDo6Zm9yd2FyZEV2ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRleHRDb250cm9s OjpzaG93UG9wdXApOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUaGVtZU1hYy5oOgorICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJUaGVtZU1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlclRoZW1lTWFjOjpjb252ZXJ0VG9QYWludGluZ1JlY3QpOgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyVGhlbWVNYWM6OnBhaW50U2VhcmNoRmllbGRDYW5jZWxCdXR0b24pOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyVGhlbWVNYWM6OnBhaW50U2VhcmNoRmllbGRSZXN1bHRzRGVjb3JhdGlv bik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZU1hYzo6cGFpbnRTZWFyY2hGaWVsZFJl c3VsdHNCdXR0b24pOgorCiAyMDA4LTExLTE5ICBEYXJpbiBGaXNoZXIgIDxkYXJpbkBjaHJvbWl1 bS5vcmc+CiAKICAgICAgICAgRml4IGJ1c3RhZ2UuCmRpZmYgLS1naXQgYS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJCb3guaCBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oCmluZGV4IGRl ZDljYjUuLjVmMjAyMWQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5o CisrKyBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oCkBAIC0xOTEsNyArMTkxLDcgQEAg cHJvdGVjdGVkOgogICAgIAogICAgIHZpcnR1YWwgYm9vbCBzaG91bGRDYWxjdWxhdGVTaXplQXNS ZXBsYWNlZCgpIGNvbnN0IHsgcmV0dXJuIGlzUmVwbGFjZWQoKSAmJiAhaXNJbmxpbmVCbG9ja09y SW5saW5lVGFibGUoKTsgfQogCi0gICAgSW50U2l6ZSBvZmZzZXRGcm9tQ29udGFpbmVyKFJlbmRl ck9iamVjdCopIGNvbnN0OworICAgIHZpcnR1YWwgSW50U2l6ZSBvZmZzZXRGcm9tQ29udGFpbmVy KFJlbmRlck9iamVjdCopIGNvbnN0OwogICAgIAogcHJpdmF0ZToKICAgICB2b2lkIHBhaW50Um9v dEJveERlY29yYXRpb25zKFBhaW50SW5mbyYsIGludCB0eCwgaW50IHR5KTsKZGlmZiAtLWdpdCBh L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAgYi9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJPYmplY3QuY3BwCmluZGV4IDUxZTViMDIuLmZjNzEzNGQgMTAwNjQ0Ci0tLSBhL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAKKysrIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyT2JqZWN0LmNwcApAQCAtMjQ0Myw2ICsyNDQzLDE5IEBAIEZsb2F0UXVhZCBSZW5kZXJPYmpl Y3Q6OmxvY2FsVG9BYnNvbHV0ZVF1YWQoY29uc3QgRmxvYXRRdWFkJiBsb2NhbFF1YWQsIGJvb2wg Zml4CiAgICAgcmV0dXJuIEZsb2F0UXVhZCgpOwogfQogCitJbnRTaXplIFJlbmRlck9iamVjdDo6 b2Zmc2V0RnJvbUNvbnRhaW5lcihSZW5kZXJPYmplY3QqIG8pIGNvbnN0Cit7CisgICAgQVNTRVJU KG8gPT0gY29udGFpbmVyKCkpOworCisgICAgSW50U2l6ZSBvZmZzZXQ7CisgICAgb2Zmc2V0LmV4 cGFuZCgwLCBvLT5ib3JkZXJUb3BFeHRyYSgpKTsKKworICAgIGlmIChvLT5oYXNPdmVyZmxvd0Ns aXAoKSkKKyAgICAgICAgb2Zmc2V0IC09IG8tPmxheWVyKCktPnNjcm9sbGVkQ29udGVudE9mZnNl dCgpOworCisgICAgcmV0dXJuIG9mZnNldDsKK30KKwogSW50UmVjdCBSZW5kZXJPYmplY3Q6OmNh cmV0UmVjdChJbmxpbmVCb3gqIGlubGluZUJveCwgaW50IGNhcmV0T2Zmc2V0LCBpbnQqIGV4dHJh V2lkdGhUb0VuZE9mTGluZSkKIHsKICAgIGlmIChleHRyYVdpZHRoVG9FbmRPZkxpbmUpCmRpZmYg LS1naXQgYS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuaCBiL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlck9iamVjdC5oCmluZGV4IDk5YjIzMDkuLmUyNjg5ZTMgMTAwNjQ0Ci0tLSBhL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oCisrKyBiL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlck9iamVjdC5oCkBAIC02MDIsNiArNjAyLDkgQEAgcHVibGljOgogICAgIC8vIENvbnZlcnQg YSBsb2NhbCBxdWFkIHRvIGFuIGFic29sdXRlIHF1YWQsIHRha2luZyB0cmFuc2Zvcm1zIGludG8g YWNjb3VudC4KICAgICB2aXJ0dWFsIEZsb2F0UXVhZCBsb2NhbFRvQWJzb2x1dGVRdWFkKGNvbnN0 IEZsb2F0UXVhZCYsIGJvb2wgZml4ZWQgPSBmYWxzZSkgY29uc3Q7CiAKKyAgICAvLyBSZXR1cm4g dGhlIG9mZnNldCBmcm9tIHRoZSBjb250YWluZXIoKSByZW5kZXJlciAoZXhjbHVkaW5nIHRyYW5z Zm9ybXMpCisgICAgdmlydHVhbCBJbnRTaXplIG9mZnNldEZyb21Db250YWluZXIoUmVuZGVyT2Jq ZWN0KikgY29uc3Q7CisKICAgICAvLyB3aWR0aCBhbmQgaGVpZ2h0IGFyZSB3aXRob3V0IG1hcmdp bnMgYnV0IGluY2x1ZGUgcGFkZGluZ3MgYW5kIGJvcmRlcnMKICAgICB2aXJ0dWFsIGludCB3aWR0 aCgpIGNvbnN0IHsgcmV0dXJuIDA7IH0KICAgICB2aXJ0dWFsIGludCBoZWlnaHQoKSBjb25zdCB7 IHJldHVybiAwOyB9CmRpZmYgLS1naXQgYS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0Q29u dHJvbC5jcHAgYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0Q29udHJvbC5jcHAKaW5kZXgg NTY3ZWI0NS4uMGFiZjg4YiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4 dENvbnRyb2wuY3BwCisrKyBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRDb250cm9sLmNw cApAQCAtODUyLDkgKzg1MiwxMCBAQCB2b2lkIFJlbmRlclRleHRDb250cm9sOjpmb3J3YXJkRXZl bnQoRXZlbnQqIGV2dCkKICAgICB9IGVsc2UgaWYgKGV2dC0+dHlwZSgpID09IGV2ZW50TmFtZXMo KS5mb2N1c0V2ZW50KQogICAgICAgICBjYXBzTG9ja1N0YXRlTWF5SGF2ZUNoYW5nZWQoKTsKICAg ICBlbHNlIHsKLSAgICAgICAgaWYgKGV2dC0+aXNNb3VzZUV2ZW50KCkgJiYgbV9yZXN1bHRzQnV0 dG9uICYmIHN0YXRpY19jYXN0PE1vdXNlRXZlbnQqPihldnQpLT54KCkgPCBtX2lubmVyVGV4dC0+ cmVuZGVyZXIoKS0+YWJzb2x1dGVCb3VuZGluZ0JveFJlY3QoKS54KCkpCisgICAgICAgIEZsb2F0 UG9pbnQgbG9jYWxQb2ludCA9IG1faW5uZXJUZXh0LT5yZW5kZXJlcigpLT5hYnNvbHV0ZVRvTG9j YWwoRmxvYXRQb2ludChzdGF0aWNfY2FzdDxNb3VzZUV2ZW50Kj4oZXZ0KS0+cGFnZVgoKSwgc3Rh dGljX2Nhc3Q8TW91c2VFdmVudCo+KGV2dCktPnBhZ2VZKCkpLCBmYWxzZSwgdHJ1ZSk7CisgICAg ICAgIGlmIChldnQtPmlzTW91c2VFdmVudCgpICYmIG1fcmVzdWx0c0J1dHRvbiAmJiBsb2NhbFBv aW50LngoKSA8IG1faW5uZXJUZXh0LT5yZW5kZXJlcigpLT5ib3JkZXJCb3goKS54KCkpCiAgICAg ICAgICAgICBtX3Jlc3VsdHNCdXR0b24tPmRlZmF1bHRFdmVudEhhbmRsZXIoZXZ0KTsKLSAgICAg ICAgZWxzZSBpZiAoZXZ0LT5pc01vdXNlRXZlbnQoKSAmJiBtX2NhbmNlbEJ1dHRvbiAmJiBzdGF0 aWNfY2FzdDxNb3VzZUV2ZW50Kj4oZXZ0KS0+eCgpID4gbV9pbm5lclRleHQtPnJlbmRlcmVyKCkt PmFic29sdXRlQm91bmRpbmdCb3hSZWN0KCkucmlnaHQoKSkKKyAgICAgICAgZWxzZSBpZiAoZXZ0 LT5pc01vdXNlRXZlbnQoKSAmJiBtX2NhbmNlbEJ1dHRvbiAmJiBsb2NhbFBvaW50LngoKSA+IG1f aW5uZXJUZXh0LT5yZW5kZXJlcigpLT5ib3JkZXJCb3goKS5yaWdodCgpKQogICAgICAgICAgICAg bV9jYW5jZWxCdXR0b24tPmRlZmF1bHRFdmVudEhhbmRsZXIoZXZ0KTsKICAgICAgICAgZWxzZQog ICAgICAgICAgICAgbV9pbm5lclRleHQtPmRlZmF1bHRFdmVudEhhbmRsZXIoZXZ0KTsKQEAgLTk4 Niw3ICs5ODcsNyBAQCB2b2lkIFJlbmRlclRleHRDb250cm9sOjpzaG93UG9wdXAoKQogICAgICAg ICBtX3NlYXJjaFBvcHVwLT5zYXZlUmVjZW50U2VhcmNoZXMobmFtZSwgbV9yZWNlbnRTZWFyY2hl cyk7CiAgICAgfQogCi0gICAgbV9zZWFyY2hQb3B1cC0+c2hvdyhhYnNvbHV0ZUJvdW5kaW5nQm94 UmVjdCgpLCBkb2N1bWVudCgpLT52aWV3KCksIC0xKTsKKyAgICBtX3NlYXJjaFBvcHVwLT5zaG93 KGFic29sdXRlQm91bmRpbmdCb3hSZWN0KHRydWUpLCBkb2N1bWVudCgpLT52aWV3KCksIC0xKTsK IH0KIAogdm9pZCBSZW5kZXJUZXh0Q29udHJvbDo6aGlkZVBvcHVwKCkKZGlmZiAtLWdpdCBhL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lTWFjLmggYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJUaGVtZU1hYy5oCmluZGV4IDFhNDk4OTguLmExZGE3ZmYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlclRoZW1lTWFjLmgKKysrIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy VGhlbWVNYWMuaApAQCAtMTIwLDYgKzEyMCw4IEBAIHByb3RlY3RlZDoKIHByaXZhdGU6CiAgICAg SW50UmVjdCBpbmZsYXRlUmVjdChjb25zdCBJbnRSZWN0JiwgY29uc3QgSW50U2l6ZSYsIGNvbnN0 IGludCogbWFyZ2lucywgZmxvYXQgem9vbUxldmVsID0gMS4wZikgY29uc3Q7CiAKKyAgICBGbG9h dFJlY3QgY29udmVydFRvUGFpbnRpbmdSZWN0KGNvbnN0IFJlbmRlck9iamVjdCogaW5wdXRSZW5k ZXJlciwgY29uc3QgUmVuZGVyT2JqZWN0KiBwYXJ0UmVuZGVyZXIsIGNvbnN0IEZsb2F0UmVjdCYg aW5wdXRSZWN0LCBjb25zdCBJbnRSZWN0JiByKSBjb25zdDsKKyAgICAKICAgICAvLyBHZXQgdGhl IGNvbnRyb2wgc2l6ZSBiYXNlZCBvZmYgdGhlIGZvbnQuICBVc2VkIGJ5IHNvbWUgb2YgdGhlIGNv bnRyb2xzIChsaWtlIGJ1dHRvbnMpLgogICAgIE5TQ29udHJvbFNpemUgY29udHJvbFNpemVGb3JG b250KFJlbmRlclN0eWxlKikgY29uc3Q7CiAgICAgTlNDb250cm9sU2l6ZSBjb250cm9sU2l6ZUZv clN5c3RlbUZvbnQoUmVuZGVyU3R5bGUqKSBjb25zdDsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlclRoZW1lTWFjLm1tIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVN YWMubW0KaW5kZXggNzg5ZjBiMi4uZTQwMGViYiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyVGhlbWVNYWMubW0KKysrIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVN YWMubW0KQEAgLTQ3NSw2ICs0NzUsMjggQEAgSW50UmVjdCBSZW5kZXJUaGVtZU1hYzo6aW5mbGF0 ZVJlY3QoY29uc3QgSW50UmVjdCYgciwgY29uc3QgSW50U2l6ZSYgc2l6ZSwgY29uc3QKICAgICBy ZXR1cm4gcmVzdWx0OwogfQogCitGbG9hdFJlY3QgUmVuZGVyVGhlbWVNYWM6OmNvbnZlcnRUb1Bh aW50aW5nUmVjdChjb25zdCBSZW5kZXJPYmplY3QqIGlucHV0UmVuZGVyZXIsIGNvbnN0IFJlbmRl ck9iamVjdCogcGFydFJlbmRlcmVyLCBjb25zdCBGbG9hdFJlY3QmIGlucHV0UmVjdCwgY29uc3Qg SW50UmVjdCYgcikgY29uc3QKK3sKKyAgICBGbG9hdFJlY3QgcGFydFJlY3QoaW5wdXRSZWN0KTsK KyAgICAKKyAgICAvLyBDb21wdXRlIGFuIG9mZnNldCBiZXR3ZWVuIHRoZSBwYXJ0IHJlbmRlcmVy IGFuZCB0aGUgaW5wdXQgcmVuZGVyZXIKKyAgICBGbG9hdFNpemUgb2Zmc2V0RnJvbUlucHV0UmVu ZGVyZXI7CisgICAgY29uc3QgUmVuZGVyT2JqZWN0KiByZW5kZXJlciA9IHBhcnRSZW5kZXJlcjsK KyAgICB3aGlsZSAocmVuZGVyZXIgJiYgcmVuZGVyZXIgIT0gaW5wdXRSZW5kZXJlcikgeworICAg ICAgICBSZW5kZXJPYmplY3QqIGNvbnRhaW5pbmdSZW5kZXJlciA9IHJlbmRlcmVyLT5jb250YWlu ZXIoKTsKKyAgICAgICAgb2Zmc2V0RnJvbUlucHV0UmVuZGVyZXIgLT0gcmVuZGVyZXItPm9mZnNl dEZyb21Db250YWluZXIoY29udGFpbmluZ1JlbmRlcmVyKTsKKyAgICAgICAgcmVuZGVyZXIgPSBj b250YWluaW5nUmVuZGVyZXI7CisgICAgfQorICAgIC8vIElmIHRoZSBpbnB1dCByZW5kZXJlciB3 YXMgbm90IGEgY29udGFpbmVyLCBzb21ldGhpbmcgd2VudCB3cm9uZworICAgIEFTU0VSVChyZW5k ZXJlciA9PSBpbnB1dFJlbmRlcmVyKTsKKyAgICAvLyBNb3ZlIHRoZSByZWN0IGludG8gcGFydFJl bmRlcmVyJ3MgY29vcmRzCisgICAgcGFydFJlY3QubW92ZShvZmZzZXRGcm9tSW5wdXRSZW5kZXJl cik7CisgICAgLy8gQWNjb3VudCBmb3IgdGhlIGxvY2FsIGRyYXdpbmcgb2Zmc2V0ICh0eCwgdHkp CisgICAgcGFydFJlY3QubW92ZShyLngoKSwgci55KCkpOworCisgICAgcmV0dXJuIHBhcnRSZWN0 OworfQorCiB2b2lkIFJlbmRlclRoZW1lTWFjOjp1cGRhdGVDaGVja2VkU3RhdGUoTlNDZWxsKiBj ZWxsLCBjb25zdCBSZW5kZXJPYmplY3QqIG8pCiB7CiAgICAgYm9vbCBvbGRJbmRldGVybWluYXRl ID0gW2NlbGwgc3RhdGVdID09IE5TTWl4ZWRTdGF0ZTsKQEAgLTEyNDMsOSArMTI2NSwxMCBAQCBi b29sIFJlbmRlclRoZW1lTWFjOjpwYWludFNlYXJjaEZpZWxkQ2FuY2VsQnV0dG9uKFJlbmRlck9i amVjdCogbywgY29uc3QgUmVuZGVyTwogCiAgICAgZmxvYXQgem9vbUxldmVsID0gby0+c3R5bGUo KS0+ZWZmZWN0aXZlWm9vbSgpOwogCi0gICAgTlNSZWN0IGJvdW5kcyA9IFtzZWFyY2ggY2FuY2Vs QnV0dG9uUmVjdEZvckJvdW5kczpOU1JlY3QoaW5wdXQtPnJlbmRlcmVyKCktPmFic29sdXRlQm91 bmRpbmdCb3hSZWN0KCkpXTsKLSAgICAKLSAgICBJbnRSZWN0IHVuem9vbWVkUmVjdChib3VuZHMp OworICAgIEZsb2F0UmVjdCBsb2NhbEJvdW5kcyA9IFtzZWFyY2ggY2FuY2VsQnV0dG9uUmVjdEZv ckJvdW5kczpOU1JlY3QoaW5wdXQtPnJlbmRlcmVyKCktPmJvcmRlckJveCgpKV07CisgICAgbG9j YWxCb3VuZHMgPSBjb252ZXJ0VG9QYWludGluZ1JlY3QoaW5wdXQtPnJlbmRlcmVyKCksIG8sIGxv Y2FsQm91bmRzLCByKTsKKworICAgIEZsb2F0UmVjdCB1bnpvb21lZFJlY3QobG9jYWxCb3VuZHMp OwogICAgIGlmICh6b29tTGV2ZWwgIT0gMS4wZikgewogICAgICAgICB1bnpvb21lZFJlY3Quc2V0 V2lkdGgodW56b29tZWRSZWN0LndpZHRoKCkgLyB6b29tTGV2ZWwpOwogICAgICAgICB1bnpvb21l ZFJlY3Quc2V0SGVpZ2h0KHVuem9vbWVkUmVjdC5oZWlnaHQoKSAvIHpvb21MZXZlbCk7CkBAIC0x MzEzLDggKzEzMzYsMTAgQEAgYm9vbCBSZW5kZXJUaGVtZU1hYzo6cGFpbnRTZWFyY2hGaWVsZFJl c3VsdHNEZWNvcmF0aW9uKFJlbmRlck9iamVjdCogbywgY29uc3QgUmUKICAgICBpZiAoW3NlYXJj aCBzZWFyY2hNZW51VGVtcGxhdGVdICE9IG5pbCkKICAgICAgICAgW3NlYXJjaCBzZXRTZWFyY2hN ZW51VGVtcGxhdGU6bmlsXTsKIAotICAgIE5TUmVjdCBib3VuZHMgPSBbc2VhcmNoIHNlYXJjaEJ1 dHRvblJlY3RGb3JCb3VuZHM6TlNSZWN0KGlucHV0LT5yZW5kZXJlcigpLT5hYnNvbHV0ZUJvdW5k aW5nQm94UmVjdCgpKV07Ci0gICAgW1tzZWFyY2ggc2VhcmNoQnV0dG9uQ2VsbF0gZHJhd1dpdGhG cmFtZTpib3VuZHMgaW5WaWV3Om8tPnZpZXcoKS0+ZnJhbWVWaWV3KCktPmRvY3VtZW50Vmlldygp XTsKKyAgICBGbG9hdFJlY3QgbG9jYWxCb3VuZHMgPSBbc2VhcmNoIHNlYXJjaEJ1dHRvblJlY3RG b3JCb3VuZHM6TlNSZWN0KGlucHV0LT5yZW5kZXJlcigpLT5ib3JkZXJCb3goKSldOworICAgIGxv Y2FsQm91bmRzID0gY29udmVydFRvUGFpbnRpbmdSZWN0KGlucHV0LT5yZW5kZXJlcigpLCBvLCBs b2NhbEJvdW5kcywgcik7CisKKyAgICBbW3NlYXJjaCBzZWFyY2hCdXR0b25DZWxsXSBkcmF3V2l0 aEZyYW1lOmxvY2FsQm91bmRzIGluVmlldzpvLT52aWV3KCktPmZyYW1lVmlldygpLT5kb2N1bWVu dFZpZXcoKV07CiAgICAgW1tzZWFyY2ggc2VhcmNoQnV0dG9uQ2VsbF0gc2V0Q29udHJvbFZpZXc6 bmlsXTsKICAgICByZXR1cm4gZmFsc2U7CiB9CkBAIC0xMzQyLDkgKzEzNjcsMTAgQEAgYm9vbCBS ZW5kZXJUaGVtZU1hYzo6cGFpbnRTZWFyY2hGaWVsZFJlc3VsdHNCdXR0b24oUmVuZGVyT2JqZWN0 KiBvLCBjb25zdCBSZW5kZXIKIAogICAgIGZsb2F0IHpvb21MZXZlbCA9IG8tPnN0eWxlKCktPmVm ZmVjdGl2ZVpvb20oKTsKIAotICAgIE5TUmVjdCBib3VuZHMgPSBbc2VhcmNoIHNlYXJjaEJ1dHRv blJlY3RGb3JCb3VuZHM6TlNSZWN0KGlucHV0LT5yZW5kZXJlcigpLT5hYnNvbHV0ZUJvdW5kaW5n Qm94UmVjdCgpKV07CisgICAgRmxvYXRSZWN0IGxvY2FsQm91bmRzID0gW3NlYXJjaCBzZWFyY2hC dXR0b25SZWN0Rm9yQm91bmRzOk5TUmVjdChpbnB1dC0+cmVuZGVyZXIoKS0+Ym9yZGVyQm94KCkp XTsKKyAgICBsb2NhbEJvdW5kcyA9IGNvbnZlcnRUb1BhaW50aW5nUmVjdChpbnB1dC0+cmVuZGVy ZXIoKSwgbywgbG9jYWxCb3VuZHMsIHIpOwogICAgIAotICAgIEludFJlY3QgdW56b29tZWRSZWN0 KGJvdW5kcyk7CisgICAgSW50UmVjdCB1bnpvb21lZFJlY3QobG9jYWxCb3VuZHMpOwogICAgIGlm ICh6b29tTGV2ZWwgIT0gMS4wZikgewogICAgICAgICB1bnpvb21lZFJlY3Quc2V0V2lkdGgodW56 b29tZWRSZWN0LndpZHRoKCkgLyB6b29tTGV2ZWwpOwogICAgICAgICB1bnpvb21lZFJlY3Quc2V0 SGVpZ2h0KHVuem9vbWVkUmVjdC5oZWlnaHQoKSAvIHpvb21MZXZlbCk7Cg==