52473 2011-01-14 13:17:20 -0800 Auto-scaling to avoid orphans is broken, remove dysfunctional code 2011-01-22 01:23:46 -0800 1 1 1 Unclassified WebKit Printing 528+ (Nightly build) Mac OS X 10.6 RESOLVED FIXED InRadar, Regression P1 Normal --- 1 ap ap commit-queue darin oldest_to_newest 334544 0 78986 ap 2011-01-14 13:17:20 -0800 Created attachment 78986 test case WebHTMLView attempts to scale the document down a little if it sees that the last page is very small, in order to avoid orphans. This got broken with r67771, because PrintContext::computePageRectsWithPageSizeInternal always returns all pages with the same size now. I tried to fix this by undoing the part of PrintContext change that changed the height of the last page, but that created a bigger problem - css-page-break is no longer respected properly, as computePageRectsWithPageSizeInternal() is called after layout. 334613 1 78999 ap 2011-01-14 14:31:53 -0800 Created attachment 78999 proposed un-fix The idea of this auto-shrinking is that it (1) doesn't change page width, and (2) is fast to try, because if we try and fail, we end up switching scale three times. A difficulty with mechanical zooming is that it would not respect CSS page breaks, which is unacceptable. But there is no fast way to just change available page height with the new pagination model. This feature was questionable at best (what if I print ten separate documents with identical settings - getting different font size is terribly unwelcome). I propose retiring it. 334616 2 79000 ap 2011-01-14 14:34:49 -0800 Created attachment 79000 a more complete un-fix 335478 3 darin 2011-01-17 13:12:14 -0800 I’m not sure we should remove this. Since we broke it we need to do something. But maybe that something is to accomplish the same effect an entirely different way. 335482 4 ap 2011-01-17 13:15:37 -0800 <rdar://problem/8874774> 337538 5 79000 darin 2011-01-20 13:04:23 -0800 Comment on attachment 79000 a more complete un-fix We may have to re-add this feature some day, but this code is currently broken and so we should not keep it. 337601 6 ap 2011-01-20 14:20:38 -0800 Renaming to make it clear what's actually being done here. 337615 7 79000 commit-queue 2011-01-20 14:47:24 -0800 Comment on attachment 79000 a more complete un-fix Rejecting attachment 79000 from commit-queue. Failed to run "['./Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=eseidel-cq-sl', 'la..." exit_code: 1 Last 500 characters of output: er -> origin/master Partial-rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc ... Currently at 76282 = eaa44b02d4cae7a82d79c083a6f7d0a2aeef9194 r76283 = 5852300ad82a05c75c47c7e9b307e8301d60a013 r76284 = 55e47eadeee8ef43d67bba22f464c20964e83d56 Done rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc First, rewinding head to replay your work on top of it... Fast-forwarded master to refs/remotes/origin/master. Full output: http://queues.webkit.org/results/7560249 338544 8 ap 2011-01-22 01:23:46 -0800 Committed <http://trac.webkit.org/changeset/76435>. 78986 2011-01-14 13:17:20 -0800 2011-01-14 13:17:20 -0800 test case test.html text/html 302 ap VGhpcyBzaG91bGQgdGFrZSBvbmUgcGFnZSB3aGVuIHByaW50ZWQgYXMgTGV0dGVyLjxicj4xPGJy PjE8YnI+MTxicj4xPGJyPjE8YnI+MTxicj4xPGJyPjE8YnI+MTxicj4xPGJyPjE8YnI+MTxicj4x PGJyPjE8YnI+MTxicj4xPGJyPgoxPGJyPjE8YnI+MTxicj4KMTxicj4xPGJyPjE8YnI+MTxicj4x PGJyPjE8YnI+MTxicj4xPGJyPjE8YnI+MTxicj4xPGJyPjE8YnI+MTxicj4xPGJyPjE8YnI+MTxi cj4xPGJyPjE8YnI+MTxicj4xPGJyPjE8YnI+MTxicj4xPGJyPjE8YnI+MTxicj4xPGJyPjE8YnI+ MTxicj4xPGJyPjE8YnI+MQo= 78999 2011-01-14 14:31:53 -0800 2011-01-14 14:34:49 -0800 proposed un-fix Autoscale.txt text/plain 3550 ap SW5kZXg6IFdlYktpdC9tYWMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9tYWMvQ2hh bmdlTG9nCShyZXZpc2lvbiA3NTgxOSkKKysrIFdlYktpdC9tYWMvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMDEtMTQgIEFsZXhleSBQcm9za3VyeWFrb3Yg IDxhcEBhcHBsZS5jb20+CisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTUyNDczCisgICAgICAgIFJFR1JFU1NJT04gKHI2Nzc3MSk6IEF1dG8tc2NhbGlu ZyB0byBhdm9pZCBvcnBoYW5zIGlzIGJyb2tlbgorCisgICAgICAgIFRoaXMgZmVhdHVyZSBpcyBk ZWFkIG5vdywgc28gcmVtb3ZlIHRoZSBkeXNmdW5jdGlvbmFsIGNvZGUuCisKKyAgICAgICAgKiBX ZWJWaWV3L1dlYkhUTUxWaWV3Lm1tOgorICAgICAgICAoLVtXZWJIVE1MVmlldyBfc2V0UHJpbnRp bmc6bWluaW11bVBhZ2VXaWR0aDpoZWlnaHQ6bWF4aW11bVBhZ2VXaWR0aDphZGp1c3RWaWV3U2l6 ZTpwYWdpbmF0ZVNjcmVlbkNvbnRlbnQ6XSk6CisgICAgICAgICgtW1dlYkhUTUxWaWV3IF9zY2Fs ZUZhY3RvckZvclByaW50T3BlcmF0aW9uOl0pOgorICAgICAgICAoLVtXZWJIVE1MVmlldyBrbm93 c1BhZ2VSYW5nZTpdKToKKwogMjAxMS0wMS0xMiAgRW5yaWNhIENhc3VjY2kgIDxlbnJpY2FAYXBw bGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgpJbmRleDogV2ViS2l0 L21hYy9XZWJWaWV3L1dlYkhUTUxWaWV3Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9tYWMvV2Vi Vmlldy9XZWJIVE1MVmlldy5tbQkocmV2aXNpb24gNzU2MzcpCisrKyBXZWJLaXQvbWFjL1dlYlZp ZXcvV2ViSFRNTFZpZXcubW0JKHdvcmtpbmcgY29weSkKQEAgLTQ5Myw3ICs0OTMsNiBAQCBAaW50 ZXJmYWNlIFdlYkhUTUxWaWV3UHJpdmF0ZSA6IE5TT2JqZWN0CiAgICAgQk9PTCBjbG9zZWQ7CiAg ICAgQk9PTCBpZ25vcmluZ01vdXNlRHJhZ2dlZEV2ZW50czsKICAgICBCT09MIHByaW50aW5nOwot ICAgIEJPT0wgYXZvaWRpbmdQcmludE9ycGhhbjsKICAgICBCT09MIHBhZ2luYXRlU2NyZWVuQ29u dGVudDsKICAgICBCT09MIG9ic2VydmluZ01vdXNlTW92ZWROb3RpZmljYXRpb25zOwogICAgIEJP T0wgb2JzZXJ2aW5nU3VwZXJ2aWV3Tm90aWZpY2F0aW9uczsKQEAgLTM5OTAsOCArMzk4OSw2IEBA IC0gKHZvaWQpX3NldFByaW50aW5nOihCT09MKXByaW50aW5nIG1pbmkKICAgICBfcHJpdmF0ZS0+ cGFnZVJlY3RzID0gbmlsOwogICAgIF9wcml2YXRlLT5wcmludGluZyA9IHByaW50aW5nOwogICAg IF9wcml2YXRlLT5wYWdpbmF0ZVNjcmVlbkNvbnRlbnQgPSBwYWdpbmF0ZVNjcmVlbkNvbnRlbnQ7 Ci0gICAgaWYgKCFwcmludGluZyAmJiAhcGFnaW5hdGVTY3JlZW5Db250ZW50KQotICAgICAgICBf cHJpdmF0ZS0+YXZvaWRpbmdQcmludE9ycGhhbiA9IE5POwogICAgIAogICAgIEZyYW1lKiBjb3Jl RnJhbWUgPSBjb3JlKFtzZWxmIF9mcmFtZV0pOwogICAgIGlmIChjb3JlRnJhbWUpIHsKQEAgLTQw NTEsOCArNDA0OCw3IEBAIC0gKGZsb2F0KV9zY2FsZUZhY3RvckZvclByaW50T3BlcmF0aW9uOigK ICAgICBmbG9hdCB1c2VyU2NhbGVGYWN0b3IgPSBbcHJpbnRPcGVyYXRpb24gX3dlYl9wYWdlU2V0 dXBTY2FsZUZhY3Rvcl07CiAgICAgZmxvYXQgbWF4U2hyaW5rVG9GaXRTY2FsZUZhY3RvciA9IDEu MGYgLyBfV2ViSFRNTFZpZXdQcmludGluZ01heGltdW1TaHJpbmtGYWN0b3I7CiAgICAgZmxvYXQg c2hyaW5rVG9GaXRTY2FsZUZhY3RvciA9IFtwcmludE9wZXJhdGlvbiBfd2ViX2F2YWlsYWJsZVBh cGVyV2lkdGhdIC8gdmlld1dpZHRoOwotICAgIGZsb2F0IHNocmlua1RvQXZvaWRPcnBoYW4gPSBf cHJpdmF0ZS0+YXZvaWRpbmdQcmludE9ycGhhbiA/ICgxLjBmIC8gUHJpbnRpbmdPcnBoYW5TaHJp bmtBZGp1c3RtZW50KSA6IDEuMGY7Ci0gICAgcmV0dXJuIHVzZXJTY2FsZUZhY3RvciAqIG1heCht YXhTaHJpbmtUb0ZpdFNjYWxlRmFjdG9yLCBzaHJpbmtUb0ZpdFNjYWxlRmFjdG9yKSAqIHNocmlu a1RvQXZvaWRPcnBoYW47CisgICAgcmV0dXJuIHVzZXJTY2FsZUZhY3RvciAqIG1heChtYXhTaHJp bmtUb0ZpdFNjYWxlRmFjdG9yLCBzaHJpbmtUb0ZpdFNjYWxlRmFjdG9yKTsKIH0KIAogLy8gRklY TUUgMzQ5MTM0NDogVGhpcyBpcyBhIHNlY3JldCBBcHBLaXQtaW50ZXJuYWwgbWV0aG9kIHRoYXQg d2UgbmVlZCB0byBvdmVycmlkZSBpbiBvcmRlcgpAQCAtNDE0MSwxOSArNDEzNyw2IEBAIC0gKEJP T0wpa25vd3NQYWdlUmFuZ2U6KE5TUmFuZ2VQb2ludGVyKXIKICAgICAvLyB0aGUgYmVoYXZpb3Ig b2YgSUUgYW5kIENhbWlubyBhdCBsZWFzdC4KICAgICBpZiAoW25ld1BhZ2VSZWN0cyBjb3VudF0g PT0gMCkKICAgICAgICAgbmV3UGFnZVJlY3RzID0gW05TQXJyYXkgYXJyYXlXaXRoT2JqZWN0OltO U1ZhbHVlIHZhbHVlV2l0aFJlY3Q6TlNNYWtlUmVjdCgwLCAwLCAxLCAxKV1dOwotICAgIGVsc2Ug aWYgKFtuZXdQYWdlUmVjdHMgY291bnRdID4gMSkgewotICAgICAgICAvLyBJZiB0aGUgbGFzdCBw YWdlIGlzIGEgc2hvcnQgb3JwaGFuLCB0cnkgYWRqdXN0aW5nIHRoZSBwcmludCBoZWlnaHQgc2xp Z2h0bHkgdG8gc2VlIGlmIHRoaXMgd2lsbCBzcXVlZXplIHRoZQotICAgICAgICAvLyBjb250ZW50 IG9udG8gb25lIGZld2VyIHBhZ2UuIElmIGl0IGRvZXMsIHVzZSB0aGUgYWRqdXN0ZWQgc2NhbGUu IElmIG5vdCwgdXNlIHRoZSBvcmlnaW5hbCBzY2FsZS4KLSAgICAgICAgZmxvYXQgbGFzdFBhZ2VI ZWlnaHQgPSBOU0hlaWdodChbW25ld1BhZ2VSZWN0cyBsYXN0T2JqZWN0XSByZWN0VmFsdWVdKTsK LSAgICAgICAgaWYgKGxhc3RQYWdlSGVpZ2h0L2Z1bGxQYWdlSGVpZ2h0IDwgTGFzdFByaW50ZWRQ YWdlT3JwaGFuUmF0aW8pIHsKLSAgICAgICAgICAgIE5TQXJyYXkgKmFkanVzdGVkUGFnZVJlY3Rz ID0gW2ZyYW1lIF9jb21wdXRlUGFnZVJlY3RzV2l0aFByaW50V2lkdGhTY2FsZUZhY3Rvcjp1c2Vy U2NhbGVGYWN0b3IgcHJpbnRIZWlnaHQ6ZnVsbFBhZ2VIZWlnaHQgKiBQcmludGluZ09ycGhhblNo cmlua0FkanVzdG1lbnRdOwotICAgICAgICAgICAgLy8gVXNlIHRoZSBhZGp1c3RlZCByZWN0cyBv bmx5IGlmIHRoZSBwYWdlIGNvdW50IHdlbnQgZG93bgotICAgICAgICAgICAgaWYgKFthZGp1c3Rl ZFBhZ2VSZWN0cyBjb3VudF0gPCBbbmV3UGFnZVJlY3RzIGNvdW50XSkgewotICAgICAgICAgICAg ICAgIG5ld1BhZ2VSZWN0cyA9IGFkanVzdGVkUGFnZVJlY3RzOwotICAgICAgICAgICAgICAgIF9w cml2YXRlLT5hdm9pZGluZ1ByaW50T3JwaGFuID0gWUVTOwotICAgICAgICAgICAgfQotICAgICAg ICB9Ci0gICAgfQogICAgIAogICAgIF9wcml2YXRlLT5wYWdlUmVjdHMgPSBbbmV3UGFnZVJlY3Rz IHJldGFpbl07CiAgICAgCg== 79000 2011-01-14 14:34:49 -0800 2011-01-20 14:47:24 -0800 a more complete un-fix Autoscale.txt text/plain 4402 ap SW5kZXg6IFdlYktpdC9tYWMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9tYWMvQ2hh bmdlTG9nCShyZXZpc2lvbiA3NTgxOSkKKysrIFdlYktpdC9tYWMvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMDEtMTQgIEFsZXhleSBQcm9za3VyeWFrb3Yg IDxhcEBhcHBsZS5jb20+CisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTUyNDczCisgICAgICAgIFJFR1JFU1NJT04gKHI2Nzc3MSk6IEF1dG8tc2NhbGlu ZyB0byBhdm9pZCBvcnBoYW5zIGlzIGJyb2tlbgorCisgICAgICAgIFRoaXMgZmVhdHVyZSBpcyBk ZWFkIG5vdywgc28gcmVtb3ZlIHRoZSBkeXNmdW5jdGlvbmFsIGNvZGUuCisKKyAgICAgICAgKiBX ZWJWaWV3L1dlYkhUTUxWaWV3Lm1tOgorICAgICAgICAoLVtXZWJIVE1MVmlldyBfc2V0UHJpbnRp bmc6bWluaW11bVBhZ2VXaWR0aDpoZWlnaHQ6bWF4aW11bVBhZ2VXaWR0aDphZGp1c3RWaWV3U2l6 ZTpwYWdpbmF0ZVNjcmVlbkNvbnRlbnQ6XSk6CisgICAgICAgICgtW1dlYkhUTUxWaWV3IF9zY2Fs ZUZhY3RvckZvclByaW50T3BlcmF0aW9uOl0pOgorICAgICAgICAoLVtXZWJIVE1MVmlldyBrbm93 c1BhZ2VSYW5nZTpdKToKKwogMjAxMS0wMS0xMiAgRW5yaWNhIENhc3VjY2kgIDxlbnJpY2FAYXBw bGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgpJbmRleDogV2ViS2l0 L21hYy9XZWJWaWV3L1dlYkhUTUxWaWV3Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9tYWMvV2Vi Vmlldy9XZWJIVE1MVmlldy5tbQkocmV2aXNpb24gNzU2MzcpCisrKyBXZWJLaXQvbWFjL1dlYlZp ZXcvV2ViSFRNTFZpZXcubW0JKHdvcmtpbmcgY29weSkKQEAgLTM0NiwxNiArMzQ2LDYgQEAgY29u c3QgZmxvYXQgX1dlYkhUTUxWaWV3UHJpbnRpbmdNaW5pbXVtUwogLy8gYmVoYXZpb3IgbWF0Y2hl cyBNYWNJRSBhbmQgTW96aWxsYSwgYXQgbGVhc3QpCiBjb25zdCBmbG9hdCBfV2ViSFRNTFZpZXdQ cmludGluZ01heGltdW1TaHJpbmtGYWN0b3IgPSAyOwogCi0vLyBUaGlzIG51bWJlciBkZXRlcm1p bmVzIGhvdyBzaG9ydCB0aGUgbGFzdCBwcmludGVkIHBhZ2Ugb2YgYSBtdWx0aS1wYWdlIHByaW50 IHNlc3Npb24KLS8vIGNhbiBiZSBiZWZvcmUgd2UgdHJ5IHRvIHNocmluayB0aGUgc2NhbGUgaW4g b3JkZXIgdG8gcmVkdWNlIHRoZSBudW1iZXIgb2YgcGFnZXMsIGFuZAotLy8gdGh1cyBlbGltaW5h dGUgdGhlIG9ycGhhbi4KLSNkZWZpbmUgTGFzdFByaW50ZWRQYWdlT3JwaGFuUmF0aW8gICAgICAw LjFmCi0KLS8vIFRoaXMgbnVtYmVyIGRldGVybWluZXMgdGhlIGFtb3VudCB0aGUgc2NhbGUgZmFj dG9yIGlzIGFkanVzdGVkIHRvIHRyeSB0byBlbGltaW5hdGUgb3JwaGFucy4KLS8vIEl0IGhhcyBu byBkaXJlY3QgbWF0aGVtYXRpY2FsIHJlbGF0aW9uc2hpcCB0byBMYXN0UHJpbnRlZFBhZ2VPcnBo YW5SYXRpbywgZHVlIHRvIHZhcmlhYmxlCi0vLyBudW1iZXJzIG9mIHBhZ2VzLCBsb2dpYyB0byBh dm9pZCBicmVha2luZyBlbGVtZW50cywgYW5kIENTUy1zdXBwbGllZCBoYXJkIHBhZ2UgYnJlYWtz LgotI2RlZmluZSBQcmludGluZ09ycGhhblNocmlua0FkanVzdG1lbnQgIDEuMWYKLQogI2RlZmlu ZSBBVVRPU0NST0xMX0lOVEVSVkFMICAgICAgICAgICAgIDAuMWYKIAogI2RlZmluZSBEUkFHX0xB QkVMX0JPUkRFUl9YICAgICAgICAgICAgIDQuMGYKQEAgLTQ5Myw3ICs0ODMsNiBAQCBAaW50ZXJm YWNlIFdlYkhUTUxWaWV3UHJpdmF0ZSA6IE5TT2JqZWN0CiAgICAgQk9PTCBjbG9zZWQ7CiAgICAg Qk9PTCBpZ25vcmluZ01vdXNlRHJhZ2dlZEV2ZW50czsKICAgICBCT09MIHByaW50aW5nOwotICAg IEJPT0wgYXZvaWRpbmdQcmludE9ycGhhbjsKICAgICBCT09MIHBhZ2luYXRlU2NyZWVuQ29udGVu dDsKICAgICBCT09MIG9ic2VydmluZ01vdXNlTW92ZWROb3RpZmljYXRpb25zOwogICAgIEJPT0wg b2JzZXJ2aW5nU3VwZXJ2aWV3Tm90aWZpY2F0aW9uczsKQEAgLTM5OTAsOCArMzk3OSw2IEBAIC0g KHZvaWQpX3NldFByaW50aW5nOihCT09MKXByaW50aW5nIG1pbmkKICAgICBfcHJpdmF0ZS0+cGFn ZVJlY3RzID0gbmlsOwogICAgIF9wcml2YXRlLT5wcmludGluZyA9IHByaW50aW5nOwogICAgIF9w cml2YXRlLT5wYWdpbmF0ZVNjcmVlbkNvbnRlbnQgPSBwYWdpbmF0ZVNjcmVlbkNvbnRlbnQ7Ci0g ICAgaWYgKCFwcmludGluZyAmJiAhcGFnaW5hdGVTY3JlZW5Db250ZW50KQotICAgICAgICBfcHJp dmF0ZS0+YXZvaWRpbmdQcmludE9ycGhhbiA9IE5POwogICAgIAogICAgIEZyYW1lKiBjb3JlRnJh bWUgPSBjb3JlKFtzZWxmIF9mcmFtZV0pOwogICAgIGlmIChjb3JlRnJhbWUpIHsKQEAgLTQwNTEs OCArNDAzOCw3IEBAIC0gKGZsb2F0KV9zY2FsZUZhY3RvckZvclByaW50T3BlcmF0aW9uOigKICAg ICBmbG9hdCB1c2VyU2NhbGVGYWN0b3IgPSBbcHJpbnRPcGVyYXRpb24gX3dlYl9wYWdlU2V0dXBT Y2FsZUZhY3Rvcl07CiAgICAgZmxvYXQgbWF4U2hyaW5rVG9GaXRTY2FsZUZhY3RvciA9IDEuMGYg LyBfV2ViSFRNTFZpZXdQcmludGluZ01heGltdW1TaHJpbmtGYWN0b3I7CiAgICAgZmxvYXQgc2hy aW5rVG9GaXRTY2FsZUZhY3RvciA9IFtwcmludE9wZXJhdGlvbiBfd2ViX2F2YWlsYWJsZVBhcGVy V2lkdGhdIC8gdmlld1dpZHRoOwotICAgIGZsb2F0IHNocmlua1RvQXZvaWRPcnBoYW4gPSBfcHJp dmF0ZS0+YXZvaWRpbmdQcmludE9ycGhhbiA/ICgxLjBmIC8gUHJpbnRpbmdPcnBoYW5TaHJpbmtB ZGp1c3RtZW50KSA6IDEuMGY7Ci0gICAgcmV0dXJuIHVzZXJTY2FsZUZhY3RvciAqIG1heChtYXhT aHJpbmtUb0ZpdFNjYWxlRmFjdG9yLCBzaHJpbmtUb0ZpdFNjYWxlRmFjdG9yKSAqIHNocmlua1Rv QXZvaWRPcnBoYW47CisgICAgcmV0dXJuIHVzZXJTY2FsZUZhY3RvciAqIG1heChtYXhTaHJpbmtU b0ZpdFNjYWxlRmFjdG9yLCBzaHJpbmtUb0ZpdFNjYWxlRmFjdG9yKTsKIH0KIAogLy8gRklYTUUg MzQ5MTM0NDogVGhpcyBpcyBhIHNlY3JldCBBcHBLaXQtaW50ZXJuYWwgbWV0aG9kIHRoYXQgd2Ug bmVlZCB0byBvdmVycmlkZSBpbiBvcmRlcgpAQCAtNDE0MSwxOSArNDEyNyw2IEBAIC0gKEJPT0wp a25vd3NQYWdlUmFuZ2U6KE5TUmFuZ2VQb2ludGVyKXIKICAgICAvLyB0aGUgYmVoYXZpb3Igb2Yg SUUgYW5kIENhbWlubyBhdCBsZWFzdC4KICAgICBpZiAoW25ld1BhZ2VSZWN0cyBjb3VudF0gPT0g MCkKICAgICAgICAgbmV3UGFnZVJlY3RzID0gW05TQXJyYXkgYXJyYXlXaXRoT2JqZWN0OltOU1Zh bHVlIHZhbHVlV2l0aFJlY3Q6TlNNYWtlUmVjdCgwLCAwLCAxLCAxKV1dOwotICAgIGVsc2UgaWYg KFtuZXdQYWdlUmVjdHMgY291bnRdID4gMSkgewotICAgICAgICAvLyBJZiB0aGUgbGFzdCBwYWdl IGlzIGEgc2hvcnQgb3JwaGFuLCB0cnkgYWRqdXN0aW5nIHRoZSBwcmludCBoZWlnaHQgc2xpZ2h0 bHkgdG8gc2VlIGlmIHRoaXMgd2lsbCBzcXVlZXplIHRoZQotICAgICAgICAvLyBjb250ZW50IG9u dG8gb25lIGZld2VyIHBhZ2UuIElmIGl0IGRvZXMsIHVzZSB0aGUgYWRqdXN0ZWQgc2NhbGUuIElm IG5vdCwgdXNlIHRoZSBvcmlnaW5hbCBzY2FsZS4KLSAgICAgICAgZmxvYXQgbGFzdFBhZ2VIZWln aHQgPSBOU0hlaWdodChbW25ld1BhZ2VSZWN0cyBsYXN0T2JqZWN0XSByZWN0VmFsdWVdKTsKLSAg ICAgICAgaWYgKGxhc3RQYWdlSGVpZ2h0L2Z1bGxQYWdlSGVpZ2h0IDwgTGFzdFByaW50ZWRQYWdl T3JwaGFuUmF0aW8pIHsKLSAgICAgICAgICAgIE5TQXJyYXkgKmFkanVzdGVkUGFnZVJlY3RzID0g W2ZyYW1lIF9jb21wdXRlUGFnZVJlY3RzV2l0aFByaW50V2lkdGhTY2FsZUZhY3Rvcjp1c2VyU2Nh bGVGYWN0b3IgcHJpbnRIZWlnaHQ6ZnVsbFBhZ2VIZWlnaHQgKiBQcmludGluZ09ycGhhblNocmlu a0FkanVzdG1lbnRdOwotICAgICAgICAgICAgLy8gVXNlIHRoZSBhZGp1c3RlZCByZWN0cyBvbmx5 IGlmIHRoZSBwYWdlIGNvdW50IHdlbnQgZG93bgotICAgICAgICAgICAgaWYgKFthZGp1c3RlZFBh Z2VSZWN0cyBjb3VudF0gPCBbbmV3UGFnZVJlY3RzIGNvdW50XSkgewotICAgICAgICAgICAgICAg IG5ld1BhZ2VSZWN0cyA9IGFkanVzdGVkUGFnZVJlY3RzOwotICAgICAgICAgICAgICAgIF9wcml2 YXRlLT5hdm9pZGluZ1ByaW50T3JwaGFuID0gWUVTOwotICAgICAgICAgICAgfQotICAgICAgICB9 Ci0gICAgfQogICAgIAogICAgIF9wcml2YXRlLT5wYWdlUmVjdHMgPSBbbmV3UGFnZVJlY3RzIHJl dGFpbl07CiAgICAgCg==