62058 2011-06-03 15:03:32 -0700 Switch paintFloats, paintChildren, and paintEllipsisBoxes to use IntPoint 2011-06-06 10:50:11 -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 415228 0 leviw 2011-06-03 15:03:32 -0700 Now with triple the tx/ty removal! 415230 1 95971 leviw 2011-06-03 15:06:30 -0700 Created attachment 95971 Patch 415245 2 95971 eric 2011-06-03 15:40:21 -0700 Comment on attachment 95971 Patch Yay! 415891 3 leviw 2011-06-06 10:50:11 -0700 Committed r88172: <http://trac.webkit.org/changeset/88172> 95971 2011-06-03 15:06:30 -0700 2011-06-03 15:40:21 -0700 Patch bug-62058-20110603150629.patch text/plain 9953 leviw SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg4MDY3KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTEtMDYtMDMgIExldmkgV2Vp bnRyYXViICA8bGV2aXdAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFN3aXRjaCBwYWludEZsb2F0cywgcGFpbnRDaGlsZHJlbiwg YW5kIHBhaW50RWxsaXBzaXNCb3hlcyB0byB1c2UgSW50UG9pbnQKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYyMDU4CisKKyAgICAgICAgU3dpdGNoaW5n IHBhaW50RmxvYXRzLCBwYWludENoaWxkcmVuLCBhbmQgcGFpbnRFbGxpcHNpc0JveGVzIHRvIHRh a2UgSW50UG9pbnRzIHJlcHJlc2VudGluZworICAgICAgICB0aGVpciBwYWludCBvZmZzZXRzIGlu c3RlYWQgb2YgcGFpcnMgb2YgaW50cy4KKworICAgICAgICBObyBuZXcgdGVzdHMgc2luY2UgdGhp cyBpcyBzaW1wbGUgcmVmYWN0b3JpbmcuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxv Y2suY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OnBhaW50Q29sdW1uQ29udGVu dHMpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OnBhaW50Q29udGVudHMpOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OnBhaW50Q2hpbGRyZW4pOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyQmxvY2s6OnBhaW50T2JqZWN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ckJsb2NrOjpwYWludEZsb2F0cyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6cGFp bnRFbGxpcHNpc0JveGVzKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2suaDoKKwog MjAxMS0wNS0zMSAgTWFydGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgUnlvc3VrZSBOaXdhLgpJbmRleDogU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckJsb2NrLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQmxvY2suY3BwCShyZXZpc2lvbiA4ODA1MikKKysrIFNvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIzNTMsNyArMjM1 Myw3IEBAIHZvaWQgUmVuZGVyQmxvY2s6OnBhaW50Q29sdW1uQ29udGVudHMoUGEKICAgICAgICAg ICAgIGludCBmaW5hbFggPSB0eCArIG9mZnNldC53aWR0aCgpOwogICAgICAgICAgICAgaW50IGZp bmFsWSA9IHR5ICsgb2Zmc2V0LmhlaWdodCgpOwogICAgICAgICAgICAgaWYgKHBhaW50aW5nRmxv YXRzKQotICAgICAgICAgICAgICAgIHBhaW50RmxvYXRzKGluZm8sIGZpbmFsWCwgZmluYWxZLCBw YWludEluZm8ucGhhc2UgPT0gUGFpbnRQaGFzZVNlbGVjdGlvbiB8fCBwYWludEluZm8ucGhhc2Ug PT0gUGFpbnRQaGFzZVRleHRDbGlwKTsKKyAgICAgICAgICAgICAgICBwYWludEZsb2F0cyhpbmZv LCBJbnRQb2ludChmaW5hbFgsIGZpbmFsWSksIHBhaW50SW5mby5waGFzZSA9PSBQYWludFBoYXNl U2VsZWN0aW9uIHx8IHBhaW50SW5mby5waGFzZSA9PSBQYWludFBoYXNlVGV4dENsaXApOwogICAg ICAgICAgICAgZWxzZQogICAgICAgICAgICAgICAgIHBhaW50Q29udGVudHMoaW5mbywgZmluYWxY LCBmaW5hbFkpOwogICAgICAgICB9CkBAIC0yMzc3LDEwICsyMzc3LDEwIEBAIHZvaWQgUmVuZGVy QmxvY2s6OnBhaW50Q29udGVudHMoUGFpbnRJbmYKICAgICBpZiAoY2hpbGRyZW5JbmxpbmUoKSkK ICAgICAgICAgbV9saW5lQm94ZXMucGFpbnQodGhpcywgcGFpbnRJbmZvLCB0eCwgdHkpOwogICAg IGVsc2UKLSAgICAgICAgcGFpbnRDaGlsZHJlbihwYWludEluZm8sIHR4LCB0eSk7CisgICAgICAg IHBhaW50Q2hpbGRyZW4ocGFpbnRJbmZvLCBJbnRQb2ludCh0eCwgdHkpKTsKIH0KIAotdm9pZCBS ZW5kZXJCbG9jazo6cGFpbnRDaGlsZHJlbihQYWludEluZm8mIHBhaW50SW5mbywgaW50IHR4LCBp bnQgdHkpCit2b2lkIFJlbmRlckJsb2NrOjpwYWludENoaWxkcmVuKFBhaW50SW5mbyYgcGFpbnRJ bmZvLCBjb25zdCBJbnRQb2ludCYgcGFpbnRPZmZzZXQpCiB7CiAgICAgUGFpbnRQaGFzZSBuZXdQ aGFzZSA9IChwYWludEluZm8ucGhhc2UgPT0gUGFpbnRQaGFzZUNoaWxkT3V0bGluZXMpID8gUGFp bnRQaGFzZU91dGxpbmUgOiBwYWludEluZm8ucGhhc2U7CiAgICAgbmV3UGhhc2UgPSAobmV3UGhh c2UgPT0gUGFpbnRQaGFzZUNoaWxkQmxvY2tCYWNrZ3JvdW5kcykgPyBQYWludFBoYXNlQ2hpbGRC bG9ja0JhY2tncm91bmQgOiBuZXdQaGFzZTsKQEAgLTIzOTgsMzQgKzIzOTgsMzUgQEAgdm9pZCBS ZW5kZXJCbG9jazo6cGFpbnRDaGlsZHJlbihQYWludEluZgogICAgIGZvciAoUmVuZGVyQm94KiBj aGlsZCA9IGZpcnN0Q2hpbGRCb3goKTsgY2hpbGQ7IGNoaWxkID0gY2hpbGQtPm5leHRTaWJsaW5n Qm94KCkpIHsgICAgICAgIAogICAgICAgICAvLyBDaGVjayBmb3IgcGFnZS1icmVhay1iZWZvcmU6 IGFsd2F5cywgYW5kIGlmIGl0J3Mgc2V0LCBicmVhayBhbmQgYmFpbC4KICAgICAgICAgYm9vbCBj aGVja0JlZm9yZUFsd2F5cyA9ICFjaGlsZHJlbklubGluZSgpICYmICh1c2VQcmludFJlY3QgJiYg Y2hpbGQtPnN0eWxlKCktPnBhZ2VCcmVha0JlZm9yZSgpID09IFBCQUxXQVlTKTsKKyAgICAgICAg aW50IGFic29sdXRlQ2hpbGRZID0gcGFpbnRPZmZzZXQueSgpICsgY2hpbGQtPnkoKTsKICAgICAg ICAgaWYgKGNoZWNrQmVmb3JlQWx3YXlzCi0gICAgICAgICAgICAmJiAodHkgKyBjaGlsZC0+eSgp KSA+IHBhaW50SW5mby5yZWN0LnkoKQotICAgICAgICAgICAgJiYgKHR5ICsgY2hpbGQtPnkoKSkg PCBwYWludEluZm8ucmVjdC5tYXhZKCkpIHsKLSAgICAgICAgICAgIHZpZXcoKS0+c2V0QmVzdFRy dW5jYXRlZEF0KHR5ICsgY2hpbGQtPnkoKSwgdGhpcywgdHJ1ZSk7CisgICAgICAgICAgICAmJiBh YnNvbHV0ZUNoaWxkWSA+IHBhaW50SW5mby5yZWN0LnkoKQorICAgICAgICAgICAgJiYgYWJzb2x1 dGVDaGlsZFkgPCBwYWludEluZm8ucmVjdC5tYXhZKCkpIHsKKyAgICAgICAgICAgIHZpZXcoKS0+ c2V0QmVzdFRydW5jYXRlZEF0KGFic29sdXRlQ2hpbGRZLCB0aGlzLCB0cnVlKTsKICAgICAgICAg ICAgIHJldHVybjsKICAgICAgICAgfQogCiAgICAgICAgIGlmICghY2hpbGQtPmlzRmxvYXRpbmco KSAmJiBjaGlsZC0+aXNSZXBsYWNlZCgpICYmIHVzZVByaW50UmVjdCAmJiBjaGlsZC0+aGVpZ2h0 KCkgPD0gcmVuZGVyVmlldy0+cHJpbnRSZWN0KCkuaGVpZ2h0KCkpIHsKICAgICAgICAgICAgIC8v IFBhZ2luYXRlIGJsb2NrLWxldmVsIHJlcGxhY2VkIGVsZW1lbnRzLgotICAgICAgICAgICAgaWYg KHR5ICsgY2hpbGQtPnkoKSArIGNoaWxkLT5oZWlnaHQoKSA+IHJlbmRlclZpZXctPnByaW50UmVj dCgpLm1heFkoKSkgewotICAgICAgICAgICAgICAgIGlmICh0eSArIGNoaWxkLT55KCkgPCByZW5k ZXJWaWV3LT50cnVuY2F0ZWRBdCgpKQotICAgICAgICAgICAgICAgICAgICByZW5kZXJWaWV3LT5z ZXRCZXN0VHJ1bmNhdGVkQXQodHkgKyBjaGlsZC0+eSgpLCBjaGlsZCk7CisgICAgICAgICAgICBp ZiAoYWJzb2x1dGVDaGlsZFkgKyBjaGlsZC0+aGVpZ2h0KCkgPiByZW5kZXJWaWV3LT5wcmludFJl Y3QoKS5tYXhZKCkpIHsKKyAgICAgICAgICAgICAgICBpZiAoYWJzb2x1dGVDaGlsZFkgPCByZW5k ZXJWaWV3LT50cnVuY2F0ZWRBdCgpKQorICAgICAgICAgICAgICAgICAgICByZW5kZXJWaWV3LT5z ZXRCZXN0VHJ1bmNhdGVkQXQoYWJzb2x1dGVDaGlsZFksIGNoaWxkKTsKICAgICAgICAgICAgICAg ICAvLyBJZiB3ZSB3ZXJlIGFibGUgdG8gdHJ1bmNhdGUsIGRvbid0IHBhaW50LgotICAgICAgICAg ICAgICAgIGlmICh0eSArIGNoaWxkLT55KCkgPj0gcmVuZGVyVmlldy0+dHJ1bmNhdGVkQXQoKSkK KyAgICAgICAgICAgICAgICBpZiAoYWJzb2x1dGVDaGlsZFkgPj0gcmVuZGVyVmlldy0+dHJ1bmNh dGVkQXQoKSkKICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICB9CiAgICAg ICAgIH0KIAotICAgICAgICBJbnRQb2ludCBjaGlsZFBvaW50ID0gZmxpcEZvcldyaXRpbmdNb2Rl KGNoaWxkLCBJbnRQb2ludCh0eCwgdHkpLCBQYXJlbnRUb0NoaWxkRmxpcHBpbmdBZGp1c3RtZW50 KTsKKyAgICAgICAgSW50UG9pbnQgY2hpbGRQb2ludCA9IGZsaXBGb3JXcml0aW5nTW9kZShjaGls ZCwgcGFpbnRPZmZzZXQsIFBhcmVudFRvQ2hpbGRGbGlwcGluZ0FkanVzdG1lbnQpOwogICAgICAg ICBpZiAoIWNoaWxkLT5oYXNTZWxmUGFpbnRpbmdMYXllcigpICYmICFjaGlsZC0+aXNGbG9hdGlu ZygpKQogICAgICAgICAgICAgY2hpbGQtPnBhaW50KGluZm8sIGNoaWxkUG9pbnQueCgpLCBjaGls ZFBvaW50LnkoKSk7CiAKICAgICAgICAgLy8gQ2hlY2sgZm9yIHBhZ2UtYnJlYWstYWZ0ZXI6IGFs d2F5cywgYW5kIGlmIGl0J3Mgc2V0LCBicmVhayBhbmQgYmFpbC4KICAgICAgICAgYm9vbCBjaGVj a0FmdGVyQWx3YXlzID0gIWNoaWxkcmVuSW5saW5lKCkgJiYgKHVzZVByaW50UmVjdCAmJiBjaGls ZC0+c3R5bGUoKS0+cGFnZUJyZWFrQWZ0ZXIoKSA9PSBQQkFMV0FZUyk7CiAgICAgICAgIGlmIChj aGVja0FmdGVyQWx3YXlzCi0gICAgICAgICAgICAmJiAodHkgKyBjaGlsZC0+eSgpICsgY2hpbGQt PmhlaWdodCgpKSA+IHBhaW50SW5mby5yZWN0LnkoKQotICAgICAgICAgICAgJiYgKHR5ICsgY2hp bGQtPnkoKSArIGNoaWxkLT5oZWlnaHQoKSkgPCBwYWludEluZm8ucmVjdC5tYXhZKCkpIHsKLSAg ICAgICAgICAgIHZpZXcoKS0+c2V0QmVzdFRydW5jYXRlZEF0KHR5ICsgY2hpbGQtPnkoKSArIGNo aWxkLT5oZWlnaHQoKSArIG1heCgwLCBjaGlsZC0+Y29sbGFwc2VkTWFyZ2luQWZ0ZXIoKSksIHRo aXMsIHRydWUpOworICAgICAgICAgICAgJiYgKGFic29sdXRlQ2hpbGRZICsgY2hpbGQtPmhlaWdo dCgpKSA+IHBhaW50SW5mby5yZWN0LnkoKQorICAgICAgICAgICAgJiYgKGFic29sdXRlQ2hpbGRZ ICsgY2hpbGQtPmhlaWdodCgpKSA8IHBhaW50SW5mby5yZWN0Lm1heFkoKSkgeworICAgICAgICAg ICAgdmlldygpLT5zZXRCZXN0VHJ1bmNhdGVkQXQoYWJzb2x1dGVDaGlsZFkgKyBjaGlsZC0+aGVp Z2h0KCkgKyBtYXgoMCwgY2hpbGQtPmNvbGxhcHNlZE1hcmdpbkFmdGVyKCkpLCB0aGlzLCB0cnVl KTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogICAgIH0KQEAgLTI1MDcsNyArMjUw OCw3IEBAIHZvaWQgUmVuZGVyQmxvY2s6OnBhaW50T2JqZWN0KFBhaW50SW5mbyYKICAgICAgICAg aWYgKGhhc0NvbHVtbnMoKSkKICAgICAgICAgICAgIHBhaW50Q29sdW1uQ29udGVudHMocGFpbnRJ bmZvLCBzY3JvbGxlZFgsIHNjcm9sbGVkWSwgdHJ1ZSk7CiAgICAgICAgIGVsc2UKLSAgICAgICAg ICAgIHBhaW50RmxvYXRzKHBhaW50SW5mbywgc2Nyb2xsZWRYLCBzY3JvbGxlZFksIHBhaW50UGhh c2UgPT0gUGFpbnRQaGFzZVNlbGVjdGlvbiB8fCBwYWludFBoYXNlID09IFBhaW50UGhhc2VUZXh0 Q2xpcCk7CisgICAgICAgICAgICBwYWludEZsb2F0cyhwYWludEluZm8sIEludFBvaW50KHNjcm9s bGVkWCwgc2Nyb2xsZWRZKSwgcGFpbnRQaGFzZSA9PSBQYWludFBoYXNlU2VsZWN0aW9uIHx8IHBh aW50UGhhc2UgPT0gUGFpbnRQaGFzZVRleHRDbGlwKTsKICAgICB9CiAKICAgICAvLyA1LiBwYWlu dCBvdXRsaW5lLgpAQCAtMjU2MCw3ICsyNTYxLDcgQEAgSW50UG9pbnQgUmVuZGVyQmxvY2s6OmZs aXBGbG9hdEZvcldyaXRpbgogICAgIHJldHVybiBJbnRQb2ludChwb2ludC54KCkgKyB3aWR0aCgp IC0gY2hpbGQtPndpZHRoKCkgLSAyICogeFBvc2l0aW9uRm9yRmxvYXRJbmNsdWRpbmdNYXJnaW4o Y2hpbGQpLCBwb2ludC55KCkpOwogfQogCi12b2lkIFJlbmRlckJsb2NrOjpwYWludEZsb2F0cyhQ YWludEluZm8mIHBhaW50SW5mbywgaW50IHR4LCBpbnQgdHksIGJvb2wgcHJlc2VydmVQaGFzZSkK K3ZvaWQgUmVuZGVyQmxvY2s6OnBhaW50RmxvYXRzKFBhaW50SW5mbyYgcGFpbnRJbmZvLCBjb25z dCBJbnRQb2ludCYgcGFpbnRPZmZzZXQsIGJvb2wgcHJlc2VydmVQaGFzZSkKIHsKICAgICBpZiAo IW1fZmxvYXRpbmdPYmplY3RzKQogICAgICAgICByZXR1cm47CkBAIC0yNTczLDcgKzI1NzQsNyBA QCB2b2lkIFJlbmRlckJsb2NrOjpwYWludEZsb2F0cyhQYWludEluZm8mCiAgICAgICAgIGlmIChy LT5tX3Nob3VsZFBhaW50ICYmICFyLT5tX3JlbmRlcmVyLT5oYXNTZWxmUGFpbnRpbmdMYXllcigp KSB7CiAgICAgICAgICAgICBQYWludEluZm8gY3VycmVudFBhaW50SW5mbyhwYWludEluZm8pOwog ICAgICAgICAgICAgY3VycmVudFBhaW50SW5mby5waGFzZSA9IHByZXNlcnZlUGhhc2UgPyBwYWlu dEluZm8ucGhhc2UgOiBQYWludFBoYXNlQmxvY2tCYWNrZ3JvdW5kOwotICAgICAgICAgICAgSW50 UG9pbnQgY2hpbGRQb2ludCA9IGZsaXBGbG9hdEZvcldyaXRpbmdNb2RlKHIsIEludFBvaW50KHR4 ICsgeFBvc2l0aW9uRm9yRmxvYXRJbmNsdWRpbmdNYXJnaW4ocikgLSByLT5tX3JlbmRlcmVyLT54 KCksIHR5ICsgeVBvc2l0aW9uRm9yRmxvYXRJbmNsdWRpbmdNYXJnaW4ocikgLSByLT5tX3JlbmRl cmVyLT55KCkpKTsKKyAgICAgICAgICAgIEludFBvaW50IGNoaWxkUG9pbnQgPSBmbGlwRmxvYXRG b3JXcml0aW5nTW9kZShyLCBJbnRQb2ludChwYWludE9mZnNldC54KCkgKyB4UG9zaXRpb25Gb3JG bG9hdEluY2x1ZGluZ01hcmdpbihyKSAtIHItPm1fcmVuZGVyZXItPngoKSwgcGFpbnRPZmZzZXQu eSgpICsgeVBvc2l0aW9uRm9yRmxvYXRJbmNsdWRpbmdNYXJnaW4ocikgLSByLT5tX3JlbmRlcmVy LT55KCkpKTsKICAgICAgICAgICAgIHItPm1fcmVuZGVyZXItPnBhaW50KGN1cnJlbnRQYWludElu Zm8sIGNoaWxkUG9pbnQueCgpLCBjaGlsZFBvaW50LnkoKSk7CiAgICAgICAgICAgICBpZiAoIXBy ZXNlcnZlUGhhc2UpIHsKICAgICAgICAgICAgICAgICBjdXJyZW50UGFpbnRJbmZvLnBoYXNlID0g UGFpbnRQaGFzZUNoaWxkQmxvY2tCYWNrZ3JvdW5kczsKQEAgLTI1ODksNyArMjU5MCw3IEBAIHZv aWQgUmVuZGVyQmxvY2s6OnBhaW50RmxvYXRzKFBhaW50SW5mbyYKICAgICB9CiB9CiAKLXZvaWQg UmVuZGVyQmxvY2s6OnBhaW50RWxsaXBzaXNCb3hlcyhQYWludEluZm8mIHBhaW50SW5mbywgaW50 IHR4LCBpbnQgdHkpCit2b2lkIFJlbmRlckJsb2NrOjpwYWludEVsbGlwc2lzQm94ZXMoUGFpbnRJ bmZvJiBwYWludEluZm8sIGNvbnN0IEludFBvaW50JiBwYWludE9mZnNldCkKIHsKICAgICBpZiAo IXBhaW50SW5mby5zaG91bGRQYWludFdpdGhpblJvb3QodGhpcykgfHwgIWZpcnN0TGluZUJveCgp KQogICAgICAgICByZXR1cm47CkBAIC0yNTk3LDcgKzI1OTgsNyBAQCB2b2lkIFJlbmRlckJsb2Nr OjpwYWludEVsbGlwc2lzQm94ZXMoUGFpCiAgICAgaWYgKHN0eWxlKCktPnZpc2liaWxpdHkoKSA9 PSBWSVNJQkxFICYmIHBhaW50SW5mby5waGFzZSA9PSBQYWludFBoYXNlRm9yZWdyb3VuZCkgewog ICAgICAgICAvLyBXZSBjYW4gY2hlY2sgdGhlIGZpcnN0IGJveCBhbmQgbGFzdCBib3ggYW5kIGF2 b2lkIHBhaW50aW5nIGlmIHdlIGRvbid0CiAgICAgICAgIC8vIGludGVyc2VjdC4KLSAgICAgICAg aW50IHlQb3MgPSB0eSArIGZpcnN0TGluZUJveCgpLT55KCk7CisgICAgICAgIGludCB5UG9zID0g cGFpbnRPZmZzZXQueSgpICsgZmlyc3RMaW5lQm94KCktPnkoKTsKICAgICAgICAgaW50IGggPSBs YXN0TGluZUJveCgpLT55KCkgKyBsYXN0TGluZUJveCgpLT5sb2dpY2FsSGVpZ2h0KCkgLSBmaXJz dExpbmVCb3goKS0+eSgpOwogICAgICAgICBpZiAoeVBvcyA+PSBwYWludEluZm8ucmVjdC5tYXhZ KCkgfHwgeVBvcyArIGggPD0gcGFpbnRJbmZvLnJlY3QueSgpKQogICAgICAgICAgICAgcmV0dXJu OwpAQCAtMjYwNiwxMCArMjYwNywxMCBAQCB2b2lkIFJlbmRlckJsb2NrOjpwYWludEVsbGlwc2lz Qm94ZXMoUGFpCiAgICAgICAgIC8vIHRoZW0uICBOb3RlIHRoYXQgYm94ZXMgY2FuIGVhc2lseSBv dmVybGFwLCBzbyB3ZSBjYW4ndCBtYWtlIGFueSBhc3N1bXB0aW9ucwogICAgICAgICAvLyBiYXNl ZCBvZmYgcG9zaXRpb25zIG9mIG91ciBmaXJzdCBsaW5lIGJveCBvciBvdXIgbGFzdCBsaW5lIGJv eC4KICAgICAgICAgZm9yIChSb290SW5saW5lQm94KiBjdXJyID0gZmlyc3RSb290Qm94KCk7IGN1 cnI7IGN1cnIgPSBjdXJyLT5uZXh0Um9vdEJveCgpKSB7Ci0gICAgICAgICAgICB5UG9zID0gdHkg KyBjdXJyLT55KCk7CisgICAgICAgICAgICB5UG9zID0gcGFpbnRPZmZzZXQueSgpICsgY3Vyci0+ eSgpOwogICAgICAgICAgICAgaCA9IGN1cnItPmxvZ2ljYWxIZWlnaHQoKTsKICAgICAgICAgICAg IGlmIChjdXJyLT5lbGxpcHNpc0JveCgpICYmIHlQb3MgPCBwYWludEluZm8ucmVjdC5tYXhZKCkg JiYgeVBvcyArIGggPiBwYWludEluZm8ucmVjdC55KCkpCi0gICAgICAgICAgICAgICAgY3Vyci0+ cGFpbnRFbGxpcHNpc0JveChwYWludEluZm8sIEludFBvaW50KHR4LCB0eSksIGN1cnItPmxpbmVU b3AoKSwgY3Vyci0+bGluZUJvdHRvbSgpKTsKKyAgICAgICAgICAgICAgICBjdXJyLT5wYWludEVs bGlwc2lzQm94KHBhaW50SW5mbywgcGFpbnRPZmZzZXQsIGN1cnItPmxpbmVUb3AoKSwgY3Vyci0+ bGluZUJvdHRvbSgpKTsKICAgICAgICAgfQogICAgIH0KIH0KSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJCbG9jay5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJCbG9jay5oCShyZXZpc2lvbiA4ODA1MikKKysrIFNvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJCbG9jay5oCSh3b3JraW5nIGNvcHkpCkBAIC01NTksMTIgKzU1OSwx MiBAQCBwcml2YXRlOgogCiAgICAgLy8gRW5kIG9mIGZ1bmN0aW9ucyBkZWZpbmVkIGluIFJlbmRl ckJsb2NrTGluZUxheW91dC5jcHAuCiAKLSAgICB2b2lkIHBhaW50RmxvYXRzKFBhaW50SW5mbyYs IGludCB0eCwgaW50IHR5LCBib29sIHByZXNlcnZlUGhhc2UgPSBmYWxzZSk7CisgICAgdm9pZCBw YWludEZsb2F0cyhQYWludEluZm8mLCBjb25zdCBJbnRQb2ludCYsIGJvb2wgcHJlc2VydmVQaGFz ZSA9IGZhbHNlKTsKICAgICB2b2lkIHBhaW50Q29udGVudHMoUGFpbnRJbmZvJiwgaW50IHR4LCBp bnQgdHkpOwogICAgIHZvaWQgcGFpbnRDb2x1bW5Db250ZW50cyhQYWludEluZm8mLCBpbnQgdHgs IGludCB0eSwgYm9vbCBwYWludEZsb2F0cyA9IGZhbHNlKTsKICAgICB2b2lkIHBhaW50Q29sdW1u UnVsZXMoUGFpbnRJbmZvJiwgaW50IHR4LCBpbnQgdHkpOwotICAgIHZvaWQgcGFpbnRDaGlsZHJl bihQYWludEluZm8mLCBpbnQgdHgsIGludCB0eSk7Ci0gICAgdm9pZCBwYWludEVsbGlwc2lzQm94 ZXMoUGFpbnRJbmZvJiwgaW50IHR4LCBpbnQgdHkpOworICAgIHZvaWQgcGFpbnRDaGlsZHJlbihQ YWludEluZm8mLCBjb25zdCBJbnRQb2ludCYpOworICAgIHZvaWQgcGFpbnRFbGxpcHNpc0JveGVz KFBhaW50SW5mbyYsIGNvbnN0IEludFBvaW50Jik7CiAgICAgdm9pZCBwYWludFNlbGVjdGlvbihQ YWludEluZm8mLCBpbnQgdHgsIGludCB0eSk7CiAgICAgdm9pZCBwYWludENhcmV0KFBhaW50SW5m byYsIGNvbnN0IEludFBvaW50JiwgQ2FyZXRUeXBlKTsKIAo=