22109 2008-11-06 11:29:56 -0800 [Transforms] input type="range" has event handling issues with transforms 2008-11-06 12:55:50 -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 adele koivisto oldest_to_newest 97848 0 simon.fraser 2008-11-06 11:29:56 -0800 The RenderSlider needs to take transforms into account for hit testing, and handling thumb drags. 97849 1 24949 simon.fraser 2008-11-06 11:30:23 -0800 Created attachment 24949 Testcase 97854 2 simon.fraser 2008-11-06 12:08:32 -0800 Note that sliders are used for the built-in video controls, so this will fix transformed video too. 97862 3 simon.fraser 2008-11-06 12:21:25 -0800 Filed bug 22111 to cover other issues with transformed video controls. 97868 4 24955 simon.fraser 2008-11-06 12:48:39 -0800 Created attachment 24955 Patch, testcase, changelog 97870 5 simon.fraser 2008-11-06 12:55:50 -0800 M WebCore/html/HTMLInputElement.cpp M WebCore/rendering/RenderSlider.cpp M WebCore/ChangeLog M LayoutTests/ChangeLog A LayoutTests/fast/forms/slider-transformed.html A LayoutTests/fast/forms/slider-transformed-expected.txt r38193 = 52b2c5098781781b84ccaaaecc8ddd094acd925b (trunk) 24949 2008-11-06 11:30:23 -0800 2008-11-06 11:30:23 -0800 Testcase slider.html text/html 1010 simon.fraser PCFET0NUWVBFIGh0bWwgUFVCTElDICItLy9XM0MvL0RURCBIVE1MIDQuMDEgVHJhbnNpdGlvbmFs Ly9FTiIKICAgImh0dHA6Ly93d3cudzMub3JnL1RSL2h0bWw0L2xvb3NlLmR0ZCI+Cgo8aHRtbCBs YW5nPSJlbiI+CjxoZWFkPgoJPG1ldGEgaHR0cC1lcXVpdj0iQ29udGVudC1UeXBlIiBjb250ZW50 PSJ0ZXh0L2h0bWw7IGNoYXJzZXQ9dXRmLTgiPgoJPHRpdGxlPlNsaWRlciBUZXN0PC90aXRsZT4K ICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiIG1lZGlhPSJzY3JlZW4iPgogICAgCiAgICBpbnB1dCB7 CiAgICAgIGRpc3BsYXk6IGJsb2NrOwogICAgICB3aWR0aDogMzAwcHg7CiAgICB9CiAgPC9zdHls ZT4KICA8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCIgY2hhcnNldD0idXRmLTgiPgogICAg ZnVuY3Rpb24gc2hvd1ZhbHVlKHNsaWRlcikKICAgIHsKICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVu dEJ5SWQoJ3ZhbHVlJykuaW5uZXJIVE1MID0gc2xpZGVyLnZhbHVlOwogICAgfQogIDwvc2NyaXB0 Pgo8L2hlYWQ+Cjxib2R5PgoKPGlucHV0IHR5cGU9InJhbmdlIiBtaW49IjAiIG1heD0iMTAwIiBv bmNoYW5nZT0ic2hvd1ZhbHVlKHRoaXMpIiBzdHlsZT0iLXdlYmtpdC10cmFuc2Zvcm06IHRyYW5z bGF0ZSgtNTBweCwgMjAwcHgpIHJvdGF0ZSg5MGRlZykiPjwvaW5wdXQ+Cgo8aW5wdXQgdHlwZT0i cmFuZ2UiIG1pbj0iMCIgbWF4PSIxMDAiIG9uY2hhbmdlPSJzaG93VmFsdWUodGhpcykiIHN0eWxl PSItd2Via2l0LXRyYW5zZm9ybTogdHJhbnNsYXRlKDEwMHB4LCAyMDBweCkgcm90YXRlKDQ1ZGVn KSI+PC9pbnB1dD4KCjxpbnB1dCB0eXBlPSJyYW5nZSIgbWluPSIwIiBtYXg9IjEwMCIgb25jaGFu Z2U9InNob3dWYWx1ZSh0aGlzKSIgc3R5bGU9Ii13ZWJraXQtdHJhbnNmb3JtOiB0cmFuc2xhdGUo MzAwcHgsIDIwMHB4KSByb3RhdGUoMTgwZGVnKSI+PC9pbnB1dD4KCjxwPlZhbHVlOjwvcD4KPGRp diBpZD0idmFsdWUiPgogIAo8L2Rpdj4KCjwvYm9keT4KPC9odG1sPgo= 24955 2008-11-06 12:48:39 -0800 2008-11-06 12:53:44 -0800 Patch, testcase, changelog 22109_patch.txt text/plain 8559 simon.fraser ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAzNDBkMTlkLi5lYjhkZjkyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMDgtMTEt MDYgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIyMTA5CisgICAgICAgIE1ha2UgPGlucHV0IHR5cGU9InJhbmdl Ij4gd29yayBjb3JyZWN0bHkgd2l0aCB0cmFuc2Zvcm1zCisgICAgICAgIAorICAgICAgICAqIGZh c3QvZm9ybXMvc2xpZGVyLXRyYW5zZm9ybWVkLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAg ICogZmFzdC9mb3Jtcy9zbGlkZXItdHJhbnNmb3JtZWQuaHRtbDogQWRkZWQuCisKIDIwMDgtMTEt MDUgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2 aWV3ZWQgYnkgRGF2ZSBIeWF0dApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9mb3Jtcy9z bGlkZXItdHJhbnNmb3JtZWQtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9mb3Jtcy9z bGlkZXItdHJhbnNmb3JtZWQtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4 IDAwMDAwMDAuLmNjMTFiYzkKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2Zv cm1zL3NsaWRlci10cmFuc2Zvcm1lZC1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwyIEBACisKK1BB U1M6IHNsaWRlciB2YWx1ZSBzZXQgdG8gMzkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3Qv Zm9ybXMvc2xpZGVyLXRyYW5zZm9ybWVkLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2Zvcm1zL3Ns aWRlci10cmFuc2Zvcm1lZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAu LmQ0NjI1OWQKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2Zvcm1zL3NsaWRl ci10cmFuc2Zvcm1lZC5odG1sCkBAIC0wLDAgKzEsNTAgQEAKKzxodG1sPgorPGhlYWQ+CisgIDxt ZXRhIGh0dHAtZXF1aXY9IkNvbnRlbnQtdHlwZSIgY29udGVudD0idGV4dC9odG1sOyBjaGFyc2V0 PXV0Zi04Ij4KKyAgPHRpdGxlPnNsaWRlci10cmFuc2Zvcm1lZDwvdGl0bGU+CisgIDxzdHlsZSB0 eXBlPSJ0ZXh0L2NzcyIgbWVkaWE9InNjcmVlbiI+CisgICAgaW5wdXRbdHlwZT0icmFuZ2UiXSB7 CisgICAgICAtd2Via2l0LXRyYW5zZm9ybS1vcmlnaW46IHRvcCBsZWZ0OworICAgICAgLXdlYmtp dC10cmFuc2Zvcm06IHJvdGF0ZSg0NWRlZyk7CisgICAgICB3aWR0aDogMjAwcHg7CisgICAgfQor ICAgIAorICAgICNyZXN1bHRzIHsKKyAgICAgIG1hcmdpbi10b3A6IDE2MHB4OworICAgIH0KKyAg PC9zdHlsZT4KKyAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIGNoYXJzZXQ9InV0Zi04 Ij4KKyAgICBpZiAod2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKQorICAgICAgICBsYXlvdXRU ZXN0Q29udHJvbGxlci5kdW1wQXNUZXh0KCk7CisKKyAgICBmdW5jdGlvbiBkaXNwYXRjaEV2ZW50 KGV2ZW50VHlwZSwgY2xpZW50WCwgY2xpZW50WSkKKyAgICB7CisgICAgICB2YXIgZXYgPSBkb2N1 bWVudC5jcmVhdGVFdmVudCgiTW91c2VFdmVudCIpOworICAgICAgZXYuaW5pdE1vdXNlRXZlbnQo ZXZlbnRUeXBlLCB0cnVlLCB0cnVlLCB3aW5kb3csIDEsIDEsIDEsIGNsaWVudFgsIGNsaWVudFks IGZhbHNlLCBmYWxzZSwgZmFsc2UsIGZhbHNlLCAwLCBkb2N1bWVudCk7CisgICAgICB2YXIgdGFy Z2V0ID0gZG9jdW1lbnQuZWxlbWVudEZyb21Qb2ludChldi5wYWdlWCwgZXYucGFnZVkpOworICAg ICAgdGFyZ2V0LmRpc3BhdGNoRXZlbnQoZXYpOworICAgIH0KKyAgICAKKyAgICBmdW5jdGlvbiB0 ZXN0KCkKKyAgICB7CisgICAgICAvLyBGb3Igc29tZSByZWFzb24gdGhlIHNsaWRlciBuZWVkcyBt b3VzZXVwL21vdXNlZG93biwgbm90IGp1c3QgYSAiY2xpY2siCisgICAgICBkaXNwYXRjaEV2ZW50 KCJtb3VzZWRvd24iLCA2MSwgNzEpOworICAgICAgZGlzcGF0Y2hFdmVudCgibW91c2V1cCIsIDYx LCA3MSk7CisKKyAgICAgIGNvbnN0IGV4cGVjdGVkVmFsdWUgPSAzOTsKKyAgICAgIHZhciB2YWwg PSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnc2xpZGVyJykudmFsdWU7CisgICAgICB2YXIgcmVz dWx0OworICAgICAgaWYgKHZhbCA9PSBleHBlY3RlZFZhbHVlKQorICAgICAgICByZXN1bHQgPSAi UEFTUzogc2xpZGVyIHZhbHVlIHNldCB0byAiICsgZXhwZWN0ZWRWYWx1ZTsKKyAgICAgIGVsc2UK KyAgICAgICAgcmVzdWx0ID0gIkZBSUw6IGV4cGVjdGVkIHNsaWRlciB2YWx1ZSAiICsgZXhwZWN0 ZWRWYWx1ZSArICIsIGdvdCAiICsgdmFsOworICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQo J3Jlc3VsdHMnKS5pbm5lckhUTUwgPSByZXN1bHQ7CisgICAgfQorICA8L3NjcmlwdD4KKzwvaGVh ZD4KKzxib2R5IG9ubG9hZD0idGVzdCgpIj4KKyAgPGlucHV0IHR5cGU9InJhbmdlIiBpZD0ic2xp ZGVyIiBtaW49IjAiIG1heD0iMTAwIiB2YWx1ZT0iMTAiPgorICA8ZGl2IGlkPSJyZXN1bHRzIj4K KyAgPC9kaXY+Cis8L2JvZHk+Cis8L2h0bWw+ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpk aWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAz MDRjZGY1Li5kNTAzY2Q1IDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDA4LTExLTA2ICBTaW1vbiBGcmFzZXIg IDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMjEwOQorICAgICAgICBNYWtlIDxpbnB1dCB0eXBlPSJyYW5nZSI+IHdvcmsgY29ycmVjdGx5 IHdpdGggdHJhbnNmb3JtcworCisgICAgICAgIFRlc3Q6IGZhc3QvZm9ybXMvc2xpZGVyLXRyYW5z Zm9ybWVkLmh0bWwKKworICAgICAgICAqIGh0bWwvSFRNTElucHV0RWxlbWVudC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpIVE1MSW5wdXRFbGVtZW50OjpkZWZhdWx0RXZlbnRIYW5kbGVyKToKKyAg ICAgICAgICAgIENvbXB1dGUgYSBjb3JyZWN0IGxvY2FsIHBvaW50IHdoZW4gdGhlIGV2ZW50IGlz IHJldGFyZ2V0ZWQKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyU2xpZGVyLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkhUTUxTbGlkZXJUaHVtYkVsZW1lbnQ6OmRlZmF1bHRFdmVudEhhbmRsZXIp OgorICAgICAgICAgICAgQ29tcHV0ZSBtX2luaXRpYWxDbGlja1BvaW50IGluIHNsaWRlci1sb2Nh bCBjb29yZHMsIHNvIHRoYXQKKyAgICAgICAgICAgIGRlbHRhcyBhcmUgY29tcHV0ZWQgY29ycmVj dGx5IHdpdGggdHJhbnNmb3JtcworICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU2xpZGVyOjptb3Vz ZUV2ZW50SXNJblRodW1iKToKKyAgICAgICAgICAgIFJhdGhlciB0aGFuIGNvbXB1dGluZyBhbiBh YnNvbHV0ZSBib3VuZHMgZm9yIHRoZSB0aHVtYiwKKyAgICAgICAgICAgIGNvbnZlcnQgdGhlIHBv aW50IHRvIGxvY2FsIGNvb3JkcyBhbmQgY29tcGFyZSBpdCB3aXRoIHRoZSBib3JkZXIgYm94Lgor CiAyMDA4LTExLTA1ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAg ICAgICAgIFJldmlld2VkIGJ5IERhdmUgSHlhdHQKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaHRtbC9I VE1MSW5wdXRFbGVtZW50LmNwcCBiL1dlYkNvcmUvaHRtbC9IVE1MSW5wdXRFbGVtZW50LmNwcApp bmRleCBkYTgzNzEwLi5hODAyZWFmIDEwMDY0NAotLS0gYS9XZWJDb3JlL2h0bWwvSFRNTElucHV0 RWxlbWVudC5jcHAKKysrIGIvV2ViQ29yZS9odG1sL0hUTUxJbnB1dEVsZW1lbnQuY3BwCkBAIC0x NDI5LDExICsxNDI5LDggQEAgdm9pZCBIVE1MSW5wdXRFbGVtZW50OjpkZWZhdWx0RXZlbnRIYW5k bGVyKEV2ZW50KiBldnQpCiAgICAgICAgICAgICBNb3VzZUV2ZW50KiBtRXZ0ID0gc3RhdGljX2Nh c3Q8TW91c2VFdmVudCo+KGV2dCk7CiAgICAgICAgICAgICBpZiAoIXNsaWRlci0+bW91c2VFdmVu dElzSW5UaHVtYihtRXZ0KSkgewogICAgICAgICAgICAgICAgIEludFBvaW50IGV2ZW50T2Zmc2V0 KG1FdnQtPm9mZnNldFgoKSwgbUV2dC0+b2Zmc2V0WSgpKTsKLSAgICAgICAgICAgICAgICBpZiAo bUV2dC0+dGFyZ2V0KCkgIT0gdGhpcykgewotICAgICAgICAgICAgICAgICAgICBJbnRSZWN0IHJl Y3QgPSByZW5kZXJlcigpLT5hYnNvbHV0ZUJvdW5kaW5nQm94UmVjdCgpOwotICAgICAgICAgICAg ICAgICAgICBldmVudE9mZnNldC5zZXRYKG1FdnQtPnBhZ2VYKCkgLSByZWN0LngoKSk7Ci0gICAg ICAgICAgICAgICAgICAgIGV2ZW50T2Zmc2V0LnNldFkobUV2dC0+cGFnZVkoKSAtIHJlY3QueSgp KTsKLSAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgaWYgKG1FdnQtPnRhcmdldCgp ICE9IHRoaXMpIC8vIERvZXMgdGhpcyBldmVyIGhhcHBlbiBub3c/IFdhcyBhZGRlZCBmb3IgPHZp ZGVvPiBjb250cm9scworICAgICAgICAgICAgICAgICAgICBldmVudE9mZnNldCA9IHJvdW5kZWRJ bnRQb2ludChyZW5kZXJlcigpLT5hYnNvbHV0ZVRvTG9jYWwoRmxvYXRQb2ludChtRXZ0LT5wYWdl WCgpLCBtRXZ0LT5wYWdlWSgpKSwgZmFsc2UsIHRydWUpKTsKICAgICAgICAgICAgICAgICBzbGlk ZXItPnNldFZhbHVlRm9yUG9zaXRpb24oc2xpZGVyLT5wb3NpdGlvbkZvck9mZnNldChldmVudE9m ZnNldCkpOwogICAgICAgICAgICAgfQogICAgICAgICB9CmRpZmYgLS1naXQgYS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJTbGlkZXIuY3BwIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyU2xpZGVy LmNwcAppbmRleCAwYWZkZTQ5Li5mOWNiMTNjIDEwMDY0NAotLS0gYS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJTbGlkZXIuY3BwCisrKyBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclNsaWRlci5j cHAKQEAgLTU0LDcgKzU0LDcgQEAgcHVibGljOgogICAgIGJvb2wgaW5EcmFnTW9kZSgpIGNvbnN0 IHsgcmV0dXJuIG1faW5EcmFnTW9kZTsgfQogcHJpdmF0ZToKICAgICBOb2RlKiBtX3NoYWRvd1Bh cmVudDsKLSAgICBJbnRQb2ludCBtX2luaXRpYWxDbGlja1BvaW50OworICAgIEZsb2F0UG9pbnQg bV9pbml0aWFsQ2xpY2tQb2ludDsgICAgICAgLy8gaW5pdGlhbCBjbGljayBwb2ludCBpbiBSZW5k ZXJTbGlkZXItbG9jYWwgY29vcmRpbmF0ZXMKICAgICBpbnQgbV9pbml0aWFsUG9zaXRpb247CiAg ICAgYm9vbCBtX2luRHJhZ01vZGU7CiB9OwpAQCAtNzMsMTIgKzczLDE0IEBAIHZvaWQgSFRNTFNs aWRlclRodW1iRWxlbWVudDo6ZGVmYXVsdEV2ZW50SGFuZGxlcihFdmVudCogZXZlbnQpCiAgICAg Y29uc3QgQXRvbWljU3RyaW5nJiBldmVudFR5cGUgPSBldmVudC0+dHlwZSgpOwogICAgIGlmIChl dmVudFR5cGUgPT0gZXZlbnROYW1lcygpLm1vdXNlZG93bkV2ZW50ICYmIGV2ZW50LT5pc01vdXNl RXZlbnQoKSAmJiBzdGF0aWNfY2FzdDxNb3VzZUV2ZW50Kj4oZXZlbnQpLT5idXR0b24oKSA9PSBM ZWZ0QnV0dG9uKSB7CiAgICAgICAgIE1vdXNlRXZlbnQqIG1vdXNlRXZlbnQgPSBzdGF0aWNfY2Fz dDxNb3VzZUV2ZW50Kj4oZXZlbnQpOwotICAgICAgICBpZiAoZG9jdW1lbnQoKS0+ZnJhbWUoKSAm JiByZW5kZXJlcigpICYmIHJlbmRlcmVyKCktPnBhcmVudCgpCi0gICAgICAgICAgICAgICAgJiYg c3RhdGljX2Nhc3Q8UmVuZGVyU2xpZGVyKj4ocmVuZGVyZXIoKS0+cGFyZW50KCkpLT5tb3VzZUV2 ZW50SXNJblRodW1iKG1vdXNlRXZlbnQpKSB7Ci0gICAgICAgICAgICAvLyBDYWNoZSB0aGUgaW5p dGlhbCBwb2ludCB3aGVyZSB0aGUgbW91c2UgZG93biBvY2N1cnJlZC4KLSAgICAgICAgICAgIG1f aW5pdGlhbENsaWNrUG9pbnQgPSBJbnRQb2ludChtb3VzZUV2ZW50LT5wYWdlWCgpLCBtb3VzZUV2 ZW50LT5wYWdlWSgpKTsKKyAgICAgICAgUmVuZGVyU2xpZGVyKiBzbGlkZXI7CisgICAgICAgIGlm IChkb2N1bWVudCgpLT5mcmFtZSgpICYmIHJlbmRlcmVyKCkgJiYgcmVuZGVyZXIoKS0+cGFyZW50 KCkgJiYKKyAgICAgICAgICAgICAgICAoc2xpZGVyID0gc3RhdGljX2Nhc3Q8UmVuZGVyU2xpZGVy Kj4ocmVuZGVyZXIoKS0+cGFyZW50KCkpKSAmJgorICAgICAgICAgICAgICAgIHNsaWRlci0+bW91 c2VFdmVudElzSW5UaHVtYihtb3VzZUV2ZW50KSkgeworICAgICAgICAgICAgLy8gQ2FjaGUgdGhl IGluaXRpYWwgcG9pbnQgd2hlcmUgdGhlIG1vdXNlIGRvd24gb2NjdXJyZWQsIGluIHNsaWRlciBj b29yZGluYXRlcworICAgICAgICAgICAgbV9pbml0aWFsQ2xpY2tQb2ludCA9IHNsaWRlci0+YWJz b2x1dGVUb0xvY2FsKEZsb2F0UG9pbnQobW91c2VFdmVudC0+cGFnZVgoKSwgbW91c2VFdmVudC0+ cGFnZVkoKSksIGZhbHNlLCB0cnVlKTsKICAgICAgICAgICAgIC8vIENhY2hlIHRoZSBpbml0aWFs IHBvc2l0aW9uIG9mIHRoZSB0aHVtYi4KLSAgICAgICAgICAgIG1faW5pdGlhbFBvc2l0aW9uID0g c3RhdGljX2Nhc3Q8UmVuZGVyU2xpZGVyKj4ocmVuZGVyZXIoKS0+cGFyZW50KCkpLT5jdXJyZW50 UG9zaXRpb24oKTsKKyAgICAgICAgICAgIG1faW5pdGlhbFBvc2l0aW9uID0gc2xpZGVyLT5jdXJy ZW50UG9zaXRpb24oKTsKICAgICAgICAgICAgIG1faW5EcmFnTW9kZSA9IHRydWU7CiAgICAgICAg ICAgICAKICAgICAgICAgICAgIGRvY3VtZW50KCktPmZyYW1lKCktPmV2ZW50SGFuZGxlcigpLT5z ZXRDYXB0dXJpbmdNb3VzZUV2ZW50c05vZGUobV9zaGFkb3dQYXJlbnQpOwpAQCAtOTksMTAgKzEw MSwxMSBAQCB2b2lkIEhUTUxTbGlkZXJUaHVtYkVsZW1lbnQ6OmRlZmF1bHRFdmVudEhhbmRsZXIo RXZlbnQqIGV2ZW50KQogICAgICAgICAgICAgLy8gTW92ZSB0aGUgc2xpZGVyCiAgICAgICAgICAg ICBNb3VzZUV2ZW50KiBtb3VzZUV2ZW50ID0gc3RhdGljX2Nhc3Q8TW91c2VFdmVudCo+KGV2ZW50 KTsKICAgICAgICAgICAgIFJlbmRlclNsaWRlciogc2xpZGVyID0gc3RhdGljX2Nhc3Q8UmVuZGVy U2xpZGVyKj4ocmVuZGVyZXIoKS0+cGFyZW50KCkpOworICAgICAgICAgICAgRmxvYXRQb2ludCBj dXJQb2ludCA9IHNsaWRlci0+YWJzb2x1dGVUb0xvY2FsKEZsb2F0UG9pbnQobW91c2VFdmVudC0+ cGFnZVgoKSwgbW91c2VFdmVudC0+cGFnZVkoKSksIGZhbHNlLCB0cnVlKTsKICAgICAgICAgICAg IGludCBuZXdQb3NpdGlvbiA9IHNsaWRlci0+cG9zaXRpb25Gb3JPZmZzZXQoCi0gICAgICAgICAg ICAgICAgSW50UG9pbnQobV9pbml0aWFsUG9zaXRpb24gKyBtb3VzZUV2ZW50LT5wYWdlWCgpIC0g bV9pbml0aWFsQ2xpY2tQb2ludC54KCkKKyAgICAgICAgICAgICAgICBJbnRQb2ludChtX2luaXRp YWxQb3NpdGlvbiArIGN1clBvaW50LngoKSAtIG1faW5pdGlhbENsaWNrUG9pbnQueCgpCiAgICAg ICAgICAgICAgICAgICAgICAgICArIChyZW5kZXJlcigpLT53aWR0aCgpIC8gMiksIAotICAgICAg ICAgICAgICAgICAgICBtX2luaXRpYWxQb3NpdGlvbiArIG1vdXNlRXZlbnQtPnBhZ2VZKCkgLSBt X2luaXRpYWxDbGlja1BvaW50LnkoKQorICAgICAgICAgICAgICAgICAgICBtX2luaXRpYWxQb3Np dGlvbiArIGN1clBvaW50LnkoKSAtIG1faW5pdGlhbENsaWNrUG9pbnQueSgpCiAgICAgICAgICAg ICAgICAgICAgICAgICArIChyZW5kZXJlcigpLT5oZWlnaHQoKSAvIDIpKSk7CiAgICAgICAgICAg ICBpZiAoc2xpZGVyLT5jdXJyZW50UG9zaXRpb24oKSAhPSBuZXdQb3NpdGlvbikgewogICAgICAg ICAgICAgICAgIHNsaWRlci0+c2V0Q3VycmVudFBvc2l0aW9uKG5ld1Bvc2l0aW9uKTsKQEAgLTI1 Niw4ICsyNTksOSBAQCBib29sIFJlbmRlclNsaWRlcjo6bW91c2VFdmVudElzSW5UaHVtYihNb3Vz ZUV2ZW50KiBldnQpCiAgICAgaWYgKCFtX3RodW1iIHx8ICFtX3RodW1iLT5yZW5kZXJlcigpKQog ICAgICAgICByZXR1cm4gZmFsc2U7CiAgCi0gICAgSW50UmVjdCB0aHVtYkJvdW5kcyA9IG1fdGh1 bWItPnJlbmRlcmVyKCktPmFic29sdXRlQm91bmRpbmdCb3hSZWN0KCk7Ci0gICAgcmV0dXJuIHRo dW1iQm91bmRzLmNvbnRhaW5zKGV2dC0+cGFnZVgoKSwgZXZ0LT5wYWdlWSgpKTsKKyAgICBGbG9h dFBvaW50IGxvY2FsUG9pbnQgPSBtX3RodW1iLT5yZW5kZXJlcigpLT5hYnNvbHV0ZVRvTG9jYWwo RmxvYXRQb2ludChldnQtPnBhZ2VYKCksIGV2dC0+cGFnZVkoKSksIGZhbHNlLCB0cnVlKTsKKyAg ICBJbnRSZWN0IHRodW1iQm91bmRzID0gbV90aHVtYi0+cmVuZGVyZXIoKS0+Ym9yZGVyQm94KCk7 CisgICAgcmV0dXJuIHRodW1iQm91bmRzLmNvbnRhaW5zKHJvdW5kZWRJbnRQb2ludChsb2NhbFBv aW50KSk7CiB9CiAKIHZvaWQgUmVuZGVyU2xpZGVyOjpzZXRWYWx1ZUZvclBvc2l0aW9uKGludCBw b3NpdGlvbikK