62134 2011-06-06 11:32:38 -0700 Switch paintContents, paintColumnContents, paintColumnRules, and paintSelection to use IntPoint 2011-06-06 11:43:46 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 60318 1 leviw leviw darin eae eric simon.fraser oldest_to_newest 415912 0 leviw 2011-06-06 11:32:38 -0700 Ongoing tx/ty removal. 415915 1 96101 leviw 2011-06-06 11:35:26 -0700 Created attachment 96101 Patch 415922 2 96101 leviw 2011-06-06 11:43:43 -0700 Comment on attachment 96101 Patch Clearing flags on attachment: 96101 Committed r88176: <http://trac.webkit.org/changeset/88176> 415923 3 leviw 2011-06-06 11:43:46 -0700 All reviewed patches have been landed. Closing bug. 96101 2011-06-06 11:35:26 -0700 2011-06-06 11:43:42 -0700 Patch bug-62134-20110606113525.patch text/plain 9809 leviw SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg4MTc1KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTEtMDYtMDYgIExldmkgV2Vp bnRyYXViICA8bGV2aXdAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFN3aXRjaCBwYWludENvbnRlbnRzLCBwYWludENvbHVtbkNv bnRlbnRzLCBwYWludENvbHVtblJ1bGVzLCBhbmQgcGFpbnRTZWxlY3Rpb24gdG8gdXNlIEludFBv aW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MjEz NAorCisgICAgICAgIFN3aXRjaGluZyBwYWludENvbnRlbnRzLCBwYWludENvbHVtbkNvbnRlbnRz LCBwYWludENvbHVtblJ1bGVzLCBhbmQgcGFpbnRTZWxlY3Rpb24gdG8gdGFrZSBhbgorICAgICAg ICBJbnRQb2ludCByZXByZXNlbnRpbmcgdGhlIHBhaW50IG9mZnNldCBpbnN0ZWFkIG9mIGEgcGFp ciBvZiBpbnRzLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBhcyB0aGlzIHNpbXBsZSByZWZhY3Rv cmluZy4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9jay5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJCbG9jazo6cGFpbnRDb2x1bW5SdWxlcyk6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJCbG9jazo6cGFpbnRDb2x1bW5Db250ZW50cyk6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJCbG9jazo6cGFpbnRDb250ZW50cyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9j azo6cGFpbnRPYmplY3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OnBhaW50U2Vs ZWN0aW9uKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2suaDoKKwogMjAxMS0wNi0w NiAgWWFlbCBBaGFyb24gIDx5YWVsLmFoYXJvbkBub2tpYS5jb20+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgRXJpYyBTZWlkZWwuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy QmxvY2suY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC bG9jay5jcHAJKHJldmlzaW9uIDg4MTcyKQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckJsb2NrLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjI2OSw3ICsyMjY5LDcgQEAgdm9pZCBS ZW5kZXJCbG9jazo6cGFpbnQoUGFpbnRJbmZvJiBwYWludAogICAgICAgICBsYXllcigpLT5wYWlu dE92ZXJmbG93Q29udHJvbHMocGFpbnRJbmZvLmNvbnRleHQsIEludFBvaW50KHR4LCB0eSksIHBh aW50SW5mby5yZWN0KTsKIH0KIAotdm9pZCBSZW5kZXJCbG9jazo6cGFpbnRDb2x1bW5SdWxlcyhQ YWludEluZm8mIHBhaW50SW5mbywgaW50IHR4LCBpbnQgdHkpCit2b2lkIFJlbmRlckJsb2NrOjpw YWludENvbHVtblJ1bGVzKFBhaW50SW5mbyYgcGFpbnRJbmZvLCBjb25zdCBJbnRQb2ludCYgcGFp bnRPZmZzZXQpCiB7CiAgICAgaWYgKHBhaW50SW5mby5jb250ZXh0LT5wYWludGluZ0Rpc2FibGVk KCkpCiAgICAgICAgIHJldHVybjsKQEAgLTIzMDksOSArMjMwOSw5IEBAIHZvaWQgUmVuZGVyQmxv Y2s6OnBhaW50Q29sdW1uUnVsZXMoUGFpbnQKICAgICAgICAKICAgICAgICAgLy8gTm93IHBhaW50 IHRoZSBjb2x1bW4gcnVsZS4KICAgICAgICAgaWYgKGkgPCBjb2xDb3VudCAtIDEpIHsKLSAgICAg ICAgICAgIGludCBydWxlTGVmdCA9IGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgPyB0eCArIHJ1 bGVMb2dpY2FsTGVmdCAtIHJ1bGVXaWR0aCAvIDIgKyBydWxlQWRkIDogdHggKyBib3JkZXJCZWZv cmUoKSArIHBhZGRpbmdCZWZvcmUoKTsKKyAgICAgICAgICAgIGludCBydWxlTGVmdCA9IGlzSG9y aXpvbnRhbFdyaXRpbmdNb2RlKCkgPyBwYWludE9mZnNldC54KCkgKyBydWxlTG9naWNhbExlZnQg LSBydWxlV2lkdGggLyAyICsgcnVsZUFkZCA6IHBhaW50T2Zmc2V0LngoKSArIGJvcmRlckJlZm9y ZSgpICsgcGFkZGluZ0JlZm9yZSgpOwogICAgICAgICAgICAgaW50IHJ1bGVSaWdodCA9IGlzSG9y aXpvbnRhbFdyaXRpbmdNb2RlKCkgPyBydWxlTGVmdCArIHJ1bGVXaWR0aCA6IHJ1bGVMZWZ0ICsg Y29udGVudFdpZHRoKCk7Ci0gICAgICAgICAgICBpbnQgcnVsZVRvcCA9IGlzSG9yaXpvbnRhbFdy aXRpbmdNb2RlKCkgPyB0eSArIGJvcmRlclRvcCgpICsgcGFkZGluZ1RvcCgpIDogdHkgKyBydWxl TG9naWNhbExlZnQgLSBydWxlV2lkdGggLyAyICsgcnVsZUFkZDsKKyAgICAgICAgICAgIGludCBy dWxlVG9wID0gaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA/IHBhaW50T2Zmc2V0LnkoKSArIGJv cmRlclRvcCgpICsgcGFkZGluZ1RvcCgpIDogcGFpbnRPZmZzZXQueSgpICsgcnVsZUxvZ2ljYWxM ZWZ0IC0gcnVsZVdpZHRoIC8gMiArIHJ1bGVBZGQ7CiAgICAgICAgICAgICBpbnQgcnVsZUJvdHRv bSA9IGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgPyBydWxlVG9wICsgY29udGVudEhlaWdodCgp IDogcnVsZVRvcCArIHJ1bGVXaWR0aDsKICAgICAgICAgICAgIGRyYXdMaW5lRm9yQm94U2lkZShw YWludEluZm8uY29udGV4dCwgcnVsZUxlZnQsIHJ1bGVUb3AsIHJ1bGVSaWdodCwgcnVsZUJvdHRv bSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzdHlsZSgpLT5pc0xlZnRUb1JpZ2h0 RGlyZWN0aW9uKCkgPyBCU0xlZnQgOiBCU1JpZ2h0LCBydWxlQ29sb3IsIHJ1bGVTdHlsZSwgMCwg MCwgYW50aWFsaWFzKTsKQEAgLTIzMjEsNyArMjMyMSw3IEBAIHZvaWQgUmVuZGVyQmxvY2s6OnBh aW50Q29sdW1uUnVsZXMoUGFpbnQKICAgICB9CiB9CiAKLXZvaWQgUmVuZGVyQmxvY2s6OnBhaW50 Q29sdW1uQ29udGVudHMoUGFpbnRJbmZvJiBwYWludEluZm8sIGludCB0eCwgaW50IHR5LCBib29s IHBhaW50aW5nRmxvYXRzKQordm9pZCBSZW5kZXJCbG9jazo6cGFpbnRDb2x1bW5Db250ZW50cyhQ YWludEluZm8mIHBhaW50SW5mbywgY29uc3QgSW50UG9pbnQmIHBhaW50T2Zmc2V0LCBib29sIHBh aW50aW5nRmxvYXRzKQogewogICAgIC8vIFdlIG5lZWQgdG8gZG8gbXVsdGlwbGUgcGFzc2VzLCBi cmVha2luZyB1cCBvdXIgY2hpbGQgcGFpbnRpbmcgaW50byBzdHJpcHMuCiAgICAgR3JhcGhpY3ND b250ZXh0KiBjb250ZXh0ID0gcGFpbnRJbmZvLmNvbnRleHQ7CkBAIC0yMzM2LDcgKzIzMzYsNyBA QCB2b2lkIFJlbmRlckJsb2NrOjpwYWludENvbHVtbkNvbnRlbnRzKFBhCiAgICAgICAgIGZsaXBG b3JXcml0aW5nTW9kZShjb2xSZWN0KTsKICAgICAgICAgaW50IGxvZ2ljYWxMZWZ0T2Zmc2V0ID0g KGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgPyBjb2xSZWN0LngoKSA6IGNvbFJlY3QueSgpKSAt IGxvZ2ljYWxMZWZ0T2Zmc2V0Rm9yQ29udGVudCgpOwogICAgICAgICBJbnRTaXplIG9mZnNldCA9 IGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgPyBJbnRTaXplKGxvZ2ljYWxMZWZ0T2Zmc2V0LCBj dXJyTG9naWNhbFRvcE9mZnNldCkgOiBJbnRTaXplKGN1cnJMb2dpY2FsVG9wT2Zmc2V0LCBsb2dp Y2FsTGVmdE9mZnNldCk7Ci0gICAgICAgIGNvbFJlY3QubW92ZSh0eCwgdHkpOworICAgICAgICBj b2xSZWN0Lm1vdmVCeShwYWludE9mZnNldCk7CiAgICAgICAgIFBhaW50SW5mbyBpbmZvKHBhaW50 SW5mbyk7CiAgICAgICAgIGluZm8ucmVjdC5pbnRlcnNlY3QoY29sUmVjdCk7CiAgICAgICAgIApA QCAtMjM0OCwxMiArMjM0OCwxMSBAQCB2b2lkIFJlbmRlckJsb2NrOjpwYWludENvbHVtbkNvbnRl bnRzKFBhCiAgICAgICAgICAgICBjb250ZXh0LT5jbGlwKGNvbFJlY3QpOwogCiAgICAgICAgICAg ICAvLyBBZGp1c3Qgb3VyIHggYW5kIHkgd2hlbiBwYWludGluZy4KLSAgICAgICAgICAgIGludCBm aW5hbFggPSB0eCArIG9mZnNldC53aWR0aCgpOwotICAgICAgICAgICAgaW50IGZpbmFsWSA9IHR5 ICsgb2Zmc2V0LmhlaWdodCgpOworICAgICAgICAgICAgSW50UG9pbnQgYWRqdXN0ZWRQYWludE9m ZnNldCA9IHBhaW50T2Zmc2V0ICsgb2Zmc2V0OwogICAgICAgICAgICAgaWYgKHBhaW50aW5nRmxv YXRzKQotICAgICAgICAgICAgICAgIHBhaW50RmxvYXRzKGluZm8sIEludFBvaW50KGZpbmFsWCwg ZmluYWxZKSwgcGFpbnRJbmZvLnBoYXNlID09IFBhaW50UGhhc2VTZWxlY3Rpb24gfHwgcGFpbnRJ bmZvLnBoYXNlID09IFBhaW50UGhhc2VUZXh0Q2xpcCk7CisgICAgICAgICAgICAgICAgcGFpbnRG bG9hdHMoaW5mbywgYWRqdXN0ZWRQYWludE9mZnNldCwgcGFpbnRJbmZvLnBoYXNlID09IFBhaW50 UGhhc2VTZWxlY3Rpb24gfHwgcGFpbnRJbmZvLnBoYXNlID09IFBhaW50UGhhc2VUZXh0Q2xpcCk7 CiAgICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAgcGFpbnRDb250ZW50cyhpbmZvLCBm aW5hbFgsIGZpbmFsWSk7CisgICAgICAgICAgICAgICAgcGFpbnRDb250ZW50cyhpbmZvLCBhZGp1 c3RlZFBhaW50T2Zmc2V0KTsKICAgICAgICAgfQogCiAgICAgICAgIGludCBibG9ja0RlbHRhID0g KGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgPyBjb2xSZWN0LmhlaWdodCgpIDogY29sUmVjdC53 aWR0aCgpKTsKQEAgLTIzNjQsNyArMjM2Myw3IEBAIHZvaWQgUmVuZGVyQmxvY2s6OnBhaW50Q29s dW1uQ29udGVudHMoUGEKICAgICB9CiB9CiAKLXZvaWQgUmVuZGVyQmxvY2s6OnBhaW50Q29udGVu dHMoUGFpbnRJbmZvJiBwYWludEluZm8sIGludCB0eCwgaW50IHR5KQordm9pZCBSZW5kZXJCbG9j azo6cGFpbnRDb250ZW50cyhQYWludEluZm8mIHBhaW50SW5mbywgY29uc3QgSW50UG9pbnQmIHBh aW50T2Zmc2V0KQogewogICAgIC8vIEF2b2lkIHBhaW50aW5nIGRlc2NlbmRhbnRzIG9mIHRoZSBy b290IGVsZW1lbnQgd2hlbiBzdHlsZXNoZWV0cyBoYXZlbid0IGxvYWRlZC4gIFRoaXMgZWxpbWlu YXRlcyBGT1VDLgogICAgIC8vIEl0J3Mgb2sgbm90IHRvIGRyYXcsIGJlY2F1c2UgbGF0ZXIgb24s IHdoZW4gYWxsIHRoZSBzdHlsZXNoZWV0cyBkbyBsb2FkLCB1cGRhdGVTdHlsZVNlbGVjdG9yIG9u IHRoZSBEb2N1bWVudApAQCAtMjM3Myw5ICsyMzcyLDkgQEAgdm9pZCBSZW5kZXJCbG9jazo6cGFp bnRDb250ZW50cyhQYWludEluZgogICAgICAgICByZXR1cm47CiAKICAgICBpZiAoY2hpbGRyZW5J bmxpbmUoKSkKLSAgICAgICAgbV9saW5lQm94ZXMucGFpbnQodGhpcywgcGFpbnRJbmZvLCB0eCwg dHkpOworICAgICAgICBtX2xpbmVCb3hlcy5wYWludCh0aGlzLCBwYWludEluZm8sIHBhaW50T2Zm c2V0LngoKSwgcGFpbnRPZmZzZXQueSgpKTsKICAgICBlbHNlCi0gICAgICAgIHBhaW50Q2hpbGRy ZW4ocGFpbnRJbmZvLCBJbnRQb2ludCh0eCwgdHkpKTsKKyAgICAgICAgcGFpbnRDaGlsZHJlbihw YWludEluZm8sIHBhaW50T2Zmc2V0KTsKIH0KIAogdm9pZCBSZW5kZXJCbG9jazo6cGFpbnRDaGls ZHJlbihQYWludEluZm8mIHBhaW50SW5mbywgY29uc3QgSW50UG9pbnQmIHBhaW50T2Zmc2V0KQpA QCAtMjQ2Niw3ICsyNDY1LDcgQEAgdm9pZCBSZW5kZXJCbG9jazo6cGFpbnRPYmplY3QoUGFpbnRJ bmZvJgogICAgICAgICBpZiAoaGFzQm94RGVjb3JhdGlvbnMoKSkKICAgICAgICAgICAgIHBhaW50 Qm94RGVjb3JhdGlvbnMocGFpbnRJbmZvLCBwYWludE9mZnNldCk7CiAgICAgICAgIGlmIChoYXND b2x1bW5zKCkpCi0gICAgICAgICAgICBwYWludENvbHVtblJ1bGVzKHBhaW50SW5mbywgcGFpbnRP ZmZzZXQueCgpLCBwYWludE9mZnNldC55KCkpOworICAgICAgICAgICAgcGFpbnRDb2x1bW5SdWxl cyhwYWludEluZm8sIHBhaW50T2Zmc2V0KTsKICAgICB9CiAKICAgICBpZiAocGFpbnRQaGFzZSA9 PSBQYWludFBoYXNlTWFzayAmJiBzdHlsZSgpLT52aXNpYmlsaXR5KCkgPT0gVklTSUJMRSkgewpA QCAtMjQ4NiwyMSArMjQ4NSwyMSBAQCB2b2lkIFJlbmRlckJsb2NrOjpwYWludE9iamVjdChQYWlu dEluZm8mCiAgICAgLy8gMi4gcGFpbnQgY29udGVudHMKICAgICBpZiAocGFpbnRQaGFzZSAhPSBQ YWludFBoYXNlU2VsZk91dGxpbmUpIHsKICAgICAgICAgaWYgKGhhc0NvbHVtbnMoKSkKLSAgICAg ICAgICAgIHBhaW50Q29sdW1uQ29udGVudHMocGFpbnRJbmZvLCBzY3JvbGxlZE9mZnNldC54KCks IHNjcm9sbGVkT2Zmc2V0LnkoKSk7CisgICAgICAgICAgICBwYWludENvbHVtbkNvbnRlbnRzKHBh aW50SW5mbywgc2Nyb2xsZWRPZmZzZXQpOwogICAgICAgICBlbHNlCi0gICAgICAgICAgICBwYWlu dENvbnRlbnRzKHBhaW50SW5mbywgc2Nyb2xsZWRPZmZzZXQueCgpLCBzY3JvbGxlZE9mZnNldC55 KCkpOworICAgICAgICAgICAgcGFpbnRDb250ZW50cyhwYWludEluZm8sIHNjcm9sbGVkT2Zmc2V0 KTsKICAgICB9CiAKICAgICAvLyAzLiBwYWludCBzZWxlY3Rpb24KICAgICAvLyBGSVhNRTogTWFr ZSB0aGlzIHdvcmsgd2l0aCBtdWx0aSBjb2x1bW4gbGF5b3V0cy4gIEZvciBub3cgZG9uJ3QgZmls bCBnYXBzLgogICAgIGJvb2wgaXNQcmludGluZyA9IGRvY3VtZW50KCktPnByaW50aW5nKCk7CiAg ICAgaWYgKCFpc1ByaW50aW5nICYmICFoYXNDb2x1bW5zKCkpCi0gICAgICAgIHBhaW50U2VsZWN0 aW9uKHBhaW50SW5mbywgc2Nyb2xsZWRPZmZzZXQueCgpLCBzY3JvbGxlZE9mZnNldC55KCkpOyAv LyBGaWxsIGluIGdhcHMgaW4gc2VsZWN0aW9uIG9uIGxpbmVzIGFuZCBiZXR3ZWVuIGJsb2Nrcy4K KyAgICAgICAgcGFpbnRTZWxlY3Rpb24ocGFpbnRJbmZvLCBzY3JvbGxlZE9mZnNldCk7IC8vIEZp bGwgaW4gZ2FwcyBpbiBzZWxlY3Rpb24gb24gbGluZXMgYW5kIGJldHdlZW4gYmxvY2tzLgogCiAg ICAgLy8gNC4gcGFpbnQgZmxvYXRzLgogICAgIGlmIChwYWludFBoYXNlID09IFBhaW50UGhhc2VG bG9hdCB8fCBwYWludFBoYXNlID09IFBhaW50UGhhc2VTZWxlY3Rpb24gfHwgcGFpbnRQaGFzZSA9 PSBQYWludFBoYXNlVGV4dENsaXApIHsKICAgICAgICAgaWYgKGhhc0NvbHVtbnMoKSkKLSAgICAg ICAgICAgIHBhaW50Q29sdW1uQ29udGVudHMocGFpbnRJbmZvLCBzY3JvbGxlZE9mZnNldC54KCks IHNjcm9sbGVkT2Zmc2V0LnkoKSwgdHJ1ZSk7CisgICAgICAgICAgICBwYWludENvbHVtbkNvbnRl bnRzKHBhaW50SW5mbywgc2Nyb2xsZWRPZmZzZXQsIHRydWUpOwogICAgICAgICBlbHNlCiAgICAg ICAgICAgICBwYWludEZsb2F0cyhwYWludEluZm8sIHNjcm9sbGVkT2Zmc2V0LCBwYWludFBoYXNl ID09IFBhaW50UGhhc2VTZWxlY3Rpb24gfHwgcGFpbnRQaGFzZSA9PSBQYWludFBoYXNlVGV4dENs aXApOwogICAgIH0KQEAgLTI3NDAsNyArMjczOSw3IEBAIEdhcFJlY3RzIFJlbmRlckJsb2NrOjpz ZWxlY3Rpb25HYXBSZWN0c0YKICAgICByZXR1cm4gc2VsZWN0aW9uR2Fwcyh0aGlzLCBvZmZzZXRG cm9tUmVwYWludENvbnRhaW5lciwgSW50U2l6ZSgpLCBsYXN0VG9wLCBsYXN0TGVmdCwgbGFzdFJp Z2h0KTsKIH0KIAotdm9pZCBSZW5kZXJCbG9jazo6cGFpbnRTZWxlY3Rpb24oUGFpbnRJbmZvJiBw YWludEluZm8sIGludCB0eCwgaW50IHR5KQordm9pZCBSZW5kZXJCbG9jazo6cGFpbnRTZWxlY3Rp b24oUGFpbnRJbmZvJiBwYWludEluZm8sIGNvbnN0IEludFBvaW50JiBwYWludE9mZnNldCkKIHsK ICAgICBpZiAoc2hvdWxkUGFpbnRTZWxlY3Rpb25HYXBzKCkgJiYgcGFpbnRJbmZvLnBoYXNlID09 IFBhaW50UGhhc2VGb3JlZ3JvdW5kKSB7CiAgICAgICAgIGludCBsYXN0VG9wID0gMDsKQEAgLTI3 NDgsMTAgKzI3NDcsMTAgQEAgdm9pZCBSZW5kZXJCbG9jazo6cGFpbnRTZWxlY3Rpb24oUGFpbnRJ bgogICAgICAgICBpbnQgbGFzdFJpZ2h0ID0gbG9naWNhbFJpZ2h0U2VsZWN0aW9uT2Zmc2V0KHRo aXMsIGxhc3RUb3ApOwogICAgICAgICBHcmFwaGljc0NvbnRleHRTdGF0ZVNhdmVyIHN0YXRlU2F2 ZXIoKnBhaW50SW5mby5jb250ZXh0KTsKIAotICAgICAgICBJbnRSZWN0IGdhcFJlY3RzQm91bmRz ID0gc2VsZWN0aW9uR2Fwcyh0aGlzLCBJbnRQb2ludCh0eCwgdHkpLCBJbnRTaXplKCksIGxhc3RU b3AsIGxhc3RMZWZ0LCBsYXN0UmlnaHQsICZwYWludEluZm8pOworICAgICAgICBJbnRSZWN0IGdh cFJlY3RzQm91bmRzID0gc2VsZWN0aW9uR2Fwcyh0aGlzLCBwYWludE9mZnNldCwgSW50U2l6ZSgp LCBsYXN0VG9wLCBsYXN0TGVmdCwgbGFzdFJpZ2h0LCAmcGFpbnRJbmZvKTsKICAgICAgICAgaWYg KCFnYXBSZWN0c0JvdW5kcy5pc0VtcHR5KCkpIHsKICAgICAgICAgICAgIGlmIChSZW5kZXJMYXll ciogbGF5ZXIgPSBlbmNsb3NpbmdMYXllcigpKSB7Ci0gICAgICAgICAgICAgICAgZ2FwUmVjdHNC b3VuZHMubW92ZShJbnRTaXplKC10eCwgLXR5KSk7CisgICAgICAgICAgICAgICAgZ2FwUmVjdHNC b3VuZHMubW92ZUJ5KC1wYWludE9mZnNldCk7CiAgICAgICAgICAgICAgICAgaWYgKCFoYXNMYXll cigpKSB7CiAgICAgICAgICAgICAgICAgICAgIEludFJlY3QgbG9jYWxCb3VuZHMoZ2FwUmVjdHNC b3VuZHMpOwogICAgICAgICAgICAgICAgICAgICBmbGlwRm9yV3JpdGluZ01vZGUobG9jYWxCb3Vu ZHMpOwpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgJKHJldmlzaW9u IDg4MTcyKQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgJKHdvcmtp bmcgY29weSkKQEAgLTU2MCwxMiArNTYwLDEyIEBAIHByaXZhdGU6CiAgICAgLy8gRW5kIG9mIGZ1 bmN0aW9ucyBkZWZpbmVkIGluIFJlbmRlckJsb2NrTGluZUxheW91dC5jcHAuCiAKICAgICB2b2lk IHBhaW50RmxvYXRzKFBhaW50SW5mbyYsIGNvbnN0IEludFBvaW50JiwgYm9vbCBwcmVzZXJ2ZVBo YXNlID0gZmFsc2UpOwotICAgIHZvaWQgcGFpbnRDb250ZW50cyhQYWludEluZm8mLCBpbnQgdHgs IGludCB0eSk7Ci0gICAgdm9pZCBwYWludENvbHVtbkNvbnRlbnRzKFBhaW50SW5mbyYsIGludCB0 eCwgaW50IHR5LCBib29sIHBhaW50RmxvYXRzID0gZmFsc2UpOwotICAgIHZvaWQgcGFpbnRDb2x1 bW5SdWxlcyhQYWludEluZm8mLCBpbnQgdHgsIGludCB0eSk7CisgICAgdm9pZCBwYWludENvbnRl bnRzKFBhaW50SW5mbyYsIGNvbnN0IEludFBvaW50Jik7CisgICAgdm9pZCBwYWludENvbHVtbkNv bnRlbnRzKFBhaW50SW5mbyYsIGNvbnN0IEludFBvaW50JiwgYm9vbCBwYWludEZsb2F0cyA9IGZh bHNlKTsKKyAgICB2b2lkIHBhaW50Q29sdW1uUnVsZXMoUGFpbnRJbmZvJiwgY29uc3QgSW50UG9p bnQmKTsKICAgICB2b2lkIHBhaW50Q2hpbGRyZW4oUGFpbnRJbmZvJiwgY29uc3QgSW50UG9pbnQm KTsKICAgICB2b2lkIHBhaW50RWxsaXBzaXNCb3hlcyhQYWludEluZm8mLCBjb25zdCBJbnRQb2lu dCYpOwotICAgIHZvaWQgcGFpbnRTZWxlY3Rpb24oUGFpbnRJbmZvJiwgaW50IHR4LCBpbnQgdHkp OworICAgIHZvaWQgcGFpbnRTZWxlY3Rpb24oUGFpbnRJbmZvJiwgY29uc3QgSW50UG9pbnQmKTsK ICAgICB2b2lkIHBhaW50Q2FyZXQoUGFpbnRJbmZvJiwgY29uc3QgSW50UG9pbnQmLCBDYXJldFR5 cGUpOwogCiAgICAgRmxvYXRpbmdPYmplY3QqIGluc2VydEZsb2F0aW5nT2JqZWN0KFJlbmRlckJv eCopOwo=