78287 2012-02-09 15:08:42 -0800 Convert InlineFlowBox to LayoutUnits in preparation for turning on subpixel layout 2012-10-08 16:20:36 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED INVALID P2 Normal --- 78054 63567 1 eae eae dglazkov eric gustavo leviw pnormand webkit.review.bot xan.lopez oldest_to_newest 553543 0 eae 2012-02-09 15:08:42 -0800 Convert InlineFlowBox to use LayoutUnits internally. 553556 1 126386 eae 2012-02-09 15:16:35 -0800 Created attachment 126386 Patch 553594 2 126386 pnormand 2012-02-09 16:10:42 -0800 Comment on attachment 126386 Patch Attachment 126386 did not pass gtk-ews (gtk): Output: http://queues.webkit.org/results/11447434 553608 3 126386 webkit.review.bot 2012-02-09 16:25:41 -0800 Comment on attachment 126386 Patch Attachment 126386 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/11480449 553616 4 126386 webkit-ews 2012-02-09 16:42:53 -0800 Comment on attachment 126386 Patch Attachment 126386 did not pass qt-ews (qt): Output: http://queues.webkit.org/results/11485436 553634 5 126386 gyuyoung.kim 2012-02-09 17:22:08 -0800 Comment on attachment 126386 Patch Attachment 126386 did not pass efl-ews (efl): Output: http://queues.webkit.org/results/11487486 126386 2012-02-09 15:16:35 -0800 2012-02-13 10:52:47 -0800 Patch bug-78287-20120209151634.patch text/plain 15071 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwNzI5NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMxIEBACisyMDEyLTAyLTA5ICBFbWlsIEEg RWtsdW5kICA8ZWFlQGNocm9taXVtLm9yZz4KKworICAgICAgICBDb252ZXJ0IElubGluZUZsb3dC b3ggdG8gTGF5b3V0VW5pdHMgaW4gcHJlcGFyYXRpb24gZm9yIHR1cm5pbmcgb24gc3VicGl4ZWwg bGF5b3V0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03 ODI4NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENo YW5nZSBJbmxpbmVGbG93Qm94IHRvIHVzZSBMYXlvdXRVbml0cyBpbnRlcm5hbGx5LiBUaGUgdG9w IGVkZ2UgaXMKKyAgICAgICAgc25hcHBlZCB0byBkZXZpY2UgcGl4ZWxzIHRvIGVuc3VyZSBwcm9w ZXIgYWxpZ25tZW50IGFuZCB0byBtYXRjaCB0aGUKKyAgICAgICAgY29udGFpbmluZyBibG9jay4K KworICAgICAgICBObyBuZXcgdGVzdHMsIG5vIGZ1bmN0aW9uYWxpdHkgY2hhbmdlcy4KKworICAg ICAgICAqIHJlbmRlcmluZy9JbmxpbmVGbG93Qm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Oklu bGluZUZsb3dCb3g6OmdldEZsb3dTcGFjaW5nTG9naWNhbFdpZHRoKToKKyAgICAgICAgKFdlYkNv cmU6OklubGluZUZsb3dCb3g6OnBsYWNlQm94ZXNJbklubGluZURpcmVjdGlvbik6CisgICAgICAg IChXZWJDb3JlOjpJbmxpbmVGbG93Qm94OjpwbGFjZUJveGVzSW5CbG9ja0RpcmVjdGlvbik6Cisg ICAgICAgIChXZWJDb3JlOjpJbmxpbmVGbG93Qm94OjphZGRCb3JkZXJPdXRzZXRWaXN1YWxPdmVy Zmxvdyk6CisgICAgICAgIChXZWJDb3JlOjpJbmxpbmVGbG93Qm94OjpwYWludCk6CisgICAgICAg IChXZWJDb3JlOjpJbmxpbmVGbG93Qm94OjpwYWludEZpbGxMYXllcik6CisgICAgICAgIChXZWJD b3JlOjpJbmxpbmVGbG93Qm94OjpwYWludEJveERlY29yYXRpb25zKToKKyAgICAgICAgKFdlYkNv cmU6OklubGluZUZsb3dCb3g6OnBhaW50TWFzayk6CisgICAgICAgIChXZWJDb3JlOjpJbmxpbmVG bG93Qm94Ojpjb21wdXRlT3ZlckFubm90YXRpb25BZGp1c3RtZW50KToKKyAgICAgICAgKiByZW5k ZXJpbmcvSW5saW5lRmxvd0JveC5oOgorICAgICAgICAoV2ViQ29yZTo6SW5saW5lRmxvd0JveDo6 bWFyZ2luQm9yZGVyUGFkZGluZ0xvZ2ljYWxMZWZ0KToKKyAgICAgICAgKFdlYkNvcmU6OklubGlu ZUZsb3dCb3g6Om1hcmdpbkJvcmRlclBhZGRpbmdMb2dpY2FsUmlnaHQpOgorICAgICAgICAoSW5s aW5lRmxvd0JveCk6CisKIDIwMTItMDItMDkgIEpvaG4gQmF0ZXMgIDxqYmF0ZXNAZ29vZ2xlLmNv bT4KIAogICAgICAgICBbQ2hyb21pdW1dIEFkZCBjaHJvbWl1bS1zdHlsZSB0cmFjaW5nIHN1cHBv cnQKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVGbG93Qm94LmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lRmxvd0JveC5jcHAJKHJl dmlzaW9uIDEwNzEyNCkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVGbG93Qm94 LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTYsOSArNTYsOSBAQCBJbmxpbmVGbG93Qm94Ojp+SW5s aW5lRmxvd0JveCgpCiAKICNlbmRpZgogCi1pbnQgSW5saW5lRmxvd0JveDo6Z2V0Rmxvd1NwYWNp bmdMb2dpY2FsV2lkdGgoKQorTGF5b3V0VW5pdCBJbmxpbmVGbG93Qm94OjpnZXRGbG93U3BhY2lu Z0xvZ2ljYWxXaWR0aCgpCiB7Ci0gICAgaW50IHRvdFdpZHRoID0gbWFyZ2luQm9yZGVyUGFkZGlu Z0xvZ2ljYWxMZWZ0KCkgKyBtYXJnaW5Cb3JkZXJQYWRkaW5nTG9naWNhbFJpZ2h0KCk7CisgICAg TGF5b3V0VW5pdCB0b3RXaWR0aCA9IG1hcmdpbkJvcmRlclBhZGRpbmdMb2dpY2FsTGVmdCgpICsg bWFyZ2luQm9yZGVyUGFkZGluZ0xvZ2ljYWxSaWdodCgpOwogICAgIGZvciAoSW5saW5lQm94KiBj dXJyID0gZmlyc3RDaGlsZCgpOyBjdXJyOyBjdXJyID0gY3Vyci0+bmV4dE9uTGluZSgpKSB7CiAg ICAgICAgIGlmIChjdXJyLT5pc0lubGluZUZsb3dCb3goKSkKICAgICAgICAgICAgIHRvdFdpZHRo ICs9IHRvSW5saW5lRmxvd0JveChjdXJyKS0+Z2V0Rmxvd1NwYWNpbmdMb2dpY2FsV2lkdGgoKTsK QEAgLTM5Nyw4ICszOTcsOCBAQCBmbG9hdCBJbmxpbmVGbG93Qm94OjpwbGFjZUJveGVzSW5Jbmxp bmVECiAgICAgICAgICAgICB9IGVsc2UgaWYgKCFjdXJyLT5yZW5kZXJlcigpLT5pc0xpc3RNYXJr ZXIoKSB8fCB0b1JlbmRlckxpc3RNYXJrZXIoY3Vyci0+cmVuZGVyZXIoKSktPmlzSW5zaWRlKCkp IHsKICAgICAgICAgICAgICAgICAvLyBUaGUgYm94IGNhbiBoYXZlIGEgZGlmZmVyZW50IHdyaXRp bmctbW9kZSB0aGFuIHRoZSBvdmVyYWxsIGxpbmUsIHNvIHRoaXMgaXMgYSBiaXQgY29tcGxpY2F0 ZWQuCiAgICAgICAgICAgICAgICAgLy8gSnVzdCBnZXQgYWxsIHRoZSBwaHlzaWNhbCBtYXJnaW4g YW5kIG92ZXJmbG93IHZhbHVlcyBieSBoYW5kIGJhc2VkIG9mZiB8aXNWZXJ0aWNhbHwuCi0gICAg ICAgICAgICAgICAgaW50IGxvZ2ljYWxMZWZ0TWFyZ2luID0gaXNIb3Jpem9udGFsKCkgPyBjdXJy LT5ib3hNb2RlbE9iamVjdCgpLT5tYXJnaW5MZWZ0KCkgOiBjdXJyLT5ib3hNb2RlbE9iamVjdCgp LT5tYXJnaW5Ub3AoKTsKLSAgICAgICAgICAgICAgICBpbnQgbG9naWNhbFJpZ2h0TWFyZ2luID0g aXNIb3Jpem9udGFsKCkgPyBjdXJyLT5ib3hNb2RlbE9iamVjdCgpLT5tYXJnaW5SaWdodCgpIDog Y3Vyci0+Ym94TW9kZWxPYmplY3QoKS0+bWFyZ2luQm90dG9tKCk7CisgICAgICAgICAgICAgICAg TGF5b3V0VW5pdCBsb2dpY2FsTGVmdE1hcmdpbiA9IGlzSG9yaXpvbnRhbCgpID8gY3Vyci0+Ym94 TW9kZWxPYmplY3QoKS0+bWFyZ2luTGVmdCgpIDogY3Vyci0+Ym94TW9kZWxPYmplY3QoKS0+bWFy Z2luVG9wKCk7CisgICAgICAgICAgICAgICAgTGF5b3V0VW5pdCBsb2dpY2FsUmlnaHRNYXJnaW4g PSBpc0hvcml6b250YWwoKSA/IGN1cnItPmJveE1vZGVsT2JqZWN0KCktPm1hcmdpblJpZ2h0KCkg OiBjdXJyLT5ib3hNb2RlbE9iamVjdCgpLT5tYXJnaW5Cb3R0b20oKTsKICAgICAgICAgICAgICAg ICAKICAgICAgICAgICAgICAgICBsb2dpY2FsTGVmdCArPSBsb2dpY2FsTGVmdE1hcmdpbjsKICAg ICAgICAgICAgICAgICBjdXJyLT5zZXRMb2dpY2FsTGVmdChsb2dpY2FsTGVmdCk7CkBAIC01ODQs MTAgKzU4NCwxMyBAQCB2b2lkIElubGluZUZsb3dCb3g6OmNvbXB1dGVMb2dpY2FsQm94SGVpCiB2 b2lkIElubGluZUZsb3dCb3g6OnBsYWNlQm94ZXNJbkJsb2NrRGlyZWN0aW9uKExheW91dFVuaXQg dG9wLCBMYXlvdXRVbml0IG1heEhlaWdodCwgTGF5b3V0VW5pdCBtYXhBc2NlbnQsIGJvb2wgc3Ry aWN0TW9kZSwgTGF5b3V0VW5pdCYgbGluZVRvcCwgTGF5b3V0VW5pdCYgbGluZUJvdHRvbSwgYm9v bCYgc2V0TGluZVRvcCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgTGF5b3V0VW5pdCYgbGluZVRvcEluY2x1ZGluZ01hcmdpbnMsIExheW91dFVuaXQmIGxp bmVCb3R0b21JbmNsdWRpbmdNYXJnaW5zLCBib29sJiBoYXNBbm5vdGF0aW9uc0JlZm9yZSwgYm9v bCYgaGFzQW5ub3RhdGlvbnNBZnRlciwgRm9udEJhc2VsaW5lIGJhc2VsaW5lVHlwZSkKIHsKKyAg ICAvLyBUaGUgdG9wIGVkZ2UgaXMgc25hcHBlZCB0byBkZXZpY2UgcGl4ZWxzIHRvIGVuc3VyZSBw cm9wZXIgYWxpZ25tZW50IGFuZCB0byBtYXRjaCB0aGUgY29udGFpbmluZyBibG9jay4KKyAgICAv LyBGSVhNRTogQ2hhbmdlIHRoaXMgdG8gdG9wLnJvdW5kKCkgb25jZSB3ZSBtb3ZlIG92ZXIgdG8g c3VicGl4ZWwgbGF5b3V0LiBTZWUgYnVnIDYwMzE4LgorICAgIExheW91dFVuaXQgcGl4ZWxTbmFw cGVkVG9wID0gdG9wOwogICAgIGJvb2wgaXNSb290Qm94ID0gaXNSb290SW5saW5lQm94KCk7CiAg ICAgaWYgKGlzUm9vdEJveCkgewogICAgICAgICBjb25zdCBGb250TWV0cmljcyYgZm9udE1ldHJp Y3MgPSByZW5kZXJlcigpLT5zdHlsZShtX2ZpcnN0TGluZSktPmZvbnRNZXRyaWNzKCk7Ci0gICAg ICAgIHNldExvZ2ljYWxUb3AodG9wICsgbWF4QXNjZW50IC0gZm9udE1ldHJpY3MuYXNjZW50KGJh c2VsaW5lVHlwZSkpOworICAgICAgICBzZXRMb2dpY2FsVG9wKHBpeGVsU25hcHBlZFRvcCArIG1h eEFzY2VudCAtIGZvbnRNZXRyaWNzLmFzY2VudChiYXNlbGluZVR5cGUpKTsKICAgICB9CiAKICAg ICBMYXlvdXRVbml0IGFkanVzdG1lbnRGb3JDaGlsZHJlbldpdGhTYW1lTGluZUhlaWdodEFuZEJh c2VsaW5lID0gMDsKQEAgLTYwOSwyMiArNjEyLDIyIEBAIHZvaWQgSW5saW5lRmxvd0JveDo6cGxh Y2VCb3hlc0luQmxvY2tEaXIKICAgICAgICAgSW5saW5lRmxvd0JveCogaW5saW5lRmxvd0JveCA9 IGN1cnItPmlzSW5saW5lRmxvd0JveCgpID8gdG9JbmxpbmVGbG93Qm94KGN1cnIpIDogMDsKICAg ICAgICAgYm9vbCBjaGlsZEFmZmVjdHNUb3BCb3R0b21Qb3MgPSB0cnVlOwogICAgICAgICBpZiAo Y3Vyci0+dmVydGljYWxBbGlnbigpID09IFRPUCkKLSAgICAgICAgICAgIGN1cnItPnNldExvZ2lj YWxUb3AodG9wKTsKKyAgICAgICAgICAgIGN1cnItPnNldExvZ2ljYWxUb3AocGl4ZWxTbmFwcGVk VG9wKTsKICAgICAgICAgZWxzZSBpZiAoY3Vyci0+dmVydGljYWxBbGlnbigpID09IEJPVFRPTSkK LSAgICAgICAgICAgIGN1cnItPnNldExvZ2ljYWxUb3AodG9wICsgbWF4SGVpZ2h0IC0gY3Vyci0+ bGluZUhlaWdodCgpKTsKKyAgICAgICAgICAgIGN1cnItPnNldExvZ2ljYWxUb3AocGl4ZWxTbmFw cGVkVG9wICsgbWF4SGVpZ2h0IC0gY3Vyci0+bGluZUhlaWdodCgpKTsKICAgICAgICAgZWxzZSB7 CiAgICAgICAgICAgICBpZiAoIXN0cmljdE1vZGUgJiYgaW5saW5lRmxvd0JveCAmJiAhaW5saW5l Rmxvd0JveC0+aGFzVGV4dENoaWxkcmVuKCkgJiYgIWN1cnItPmJveE1vZGVsT2JqZWN0KCktPmhh c0lubGluZURpcmVjdGlvbkJvcmRlcnNPclBhZGRpbmcoKQogICAgICAgICAgICAgICAgICYmICEo aW5saW5lRmxvd0JveC0+ZGVzY2VuZGFudHNIYXZlU2FtZUxpbmVIZWlnaHRBbmRCYXNlbGluZSgp ICYmIGlubGluZUZsb3dCb3gtPmhhc1RleHREZXNjZW5kYW50cygpKSkKICAgICAgICAgICAgICAg ICBjaGlsZEFmZmVjdHNUb3BCb3R0b21Qb3MgPSBmYWxzZTsKICAgICAgICAgICAgIExheW91dFVu aXQgcG9zQWRqdXN0ID0gbWF4QXNjZW50IC0gY3Vyci0+YmFzZWxpbmVQb3NpdGlvbihiYXNlbGlu ZVR5cGUpOwotICAgICAgICAgICAgY3Vyci0+c2V0TG9naWNhbFRvcChjdXJyLT5sb2dpY2FsVG9w KCkgKyB0b3AgKyBwb3NBZGp1c3QpOworICAgICAgICAgICAgY3Vyci0+c2V0TG9naWNhbFRvcChj dXJyLT5sb2dpY2FsVG9wKCkgKyBwaXhlbFNuYXBwZWRUb3AgKyBwb3NBZGp1c3QpOwogICAgICAg ICB9Ci0gICAgICAgIAorCiAgICAgICAgIExheW91dFVuaXQgbmV3TG9naWNhbFRvcCA9IGN1cnIt PmxvZ2ljYWxUb3AoKTsKICAgICAgICAgTGF5b3V0VW5pdCBuZXdMb2dpY2FsVG9wSW5jbHVkaW5n TWFyZ2lucyA9IG5ld0xvZ2ljYWxUb3A7CiAgICAgICAgIExheW91dFVuaXQgYm94SGVpZ2h0ID0g Y3Vyci0+bG9naWNhbEhlaWdodCgpOwogICAgICAgICBMYXlvdXRVbml0IGJveEhlaWdodEluY2x1 ZGluZ01hcmdpbnMgPSBib3hIZWlnaHQ7Ci0gICAgICAgICAgICAKKwogICAgICAgICBpZiAoY3Vy ci0+aXNUZXh0KCkgfHwgY3Vyci0+aXNJbmxpbmVGbG93Qm94KCkpIHsKICAgICAgICAgICAgIGNv bnN0IEZvbnRNZXRyaWNzJiBmb250TWV0cmljcyA9IGN1cnItPnJlbmRlcmVyKCktPnN0eWxlKG1f Zmlyc3RMaW5lKS0+Zm9udE1ldHJpY3MoKTsKICAgICAgICAgICAgIG5ld0xvZ2ljYWxUb3AgKz0g Y3Vyci0+YmFzZWxpbmVQb3NpdGlvbihiYXNlbGluZVR5cGUpIC0gZm9udE1ldHJpY3MuYXNjZW50 KGJhc2VsaW5lVHlwZSk7CkBAIC02NTcsOCArNjYwLDggQEAgdm9pZCBJbmxpbmVGbG93Qm94Ojpw bGFjZUJveGVzSW5CbG9ja0RpcgogCiAgICAgICAgICAgICAgICAgUmVuZGVyUnVieVJ1biogcnVi eVJ1biA9IHRvUmVuZGVyUnVieVJ1bihjdXJyLT5yZW5kZXJlcigpKTsKICAgICAgICAgICAgICAg ICBpZiAoUmVuZGVyUnVieUJhc2UqIHJ1YnlCYXNlID0gcnVieVJ1bi0+cnVieUJhc2UoKSkgewot ICAgICAgICAgICAgICAgICAgICBMYXlvdXRVbml0IGJvdHRvbVJ1YnlCYXNlTGVhZGluZyA9IChj dXJyLT5sb2dpY2FsSGVpZ2h0KCkgLSBydWJ5QmFzZS0+bG9naWNhbEJvdHRvbSgpKSArIHJ1YnlC YXNlLT5sb2dpY2FsSGVpZ2h0KCkgLSAocnVieUJhc2UtPmxhc3RSb290Qm94KCkgPyBydWJ5QmFz ZS0+bGFzdFJvb3RCb3goKS0+bGluZUJvdHRvbSgpIDogMCk7Ci0gICAgICAgICAgICAgICAgICAg IExheW91dFVuaXQgdG9wUnVieUJhc2VMZWFkaW5nID0gcnVieUJhc2UtPmxvZ2ljYWxUb3AoKSAr IChydWJ5QmFzZS0+Zmlyc3RSb290Qm94KCkgPyBydWJ5QmFzZS0+Zmlyc3RSb290Qm94KCktPmxp bmVUb3AoKSA6IDApOworICAgICAgICAgICAgICAgICAgICBMYXlvdXRVbml0IGJvdHRvbVJ1YnlC YXNlTGVhZGluZyA9IChjdXJyLT5sb2dpY2FsSGVpZ2h0KCkgLSBydWJ5QmFzZS0+bG9naWNhbEJv dHRvbSgpKSArIHJ1YnlCYXNlLT5sb2dpY2FsSGVpZ2h0KCkgLSAocnVieUJhc2UtPmxhc3RSb290 Qm94KCkgPyBydWJ5QmFzZS0+bGFzdFJvb3RCb3goKS0+bGluZUJvdHRvbSgpIDogTGF5b3V0VW5p dCgwKSk7CisgICAgICAgICAgICAgICAgICAgIExheW91dFVuaXQgdG9wUnVieUJhc2VMZWFkaW5n ID0gcnVieUJhc2UtPmxvZ2ljYWxUb3AoKSArIChydWJ5QmFzZS0+Zmlyc3RSb290Qm94KCkgPyBy dWJ5QmFzZS0+Zmlyc3RSb290Qm94KCktPmxpbmVUb3AoKSA6IExheW91dFVuaXQoMCkpOwogICAg ICAgICAgICAgICAgICAgICBuZXdMb2dpY2FsVG9wICs9ICFyZW5kZXJlcigpLT5zdHlsZSgpLT5p c0ZsaXBwZWRMaW5lc1dyaXRpbmdNb2RlKCkgPyB0b3BSdWJ5QmFzZUxlYWRpbmcgOiBib3R0b21S dWJ5QmFzZUxlYWRpbmc7CiAgICAgICAgICAgICAgICAgICAgIGJveEhlaWdodCAtPSAodG9wUnVi eUJhc2VMZWFkaW5nICsgYm90dG9tUnVieUJhc2VMZWFkaW5nKTsKICAgICAgICAgICAgICAgICB9 CkBAIC02ODksNyArNjkyLDcgQEAgdm9pZCBJbmxpbmVGbG93Qm94OjpwbGFjZUJveGVzSW5CbG9j a0RpcgogICAgICAgICAvLyBBZGp1c3QgYm94ZXMgdG8gdXNlIHRoZWlyIHJlYWwgYm94IHkvaGVp Z2h0IGFuZCBub3QgdGhlIGxvZ2ljYWwgaGVpZ2h0IChhcyBkaWN0YXRlZCBieQogICAgICAgICAv LyBsaW5lLWhlaWdodCkuCiAgICAgICAgIGlmIChpbmxpbmVGbG93Qm94KQotICAgICAgICAgICAg aW5saW5lRmxvd0JveC0+cGxhY2VCb3hlc0luQmxvY2tEaXJlY3Rpb24odG9wLCBtYXhIZWlnaHQs IG1heEFzY2VudCwgc3RyaWN0TW9kZSwgbGluZVRvcCwgbGluZUJvdHRvbSwgc2V0TGluZVRvcCwK KyAgICAgICAgICAgIGlubGluZUZsb3dCb3gtPnBsYWNlQm94ZXNJbkJsb2NrRGlyZWN0aW9uKHBp eGVsU25hcHBlZFRvcCwgbWF4SGVpZ2h0LCBtYXhBc2NlbnQsIHN0cmljdE1vZGUsIGxpbmVUb3As IGxpbmVCb3R0b20sIHNldExpbmVUb3AsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBsaW5lVG9wSW5jbHVkaW5nTWFyZ2lucywgbGluZUJvdHRv bUluY2x1ZGluZ01hcmdpbnMsIGhhc0Fubm90YXRpb25zQmVmb3JlLCBoYXNBbm5vdGF0aW9uc0Fm dGVyLCBiYXNlbGluZVR5cGUpOwogICAgIH0KIApAQCAtNzAwLDEwICs3MDMsMTAgQEAgdm9pZCBJ bmxpbmVGbG93Qm94OjpwbGFjZUJveGVzSW5CbG9ja0RpcgogICAgICAgICAgICAgICAgIGxpbmVU b3AgPSBwaXhlbFNuYXBwZWRMb2dpY2FsVG9wKCk7CiAgICAgICAgICAgICAgICAgbGluZVRvcElu Y2x1ZGluZ01hcmdpbnMgPSBsaW5lVG9wOwogICAgICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAg ICAgICAgICBsaW5lVG9wID0gbWluKGxpbmVUb3AsIHBpeGVsU25hcHBlZExvZ2ljYWxUb3AoKSk7 CisgICAgICAgICAgICAgICAgbGluZVRvcCA9IG1pbjxMYXlvdXRVbml0PihsaW5lVG9wLCBwaXhl bFNuYXBwZWRMb2dpY2FsVG9wKCkpOwogICAgICAgICAgICAgICAgIGxpbmVUb3BJbmNsdWRpbmdN YXJnaW5zID0gbWluKGxpbmVUb3AsIGxpbmVUb3BJbmNsdWRpbmdNYXJnaW5zKTsKICAgICAgICAg ICAgIH0KLSAgICAgICAgICAgIGxpbmVCb3R0b20gPSBtYXgobGluZUJvdHRvbSwgcGl4ZWxTbmFw cGVkTG9naWNhbEJvdHRvbSgpKTsKKyAgICAgICAgICAgIGxpbmVCb3R0b20gPSBtYXg8TGF5b3V0 VW5pdD4obGluZUJvdHRvbSwgcGl4ZWxTbmFwcGVkTG9naWNhbEJvdHRvbSgpKTsKICAgICAgICAg ICAgIGxpbmVCb3R0b21JbmNsdWRpbmdNYXJnaW5zID0gbWF4KGxpbmVCb3R0b20sIGxpbmVCb3R0 b21JbmNsdWRpbmdNYXJnaW5zKTsKICAgICAgICAgfQogICAgICAgICAKQEAgLTc4Nyw4ICs3OTAs OCBAQCBpbmxpbmUgdm9pZCBJbmxpbmVGbG93Qm94OjphZGRCb3JkZXJPdXRzCiAgICAgTGF5b3V0 VW5pdCBib3JkZXJPdXRzZXRMb2dpY2FsUmlnaHQ7CiAgICAgc3R5bGUtPmdldEJvcmRlckltYWdl SW5saW5lRGlyZWN0aW9uT3V0c2V0cyhib3JkZXJPdXRzZXRMb2dpY2FsTGVmdCwgYm9yZGVyT3V0 c2V0TG9naWNhbFJpZ2h0KTsKIAotICAgIExheW91dFVuaXQgb3V0c2V0TG9naWNhbExlZnQgPSBp bmNsdWRlTG9naWNhbExlZnRFZGdlKCkgPyBib3JkZXJPdXRzZXRMb2dpY2FsTGVmdCA6IDA7Ci0g ICAgTGF5b3V0VW5pdCBvdXRzZXRMb2dpY2FsUmlnaHQgPSBpbmNsdWRlTG9naWNhbFJpZ2h0RWRn ZSgpID8gYm9yZGVyT3V0c2V0TG9naWNhbFJpZ2h0IDogMDsKKyAgICBMYXlvdXRVbml0IG91dHNl dExvZ2ljYWxMZWZ0ID0gaW5jbHVkZUxvZ2ljYWxMZWZ0RWRnZSgpID8gYm9yZGVyT3V0c2V0TG9n aWNhbExlZnQgOiBMYXlvdXRVbml0KDApOworICAgIExheW91dFVuaXQgb3V0c2V0TG9naWNhbFJp Z2h0ID0gaW5jbHVkZUxvZ2ljYWxSaWdodEVkZ2UoKSA/IGJvcmRlck91dHNldExvZ2ljYWxSaWdo dCA6IExheW91dFVuaXQoMCk7CiAKICAgICBMYXlvdXRVbml0IGxvZ2ljYWxMZWZ0VmlzdWFsT3Zl cmZsb3cgPSBtaW4ocGl4ZWxTbmFwcGVkTG9naWNhbExlZnQoKSAtIG91dHNldExvZ2ljYWxMZWZ0 LCBsb2dpY2FsVmlzdWFsT3ZlcmZsb3cueCgpKTsKICAgICBMYXlvdXRVbml0IGxvZ2ljYWxSaWdo dFZpc3VhbE92ZXJmbG93ID0gbWF4KHBpeGVsU25hcHBlZExvZ2ljYWxSaWdodCgpICsgb3V0c2V0 TG9naWNhbFJpZ2h0LCBsb2dpY2FsVmlzdWFsT3ZlcmZsb3cubWF4WCgpKTsKQEAgLTEwMDgsNyAr MTAxMSw3IEBAIHZvaWQgSW5saW5lRmxvd0JveDo6cGFpbnQoUGFpbnRJbmZvJiBwYWkKICAgICBm bGlwRm9yV3JpdGluZ01vZGUob3ZlcmZsb3dSZWN0KTsKICAgICBvdmVyZmxvd1JlY3QubW92ZUJ5 KHBhaW50T2Zmc2V0KTsKICAgICAKLSAgICBpZiAoIXBhaW50SW5mby5yZWN0LmludGVyc2VjdHMo b3ZlcmZsb3dSZWN0KSkKKyAgICBpZiAoIXBhaW50SW5mby5yZWN0LmludGVyc2VjdHMocGl4ZWxT bmFwcGVkSW50UmVjdChvdmVyZmxvd1JlY3QpKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgaWYg KHBhaW50SW5mby5waGFzZSAhPSBQYWludFBoYXNlQ2hpbGRPdXRsaW5lcykgewpAQCAtMTEwNywx MCArMTExMCwxMCBAQCB2b2lkIElubGluZUZsb3dCb3g6OnBhaW50RmlsbExheWVyKGNvbnN0CiAg ICAgICAgICAgICBmb3IgKElubGluZUZsb3dCb3gqIGN1cnIgPSB0aGlzOyBjdXJyOyBjdXJyID0g Y3Vyci0+cHJldkxpbmVCb3goKSkKICAgICAgICAgICAgICAgICB0b3RhbExvZ2ljYWxXaWR0aCAr PSBjdXJyLT5sb2dpY2FsV2lkdGgoKTsKICAgICAgICAgfQotICAgICAgICBMYXlvdXRVbml0IHN0 cmlwWCA9IHJlY3QueCgpIC0gKGlzSG9yaXpvbnRhbCgpID8gbG9naWNhbE9mZnNldE9uTGluZSA6 IDApOwotICAgICAgICBMYXlvdXRVbml0IHN0cmlwWSA9IHJlY3QueSgpIC0gKGlzSG9yaXpvbnRh bCgpID8gMCA6IGxvZ2ljYWxPZmZzZXRPbkxpbmUpOwotICAgICAgICBMYXlvdXRVbml0IHN0cmlw V2lkdGggPSBpc0hvcml6b250YWwoKSA/IHRvdGFsTG9naWNhbFdpZHRoIDogd2lkdGgoKTsKLSAg ICAgICAgTGF5b3V0VW5pdCBzdHJpcEhlaWdodCA9IGlzSG9yaXpvbnRhbCgpID8gaGVpZ2h0KCkg OiB0b3RhbExvZ2ljYWxXaWR0aDsKKyAgICAgICAgTGF5b3V0VW5pdCBzdHJpcFggPSByZWN0Lngo KSAtIChpc0hvcml6b250YWwoKSA/IGxvZ2ljYWxPZmZzZXRPbkxpbmUgOiBMYXlvdXRVbml0KDAp KTsKKyAgICAgICAgTGF5b3V0VW5pdCBzdHJpcFkgPSByZWN0LnkoKSAtIChpc0hvcml6b250YWwo KSA/IExheW91dFVuaXQoMCkgOiBsb2dpY2FsT2Zmc2V0T25MaW5lKTsKKyAgICAgICAgTGF5b3V0 VW5pdCBzdHJpcFdpZHRoID0gaXNIb3Jpem9udGFsKCkgPyB0b3RhbExvZ2ljYWxXaWR0aCA6IExh eW91dFVuaXQod2lkdGgoKSk7CisgICAgICAgIExheW91dFVuaXQgc3RyaXBIZWlnaHQgPSBpc0hv cml6b250YWwoKSA/IExheW91dFVuaXQoaGVpZ2h0KCkpIDogdG90YWxMb2dpY2FsV2lkdGg7CiAK ICAgICAgICAgR3JhcGhpY3NDb250ZXh0U3RhdGVTYXZlciBzdGF0ZVNhdmVyKCpwYWludEluZm8u Y29udGV4dCk7CiAgICAgICAgIHBhaW50SW5mby5jb250ZXh0LT5jbGlwKExheW91dFJlY3QocmVj dC54KCksIHJlY3QueSgpLCB3aWR0aCgpLCBoZWlnaHQoKSkpOwpAQCAtMTIzNyw4ICsxMjQwLDgg QEAgdm9pZCBJbmxpbmVGbG93Qm94OjpwYWludEJveERlY29yYXRpb25zKAogICAgICAgICAgICAg ICAgIExheW91dFVuaXQgdG90YWxMb2dpY2FsV2lkdGggPSBsb2dpY2FsT2Zmc2V0T25MaW5lOwog ICAgICAgICAgICAgICAgIGZvciAoSW5saW5lRmxvd0JveCogY3VyciA9IHRoaXM7IGN1cnI7IGN1 cnIgPSBjdXJyLT5uZXh0TGluZUJveCgpKQogICAgICAgICAgICAgICAgICAgICB0b3RhbExvZ2lj YWxXaWR0aCArPSBjdXJyLT5sb2dpY2FsV2lkdGgoKTsKLSAgICAgICAgICAgICAgICBMYXlvdXRV bml0IHN0cmlwWCA9IGFkanVzdGVkUGFpbnRvZmZzZXQueCgpIC0gKGlzSG9yaXpvbnRhbCgpID8g bG9naWNhbE9mZnNldE9uTGluZSA6IDApOwotICAgICAgICAgICAgICAgIExheW91dFVuaXQgc3Ry aXBZID0gYWRqdXN0ZWRQYWludG9mZnNldC55KCkgLSAoaXNIb3Jpem9udGFsKCkgPyAwIDogbG9n aWNhbE9mZnNldE9uTGluZSk7CisgICAgICAgICAgICAgICAgTGF5b3V0VW5pdCBzdHJpcFggPSBh ZGp1c3RlZFBhaW50b2Zmc2V0LngoKSAtIChpc0hvcml6b250YWwoKSA/IGxvZ2ljYWxPZmZzZXRP bkxpbmUgOiBMYXlvdXRVbml0KDApKTsKKyAgICAgICAgICAgICAgICBMYXlvdXRVbml0IHN0cmlw WSA9IGFkanVzdGVkUGFpbnRvZmZzZXQueSgpIC0gKGlzSG9yaXpvbnRhbCgpID8gTGF5b3V0VW5p dCgwKSA6IGxvZ2ljYWxPZmZzZXRPbkxpbmUpOwogICAgICAgICAgICAgICAgIExheW91dFVuaXQg c3RyaXBXaWR0aCA9IGlzSG9yaXpvbnRhbCgpID8gdG90YWxMb2dpY2FsV2lkdGggOiBmcmFtZVJl Y3Qud2lkdGgoKTsKICAgICAgICAgICAgICAgICBMYXlvdXRVbml0IHN0cmlwSGVpZ2h0ID0gaXNI b3Jpem9udGFsKCkgPyBmcmFtZVJlY3QuaGVpZ2h0KCkgOiB0b3RhbExvZ2ljYWxXaWR0aDsKIApA QCAtMTMwOCw4ICsxMzExLDggQEAgdm9pZCBJbmxpbmVGbG93Qm94OjpwYWludE1hc2soUGFpbnRJ bmZvJgogICAgICAgICBMYXlvdXRVbml0IHRvdGFsTG9naWNhbFdpZHRoID0gbG9naWNhbE9mZnNl dE9uTGluZTsKICAgICAgICAgZm9yIChJbmxpbmVGbG93Qm94KiBjdXJyID0gdGhpczsgY3Vycjsg Y3VyciA9IGN1cnItPm5leHRMaW5lQm94KCkpCiAgICAgICAgICAgICB0b3RhbExvZ2ljYWxXaWR0 aCArPSBjdXJyLT5sb2dpY2FsV2lkdGgoKTsKLSAgICAgICAgTGF5b3V0VW5pdCBzdHJpcFggPSBh ZGp1c3RlZFBhaW50T2Zmc2V0LngoKSAtIChpc0hvcml6b250YWwoKSA/IGxvZ2ljYWxPZmZzZXRP bkxpbmUgOiAwKTsKLSAgICAgICAgTGF5b3V0VW5pdCBzdHJpcFkgPSBhZGp1c3RlZFBhaW50T2Zm c2V0LnkoKSAtIChpc0hvcml6b250YWwoKSA/IDAgOiBsb2dpY2FsT2Zmc2V0T25MaW5lKTsKKyAg ICAgICAgTGF5b3V0VW5pdCBzdHJpcFggPSBhZGp1c3RlZFBhaW50T2Zmc2V0LngoKSAtIChpc0hv cml6b250YWwoKSA/IGxvZ2ljYWxPZmZzZXRPbkxpbmUgOiBMYXlvdXRVbml0KDApKTsKKyAgICAg ICAgTGF5b3V0VW5pdCBzdHJpcFkgPSBhZGp1c3RlZFBhaW50T2Zmc2V0LnkoKSAtIChpc0hvcml6 b250YWwoKSA/IExheW91dFVuaXQoMCkgOiBsb2dpY2FsT2Zmc2V0T25MaW5lKTsKICAgICAgICAg TGF5b3V0VW5pdCBzdHJpcFdpZHRoID0gaXNIb3Jpem9udGFsKCkgPyB0b3RhbExvZ2ljYWxXaWR0 aCA6IGZyYW1lUmVjdC53aWR0aCgpOwogICAgICAgICBMYXlvdXRVbml0IHN0cmlwSGVpZ2h0ID0g aXNIb3Jpem9udGFsKCkgPyBmcmFtZVJlY3QuaGVpZ2h0KCkgOiB0b3RhbExvZ2ljYWxXaWR0aDsK IApAQCAtMTQwNiw3ICsxNDA5LDcgQEAgTGF5b3V0VW5pdCBJbmxpbmVGbG93Qm94Ojpjb21wdXRl T3ZlckFubgogICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICAgICAgCiAgICAgICAg ICAgICBpZiAoIXJ1YnlSdW4tPnN0eWxlKCktPmlzRmxpcHBlZExpbmVzV3JpdGluZ01vZGUoKSkg ewotICAgICAgICAgICAgICAgIExheW91dFVuaXQgdG9wT2ZGaXJzdFJ1YnlUZXh0TGluZSA9IHJ1 YnlUZXh0LT5sb2dpY2FsVG9wKCkgKyAocnVieVRleHQtPmZpcnN0Um9vdEJveCgpID8gcnVieVRl eHQtPmZpcnN0Um9vdEJveCgpLT5saW5lVG9wKCkgOiAwKTsKKyAgICAgICAgICAgICAgICBMYXlv dXRVbml0IHRvcE9mRmlyc3RSdWJ5VGV4dExpbmUgPSBydWJ5VGV4dC0+bG9naWNhbFRvcCgpICsg KHJ1YnlUZXh0LT5maXJzdFJvb3RCb3goKSA/IHJ1YnlUZXh0LT5maXJzdFJvb3RCb3goKS0+bGlu ZVRvcCgpIDogTGF5b3V0VW5pdCgwKSk7CiAgICAgICAgICAgICAgICAgaWYgKHRvcE9mRmlyc3RS dWJ5VGV4dExpbmUgPj0gMCkKICAgICAgICAgICAgICAgICAgICAgY29udGludWU7CiAgICAgICAg ICAgICAgICAgdG9wT2ZGaXJzdFJ1YnlUZXh0TGluZSArPSBjdXJyLT5sb2dpY2FsVG9wKCk7Cklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lRmxvd0JveC5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVGbG93Qm94LmgJKHJldmlzaW9uIDEw NzEyNCkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVGbG93Qm94LmgJKHdvcmtp bmcgY29weSkKQEAgLTExNyw4ICsxMTcsOCBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBSZW5kZXJM aW5lQm94TGlzdCogcmVuZGVyZXJMaW5lQm94ZXMoKSBjb25zdDsKIAogICAgIC8vIGxvZ2ljYWxM ZWZ0ID0gbGVmdCBpbiBhIGhvcml6b250YWwgbGluZSBhbmQgdG9wIGluIGEgdmVydGljYWwgbGlu ZS4KLSAgICBpbnQgbWFyZ2luQm9yZGVyUGFkZGluZ0xvZ2ljYWxMZWZ0KCkgY29uc3QgeyByZXR1 cm4gbWFyZ2luTG9naWNhbExlZnQoKSArIGJvcmRlckxvZ2ljYWxMZWZ0KCkgKyBwYWRkaW5nTG9n aWNhbExlZnQoKTsgfQotICAgIGludCBtYXJnaW5Cb3JkZXJQYWRkaW5nTG9naWNhbFJpZ2h0KCkg Y29uc3QgeyByZXR1cm4gbWFyZ2luTG9naWNhbFJpZ2h0KCkgKyBib3JkZXJMb2dpY2FsUmlnaHQo KSArIHBhZGRpbmdMb2dpY2FsUmlnaHQoKTsgfQorICAgIExheW91dFVuaXQgbWFyZ2luQm9yZGVy UGFkZGluZ0xvZ2ljYWxMZWZ0KCkgY29uc3QgeyByZXR1cm4gbWFyZ2luTG9naWNhbExlZnQoKSAr IGJvcmRlckxvZ2ljYWxMZWZ0KCkgKyBwYWRkaW5nTG9naWNhbExlZnQoKTsgfQorICAgIExheW91 dFVuaXQgbWFyZ2luQm9yZGVyUGFkZGluZ0xvZ2ljYWxSaWdodCgpIGNvbnN0IHsgcmV0dXJuIG1h cmdpbkxvZ2ljYWxSaWdodCgpICsgYm9yZGVyTG9naWNhbFJpZ2h0KCkgKyBwYWRkaW5nTG9naWNh bFJpZ2h0KCk7IH0KICAgICBMYXlvdXRVbml0IG1hcmdpbkxvZ2ljYWxMZWZ0KCkgY29uc3QKICAg ICB7CiAgICAgICAgIGlmICghaW5jbHVkZUxvZ2ljYWxMZWZ0RWRnZSgpKQpAQCAtMTY2LDcgKzE2 Niw3IEBAIHB1YmxpYzoKIAogICAgIC8vIEhlbHBlciBmdW5jdGlvbnMgdXNlZCBkdXJpbmcgbGlu ZSBjb25zdHJ1Y3Rpb24gYW5kIHBsYWNlbWVudC4KICAgICB2b2lkIGRldGVybWluZVNwYWNpbmdG b3JGbG93Qm94ZXMoYm9vbCBsYXN0TGluZSwgYm9vbCBpc0xvZ2ljYWxseUxhc3RSdW5XcmFwcGVk LCBSZW5kZXJPYmplY3QqIGxvZ2ljYWxseUxhc3RSdW5SZW5kZXJlcik7Ci0gICAgaW50IGdldEZs b3dTcGFjaW5nTG9naWNhbFdpZHRoKCk7CisgICAgTGF5b3V0VW5pdCBnZXRGbG93U3BhY2luZ0xv Z2ljYWxXaWR0aCgpOwogICAgIGZsb2F0IHBsYWNlQm94ZXNJbklubGluZURpcmVjdGlvbihmbG9h dCBsb2dpY2FsTGVmdCwgYm9vbCYgbmVlZHNXb3JkU3BhY2luZywgR2x5cGhPdmVyZmxvd0FuZEZh bGxiYWNrRm9udHNNYXAmKTsKICAgICB2b2lkIGNvbXB1dGVMb2dpY2FsQm94SGVpZ2h0cyhSb290 SW5saW5lQm94KiwgTGF5b3V0VW5pdCYgbWF4UG9zaXRpb25Ub3AsIExheW91dFVuaXQmIG1heFBv c2l0aW9uQm90dG9tLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIExheW91dFVu aXQmIG1heEFzY2VudCwgTGF5b3V0VW5pdCYgbWF4RGVzY2VudCwgYm9vbCYgc2V0TWF4QXNjZW50 LCBib29sJiBzZXRNYXhEZXNjZW50LAo=