62035 2011-06-03 11:55:58 -0700 Switch paintItemForeground and paintItemForeground to use IntPoint 2011-06-03 13:55:51 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 60318 1 leviw leviw darin dglazkov eae eric simon.fraser webkit.review.bot oldest_to_newest 415061 0 leviw 2011-06-03 11:55:58 -0700 Ongoing tx/ty removal. 415062 1 leviw 2011-06-03 11:58:20 -0700 Going for 2 :) 415072 2 95942 leviw 2011-06-03 12:03:06 -0700 Created attachment 95942 Patch 415081 3 95942 webkit.review.bot 2011-06-03 12:22:21 -0700 Comment on attachment 95942 Patch Attachment 95942 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/8757836 415083 4 leviw 2011-06-03 12:23:12 -0700 (In reply to comment #3) > (From update of attachment 95942 [details]) > Attachment 95942 [details] did not pass chromium-ews (chromium-xvfb): > Output: http://queues.webkit.org/results/8757836 Whoops! Grabbed too much on that one. 415094 5 95946 leviw 2011-06-03 12:30:06 -0700 Created attachment 95946 Patch 415142 6 95946 eric 2011-06-03 13:44:02 -0700 Comment on attachment 95946 Patch OK. 415150 7 95946 leviw 2011-06-03 13:55:47 -0700 Comment on attachment 95946 Patch Clearing flags on attachment: 95946 Committed r88049: <http://trac.webkit.org/changeset/88049> 415151 8 leviw 2011-06-03 13:55:51 -0700 All reviewed patches have been landed. Closing bug. 95942 2011-06-03 12:03:06 -0700 2011-06-03 12:30:03 -0700 Patch bug-62035-20110603120304.patch text/plain 5530 leviw SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg4MDM1KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDYtMDMgIExldmkgV2Vp bnRyYXViICA8bGV2aXdAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFN3aXRjaCBwYWludEl0ZW1Gb3JlZ3JvdW5kIGFuZCBwYWlu dEl0ZW1Gb3JlZ3JvdW5kIHRvIHVzZSBJbnRQb2ludAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjIwMzUKKworICAgICAgICBTd2l0Y2hpbmcgcGFpbnRJ dGVtRm9yZS9CYWNrZ3JvdW5kIHRvIHVzZSBJbnRQb2ludCBpbnN0ZWFkIG9mIGEgcGFpciBvZiBp bnRzLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBzaW5jZSB0aGlzIGlzIHNpbXBsZSByZWZhY3Rv cmluZy4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMaXN0Qm94LmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlckxpc3RCb3g6OnBhaW50T2JqZWN0KToKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlckxpc3RCb3g6OnBhaW50SXRlbUZvcmVncm91bmQpOgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyTGlzdEJveDo6cGFpbnRJdGVtQmFja2dyb3VuZCk6CisgICAgICAgICogcmVuZGVyaW5n L1JlbmRlckxpc3RCb3guaDoKKwogMjAxMS0wNi0wMSAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFw cGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBGcmFzZXIuCkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAJKHJldmlzaW9uIDg4MDMzKQorKysg U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAkod29ya2luZyBjb3B5KQpA QCAtMjQ1MSw3ICsyNDUxLDcgQEAgdm9pZCBSZW5kZXJCbG9jazo6cGFpbnRDYXJldChQYWludElu Zm8mIAogICAgICAgICBvZmZzZXRGb3JDb250ZW50cyh0eCwgdHkpOwogCiAgICAgICAgIGlmICh0 eXBlID09IEN1cnNvckNhcmV0KQotICAgICAgICAgICAgZnJhbWUoKS0+c2VsZWN0aW9uKCktPnBh aW50Q2FyZXQocGFpbnRJbmZvLmNvbnRleHQsIHR4LCB0eSwgcGFpbnRJbmZvLnJlY3QpOworICAg ICAgICAgICAgZnJhbWUoKS0+c2VsZWN0aW9uKCktPnBhaW50Q2FyZXQocGFpbnRJbmZvLmNvbnRl eHQsIEludFBvaW50KHR4LCB0eSksIHBhaW50SW5mby5yZWN0KTsKICAgICAgICAgZWxzZQogICAg ICAgICAgICAgZnJhbWUoKS0+cGFnZSgpLT5kcmFnQ2FyZXRDb250cm9sbGVyKCktPnBhaW50RHJh Z0NhcmV0KGZyYW1lKCksIHBhaW50SW5mby5jb250ZXh0LCB0eCwgdHksIHBhaW50SW5mby5yZWN0 KTsKICAgICB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlzdEJveC5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RCb3gu Y3BwCShyZXZpc2lvbiA4ODAzMykKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJM aXN0Qm94LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjY2LDcgKzI2Niw3IEBAIHZvaWQgUmVuZGVy TGlzdEJveDo6cGFpbnRPYmplY3QoUGFpbnRJbmYKICAgICBpZiAocGFpbnRJbmZvLnBoYXNlID09 IFBhaW50UGhhc2VGb3JlZ3JvdW5kKSB7CiAgICAgICAgIGludCBpbmRleCA9IG1faW5kZXhPZmZz ZXQ7CiAgICAgICAgIHdoaWxlIChpbmRleCA8IGxpc3RJdGVtc1NpemUgJiYgaW5kZXggPD0gbV9p bmRleE9mZnNldCArIG51bVZpc2libGVJdGVtcygpKSB7Ci0gICAgICAgICAgICBwYWludEl0ZW1G b3JlZ3JvdW5kKHBhaW50SW5mbywgdHgsIHR5LCBpbmRleCk7CisgICAgICAgICAgICBwYWludEl0 ZW1Gb3JlZ3JvdW5kKHBhaW50SW5mbywgSW50UG9pbnQodHgsIHR5KSwgaW5kZXgpOwogICAgICAg ICAgICAgaW5kZXgrKzsKICAgICAgICAgfQogICAgIH0KQEAgLTI4OSw3ICsyODksNyBAQCB2b2lk IFJlbmRlckxpc3RCb3g6OnBhaW50T2JqZWN0KFBhaW50SW5mCiAgICAgY2FzZSBQYWludFBoYXNl Q2hpbGRCbG9ja0JhY2tncm91bmRzOiB7CiAgICAgICAgIGludCBpbmRleCA9IG1faW5kZXhPZmZz ZXQ7CiAgICAgICAgIHdoaWxlIChpbmRleCA8IGxpc3RJdGVtc1NpemUgJiYgaW5kZXggPD0gbV9p bmRleE9mZnNldCArIG51bVZpc2libGVJdGVtcygpKSB7Ci0gICAgICAgICAgICBwYWludEl0ZW1C YWNrZ3JvdW5kKHBhaW50SW5mbywgdHgsIHR5LCBpbmRleCk7CisgICAgICAgICAgICBwYWludEl0 ZW1CYWNrZ3JvdW5kKHBhaW50SW5mbywgSW50UG9pbnQodHgsIHR5KSwgaW5kZXgpOwogICAgICAg ICAgICAgaW5kZXgrKzsKICAgICAgICAgfQogICAgICAgICBicmVhazsKQEAgLTM1Niw3ICszNTYs NyBAQCBzdGF0aWMgSW50U2l6ZSBpdGVtT2Zmc2V0Rm9yQWxpZ25tZW50KFRlCiAgICAgcmV0dXJu IG9mZnNldDsKIH0KIAotdm9pZCBSZW5kZXJMaXN0Qm94OjpwYWludEl0ZW1Gb3JlZ3JvdW5kKFBh aW50SW5mbyYgcGFpbnRJbmZvLCBpbnQgdHgsIGludCB0eSwgaW50IGxpc3RJbmRleCkKK3ZvaWQg UmVuZGVyTGlzdEJveDo6cGFpbnRJdGVtRm9yZWdyb3VuZChQYWludEluZm8mIHBhaW50SW5mbywg Y29uc3QgSW50UG9pbnQmIHBhaW50T2Zmc2V0LCBpbnQgbGlzdEluZGV4KQogewogICAgIFNlbGVj dEVsZW1lbnQqIHNlbGVjdCA9IHRvU2VsZWN0RWxlbWVudChzdGF0aWNfY2FzdDxFbGVtZW50Kj4o bm9kZSgpKSk7CiAgICAgY29uc3QgVmVjdG9yPEVsZW1lbnQqPiYgbGlzdEl0ZW1zID0gc2VsZWN0 LT5saXN0SXRlbXMoKTsKQEAgLTM5Miw3ICszOTIsNyBAQCB2b2lkIFJlbmRlckxpc3RCb3g6OnBh aW50SXRlbUZvcmVncm91bmQoCiAgICAgY29uc3QgVUNoYXIqIHN0cmluZyA9IGl0ZW1UZXh0LmNo YXJhY3RlcnMoKTsKICAgICBUZXh0UnVuIHRleHRSdW4oc3RyaW5nLCBsZW5ndGgsIGZhbHNlLCAw LCAwLCBUZXh0UnVuOjpBbGxvd1RyYWlsaW5nRXhwYW5zaW9uLCBpdGVtU3R5bGUtPmRpcmVjdGlv bigpLCBpdGVtU3R5bGUtPnVuaWNvZGVCaWRpKCkgPT0gT3ZlcnJpZGUpOwogICAgIEZvbnQgaXRl bUZvbnQgPSBzdHlsZSgpLT5mb250KCk7Ci0gICAgSW50UmVjdCByID0gaXRlbUJvdW5kaW5nQm94 UmVjdChJbnRQb2ludCh0eCwgdHkpLCBsaXN0SW5kZXgpOworICAgIEludFJlY3QgciA9IGl0ZW1C b3VuZGluZ0JveFJlY3QocGFpbnRPZmZzZXQsIGxpc3RJbmRleCk7CiAgICAgci5tb3ZlKGl0ZW1P ZmZzZXRGb3JBbGlnbm1lbnQodGV4dFJ1biwgaXRlbVN0eWxlLCBpdGVtRm9udCwgcikpOwogCiAg ICAgaWYgKGlzT3B0aW9uR3JvdXBFbGVtZW50KGVsZW1lbnQpKSB7CkBAIC00MDcsNyArNDA3LDcg QEAgdm9pZCBSZW5kZXJMaXN0Qm94OjpwYWludEl0ZW1Gb3JlZ3JvdW5kKAogICAgICAgICBwYWlu dEluZm8uY29udGV4dC0+ZHJhd0JpZGlUZXh0KGl0ZW1Gb250LCB0ZXh0UnVuLCByLmxvY2F0aW9u KCkpOwogfQogCi12b2lkIFJlbmRlckxpc3RCb3g6OnBhaW50SXRlbUJhY2tncm91bmQoUGFpbnRJ bmZvJiBwYWludEluZm8sIGludCB0eCwgaW50IHR5LCBpbnQgbGlzdEluZGV4KQordm9pZCBSZW5k ZXJMaXN0Qm94OjpwYWludEl0ZW1CYWNrZ3JvdW5kKFBhaW50SW5mbyYgcGFpbnRJbmZvLCBjb25z dCBJbnRQb2ludCYgcGFpbnRPZmZzZXQsIGludCBsaXN0SW5kZXgpCiB7CiAgICAgU2VsZWN0RWxl bWVudCogc2VsZWN0ID0gdG9TZWxlY3RFbGVtZW50KHN0YXRpY19jYXN0PEVsZW1lbnQqPihub2Rl KCkpKTsKICAgICBjb25zdCBWZWN0b3I8RWxlbWVudCo+JiBsaXN0SXRlbXMgPSBzZWxlY3QtPmxp c3RJdGVtcygpOwpAQCAtNDI2LDggKzQyNiw4IEBAIHZvaWQgUmVuZGVyTGlzdEJveDo6cGFpbnRJ dGVtQmFja2dyb3VuZCgKICAgICAvLyBEcmF3IHRoZSBiYWNrZ3JvdW5kIGZvciB0aGlzIGxpc3Qg Ym94IGl0ZW0KICAgICBpZiAoIWVsZW1lbnQtPnJlbmRlclN0eWxlKCkgfHwgZWxlbWVudC0+cmVu ZGVyU3R5bGUoKS0+dmlzaWJpbGl0eSgpICE9IEhJRERFTikgewogICAgICAgICBDb2xvclNwYWNl IGNvbG9yU3BhY2UgPSBlbGVtZW50LT5yZW5kZXJTdHlsZSgpID8gZWxlbWVudC0+cmVuZGVyU3R5 bGUoKS0+Y29sb3JTcGFjZSgpIDogc3R5bGUoKS0+Y29sb3JTcGFjZSgpOwotICAgICAgICBJbnRS ZWN0IGl0ZW1SZWN0ID0gaXRlbUJvdW5kaW5nQm94UmVjdChJbnRQb2ludCh0eCwgdHkpLCBsaXN0 SW5kZXgpOwotICAgICAgICBpdGVtUmVjdC5pbnRlcnNlY3QoY29udHJvbENsaXBSZWN0KEludFBv aW50KHR4LCB0eSkpKTsKKyAgICAgICAgSW50UmVjdCBpdGVtUmVjdCA9IGl0ZW1Cb3VuZGluZ0Jv eFJlY3QocGFpbnRPZmZzZXQsIGxpc3RJbmRleCk7CisgICAgICAgIGl0ZW1SZWN0LmludGVyc2Vj dChjb250cm9sQ2xpcFJlY3QocGFpbnRPZmZzZXQpKTsKICAgICAgICAgcGFpbnRJbmZvLmNvbnRl eHQtPmZpbGxSZWN0KGl0ZW1SZWN0LCBiYWNrQ29sb3IsIGNvbG9yU3BhY2UpOwogICAgIH0KIH0K SW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMaXN0Qm94LmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RCb3guaAkocmV2aXNpb24g ODgwMzMpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlzdEJveC5oCSh3b3Jr aW5nIGNvcHkpCkBAIC0xMzMsOCArMTMzLDggQEAgcHJpdmF0ZToKICAgICBpbnQgbnVtSXRlbXMo KSBjb25zdDsKICAgICBpbnQgbGlzdEhlaWdodCgpIGNvbnN0OwogICAgIHZvaWQgcGFpbnRTY3Jv bGxiYXIoUGFpbnRJbmZvJiwgaW50IHR4LCBpbnQgdHkpOwotICAgIHZvaWQgcGFpbnRJdGVtRm9y ZWdyb3VuZChQYWludEluZm8mLCBpbnQgdHgsIGludCB0eSwgaW50IGxpc3RJbmRleCk7Ci0gICAg dm9pZCBwYWludEl0ZW1CYWNrZ3JvdW5kKFBhaW50SW5mbyYsIGludCB0eCwgaW50IHR5LCBpbnQg bGlzdEluZGV4KTsKKyAgICB2b2lkIHBhaW50SXRlbUZvcmVncm91bmQoUGFpbnRJbmZvJiwgY29u c3QgSW50UG9pbnQmLCBpbnQgbGlzdEluZGV4KTsKKyAgICB2b2lkIHBhaW50SXRlbUJhY2tncm91 bmQoUGFpbnRJbmZvJiwgY29uc3QgSW50UG9pbnQmLCBpbnQgbGlzdEluZGV4KTsKICAgICB2b2lk IHNjcm9sbFRvUmV2ZWFsU2VsZWN0aW9uKCk7CiAKICAgICBib29sIG1fb3B0aW9uc0NoYW5nZWQ7 Cg== 95946 2011-06-03 12:30:06 -0700 2011-06-03 13:55:47 -0700 Patch bug-62035-20110603123005.patch text/plain 4830 leviw SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg4MDM4KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDYtMDMgIExldmkgV2Vp bnRyYXViICA8bGV2aXdAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFN3aXRjaCBwYWludEl0ZW1Gb3JlZ3JvdW5kIGFuZCBwYWlu dEl0ZW1Gb3JlZ3JvdW5kIHRvIHVzZSBJbnRQb2ludAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjIwMzUKKworICAgICAgICBTd2l0Y2hpbmcgcGFpbnRJ dGVtRm9yZS9CYWNrZ3JvdW5kIHRvIHVzZSBJbnRQb2ludCBpbnN0ZWFkIG9mIGEgcGFpciBvZiBp bnRzLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBzaW5jZSB0aGlzIGlzIHNpbXBsZSByZWZhY3Rv cmluZy4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMaXN0Qm94LmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlckxpc3RCb3g6OnBhaW50T2JqZWN0KToKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlckxpc3RCb3g6OnBhaW50SXRlbUZvcmVncm91bmQpOgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyTGlzdEJveDo6cGFpbnRJdGVtQmFja2dyb3VuZCk6CisgICAgICAgICogcmVuZGVyaW5n L1JlbmRlckxpc3RCb3guaDoKKwogMjAxMS0wNi0wMyAgQ2hyaXMgUm9nZXJzICA8Y3JvZ2Vyc0Bn b29nbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEtlbm5ldGggUnVzc2VsbC4KSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMaXN0Qm94LmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlzdEJveC5jcHAJKHJldmlzaW9uIDg4 MDM4KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RCb3guY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0yNjYsNyArMjY2LDcgQEAgdm9pZCBSZW5kZXJMaXN0Qm94OjpwYWludE9i amVjdChQYWludEluZgogICAgIGlmIChwYWludEluZm8ucGhhc2UgPT0gUGFpbnRQaGFzZUZvcmVn cm91bmQpIHsKICAgICAgICAgaW50IGluZGV4ID0gbV9pbmRleE9mZnNldDsKICAgICAgICAgd2hp bGUgKGluZGV4IDwgbGlzdEl0ZW1zU2l6ZSAmJiBpbmRleCA8PSBtX2luZGV4T2Zmc2V0ICsgbnVt VmlzaWJsZUl0ZW1zKCkpIHsKLSAgICAgICAgICAgIHBhaW50SXRlbUZvcmVncm91bmQocGFpbnRJ bmZvLCB0eCwgdHksIGluZGV4KTsKKyAgICAgICAgICAgIHBhaW50SXRlbUZvcmVncm91bmQocGFp bnRJbmZvLCBJbnRQb2ludCh0eCwgdHkpLCBpbmRleCk7CiAgICAgICAgICAgICBpbmRleCsrOwog ICAgICAgICB9CiAgICAgfQpAQCAtMjg5LDcgKzI4OSw3IEBAIHZvaWQgUmVuZGVyTGlzdEJveDo6 cGFpbnRPYmplY3QoUGFpbnRJbmYKICAgICBjYXNlIFBhaW50UGhhc2VDaGlsZEJsb2NrQmFja2dy b3VuZHM6IHsKICAgICAgICAgaW50IGluZGV4ID0gbV9pbmRleE9mZnNldDsKICAgICAgICAgd2hp bGUgKGluZGV4IDwgbGlzdEl0ZW1zU2l6ZSAmJiBpbmRleCA8PSBtX2luZGV4T2Zmc2V0ICsgbnVt VmlzaWJsZUl0ZW1zKCkpIHsKLSAgICAgICAgICAgIHBhaW50SXRlbUJhY2tncm91bmQocGFpbnRJ bmZvLCB0eCwgdHksIGluZGV4KTsKKyAgICAgICAgICAgIHBhaW50SXRlbUJhY2tncm91bmQocGFp bnRJbmZvLCBJbnRQb2ludCh0eCwgdHkpLCBpbmRleCk7CiAgICAgICAgICAgICBpbmRleCsrOwog ICAgICAgICB9CiAgICAgICAgIGJyZWFrOwpAQCAtMzU2LDcgKzM1Niw3IEBAIHN0YXRpYyBJbnRT aXplIGl0ZW1PZmZzZXRGb3JBbGlnbm1lbnQoVGUKICAgICByZXR1cm4gb2Zmc2V0OwogfQogCi12 b2lkIFJlbmRlckxpc3RCb3g6OnBhaW50SXRlbUZvcmVncm91bmQoUGFpbnRJbmZvJiBwYWludElu Zm8sIGludCB0eCwgaW50IHR5LCBpbnQgbGlzdEluZGV4KQordm9pZCBSZW5kZXJMaXN0Qm94Ojpw YWludEl0ZW1Gb3JlZ3JvdW5kKFBhaW50SW5mbyYgcGFpbnRJbmZvLCBjb25zdCBJbnRQb2ludCYg cGFpbnRPZmZzZXQsIGludCBsaXN0SW5kZXgpCiB7CiAgICAgU2VsZWN0RWxlbWVudCogc2VsZWN0 ID0gdG9TZWxlY3RFbGVtZW50KHN0YXRpY19jYXN0PEVsZW1lbnQqPihub2RlKCkpKTsKICAgICBj b25zdCBWZWN0b3I8RWxlbWVudCo+JiBsaXN0SXRlbXMgPSBzZWxlY3QtPmxpc3RJdGVtcygpOwpA QCAtMzkyLDcgKzM5Miw3IEBAIHZvaWQgUmVuZGVyTGlzdEJveDo6cGFpbnRJdGVtRm9yZWdyb3Vu ZCgKICAgICBjb25zdCBVQ2hhciogc3RyaW5nID0gaXRlbVRleHQuY2hhcmFjdGVycygpOwogICAg IFRleHRSdW4gdGV4dFJ1bihzdHJpbmcsIGxlbmd0aCwgZmFsc2UsIDAsIDAsIFRleHRSdW46OkFs bG93VHJhaWxpbmdFeHBhbnNpb24sIGl0ZW1TdHlsZS0+ZGlyZWN0aW9uKCksIGl0ZW1TdHlsZS0+ dW5pY29kZUJpZGkoKSA9PSBPdmVycmlkZSk7CiAgICAgRm9udCBpdGVtRm9udCA9IHN0eWxlKCkt PmZvbnQoKTsKLSAgICBJbnRSZWN0IHIgPSBpdGVtQm91bmRpbmdCb3hSZWN0KEludFBvaW50KHR4 LCB0eSksIGxpc3RJbmRleCk7CisgICAgSW50UmVjdCByID0gaXRlbUJvdW5kaW5nQm94UmVjdChw YWludE9mZnNldCwgbGlzdEluZGV4KTsKICAgICByLm1vdmUoaXRlbU9mZnNldEZvckFsaWdubWVu dCh0ZXh0UnVuLCBpdGVtU3R5bGUsIGl0ZW1Gb250LCByKSk7CiAKICAgICBpZiAoaXNPcHRpb25H cm91cEVsZW1lbnQoZWxlbWVudCkpIHsKQEAgLTQwNyw3ICs0MDcsNyBAQCB2b2lkIFJlbmRlckxp c3RCb3g6OnBhaW50SXRlbUZvcmVncm91bmQoCiAgICAgICAgIHBhaW50SW5mby5jb250ZXh0LT5k cmF3QmlkaVRleHQoaXRlbUZvbnQsIHRleHRSdW4sIHIubG9jYXRpb24oKSk7CiB9CiAKLXZvaWQg UmVuZGVyTGlzdEJveDo6cGFpbnRJdGVtQmFja2dyb3VuZChQYWludEluZm8mIHBhaW50SW5mbywg aW50IHR4LCBpbnQgdHksIGludCBsaXN0SW5kZXgpCit2b2lkIFJlbmRlckxpc3RCb3g6OnBhaW50 SXRlbUJhY2tncm91bmQoUGFpbnRJbmZvJiBwYWludEluZm8sIGNvbnN0IEludFBvaW50JiBwYWlu dE9mZnNldCwgaW50IGxpc3RJbmRleCkKIHsKICAgICBTZWxlY3RFbGVtZW50KiBzZWxlY3QgPSB0 b1NlbGVjdEVsZW1lbnQoc3RhdGljX2Nhc3Q8RWxlbWVudCo+KG5vZGUoKSkpOwogICAgIGNvbnN0 IFZlY3RvcjxFbGVtZW50Kj4mIGxpc3RJdGVtcyA9IHNlbGVjdC0+bGlzdEl0ZW1zKCk7CkBAIC00 MjYsOCArNDI2LDggQEAgdm9pZCBSZW5kZXJMaXN0Qm94OjpwYWludEl0ZW1CYWNrZ3JvdW5kKAog ICAgIC8vIERyYXcgdGhlIGJhY2tncm91bmQgZm9yIHRoaXMgbGlzdCBib3ggaXRlbQogICAgIGlm ICghZWxlbWVudC0+cmVuZGVyU3R5bGUoKSB8fCBlbGVtZW50LT5yZW5kZXJTdHlsZSgpLT52aXNp YmlsaXR5KCkgIT0gSElEREVOKSB7CiAgICAgICAgIENvbG9yU3BhY2UgY29sb3JTcGFjZSA9IGVs ZW1lbnQtPnJlbmRlclN0eWxlKCkgPyBlbGVtZW50LT5yZW5kZXJTdHlsZSgpLT5jb2xvclNwYWNl KCkgOiBzdHlsZSgpLT5jb2xvclNwYWNlKCk7Ci0gICAgICAgIEludFJlY3QgaXRlbVJlY3QgPSBp dGVtQm91bmRpbmdCb3hSZWN0KEludFBvaW50KHR4LCB0eSksIGxpc3RJbmRleCk7Ci0gICAgICAg IGl0ZW1SZWN0LmludGVyc2VjdChjb250cm9sQ2xpcFJlY3QoSW50UG9pbnQodHgsIHR5KSkpOwor ICAgICAgICBJbnRSZWN0IGl0ZW1SZWN0ID0gaXRlbUJvdW5kaW5nQm94UmVjdChwYWludE9mZnNl dCwgbGlzdEluZGV4KTsKKyAgICAgICAgaXRlbVJlY3QuaW50ZXJzZWN0KGNvbnRyb2xDbGlwUmVj dChwYWludE9mZnNldCkpOwogICAgICAgICBwYWludEluZm8uY29udGV4dC0+ZmlsbFJlY3QoaXRl bVJlY3QsIGJhY2tDb2xvciwgY29sb3JTcGFjZSk7CiAgICAgfQogfQpJbmRleDogU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RCb3guaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyTGlzdEJveC5oCShyZXZpc2lvbiA4ODAzOCkKKysrIFNvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMaXN0Qm94LmgJKHdvcmtpbmcgY29weSkKQEAgLTEz Myw4ICsxMzMsOCBAQCBwcml2YXRlOgogICAgIGludCBudW1JdGVtcygpIGNvbnN0OwogICAgIGlu dCBsaXN0SGVpZ2h0KCkgY29uc3Q7CiAgICAgdm9pZCBwYWludFNjcm9sbGJhcihQYWludEluZm8m LCBpbnQgdHgsIGludCB0eSk7Ci0gICAgdm9pZCBwYWludEl0ZW1Gb3JlZ3JvdW5kKFBhaW50SW5m byYsIGludCB0eCwgaW50IHR5LCBpbnQgbGlzdEluZGV4KTsKLSAgICB2b2lkIHBhaW50SXRlbUJh Y2tncm91bmQoUGFpbnRJbmZvJiwgaW50IHR4LCBpbnQgdHksIGludCBsaXN0SW5kZXgpOworICAg IHZvaWQgcGFpbnRJdGVtRm9yZWdyb3VuZChQYWludEluZm8mLCBjb25zdCBJbnRQb2ludCYsIGlu dCBsaXN0SW5kZXgpOworICAgIHZvaWQgcGFpbnRJdGVtQmFja2dyb3VuZChQYWludEluZm8mLCBj b25zdCBJbnRQb2ludCYsIGludCBsaXN0SW5kZXgpOwogICAgIHZvaWQgc2Nyb2xsVG9SZXZlYWxT ZWxlY3Rpb24oKTsKIAogICAgIGJvb2wgbV9vcHRpb25zQ2hhbmdlZDsK