20464 2008-08-20 13:57:13 -0700 matrix returned from getComputedStyle().webkitTransform should not contain transform-origin 2008-08-20 14:57:43 -0700 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 dino oldest_to_newest 88935 0 simon.fraser 2008-08-20 13:57:13 -0700 The matrix() returned by getComputedStyle().webkitTransform has the transform origin in it, which is, I think, incorrect. It should be possible to assign the result of getComputedStyle().webkitTransform back to element.style.webkitTransform and not have the element move. 88939 1 22900 simon.fraser 2008-08-20 14:22:53 -0700 Created attachment 22900 Testcase 88942 2 22901 simon.fraser 2008-08-20 14:52:51 -0700 Created attachment 22901 Patch, testcase, changelog 88943 3 22901 hyatt 2008-08-20 14:54:06 -0700 Comment on attachment 22901 Patch, testcase, changelog r=me 88944 4 simon.fraser 2008-08-20 14:57:43 -0700 Committed r35862 M WebCore/rendering/style/RenderStyle.cpp M WebCore/rendering/style/RenderStyle.h M WebCore/ChangeLog M WebCore/css/CSSComputedStyleDeclaration.cpp M LayoutTests/ChangeLog r35862 = be1d24c242df001aa5ff47bc008712a76460dd98 (trunk) 22900 2008-08-20 14:22:53 -0700 2008-08-20 14:22:53 -0700 Testcase transform-origin.html text/html 2497 simon.fraser PCFET0NUWVBFIGh0bWwgUFVCTElDICItLy9XM0MvL0RURCBIVE1MIDQuMDEgVHJhbnNpdGlvbmFs Ly9FTiIKICAgImh0dHA6Ly93d3cudzMub3JnL1RSL2h0bWw0L2xvb3NlLmR0ZCI+Cgo8aHRtbCBs YW5nPSJlbiI+CjxoZWFkPgogIDxtZXRhIGh0dHAtZXF1aXY9IkNvbnRlbnQtVHlwZSIgY29udGVu dD0idGV4dC9odG1sOyBjaGFyc2V0PXV0Zi04Ij4KICA8dGl0bGU+VHJhbnNmb3JtIE9yaWdpbjwv dGl0bGU+CiAgPHN0eWxlIHR5cGU9InRleHQvY3NzIiBtZWRpYT0ic2NyZWVuIj4KICAgIC5jb250 YWluZXIgewogICAgICBoZWlnaHQ6IDEwMHB4OwogICAgICB3aWR0aDogMjAwcHg7CiAgICAgIG1h cmdpbjogMzBweDsKICAgICAgb3V0bGluZTogMXB4IHNvbGlkIGJsYWNrOwogICAgfQogICAgLmJv eCB7CiAgICAgIGhlaWdodDogMTAwJTsKICAgICAgd2lkdGg6IDEwMCU7CiAgICAgIGJhY2tncm91 bmQtY29sb3I6IGdyZWVuOwogICAgICAtd2Via2l0LXRyYW5zZm9ybS1vcmlnaW46IDIwJSA1MCU7 CiAgICB9CiAgICAjcmVzdWx0cyB7CiAgICAgIG1hcmdpbi10b3A6IDEwMHB4OwogICAgfQogIDwv c3R5bGU+CiAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIGNoYXJzZXQ9InV0Zi04Ij4K ICAgIGlmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpIHsKICAgICAgbGF5b3V0VGVzdENv bnRyb2xsZXIuZHVtcEFzVGV4dCgpOwogICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci53YWl0VW50 aWxEb25lKCk7CiAgICB9CgogICAgdmFyIGdUZXN0cyA9IFsKICAgICAgeyAndHJhbnNmb3JtJyA6 ICd0cmFuc2xhdGUoODBweCwgOTBweCknLCAgJ3Jlc3VsdCcgOiAnbWF0cml4KDEsIDAsIDAsIDEs IDgwLCA5MCknIH0sCiAgICAgIHsgJ3RyYW5zZm9ybScgOiAnc2NhbGUoMS4yLCAwLjgpJywgICAg ICAgICdyZXN1bHQnIDogJ21hdHJpeCgxLjIsIDAsIDAsIDAuOCwgMCwgMCknIH0sCiAgICAgIHsg J3RyYW5zZm9ybScgOiAnc2tldygtMC43cmFkLCAyMGRlZyknLCAgICdyZXN1bHQnIDogJ21hdHJp eCgxLCAwLjM2Mzk3LCAtMC44NDIyODgsIDEsIDAsIDApJyB9LAogICAgICB7ICd0cmFuc2Zvcm0n IDogJ3JvdGF0ZSg0NWRlZyknLCAgICAgICAgICAncmVzdWx0JyA6ICdtYXRyaXgoMC43MDcxMDcs IDAuNzA3MTA3LCAtMC43MDcxMDcsIDAuNzA3MTA3LCAwLCAwKScgfSwKICAgIF07CiAgICAKICAg IGZ1bmN0aW9uIHJ1blRlc3RzKCkKICAgIHsKICAgICAgdmFyIHRlc3RCb3ggPSBkb2N1bWVudC5n ZXRFbGVtZW50QnlJZCgndGVzdC1ib3gnKTsKICAgICAgdmFyIHJlc3VsdHNCb3ggPSBkb2N1bWVu dC5nZXRFbGVtZW50QnlJZCgncmVzdWx0cycpOwoKICAgICAgZ1Rlc3RzLmZvckVhY2goZnVuY3Rp b24oY3VyVGVzdCkgewogICAgICAgIC8vIHNldCBvbmUgb2Ygb3VyIHRlc3QgdHJhbnNmb3Jtcwog ICAgICAgIHRlc3RCb3guc3R5bGUud2Via2l0VHJhbnNmb3JtID0gY3VyVGVzdC50cmFuc2Zvcm07 CiAgICAgICAgLy8gcmVhZCBiYWNrIGNvbXB1dGVkIHN0eWxlCiAgICAgICAgdmFyIG9sZFRyYW5z Zm9ybSA9IHdpbmRvdy5nZXRDb21wdXRlZFN0eWxlKHRlc3RCb3gpLndlYmtpdFRyYW5zZm9ybTsK ICAgICAgICAvLyBzZXQgdGhhdCBtYXRyaXgoKSBiYWNrIG9uIHRoZSBlbGVtZW50CiAgICAgICAg dGVzdEJveC5zdHlsZS53ZWJraXRUcmFuc2Zvcm0gPSBvbGRUcmFuc2Zvcm07CiAgICAgICAgLy8g cmVhZCBiYWNrIGNvbXB1dGVkIHN0eWxlCiAgICAgICAgdmFyIGNvbXB1dGVkVHJhbnNmb3JtID0g d2luZG93LmdldENvbXB1dGVkU3R5bGUodGVzdEJveCkud2Via2l0VHJhbnNmb3JtOwogICAgICAg IAogICAgICAgIHZhciBzdWNjZXNzID0gKG9sZFRyYW5zZm9ybSA9PSBjb21wdXRlZFRyYW5zZm9y bSk7CiAgICAgICAgdmFyIHJlc3VsdDsKICAgICAgICBpZiAoc3VjY2VzcykKICAgICAgICAgIHJl c3VsdCA9IGN1clRlc3QudHJhbnNmb3JtICsgJyBleHBlY3RlZCA8Y29kZT4nICsgY3VyVGVzdC5y ZXN1bHQgKyAnPC9jb2RlPiA6IFBBU1MnOwogICAgICAgIGVsc2UKICAgICAgICAgIHJlc3VsdCA9 IGN1clRlc3QudHJhbnNmb3JtICsgJyBleHBlY3RlZCA8Y29kZT4nICsgb2xkVHJhbnNmb3JtICsg JzwvY29kZT4sIGdvdCA8Y29kZT4nICsgY29tcHV0ZWRUcmFuc2Zvcm0gKyAnPC9jb2RlPiA6IEZB SUwnOwogICAgICAgIHJlc3VsdHNCb3guaW5uZXJIVE1MICs9IHJlc3VsdCArICc8YnI+JzsKICAg ICAgfSk7CiAgICAgIAogICAgICBpZiAod2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKQogICAg ICAgIGxheW91dFRlc3RDb250cm9sbGVyLm5vdGlmeURvbmUoKTsKICAgIH0KICA8L3NjcmlwdD4K PC9oZWFkPgo8Ym9keSBvbmxvYWQ9InJ1blRlc3RzKCkiPgoKICA8ZGl2IGNsYXNzPSJjb250YWlu ZXIiPgogICAgPGRpdiBpZD0idGVzdC1ib3giIGNsYXNzPSJib3giPjwvZGl2PgogIDwvZGl2PgoK ICA8ZGl2IGlkPSJyZXN1bHRzIj4KICA8L2Rpdj4KPC9ib2R5Pgo8L2h0bWw+Cg== 22901 2008-08-20 14:52:51 -0700 2008-08-20 14:54:06 -0700 Patch, testcase, changelog getComputedStyle_patch.txt text/plain 7801 simon.fraser ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA1ZTNjYjNmLi5jNjMyMjYzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMDgtMDgt MjAgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgZ2V0Q29tcHV0ZWRTdHlsZSgpIGZv ciB3ZWJraXRUcmFuc2Zvcm0gc2hvdWxkIHJldHVybiBhIHRyYW5zZm9ybQorICAgICAgICB0aGF0 IGRvZXMgbm90IGhhdmUgdGhlIHRyYW5zZm9ybSBvcmlnaW4gYmFrZWQgaW50byBpdC4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNDY0CisKKyAgICAg ICAgKiBmYXN0L2Nzcy9nZXRDb21wdXRlZFN0eWxlLXRyYW5zZm9ybS1leHBlY3RlZC50eHQ6IEFk ZGVkLgorICAgICAgICAqIGZhc3QvY3NzL2dldENvbXB1dGVkU3R5bGUtdHJhbnNmb3JtLmh0bWw6 IEFkZGVkLgorCiAyMDA4LTA4LTE5ICBjaHJpcyBmbGVpemFjaCAgPGNmbGVpemFjaEBhcHBsZS5j b20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQmV0aCBEYWtpbgpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvZmFzdC9jc3MvZ2V0Q29tcHV0ZWRTdHlsZS10cmFuc2Zvcm0tZXhwZWN0ZWQudHh0IGIv TGF5b3V0VGVzdHMvZmFzdC9jc3MvZ2V0Q29tcHV0ZWRTdHlsZS10cmFuc2Zvcm0tZXhwZWN0ZWQu dHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmUzYTkzZWIKLS0tIC9kZXYv bnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9nZXRDb21wdXRlZFN0eWxlLXRyYW5zZm9y bS1leHBlY3RlZC50eHQKQEAgLTAsMCArMSw1IEBACit0cmFuc2xhdGUoODBweCwgOTBweCkgZXhw ZWN0ZWQgbWF0cml4KDEsIDAsIDAsIDEsIDgwLCA5MCkgOiBQQVNTCitzY2FsZSgxLjIsIDAuOCkg ZXhwZWN0ZWQgbWF0cml4KDEuMiwgMCwgMCwgMC44LCAwLCAwKSA6IFBBU1MKK3NrZXcoLTAuN3Jh ZCwgMjBkZWcpIGV4cGVjdGVkIG1hdHJpeCgxLCAwLjM2Mzk3LCAtMC44NDIyODgsIDEsIDAsIDAp IDogUEFTUworcm90YXRlKDQ1ZGVnKSBleHBlY3RlZCBtYXRyaXgoMC43MDcxMDcsIDAuNzA3MTA3 LCAtMC43MDcxMDcsIDAuNzA3MTA3LCAwLCAwKSA6IFBBU1MKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvZmFzdC9jc3MvZ2V0Q29tcHV0ZWRTdHlsZS10cmFuc2Zvcm0uaHRtbCBiL0xheW91dFRl c3RzL2Zhc3QvY3NzL2dldENvbXB1dGVkU3R5bGUtdHJhbnNmb3JtLmh0bWwKbmV3IGZpbGUgbW9k ZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNDVlNjg2NwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91 dFRlc3RzL2Zhc3QvY3NzL2dldENvbXB1dGVkU3R5bGUtdHJhbnNmb3JtLmh0bWwKQEAgLTAsMCAr MSw3NiBAQAorPCFET0NUWVBFIGh0bWwgUFVCTElDICItLy9XM0MvL0RURCBIVE1MIDQuMDEgVHJh bnNpdGlvbmFsLy9FTiIKKyAgICJodHRwOi8vd3d3LnczLm9yZy9UUi9odG1sNC9sb29zZS5kdGQi PgorCis8aHRtbCBsYW5nPSJlbiI+Cis8aGVhZD4KKyAgPG1ldGEgaHR0cC1lcXVpdj0iQ29udGVu dC1UeXBlIiBjb250ZW50PSJ0ZXh0L2h0bWw7IGNoYXJzZXQ9dXRmLTgiPgorICA8dGl0bGU+VHJh bnNmb3JtIE9yaWdpbjwvdGl0bGU+CisgIDxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyIgbWVkaWE9InNj cmVlbiI+CisgICAgLmNvbnRhaW5lciB7CisgICAgICBoZWlnaHQ6IDEwMHB4OworICAgICAgd2lk dGg6IDIwMHB4OworICAgICAgbWFyZ2luOiAzMHB4OworICAgICAgb3V0bGluZTogMXB4IHNvbGlk IGJsYWNrOworICAgIH0KKyAgICAuYm94IHsKKyAgICAgIGhlaWdodDogMTAwJTsKKyAgICAgIHdp ZHRoOiAxMDAlOworICAgICAgYmFja2dyb3VuZC1jb2xvcjogZ3JlZW47CisgICAgICAtd2Via2l0 LXRyYW5zZm9ybS1vcmlnaW46IDIwJSA1MCU7CisgICAgfQorICAgICNyZXN1bHRzIHsKKyAgICAg IG1hcmdpbi10b3A6IDEwMHB4OworICAgIH0KKyAgPC9zdHlsZT4KKyAgPHNjcmlwdCB0eXBlPSJ0 ZXh0L2phdmFzY3JpcHQiIGNoYXJzZXQ9InV0Zi04Ij4KKyAgICBpZiAod2luZG93LmxheW91dFRl c3RDb250cm9sbGVyKSB7CisgICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5kdW1wQXNUZXh0KCk7 CisgICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci53YWl0VW50aWxEb25lKCk7CisgICAgfQorCisg ICAgdmFyIGdUZXN0cyA9IFsKKyAgICAgIHsgJ3RyYW5zZm9ybScgOiAndHJhbnNsYXRlKDgwcHgs IDkwcHgpJywgICdyZXN1bHQnIDogJ21hdHJpeCgxLCAwLCAwLCAxLCA4MCwgOTApJyB9LAorICAg ICAgeyAndHJhbnNmb3JtJyA6ICdzY2FsZSgxLjIsIDAuOCknLCAgICAgICAgJ3Jlc3VsdCcgOiAn bWF0cml4KDEuMiwgMCwgMCwgMC44LCAwLCAwKScgfSwKKyAgICAgIHsgJ3RyYW5zZm9ybScgOiAn c2tldygtMC43cmFkLCAyMGRlZyknLCAgICdyZXN1bHQnIDogJ21hdHJpeCgxLCAwLjM2Mzk3LCAt MC44NDIyODgsIDEsIDAsIDApJyB9LAorICAgICAgeyAndHJhbnNmb3JtJyA6ICdyb3RhdGUoNDVk ZWcpJywgICAgICAgICAgJ3Jlc3VsdCcgOiAnbWF0cml4KDAuNzA3MTA3LCAwLjcwNzEwNywgLTAu NzA3MTA3LCAwLjcwNzEwNywgMCwgMCknIH0sCisgICAgXTsKKyAgICAKKyAgICBmdW5jdGlvbiBy dW5UZXN0cygpCisgICAgeworICAgICAgdmFyIHRlc3RCb3ggPSBkb2N1bWVudC5nZXRFbGVtZW50 QnlJZCgndGVzdC1ib3gnKTsKKyAgICAgIHZhciByZXN1bHRzQm94ID0gZG9jdW1lbnQuZ2V0RWxl bWVudEJ5SWQoJ3Jlc3VsdHMnKTsKKworICAgICAgZ1Rlc3RzLmZvckVhY2goZnVuY3Rpb24oY3Vy VGVzdCkgeworICAgICAgICAvLyBzZXQgb25lIG9mIG91ciB0ZXN0IHRyYW5zZm9ybXMKKyAgICAg ICAgdGVzdEJveC5zdHlsZS53ZWJraXRUcmFuc2Zvcm0gPSBjdXJUZXN0LnRyYW5zZm9ybTsKKyAg ICAgICAgLy8gcmVhZCBiYWNrIGNvbXB1dGVkIHN0eWxlCisgICAgICAgIHZhciBvbGRUcmFuc2Zv cm0gPSB3aW5kb3cuZ2V0Q29tcHV0ZWRTdHlsZSh0ZXN0Qm94KS53ZWJraXRUcmFuc2Zvcm07Cisg ICAgICAgIC8vIHNldCB0aGF0IG1hdHJpeCgpIGJhY2sgb24gdGhlIGVsZW1lbnQKKyAgICAgICAg dGVzdEJveC5zdHlsZS53ZWJraXRUcmFuc2Zvcm0gPSBvbGRUcmFuc2Zvcm07CisgICAgICAgIC8v IHJlYWQgYmFjayBjb21wdXRlZCBzdHlsZQorICAgICAgICB2YXIgY29tcHV0ZWRUcmFuc2Zvcm0g PSB3aW5kb3cuZ2V0Q29tcHV0ZWRTdHlsZSh0ZXN0Qm94KS53ZWJraXRUcmFuc2Zvcm07CisgICAg ICAgIAorICAgICAgICB2YXIgc3VjY2VzcyA9IChvbGRUcmFuc2Zvcm0gPT0gY29tcHV0ZWRUcmFu c2Zvcm0pOworICAgICAgICB2YXIgcmVzdWx0OworICAgICAgICBpZiAoc3VjY2VzcykKKyAgICAg ICAgICByZXN1bHQgPSBjdXJUZXN0LnRyYW5zZm9ybSArICcgZXhwZWN0ZWQgPGNvZGU+JyArIGN1 clRlc3QucmVzdWx0ICsgJzwvY29kZT4gOiBQQVNTJzsKKyAgICAgICAgZWxzZQorICAgICAgICAg IHJlc3VsdCA9IGN1clRlc3QudHJhbnNmb3JtICsgJyBleHBlY3RlZCA8Y29kZT4nICsgb2xkVHJh bnNmb3JtICsgJzwvY29kZT4sIGdvdCA8Y29kZT4nICsgY29tcHV0ZWRUcmFuc2Zvcm0gKyAnPC9j b2RlPiA6IEZBSUwnOworICAgICAgICByZXN1bHRzQm94LmlubmVySFRNTCArPSByZXN1bHQgKyAn PGJyPic7CisgICAgICB9KTsKKyAgICAgIAorICAgICAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29u dHJvbGxlcikKKyAgICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIubm90aWZ5RG9uZSgpOworICAg IH0KKyAgPC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keSBvbmxvYWQ9InJ1blRlc3RzKCkiPgorCisg IDxkaXYgY2xhc3M9ImNvbnRhaW5lciI+CisgICAgPGRpdiBpZD0idGVzdC1ib3giIGNsYXNzPSJi b3giPjwvZGl2PgorICA8L2Rpdj4KKworICA8ZGl2IGlkPSJyZXN1bHRzIj4KKyAgPC9kaXY+Cis8 L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUv Q2hhbmdlTG9nCmluZGV4IDY5NDlmNWIuLjYyMzdmMjcgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hh bmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMDgtMDgt MjAgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgZ2V0Q29tcHV0ZWRTdHlsZSgpIGZv ciB3ZWJraXRUcmFuc2Zvcm0gc2hvdWxkIHJldHVybiBhIHRyYW5zZm9ybQorICAgICAgICB0aGF0 IGRvZXMgbm90IGhhdmUgdGhlIHRyYW5zZm9ybSBvcmlnaW4gYmFrZWQgaW50byBpdC4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNDY0CisgICAgICAg IAorICAgICAgICBUZXN0OiBmYXN0L2Nzcy9nZXRDb21wdXRlZFN0eWxlLXRyYW5zZm9ybS5odG1s CisKKyAgICAgICAgKiBjc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OmNvbXB1dGVkVHJhbnNmb3JtKToKKyAgICAgICAgKiByZW5kZXJpbmcvc3R5 bGUvUmVuZGVyU3R5bGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU3R5bGU6OmFwcGx5 VHJhbnNmb3JtKToKKyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaDoKKwog MjAwOC0wOC0yMCAgSm9zaCBBYXMgIDxqb3NobW96QGdtYWlsLmNvbT4KIAogICAgICAgICBSZXZp ZXdlZCBhbmQgbGFuZGVkIGJ5IEFuZGVycy4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvY3NzL0NTU0Nv bXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHAgYi9XZWJDb3JlL2Nzcy9DU1NDb21wdXRlZFN0eWxl RGVjbGFyYXRpb24uY3BwCmluZGV4IGNmMzZiM2QuLmVmODNlMmUgMTAwNjQ0Ci0tLSBhL1dlYkNv cmUvY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHAKKysrIGIvV2ViQ29yZS9jc3Mv Q1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcApAQCAtNDAwLDcgKzQwMCw3IEBAIHN0YXRp YyBQYXNzUmVmUHRyPENTU1ZhbHVlPiBjb21wdXRlZFRyYW5zZm9ybShSZW5kZXJPYmplY3QqIHJl bmRlcmVyKQogICAgIEludFJlY3QgYm94ID0gc2l6aW5nQm94KHJlbmRlcmVyKTsKIAogICAgIEFm ZmluZVRyYW5zZm9ybSB0cmFuc2Zvcm07Ci0gICAgcmVuZGVyZXItPnN0eWxlKCktPmFwcGx5VHJh bnNmb3JtKHRyYW5zZm9ybSwgYm94LnNpemUoKSk7CisgICAgcmVuZGVyZXItPnN0eWxlKCktPmFw cGx5VHJhbnNmb3JtKHRyYW5zZm9ybSwgYm94LnNpemUoKSwgZmFsc2UpOwogCiAgICAgUmVmUHRy PFdlYktpdENTU1RyYW5zZm9ybVZhbHVlPiB0cmFuc2Zvcm1WYWwgPSBXZWJLaXRDU1NUcmFuc2Zv cm1WYWx1ZTo6Y3JlYXRlKFdlYktpdENTU1RyYW5zZm9ybVZhbHVlOjpNYXRyaXhUcmFuc2Zvcm1P cGVyYXRpb24pOwogCmRpZmYgLS1naXQgYS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJT dHlsZS5jcHAgYi9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5jcHAKaW5kZXgg NjhkNDZmMy4uZjYzZjY4MSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVu ZGVyU3R5bGUuY3BwCisrKyBiL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmNw cApAQCAtMTc4Nyw3ICsxNzg3LDcgQEAgdm9pZCBDb250ZW50RGF0YTo6Y2xlYXIoKQogICAgIH0K IH0KIAotdm9pZCBSZW5kZXJTdHlsZTo6YXBwbHlUcmFuc2Zvcm0oQWZmaW5lVHJhbnNmb3JtJiB0 cmFuc2Zvcm0sIGNvbnN0IEludFNpemUmIGJvcmRlckJveFNpemUpIGNvbnN0Cit2b2lkIFJlbmRl clN0eWxlOjphcHBseVRyYW5zZm9ybShBZmZpbmVUcmFuc2Zvcm0mIHRyYW5zZm9ybSwgY29uc3Qg SW50U2l6ZSYgYm9yZGVyQm94U2l6ZSwgYm9vbCBpbmNsdWRlVHJhbnNmb3JtT3JpZ2luKSBjb25z dAogewogICAgIC8vIHRyYW5zZm9ybS1vcmlnaW4gYnJhY2tldHMgdGhlIHRyYW5zZm9ybSB3aXRo IHRyYW5zbGF0ZSBvcGVyYXRpb25zLgogICAgIC8vIE9wdGltaXplIGZvciB0aGUgY2FzZSB3aGVy ZSB0aGUgb25seSB0cmFuc2Zvcm0gaXMgYSB0cmFuc2xhdGlvbiwgc2luY2UgdGhlIHRyYW5zZm9y bS1vcmlnaW4gaXMgaXJyZWxldmFudApAQCAtMTc5NSwxMCArMTc5NSwxMiBAQCB2b2lkIFJlbmRl clN0eWxlOjphcHBseVRyYW5zZm9ybShBZmZpbmVUcmFuc2Zvcm0mIHRyYW5zZm9ybSwgY29uc3Qg SW50U2l6ZSYgYm9yZAogICAgIGJvb2wgYXBwbHlUcmFuc2Zvcm1PcmlnaW4gPSBmYWxzZTsKICAg ICB1bnNpZ25lZCBzID0gcmFyZU5vbkluaGVyaXRlZERhdGEtPm1fdHJhbnNmb3JtLT5tX29wZXJh dGlvbnMuc2l6ZSgpOwogICAgIHVuc2lnbmVkIGk7Ci0gICAgZm9yIChpID0gMDsgaSA8IHM7IGkr KykgewotICAgICAgICBpZiAoIXJhcmVOb25Jbmhlcml0ZWREYXRhLT5tX3RyYW5zZm9ybS0+bV9v cGVyYXRpb25zW2ldLT5pc1RyYW5zbGF0ZU9wZXJhdGlvbigpKSB7Ci0gICAgICAgICAgICBhcHBs eVRyYW5zZm9ybU9yaWdpbiA9IHRydWU7Ci0gICAgICAgICAgICBicmVhazsKKyAgICBpZiAoaW5j bHVkZVRyYW5zZm9ybU9yaWdpbikgeworICAgICAgICBmb3IgKGkgPSAwOyBpIDwgczsgaSsrKSB7 CisgICAgICAgICAgICBpZiAoIXJhcmVOb25Jbmhlcml0ZWREYXRhLT5tX3RyYW5zZm9ybS0+bV9v cGVyYXRpb25zW2ldLT5pc1RyYW5zbGF0ZU9wZXJhdGlvbigpKSB7CisgICAgICAgICAgICAgICAg YXBwbHlUcmFuc2Zvcm1PcmlnaW4gPSB0cnVlOworICAgICAgICAgICAgICAgIGJyZWFrOworICAg ICAgICAgICAgfQogICAgICAgICB9CiAgICAgfQogICAgIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9y ZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaCBiL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1Jl bmRlclN0eWxlLmgKaW5kZXggMzZlMDAxNS4uZTA2NTJkZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9y ZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaAorKysgYi9XZWJDb3JlL3JlbmRlcmluZy9zdHls ZS9SZW5kZXJTdHlsZS5oCkBAIC0yMTQ2LDcgKzIxNDYsNyBAQCBwdWJsaWM6CiAgICAgTGVuZ3Ro IHRyYW5zZm9ybU9yaWdpblgoKSBjb25zdCB7IHJldHVybiByYXJlTm9uSW5oZXJpdGVkRGF0YS0+ bV90cmFuc2Zvcm0tPm1feDsgfQogICAgIExlbmd0aCB0cmFuc2Zvcm1PcmlnaW5ZKCkgY29uc3Qg eyByZXR1cm4gcmFyZU5vbkluaGVyaXRlZERhdGEtPm1fdHJhbnNmb3JtLT5tX3k7IH0KICAgICBi b29sIGhhc1RyYW5zZm9ybSgpIGNvbnN0IHsgcmV0dXJuICFyYXJlTm9uSW5oZXJpdGVkRGF0YS0+ bV90cmFuc2Zvcm0tPm1fb3BlcmF0aW9ucy5pc0VtcHR5KCk7IH0KLSAgICB2b2lkIGFwcGx5VHJh bnNmb3JtKEFmZmluZVRyYW5zZm9ybSYsIGNvbnN0IEludFNpemUmIGJvcmRlckJveFNpemUpIGNv bnN0OworICAgIHZvaWQgYXBwbHlUcmFuc2Zvcm0oQWZmaW5lVHJhbnNmb3JtJiwgY29uc3QgSW50 U2l6ZSYgYm9yZGVyQm94U2l6ZSwgYm9vbCBpbmNsdWRlVHJhbnNmb3JtT3JpZ2luID0gdHJ1ZSkg Y29uc3Q7CiAgICAgYm9vbCBoYXNNYXNrKCkgY29uc3QgeyByZXR1cm4gcmFyZU5vbkluaGVyaXRl ZERhdGEtPm1fbWFzay5oYXNJbWFnZSgpIHx8IHJhcmVOb25Jbmhlcml0ZWREYXRhLT5tX21hc2tC b3hJbWFnZS5oYXNJbWFnZSgpOyB9CiAgICAgLy8gRW5kIENTUzMgR2V0dGVycwogCg==