62146 2011-06-06 13:57:50 -0700 Remove tx/ty offset from selectionRect 2011-06-06 14:26:31 -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 415986 0 leviw 2011-06-06 13:57:50 -0700 These offsets are always passed in as 0,0. 416002 1 96122 leviw 2011-06-06 14:17:23 -0700 Created attachment 96122 Patch 416003 2 96122 eric 2011-06-06 14:19:18 -0700 Comment on attachment 96122 Patch :) 416004 3 96122 leviw 2011-06-06 14:26:28 -0700 Comment on attachment 96122 Patch Clearing flags on attachment: 96122 Committed r88188: <http://trac.webkit.org/changeset/88188> 416005 4 leviw 2011-06-06 14:26:31 -0700 All reviewed patches have been landed. Closing bug. 96122 2011-06-06 14:17:23 -0700 2011-06-06 14:26:28 -0700 Patch bug-62146-20110606141722.patch text/plain 10443 leviw SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg4MTg2KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzEgQEAKKzIwMTEtMDYtMDYgIExldmkgV2Vp bnRyYXViICA8bGV2aXdAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFJlbW92ZSB0eC90eSBvZmZzZXQgZnJvbSBzZWxlY3Rpb25S ZWN0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MjE0 NgorCisgICAgICAgIFJlbW92aW5nIHVudXNlZCBvZmZzZXQgcGFyYW1ldGVycyBmcm9tIHNlbGVj dGlvblJlY3QuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIHNpbmNlIHRoaXMgaXMganVzdCBjbGVh bnVwLgorCisgICAgICAgICogcmVuZGVyaW5nL0VsbGlwc2lzQm94LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkVsbGlwc2lzQm94OjpzZWxlY3Rpb25SZWN0KToKKyAgICAgICAgKiByZW5kZXJpbmcv RWxsaXBzaXNCb3guaDoKKyAgICAgICAgKiByZW5kZXJpbmcvSW5saW5lVGV4dEJveC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpJbmxpbmVUZXh0Qm94OjpzZWxlY3Rpb25SZWN0KToKKyAgICAgICAg KiByZW5kZXJpbmcvSW5saW5lVGV4dEJveC5oOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJU ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRleHQ6OmFic29sdXRlUmVjdHNGb3JS YW5nZSk6CisgICAgICAgIChXZWJDb3JlOjplbGxpcHNpc1JlY3RGb3JCb3gpOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyVGV4dDo6YWJzb2x1dGVRdWFkc0ZvclJhbmdlKToKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlclRleHQ6OnNlbGVjdGlvblJlY3RGb3JSZXBhaW50KToKKyAgICAgICAgKiBy ZW5kZXJpbmcvc3ZnL1JlbmRlclNWR0lubGluZVRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyU1ZHSW5saW5lVGV4dDo6bG9jYWxDYXJldFJlY3QpOgorICAgICAgICAqIHJlbmRlcmlu Zy9zdmcvU1ZHSW5saW5lVGV4dEJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTVkdJbmxpbmVU ZXh0Qm94OjpzZWxlY3Rpb25SZWN0KToKKyAgICAgICAgKiByZW5kZXJpbmcvc3ZnL1NWR0lubGlu ZVRleHRCb3guaDoKKwogMjAxMS0wNi0wMyAgTGV2aSBXZWludHJhdWIgIDxsZXZpd0BjaHJvbWl1 bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvRWxsaXBzaXNCb3guY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9FbGxpcHNpc0JveC5jcHAJKHJldmlzaW9uIDg4MTcyKQorKysgU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0VsbGlwc2lzQm94LmNwcAkod29ya2luZyBjb3B5KQpAQCAt NzMsMTIgKzczLDEyIEBAIHZvaWQgRWxsaXBzaXNCb3g6OnBhaW50KFBhaW50SW5mbyYgcGFpbnQK ICAgICB9CiB9CiAKLUludFJlY3QgRWxsaXBzaXNCb3g6OnNlbGVjdGlvblJlY3QoaW50IHR4LCBp bnQgdHkpCitJbnRSZWN0IEVsbGlwc2lzQm94OjpzZWxlY3Rpb25SZWN0KCkKIHsKICAgICBSZW5k ZXJTdHlsZSogc3R5bGUgPSBtX3JlbmRlcmVyLT5zdHlsZShtX2ZpcnN0TGluZSk7CiAgICAgY29u c3QgRm9udCYgZm9udCA9IHN0eWxlLT5mb250KCk7CiAgICAgLy8gRklYTUU6IFdoeSBpcyB0aGlz IGFsd2F5cyBMVFI/IEZpeCBieSBwYXNzaW5nIGNvcnJlY3QgdGV4dCBydW4gZmxhZ3MgYmVsb3cu Ci0gICAgcmV0dXJuIGVuY2xvc2luZ0ludFJlY3QoZm9udC5zZWxlY3Rpb25SZWN0Rm9yVGV4dChS ZW5kZXJCbG9jazo6Y29uc3RydWN0VGV4dFJ1bihyZW5kZXJlcigpLCBmb250LCBtX3N0ciwgc3R5 bGUsIFRleHRSdW46OkFsbG93VHJhaWxpbmdFeHBhbnNpb24pLCBJbnRQb2ludCh4KCkgKyB0eCwg eSgpICsgdHkgKyByb290KCktPnNlbGVjdGlvblRvcCgpKSwgcm9vdCgpLT5zZWxlY3Rpb25IZWln aHQoKSkpOworICAgIHJldHVybiBlbmNsb3NpbmdJbnRSZWN0KGZvbnQuc2VsZWN0aW9uUmVjdEZv clRleHQoUmVuZGVyQmxvY2s6OmNvbnN0cnVjdFRleHRSdW4ocmVuZGVyZXIoKSwgZm9udCwgbV9z dHIsIHN0eWxlLCBUZXh0UnVuOjpBbGxvd1RyYWlsaW5nRXhwYW5zaW9uKSwgSW50UG9pbnQoeCgp LCB5KCkgKyByb290KCktPnNlbGVjdGlvblRvcCgpKSwgcm9vdCgpLT5zZWxlY3Rpb25IZWlnaHQo KSkpOwogfQogCiB2b2lkIEVsbGlwc2lzQm94OjpwYWludFNlbGVjdGlvbihHcmFwaGljc0NvbnRl eHQqIGNvbnRleHQsIGludCB0eCwgaW50IHR5LCBSZW5kZXJTdHlsZSogc3R5bGUsIGNvbnN0IEZv bnQmIGZvbnQpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvRWxsaXBzaXNCb3guaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvRWxsaXBzaXNCb3guaAkocmV2 aXNpb24gODgxNzIpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvRWxsaXBzaXNCb3guaAko d29ya2luZyBjb3B5KQpAQCAtNDIsNyArNDIsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lk IHBhaW50KFBhaW50SW5mbyYsIGNvbnN0IEludFBvaW50JiwgaW50IGxpbmVUb3AsIGludCBsaW5l Qm90dG9tKTsKICAgICB2aXJ0dWFsIGJvb2wgbm9kZUF0UG9pbnQoY29uc3QgSGl0VGVzdFJlcXVl c3QmLCBIaXRUZXN0UmVzdWx0JiwgY29uc3QgSW50UG9pbnQmIHBvaW50SW5Db250YWluZXIsIGlu dCB0eCwgaW50IHR5LCBpbnQgbGluZVRvcCwgaW50IGxpbmVCb3R0b20pOwogICAgIHZvaWQgc2V0 U2VsZWN0aW9uU3RhdGUoUmVuZGVyT2JqZWN0OjpTZWxlY3Rpb25TdGF0ZSBzKSB7IG1fc2VsZWN0 aW9uU3RhdGUgPSBzOyB9Ci0gICAgSW50UmVjdCBzZWxlY3Rpb25SZWN0KGludCB0eCwgaW50IHR5 KTsKKyAgICBJbnRSZWN0IHNlbGVjdGlvblJlY3QoKTsKIAogcHJpdmF0ZToKICAgICB2aXJ0dWFs IGludCBoZWlnaHQoKSBjb25zdCB7IHJldHVybiBtX2hlaWdodDsgfQpJbmRleDogU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL0lubGluZVRleHRCb3guY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVUZXh0Qm94LmNwcAkocmV2aXNpb24gODgxNzIpCisrKyBT b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lVGV4dEJveC5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTE3Miw3ICsxNzIsNyBAQCBzdGF0aWMgdm9pZCBhZGp1c3RDaGFyYWN0ZXJzQW5kTGVuZ3Ro Rm9yCiAgICAgbGVuZ3RoICs9IGh5cGhlblN0cmluZy5sZW5ndGgoKTsKIH0KIAotSW50UmVjdCBJ bmxpbmVUZXh0Qm94OjpzZWxlY3Rpb25SZWN0KGludCB0eCwgaW50IHR5LCBpbnQgc3RhcnRQb3Ms IGludCBlbmRQb3MpCitJbnRSZWN0IElubGluZVRleHRCb3g6OnNlbGVjdGlvblJlY3QoaW50IHN0 YXJ0UG9zLCBpbnQgZW5kUG9zKQogewogICAgIGludCBzUG9zID0gbWF4KHN0YXJ0UG9zIC0gbV9z dGFydCwgMCk7CiAgICAgaW50IGVQb3MgPSBtaW4oZW5kUG9zIC0gbV9zdGFydCwgKGludCltX2xl bik7CkBAIC0yMDAsNyArMjAwLDcgQEAgSW50UmVjdCBJbmxpbmVUZXh0Qm94OjpzZWxlY3Rpb25S ZWN0KGludAogICAgIGVsc2UgaWYgKHIubWF4WCgpID4gbG9naWNhbFJpZ2h0KCkpCiAgICAgICAg IGxvZ2ljYWxXaWR0aCA9IGxvZ2ljYWxSaWdodCgpIC0gci54KCk7CiAKLSAgICBJbnRQb2ludCB0 b3BQb2ludCA9IGlzSG9yaXpvbnRhbCgpID8gSW50UG9pbnQoci54KCksIHR5ICsgc2VsVG9wKSA6 IEludFBvaW50KHR4ICsgc2VsVG9wLCByLngoKSk7CisgICAgSW50UG9pbnQgdG9wUG9pbnQgPSBp c0hvcml6b250YWwoKSA/IEludFBvaW50KHIueCgpLCBzZWxUb3ApIDogSW50UG9pbnQoc2VsVG9w LCByLngoKSk7CiAgICAgaW50IHdpZHRoID0gaXNIb3Jpem9udGFsKCkgPyBsb2dpY2FsV2lkdGgg OiBzZWxIZWlnaHQ7CiAgICAgaW50IGhlaWdodCA9IGlzSG9yaXpvbnRhbCgpID8gc2VsSGVpZ2h0 IDogbG9naWNhbFdpZHRoOwogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5l VGV4dEJveC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVU ZXh0Qm94LmgJKHJldmlzaW9uIDg4MTcyKQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lu bGluZVRleHRCb3guaAkod29ya2luZyBjb3B5KQpAQCAtMTA1LDcgKzEwNSw3IEBAIHByaXZhdGU6 CiBwdWJsaWM6CiAgICAgdmlydHVhbCBJbnRSZWN0IGNhbGN1bGF0ZUJvdW5kYXJpZXMoKSBjb25z dCB7IHJldHVybiBJbnRSZWN0KHgoKSwgeSgpLCB3aWR0aCgpLCBoZWlnaHQoKSk7IH0KIAotICAg IHZpcnR1YWwgSW50UmVjdCBzZWxlY3Rpb25SZWN0KGludCBhYnN4LCBpbnQgYWJzeSwgaW50IHN0 YXJ0UG9zLCBpbnQgZW5kUG9zKTsKKyAgICB2aXJ0dWFsIEludFJlY3Qgc2VsZWN0aW9uUmVjdChp bnQgc3RhcnRQb3MsIGludCBlbmRQb3MpOwogICAgIGJvb2wgaXNTZWxlY3RlZChpbnQgc3RhcnRQ b3MsIGludCBlbmRQb3MpIGNvbnN0OwogICAgIHZvaWQgc2VsZWN0aW9uU3RhcnRFbmQoaW50JiBz UG9zLCBpbnQmIGVQb3MpOwogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy VGV4dC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRl eHQuY3BwCShyZXZpc2lvbiA4ODE3MikKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJUZXh0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjkyLDcgKzI5Miw3IEBAIHZvaWQgUmVuZGVy VGV4dDo6YWJzb2x1dGVSZWN0c0ZvclJhbmdlKFYKICAgICAgICAgaWYgKHN0YXJ0IDw9IGJveC0+ c3RhcnQoKSAmJiBib3gtPmVuZCgpIDwgZW5kKSB7CiAgICAgICAgICAgICBJbnRSZWN0IHIgPSBi b3gtPmNhbGN1bGF0ZUJvdW5kYXJpZXMoKTsKICAgICAgICAgICAgIGlmICh1c2VTZWxlY3Rpb25I ZWlnaHQpIHsKLSAgICAgICAgICAgICAgICBJbnRSZWN0IHNlbGVjdGlvblJlY3QgPSBib3gtPnNl bGVjdGlvblJlY3QoMCwgMCwgc3RhcnQsIGVuZCk7CisgICAgICAgICAgICAgICAgSW50UmVjdCBz ZWxlY3Rpb25SZWN0ID0gYm94LT5zZWxlY3Rpb25SZWN0KHN0YXJ0LCBlbmQpOwogICAgICAgICAg ICAgICAgIGlmIChib3gtPmlzSG9yaXpvbnRhbCgpKSB7CiAgICAgICAgICAgICAgICAgICAgIHIu c2V0SGVpZ2h0KHNlbGVjdGlvblJlY3QuaGVpZ2h0KCkpOwogICAgICAgICAgICAgICAgICAgICBy LnNldFkoc2VsZWN0aW9uUmVjdC55KCkpOwpAQCAtMzA0LDcgKzMwNCw3IEBAIHZvaWQgUmVuZGVy VGV4dDo6YWJzb2x1dGVSZWN0c0ZvclJhbmdlKFYKICAgICAgICAgICAgIHJlY3RzLmFwcGVuZChs b2NhbFRvQWJzb2x1dGVRdWFkKEZsb2F0UXVhZChyKSkuZW5jbG9zaW5nQm91bmRpbmdCb3goKSk7 CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICB1bnNpZ25lZCByZWFsRW5kID0gbWluKGJv eC0+ZW5kKCkgKyAxLCBlbmQpOwotICAgICAgICAgICAgSW50UmVjdCByID0gYm94LT5zZWxlY3Rp b25SZWN0KDAsIDAsIHN0YXJ0LCByZWFsRW5kKTsKKyAgICAgICAgICAgIEludFJlY3QgciA9IGJv eC0+c2VsZWN0aW9uUmVjdChzdGFydCwgcmVhbEVuZCk7CiAgICAgICAgICAgICBpZiAoIXIuaXNF bXB0eSgpKSB7CiAgICAgICAgICAgICAgICAgaWYgKCF1c2VTZWxlY3Rpb25IZWlnaHQpIHsKICAg ICAgICAgICAgICAgICAgICAgLy8gY2hhbmdlIHRoZSBoZWlnaHQgYW5kIHkgcG9zaXRpb24gYmVj YXVzZSBzZWxlY3Rpb25SZWN0IHVzZXMgc2VsZWN0aW9uLXNwZWNpZmljIHZhbHVlcwpAQCAtMzQw LDcgKzM0MCw3IEBAIHN0YXRpYyBJbnRSZWN0IGVsbGlwc2lzUmVjdEZvckJveChJbmxpbmUKICAg ICAgICAgLy8gdGhlIHNlbGVjdGlvbiBpcyBwYXN0IHRoZSBiZWdpbm5pbmcgb2YgdGhlIHRydW5j YXRpb24gYW5kIHRoZQogICAgICAgICAvLyBiZWdpbm5pbmcgb2YgdGhlIHNlbGVjdGlvbiBpcyBi ZWZvcmUgb3IgYXQgdGhlIGJlZ2lubmluZyBvZiB0aGUgdHJ1bmNhdGlvbi4KICAgICAgICAgaWYg KGVsbGlwc2lzRW5kUG9zaXRpb24gPj0gdHJ1bmNhdGlvbiAmJiBlbGxpcHNpc1N0YXJ0UG9zaXRp b24gPD0gdHJ1bmNhdGlvbikKLSAgICAgICAgICAgIHJldHVybiBlbGxpcHNpcy0+c2VsZWN0aW9u UmVjdCgwLCAwKTsKKyAgICAgICAgICAgIHJldHVybiBlbGxpcHNpcy0+c2VsZWN0aW9uUmVjdCgp OwogICAgIH0KICAgICAKICAgICByZXR1cm4gSW50UmVjdCgpOwpAQCAtMzg1LDcgKzM4NSw3IEBA IHZvaWQgUmVuZGVyVGV4dDo6YWJzb2x1dGVRdWFkc0ZvclJhbmdlKFYKICAgICAgICAgaWYgKHN0 YXJ0IDw9IGJveC0+c3RhcnQoKSAmJiBib3gtPmVuZCgpIDwgZW5kKSB7CiAgICAgICAgICAgICBJ bnRSZWN0IHIoYm94LT5jYWxjdWxhdGVCb3VuZGFyaWVzKCkpOwogICAgICAgICAgICAgaWYgKHVz ZVNlbGVjdGlvbkhlaWdodCkgewotICAgICAgICAgICAgICAgIEludFJlY3Qgc2VsZWN0aW9uUmVj dCA9IGJveC0+c2VsZWN0aW9uUmVjdCgwLCAwLCBzdGFydCwgZW5kKTsKKyAgICAgICAgICAgICAg ICBJbnRSZWN0IHNlbGVjdGlvblJlY3QgPSBib3gtPnNlbGVjdGlvblJlY3Qoc3RhcnQsIGVuZCk7 CiAgICAgICAgICAgICAgICAgaWYgKGJveC0+aXNIb3Jpem9udGFsKCkpIHsKICAgICAgICAgICAg ICAgICAgICAgci5zZXRIZWlnaHQoc2VsZWN0aW9uUmVjdC5oZWlnaHQoKSk7CiAgICAgICAgICAg ICAgICAgICAgIHIuc2V0WShzZWxlY3Rpb25SZWN0LnkoKSk7CkBAIC0zOTcsNyArMzk3LDcgQEAg dm9pZCBSZW5kZXJUZXh0OjphYnNvbHV0ZVF1YWRzRm9yUmFuZ2UoVgogICAgICAgICAgICAgcXVh ZHMuYXBwZW5kKGxvY2FsVG9BYnNvbHV0ZVF1YWQoRmxvYXRSZWN0KHIpKSk7CiAgICAgICAgIH0g ZWxzZSB7CiAgICAgICAgICAgICB1bnNpZ25lZCByZWFsRW5kID0gbWluKGJveC0+ZW5kKCkgKyAx LCBlbmQpOwotICAgICAgICAgICAgSW50UmVjdCByID0gYm94LT5zZWxlY3Rpb25SZWN0KDAsIDAs IHN0YXJ0LCByZWFsRW5kKTsKKyAgICAgICAgICAgIEludFJlY3QgciA9IGJveC0+c2VsZWN0aW9u UmVjdChzdGFydCwgcmVhbEVuZCk7CiAgICAgICAgICAgICBpZiAoci5oZWlnaHQoKSkgewogICAg ICAgICAgICAgICAgIGlmICghdXNlU2VsZWN0aW9uSGVpZ2h0KSB7CiAgICAgICAgICAgICAgICAg ICAgIC8vIGNoYW5nZSB0aGUgaGVpZ2h0IGFuZCB5IHBvc2l0aW9uIGJlY2F1c2Ugc2VsZWN0aW9u UmVjdCB1c2VzIHNlbGVjdGlvbi1zcGVjaWZpYyB2YWx1ZXMKQEAgLTEzOTcsNyArMTM5Nyw3IEBA IEludFJlY3QgUmVuZGVyVGV4dDo6c2VsZWN0aW9uUmVjdEZvclJlcGEKIAogICAgIEludFJlY3Qg cmVjdDsKICAgICBmb3IgKElubGluZVRleHRCb3gqIGJveCA9IGZpcnN0VGV4dEJveCgpOyBib3g7 IGJveCA9IGJveC0+bmV4dFRleHRCb3goKSkgewotICAgICAgICByZWN0LnVuaXRlKGJveC0+c2Vs ZWN0aW9uUmVjdCgwLCAwLCBzdGFydFBvcywgZW5kUG9zKSk7CisgICAgICAgIHJlY3QudW5pdGUo Ym94LT5zZWxlY3Rpb25SZWN0KHN0YXJ0UG9zLCBlbmRQb3MpKTsKICAgICAgICAgcmVjdC51bml0 ZShlbGxpcHNpc1JlY3RGb3JCb3goYm94LCBzdGFydFBvcywgZW5kUG9zKSk7CiAgICAgfQogCklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR0lubGluZVRleHQuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHSW5s aW5lVGV4dC5jcHAJKHJldmlzaW9uIDg4MTcyKQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L3N2Zy9SZW5kZXJTVkdJbmxpbmVUZXh0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTE3LDEyICsx MTcsMTIgQEAgSW50UmVjdCBSZW5kZXJTVkdJbmxpbmVUZXh0Ojpsb2NhbENhcmV0UgogCiAgICAg Ly8gVXNlIHRoZSBlZGdlIG9mIHRoZSBzZWxlY3Rpb24gcmVjdCB0byBkZXRlcm1pbmUgdGhlIGNh cmV0IHJlY3QuCiAgICAgaWYgKHN0YXRpY19jYXN0PHVuc2lnbmVkPihjYXJldE9mZnNldCkgPCB0 ZXh0Qm94LT5zdGFydCgpICsgdGV4dEJveC0+bGVuKCkpIHsKLSAgICAgICAgSW50UmVjdCByZWN0 ID0gdGV4dEJveC0+c2VsZWN0aW9uUmVjdCgwLCAwLCBjYXJldE9mZnNldCwgY2FyZXRPZmZzZXQg KyAxKTsKKyAgICAgICAgSW50UmVjdCByZWN0ID0gdGV4dEJveC0+c2VsZWN0aW9uUmVjdChjYXJl dE9mZnNldCwgY2FyZXRPZmZzZXQgKyAxKTsKICAgICAgICAgaW50IHggPSBib3gtPmlzTGVmdFRv UmlnaHREaXJlY3Rpb24oKSA/IHJlY3QueCgpIDogcmVjdC5tYXhYKCk7CiAgICAgICAgIHJldHVy biBJbnRSZWN0KHgsIHJlY3QueSgpLCBjYXJldFdpZHRoLCByZWN0LmhlaWdodCgpKTsKICAgICB9 CiAKLSAgICBJbnRSZWN0IHJlY3QgPSB0ZXh0Qm94LT5zZWxlY3Rpb25SZWN0KDAsIDAsIGNhcmV0 T2Zmc2V0IC0gMSwgY2FyZXRPZmZzZXQpOworICAgIEludFJlY3QgcmVjdCA9IHRleHRCb3gtPnNl bGVjdGlvblJlY3QoY2FyZXRPZmZzZXQgLSAxLCBjYXJldE9mZnNldCk7CiAgICAgaW50IHggPSBi b3gtPmlzTGVmdFRvUmlnaHREaXJlY3Rpb24oKSA/IHJlY3QubWF4WCgpIDogcmVjdC54KCk7CiAg ICAgcmV0dXJuIEludFJlY3QoeCwgcmVjdC55KCksIGNhcmV0V2lkdGgsIHJlY3QuaGVpZ2h0KCkp OwogfQpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9TVkdJbmxpbmVUZXh0Qm94 LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1NWR0lubGlu ZVRleHRCb3guY3BwCShyZXZpc2lvbiA4ODE3MikKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9zdmcvU1ZHSW5saW5lVGV4dEJveC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTExMiw3ICsxMTIs NyBAQCBGbG9hdFJlY3QgU1ZHSW5saW5lVGV4dEJveDo6c2VsZWN0aW9uUmVjCiAgICAgcmV0dXJu IHNlbGVjdGlvblJlY3Q7CiB9CiAKLUludFJlY3QgU1ZHSW5saW5lVGV4dEJveDo6c2VsZWN0aW9u UmVjdChpbnQsIGludCwgaW50IHN0YXJ0UG9zaXRpb24sIGludCBlbmRQb3NpdGlvbikKK0ludFJl Y3QgU1ZHSW5saW5lVGV4dEJveDo6c2VsZWN0aW9uUmVjdChpbnQgc3RhcnRQb3NpdGlvbiwgaW50 IGVuZFBvc2l0aW9uKQogewogICAgIGludCBib3hTdGFydCA9IHN0YXJ0KCk7CiAgICAgc3RhcnRQ b3NpdGlvbiA9IG1heChzdGFydFBvc2l0aW9uIC0gYm94U3RhcnQsIDApOwpJbmRleDogU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9TVkdJbmxpbmVUZXh0Qm94LmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9TVkdJbmxpbmVUZXh0Qm94LmgJKHJldmlzaW9u IDg4MTcyKQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9TVkdJbmxpbmVUZXh0Qm94 LmgJKHdvcmtpbmcgY29weSkKQEAgLTQ3LDcgKzQ3LDcgQEAgcHVibGljOgogCiAgICAgdm9pZCBw YWludFNlbGVjdGlvbkJhY2tncm91bmQoUGFpbnRJbmZvJik7CiAgICAgdmlydHVhbCB2b2lkIHBh aW50KFBhaW50SW5mbyYsIGNvbnN0IEludFBvaW50JiwgaW50IGxpbmVUb3AsIGludCBsaW5lQm90 dG9tKTsKLSAgICB2aXJ0dWFsIEludFJlY3Qgc2VsZWN0aW9uUmVjdChpbnQgYWJzeCwgaW50IGFi c3ksIGludCBzdGFydFBvc2l0aW9uLCBpbnQgZW5kUG9zaXRpb24pOworICAgIHZpcnR1YWwgSW50 UmVjdCBzZWxlY3Rpb25SZWN0KGludCBzdGFydFBvc2l0aW9uLCBpbnQgZW5kUG9zaXRpb24pOwog CiAgICAgYm9vbCBtYXBTdGFydEVuZFBvc2l0aW9uc0ludG9GcmFnbWVudENvb3JkaW5hdGVzKGNv bnN0IFNWR1RleHRGcmFnbWVudCYsIGludCYgc3RhcnRQb3NpdGlvbiwgaW50JiBlbmRQb3NpdGlv bikgY29uc3Q7CiAK