48497 2010-10-27 20:31:10 -0700 Avoid overlapping label text in autofill popup with icon 2010-11-02 17:25:31 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 isherman isherman commit-queue dglazkov fishd isherman jcivelli jorlow krit rniwa tkent webkit.review.bot zimmermann oldest_to_newest 300842 0 isherman 2010-10-27 20:31:10 -0700 Avoid overlapping label text in autocomplete popup with icon 300843 1 72134 isherman 2010-10-27 20:35:21 -0700 Created attachment 72134 Patch 300847 2 isherman 2010-10-27 20:40:02 -0700 paintRow() probably also needs to updated to take the icon width into account for the |restrictWidthOfListBox| case. It's not entirely obvious to me how that should work -- should the label take precedence to the icon, or vice versa? If there are multiple rows and only some of the rows have overflow, what alignment do we want across the rows? This could probably also use a layout test, but I couldn't find any existing layout tests for these functions. Could someone please point me in the right direction? 300848 3 isherman 2010-10-27 20:43:17 -0700 I should have mentioned -- this corresponds to Chromium bug 60096: http://code.google.com/p/chromium/issues/detail?id=60096 301120 4 jcivelli 2010-10-28 09:52:36 -0700 View in context: https://bugs.webkit.org/attachment.cgi?id=72134&action=review > WebCore/platform/chromium/PopupMenuChromium.cpp:1272 > + if (width > 0) 4 space indent > WebCore/platform/chromium/PopupMenuChromium.cpp:1277 > + We should probably take into account the icon when computing the row height. 301501 5 72274 isherman 2010-10-28 17:52:04 -0700 Created attachment 72274 Patch, addressing Jay's comments 301510 6 72274 isherman 2010-10-28 18:03:50 -0700 Comment on attachment 72274 Patch, addressing Jay's comments New patch up, addressing Jay's review comments 301768 7 webkit.review.bot 2010-10-29 08:16:40 -0700 Attachment 72274 did not build on chromium: Build output: http://queues.webkit.org/results/4830078 301777 8 jcivelli 2010-10-29 08:36:48 -0700 I am not a reviewer but R+ for me. 302609 9 72274 tkent 2010-11-01 05:46:57 -0700 Comment on attachment 72274 Patch, addressing Jay's comments View in context: https://bugs.webkit.org/attachment.cgi?id=72274&action=review > WebCore/ChangeLog:741 > +2010-10-27 Ilya Sherman <isherman@chromium.org> New ChangeLog entry should be at the beginning of the file. > WebCore/platform/chromium/PopupMenuChromium.cpp:1278 > + width += kLabelToIconPadding; We don't use "k" prefix in WebKit style. I understand this symbol is not introduced by this patch. So you don't need to address this issue for now. 302813 10 72531 isherman 2010-11-01 11:41:15 -0700 Created attachment 72531 Patch I think I uploaded an old version of the patch somehow last time; hoping things work better this time 302816 11 72532 isherman 2010-11-01 11:46:12 -0700 Created attachment 72532 Patch Third time's the charm? 302917 12 72532 tkent 2010-11-01 14:12:22 -0700 Comment on attachment 72532 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=72532&action=review > WebCore/ChangeLog:9 > + No new tests. (OOPS!) Remove this line please. 302969 13 isherman 2010-11-01 15:00:42 -0700 (In reply to comment #12) > (From update of attachment 72532 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=72532&action=review > > > WebCore/ChangeLog:9 > > + No new tests. (OOPS!) > > Remove this line please. Does that mean this patch doesn't need any tests? I'd figured that we want tests, but wasn't sure where to add them and what to use as a starting point... 303057 14 72532 tkent 2010-11-01 16:32:20 -0700 Comment on attachment 72532 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=72532&action=review >>> WebCore/ChangeLog:9 >>> + No new tests. (OOPS!) >> >> Remove this line please. > > Does that mean this patch doesn't need any tests? I'd figured that we want tests, but wasn't sure where to add them and what to use as a starting point... Of course we should have tests as possible. I meant we should remove (OOPS!) except "Reviewed by" line. Commit-queue rejects a patch with (OOPS!). We already have WebKit/chromium/tests/PopupMenuTest.cpp, but I think it's difficult to add a test for this change in WebKit. So I think it's ok to have no tests. 303393 15 72675 isherman 2010-11-02 09:01:03 -0700 Created attachment 72675 Patch 303395 16 isherman 2010-11-02 09:02:29 -0700 (In reply to comment #14) > (From update of attachment 72532 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=72532&action=review > > >>> WebCore/ChangeLog:9 > >>> + No new tests. (OOPS!) > >> > >> Remove this line please. > > > > Does that mean this patch doesn't need any tests? I'd figured that we want tests, but wasn't sure where to add them and what to use as a starting point... > > Of course we should have tests as possible. I meant we should remove (OOPS!) except "Reviewed by" line. Commit-queue rejects a patch with (OOPS!). > > We already have WebKit/chromium/tests/PopupMenuTest.cpp, but I think it's difficult to add a test for this change in WebKit. So I think it's ok to have no tests. Ok, removed. 303810 17 72675 commit-queue 2010-11-02 17:25:24 -0700 Comment on attachment 72675 Patch Clearing flags on attachment: 72675 Committed r71191: <http://trac.webkit.org/changeset/71191> 303811 18 commit-queue 2010-11-02 17:25:31 -0700 All reviewed patches have been landed. Closing bug. 72134 2010-10-27 20:35:21 -0700 2010-10-28 17:51:48 -0700 Patch bug-48497-20101027203520.patch text/plain 3644 isherman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg OWNiNDNkOWI0ODg2YzYyYzUyYTc2NjM3MTA1NGI0NGU2ZDk1ZTM4Yi4uOTEyOTljODEwY2YyZDk5 OGVjMzMyMThjMzVhNmQ5ZTFlMGRmZmJmNiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMC0xMC0yNyAgSWx5 YSBTaGVybWFuICA8aXNoZXJtYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEF2b2lkIG92ZXJsYXBwaW5nIGxhYmVsIHRleHQg aW4gYXV0b2ZpbGwgcG9wdXAgd2l0aCBpY29uLgorICAgICAgICBVcGRhdGVzIHRoZSBtZW51IHdp ZHRoIGNvbXB1dGF0aW9uIHRvIHRha2UgdGhlIGljb24gd2lkdGggaW50byBhY2NvdW50LgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDg0OTcKKworICAg ICAgICBObyBuZXcgdGVzdHMuIChPT1BTISkKKworICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVt L1BvcHVwTWVudUNocm9taXVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBvcHVwTGlzdEJveDo6 cGFpbnRSb3cpOgorICAgICAgICAoV2ViQ29yZTo6UG9wdXBMaXN0Qm94OjpsYXlvdXQpOgorCiAy MDEwLTEwLTI3ICBFbnJpY2EgQ2FzdWNjaSAgPGVucmljYUBhcHBsZS5jb20+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgQWxleGV5IFByb3NrdXJ5YWtvdi4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxh dGZvcm0vY2hyb21pdW0vUG9wdXBNZW51Q2hyb21pdW0uY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9j aHJvbWl1bS9Qb3B1cE1lbnVDaHJvbWl1bS5jcHAKaW5kZXggM2M4MDdiYTEwOGFhZGVjMzdiMWJl NWRiNTFkMGFiYzE0MGQ3ZGUyMy4uNjRmZjY0NTdhY2Y1ODJhOTJlODAwNTc4MzIwYTk5NzVjNjlj YTRjYyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9Qb3B1cE1lbnVDaHJv bWl1bS5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9Qb3B1cE1lbnVDaHJvbWl1 bS5jcHAKQEAgLTkyNywxNSArOTI3LDE2IEBAIHZvaWQgUG9wdXBMaXN0Qm94OjpwYWludFJvdyhH cmFwaGljc0NvbnRleHQqIGdjLCBjb25zdCBJbnRSZWN0JiByZWN0LCBpbnQgcm93SW5kCiAgICAg Ly8gUHJlcGFyZSB0ZXh0IHRvIGJlIGRyYXduLgogICAgIFN0cmluZyBpdGVtVGV4dCA9IG1fcG9w dXBDbGllbnQtPml0ZW1UZXh0KHJvd0luZGV4KTsKICAgICBTdHJpbmcgaXRlbUxhYmVsID0gbV9w b3B1cENsaWVudC0+aXRlbUxhYmVsKHJvd0luZGV4KTsKKyAgICBTdHJpbmcgaXRlbUljb24gPSBt X3BvcHVwQ2xpZW50LT5pdGVtSWNvbihyb3dJbmRleCk7CiAgICAgaWYgKG1fc2V0dGluZ3MucmVz dHJpY3RXaWR0aE9mTGlzdEJveCkgeyAvLyBUcnVuY2F0ZSBzdHJpbmdzIHRvIGZpdCBpbi4KICAg ICAgICAgLy8gRklYTUU6IFdlIHNob3VsZCBsZWZ0VHJ1bmNhdGUgZm9yIHRoZSBydGwgY2FzZS4K ICAgICAgICAgLy8gU3RyaW5nVHJ1bmNhdG9yOjpsZWZ0VHJ1bmNhdGUgd291bGQgaGF2ZSB0byBi ZSBpbXBsZW1lbnRlZC4KICAgICAgICAgU3RyaW5nIHN0ciA9IFN0cmluZ1RydW5jYXRvcjo6cmln aHRUcnVuY2F0ZShpdGVtVGV4dCwgbWF4V2lkdGgsIGl0ZW1Gb250KTsKICAgICAgICAgaWYgKHN0 ciAhPSBpdGVtVGV4dCkgewogICAgICAgICAgICAgaXRlbVRleHQgPSBzdHI7Ci0gICAgICAgICAg ICAvLyBEb24ndCBkaXNwbGF5IHRoZSBsYWJlbCwgd2UgYWxyZWFkeSBkb24ndCBoYXZlIGVub3Vn aCByb29tIGZvciB0aGUKLSAgICAgICAgICAgIC8vIGl0ZW0gdGV4dC4KKyAgICAgICAgICAgIC8v IERvbid0IGRpc3BsYXkgdGhlIGxhYmVsIG9yIGljb24sIHdlIGFscmVhZHkgZG9uJ3QgaGF2ZSBl bm91Z2ggcm9vbSBmb3IgdGhlIGl0ZW0gdGV4dC4KICAgICAgICAgICAgIGl0ZW1MYWJlbCA9ICIi OworICAgICAgICAgICAgaXRlbUljb24gPSAiIjsKICAgICAgICAgfSBlbHNlIGlmICghaXRlbUxh YmVsLmlzRW1wdHkoKSkgewogICAgICAgICAgICAgaW50IGF2YWlsYWJsZVdpZHRoID0gbWF4V2lk dGggLSBrVGV4dFRvTGFiZWxQYWRkaW5nIC0KICAgICAgICAgICAgICAgICBTdHJpbmdUcnVuY2F0 b3I6OndpZHRoKGl0ZW1UZXh0LCBpdGVtRm9udCk7CkBAIC05NjYsNyArOTY3LDYgQEAgdm9pZCBQ b3B1cExpc3RCb3g6OnBhaW50Um93KEdyYXBoaWNzQ29udGV4dCogZ2MsIGNvbnN0IEludFJlY3Qm IHJlY3QsIGludCByb3dJbmQKICAgICBpbnQgcmVtYWluaW5nV2lkdGggPSByb3dSZWN0LndpZHRo KCkgLSByaWdodFBhZGRpbmc7CiAKICAgICAvLyBEcmF3IHRoZSBpY29uIGlmIGFwcGxpY2FibGUu Ci0gICAgU3RyaW5nIGl0ZW1JY29uID0gbV9wb3B1cENsaWVudC0+aXRlbUljb24ocm93SW5kZXgp OwogICAgIFJlZlB0cjxJbWFnZT4gaW1hZ2UoSW1hZ2U6OmxvYWRQbGF0Zm9ybVJlc291cmNlKGl0 ZW1JY29uLnV0ZjgoKS5kYXRhKCkpKTsKICAgICBpZiAoaW1hZ2UgJiYgIWltYWdlLT5pc051bGwo KSkgewogICAgICAgICBJbnRSZWN0IGltYWdlUmVjdCA9IGltYWdlLT5yZWN0KCk7CkBAIC0xMjU3 LDYgKzEyNTcsNyBAQCB2b2lkIFBvcHVwTGlzdEJveDo6bGF5b3V0KCkKICAgICAgICAgLy8gRW5z dXJlIHRoZSBwb3B1cCBpcyB3aWRlIGVub3VnaCB0byBmaXQgdGhpcyBpdGVtLgogICAgICAgICBT dHJpbmcgdGV4dCA9IG1fcG9wdXBDbGllbnQtPml0ZW1UZXh0KGkpOwogICAgICAgICBTdHJpbmcg bGFiZWwgPSBtX3BvcHVwQ2xpZW50LT5pdGVtTGFiZWwoaSk7CisgICAgICAgIFN0cmluZyBpY29u ID0gbV9wb3B1cENsaWVudC0+aXRlbUljb24oaSk7CiAgICAgICAgIGludCB3aWR0aCA9IDA7CiAg ICAgICAgIGlmICghdGV4dC5pc0VtcHR5KCkpCiAgICAgICAgICAgICB3aWR0aCA9IGl0ZW1Gb250 LndpZHRoKFRleHRSdW4odGV4dCkpOwpAQCAtMTI2NSw2ICsxMjY2LDE1IEBAIHZvaWQgUG9wdXBM aXN0Qm94OjpsYXlvdXQoKQogICAgICAgICAgICAgICAgIHdpZHRoICs9IGtUZXh0VG9MYWJlbFBh ZGRpbmc7CiAgICAgICAgICAgICB3aWR0aCArPSBpdGVtRm9udC53aWR0aChUZXh0UnVuKGxhYmVs KSk7CiAgICAgICAgIH0KKyAgICAgICAgaWYgKCFpY29uLmlzRW1wdHkoKSkgeworICAgICAgICAg ICAgUmVmUHRyPEltYWdlPiBpbWFnZShJbWFnZTo6bG9hZFBsYXRmb3JtUmVzb3VyY2UoaWNvbi51 dGY4KCkuZGF0YSgpKSk7CisgICAgICAgICAgICBpZiAoaW1hZ2UgJiYgIWltYWdlLT5pc051bGwo KSkgeworICAgICAgICAgICAgICBpZiAod2lkdGggPiAwKQorICAgICAgICAgICAgICAgICAgd2lk dGggKz0ga0xhYmVsVG9JY29uUGFkZGluZzsKKyAgICAgICAgICAgICAgd2lkdGggKz0gaW1hZ2Ut PnJlY3QoKS53aWR0aCgpOworICAgICAgICAgICAgfQorICAgICAgICB9CisKICAgICAgICAgYmFz ZVdpZHRoID0gbWF4KGJhc2VXaWR0aCwgd2lkdGgpOwogICAgICAgICAvLyBGSVhNRTogaHR0cDov L2IvMTIxMDQ4MSBXZSBzaG91bGQgZ2V0IHRoZSBwYWRkaW5nIG9mIGluZGl2aWR1YWwgb3B0aW9u IGVsZW1lbnRzLgogICAgICAgICBwYWRkaW5nV2lkdGggPSBtYXgocGFkZGluZ1dpZHRoLAo= 72274 2010-10-28 17:52:04 -0700 2010-11-01 11:41:11 -0700 Patch, addressing Jay's comments bug-48497-20101028175202.patch text/plain 4200 isherman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NDAyNzQwNzY4NjM3Y2M5YmYzN2RjNGExY2IyNjk2N2JkMDZhMWRkYS4uMGM4ZTMzODY1MTBlNGMy MDg4NTU1YTI3MTI2OTVlN2M5ODUxODk3MCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTczOCw2ICs3MzgsMjAgQEAKICAgICAgICAgKFdl YkNvcmU6OkF1ZGlvRFNQS2VybmVsOjpBdWRpb0RTUEtlcm5lbCk6CiAgICAgICAgIChXZWJDb3Jl OjpBdWRpb0RTUEtlcm5lbDo6c2FtcGxlUmF0ZSk6CiAKKzIwMTAtMTAtMjcgIElseWEgU2hlcm1h biAgPGlzaGVybWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBBdm9pZCBvdmVybGFwcGluZyBsYWJlbCB0ZXh0IGluIGF1dG9m aWxsIHBvcHVwIHdpdGggaWNvbi4KKyAgICAgICAgVXBkYXRlcyB0aGUgbWVudSB3aWR0aCBjb21w dXRhdGlvbiB0byB0YWtlIHRoZSBpY29uIHdpZHRoIGludG8gYWNjb3VudC4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ4NDk3CisKKyAgICAgICAgTm8g bmV3IHRlc3RzLiAoT09QUyEpCisKKyAgICAgICAgKiBwbGF0Zm9ybS9jaHJvbWl1bS9Qb3B1cE1l bnVDaHJvbWl1bS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQb3B1cExpc3RCb3g6OnBhaW50Um93 KToKKyAgICAgICAgKFdlYkNvcmU6OlBvcHVwTGlzdEJveDo6bGF5b3V0KToKKwogMjAxMC0xMC0y NyAgRW5yaWNhIENhc3VjY2kgIDxlbnJpY2FAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2Vk IGJ5IEFsZXhleSBQcm9za3VyeWFrb3YuCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2No cm9taXVtL1BvcHVwTWVudUNocm9taXVtLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0v UG9wdXBNZW51Q2hyb21pdW0uY3BwCmluZGV4IDNjODA3YmExMDhhYWRlYzM3YjFiZTVkYjUxZDBh YmMxNDBkN2RlMjMuLmQ2NzMzOWI5YWUyZWU5ZGU0MGU1NjdmMzQ0YzBjZWNlOWVlNmJlZTggMTAw NjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUG9wdXBNZW51Q2hyb21pdW0uY3Bw CisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUG9wdXBNZW51Q2hyb21pdW0uY3BwCkBA IC05MjcsMTUgKzkyNywxNiBAQCB2b2lkIFBvcHVwTGlzdEJveDo6cGFpbnRSb3coR3JhcGhpY3ND b250ZXh0KiBnYywgY29uc3QgSW50UmVjdCYgcmVjdCwgaW50IHJvd0luZAogICAgIC8vIFByZXBh cmUgdGV4dCB0byBiZSBkcmF3bi4KICAgICBTdHJpbmcgaXRlbVRleHQgPSBtX3BvcHVwQ2xpZW50 LT5pdGVtVGV4dChyb3dJbmRleCk7CiAgICAgU3RyaW5nIGl0ZW1MYWJlbCA9IG1fcG9wdXBDbGll bnQtPml0ZW1MYWJlbChyb3dJbmRleCk7CisgICAgU3RyaW5nIGl0ZW1JY29uID0gbV9wb3B1cENs aWVudC0+aXRlbUljb24ocm93SW5kZXgpOwogICAgIGlmIChtX3NldHRpbmdzLnJlc3RyaWN0V2lk dGhPZkxpc3RCb3gpIHsgLy8gVHJ1bmNhdGUgc3RyaW5ncyB0byBmaXQgaW4uCiAgICAgICAgIC8v IEZJWE1FOiBXZSBzaG91bGQgbGVmdFRydW5jYXRlIGZvciB0aGUgcnRsIGNhc2UuCiAgICAgICAg IC8vIFN0cmluZ1RydW5jYXRvcjo6bGVmdFRydW5jYXRlIHdvdWxkIGhhdmUgdG8gYmUgaW1wbGVt ZW50ZWQuCiAgICAgICAgIFN0cmluZyBzdHIgPSBTdHJpbmdUcnVuY2F0b3I6OnJpZ2h0VHJ1bmNh dGUoaXRlbVRleHQsIG1heFdpZHRoLCBpdGVtRm9udCk7CiAgICAgICAgIGlmIChzdHIgIT0gaXRl bVRleHQpIHsKICAgICAgICAgICAgIGl0ZW1UZXh0ID0gc3RyOwotICAgICAgICAgICAgLy8gRG9u J3QgZGlzcGxheSB0aGUgbGFiZWwsIHdlIGFscmVhZHkgZG9uJ3QgaGF2ZSBlbm91Z2ggcm9vbSBm b3IgdGhlCi0gICAgICAgICAgICAvLyBpdGVtIHRleHQuCisgICAgICAgICAgICAvLyBEb24ndCBk aXNwbGF5IHRoZSBsYWJlbCBvciBpY29uLCB3ZSBhbHJlYWR5IGRvbid0IGhhdmUgZW5vdWdoIHJv b20gZm9yIHRoZSBpdGVtIHRleHQuCiAgICAgICAgICAgICBpdGVtTGFiZWwgPSAiIjsKKyAgICAg ICAgICAgIGl0ZW1JY29uID0gIiI7CiAgICAgICAgIH0gZWxzZSBpZiAoIWl0ZW1MYWJlbC5pc0Vt cHR5KCkpIHsKICAgICAgICAgICAgIGludCBhdmFpbGFibGVXaWR0aCA9IG1heFdpZHRoIC0ga1Rl eHRUb0xhYmVsUGFkZGluZyAtCiAgICAgICAgICAgICAgICAgU3RyaW5nVHJ1bmNhdG9yOjp3aWR0 aChpdGVtVGV4dCwgaXRlbUZvbnQpOwpAQCAtOTY2LDcgKzk2Nyw2IEBAIHZvaWQgUG9wdXBMaXN0 Qm94OjpwYWludFJvdyhHcmFwaGljc0NvbnRleHQqIGdjLCBjb25zdCBJbnRSZWN0JiByZWN0LCBp bnQgcm93SW5kCiAgICAgaW50IHJlbWFpbmluZ1dpZHRoID0gcm93UmVjdC53aWR0aCgpIC0gcmln aHRQYWRkaW5nOwogCiAgICAgLy8gRHJhdyB0aGUgaWNvbiBpZiBhcHBsaWNhYmxlLgotICAgIFN0 cmluZyBpdGVtSWNvbiA9IG1fcG9wdXBDbGllbnQtPml0ZW1JY29uKHJvd0luZGV4KTsKICAgICBS ZWZQdHI8SW1hZ2U+IGltYWdlKEltYWdlOjpsb2FkUGxhdGZvcm1SZXNvdXJjZShpdGVtSWNvbi51 dGY4KCkuZGF0YSgpKSk7CiAgICAgaWYgKGltYWdlICYmICFpbWFnZS0+aXNOdWxsKCkpIHsKICAg ICAgICAgSW50UmVjdCBpbWFnZVJlY3QgPSBpbWFnZS0+cmVjdCgpOwpAQCAtMTA4OSw3ICsxMDg5 LDEzIEBAIGludCBQb3B1cExpc3RCb3g6OmdldFJvd0hlaWdodChpbnQgaW5kZXgpCiAgICAgaWYg KGluZGV4IDwgMCkKICAgICAgICAgcmV0dXJuIDA7CiAKLSAgICByZXR1cm4gZ2V0Um93Rm9udChp bmRleCkuaGVpZ2h0KCk7CisgICAgU3RyaW5nIGljb24gPSBtX3BvcHVwQ2xpZW50LT5pdGVtSWNv bihpKTsKKyAgICBSZWZQdHI8SW1hZ2U+IGltYWdlKEltYWdlOjpsb2FkUGxhdGZvcm1SZXNvdXJj ZShpY29uLnV0ZjgoKS5kYXRhKCkpKTsKKworICAgIGludCBmb250SGVpZ2h0ID0gZ2V0Um93Rm9u dChpbmRleCkuaGVpZ2h0KCk7CisgICAgaW50IGljb25IZWlnaHQgPSAoaW1hZ2UgJiYgIWltYWdl LT5pc051bGwoKSkgPyBpbWFnZS0+cmVjdCgpLmhlaWdodCgpIDogMDsKKworICAgIHJldHVybiBt YXgoZm9udEhlaWdodCwgaWNvbkhlaWdodCk7CiB9CiAKIEludFJlY3QgUG9wdXBMaXN0Qm94Ojpn ZXRSb3dCb3VuZHMoaW50IGluZGV4KQpAQCAtMTI1Nyw2ICsxMjYzLDggQEAgdm9pZCBQb3B1cExp c3RCb3g6OmxheW91dCgpCiAgICAgICAgIC8vIEVuc3VyZSB0aGUgcG9wdXAgaXMgd2lkZSBlbm91 Z2ggdG8gZml0IHRoaXMgaXRlbS4KICAgICAgICAgU3RyaW5nIHRleHQgPSBtX3BvcHVwQ2xpZW50 LT5pdGVtVGV4dChpKTsKICAgICAgICAgU3RyaW5nIGxhYmVsID0gbV9wb3B1cENsaWVudC0+aXRl bUxhYmVsKGkpOworICAgICAgICBTdHJpbmcgaWNvbiA9IG1fcG9wdXBDbGllbnQtPml0ZW1JY29u KGkpOworICAgICAgICBSZWZQdHI8SW1hZ2U+IGljb25JbWFnZShJbWFnZTo6bG9hZFBsYXRmb3Jt UmVzb3VyY2UoaWNvbi51dGY4KCkuZGF0YSgpKSk7CiAgICAgICAgIGludCB3aWR0aCA9IDA7CiAg ICAgICAgIGlmICghdGV4dC5pc0VtcHR5KCkpCiAgICAgICAgICAgICB3aWR0aCA9IGl0ZW1Gb250 LndpZHRoKFRleHRSdW4odGV4dCkpOwpAQCAtMTI2NSw2ICsxMjczLDEyIEBAIHZvaWQgUG9wdXBM aXN0Qm94OjpsYXlvdXQoKQogICAgICAgICAgICAgICAgIHdpZHRoICs9IGtUZXh0VG9MYWJlbFBh ZGRpbmc7CiAgICAgICAgICAgICB3aWR0aCArPSBpdGVtRm9udC53aWR0aChUZXh0UnVuKGxhYmVs KSk7CiAgICAgICAgIH0KKyAgICAgICAgaWYgKGljb25JbWFnZSAmJiAhaWNvbkltYWdlLT5pc051 bGwoKSkgeworICAgICAgICAgICAgaWYgKHdpZHRoID4gMCkKKyAgICAgICAgICAgICAgICB3aWR0 aCArPSBrTGFiZWxUb0ljb25QYWRkaW5nOworICAgICAgICAgICAgd2lkdGggKz0gaWNvbkltYWdl LT5yZWN0KCkud2lkdGgoKTsKKyAgICAgICAgfQorCiAgICAgICAgIGJhc2VXaWR0aCA9IG1heChi YXNlV2lkdGgsIHdpZHRoKTsKICAgICAgICAgLy8gRklYTUU6IGh0dHA6Ly9iLzEyMTA0ODEgV2Ug c2hvdWxkIGdldCB0aGUgcGFkZGluZyBvZiBpbmRpdmlkdWFsIG9wdGlvbiBlbGVtZW50cy4KICAg ICAgICAgcGFkZGluZ1dpZHRoID0gbWF4KHBhZGRpbmdXaWR0aCwK 72531 2010-11-01 11:41:15 -0700 2010-11-01 11:46:07 -0700 Patch bug-48497-20101101114114.patch text/plain 4166 isherman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZWE3NTllMjhjNDIyMzYwNmEwZjNiNWJlZDFiODYwYTNiNzU4ZDQ3Mi4uMWE4ZTliZDk5N2NhM2Vj ODg0YTZmMDJkNDUzZjE4ZjkyOWZhZjhiNyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTIyMzgsNiArMjIzOCwyMCBAQAogICAgICAgICAq IHBsYXRmb3JtL1VVSUQuY3BwOgogICAgICAgICAoV2ViQ29yZTo6Y3JlYXRlQ2Fub25pY2FsVVVJ RFN0cmluZyk6CiAKKzIwMTAtMTAtMjggIElseWEgU2hlcm1hbiAgPGlzaGVybWFuQGNocm9taXVt Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBB dm9pZCBvdmVybGFwcGluZyBsYWJlbCB0ZXh0IGluIGF1dG9maWxsIHBvcHVwIHdpdGggaWNvbi4K KyAgICAgICAgVXBkYXRlcyB0aGUgbWVudSB3aWR0aCBjb21wdXRhdGlvbiB0byB0YWtlIHRoZSBp Y29uIHdpZHRoIGludG8gYWNjb3VudC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTQ4NDk3CisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiAoT09QUyEpCisK KyAgICAgICAgKiBwbGF0Zm9ybS9jaHJvbWl1bS9Qb3B1cE1lbnVDaHJvbWl1bS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpQb3B1cExpc3RCb3g6OnBhaW50Um93KToKKyAgICAgICAgKFdlYkNvcmU6 OlBvcHVwTGlzdEJveDo6bGF5b3V0KToKKwogMjAxMC0xMC0yOCAgSmlhIFB1ICA8anB1QGFwcGxl LmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYW4gQmVybnN0ZWluLgpkaWZmIC0tZ2l0IGEv V2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9Qb3B1cE1lbnVDaHJvbWl1bS5jcHAgYi9XZWJDb3Jl L3BsYXRmb3JtL2Nocm9taXVtL1BvcHVwTWVudUNocm9taXVtLmNwcAppbmRleCAzYzgwN2JhMTA4 YWFkZWMzN2IxYmU1ZGI1MWQwYWJjMTQwZDdkZTIzLi4zZmY0ZmYwZGExYTA4NjNkNjA0ODg4M2Q0 ODM4MWVkYzE1NjYwNTgzIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1Bv cHVwTWVudUNocm9taXVtLmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1BvcHVw TWVudUNocm9taXVtLmNwcApAQCAtOTI3LDE1ICs5MjcsMTYgQEAgdm9pZCBQb3B1cExpc3RCb3g6 OnBhaW50Um93KEdyYXBoaWNzQ29udGV4dCogZ2MsIGNvbnN0IEludFJlY3QmIHJlY3QsIGludCBy b3dJbmQKICAgICAvLyBQcmVwYXJlIHRleHQgdG8gYmUgZHJhd24uCiAgICAgU3RyaW5nIGl0ZW1U ZXh0ID0gbV9wb3B1cENsaWVudC0+aXRlbVRleHQocm93SW5kZXgpOwogICAgIFN0cmluZyBpdGVt TGFiZWwgPSBtX3BvcHVwQ2xpZW50LT5pdGVtTGFiZWwocm93SW5kZXgpOworICAgIFN0cmluZyBp dGVtSWNvbiA9IG1fcG9wdXBDbGllbnQtPml0ZW1JY29uKHJvd0luZGV4KTsKICAgICBpZiAobV9z ZXR0aW5ncy5yZXN0cmljdFdpZHRoT2ZMaXN0Qm94KSB7IC8vIFRydW5jYXRlIHN0cmluZ3MgdG8g Zml0IGluLgogICAgICAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIGxlZnRUcnVuY2F0ZSBmb3IgdGhl IHJ0bCBjYXNlLgogICAgICAgICAvLyBTdHJpbmdUcnVuY2F0b3I6OmxlZnRUcnVuY2F0ZSB3b3Vs ZCBoYXZlIHRvIGJlIGltcGxlbWVudGVkLgogICAgICAgICBTdHJpbmcgc3RyID0gU3RyaW5nVHJ1 bmNhdG9yOjpyaWdodFRydW5jYXRlKGl0ZW1UZXh0LCBtYXhXaWR0aCwgaXRlbUZvbnQpOwogICAg ICAgICBpZiAoc3RyICE9IGl0ZW1UZXh0KSB7CiAgICAgICAgICAgICBpdGVtVGV4dCA9IHN0cjsK LSAgICAgICAgICAgIC8vIERvbid0IGRpc3BsYXkgdGhlIGxhYmVsLCB3ZSBhbHJlYWR5IGRvbid0 IGhhdmUgZW5vdWdoIHJvb20gZm9yIHRoZQotICAgICAgICAgICAgLy8gaXRlbSB0ZXh0LgorICAg ICAgICAgICAgLy8gRG9uJ3QgZGlzcGxheSB0aGUgbGFiZWwgb3IgaWNvbiwgd2UgYWxyZWFkeSBk b24ndCBoYXZlIGVub3VnaCByb29tIGZvciB0aGUgaXRlbSB0ZXh0LgogICAgICAgICAgICAgaXRl bUxhYmVsID0gIiI7CisgICAgICAgICAgICBpdGVtSWNvbiA9ICIiOwogICAgICAgICB9IGVsc2Ug aWYgKCFpdGVtTGFiZWwuaXNFbXB0eSgpKSB7CiAgICAgICAgICAgICBpbnQgYXZhaWxhYmxlV2lk dGggPSBtYXhXaWR0aCAtIGtUZXh0VG9MYWJlbFBhZGRpbmcgLQogICAgICAgICAgICAgICAgIFN0 cmluZ1RydW5jYXRvcjo6d2lkdGgoaXRlbVRleHQsIGl0ZW1Gb250KTsKQEAgLTk2Niw3ICs5Njcs NiBAQCB2b2lkIFBvcHVwTGlzdEJveDo6cGFpbnRSb3coR3JhcGhpY3NDb250ZXh0KiBnYywgY29u c3QgSW50UmVjdCYgcmVjdCwgaW50IHJvd0luZAogICAgIGludCByZW1haW5pbmdXaWR0aCA9IHJv d1JlY3Qud2lkdGgoKSAtIHJpZ2h0UGFkZGluZzsKIAogICAgIC8vIERyYXcgdGhlIGljb24gaWYg YXBwbGljYWJsZS4KLSAgICBTdHJpbmcgaXRlbUljb24gPSBtX3BvcHVwQ2xpZW50LT5pdGVtSWNv bihyb3dJbmRleCk7CiAgICAgUmVmUHRyPEltYWdlPiBpbWFnZShJbWFnZTo6bG9hZFBsYXRmb3Jt UmVzb3VyY2UoaXRlbUljb24udXRmOCgpLmRhdGEoKSkpOwogICAgIGlmIChpbWFnZSAmJiAhaW1h Z2UtPmlzTnVsbCgpKSB7CiAgICAgICAgIEludFJlY3QgaW1hZ2VSZWN0ID0gaW1hZ2UtPnJlY3Qo KTsKQEAgLTEwODksNyArMTA4OSwxMyBAQCBpbnQgUG9wdXBMaXN0Qm94OjpnZXRSb3dIZWlnaHQo aW50IGluZGV4KQogICAgIGlmIChpbmRleCA8IDApCiAgICAgICAgIHJldHVybiAwOwogCi0gICAg cmV0dXJuIGdldFJvd0ZvbnQoaW5kZXgpLmhlaWdodCgpOworICAgIFN0cmluZyBpY29uID0gbV9w b3B1cENsaWVudC0+aXRlbUljb24oaW5kZXgpOworICAgIFJlZlB0cjxJbWFnZT4gaW1hZ2UoSW1h Z2U6OmxvYWRQbGF0Zm9ybVJlc291cmNlKGljb24udXRmOCgpLmRhdGEoKSkpOworCisgICAgaW50 IGZvbnRIZWlnaHQgPSBnZXRSb3dGb250KGluZGV4KS5oZWlnaHQoKTsKKyAgICBpbnQgaWNvbkhl aWdodCA9IChpbWFnZSAmJiAhaW1hZ2UtPmlzTnVsbCgpKSA/IGltYWdlLT5yZWN0KCkuaGVpZ2h0 KCkgOiAwOworCisgICAgcmV0dXJuIG1heChmb250SGVpZ2h0LCBpY29uSGVpZ2h0KTsKIH0KIAog SW50UmVjdCBQb3B1cExpc3RCb3g6OmdldFJvd0JvdW5kcyhpbnQgaW5kZXgpCkBAIC0xMjU3LDYg KzEyNjMsOCBAQCB2b2lkIFBvcHVwTGlzdEJveDo6bGF5b3V0KCkKICAgICAgICAgLy8gRW5zdXJl IHRoZSBwb3B1cCBpcyB3aWRlIGVub3VnaCB0byBmaXQgdGhpcyBpdGVtLgogICAgICAgICBTdHJp bmcgdGV4dCA9IG1fcG9wdXBDbGllbnQtPml0ZW1UZXh0KGkpOwogICAgICAgICBTdHJpbmcgbGFi ZWwgPSBtX3BvcHVwQ2xpZW50LT5pdGVtTGFiZWwoaSk7CisgICAgICAgIFN0cmluZyBpY29uID0g bV9wb3B1cENsaWVudC0+aXRlbUljb24oaSk7CisgICAgICAgIFJlZlB0cjxJbWFnZT4gaWNvbklt YWdlKEltYWdlOjpsb2FkUGxhdGZvcm1SZXNvdXJjZShpY29uLnV0ZjgoKS5kYXRhKCkpKTsKICAg ICAgICAgaW50IHdpZHRoID0gMDsKICAgICAgICAgaWYgKCF0ZXh0LmlzRW1wdHkoKSkKICAgICAg ICAgICAgIHdpZHRoID0gaXRlbUZvbnQud2lkdGgoVGV4dFJ1bih0ZXh0KSk7CkBAIC0xMjY1LDYg KzEyNzMsMTIgQEAgdm9pZCBQb3B1cExpc3RCb3g6OmxheW91dCgpCiAgICAgICAgICAgICAgICAg d2lkdGggKz0ga1RleHRUb0xhYmVsUGFkZGluZzsKICAgICAgICAgICAgIHdpZHRoICs9IGl0ZW1G b250LndpZHRoKFRleHRSdW4obGFiZWwpKTsKICAgICAgICAgfQorICAgICAgICBpZiAoaWNvbklt YWdlICYmICFpY29uSW1hZ2UtPmlzTnVsbCgpKSB7CisgICAgICAgICAgICBpZiAod2lkdGggPiAw KQorICAgICAgICAgICAgICAgIHdpZHRoICs9IGtMYWJlbFRvSWNvblBhZGRpbmc7CisgICAgICAg ICAgICB3aWR0aCArPSBpY29uSW1hZ2UtPnJlY3QoKS53aWR0aCgpOworICAgICAgICB9CisKICAg ICAgICAgYmFzZVdpZHRoID0gbWF4KGJhc2VXaWR0aCwgd2lkdGgpOwogICAgICAgICAvLyBGSVhN RTogaHR0cDovL2IvMTIxMDQ4MSBXZSBzaG91bGQgZ2V0IHRoZSBwYWRkaW5nIG9mIGluZGl2aWR1 YWwgb3B0aW9uIGVsZW1lbnRzLgogICAgICAgICBwYWRkaW5nV2lkdGggPSBtYXgocGFkZGluZ1dp ZHRoLAo= 72532 2010-11-01 11:46:12 -0700 2010-11-02 09:00:59 -0700 Patch bug-48497-20101101114610.patch text/plain 4093 isherman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZWE3NTllMjhjNDIyMzYwNmEwZjNiNWJlZDFiODYwYTNiNzU4ZDQ3Mi4uYTA2M2Q5MWZkODJlNGM0 MGYwODM4NzIzZjkxYWRlNmM5MWEzZWJkNyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMC0xMC0yOCAgSWx5 YSBTaGVybWFuICA8aXNoZXJtYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEF2b2lkIG92ZXJsYXBwaW5nIGxhYmVsIHRleHQg aW4gYXV0b2ZpbGwgcG9wdXAgd2l0aCBpY29uLgorICAgICAgICBVcGRhdGVzIHRoZSBtZW51IHdp ZHRoIGNvbXB1dGF0aW9uIHRvIHRha2UgdGhlIGljb24gd2lkdGggaW50byBhY2NvdW50LgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDg0OTcKKworICAg ICAgICBObyBuZXcgdGVzdHMuIChPT1BTISkKKworICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVt L1BvcHVwTWVudUNocm9taXVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBvcHVwTGlzdEJveDo6 cGFpbnRSb3cpOgorICAgICAgICAoV2ViQ29yZTo6UG9wdXBMaXN0Qm94OjpsYXlvdXQpOgorCiAy MDEwLTExLTAxICBFcmljIENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgogCiAgICAg ICAgIFJldmlld2VkIGJ5IEFkYW0gUm9iZW4uCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3Jt L2Nocm9taXVtL1BvcHVwTWVudUNocm9taXVtLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21p dW0vUG9wdXBNZW51Q2hyb21pdW0uY3BwCmluZGV4IDNjODA3YmExMDhhYWRlYzM3YjFiZTVkYjUx ZDBhYmMxNDBkN2RlMjMuLjNmZjRmZjBkYTFhMDg2M2Q2MDQ4ODgzZDQ4MzgxZWRjMTU2NjA1ODMg MTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUG9wdXBNZW51Q2hyb21pdW0u Y3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUG9wdXBNZW51Q2hyb21pdW0uY3Bw CkBAIC05MjcsMTUgKzkyNywxNiBAQCB2b2lkIFBvcHVwTGlzdEJveDo6cGFpbnRSb3coR3JhcGhp Y3NDb250ZXh0KiBnYywgY29uc3QgSW50UmVjdCYgcmVjdCwgaW50IHJvd0luZAogICAgIC8vIFBy ZXBhcmUgdGV4dCB0byBiZSBkcmF3bi4KICAgICBTdHJpbmcgaXRlbVRleHQgPSBtX3BvcHVwQ2xp ZW50LT5pdGVtVGV4dChyb3dJbmRleCk7CiAgICAgU3RyaW5nIGl0ZW1MYWJlbCA9IG1fcG9wdXBD bGllbnQtPml0ZW1MYWJlbChyb3dJbmRleCk7CisgICAgU3RyaW5nIGl0ZW1JY29uID0gbV9wb3B1 cENsaWVudC0+aXRlbUljb24ocm93SW5kZXgpOwogICAgIGlmIChtX3NldHRpbmdzLnJlc3RyaWN0 V2lkdGhPZkxpc3RCb3gpIHsgLy8gVHJ1bmNhdGUgc3RyaW5ncyB0byBmaXQgaW4uCiAgICAgICAg IC8vIEZJWE1FOiBXZSBzaG91bGQgbGVmdFRydW5jYXRlIGZvciB0aGUgcnRsIGNhc2UuCiAgICAg ICAgIC8vIFN0cmluZ1RydW5jYXRvcjo6bGVmdFRydW5jYXRlIHdvdWxkIGhhdmUgdG8gYmUgaW1w bGVtZW50ZWQuCiAgICAgICAgIFN0cmluZyBzdHIgPSBTdHJpbmdUcnVuY2F0b3I6OnJpZ2h0VHJ1 bmNhdGUoaXRlbVRleHQsIG1heFdpZHRoLCBpdGVtRm9udCk7CiAgICAgICAgIGlmIChzdHIgIT0g aXRlbVRleHQpIHsKICAgICAgICAgICAgIGl0ZW1UZXh0ID0gc3RyOwotICAgICAgICAgICAgLy8g RG9uJ3QgZGlzcGxheSB0aGUgbGFiZWwsIHdlIGFscmVhZHkgZG9uJ3QgaGF2ZSBlbm91Z2ggcm9v bSBmb3IgdGhlCi0gICAgICAgICAgICAvLyBpdGVtIHRleHQuCisgICAgICAgICAgICAvLyBEb24n dCBkaXNwbGF5IHRoZSBsYWJlbCBvciBpY29uLCB3ZSBhbHJlYWR5IGRvbid0IGhhdmUgZW5vdWdo IHJvb20gZm9yIHRoZSBpdGVtIHRleHQuCiAgICAgICAgICAgICBpdGVtTGFiZWwgPSAiIjsKKyAg ICAgICAgICAgIGl0ZW1JY29uID0gIiI7CiAgICAgICAgIH0gZWxzZSBpZiAoIWl0ZW1MYWJlbC5p c0VtcHR5KCkpIHsKICAgICAgICAgICAgIGludCBhdmFpbGFibGVXaWR0aCA9IG1heFdpZHRoIC0g a1RleHRUb0xhYmVsUGFkZGluZyAtCiAgICAgICAgICAgICAgICAgU3RyaW5nVHJ1bmNhdG9yOjp3 aWR0aChpdGVtVGV4dCwgaXRlbUZvbnQpOwpAQCAtOTY2LDcgKzk2Nyw2IEBAIHZvaWQgUG9wdXBM aXN0Qm94OjpwYWludFJvdyhHcmFwaGljc0NvbnRleHQqIGdjLCBjb25zdCBJbnRSZWN0JiByZWN0 LCBpbnQgcm93SW5kCiAgICAgaW50IHJlbWFpbmluZ1dpZHRoID0gcm93UmVjdC53aWR0aCgpIC0g cmlnaHRQYWRkaW5nOwogCiAgICAgLy8gRHJhdyB0aGUgaWNvbiBpZiBhcHBsaWNhYmxlLgotICAg IFN0cmluZyBpdGVtSWNvbiA9IG1fcG9wdXBDbGllbnQtPml0ZW1JY29uKHJvd0luZGV4KTsKICAg ICBSZWZQdHI8SW1hZ2U+IGltYWdlKEltYWdlOjpsb2FkUGxhdGZvcm1SZXNvdXJjZShpdGVtSWNv bi51dGY4KCkuZGF0YSgpKSk7CiAgICAgaWYgKGltYWdlICYmICFpbWFnZS0+aXNOdWxsKCkpIHsK ICAgICAgICAgSW50UmVjdCBpbWFnZVJlY3QgPSBpbWFnZS0+cmVjdCgpOwpAQCAtMTA4OSw3ICsx MDg5LDEzIEBAIGludCBQb3B1cExpc3RCb3g6OmdldFJvd0hlaWdodChpbnQgaW5kZXgpCiAgICAg aWYgKGluZGV4IDwgMCkKICAgICAgICAgcmV0dXJuIDA7CiAKLSAgICByZXR1cm4gZ2V0Um93Rm9u dChpbmRleCkuaGVpZ2h0KCk7CisgICAgU3RyaW5nIGljb24gPSBtX3BvcHVwQ2xpZW50LT5pdGVt SWNvbihpbmRleCk7CisgICAgUmVmUHRyPEltYWdlPiBpbWFnZShJbWFnZTo6bG9hZFBsYXRmb3Jt UmVzb3VyY2UoaWNvbi51dGY4KCkuZGF0YSgpKSk7CisKKyAgICBpbnQgZm9udEhlaWdodCA9IGdl dFJvd0ZvbnQoaW5kZXgpLmhlaWdodCgpOworICAgIGludCBpY29uSGVpZ2h0ID0gKGltYWdlICYm ICFpbWFnZS0+aXNOdWxsKCkpID8gaW1hZ2UtPnJlY3QoKS5oZWlnaHQoKSA6IDA7CisKKyAgICBy ZXR1cm4gbWF4KGZvbnRIZWlnaHQsIGljb25IZWlnaHQpOwogfQogCiBJbnRSZWN0IFBvcHVwTGlz dEJveDo6Z2V0Um93Qm91bmRzKGludCBpbmRleCkKQEAgLTEyNTcsNiArMTI2Myw4IEBAIHZvaWQg UG9wdXBMaXN0Qm94OjpsYXlvdXQoKQogICAgICAgICAvLyBFbnN1cmUgdGhlIHBvcHVwIGlzIHdp ZGUgZW5vdWdoIHRvIGZpdCB0aGlzIGl0ZW0uCiAgICAgICAgIFN0cmluZyB0ZXh0ID0gbV9wb3B1 cENsaWVudC0+aXRlbVRleHQoaSk7CiAgICAgICAgIFN0cmluZyBsYWJlbCA9IG1fcG9wdXBDbGll bnQtPml0ZW1MYWJlbChpKTsKKyAgICAgICAgU3RyaW5nIGljb24gPSBtX3BvcHVwQ2xpZW50LT5p dGVtSWNvbihpKTsKKyAgICAgICAgUmVmUHRyPEltYWdlPiBpY29uSW1hZ2UoSW1hZ2U6OmxvYWRQ bGF0Zm9ybVJlc291cmNlKGljb24udXRmOCgpLmRhdGEoKSkpOwogICAgICAgICBpbnQgd2lkdGgg PSAwOwogICAgICAgICBpZiAoIXRleHQuaXNFbXB0eSgpKQogICAgICAgICAgICAgd2lkdGggPSBp dGVtRm9udC53aWR0aChUZXh0UnVuKHRleHQpKTsKQEAgLTEyNjUsNiArMTI3MywxMiBAQCB2b2lk IFBvcHVwTGlzdEJveDo6bGF5b3V0KCkKICAgICAgICAgICAgICAgICB3aWR0aCArPSBrVGV4dFRv TGFiZWxQYWRkaW5nOwogICAgICAgICAgICAgd2lkdGggKz0gaXRlbUZvbnQud2lkdGgoVGV4dFJ1 bihsYWJlbCkpOwogICAgICAgICB9CisgICAgICAgIGlmIChpY29uSW1hZ2UgJiYgIWljb25JbWFn ZS0+aXNOdWxsKCkpIHsKKyAgICAgICAgICAgIGlmICh3aWR0aCA+IDApCisgICAgICAgICAgICAg ICAgd2lkdGggKz0ga0xhYmVsVG9JY29uUGFkZGluZzsKKyAgICAgICAgICAgIHdpZHRoICs9IGlj b25JbWFnZS0+cmVjdCgpLndpZHRoKCk7CisgICAgICAgIH0KKwogICAgICAgICBiYXNlV2lkdGgg PSBtYXgoYmFzZVdpZHRoLCB3aWR0aCk7CiAgICAgICAgIC8vIEZJWE1FOiBodHRwOi8vYi8xMjEw NDgxIFdlIHNob3VsZCBnZXQgdGhlIHBhZGRpbmcgb2YgaW5kaXZpZHVhbCBvcHRpb24gZWxlbWVu dHMuCiAgICAgICAgIHBhZGRpbmdXaWR0aCA9IG1heChwYWRkaW5nV2lkdGgsCg== 72675 2010-11-02 09:01:03 -0700 2010-11-02 17:25:24 -0700 Patch bug-48497-20101102090102.patch text/plain 4059 isherman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MzA3YzQ4YmIzZWE1Y2RlODAwYzE4Mjk0MmQ0Mjk4NDNjOGEyM2ZmNC4uZTgyZGQyZWQ5MGZjZjgz MzI2NDhhNDJhYWI3NWY2ZjQ3YTJiOGUxNSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxMC0xMS0wMiAgSWx5 YSBTaGVybWFuICA8aXNoZXJtYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEF2b2lkIG92ZXJsYXBwaW5nIGxhYmVsIHRleHQg aW4gYXV0b2ZpbGwgcG9wdXAgd2l0aCBpY29uLgorICAgICAgICBVcGRhdGVzIHRoZSBtZW51IHdp ZHRoIGNvbXB1dGF0aW9uIHRvIHRha2UgdGhlIGljb24gd2lkdGggaW50byBhY2NvdW50LgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDg0OTcKKworICAg ICAgICAqIHBsYXRmb3JtL2Nocm9taXVtL1BvcHVwTWVudUNocm9taXVtLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlBvcHVwTGlzdEJveDo6cGFpbnRSb3cpOgorICAgICAgICAoV2ViQ29yZTo6UG9w dXBMaXN0Qm94OjpsYXlvdXQpOgorCiAyMDEwLTExLTAyICBDc2FiYSBPc3p0cm9nb27DoWMgIDxv c3N5QHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCB0cml2aWFsIGZpeC4KZGlmZiAt LWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUG9wdXBNZW51Q2hyb21pdW0uY3BwIGIv V2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9Qb3B1cE1lbnVDaHJvbWl1bS5jcHAKaW5kZXggM2M4 MDdiYTEwOGFhZGVjMzdiMWJlNWRiNTFkMGFiYzE0MGQ3ZGUyMy4uM2ZmNGZmMGRhMWEwODYzZDYw NDg4ODNkNDgzODFlZGMxNTY2MDU4MyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9jaHJv bWl1bS9Qb3B1cE1lbnVDaHJvbWl1bS5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1 bS9Qb3B1cE1lbnVDaHJvbWl1bS5jcHAKQEAgLTkyNywxNSArOTI3LDE2IEBAIHZvaWQgUG9wdXBM aXN0Qm94OjpwYWludFJvdyhHcmFwaGljc0NvbnRleHQqIGdjLCBjb25zdCBJbnRSZWN0JiByZWN0 LCBpbnQgcm93SW5kCiAgICAgLy8gUHJlcGFyZSB0ZXh0IHRvIGJlIGRyYXduLgogICAgIFN0cmlu ZyBpdGVtVGV4dCA9IG1fcG9wdXBDbGllbnQtPml0ZW1UZXh0KHJvd0luZGV4KTsKICAgICBTdHJp bmcgaXRlbUxhYmVsID0gbV9wb3B1cENsaWVudC0+aXRlbUxhYmVsKHJvd0luZGV4KTsKKyAgICBT dHJpbmcgaXRlbUljb24gPSBtX3BvcHVwQ2xpZW50LT5pdGVtSWNvbihyb3dJbmRleCk7CiAgICAg aWYgKG1fc2V0dGluZ3MucmVzdHJpY3RXaWR0aE9mTGlzdEJveCkgeyAvLyBUcnVuY2F0ZSBzdHJp bmdzIHRvIGZpdCBpbi4KICAgICAgICAgLy8gRklYTUU6IFdlIHNob3VsZCBsZWZ0VHJ1bmNhdGUg Zm9yIHRoZSBydGwgY2FzZS4KICAgICAgICAgLy8gU3RyaW5nVHJ1bmNhdG9yOjpsZWZ0VHJ1bmNh dGUgd291bGQgaGF2ZSB0byBiZSBpbXBsZW1lbnRlZC4KICAgICAgICAgU3RyaW5nIHN0ciA9IFN0 cmluZ1RydW5jYXRvcjo6cmlnaHRUcnVuY2F0ZShpdGVtVGV4dCwgbWF4V2lkdGgsIGl0ZW1Gb250 KTsKICAgICAgICAgaWYgKHN0ciAhPSBpdGVtVGV4dCkgewogICAgICAgICAgICAgaXRlbVRleHQg PSBzdHI7Ci0gICAgICAgICAgICAvLyBEb24ndCBkaXNwbGF5IHRoZSBsYWJlbCwgd2UgYWxyZWFk eSBkb24ndCBoYXZlIGVub3VnaCByb29tIGZvciB0aGUKLSAgICAgICAgICAgIC8vIGl0ZW0gdGV4 dC4KKyAgICAgICAgICAgIC8vIERvbid0IGRpc3BsYXkgdGhlIGxhYmVsIG9yIGljb24sIHdlIGFs cmVhZHkgZG9uJ3QgaGF2ZSBlbm91Z2ggcm9vbSBmb3IgdGhlIGl0ZW0gdGV4dC4KICAgICAgICAg ICAgIGl0ZW1MYWJlbCA9ICIiOworICAgICAgICAgICAgaXRlbUljb24gPSAiIjsKICAgICAgICAg fSBlbHNlIGlmICghaXRlbUxhYmVsLmlzRW1wdHkoKSkgewogICAgICAgICAgICAgaW50IGF2YWls YWJsZVdpZHRoID0gbWF4V2lkdGggLSBrVGV4dFRvTGFiZWxQYWRkaW5nIC0KICAgICAgICAgICAg ICAgICBTdHJpbmdUcnVuY2F0b3I6OndpZHRoKGl0ZW1UZXh0LCBpdGVtRm9udCk7CkBAIC05NjYs NyArOTY3LDYgQEAgdm9pZCBQb3B1cExpc3RCb3g6OnBhaW50Um93KEdyYXBoaWNzQ29udGV4dCog Z2MsIGNvbnN0IEludFJlY3QmIHJlY3QsIGludCByb3dJbmQKICAgICBpbnQgcmVtYWluaW5nV2lk dGggPSByb3dSZWN0LndpZHRoKCkgLSByaWdodFBhZGRpbmc7CiAKICAgICAvLyBEcmF3IHRoZSBp Y29uIGlmIGFwcGxpY2FibGUuCi0gICAgU3RyaW5nIGl0ZW1JY29uID0gbV9wb3B1cENsaWVudC0+ aXRlbUljb24ocm93SW5kZXgpOwogICAgIFJlZlB0cjxJbWFnZT4gaW1hZ2UoSW1hZ2U6OmxvYWRQ bGF0Zm9ybVJlc291cmNlKGl0ZW1JY29uLnV0ZjgoKS5kYXRhKCkpKTsKICAgICBpZiAoaW1hZ2Ug JiYgIWltYWdlLT5pc051bGwoKSkgewogICAgICAgICBJbnRSZWN0IGltYWdlUmVjdCA9IGltYWdl LT5yZWN0KCk7CkBAIC0xMDg5LDcgKzEwODksMTMgQEAgaW50IFBvcHVwTGlzdEJveDo6Z2V0Um93 SGVpZ2h0KGludCBpbmRleCkKICAgICBpZiAoaW5kZXggPCAwKQogICAgICAgICByZXR1cm4gMDsK IAotICAgIHJldHVybiBnZXRSb3dGb250KGluZGV4KS5oZWlnaHQoKTsKKyAgICBTdHJpbmcgaWNv biA9IG1fcG9wdXBDbGllbnQtPml0ZW1JY29uKGluZGV4KTsKKyAgICBSZWZQdHI8SW1hZ2U+IGlt YWdlKEltYWdlOjpsb2FkUGxhdGZvcm1SZXNvdXJjZShpY29uLnV0ZjgoKS5kYXRhKCkpKTsKKwor ICAgIGludCBmb250SGVpZ2h0ID0gZ2V0Um93Rm9udChpbmRleCkuaGVpZ2h0KCk7CisgICAgaW50 IGljb25IZWlnaHQgPSAoaW1hZ2UgJiYgIWltYWdlLT5pc051bGwoKSkgPyBpbWFnZS0+cmVjdCgp LmhlaWdodCgpIDogMDsKKworICAgIHJldHVybiBtYXgoZm9udEhlaWdodCwgaWNvbkhlaWdodCk7 CiB9CiAKIEludFJlY3QgUG9wdXBMaXN0Qm94OjpnZXRSb3dCb3VuZHMoaW50IGluZGV4KQpAQCAt MTI1Nyw2ICsxMjYzLDggQEAgdm9pZCBQb3B1cExpc3RCb3g6OmxheW91dCgpCiAgICAgICAgIC8v IEVuc3VyZSB0aGUgcG9wdXAgaXMgd2lkZSBlbm91Z2ggdG8gZml0IHRoaXMgaXRlbS4KICAgICAg ICAgU3RyaW5nIHRleHQgPSBtX3BvcHVwQ2xpZW50LT5pdGVtVGV4dChpKTsKICAgICAgICAgU3Ry aW5nIGxhYmVsID0gbV9wb3B1cENsaWVudC0+aXRlbUxhYmVsKGkpOworICAgICAgICBTdHJpbmcg aWNvbiA9IG1fcG9wdXBDbGllbnQtPml0ZW1JY29uKGkpOworICAgICAgICBSZWZQdHI8SW1hZ2U+ IGljb25JbWFnZShJbWFnZTo6bG9hZFBsYXRmb3JtUmVzb3VyY2UoaWNvbi51dGY4KCkuZGF0YSgp KSk7CiAgICAgICAgIGludCB3aWR0aCA9IDA7CiAgICAgICAgIGlmICghdGV4dC5pc0VtcHR5KCkp CiAgICAgICAgICAgICB3aWR0aCA9IGl0ZW1Gb250LndpZHRoKFRleHRSdW4odGV4dCkpOwpAQCAt MTI2NSw2ICsxMjczLDEyIEBAIHZvaWQgUG9wdXBMaXN0Qm94OjpsYXlvdXQoKQogICAgICAgICAg ICAgICAgIHdpZHRoICs9IGtUZXh0VG9MYWJlbFBhZGRpbmc7CiAgICAgICAgICAgICB3aWR0aCAr PSBpdGVtRm9udC53aWR0aChUZXh0UnVuKGxhYmVsKSk7CiAgICAgICAgIH0KKyAgICAgICAgaWYg KGljb25JbWFnZSAmJiAhaWNvbkltYWdlLT5pc051bGwoKSkgeworICAgICAgICAgICAgaWYgKHdp ZHRoID4gMCkKKyAgICAgICAgICAgICAgICB3aWR0aCArPSBrTGFiZWxUb0ljb25QYWRkaW5nOwor ICAgICAgICAgICAgd2lkdGggKz0gaWNvbkltYWdlLT5yZWN0KCkud2lkdGgoKTsKKyAgICAgICAg fQorCiAgICAgICAgIGJhc2VXaWR0aCA9IG1heChiYXNlV2lkdGgsIHdpZHRoKTsKICAgICAgICAg Ly8gRklYTUU6IGh0dHA6Ly9iLzEyMTA0ODEgV2Ugc2hvdWxkIGdldCB0aGUgcGFkZGluZyBvZiBp bmRpdmlkdWFsIG9wdGlvbiBlbGVtZW50cy4KICAgICAgICAgcGFkZGluZ1dpZHRoID0gbWF4KHBh ZGRpbmdXaWR0aCwK