114311 2013-04-09 15:54:11 -0700 REGRESSION (142152): ensure we skip past out-of-flow objects when detecting whitespace to ignore after leading empty inlines 2013-04-11 12:15:49 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 eae robert commit-queue eric esprehn+autocc ojan.autocc robert simon.fraser oldest_to_newest 872112 0 eae 2013-04-09 15:54:11 -0700 Since r142152 we incorrectly layout out of flow content inside an inline-blocks with vertical-align. What steps will reproduce the problem? 1. Go to http://join.iatn.net/ 2. Notice in 26.0.1410.43 that the placeholder text shows up unusually high in our boxes. (Note that this isn't actual HTML5 placeholder attribute text, but a custom development to support all browsers.) Prior to this version of Chrome, it rendered perfectly fine. The second screenshot shows how it renders in Safari 6.0.1 (8536.26.14), and that's also how it looked prior to this release of Chrome. Originally reported for chromium in: https://code.google.com/p/chromium/issues/detail?id=226246 872115 1 197184 eae 2013-04-09 15:54:30 -0700 Created attachment 197184 minimal test case 873201 2 197397 robert 2013-04-10 13:34:20 -0700 Created attachment 197397 Patch 873240 3 197404 robert 2013-04-10 14:21:28 -0700 Created attachment 197404 Patch 874020 4 197404 commit-queue 2013-04-11 12:15:47 -0700 Comment on attachment 197404 Patch Clearing flags on attachment: 197404 Committed r148223: <http://trac.webkit.org/changeset/148223> 874021 5 commit-queue 2013-04-11 12:15:49 -0700 All reviewed patches have been landed. Closing bug. 197184 2013-04-09 15:54:30 -0700 2013-04-09 15:54:30 -0700 minimal test case test2.html text/html 386 eae PCFET0NUWVBFIGh0bWw+CjxodG1sPgoJPGhlYWQ+CgkJPHN0eWxlPgoJCQkuY29udGFpbmVyIHsK CQkJCWRpc3BsYXk6IGlubGluZS1ibG9jazsKCQkJCXZlcnRpY2FsLWFsaWduOiB0b3A7CgkJCX0K CQkJLmNvbnRhaW5lciA+IGxhYmVsID4gc3BhbiB7CgkJCQlwYWRkaW5nOiA1cHg7CgkJCQlwb3Np dGlvbjogYWJzb2x1dGU7CgkJCX0KCQk8L3N0eWxlPgoJPC9oZWFkPgoJPGJvZHk+CgkJPHNwYW4g Y2xhc3M9ImNvbnRhaW5lciI+CgkJCTxsYWJlbCBmb3I9ImlucHV0LWZpZWxkIj48c3Bhbj5TaG91 bGQgYmUgaW5zaWRlIGlucHV0PC9zcGFuPjwvbGFiZWw+CgkJCTxpbnB1dCBpZD0iaW5wdXQtZmll bGQiIHR5cGU9InRleHQiPgoJCTwvc3Bhbj4KCTwvYm9keT4KPC9odG1sPgo= 197397 2013-04-10 13:34:20 -0700 2013-04-10 14:21:24 -0700 Patch bug-114311-20130410213345.patch text/plain 6993 robert U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ4MDMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzFiNTY2Y2JiM2Y1ZWRh NzMxMTUxOWJmNjczYzZlN2Q5ZDBmZDA1OS4uY2FhYzA0NzcwNzk3ZmUzOGIwMGJjMjE5ZTc0NzQ1 NzVhYTFjY2JiZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEzLTA0LTEwICBSb2Jl cnQgSG9nYW4gIDxyb2JlcnRAd2Via2l0Lm9yZz4KKworICAgICAgICBSRUdSRVNTSU9OICgxNDIx NTIpOiBlbnN1cmUgd2Ugc2tpcCBwYXN0IG91dC1vZi1mbG93IG9iamVjdHMgd2hlbiBkZXRlY3Rp bmcgd2hpdGVzcGFjZSB0byBpZ25vcmUgYWZ0ZXIgbGVhZGluZyBlbXB0eSBpbmxpbmVzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTQzMTEKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIHdlIGhpdCBh biBlbXB0eSBpbmxpbmUgaW4gbGluZSBsYXlvdXQgYW5kIHRyeSB0byBkZXRlY3Qgd2hldGhlciBp dCBoYXMgYW55IHdoaXRlc3BhY2UgYWZ0ZXIgaXQgdGhhdCB3ZSBvdWdodCB0byBpZ25vcmUsIHRo ZW4KKyAgICAgICAgd2UgbmVlZCB0byBza2lwIHBhc3Qgb3V0LW9mLWZsb3cgYW5kIGZsb2F0aW5n IG9iamVjdHMgd2hlbiBsb29raW5nIGZvciB0aGF0IHdoaXRlc3BhY2UuIEZhaWx1cmUgdG8gZG8g c28gd2lsbCByZXN1bHQgaW4gdXMKKyAgICAgICAgYWRkaW5nIHRoZSB3aWR0aCBmcm9tIHRoZSBm aXJzdCBzcGFjZSB3ZSBlbmNvdW50ZXIgdG8gb3VyIGxpbmUgd2lkdGggYW5kIG92ZXItZXN0aW1h dGluZyB0aGUgcmVhbCB3aWR0aCBvZiB0aGUgbGluZS4KKworICAgICAgICBXZSdyZSBoaXR0aW5n IHRoaXMgYnVnIG5vdyBiZWNhdXNlIHdlIGhhdmUgYnJvYWRlbmVkIHRoZSBjYXRlZ29yeSBvZiBl bXB0eSBpbmxpbmVzIHRoYXQgZ2V0IGxpbmVib3hlcyBzbyB3ZSBnbyBpbnRvIGxpbmUgbGF5b3V0 IAorICAgICAgICBhbmQgaGF2ZSB0byBkZWFsIHdpdGggdGhlbSBhbmQgdGhlaXIgc3Vic2VxdWVu dCB3aGl0ZXNwYWNlIHRoZXJlLiBQcmV2aW91c2x5IHRoaXMgc29ydCBvZiB3aGl0ZXNwYWNlIHdv dWxkIGhhdmUgYmVlbiBzaW1wbHkKKyAgICAgICAgY29uc3VtZWQgYnkgfHNraXBMZWFkaW5nV2hp dGVzcGFjZXwuCisKKyAgICAgICAgVGVzdDogZmFzdC9pbmxpbmUvb3V0LW9mLWZsb3ctb2JqZWN0 cy1hbmQtd2hpdGVzcGFjZS1hZnRlci1lbXB0eS1pbmxpbmUuaHRtbAorCisgICAgICAgICogcmVu ZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpzaG91 bGRTa2lwV2hpdGVzcGFjZUFmdGVyU3RhcnRPYmplY3QpOgorCiAyMDEzLTA0LTA5ICBBbmRyZWFz IEtsaW5nICA8YWtsaW5nQGFwcGxlLmNvbT4KIAogICAgICAgICBUaHJvdHRsZSByZXNpemUgZXZl bnRzIGR1cmluZyBsaXZlIHdpbmRvdyByZXNpemUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3BwCmluZGV4IGFmNWNhMDBkZjYyNTg1NTBj ZWJlYWRmYzNlYTI3ZGVkM2I5ODQxZTcuLjVjYmVkMmM4NGNhMzE1NzA0YjU4NTE5NjE2N2U4ZmVl NTdhN2UzZGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9j a0xpbmVMYXlvdXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9j a0xpbmVMYXlvdXQuY3BwCkBAIC0yNDEyLDYgKzI0MTIsOSBAQCB2b2lkIFJlbmRlckJsb2NrOjpM aW5lQnJlYWtlcjo6c2tpcExlYWRpbmdXaGl0ZXNwYWNlKElubGluZUJpZGlSZXNvbHZlciYgcmVz b2x2ZQogc3RhdGljIGJvb2wgc2hvdWxkU2tpcFdoaXRlc3BhY2VBZnRlclN0YXJ0T2JqZWN0KFJl bmRlckJsb2NrKiBibG9jaywgUmVuZGVyT2JqZWN0KiBvLCBMaW5lTWlkcG9pbnRTdGF0ZSYgbGlu ZU1pZHBvaW50U3RhdGUpCiB7CiAgICAgUmVuZGVyT2JqZWN0KiBuZXh0ID0gYmlkaU5leHRTa2lw cGluZ0VtcHR5SW5saW5lcyhibG9jaywgbyk7CisgICAgd2hpbGUgKG5leHQgJiYgbmV4dC0+aXNG bG9hdGluZ09yT3V0T2ZGbG93UG9zaXRpb25lZCgpKQorICAgICAgICBuZXh0ID0gYmlkaU5leHRT a2lwcGluZ0VtcHR5SW5saW5lcyhibG9jaywgbmV4dCk7CisKICAgICBpZiAobmV4dCAmJiAhbmV4 dC0+aXNCUigpICYmIG5leHQtPmlzVGV4dCgpICYmIHRvUmVuZGVyVGV4dChuZXh0KS0+dGV4dExl bmd0aCgpID4gMCkgewogICAgICAgICBSZW5kZXJUZXh0KiBuZXh0VGV4dCA9IHRvUmVuZGVyVGV4 dChuZXh0KTsKICAgICAgICAgVUNoYXIgbmV4dENoYXIgPSBuZXh0VGV4dC0+Y2hhcmFjdGVyQXQo MCk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cKaW5kZXggZjc0NmI1OTAxYjU4M2U2ZGM0OWVlMjY5NThjMjlkOTk5MTc3ZTFiYy4uYmNm NzIzMGY2YmM1M2IyODFjNDM3OTZlZjc2ODA2NDZmMTg3ODcyYSAxMDA2NDQKLS0tIGEvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEz IEBACisyMDEzLTA0LTEwICBSb2JlcnQgSG9nYW4gIDxyb2JlcnRAd2Via2l0Lm9yZz4KKworICAg ICAgICBSRUdSRVNTSU9OICgxNDIxNTIpOiBlbnN1cmUgd2Ugc2tpcCBwYXN0IG91dC1vZi1mbG93 IG9iamVjdHMgd2hlbiBkZXRlY3Rpbmcgd2hpdGVzcGFjZSB0byBpZ25vcmUgYWZ0ZXIgbGVhZGlu ZyBlbXB0eSBpbmxpbmVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMTQzMTEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIGZhc3QvaW5saW5lL291dC1vZi1mbG93LW9iamVjdHMtYW5kLXdoaXRlc3BhY2Ut YWZ0ZXItZW1wdHktaW5saW5lLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZmFzdC9p bmxpbmUvb3V0LW9mLWZsb3ctb2JqZWN0cy1hbmQtd2hpdGVzcGFjZS1hZnRlci1lbXB0eS1pbmxp bmUuaHRtbDogQWRkZWQuCisKIDIwMTMtMDQtMDkgIEFybmF1ZCBSZW5ldmllciAgPGEucmVuZXZp ZXJAc2lzYS5zYW1zdW5nLmNvbT4KIAogICAgICAgICBXaGl0ZXNwYWNlIGluIHBhcnRpY3VsYXIg c291cmNlIGNvZGUgY2hhbmdlcyByZW5kZXJpbmc7IGRvZXMgbm90IGluIEZpcmVmb3gKZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvaW5saW5lL291dC1vZi1mbG93LW9iamVjdHMtYW5kLXdo aXRlc3BhY2UtYWZ0ZXItZW1wdHktaW5saW5lLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zh c3QvaW5saW5lL291dC1vZi1mbG93LW9iamVjdHMtYW5kLXdoaXRlc3BhY2UtYWZ0ZXItZW1wdHkt aW5saW5lLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4yMDcyNjM1ZWJjMmUzMTZmZmQ3ZjgxOTRi ZmYwN2QwNmI4ZTdiZjcxCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9pbmxp bmUvb3V0LW9mLWZsb3ctb2JqZWN0cy1hbmQtd2hpdGVzcGFjZS1hZnRlci1lbXB0eS1pbmxpbmUt ZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsNSBAQAord2Via2l0Lm9yZy9wLzExNDMxMTogVGhlIHRl eHQgc2hvdWxkIGJlIGluc2lkZSB0aGUgaW5wdXQgY29udHJvbC4KKworSW5wdXQgCitQQVNTCisK ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvaW5saW5lL291dC1vZi1mbG93LW9iamVjdHMt YW5kLXdoaXRlc3BhY2UtYWZ0ZXItZW1wdHktaW5saW5lLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0 L2lubGluZS9vdXQtb2YtZmxvdy1vYmplY3RzLWFuZC13aGl0ZXNwYWNlLWFmdGVyLWVtcHR5LWlu bGluZS5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAuLjQ2ZGEyMjdiNjM1OGJjNzAzMDZkMTVkMGI3MWM2ZjI2ZGI1 ODYxYzkKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2lubGluZS9vdXQtb2Yt Zmxvdy1vYmplY3RzLWFuZC13aGl0ZXNwYWNlLWFmdGVyLWVtcHR5LWlubGluZS5odG1sCkBAIC0w LDAgKzEsNTYgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+CisgICAgPGhlYWQ+CisgICAgICAg IDxzdHlsZT4KKyAgICAgICAgICAgIGJvZHkgPiBzcGFuIHsKKyAgICAgICAgICAgICAgICBkaXNw bGF5OiBpbmxpbmUtYmxvY2s7CisgICAgICAgICAgICAgICAgdmVydGljYWwtYWxpZ246IHRvcDsK KyAgICAgICAgICAgICAgICBmb250OiAyMHB4LzEgQWhlbTsKKyAgICAgICAgICAgIH0KKyAgICAg ICAgICAgIC5jb250YWluZXItYWJzb2x1dGUgPiBsYWJlbCA+IHNwYW4geworICAgICAgICAgICAg ICAgIHBhZGRpbmc6IDVweDsKKyAgICAgICAgICAgICAgICBwb3NpdGlvbjogYWJzb2x1dGU7Cisg ICAgICAgICAgICB9CisgICAgICAgICAgICAuY29udGFpbmVyLWZsb2F0ID4gbGFiZWwgPiBzcGFu IHsKKyAgICAgICAgICAgICAgICBwYWRkaW5nOiA1cHg7CisgICAgICAgICAgICAgICAgZmxvYXQ6 IGxlZnQ7CisgICAgICAgICAgICB9CisgICAgICAgICAgICBpbnB1dCB7CisgICAgICAgICAgICAg ICAgYm9yZGVyLXRvcDogMHB4OworICAgICAgICAgICAgICAgIGJvcmRlci1ib3R0b206IDBweDsK KyAgICAgICAgICAgICAgICBtYXJnaW4tdG9wOiAwcHg7CisgICAgICAgICAgICAgICAgbWFyZ2lu LWJvdHRvbTogMHB4OworICAgICAgICAgICAgICAgIHBhZGRpbmctdG9wOiAwcHg7CisgICAgICAg ICAgICAgICAgcGFkZGluZy1ib3R0b206IDBweDsKKyAgICAgICAgICAgIH0KKyAgICAgICAgPC9z dHlsZT4KKyAgICAgICAgPHNjcmlwdCBzcmM9Ii4uLy4uL3Jlc291cmNlcy9jaGVjay1sYXlvdXQu anMiPjwvc2NyaXB0PgorICAgIDwvaGVhZD4KKyAgICA8Ym9keT4KKyAgICAgICAgPHA+d2Via2l0 Lm9yZy9wLzExNDMxMTogVGhlIHRleHQgc2hvdWxkIGJlIGluc2lkZSB0aGUgaW5wdXQgY29udHJv bHMuIDwvcD4KKyAgICAgICAgPHNwYW4gaWQ9ImlkMSIgY2xhc3M9ImNvbnRhaW5lci1hYnNvbHV0 ZSIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjIwcHgiPjxsYWJlbCBmb3I9ImlucHV0LWZpZWxkIj48 c3Bhbj5JbnB1dDwvc3Bhbj48L2xhYmVsPiAgICA8aW5wdXQgaWQ9ImlucHV0LWZpZWxkIiB0eXBl PSJ0ZXh0Ij48L3NwYW4+CisgICAgICAgIDxzcGFuIGlkPSJpZDIiIGNsYXNzPSJjb250YWluZXIt ZmxvYXQiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSIzMHB4Ij48bGFiZWwgZm9yPSJpbnB1dC1maWVs ZCI+PHNwYW4+SW5wdXQ8L3NwYW4+PC9sYWJlbD4gICAgPGlucHV0IGlkPSJpbnB1dC1maWVsZCIg dHlwZT0idGV4dCI+PC9zcGFuPgorICAgICAgICA8c3BhbiBpZD0iaWQzIiBjbGFzcz0iY29udGFp bmVyLWFic29sdXRlIiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iMjBweCI+PGxhYmVsIGZvcj0iaW5w dXQtZmllbGQiPjxzcGFuPklucHV0PC9zcGFuPjwvbGFiZWw+IDxpbnB1dCBpZD0iaW5wdXQtZmll bGQiIHR5cGU9InRleHQiPjwvc3Bhbj4KKyAgICAgICAgPHNwYW4gaWQ9ImlkNCIgY2xhc3M9ImNv bnRhaW5lci1mbG9hdCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjMwcHgiPjxsYWJlbCBmb3I9Imlu cHV0LWZpZWxkIj48c3Bhbj5JbnB1dDwvc3Bhbj48L2xhYmVsPiA8aW5wdXQgaWQ9ImlucHV0LWZp ZWxkIiB0eXBlPSJ0ZXh0Ij48L3NwYW4+CisgICAgICAgIDxzcGFuIGlkPSJpZDUiIGNsYXNzPSJj b250YWluZXItYWJzb2x1dGUiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSIyMHB4Ij48bGFiZWwgZm9y PSJpbnB1dC1maWVsZCI+PHNwYW4+SW5wdXQ8L3NwYW4+PC9sYWJlbD48aW5wdXQgaWQ9ImlucHV0 LWZpZWxkIiB0eXBlPSJ0ZXh0Ij48L3NwYW4+CisgICAgICAgIDxzcGFuIGlkPSJpZDYiIGNsYXNz PSJjb250YWluZXItZmxvYXQiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSIzMHB4Ij48bGFiZWwgZm9y PSJpbnB1dC1maWVsZCI+PHNwYW4+SW5wdXQ8L3NwYW4+PC9sYWJlbD48aW5wdXQgaWQ9ImlucHV0 LWZpZWxkIiB0eXBlPSJ0ZXh0Ij48L3NwYW4+CisgICAgICAgIDxzcGFuIGlkPSJpZDciIGNsYXNz PSJjb250YWluZXItYWJzb2x1dGUiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSIyMHB4Ij4KKyAgICAg ICAgICAgIDxsYWJlbCBmb3I9ImlucHV0LWZpZWxkIj48c3Bhbj5JbnB1dDwvc3Bhbj48L2xhYmVs PgorICAgICAgICAgICAgPGlucHV0IGlkPSJpbnB1dC1maWVsZCIgdHlwZT0idGV4dCI+CisgICAg ICAgIDwvc3Bhbj4KKyAgICAgICAgPHNwYW4gaWQ9ImlkOCIgY2xhc3M9ImNvbnRhaW5lci1mbG9h dCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjMwcHgiPgorICAgICAgICAgICAgPGxhYmVsIGZvcj0i aW5wdXQtZmllbGQiPjxzcGFuPklucHV0PC9zcGFuPjwvbGFiZWw+CisgICAgICAgICAgICA8aW5w dXQgaWQ9ImlucHV0LWZpZWxkIiB0eXBlPSJ0ZXh0Ij4KKyAgICAgICAgPC9zcGFuPgorICAgICAg ICA8c2NyaXB0PgorICAgICAgICAgICAgY2hlY2tMYXlvdXQoJyNpZDEnKTsKKyAgICAgICAgICAg IGNoZWNrTGF5b3V0KCcjaWQyJyk7CisgICAgICAgICAgICBjaGVja0xheW91dCgnI2lkMycpOwor ICAgICAgICAgICAgY2hlY2tMYXlvdXQoJyNpZDQnKTsKKyAgICAgICAgICAgIGNoZWNrTGF5b3V0 KCcjaWQ1Jyk7CisgICAgICAgICAgICBjaGVja0xheW91dCgnI2lkNicpOworICAgICAgICAgICAg Y2hlY2tMYXlvdXQoJyNpZDcnKTsKKyAgICAgICAgICAgIGNoZWNrTGF5b3V0KCcjaWQ4Jyk7Cisg ICAgICAgIDwvc2NyaXB0PgorICAgIDwvYm9keT4KKzwvaHRtbD4K 197404 2013-04-10 14:21:28 -0700 2013-04-11 12:15:47 -0700 Patch bug-114311-20130410222053.patch text/plain 7091 robert U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ4MDMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzFiNTY2Y2JiM2Y1ZWRh NzMxMTUxOWJmNjczYzZlN2Q5ZDBmZDA1OS4uY2FhYzA0NzcwNzk3ZmUzOGIwMGJjMjE5ZTc0NzQ1 NzVhYTFjY2JiZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEzLTA0LTEwICBSb2Jl cnQgSG9nYW4gIDxyb2JlcnRAd2Via2l0Lm9yZz4KKworICAgICAgICBSRUdSRVNTSU9OICgxNDIx NTIpOiBlbnN1cmUgd2Ugc2tpcCBwYXN0IG91dC1vZi1mbG93IG9iamVjdHMgd2hlbiBkZXRlY3Rp bmcgd2hpdGVzcGFjZSB0byBpZ25vcmUgYWZ0ZXIgbGVhZGluZyBlbXB0eSBpbmxpbmVzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTQzMTEKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIHdlIGhpdCBh biBlbXB0eSBpbmxpbmUgaW4gbGluZSBsYXlvdXQgYW5kIHRyeSB0byBkZXRlY3Qgd2hldGhlciBp dCBoYXMgYW55IHdoaXRlc3BhY2UgYWZ0ZXIgaXQgdGhhdCB3ZSBvdWdodCB0byBpZ25vcmUsIHRo ZW4KKyAgICAgICAgd2UgbmVlZCB0byBza2lwIHBhc3Qgb3V0LW9mLWZsb3cgYW5kIGZsb2F0aW5n IG9iamVjdHMgd2hlbiBsb29raW5nIGZvciB0aGF0IHdoaXRlc3BhY2UuIEZhaWx1cmUgdG8gZG8g c28gd2lsbCByZXN1bHQgaW4gdXMKKyAgICAgICAgYWRkaW5nIHRoZSB3aWR0aCBmcm9tIHRoZSBm aXJzdCBzcGFjZSB3ZSBlbmNvdW50ZXIgdG8gb3VyIGxpbmUgd2lkdGggYW5kIG92ZXItZXN0aW1h dGluZyB0aGUgcmVhbCB3aWR0aCBvZiB0aGUgbGluZS4KKworICAgICAgICBXZSdyZSBoaXR0aW5n IHRoaXMgYnVnIG5vdyBiZWNhdXNlIHdlIGhhdmUgYnJvYWRlbmVkIHRoZSBjYXRlZ29yeSBvZiBl bXB0eSBpbmxpbmVzIHRoYXQgZ2V0IGxpbmVib3hlcyBzbyB3ZSBnbyBpbnRvIGxpbmUgbGF5b3V0 IAorICAgICAgICBhbmQgaGF2ZSB0byBkZWFsIHdpdGggdGhlbSBhbmQgdGhlaXIgc3Vic2VxdWVu dCB3aGl0ZXNwYWNlIHRoZXJlLiBQcmV2aW91c2x5IHRoaXMgc29ydCBvZiB3aGl0ZXNwYWNlIHdv dWxkIGhhdmUgYmVlbiBzaW1wbHkKKyAgICAgICAgY29uc3VtZWQgYnkgfHNraXBMZWFkaW5nV2hp dGVzcGFjZXwuCisKKyAgICAgICAgVGVzdDogZmFzdC9pbmxpbmUvb3V0LW9mLWZsb3ctb2JqZWN0 cy1hbmQtd2hpdGVzcGFjZS1hZnRlci1lbXB0eS1pbmxpbmUuaHRtbAorCisgICAgICAgICogcmVu ZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpzaG91 bGRTa2lwV2hpdGVzcGFjZUFmdGVyU3RhcnRPYmplY3QpOgorCiAyMDEzLTA0LTA5ICBBbmRyZWFz IEtsaW5nICA8YWtsaW5nQGFwcGxlLmNvbT4KIAogICAgICAgICBUaHJvdHRsZSByZXNpemUgZXZl bnRzIGR1cmluZyBsaXZlIHdpbmRvdyByZXNpemUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3BwCmluZGV4IGFmNWNhMDBkZjYyNTg1NTBj ZWJlYWRmYzNlYTI3ZGVkM2I5ODQxZTcuLjVjYmVkMmM4NGNhMzE1NzA0YjU4NTE5NjE2N2U4ZmVl NTdhN2UzZGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9j a0xpbmVMYXlvdXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9j a0xpbmVMYXlvdXQuY3BwCkBAIC0yNDEyLDYgKzI0MTIsOSBAQCB2b2lkIFJlbmRlckJsb2NrOjpM aW5lQnJlYWtlcjo6c2tpcExlYWRpbmdXaGl0ZXNwYWNlKElubGluZUJpZGlSZXNvbHZlciYgcmVz b2x2ZQogc3RhdGljIGJvb2wgc2hvdWxkU2tpcFdoaXRlc3BhY2VBZnRlclN0YXJ0T2JqZWN0KFJl bmRlckJsb2NrKiBibG9jaywgUmVuZGVyT2JqZWN0KiBvLCBMaW5lTWlkcG9pbnRTdGF0ZSYgbGlu ZU1pZHBvaW50U3RhdGUpCiB7CiAgICAgUmVuZGVyT2JqZWN0KiBuZXh0ID0gYmlkaU5leHRTa2lw cGluZ0VtcHR5SW5saW5lcyhibG9jaywgbyk7CisgICAgd2hpbGUgKG5leHQgJiYgbmV4dC0+aXNG bG9hdGluZ09yT3V0T2ZGbG93UG9zaXRpb25lZCgpKQorICAgICAgICBuZXh0ID0gYmlkaU5leHRT a2lwcGluZ0VtcHR5SW5saW5lcyhibG9jaywgbmV4dCk7CisKICAgICBpZiAobmV4dCAmJiAhbmV4 dC0+aXNCUigpICYmIG5leHQtPmlzVGV4dCgpICYmIHRvUmVuZGVyVGV4dChuZXh0KS0+dGV4dExl bmd0aCgpID4gMCkgewogICAgICAgICBSZW5kZXJUZXh0KiBuZXh0VGV4dCA9IHRvUmVuZGVyVGV4 dChuZXh0KTsKICAgICAgICAgVUNoYXIgbmV4dENoYXIgPSBuZXh0VGV4dC0+Y2hhcmFjdGVyQXQo MCk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cKaW5kZXggZjc0NmI1OTAxYjU4M2U2ZGM0OWVlMjY5NThjMjlkOTk5MTc3ZTFiYy4uYmNm NzIzMGY2YmM1M2IyODFjNDM3OTZlZjc2ODA2NDZmMTg3ODcyYSAxMDA2NDQKLS0tIGEvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEz IEBACisyMDEzLTA0LTEwICBSb2JlcnQgSG9nYW4gIDxyb2JlcnRAd2Via2l0Lm9yZz4KKworICAg ICAgICBSRUdSRVNTSU9OICgxNDIxNTIpOiBlbnN1cmUgd2Ugc2tpcCBwYXN0IG91dC1vZi1mbG93 IG9iamVjdHMgd2hlbiBkZXRlY3Rpbmcgd2hpdGVzcGFjZSB0byBpZ25vcmUgYWZ0ZXIgbGVhZGlu ZyBlbXB0eSBpbmxpbmVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMTQzMTEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIGZhc3QvaW5saW5lL291dC1vZi1mbG93LW9iamVjdHMtYW5kLXdoaXRlc3BhY2Ut YWZ0ZXItZW1wdHktaW5saW5lLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZmFzdC9p bmxpbmUvb3V0LW9mLWZsb3ctb2JqZWN0cy1hbmQtd2hpdGVzcGFjZS1hZnRlci1lbXB0eS1pbmxp bmUuaHRtbDogQWRkZWQuCisKIDIwMTMtMDQtMDkgIEFybmF1ZCBSZW5ldmllciAgPGEucmVuZXZp ZXJAc2lzYS5zYW1zdW5nLmNvbT4KIAogICAgICAgICBXaGl0ZXNwYWNlIGluIHBhcnRpY3VsYXIg c291cmNlIGNvZGUgY2hhbmdlcyByZW5kZXJpbmc7IGRvZXMgbm90IGluIEZpcmVmb3gKZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvaW5saW5lL291dC1vZi1mbG93LW9iamVjdHMtYW5kLXdo aXRlc3BhY2UtYWZ0ZXItZW1wdHktaW5saW5lLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zh c3QvaW5saW5lL291dC1vZi1mbG93LW9iamVjdHMtYW5kLXdoaXRlc3BhY2UtYWZ0ZXItZW1wdHkt aW5saW5lLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi42M2U3NDM3YjVkZGEyMmZiNTc4M2MxNzli ZDk3NmJiY2JiYTQ0NDZiCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9pbmxp bmUvb3V0LW9mLWZsb3ctb2JqZWN0cy1hbmQtd2hpdGVzcGFjZS1hZnRlci1lbXB0eS1pbmxpbmUt ZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMTkgQEAKK3dlYmtpdC5vcmcvcC8xMTQzMTE6IFRoZSB0 ZXh0IHNob3VsZCBiZSBpbnNpZGUgdGhlIGlucHV0IGNvbnRyb2xzLgorCitJbnB1dCAKK1BBU1MK K0lucHV0IAorUEFTUworSW5wdXQgCitQQVNTCitJbnB1dCAKK1BBU1MKK0lucHV0CitQQVNTCitJ bnB1dAorUEFTUworSW5wdXQgCitQQVNTCitJbnB1dCAKK1BBU1MKKwpkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvZmFzdC9pbmxpbmUvb3V0LW9mLWZsb3ctb2JqZWN0cy1hbmQtd2hpdGVzcGFjZS1h ZnRlci1lbXB0eS1pbmxpbmUuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvaW5saW5lL291dC1vZi1m bG93LW9iamVjdHMtYW5kLXdoaXRlc3BhY2UtYWZ0ZXItZW1wdHktaW5saW5lLmh0bWwKbmV3IGZp bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMC4uNDZkYTIyN2I2MzU4YmM3MDMwNmQxNWQwYjcxYzZmMjZkYjU4NjFjOQotLS0gL2Rldi9u dWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvaW5saW5lL291dC1vZi1mbG93LW9iamVjdHMtYW5k LXdoaXRlc3BhY2UtYWZ0ZXItZW1wdHktaW5saW5lLmh0bWwKQEAgLTAsMCArMSw1NiBAQAorPCFE T0NUWVBFIGh0bWw+Cis8aHRtbD4KKyAgICA8aGVhZD4KKyAgICAgICAgPHN0eWxlPgorICAgICAg ICAgICAgYm9keSA+IHNwYW4geworICAgICAgICAgICAgICAgIGRpc3BsYXk6IGlubGluZS1ibG9j azsKKyAgICAgICAgICAgICAgICB2ZXJ0aWNhbC1hbGlnbjogdG9wOworICAgICAgICAgICAgICAg IGZvbnQ6IDIwcHgvMSBBaGVtOworICAgICAgICAgICAgfQorICAgICAgICAgICAgLmNvbnRhaW5l ci1hYnNvbHV0ZSA+IGxhYmVsID4gc3BhbiB7CisgICAgICAgICAgICAgICAgcGFkZGluZzogNXB4 OworICAgICAgICAgICAgICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKKyAgICAgICAgICAgIH0KKyAg ICAgICAgICAgIC5jb250YWluZXItZmxvYXQgPiBsYWJlbCA+IHNwYW4geworICAgICAgICAgICAg ICAgIHBhZGRpbmc6IDVweDsKKyAgICAgICAgICAgICAgICBmbG9hdDogbGVmdDsKKyAgICAgICAg ICAgIH0KKyAgICAgICAgICAgIGlucHV0IHsKKyAgICAgICAgICAgICAgICBib3JkZXItdG9wOiAw cHg7CisgICAgICAgICAgICAgICAgYm9yZGVyLWJvdHRvbTogMHB4OworICAgICAgICAgICAgICAg IG1hcmdpbi10b3A6IDBweDsKKyAgICAgICAgICAgICAgICBtYXJnaW4tYm90dG9tOiAwcHg7Cisg ICAgICAgICAgICAgICAgcGFkZGluZy10b3A6IDBweDsKKyAgICAgICAgICAgICAgICBwYWRkaW5n LWJvdHRvbTogMHB4OworICAgICAgICAgICAgfQorICAgICAgICA8L3N0eWxlPgorICAgICAgICA8 c2NyaXB0IHNyYz0iLi4vLi4vcmVzb3VyY2VzL2NoZWNrLWxheW91dC5qcyI+PC9zY3JpcHQ+Cisg ICAgPC9oZWFkPgorICAgIDxib2R5PgorICAgICAgICA8cD53ZWJraXQub3JnL3AvMTE0MzExOiBU aGUgdGV4dCBzaG91bGQgYmUgaW5zaWRlIHRoZSBpbnB1dCBjb250cm9scy4gPC9wPgorICAgICAg ICA8c3BhbiBpZD0iaWQxIiBjbGFzcz0iY29udGFpbmVyLWFic29sdXRlIiBkYXRhLWV4cGVjdGVk LWhlaWdodD0iMjBweCI+PGxhYmVsIGZvcj0iaW5wdXQtZmllbGQiPjxzcGFuPklucHV0PC9zcGFu PjwvbGFiZWw+ICAgIDxpbnB1dCBpZD0iaW5wdXQtZmllbGQiIHR5cGU9InRleHQiPjwvc3Bhbj4K KyAgICAgICAgPHNwYW4gaWQ9ImlkMiIgY2xhc3M9ImNvbnRhaW5lci1mbG9hdCIgZGF0YS1leHBl Y3RlZC1oZWlnaHQ9IjMwcHgiPjxsYWJlbCBmb3I9ImlucHV0LWZpZWxkIj48c3Bhbj5JbnB1dDwv c3Bhbj48L2xhYmVsPiAgICA8aW5wdXQgaWQ9ImlucHV0LWZpZWxkIiB0eXBlPSJ0ZXh0Ij48L3Nw YW4+CisgICAgICAgIDxzcGFuIGlkPSJpZDMiIGNsYXNzPSJjb250YWluZXItYWJzb2x1dGUiIGRh dGEtZXhwZWN0ZWQtaGVpZ2h0PSIyMHB4Ij48bGFiZWwgZm9yPSJpbnB1dC1maWVsZCI+PHNwYW4+ SW5wdXQ8L3NwYW4+PC9sYWJlbD4gPGlucHV0IGlkPSJpbnB1dC1maWVsZCIgdHlwZT0idGV4dCI+ PC9zcGFuPgorICAgICAgICA8c3BhbiBpZD0iaWQ0IiBjbGFzcz0iY29udGFpbmVyLWZsb2F0IiBk YXRhLWV4cGVjdGVkLWhlaWdodD0iMzBweCI+PGxhYmVsIGZvcj0iaW5wdXQtZmllbGQiPjxzcGFu PklucHV0PC9zcGFuPjwvbGFiZWw+IDxpbnB1dCBpZD0iaW5wdXQtZmllbGQiIHR5cGU9InRleHQi Pjwvc3Bhbj4KKyAgICAgICAgPHNwYW4gaWQ9ImlkNSIgY2xhc3M9ImNvbnRhaW5lci1hYnNvbHV0 ZSIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjIwcHgiPjxsYWJlbCBmb3I9ImlucHV0LWZpZWxkIj48 c3Bhbj5JbnB1dDwvc3Bhbj48L2xhYmVsPjxpbnB1dCBpZD0iaW5wdXQtZmllbGQiIHR5cGU9InRl eHQiPjwvc3Bhbj4KKyAgICAgICAgPHNwYW4gaWQ9ImlkNiIgY2xhc3M9ImNvbnRhaW5lci1mbG9h dCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjMwcHgiPjxsYWJlbCBmb3I9ImlucHV0LWZpZWxkIj48 c3Bhbj5JbnB1dDwvc3Bhbj48L2xhYmVsPjxpbnB1dCBpZD0iaW5wdXQtZmllbGQiIHR5cGU9InRl eHQiPjwvc3Bhbj4KKyAgICAgICAgPHNwYW4gaWQ9ImlkNyIgY2xhc3M9ImNvbnRhaW5lci1hYnNv bHV0ZSIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjIwcHgiPgorICAgICAgICAgICAgPGxhYmVsIGZv cj0iaW5wdXQtZmllbGQiPjxzcGFuPklucHV0PC9zcGFuPjwvbGFiZWw+CisgICAgICAgICAgICA8 aW5wdXQgaWQ9ImlucHV0LWZpZWxkIiB0eXBlPSJ0ZXh0Ij4KKyAgICAgICAgPC9zcGFuPgorICAg ICAgICA8c3BhbiBpZD0iaWQ4IiBjbGFzcz0iY29udGFpbmVyLWZsb2F0IiBkYXRhLWV4cGVjdGVk LWhlaWdodD0iMzBweCI+CisgICAgICAgICAgICA8bGFiZWwgZm9yPSJpbnB1dC1maWVsZCI+PHNw YW4+SW5wdXQ8L3NwYW4+PC9sYWJlbD4KKyAgICAgICAgICAgIDxpbnB1dCBpZD0iaW5wdXQtZmll bGQiIHR5cGU9InRleHQiPgorICAgICAgICA8L3NwYW4+CisgICAgICAgIDxzY3JpcHQ+CisgICAg ICAgICAgICBjaGVja0xheW91dCgnI2lkMScpOworICAgICAgICAgICAgY2hlY2tMYXlvdXQoJyNp ZDInKTsKKyAgICAgICAgICAgIGNoZWNrTGF5b3V0KCcjaWQzJyk7CisgICAgICAgICAgICBjaGVj a0xheW91dCgnI2lkNCcpOworICAgICAgICAgICAgY2hlY2tMYXlvdXQoJyNpZDUnKTsKKyAgICAg ICAgICAgIGNoZWNrTGF5b3V0KCcjaWQ2Jyk7CisgICAgICAgICAgICBjaGVja0xheW91dCgnI2lk NycpOworICAgICAgICAgICAgY2hlY2tMYXlvdXQoJyNpZDgnKTsKKyAgICAgICAgPC9zY3JpcHQ+ CisgICAgPC9ib2R5PgorPC9odG1sPgo=