69686 2011-10-07 19:27:05 -0700 margin-right is ignored with vertical writing mode 2011-10-11 20:27:05 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ojan ojan hyatt tony webkit.review.bot oldest_to_newest 480443 0 110242 ojan 2011-10-07 19:27:05 -0700 Created attachment 110242 test case summary: margin-right is ignored with vertical writing mode See test case. 480452 1 110247 ojan 2011-10-07 20:21:20 -0700 Created attachment 110247 Patch 480453 2 ojan 2011-10-07 20:21:56 -0700 Passes all the fast/writing-mode tests. Will put r? once I've verified it passes all the tests. 480557 3 hyatt 2011-10-08 08:56:40 -0700 You don't need the RenderBlock helpers. RenderStyle has helpers already for this. 480560 4 hyatt 2011-10-08 09:14:58 -0700 RenderStyle has Length marginStartUsing(const RenderStyle* otherStyle) const; Length marginEndUsing(const RenderStyle* otherStyle) const; Pass in the RenderBlock's style instead of the child's style, and it will give you the right answer. This will make the patch much smaller/simpler. 481185 5 ojan 2011-10-10 14:50:59 -0700 (In reply to comment #4) > RenderStyle has > > Length marginStartUsing(const RenderStyle* otherStyle) const; > Length marginEndUsing(const RenderStyle* otherStyle) const; > > Pass in the RenderBlock's style instead of the child's style, and it will give you the right answer. This will make the patch much smaller/simpler. ooh. that's much nicer. 481189 6 110408 ojan 2011-10-10 14:53:58 -0700 Created attachment 110408 Patch 482172 7 110408 webkit.review.bot 2011-10-11 20:27:00 -0700 Comment on attachment 110408 Patch Clearing flags on attachment: 110408 Committed r97222: <http://trac.webkit.org/changeset/97222> 482173 8 webkit.review.bot 2011-10-11 20:27:05 -0700 All reviewed patches have been landed. Closing bug. 110242 2011-10-07 19:27:05 -0700 2011-10-07 19:27:05 -0700 test case scratch.html text/html 797 ojan PHN0eWxlPgouY29udGFpbmVyIHsKICAgIHBvc2l0aW9uOiByZWxhdGl2ZTsKICAgIGJhY2tncm91 bmQtY29sb3I6IHBpbms7CiAgICBvdXRsaW5lOiAxcHggc29saWQgYmxhY2s7CiAgICBkaXNwbGF5 OiBpbmxpbmUtYmxvY2s7Cn0KLmJveCB7CiAgICBiYWNrZ3JvdW5kLWNvbG9yOiBncmV5OwogICAg d2lkdGg6IDEwMHB4OwogICAgaGVpZ2h0OiAxMDBweDsKICAgIG1hcmdpbjogMTBweCAyMHB4IDMw cHggNDBweDsKfQo8L3N0eWxlPgoKPCEtLVRoZSBmb3VyIGJveGVzIGJlbG93IHNob3VsZCBsb29r IGlkZW50aWNhbC4tLT4KCjxkaXYgY2xhc3M9ImNvbnRhaW5lciI+CiAgICA8ZGl2IGNsYXNzPSJm bGV4Ym94IHZlcnRpY2FsLWxyIGJveCIgc3R5bGU9Ii13ZWJraXQtd3JpdGluZy1tb2RlOiBob3Jp em9udGFsLXRiOyI+PC9kaXY+CjwvZGl2PgoKPGRpdiBjbGFzcz0iY29udGFpbmVyIj4KICAgIDxk aXYgY2xhc3M9ImZsZXhib3ggdmVydGljYWwtbHIgYm94IiBzdHlsZT0iLXdlYmtpdC13cml0aW5n LW1vZGU6IGhvcml0em9udGFsLWJ0OyI+PC9kaXY+CjwvZGl2PgoKPGRpdiBjbGFzcz0iY29udGFp bmVyIj4KICAgIDxkaXYgY2xhc3M9ImZsZXhib3ggdmVydGljYWwtbHIgYm94IiBzdHlsZT0iLXdl YmtpdC13cml0aW5nLW1vZGU6IHZlcnRpY2FsLWxyOyI+PC9kaXY+CjwvZGl2PgoKPGRpdiBjbGFz cz0iY29udGFpbmVyIj4KICAgIDxkaXYgY2xhc3M9ImZsZXhib3ggdmVydGljYWwtbHIgYm94IiBz dHlsZT0iLXdlYmtpdC13cml0aW5nLW1vZGU6IHZlcnRpY2FsLXJsOyI+PC9kaXY+CjwvZGl2Pgo= 110247 2011-10-07 20:21:20 -0700 2011-10-10 14:53:55 -0700 Patch bug-69686-20111007202119.patch text/plain 8422 ojan U3VidmVyc2lvbiBSZXZpc2lvbjogOTY4NTEKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBjZmM1NmRlOTQ4YTI4YWMyNmZiYjFk N2ZjZmZkMTc0YjBmYWUwMTI2Li5iZmJlMGQxNzc0YjI4ODBhY2Q4M2NlNWM3M2RkNDc1NWYxMWY2 OWMyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMTAtMDcgIE9qYW4gVmFmYWkgIDxvamFu QGNocm9taXVtLm9yZz4KKworICAgICAgICBtYXJnaW4tcmlnaHQgaXMgaWdub3JlZCB3aXRoIHZl cnRpY2FsIHdyaXRpbmcgbW9kZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9Njk2ODYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIGZhc3Qvd3JpdGluZy1tb2RlL21hcmdpbnMtZXhwZWN0ZWQudHh0OiBBZGRl ZC4KKyAgICAgICAgKiBmYXN0L3dyaXRpbmctbW9kZS9tYXJnaW5zLmh0bWw6IEFkZGVkLgorCiAy MDExLTEwLTA1ICBPamFuIFZhZmFpICA8b2phbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgZXh0 ZW5kIGZsZXhib3ggdGVzdGluZyB0byB0ZXN0IGNoaWxkcmVuIGFuZCBwYXJlbnRzIG9mIHRoZSBm bGV4Ym94CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3dyaXRpbmctbW9kZS9tYXJnaW5z LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3Qvd3JpdGluZy1tb2RlL21hcmdpbnMtZXhw ZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAuLmMxODM4ZGNkMzA0NDYwYjQzM2ZhMDBmMzM2ZGJkOWYzNDE4 OGVmZmQKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3dyaXRpbmctbW9kZS9t YXJnaW5zLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDI0IEBACitsYXllciBhdCAoMCwwKSBzaXpl IDgwMHg2MDAKKyAgUmVuZGVyVmlldyBhdCAoMCwwKSBzaXplIDgwMHg2MDAKK2xheWVyIGF0ICgw LDApIHNpemUgODAweDYwMAorICBSZW5kZXJCbG9jayB7SFRNTH0gYXQgKDAsMCkgc2l6ZSA4MDB4 NjAwCisgICAgUmVuZGVyQm9keSB7Qk9EWX0gYXQgKDgsOCkgc2l6ZSA3ODR4NTg0CisgICAgICBS ZW5kZXJUZXh0IHsjdGV4dH0gYXQgKDE2MCwxMjYpIHNpemUgNHgxOAorICAgICAgICB0ZXh0IHJ1 biBhdCAoMTYwLDEyNikgd2lkdGggNDogIiAiCisgICAgICBSZW5kZXJUZXh0IHsjdGV4dH0gYXQg KDMyNCwxMjYpIHNpemUgNHgxOAorICAgICAgICB0ZXh0IHJ1biBhdCAoMzI0LDEyNikgd2lkdGgg NDogIiAiCisgICAgICBSZW5kZXJUZXh0IHsjdGV4dH0gYXQgKDQ4OCwxMjYpIHNpemUgNHgxOAor ICAgICAgICB0ZXh0IHJ1biBhdCAoNDg4LDEyNikgd2lkdGggNDogIiAiCisgICAgICBSZW5kZXJU ZXh0IHsjdGV4dH0gYXQgKDAsMCkgc2l6ZSAweDAKK2xheWVyIGF0ICg4LDgpIHNpemUgMTYweDE0 MAorICBSZW5kZXJCbG9jayAocmVsYXRpdmUgcG9zaXRpb25lZCkge0RJVn0gYXQgKDAsMCkgc2l6 ZSAxNjB4MTQwIFtiZ2NvbG9yPSNGRkMwQ0JdCisgICAgUmVuZGVyQmxvY2sge0RJVn0gYXQgKDQw LDEwKSBzaXplIDEwMHgxMDAgW2JnY29sb3I9IzgwODA4MF0KK2xheWVyIGF0ICgxNzIsOCkgc2l6 ZSAxNjB4MTQwCisgIFJlbmRlckJsb2NrIChyZWxhdGl2ZSBwb3NpdGlvbmVkKSB7RElWfSBhdCAo MTY0LDApIHNpemUgMTYweDE0MCBbYmdjb2xvcj0jRkZDMENCXQorICAgIFJlbmRlckJsb2NrIHtE SVZ9IGF0ICg0MCwxMCkgc2l6ZSAxMDB4MTAwIFtiZ2NvbG9yPSM4MDgwODBdCitsYXllciBhdCAo MzM2LDgpIHNpemUgMTYweDE0MAorICBSZW5kZXJCbG9jayAocmVsYXRpdmUgcG9zaXRpb25lZCkg e0RJVn0gYXQgKDMyOCwwKSBzaXplIDE2MHgxNDAgW2JnY29sb3I9I0ZGQzBDQl0KKyAgICBSZW5k ZXJCbG9jayB7RElWfSBhdCAoNDAsMTApIHNpemUgMTAweDEwMCBbYmdjb2xvcj0jODA4MDgwXQor bGF5ZXIgYXQgKDUwMCw4KSBzaXplIDE2MHgxNDAKKyAgUmVuZGVyQmxvY2sgKHJlbGF0aXZlIHBv c2l0aW9uZWQpIHtESVZ9IGF0ICg0OTIsMCkgc2l6ZSAxNjB4MTQwIFtiZ2NvbG9yPSNGRkMwQ0Jd CisgICAgUmVuZGVyQmxvY2sge0RJVn0gYXQgKDQwLDEwKSBzaXplIDEwMHgxMDAgW2JnY29sb3I9 IzgwODA4MF0KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3Qvd3JpdGluZy1tb2RlL21hcmdp bnMuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3Qvd3JpdGluZy1tb2RlL21hcmdpbnMuaHRtbApuZXcg ZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwLi4yMDIyMDhlZGM3YWNkNTAzNDI2ODJlODk4NTk1YTg2NWE0ZTY0NzYzCi0tLSAvZGV2 L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC93cml0aW5nLW1vZGUvbWFyZ2lucy5odG1sCkBA IC0wLDAgKzEsMzIgQEAKKzxzdHlsZT4KKy5jb250YWluZXIgeworICAgIHBvc2l0aW9uOiByZWxh dGl2ZTsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiBwaW5rOworICAgIG91dGxpbmU6IDFweCBzb2xp ZCBibGFjazsKKyAgICBkaXNwbGF5OiBpbmxpbmUtYmxvY2s7Cit9CisuYm94IHsKKyAgICBiYWNr Z3JvdW5kLWNvbG9yOiBncmV5OworICAgIHdpZHRoOiAxMDBweDsKKyAgICBoZWlnaHQ6IDEwMHB4 OworICAgIG1hcmdpbjogMTBweCAyMHB4IDMwcHggNDBweDsKK30KKzwvc3R5bGU+CisKKzwhLS1U aGUgZm91ciBib3hlcyBiZWxvdyBzaG91bGQgbG9vayBpZGVudGljYWwuLS0+CisKKzxkaXYgY2xh c3M9ImNvbnRhaW5lciI+CisgICAgPGRpdiBjbGFzcz0iZmxleGJveCB2ZXJ0aWNhbC1sciBib3gi IHN0eWxlPSItd2Via2l0LXdyaXRpbmctbW9kZTogaG9yaXpvbnRhbC10YjsiPjwvZGl2PgorPC9k aXY+CisKKzxkaXYgY2xhc3M9ImNvbnRhaW5lciI+CisgICAgPGRpdiBjbGFzcz0iZmxleGJveCB2 ZXJ0aWNhbC1sciBib3giIHN0eWxlPSItd2Via2l0LXdyaXRpbmctbW9kZTogaG9yaXR6b250YWwt YnQ7Ij48L2Rpdj4KKzwvZGl2PgorCis8ZGl2IGNsYXNzPSJjb250YWluZXIiPgorICAgIDxkaXYg Y2xhc3M9ImZsZXhib3ggdmVydGljYWwtbHIgYm94IiBzdHlsZT0iLXdlYmtpdC13cml0aW5nLW1v ZGU6IHZlcnRpY2FsLWxyOyI+PC9kaXY+Cis8L2Rpdj4KKworPGRpdiBjbGFzcz0iY29udGFpbmVy Ij4KKyAgICA8ZGl2IGNsYXNzPSJmbGV4Ym94IHZlcnRpY2FsLWxyIGJveCIgc3R5bGU9Ii13ZWJr aXQtd3JpdGluZy1tb2RlOiB2ZXJ0aWNhbC1ybDsiPjwvZGl2PgorPC9kaXY+CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5k ZXggNTEwNTViYTIxOTdiMzAwYjRiNDdjOWJlMTViNDA3OTkwZTU4Mzg5MS4uNDMzODgxNGUxYjAw ZGY0NzhlNzg0MmE4YWMzZTJmM2E4MmQ1MjBjZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBA CisyMDExLTEwLTA3ICBPamFuIFZhZmFpICA8b2phbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAg bWFyZ2luLXJpZ2h0IGlzIGlnbm9yZWQgd2l0aCB2ZXJ0aWNhbCB3cml0aW5nIG1vZGUKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY5Njg2CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2UgbmVlZCB0byB1c2Ug dGhlIHBhcmVudCdzIHdyaXRpbmcgbW9kZSB3aGVuIGdyYWJiaW5nCisgICAgICAgIHRoZSBtYXJn aW4gc3RhcnQvZW5kIGZvciB0aGUgcHVycG9zZXMgb2YgY29tcHV0aW5nIHRoZSBwYXJlbnQncwor ICAgICAgICBwcmVmZXJyZWQgd2lkdGhzLgorCisgICAgICAgIFRlc3Q6IGZhc3Qvd3JpdGluZy1t b2RlL21hcmdpbnMuaHRtbAorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjpjb21wdXRlQmxvY2tQcmVmZXJyZWRMb2dp Y2FsV2lkdGhzKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjptYXJnaW5TdGFydFN0 eWxlRm9yQ2hpbGQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6Om1hcmdpbkVuZFN0 eWxlRm9yQ2hpbGQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9jay5oOgorCiAyMDEx LTEwLTA2ICBHYXZpbiBQZXRlcnMgIDxnYXZpbnBAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIGNv bmRpdGlvbmFsaXplIG1fY2FjaGVkU2NyaXB0IHN0YWNrcyB0byBqdXN0IENocm9taXVtIHBvcnQK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCmluZGV4IDg3MmRmNDcwZTgy M2Q0YjVhZGU3YWExZGJlMjkxMjU4ZjYxYmQ4NzAuLmU2NjM5MTFhZDc4MjI5YzQyMWRlNGFkODQ4 YWFjZGU3NmViNDNiNGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJCbG9jay5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNw cApAQCAtNTE4OCw3ICs1MTg4LDcgQEAgdm9pZCBSZW5kZXJCbG9jazo6Y29tcHV0ZUJsb2NrUHJl ZmVycmVkTG9naWNhbFdpZHRocygpCiB7CiAgICAgYm9vbCBub3dyYXAgPSBzdHlsZSgpLT53aGl0 ZVNwYWNlKCkgPT0gTk9XUkFQOwogCi0gICAgUmVuZGVyT2JqZWN0ICpjaGlsZCA9IGZpcnN0Q2hp bGQoKTsKKyAgICBSZW5kZXJPYmplY3QqIGNoaWxkID0gZmlyc3RDaGlsZCgpOwogICAgIFJlbmRl ckJsb2NrKiBjb250YWluaW5nQmxvY2sgPSB0aGlzLT5jb250YWluaW5nQmxvY2soKTsKICAgICBM YXlvdXRVbml0IGZsb2F0TGVmdFdpZHRoID0gMCwgZmxvYXRSaWdodFdpZHRoID0gMDsKICAgICB3 aGlsZSAoY2hpbGQpIHsKQEAgLTUyMTMsMTUgKzUyMTMsMjAgQEAgdm9pZCBSZW5kZXJCbG9jazo6 Y29tcHV0ZUJsb2NrUHJlZmVycmVkTG9naWNhbFdpZHRocygpCiAgICAgICAgIC8vIEEgbWFyZ2lu IGJhc2ljYWxseSBoYXMgdGhyZWUgdHlwZXM6IGZpeGVkLCBwZXJjZW50YWdlLCBhbmQgYXV0byAo dmFyaWFibGUpLgogICAgICAgICAvLyBBdXRvIGFuZCBwZXJjZW50YWdlIG1hcmdpbnMgc2ltcGx5 IGJlY29tZSAwIHdoZW4gY29tcHV0aW5nIG1pbi9tYXggd2lkdGguCiAgICAgICAgIC8vIEZpeGVk IG1hcmdpbnMgY2FuIGJlIGFkZGVkIGluIGFzIGlzLgotICAgICAgICBMZW5ndGggc3RhcnRNYXJn aW5MZW5ndGggPSBjaGlsZC0+c3R5bGUoKS0+bWFyZ2luU3RhcnQoKTsKLSAgICAgICAgTGVuZ3Ro IGVuZE1hcmdpbkxlbmd0aCA9IGNoaWxkLT5zdHlsZSgpLT5tYXJnaW5FbmQoKTsKICAgICAgICAg TGF5b3V0VW5pdCBtYXJnaW4gPSAwOwogICAgICAgICBMYXlvdXRVbml0IG1hcmdpblN0YXJ0ID0g MDsKICAgICAgICAgTGF5b3V0VW5pdCBtYXJnaW5FbmQgPSAwOwotICAgICAgICBpZiAoc3RhcnRN YXJnaW5MZW5ndGguaXNGaXhlZCgpKQotICAgICAgICAgICAgbWFyZ2luU3RhcnQgKz0gc3RhcnRN YXJnaW5MZW5ndGgudmFsdWUoKTsKLSAgICAgICAgaWYgKGVuZE1hcmdpbkxlbmd0aC5pc0ZpeGVk KCkpCi0gICAgICAgICAgICBtYXJnaW5FbmQgKz0gZW5kTWFyZ2luTGVuZ3RoLnZhbHVlKCk7CisK KyAgICAgICAgaWYgKGNoaWxkLT5pc0JveE1vZGVsT2JqZWN0KCkpIHsKKyAgICAgICAgICAgIFJl bmRlckJveE1vZGVsT2JqZWN0KiBib3hNb2RlbE9iamVjdCA9IHRvUmVuZGVyQm94TW9kZWxPYmpl Y3QoY2hpbGQpOworICAgICAgICAgICAgTGVuZ3RoIHN0YXJ0TWFyZ2luTGVuZ3RoID0gbWFyZ2lu U3RhcnRTdHlsZUZvckNoaWxkKGJveE1vZGVsT2JqZWN0KTsKKyAgICAgICAgICAgIExlbmd0aCBl bmRNYXJnaW5MZW5ndGggPSBtYXJnaW5FbmRTdHlsZUZvckNoaWxkKGJveE1vZGVsT2JqZWN0KTsK KyAgICAgICAgICAgIGlmIChzdGFydE1hcmdpbkxlbmd0aC5pc0ZpeGVkKCkpCisgICAgICAgICAg ICAgICAgbWFyZ2luU3RhcnQgKz0gc3RhcnRNYXJnaW5MZW5ndGgudmFsdWUoKTsKKyAgICAgICAg ICAgIGlmIChlbmRNYXJnaW5MZW5ndGguaXNGaXhlZCgpKQorICAgICAgICAgICAgICAgIG1hcmdp bkVuZCArPSBlbmRNYXJnaW5MZW5ndGgudmFsdWUoKTsKKyAgICAgICAgfQorCiAgICAgICAgIG1h cmdpbiA9IG1hcmdpblN0YXJ0ICsgbWFyZ2luRW5kOwogCiAgICAgICAgIExheW91dFVuaXQgdyA9 IGNoaWxkLT5taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGgoKSArIG1hcmdpbjsKQEAgLTY0OTAsNiAr NjQ5NSwyMCBAQCBMYXlvdXRVbml0IFJlbmRlckJsb2NrOjpjb2xsYXBzZWRNYXJnaW5BZnRlckZv ckNoaWxkKGNvbnN0ICBSZW5kZXJCb3gqIGNoaWxkKSBjbwogICAgIHJldHVybiBtYXJnaW5BZnRl ckZvckNoaWxkKGNoaWxkKTsKIH0KIAorTGVuZ3RoIFJlbmRlckJsb2NrOjptYXJnaW5TdGFydFN0 eWxlRm9yQ2hpbGQoY29uc3QgUmVuZGVyQm94TW9kZWxPYmplY3QqIGNoaWxkKSBjb25zdAorewor ICAgIGlmIChpc0hvcml6b250YWxXcml0aW5nTW9kZSgpKQorICAgICAgICByZXR1cm4gc3R5bGUo KS0+aXNMZWZ0VG9SaWdodERpcmVjdGlvbigpID8gY2hpbGQtPnN0eWxlKCktPm1hcmdpbkxlZnQo KSA6IGNoaWxkLT5zdHlsZSgpLT5tYXJnaW5SaWdodCgpOworICAgIHJldHVybiBzdHlsZSgpLT5p c0xlZnRUb1JpZ2h0RGlyZWN0aW9uKCkgPyBjaGlsZC0+c3R5bGUoKS0+bWFyZ2luVG9wKCkgOiBj aGlsZC0+c3R5bGUoKS0+bWFyZ2luQm90dG9tKCk7Cit9CisKK0xlbmd0aCBSZW5kZXJCbG9jazo6 bWFyZ2luRW5kU3R5bGVGb3JDaGlsZChjb25zdCBSZW5kZXJCb3hNb2RlbE9iamVjdCogY2hpbGQp IGNvbnN0Cit7CisgICAgaWYgKGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkpCisgICAgICAgIHJl dHVybiBzdHlsZSgpLT5pc0xlZnRUb1JpZ2h0RGlyZWN0aW9uKCkgPyBjaGlsZC0+c3R5bGUoKS0+ bWFyZ2luUmlnaHQoKSA6IGNoaWxkLT5zdHlsZSgpLT5tYXJnaW5MZWZ0KCk7CisgICAgcmV0dXJu IHN0eWxlKCktPmlzTGVmdFRvUmlnaHREaXJlY3Rpb24oKSA/IGNoaWxkLT5zdHlsZSgpLT5tYXJn aW5Cb3R0b20oKSA6IGNoaWxkLT5zdHlsZSgpLT5tYXJnaW5Ub3AoKTsKK30KKwogTGF5b3V0VW5p dCBSZW5kZXJCbG9jazo6bWFyZ2luQmVmb3JlRm9yQ2hpbGQoY29uc3QgUmVuZGVyQm94TW9kZWxP YmplY3QqIGNoaWxkKSBjb25zdAogewogICAgIHN3aXRjaCAoc3R5bGUoKS0+d3JpdGluZ01vZGUo KSkgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suaAppbmRleCBmNzMzMDlhZDA2 ZGJlOGI4MjkwYzA3ZThmNDcyNzc3YTUyMzUwZDU0Li45YmE0MTY5ZWYxNzU0YzE5MjQ2MDUyYzg2 YTg4NTUyMzk3Y2MxZjE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyQmxvY2suaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suaApA QCAtMjQ2LDYgKzI0Niw4IEBAIHB1YmxpYzoKICAgICBMYXlvdXRVbml0IGxvZ2ljYWxMZWZ0Rm9y Q2hpbGQoY29uc3QgUmVuZGVyQm94KiBjaGlsZCkgeyByZXR1cm4gaXNIb3Jpem9udGFsV3JpdGlu Z01vZGUoKSA/IGNoaWxkLT54KCkgOiBjaGlsZC0+eSgpOyB9CiAgICAgdm9pZCBzZXRMb2dpY2Fs TGVmdEZvckNoaWxkKFJlbmRlckJveCogY2hpbGQsIExheW91dFVuaXQgbG9naWNhbExlZnQsIEFw cGx5TGF5b3V0RGVsdGFNb2RlID0gRG9Ob3RBcHBseUxheW91dERlbHRhKTsKICAgICB2b2lkIHNl dExvZ2ljYWxUb3BGb3JDaGlsZChSZW5kZXJCb3gqIGNoaWxkLCBMYXlvdXRVbml0IGxvZ2ljYWxU b3AsIEFwcGx5TGF5b3V0RGVsdGFNb2RlID0gRG9Ob3RBcHBseUxheW91dERlbHRhKTsKKyAgICBM ZW5ndGggbWFyZ2luU3RhcnRTdHlsZUZvckNoaWxkKGNvbnN0IFJlbmRlckJveE1vZGVsT2JqZWN0 KiBjaGlsZCkgY29uc3Q7CisgICAgTGVuZ3RoIG1hcmdpbkVuZFN0eWxlRm9yQ2hpbGQoY29uc3Qg UmVuZGVyQm94TW9kZWxPYmplY3QqIGNoaWxkKSBjb25zdDsKICAgICBMYXlvdXRVbml0IG1hcmdp bkJlZm9yZUZvckNoaWxkKGNvbnN0IFJlbmRlckJveE1vZGVsT2JqZWN0KiBjaGlsZCkgY29uc3Q7 CiAgICAgTGF5b3V0VW5pdCBtYXJnaW5BZnRlckZvckNoaWxkKGNvbnN0IFJlbmRlckJveE1vZGVs T2JqZWN0KiBjaGlsZCkgY29uc3Q7CiAgICAgTGF5b3V0VW5pdCBtYXJnaW5TdGFydEZvckNoaWxk KGNvbnN0IFJlbmRlckJveE1vZGVsT2JqZWN0KiBjaGlsZCkgY29uc3Q7Cg== 110408 2011-10-10 14:53:58 -0700 2011-10-11 20:27:00 -0700 Patch bug-69686-20111010145357.patch text/plain 5602 ojan U3VidmVyc2lvbiBSZXZpc2lvbjogOTcwNzkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA2YzA1YzM0NzlkMDU1OGE1N2IzOTBm NWVkNGZmNmUyMzhmOGY2ZTIwLi4wNDNlNTdkMTNhY2EwOTZjNWI5ODdjNjUwYmZlNjhjM2EwNjcw OTNhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMTAtMDcgIE9qYW4gVmFmYWkgIDxvamFu QGNocm9taXVtLm9yZz4KKworICAgICAgICBtYXJnaW4tcmlnaHQgaXMgaWdub3JlZCB3aXRoIHZl cnRpY2FsIHdyaXRpbmcgbW9kZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9Njk2ODYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIGZhc3Qvd3JpdGluZy1tb2RlL21hcmdpbnMtZXhwZWN0ZWQudHh0OiBBZGRl ZC4KKyAgICAgICAgKiBmYXN0L3dyaXRpbmctbW9kZS9tYXJnaW5zLmh0bWw6IEFkZGVkLgorCiAy MDExLTEwLTEwICBBYmhpc2hlayBBcnlhICA8aW5mZXJub0BjaHJvbWl1bS5vcmc+CiAKICAgICAg ICAgU3R5bGUgZm9yIHVwZGF0ZWQgZHVlIHRvIGluYWJpbGl0eSB0byBsb2NhdGUKZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2Zhc3Qvd3JpdGluZy1tb2RlL21hcmdpbnMtZXhwZWN0ZWQudHh0IGIv TGF5b3V0VGVzdHMvZmFzdC93cml0aW5nLW1vZGUvbWFyZ2lucy1leHBlY3RlZC50eHQKbmV3IGZp bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMC4uYzE4MzhkY2QzMDQ0NjBiNDMzZmEwMGYzMzZkYmQ5ZjM0MTg4ZWZmZAotLS0gL2Rldi9u dWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3Qvd3JpdGluZy1tb2RlL21hcmdpbnMtZXhwZWN0ZWQu dHh0CkBAIC0wLDAgKzEsMjQgQEAKK2xheWVyIGF0ICgwLDApIHNpemUgODAweDYwMAorICBSZW5k ZXJWaWV3IGF0ICgwLDApIHNpemUgODAweDYwMAorbGF5ZXIgYXQgKDAsMCkgc2l6ZSA4MDB4NjAw CisgIFJlbmRlckJsb2NrIHtIVE1MfSBhdCAoMCwwKSBzaXplIDgwMHg2MDAKKyAgICBSZW5kZXJC b2R5IHtCT0RZfSBhdCAoOCw4KSBzaXplIDc4NHg1ODQKKyAgICAgIFJlbmRlclRleHQgeyN0ZXh0 fSBhdCAoMTYwLDEyNikgc2l6ZSA0eDE4CisgICAgICAgIHRleHQgcnVuIGF0ICgxNjAsMTI2KSB3 aWR0aCA0OiAiICIKKyAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBhdCAoMzI0LDEyNikgc2l6ZSA0 eDE4CisgICAgICAgIHRleHQgcnVuIGF0ICgzMjQsMTI2KSB3aWR0aCA0OiAiICIKKyAgICAgIFJl bmRlclRleHQgeyN0ZXh0fSBhdCAoNDg4LDEyNikgc2l6ZSA0eDE4CisgICAgICAgIHRleHQgcnVu IGF0ICg0ODgsMTI2KSB3aWR0aCA0OiAiICIKKyAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBhdCAo MCwwKSBzaXplIDB4MAorbGF5ZXIgYXQgKDgsOCkgc2l6ZSAxNjB4MTQwCisgIFJlbmRlckJsb2Nr IChyZWxhdGl2ZSBwb3NpdGlvbmVkKSB7RElWfSBhdCAoMCwwKSBzaXplIDE2MHgxNDAgW2JnY29s b3I9I0ZGQzBDQl0KKyAgICBSZW5kZXJCbG9jayB7RElWfSBhdCAoNDAsMTApIHNpemUgMTAweDEw MCBbYmdjb2xvcj0jODA4MDgwXQorbGF5ZXIgYXQgKDE3Miw4KSBzaXplIDE2MHgxNDAKKyAgUmVu ZGVyQmxvY2sgKHJlbGF0aXZlIHBvc2l0aW9uZWQpIHtESVZ9IGF0ICgxNjQsMCkgc2l6ZSAxNjB4 MTQwIFtiZ2NvbG9yPSNGRkMwQ0JdCisgICAgUmVuZGVyQmxvY2sge0RJVn0gYXQgKDQwLDEwKSBz aXplIDEwMHgxMDAgW2JnY29sb3I9IzgwODA4MF0KK2xheWVyIGF0ICgzMzYsOCkgc2l6ZSAxNjB4 MTQwCisgIFJlbmRlckJsb2NrIChyZWxhdGl2ZSBwb3NpdGlvbmVkKSB7RElWfSBhdCAoMzI4LDAp IHNpemUgMTYweDE0MCBbYmdjb2xvcj0jRkZDMENCXQorICAgIFJlbmRlckJsb2NrIHtESVZ9IGF0 ICg0MCwxMCkgc2l6ZSAxMDB4MTAwIFtiZ2NvbG9yPSM4MDgwODBdCitsYXllciBhdCAoNTAwLDgp IHNpemUgMTYweDE0MAorICBSZW5kZXJCbG9jayAocmVsYXRpdmUgcG9zaXRpb25lZCkge0RJVn0g YXQgKDQ5MiwwKSBzaXplIDE2MHgxNDAgW2JnY29sb3I9I0ZGQzBDQl0KKyAgICBSZW5kZXJCbG9j ayB7RElWfSBhdCAoNDAsMTApIHNpemUgMTAweDEwMCBbYmdjb2xvcj0jODA4MDgwXQpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvZmFzdC93cml0aW5nLW1vZGUvbWFyZ2lucy5odG1sIGIvTGF5b3V0 VGVzdHMvZmFzdC93cml0aW5nLW1vZGUvbWFyZ2lucy5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0 CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjIwMjIwOGVk YzdhY2Q1MDM0MjY4MmU4OTg1OTVhODY1YTRlNjQ3NjMKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlv dXRUZXN0cy9mYXN0L3dyaXRpbmctbW9kZS9tYXJnaW5zLmh0bWwKQEAgLTAsMCArMSwzMiBAQAor PHN0eWxlPgorLmNvbnRhaW5lciB7CisgICAgcG9zaXRpb246IHJlbGF0aXZlOworICAgIGJhY2tn cm91bmQtY29sb3I6IHBpbms7CisgICAgb3V0bGluZTogMXB4IHNvbGlkIGJsYWNrOworICAgIGRp c3BsYXk6IGlubGluZS1ibG9jazsKK30KKy5ib3ggeworICAgIGJhY2tncm91bmQtY29sb3I6IGdy ZXk7CisgICAgd2lkdGg6IDEwMHB4OworICAgIGhlaWdodDogMTAwcHg7CisgICAgbWFyZ2luOiAx MHB4IDIwcHggMzBweCA0MHB4OworfQorPC9zdHlsZT4KKworPCEtLVRoZSBmb3VyIGJveGVzIGJl bG93IHNob3VsZCBsb29rIGlkZW50aWNhbC4tLT4KKworPGRpdiBjbGFzcz0iY29udGFpbmVyIj4K KyAgICA8ZGl2IGNsYXNzPSJmbGV4Ym94IHZlcnRpY2FsLWxyIGJveCIgc3R5bGU9Ii13ZWJraXQt d3JpdGluZy1tb2RlOiBob3Jpem9udGFsLXRiOyI+PC9kaXY+Cis8L2Rpdj4KKworPGRpdiBjbGFz cz0iY29udGFpbmVyIj4KKyAgICA8ZGl2IGNsYXNzPSJmbGV4Ym94IHZlcnRpY2FsLWxyIGJveCIg c3R5bGU9Ii13ZWJraXQtd3JpdGluZy1tb2RlOiBob3JpdHpvbnRhbC1idDsiPjwvZGl2PgorPC9k aXY+CisKKzxkaXYgY2xhc3M9ImNvbnRhaW5lciI+CisgICAgPGRpdiBjbGFzcz0iZmxleGJveCB2 ZXJ0aWNhbC1sciBib3giIHN0eWxlPSItd2Via2l0LXdyaXRpbmctbW9kZTogdmVydGljYWwtbHI7 Ij48L2Rpdj4KKzwvZGl2PgorCis8ZGl2IGNsYXNzPSJjb250YWluZXIiPgorICAgIDxkaXYgY2xh c3M9ImZsZXhib3ggdmVydGljYWwtbHIgYm94IiBzdHlsZT0iLXdlYmtpdC13cml0aW5nLW1vZGU6 IHZlcnRpY2FsLXJsOyI+PC9kaXY+Cis8L2Rpdj4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA4ZTUyMWRhZmU4MWY4 YzU1NjcxMjQ3YTVmMTNhZDNhODBmN2I5OWQ1Li45YjAxYTlkMzc3Y2M0MmQ4NWNlNzYyNGIzMDU2 MTc1NWZjZTUyODk0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIv U291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMTAtMDcgIE9q YW4gVmFmYWkgIDxvamFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBtYXJnaW4tcmlnaHQgaXMg aWdub3JlZCB3aXRoIHZlcnRpY2FsIHdyaXRpbmcgbW9kZQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Njk2ODYKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZSBuZWVkIHRvIHVzZSB0aGUgcGFyZW50J3Mgd3Jp dGluZyBtb2RlIHdoZW4gZ3JhYmJpbmcKKyAgICAgICAgdGhlIG1hcmdpbiBzdGFydC9lbmQgZm9y IHRoZSBwdXJwb3NlcyBvZiBjb21wdXRpbmcgdGhlIHBhcmVudCdzCisgICAgICAgIHByZWZlcnJl ZCB3aWR0aHMuCisKKyAgICAgICAgVGVzdDogZmFzdC93cml0aW5nLW1vZGUvbWFyZ2lucy5odG1s CisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyQmxvY2s6OmNvbXB1dGVCbG9ja1ByZWZlcnJlZExvZ2ljYWxXaWR0aHMpOgorICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9jay5oOgorCiAyMDExLTEwLTEwICBTaW1vbiBGcmFz ZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT04oOTYwNzAp IDI1JSBpbnRsMSBQTFQgcmVncmVzc2lvbiBmcm9tIHNjcm9sbGJhciBpbnZhbGlkYXRpb24KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCmluZGV4IGZiOWRhNzgxNDA5NjQz MmU0NTRlMmNhNmZhYjAzODI5OGQ1OTdjYzEuLjVmZmVkY2M2ODgwNWExMjg3YWQzNTgzNjhkZWY3 MzU1ZWZlYzFmYzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC bG9jay5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcApA QCAtNTE4NCw3ICs1MTg0LDcgQEAgdm9pZCBSZW5kZXJCbG9jazo6Y29tcHV0ZUJsb2NrUHJlZmVy cmVkTG9naWNhbFdpZHRocygpCiB7CiAgICAgYm9vbCBub3dyYXAgPSBzdHlsZSgpLT53aGl0ZVNw YWNlKCkgPT0gTk9XUkFQOwogCi0gICAgUmVuZGVyT2JqZWN0ICpjaGlsZCA9IGZpcnN0Q2hpbGQo KTsKKyAgICBSZW5kZXJPYmplY3QqIGNoaWxkID0gZmlyc3RDaGlsZCgpOwogICAgIFJlbmRlckJs b2NrKiBjb250YWluaW5nQmxvY2sgPSB0aGlzLT5jb250YWluaW5nQmxvY2soKTsKICAgICBMYXlv dXRVbml0IGZsb2F0TGVmdFdpZHRoID0gMCwgZmxvYXRSaWdodFdpZHRoID0gMDsKICAgICB3aGls ZSAoY2hpbGQpIHsKQEAgLTUyMDksOCArNTIwOSw4IEBAIHZvaWQgUmVuZGVyQmxvY2s6OmNvbXB1 dGVCbG9ja1ByZWZlcnJlZExvZ2ljYWxXaWR0aHMoKQogICAgICAgICAvLyBBIG1hcmdpbiBiYXNp Y2FsbHkgaGFzIHRocmVlIHR5cGVzOiBmaXhlZCwgcGVyY2VudGFnZSwgYW5kIGF1dG8gKHZhcmlh YmxlKS4KICAgICAgICAgLy8gQXV0byBhbmQgcGVyY2VudGFnZSBtYXJnaW5zIHNpbXBseSBiZWNv bWUgMCB3aGVuIGNvbXB1dGluZyBtaW4vbWF4IHdpZHRoLgogICAgICAgICAvLyBGaXhlZCBtYXJn aW5zIGNhbiBiZSBhZGRlZCBpbiBhcyBpcy4KLSAgICAgICAgTGVuZ3RoIHN0YXJ0TWFyZ2luTGVu Z3RoID0gY2hpbGQtPnN0eWxlKCktPm1hcmdpblN0YXJ0KCk7Ci0gICAgICAgIExlbmd0aCBlbmRN YXJnaW5MZW5ndGggPSBjaGlsZC0+c3R5bGUoKS0+bWFyZ2luRW5kKCk7CisgICAgICAgIExlbmd0 aCBzdGFydE1hcmdpbkxlbmd0aCA9IGNoaWxkLT5zdHlsZSgpLT5tYXJnaW5TdGFydFVzaW5nKHN0 eWxlKCkpOworICAgICAgICBMZW5ndGggZW5kTWFyZ2luTGVuZ3RoID0gY2hpbGQtPnN0eWxlKCkt Pm1hcmdpbkVuZFVzaW5nKHN0eWxlKCkpOwogICAgICAgICBMYXlvdXRVbml0IG1hcmdpbiA9IDA7 CiAgICAgICAgIExheW91dFVuaXQgbWFyZ2luU3RhcnQgPSAwOwogICAgICAgICBMYXlvdXRVbml0 IG1hcmdpbkVuZCA9IDA7Cg==