69957 2011-10-12 13:25:25 -0700 display:inline-block elements don't correctly handle orthogonal writing-modes 2011-10-17 18:32:14 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ojan ojan hyatt tony oldest_to_newest 482661 0 110736 ojan 2011-10-12 13:25:25 -0700 Created attachment 110736 test case Summary: border-right doesn't correctly take vertical writing mode into account See test case. 482926 1 ojan 2011-10-12 18:30:00 -0700 This actually has nothing to do with borders. 482931 2 110788 ojan 2011-10-12 18:34:33 -0700 Created attachment 110788 Patch 482932 3 ojan 2011-10-12 18:35:41 -0700 Here's a first attempt. I'm a bit dubious this is the right fix given the call to computeLogicalHeight. It fixes the bug though. 483483 4 110788 hyatt 2011-10-13 14:23:16 -0700 Comment on attachment 110788 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=110788&action=review > Source/WebCore/rendering/RenderBlock.cpp:5247 > + toRenderBox(child)->computeLogicalHeight(); Yeah this is not quite right. It will use a height from a previous layout for the auto case, and that's pretty weird. I think you need to set the intrinsic height to just be borders + padding, then do computeLogicalHeight, and then use that result. However in addition, this computation needs to not have side effects, i.e., you need to set the height back to what it was when you're finished. Note that I'm approaching the point with region refactoring that I'm probably going to give you a way to compute the height/width without updating the box's member variables, since this hack of "compute it but then set it back" is starting to become really widespread. So anyway to sum up: (1) Cache the old height (2) Set the new height to be borders and padding in the logical height direction. (3) Compute the logical height (4) Cache that as your preferred logical width. (5) Set it back to the old height. 484382 5 111101 ojan 2011-10-14 15:56:40 -0700 Created attachment 111101 Patch 485361 6 111101 hyatt 2011-10-17 12:15:46 -0700 Comment on attachment 111101 Patch r=me 485521 7 ojan 2011-10-17 14:45:52 -0700 Committed r97653: <http://trac.webkit.org/changeset/97653> 485578 8 ojan 2011-10-17 15:52:46 -0700 Reverted r97653 for reason: Caused a number of Chromium failures. Committed r97661: <http://trac.webkit.org/changeset/97661> 485713 9 ojan 2011-10-17 18:32:14 -0700 Committed r97693: <http://trac.webkit.org/changeset/97693> 110736 2011-10-12 13:25:25 -0700 2011-10-12 13:25:25 -0700 test case scratch.html text/html 666 ojan PHN0eWxlPgouY29udGFpbmVyIHsKICAgIG91dGxpbmU6IDFweCBzb2xpZCByZWQ7CiAgICBkaXNw bGF5OiBpbmxpbmUtYmxvY2s7Cn0KLmJveCB7CiAgICBib3JkZXItc3R5bGU6IHNvbGlkOwogICAg Ym9yZGVyLXdpZHRoOiAxMHB4IDIwcHggMzBweCA0MHB4OwogICAgd2lkdGg6IDEwMHB4OwogICAg aGVpZ2h0OiAxMDBweDsKfQo8L3N0eWxlPgoKPCEtLVRoZSBmb3VyIGJveGVzIGJlbG93IHNob3Vs ZCBsb29rIGlkZW50aWNhbC4tLT4KCjxkaXYgY2xhc3M9ImNvbnRhaW5lciI+CiAgICA8ZGl2IGNs YXNzPSJib3giIHN0eWxlPSItd2Via2l0LXdyaXRpbmctbW9kZTogaG9yaXpvbnRhbC10YjsiPjwv ZGl2Pgo8L2Rpdj4KCjxkaXYgY2xhc3M9ImNvbnRhaW5lciI+CiAgICA8ZGl2IGNsYXNzPSJib3gi IHN0eWxlPSItd2Via2l0LXdyaXRpbmctbW9kZTogaG9yaXR6b250YWwtYnQ7Ij48L2Rpdj4KPC9k aXY+Cgo8ZGl2IGNsYXNzPSJjb250YWluZXIiPgogICAgPGRpdiBjbGFzcz0iYm94IiBzdHlsZT0i LXdlYmtpdC13cml0aW5nLW1vZGU6IHZlcnRpY2FsLWxyOyI+PC9kaXY+CjwvZGl2PgoKPGRpdiBj bGFzcz0iY29udGFpbmVyIj4KICAgIDxkaXYgY2xhc3M9ImJveCIgc3R5bGU9Ii13ZWJraXQtd3Jp dGluZy1tb2RlOiB2ZXJ0aWNhbC1ybDsiPjwvZGl2Pgo8L2Rpdj4K 110788 2011-10-12 18:34:33 -0700 2011-10-14 15:56:37 -0700 Patch bug-69957-20111012183432.patch text/plain 6576 ojan U3VidmVyc2lvbiBSZXZpc2lvbjogOTcyODUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBiMDA3ZjljOGUxNGY1ZTg3ZTFhODIw Yzc0NjM1M2E5ZGVhN2JkNWE3Li4xN2M3MTk2YTE2Mzg4OWFjYjBiMmRlMzY1M2NjODdlZjdmZTVh YTliIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMTAtMTIgIE9qYW4gVmFmYWkgIDxvamFu QGNocm9taXVtLm9yZz4KKworICAgICAgICBkaXNwbGF5OmlubGluZS1ibG9jayBlbGVtZW50cyBk b24ndCBjb3JyZWN0bHkgaGFuZGxlIG9ydGhvZ29uYWwgd3JpdGluZy1tb2RlcworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Njk5NTcKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGZhc3Qvd3JpdGluZy1tb2Rl L2JvcmRlcnMtZXhwZWN0ZWQuaHRtbDogQWRkZWQuCisgICAgICAgICogZmFzdC93cml0aW5nLW1v ZGUvYm9yZGVycy5odG1sOiBBZGRlZC4KKwogMjAxMS0xMC0xMiAgUnlvc3VrZSBOaXdhICA8cm5p d2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBDaHJvbWl1bSByZWJhc2VsaW5lIGFmdGVyIHI4NTUz NS4gVGhlIHRlc3Qgb25seSB3b3JrcyBpbiBNYWMgYmVjYXVzZSBpdCB0ZXN0cyBzdWIgcGl4ZWwg bGF5b3V0IGFuZApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC93cml0aW5nLW1vZGUvYm9y ZGVycy1leHBlY3RlZC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC93cml0aW5nLW1vZGUvYm9yZGVy cy1leHBlY3RlZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjA2NGRmN2MyMzU0NmZhMjRhODcwMTFjYjI3YzJl MTFhZjEwNmEwYWEKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3dyaXRpbmct bW9kZS9ib3JkZXJzLWV4cGVjdGVkLmh0bWwKQEAgLTAsMCArMSwyOSBAQAorPHN0eWxlPgorLmNv bnRhaW5lciB7CisgICAgYm9yZGVyOiA1cHggc29saWQgcmVkOworICAgIGRpc3BsYXk6IGlubGlu ZS1ibG9jazsKK30KKy5ib3ggeworICAgIGJvcmRlcjogNXB4IHNvbGlkOworICAgIHdpZHRoOiAx MDBweDsKKyAgICBoZWlnaHQ6IDUwcHg7Cit9Cis8L3N0eWxlPgorCis8ZGl2PlRoZSBmb3VyIGJv eGVzIGJlbG93IHNob3VsZCBsb29rIGlkZW50aWNhbC48L2Rpdj4KKworPGRpdiBjbGFzcz0iY29u dGFpbmVyIj4KKyAgICA8ZGl2IGNsYXNzPSJib3giPjwvZGl2PgorPC9kaXY+CisKKzxkaXYgY2xh c3M9ImNvbnRhaW5lciI+CisgICAgPGRpdiBjbGFzcz0iYm94Ij48L2Rpdj4KKzwvZGl2PgorCis8 ZGl2IGNsYXNzPSJjb250YWluZXIiPgorICAgIDxkaXYgY2xhc3M9ImJveCI+PC9kaXY+Cis8L2Rp dj4KKworPGRpdiBjbGFzcz0iY29udGFpbmVyIj4KKyAgICA8ZGl2IGNsYXNzPSJib3giPjwvZGl2 PgorPC9kaXY+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3dyaXRpbmctbW9kZS9ib3Jk ZXJzLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L3dyaXRpbmctbW9kZS9ib3JkZXJzLmh0bWwKbmV3 IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMC4uNGRlY2U3M2JjMjM1MGFlZjRmMDE3NmM2ZjdmZDE4YTk0MTliZTY3MAotLS0gL2Rl di9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3Qvd3JpdGluZy1tb2RlL2JvcmRlcnMuaHRtbApA QCAtMCwwICsxLDI5IEBACis8c3R5bGU+CisuY29udGFpbmVyIHsKKyAgICBib3JkZXI6IDVweCBz b2xpZCByZWQ7CisgICAgZGlzcGxheTogaW5saW5lLWJsb2NrOworfQorLmJveCB7CisgICAgYm9y ZGVyOiA1cHggc29saWQ7CisgICAgd2lkdGg6IDEwMHB4OworICAgIGhlaWdodDogNTBweDsKK30K Kzwvc3R5bGU+CisKKzxkaXY+VGhlIGZvdXIgYm94ZXMgYmVsb3cgc2hvdWxkIGxvb2sgaWRlbnRp Y2FsLjwvZGl2PgorCis8ZGl2IGNsYXNzPSJjb250YWluZXIiPgorICAgIDxkaXYgY2xhc3M9ImJv eCIgc3R5bGU9Ii13ZWJraXQtd3JpdGluZy1tb2RlOiBob3Jpem9udGFsLXRiOyI+PC9kaXY+Cis8 L2Rpdj4KKworPGRpdiBjbGFzcz0iY29udGFpbmVyIj4KKyAgICA8ZGl2IGNsYXNzPSJib3giIHN0 eWxlPSItd2Via2l0LXdyaXRpbmctbW9kZTogaG9yaXR6b250YWwtYnQ7Ij48L2Rpdj4KKzwvZGl2 PgorCis8ZGl2IGNsYXNzPSJjb250YWluZXIiPgorICAgIDxkaXYgY2xhc3M9ImJveCIgc3R5bGU9 Ii13ZWJraXQtd3JpdGluZy1tb2RlOiB2ZXJ0aWNhbC1scjsiPjwvZGl2PgorPC9kaXY+CisKKzxk aXYgY2xhc3M9ImNvbnRhaW5lciI+CisgICAgPGRpdiBjbGFzcz0iYm94IiBzdHlsZT0iLXdlYmtp dC13cml0aW5nLW1vZGU6IHZlcnRpY2FsLXJsOyI+PC9kaXY+Cis8L2Rpdj4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRl eCA5ZDQ3ODBiODFjN2QwZDFmNzU0MmY2YTc2ZDRhZWE0MjljMWQ1OGI4Li40NjUxMzg2ZmM5Yzdi MTk4YTQ0YjdjYjljOWY0ODEwYmZmYzM5ZGZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAK KzIwMTEtMTAtMTIgIE9qYW4gVmFmYWkgIDxvamFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBk aXNwbGF5OmlubGluZS1ibG9jayBlbGVtZW50cyBkb24ndCBjb3JyZWN0bHkgaGFuZGxlIG9ydGhv Z29uYWwgd3JpdGluZy1tb2RlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9Njk5NTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBSZWFkaW5nIG1pbi9tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGggZnJvbSBhIGNo aWxkIHVzZXMgdGhlIGNoaWxkJ3Mgd3JpdGluZy1tb2RlLgorICAgICAgICBJbnN0ZWFkLCB3ZSBu ZWVkIHRvIGdyYWIgdGhlIHJlc3VsdCBiYXNlZCBvbiB0aGUgcGFyZW50J3Mgd3JpdGluZy1tb2Rl LgorICAgICAgICBJbiB0aGUgY2FzZSBvZiBvcnRob2dvbmFsIHdyaXRpbmctbW9kZXMsIHdlIG5l ZWQgdGhlIGNoaWxkJ3MgbG9naWNhbCBoZWlnaHQuCisKKyAgICAgICAgVGVzdHM6IGZhc3Qvd3Jp dGluZy1tb2RlL2JvcmRlcnMtZXhwZWN0ZWQuaHRtbAorICAgICAgICAgICAgICAgZmFzdC93cml0 aW5nLW1vZGUvYm9yZGVycy5odG1sCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2su Y3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OmNvbXB1dGVCbG9ja1ByZWZlcnJl ZExvZ2ljYWxXaWR0aHMpOgorCiAyMDExLTEwLTExICBEYXZpZCBIeWF0dCAgPGh5YXR0QGFwcGxl LmNvbT4KIAogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 Njk4OTYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCmluZGV4IDU1OGUw MzkzNGQ3OTJjNDBlYmYxNmQzYmNiYTUyZGQ5NTczYWU0NDEuLmJjNGE0OWU0MjFhOTY1OGUyZDc0 N2M2YzY1MDNkYjNjNGZjNjAwNzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJCbG9jay5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJs b2NrLmNwcApAQCAtNTI0MiwxNCArNTI0MiwyMyBAQCB2b2lkIFJlbmRlckJsb2NrOjpjb21wdXRl QmxvY2tQcmVmZXJyZWRMb2dpY2FsV2lkdGhzKCkKICAgICAgICAgICAgIG1hcmdpbkVuZCArPSBl bmRNYXJnaW5MZW5ndGgudmFsdWUoKTsKICAgICAgICAgbWFyZ2luID0gbWFyZ2luU3RhcnQgKyBt YXJnaW5FbmQ7CiAKLSAgICAgICAgTGF5b3V0VW5pdCB3ID0gY2hpbGQtPm1pblByZWZlcnJlZExv Z2ljYWxXaWR0aCgpICsgbWFyZ2luOworICAgICAgICBMYXlvdXRVbml0IGNoaWxkTWluUHJlZmVy cmVkTG9naWNhbFdpZHRoLCBjaGlsZE1heFByZWZlcnJlZExvZ2ljYWxXaWR0aDsKKyAgICAgICAg aWYgKGNoaWxkLT5pc0JveCgpICYmIGNoaWxkLT5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpICE9 IGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkpIHsKKyAgICAgICAgICAgIHRvUmVuZGVyQm94KGNo aWxkKS0+Y29tcHV0ZUxvZ2ljYWxIZWlnaHQoKTsKKyAgICAgICAgICAgIGNoaWxkTWluUHJlZmVy cmVkTG9naWNhbFdpZHRoID0gY2hpbGRNYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGggPSB0b1JlbmRl ckJveChjaGlsZCktPmxvZ2ljYWxIZWlnaHQoKTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAg ICAgIGNoaWxkTWluUHJlZmVycmVkTG9naWNhbFdpZHRoID0gY2hpbGQtPm1pblByZWZlcnJlZExv Z2ljYWxXaWR0aCgpOworICAgICAgICAgICAgY2hpbGRNYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGgg PSBjaGlsZC0+bWF4UHJlZmVycmVkTG9naWNhbFdpZHRoKCk7CisgICAgICAgIH0KKyAgICAgICAg CisgICAgICAgIExheW91dFVuaXQgdyA9IGNoaWxkTWluUHJlZmVycmVkTG9naWNhbFdpZHRoICsg bWFyZ2luOwogICAgICAgICBtX21pblByZWZlcnJlZExvZ2ljYWxXaWR0aCA9IG1heCh3LCBtX21p blByZWZlcnJlZExvZ2ljYWxXaWR0aCk7CiAgICAgICAgIAogICAgICAgICAvLyBJRSBpZ25vcmVz IHRhYmxlcyBmb3IgY2FsY3VsYXRpb24gb2Ygbm93cmFwLiBNYWtlcyBzb21lIHNlbnNlLgogICAg ICAgICBpZiAobm93cmFwICYmICFjaGlsZC0+aXNUYWJsZSgpKQogICAgICAgICAgICAgbV9tYXhQ cmVmZXJyZWRMb2dpY2FsV2lkdGggPSBtYXgodywgbV9tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGgp OwogCi0gICAgICAgIHcgPSBjaGlsZC0+bWF4UHJlZmVycmVkTG9naWNhbFdpZHRoKCkgKyBtYXJn aW47CisgICAgICAgIHcgPSBjaGlsZE1heFByZWZlcnJlZExvZ2ljYWxXaWR0aCArIG1hcmdpbjsK IAogICAgICAgICBpZiAoIWNoaWxkLT5pc0Zsb2F0aW5nKCkpIHsKICAgICAgICAgICAgIGlmIChj aGlsZC0+aXNCb3goKSAmJiB0b1JlbmRlckJveChjaGlsZCktPmF2b2lkc0Zsb2F0cygpKSB7CkBA IC01MjYxLDcgKzUyNzAsNyBAQCB2b2lkIFJlbmRlckJsb2NrOjpjb21wdXRlQmxvY2tQcmVmZXJy ZWRMb2dpY2FsV2lkdGhzKCkKICAgICAgICAgICAgICAgICBMYXlvdXRVbml0IG1hcmdpbkxvZ2lj YWxSaWdodCA9IGx0ciA/IG1hcmdpbkVuZCA6IG1hcmdpblN0YXJ0OwogICAgICAgICAgICAgICAg IExheW91dFVuaXQgbWF4TGVmdCA9IG1hcmdpbkxvZ2ljYWxMZWZ0ID4gMCA/IG1heChmbG9hdExl ZnRXaWR0aCwgbWFyZ2luTG9naWNhbExlZnQpIDogZmxvYXRMZWZ0V2lkdGggKyBtYXJnaW5Mb2dp Y2FsTGVmdDsKICAgICAgICAgICAgICAgICBMYXlvdXRVbml0IG1heFJpZ2h0ID0gbWFyZ2luTG9n aWNhbFJpZ2h0ID4gMCA/IG1heChmbG9hdFJpZ2h0V2lkdGgsIG1hcmdpbkxvZ2ljYWxSaWdodCkg OiBmbG9hdFJpZ2h0V2lkdGggKyBtYXJnaW5Mb2dpY2FsUmlnaHQ7Ci0gICAgICAgICAgICAgICAg dyA9IGNoaWxkLT5tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGgoKSArIG1heExlZnQgKyBtYXhSaWdo dDsKKyAgICAgICAgICAgICAgICB3ID0gY2hpbGRNYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGggKyBt YXhMZWZ0ICsgbWF4UmlnaHQ7CiAgICAgICAgICAgICAgICAgdyA9IG1heCh3LCBmbG9hdExlZnRX aWR0aCArIGZsb2F0UmlnaHRXaWR0aCk7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBlbHNl CkBAIC01MjkwLDYgKzUyOTksNyBAQCB2b2lkIFJlbmRlckJsb2NrOjpjb21wdXRlQmxvY2tQcmVm ZXJyZWRMb2dpY2FsV2lkdGhzKCkKICAgICAgICAgLy8gb2YgMTAwcHggYmVjYXVzZSBvZiB0aGUg dGFibGUuCiAgICAgICAgIC8vIFdlIGNhbiBhY2hpZXZlIHRoaXMgZWZmZWN0IGJ5IG1ha2luZyB0 aGUgbWF4d2lkdGggb2YgYmxvY2tzIHRoYXQgY29udGFpbiB0YWJsZXMKICAgICAgICAgLy8gd2l0 aCBwZXJjZW50YWdlIHdpZHRocyBiZSBpbmZpbml0ZSAoYXMgbG9uZyBhcyB0aGV5IGFyZSBub3Qg aW5zaWRlIGEgdGFibGUgY2VsbCkuCisgICAgICAgIC8vIEZJWE1FOiBUaGVyZSBpcyBwcm9iYWJs eSBhIGJ1ZyBoZXJlIHdpdGggb3J0aG9nb25hbCB3cml0aW5nIG1vZGVzIHNpbmNlIHdlIGNoZWNr IGxvZ2ljYWxXaWR0aCBvbmx5IHVzaW5nIHRoZSBjaGlsZCdzIHdyaXRpbmcgbW9kZS4KICAgICAg ICAgaWYgKGNvbnRhaW5pbmdCbG9jayAmJiBkb2N1bWVudCgpLT5pblF1aXJrc01vZGUoKSAmJiBj aGlsZC0+c3R5bGUoKS0+bG9naWNhbFdpZHRoKCkuaXNQZXJjZW50KCkKICAgICAgICAgICAgICYm ICFpc1RhYmxlQ2VsbCgpICYmIGNoaWxkLT5pc1RhYmxlKCkgJiYgbV9tYXhQcmVmZXJyZWRMb2dp Y2FsV2lkdGggPCBCTE9DS19NQVhfV0lEVEgpIHsKICAgICAgICAgICAgIFJlbmRlckJsb2NrKiBj YiA9IGNvbnRhaW5pbmdCbG9jazsK 111101 2011-10-14 15:56:40 -0700 2011-10-17 12:15:46 -0700 Patch bug-69957-20111014155639.patch text/plain 6746 ojan U3VidmVyc2lvbiBSZXZpc2lvbjogOTc1MjEKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA0MTFhNDczNTcyYjQwNThhM2JiMGIz YzI0ODM3MThiNzE5YzRjYjkzLi4xYmE0ZTYxYmZjMjNmMjRhN2YyMzJmMmNhODdjN2ExNGRmYjBi NDJiIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMTAtMTIgIE9qYW4gVmFmYWkgIDxvamFu QGNocm9taXVtLm9yZz4KKworICAgICAgICBkaXNwbGF5OmlubGluZS1ibG9jayBlbGVtZW50cyBk b24ndCBjb3JyZWN0bHkgaGFuZGxlIG9ydGhvZ29uYWwgd3JpdGluZy1tb2RlcworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Njk5NTcKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGZhc3Qvd3JpdGluZy1tb2Rl L2JvcmRlcnMtZXhwZWN0ZWQuaHRtbDogQWRkZWQuCisgICAgICAgICogZmFzdC93cml0aW5nLW1v ZGUvYm9yZGVycy5odG1sOiBBZGRlZC4KKwogMjAxMS0xMC0xNCAgRGltaXRyaSBHbGF6a292ICA8 ZGdsYXprb3ZAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtDaHJvbWl1bV0gVXBkYXRlIGV4cGVj dGF0aW9ucyBhZnRlciByOTc1MDIuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3dyaXRp bmctbW9kZS9ib3JkZXJzLWV4cGVjdGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L3dyaXRpbmct bW9kZS9ib3JkZXJzLWV4cGVjdGVkLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMDY0ZGY3YzIzNTQ2ZmEyNGE4 NzAxMWNiMjdjMmUxMWFmMTA2YTBhYQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zh c3Qvd3JpdGluZy1tb2RlL2JvcmRlcnMtZXhwZWN0ZWQuaHRtbApAQCAtMCwwICsxLDI5IEBACis8 c3R5bGU+CisuY29udGFpbmVyIHsKKyAgICBib3JkZXI6IDVweCBzb2xpZCByZWQ7CisgICAgZGlz cGxheTogaW5saW5lLWJsb2NrOworfQorLmJveCB7CisgICAgYm9yZGVyOiA1cHggc29saWQ7Cisg ICAgd2lkdGg6IDEwMHB4OworICAgIGhlaWdodDogNTBweDsKK30KKzwvc3R5bGU+CisKKzxkaXY+ VGhlIGZvdXIgYm94ZXMgYmVsb3cgc2hvdWxkIGxvb2sgaWRlbnRpY2FsLjwvZGl2PgorCis8ZGl2 IGNsYXNzPSJjb250YWluZXIiPgorICAgIDxkaXYgY2xhc3M9ImJveCI+PC9kaXY+Cis8L2Rpdj4K KworPGRpdiBjbGFzcz0iY29udGFpbmVyIj4KKyAgICA8ZGl2IGNsYXNzPSJib3giPjwvZGl2Pgor PC9kaXY+CisKKzxkaXYgY2xhc3M9ImNvbnRhaW5lciI+CisgICAgPGRpdiBjbGFzcz0iYm94Ij48 L2Rpdj4KKzwvZGl2PgorCis8ZGl2IGNsYXNzPSJjb250YWluZXIiPgorICAgIDxkaXYgY2xhc3M9 ImJveCI+PC9kaXY+Cis8L2Rpdj4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3Qvd3JpdGlu Zy1tb2RlL2JvcmRlcnMuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3Qvd3JpdGluZy1tb2RlL2JvcmRl cnMuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwLi40ZGVjZTczYmMyMzUwYWVmNGYwMTc2YzZmN2ZkMThhOTQxOWJl NjcwCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC93cml0aW5nLW1vZGUvYm9y ZGVycy5odG1sCkBAIC0wLDAgKzEsMjkgQEAKKzxzdHlsZT4KKy5jb250YWluZXIgeworICAgIGJv cmRlcjogNXB4IHNvbGlkIHJlZDsKKyAgICBkaXNwbGF5OiBpbmxpbmUtYmxvY2s7Cit9CisuYm94 IHsKKyAgICBib3JkZXI6IDVweCBzb2xpZDsKKyAgICB3aWR0aDogMTAwcHg7CisgICAgaGVpZ2h0 OiA1MHB4OworfQorPC9zdHlsZT4KKworPGRpdj5UaGUgZm91ciBib3hlcyBiZWxvdyBzaG91bGQg bG9vayBpZGVudGljYWwuPC9kaXY+CisKKzxkaXYgY2xhc3M9ImNvbnRhaW5lciI+CisgICAgPGRp diBjbGFzcz0iYm94IiBzdHlsZT0iLXdlYmtpdC13cml0aW5nLW1vZGU6IGhvcml6b250YWwtdGI7 Ij48L2Rpdj4KKzwvZGl2PgorCis8ZGl2IGNsYXNzPSJjb250YWluZXIiPgorICAgIDxkaXYgY2xh c3M9ImJveCIgc3R5bGU9Ii13ZWJraXQtd3JpdGluZy1tb2RlOiBob3JpdHpvbnRhbC1idDsiPjwv ZGl2PgorPC9kaXY+CisKKzxkaXYgY2xhc3M9ImNvbnRhaW5lciI+CisgICAgPGRpdiBjbGFzcz0i Ym94IiBzdHlsZT0iLXdlYmtpdC13cml0aW5nLW1vZGU6IHZlcnRpY2FsLWxyOyI+PC9kaXY+Cis8 L2Rpdj4KKworPGRpdiBjbGFzcz0iY29udGFpbmVyIj4KKyAgICA8ZGl2IGNsYXNzPSJib3giIHN0 eWxlPSItd2Via2l0LXdyaXRpbmctbW9kZTogdmVydGljYWwtcmw7Ij48L2Rpdj4KKzwvZGl2Pgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nCmluZGV4IGVjNzczOWE3ODMzMDFiZWI3YjYwNTlkOGI3NTU3ZDZkYWYyMzE4MzYuLjZj MmZkMmQ5Mzg5NTIyMTBjN2ZjMjJiODU2NzgyZWM5ODZmYWMyNTcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMCBAQAorMjAxMS0xMC0xMiAgT2phbiBWYWZhaSAgPG9qYW5AY2hyb21pdW0ub3JnPgor CisgICAgICAgIGRpc3BsYXk6aW5saW5lLWJsb2NrIGVsZW1lbnRzIGRvbid0IGNvcnJlY3RseSBo YW5kbGUgb3J0aG9nb25hbCB3cml0aW5nLW1vZGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD02OTk1NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFJlYWRpbmcgbWluL21heFByZWZlcnJlZExvZ2ljYWxXaWR0 aCBmcm9tIGEgY2hpbGQgdXNlcyB0aGUgY2hpbGQncyB3cml0aW5nLW1vZGUuCisgICAgICAgIElu c3RlYWQsIHdlIG5lZWQgdG8gZ3JhYiB0aGUgcmVzdWx0IGJhc2VkIG9uIHRoZSBwYXJlbnQncyB3 cml0aW5nLW1vZGUuCisgICAgICAgIEluIHRoZSBjYXNlIG9mIG9ydGhvZ29uYWwgd3JpdGluZy1t b2Rlcywgd2UgbmVlZCB0aGUgY2hpbGQncyBsb2dpY2FsIGhlaWdodC4KKworICAgICAgICBUZXN0 czogZmFzdC93cml0aW5nLW1vZGUvYm9yZGVycy1leHBlY3RlZC5odG1sCisgICAgICAgICAgICAg ICBmYXN0L3dyaXRpbmctbW9kZS9ib3JkZXJzLmh0bWwKKworICAgICAgICAqIHJlbmRlcmluZy9S ZW5kZXJCbG9jay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6Y29tcHV0ZUJs b2NrUHJlZmVycmVkTG9naWNhbFdpZHRocyk6CisKIDIwMTEtMTAtMTQgIENhcnkgQ2xhcmsgIDxj YXJ5Y2xhcmtAZ29vZ2xlLmNvbT4KIAogICAgICAgICBbQ2hyb21pdW0gU2tpYSBvbiBNYWNdIElt cHJvdmUgZm9jdXMgcmluZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckJsb2NrLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAK aW5kZXggNDY3MWJkMmQ5ZmMwNmEzZjNlMmNiNTk1NGZhMGI1OGVlODYzNzhmMi4uYTY5YTZkYTA0 M2VkMmEyY2M4YzgxMGJlNTFhMzJiZWE5MjMwZWEwMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyQmxvY2suY3BwCkBAIC01MjUyLDE0ICs1MjUyLDI3IEBAIHZvaWQgUmVuZGVyQmxv Y2s6OmNvbXB1dGVCbG9ja1ByZWZlcnJlZExvZ2ljYWxXaWR0aHMoKQogICAgICAgICAgICAgbWFy Z2luRW5kICs9IGVuZE1hcmdpbkxlbmd0aC52YWx1ZSgpOwogICAgICAgICBtYXJnaW4gPSBtYXJn aW5TdGFydCArIG1hcmdpbkVuZDsKIAotICAgICAgICBMYXlvdXRVbml0IHcgPSBjaGlsZC0+bWlu UHJlZmVycmVkTG9naWNhbFdpZHRoKCkgKyBtYXJnaW47CisgICAgICAgIExheW91dFVuaXQgY2hp bGRNaW5QcmVmZXJyZWRMb2dpY2FsV2lkdGgsIGNoaWxkTWF4UHJlZmVycmVkTG9naWNhbFdpZHRo OworICAgICAgICBpZiAoY2hpbGQtPmlzQm94KCkgJiYgY2hpbGQtPmlzSG9yaXpvbnRhbFdyaXRp bmdNb2RlKCkgIT0gaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSkgeworICAgICAgICAgICAgUmVu ZGVyQm94KiBjaGlsZEJveCA9IHRvUmVuZGVyQm94KGNoaWxkKTsKKyAgICAgICAgICAgIExheW91 dFVuaXQgb2xkSGVpZ2h0ID0gY2hpbGRCb3gtPmxvZ2ljYWxIZWlnaHQoKTsKKyAgICAgICAgICAg IHNldExvZ2ljYWxIZWlnaHQoY2hpbGRCb3gtPmJvcmRlckFuZFBhZGRpbmdMb2dpY2FsSGVpZ2h0 KCkpOworICAgICAgICAgICAgY2hpbGRCb3gtPmNvbXB1dGVMb2dpY2FsSGVpZ2h0KCk7CisgICAg ICAgICAgICBjaGlsZE1pblByZWZlcnJlZExvZ2ljYWxXaWR0aCA9IGNoaWxkTWF4UHJlZmVycmVk TG9naWNhbFdpZHRoID0gY2hpbGRCb3gtPmxvZ2ljYWxIZWlnaHQoKTsKKyAgICAgICAgICAgIGNo aWxkQm94LT5zZXRMb2dpY2FsSGVpZ2h0KG9sZEhlaWdodCk7CisgICAgICAgIH0gZWxzZSB7Cisg ICAgICAgICAgICBjaGlsZE1pblByZWZlcnJlZExvZ2ljYWxXaWR0aCA9IGNoaWxkLT5taW5QcmVm ZXJyZWRMb2dpY2FsV2lkdGgoKTsKKyAgICAgICAgICAgIGNoaWxkTWF4UHJlZmVycmVkTG9naWNh bFdpZHRoID0gY2hpbGQtPm1heFByZWZlcnJlZExvZ2ljYWxXaWR0aCgpOworICAgICAgICB9CisK KyAgICAgICAgTGF5b3V0VW5pdCB3ID0gY2hpbGRNaW5QcmVmZXJyZWRMb2dpY2FsV2lkdGggKyBt YXJnaW47CiAgICAgICAgIG1fbWluUHJlZmVycmVkTG9naWNhbFdpZHRoID0gbWF4KHcsIG1fbWlu UHJlZmVycmVkTG9naWNhbFdpZHRoKTsKICAgICAgICAgCiAgICAgICAgIC8vIElFIGlnbm9yZXMg dGFibGVzIGZvciBjYWxjdWxhdGlvbiBvZiBub3dyYXAuIE1ha2VzIHNvbWUgc2Vuc2UuCiAgICAg ICAgIGlmIChub3dyYXAgJiYgIWNoaWxkLT5pc1RhYmxlKCkpCiAgICAgICAgICAgICBtX21heFBy ZWZlcnJlZExvZ2ljYWxXaWR0aCA9IG1heCh3LCBtX21heFByZWZlcnJlZExvZ2ljYWxXaWR0aCk7 CiAKLSAgICAgICAgdyA9IGNoaWxkLT5tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGgoKSArIG1hcmdp bjsKKyAgICAgICAgdyA9IGNoaWxkTWF4UHJlZmVycmVkTG9naWNhbFdpZHRoICsgbWFyZ2luOwog CiAgICAgICAgIGlmICghY2hpbGQtPmlzRmxvYXRpbmcoKSkgewogICAgICAgICAgICAgaWYgKGNo aWxkLT5pc0JveCgpICYmIHRvUmVuZGVyQm94KGNoaWxkKS0+YXZvaWRzRmxvYXRzKCkpIHsKQEAg LTUyNzEsNyArNTI4NCw3IEBAIHZvaWQgUmVuZGVyQmxvY2s6OmNvbXB1dGVCbG9ja1ByZWZlcnJl ZExvZ2ljYWxXaWR0aHMoKQogICAgICAgICAgICAgICAgIExheW91dFVuaXQgbWFyZ2luTG9naWNh bFJpZ2h0ID0gbHRyID8gbWFyZ2luRW5kIDogbWFyZ2luU3RhcnQ7CiAgICAgICAgICAgICAgICAg TGF5b3V0VW5pdCBtYXhMZWZ0ID0gbWFyZ2luTG9naWNhbExlZnQgPiAwID8gbWF4KGZsb2F0TGVm dFdpZHRoLCBtYXJnaW5Mb2dpY2FsTGVmdCkgOiBmbG9hdExlZnRXaWR0aCArIG1hcmdpbkxvZ2lj YWxMZWZ0OwogICAgICAgICAgICAgICAgIExheW91dFVuaXQgbWF4UmlnaHQgPSBtYXJnaW5Mb2dp Y2FsUmlnaHQgPiAwID8gbWF4KGZsb2F0UmlnaHRXaWR0aCwgbWFyZ2luTG9naWNhbFJpZ2h0KSA6 IGZsb2F0UmlnaHRXaWR0aCArIG1hcmdpbkxvZ2ljYWxSaWdodDsKLSAgICAgICAgICAgICAgICB3 ID0gY2hpbGQtPm1heFByZWZlcnJlZExvZ2ljYWxXaWR0aCgpICsgbWF4TGVmdCArIG1heFJpZ2h0 OworICAgICAgICAgICAgICAgIHcgPSBjaGlsZE1heFByZWZlcnJlZExvZ2ljYWxXaWR0aCArIG1h eExlZnQgKyBtYXhSaWdodDsKICAgICAgICAgICAgICAgICB3ID0gbWF4KHcsIGZsb2F0TGVmdFdp ZHRoICsgZmxvYXRSaWdodFdpZHRoKTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGVsc2UK QEAgLTUzMDAsNiArNTMxMyw3IEBAIHZvaWQgUmVuZGVyQmxvY2s6OmNvbXB1dGVCbG9ja1ByZWZl cnJlZExvZ2ljYWxXaWR0aHMoKQogICAgICAgICAvLyBvZiAxMDBweCBiZWNhdXNlIG9mIHRoZSB0 YWJsZS4KICAgICAgICAgLy8gV2UgY2FuIGFjaGlldmUgdGhpcyBlZmZlY3QgYnkgbWFraW5nIHRo ZSBtYXh3aWR0aCBvZiBibG9ja3MgdGhhdCBjb250YWluIHRhYmxlcwogICAgICAgICAvLyB3aXRo IHBlcmNlbnRhZ2Ugd2lkdGhzIGJlIGluZmluaXRlIChhcyBsb25nIGFzIHRoZXkgYXJlIG5vdCBp bnNpZGUgYSB0YWJsZSBjZWxsKS4KKyAgICAgICAgLy8gRklYTUU6IFRoZXJlIGlzIHByb2JhYmx5 IGEgYnVnIGhlcmUgd2l0aCBvcnRob2dvbmFsIHdyaXRpbmcgbW9kZXMgc2luY2Ugd2UgY2hlY2sg bG9naWNhbFdpZHRoIG9ubHkgdXNpbmcgdGhlIGNoaWxkJ3Mgd3JpdGluZyBtb2RlLgogICAgICAg ICBpZiAoY29udGFpbmluZ0Jsb2NrICYmIGRvY3VtZW50KCktPmluUXVpcmtzTW9kZSgpICYmIGNo aWxkLT5zdHlsZSgpLT5sb2dpY2FsV2lkdGgoKS5pc1BlcmNlbnQoKQogICAgICAgICAgICAgJiYg IWlzVGFibGVDZWxsKCkgJiYgY2hpbGQtPmlzVGFibGUoKSAmJiBtX21heFByZWZlcnJlZExvZ2lj YWxXaWR0aCA8IEJMT0NLX01BWF9XSURUSCkgewogICAgICAgICAgICAgUmVuZGVyQmxvY2sqIGNi ID0gY29udGFpbmluZ0Jsb2NrOwo=