84209 2012-04-17 16:33:06 -0700 Clean up outstanding LayoutUnit misuse in WebCore 2012-04-17 17:30:11 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 60318 1 leviw leviw eae eric jchaffraix macpherson menard webkit.review.bot oldest_to_newest 604464 0 leviw 2012-04-17 16:33:06 -0700 We're getting near the end of what can be landed in trunk without switching to FractionalLayoutUnits. This patch is made up of a bunch of small changes in different files that slipped through the cracks before. 604479 1 137636 leviw 2012-04-17 16:45:45 -0700 Created attachment 137636 Patch 604487 2 137636 eric 2012-04-17 16:57:05 -0700 Comment on attachment 137636 Patch OK. 604492 3 137636 webkit.review.bot 2012-04-17 17:00:07 -0700 Comment on attachment 137636 Patch Rejecting attachment 137636 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 1 Last 500 characters of output: ueue/Tools/Scripts/webkitpy/tool/commands/stepsequence.py", line 70, in run_and_handle_errors self._run(tool, options, state) File "/mnt/git/webkit-commit-queue/Tools/Scripts/webkitpy/tool/commands/stepsequence.py", line 64, in _run step(tool, options).run(state) File "/mnt/git/webkit-commit-queue/Tools/Scripts/webkitpy/tool/steps/validatereviewer.py", line 50, in run if changelog_entry.has_valid_reviewer(): AttributeError: 'NoneType' object has no attribute 'has_valid_reviewer' Full output: http://queues.webkit.org/results/12418921 604497 4 leviw 2012-04-17 17:05:01 -0700 (In reply to comment #3) > (From update of attachment 137636 [details]) > Rejecting attachment 137636 [details] from commit-queue. > > Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 1 > > Last 500 characters of output: > ueue/Tools/Scripts/webkitpy/tool/commands/stepsequence.py", line 70, in run_and_handle_errors > self._run(tool, options, state) > File "/mnt/git/webkit-commit-queue/Tools/Scripts/webkitpy/tool/commands/stepsequence.py", line 64, in _run > step(tool, options).run(state) > File "/mnt/git/webkit-commit-queue/Tools/Scripts/webkitpy/tool/steps/validatereviewer.py", line 50, in run > if changelog_entry.has_valid_reviewer(): > AttributeError: 'NoneType' object has no attribute 'has_valid_reviewer' > > Full output: http://queues.webkit.org/results/12418921 Any idea what this error is about? 604503 5 eric 2012-04-17 17:14:44 -0700 Likely failed to parse the ChangeLog. 604511 6 137636 leviw 2012-04-17 17:30:08 -0700 Comment on attachment 137636 Patch Clearing flags on attachment: 137636 Committed r114470: <http://trac.webkit.org/changeset/114470> 604512 7 leviw 2012-04-17 17:30:11 -0700 All reviewed patches have been landed. Closing bug. 137636 2012-04-17 16:45:45 -0700 2012-04-17 17:30:08 -0700 Patch patch text/plain 8254 leviw SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExNDQ2NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM2IEBACisgMjAxMi0wNC0xNyAgTGV2aSBX ZWludHJhdWIgIDxsZXZpd0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgQ2xlYW4gdXAgb3V0c3Rh bmRpbmcgTGF5b3V0VW5pdCBtaXN1c2UgaW4gV2ViQ29yZQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODQyMDkKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTbWFsbCBjaGFuZ2VzIHRvIGEgaGFuZGZ1bCBvZiBm aWxlcyB0byBwcmVwYXJlIHRydW5rIGZvciBGcmFjdGlvbmFsTGF5b3V0VW5pdHMuCisgICAgICAg IEZvciBtb3JlIGRldGFpbHMsIHNlZSBodHRwczovL3RyYWMud2Via2l0Lm9yZy93aWtpL0xheW91 dFVuaXQKKworICAgICAgICBObyBuZXcgdGVzdHMuIE5vIGNoYW5nZSBpbiBiZWhhdmlvci4KKwor ICAgICAgICAqIGNzcy9DU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24uY3BwOgorICAgICAgICAo V2ViQ29yZTo6Q1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uOjpnZXRQcm9wZXJ0eUNTU1ZhbHVl KTogbWluaW11bVZhbHVlRm9yTGVuZ3RoIHByZXNlcnZlcworICAgICAgICBzdWItcGl4ZWwgcHJl Y2lzaW9uLCBzbyB3ZSBzaG91bGQgYXZvaWQgdW5uZWNlc3NhcmlseSB1c2luZyBpbnRlZ2Vycy4K KyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9GcmFjdGlvbmFsTGF5b3V0UG9pbnQuaDoKKyAg ICAgICAgKFdlYkNvcmU6OkZyYWN0aW9uYWxMYXlvdXRQb2ludDo6RnJhY3Rpb25hbExheW91dFBv aW50KTogQWRkaW5nIGFuIGV4cGxpY2l0IGNvbnN0cnVjdG9yIGZyb20KKyAgICAgICAgRnJhY3Rp b25hbExheW91dFNpemVzLiBUaGlzIG1pcnJvcnMgYSBtZXRob2QgaW4gSW50UG9pbnQuCisgICAg ICAgICogcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlckJveE1vZGVsT2JqZWN0OjpwYWludEJvcmRlcik6IFRoZSByZWN0cyB0aGF0IGNo YW5nZSBjb21lIGZyb20gcm91bmRlZFJlY3RzLAorICAgICAgICB3aGljaCBhcmUgYWxyZWFkeSBw aXhlbC1zbmFwcGVkLgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5o OiBSZW1vdmluZyBhIGNvbW1lbnQgdGhhdCBpcyBubyBsb25nZXIgYXBwbGljYWJsZS4KKyAgICAg ICAgKiByZW5kZXJpbmcvUmVuZGVyVGFibGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy VGFibGU6OmNvbXB1dGVMb2dpY2FsV2lkdGgpOiBTaW5jZSB3ZSBsYXlvdXQgdGFibGVzIHVzaW5n IGludGVnZXJzLCB3ZQorICAgICAgICBuZWVkIHRvIGV4cGxpY2l0bHkgY2FsY3VsYXRlIHRoZSB3 aWR0aCB0byBiZSBpbnRlZ3JhbCBhcyB3ZWxsIHRvIGF2b2lkIHB1c2hpbmcgdGhlIG5leHQgZWxl bWVudAorICAgICAgICBvdmVyIGJ5IGEgcGl4ZWwgdGhhdCB3ZSB3b24ndCBsYXRlciBwYWludCB3 aXRoIG91ciBvd24gYm94IGRlY29yYXRpb25zLgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJU ZXh0Lmg6CisgICAgICAgIChSZW5kZXJUZXh0KTogQ29ycmVjdGluZyBhbiB1bmZvcnR1bmF0ZSBt aXNtYXRjaCBiZXR3ZWVuIGluIHRoZSByZXR1cm4gdmFsdWUgb2YgbGluZXNCb3VuZGluZ0JveAor ICAgICAgICBiZXR3ZWVuIHRoZSBoZWFkZXIgYW5kIGltcGxlbWVudGF0aW9uLgorICAgICAgICAq IHJlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJTdHlsZTo6Z2V0Um91bmRlZEJvcmRlckZvcik6IFdlIHdlcmUgaW5jb3JyZWN0bHkgbm90IHVz aW5nIHRoZSBzbmFwcGVkIGJvcmRlcgorICAgICAgICByZWN0IHRvIHBhc3MgdG8gY2FsY1JhZGlp Rm9yICh3aGljaCB0YWtlcyBhbiBJbnRSZWN0KS4gQ29ycmVjdGluZyB0aGlzLgorCiAyMDEyLTA0 LTE3ICBBbGVjIEZsZXR0ICA8YWxlY2ZsZXR0QGNocm9taXVtLm9yZz4KIAogICAgICAgICBJbmRl eGVkREIgY2hvb3NlcyB3cm9uZyByZWNvcmQgb24gUFJFVl9OT19EVVBMSUNBVEUgaW5kZXggY3Vy c29yCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9u LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURl Y2xhcmF0aW9uLmNwcAkocmV2aXNpb24gMTE0Mzk0KQorKysgU291cmNlL1dlYkNvcmUvY3NzL0NT U0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIyNDAsNyAr MjI0MCw3IEBAIFBhc3NSZWZQdHI8Q1NTVmFsdWU+IENTU0NvbXB1dGVkU3R5bGVEZWMKICAgICAg ICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdFRyYW5zZm9ybU9yaWdpbjogewogICAgICAgICAgICAg UmVmUHRyPENTU1ZhbHVlTGlzdD4gbGlzdCA9IENTU1ZhbHVlTGlzdDo6Y3JlYXRlU3BhY2VTZXBh cmF0ZWQoKTsKICAgICAgICAgICAgIGlmIChyZW5kZXJlcikgewotICAgICAgICAgICAgICAgIElu dFJlY3QgYm94ID0gc2l6aW5nQm94KHJlbmRlcmVyKTsKKyAgICAgICAgICAgICAgICBMYXlvdXRS ZWN0IGJveCA9IHNpemluZ0JveChyZW5kZXJlcik7CiAgICAgICAgICAgICAgICAgUmVuZGVyVmll dyogcmVuZGVyVmlldyA9IG1fbm9kZS0+ZG9jdW1lbnQoKS0+cmVuZGVyVmlldygpOwogICAgICAg ICAgICAgICAgIGxpc3QtPmFwcGVuZCh6b29tQWRqdXN0ZWRQaXhlbFZhbHVlKG1pbmltdW1WYWx1 ZUZvckxlbmd0aChzdHlsZS0+dHJhbnNmb3JtT3JpZ2luWCgpLCBib3gud2lkdGgoKSwgcmVuZGVy VmlldyksIHN0eWxlLmdldCgpKSk7CiAgICAgICAgICAgICAgICAgbGlzdC0+YXBwZW5kKHpvb21B ZGp1c3RlZFBpeGVsVmFsdWUobWluaW11bVZhbHVlRm9yTGVuZ3RoKHN0eWxlLT50cmFuc2Zvcm1P cmlnaW5ZKCksIGJveC5oZWlnaHQoKSwgcmVuZGVyVmlldyksIHN0eWxlLmdldCgpKSk7CkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9GcmFjdGlvbmFsTGF5b3V0UG9pbnQu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9GcmFjdGlv bmFsTGF5b3V0UG9pbnQuaAkocmV2aXNpb24gMTE0Mzk0KQorKysgU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvRnJhY3Rpb25hbExheW91dFBvaW50LmgJKHdvcmtpbmcgY29weSkKQEAg LTQzLDYgKzQzLDcgQEAgcHVibGljOgogICAgIEZyYWN0aW9uYWxMYXlvdXRQb2ludChGcmFjdGlv bmFsTGF5b3V0VW5pdCB4LCBGcmFjdGlvbmFsTGF5b3V0VW5pdCB5KSA6IG1feCh4KSwgbV95KHkp IHsgfQogICAgIEZyYWN0aW9uYWxMYXlvdXRQb2ludChjb25zdCBJbnRQb2ludCYgcG9pbnQpIDog bV94KHBvaW50LngoKSksIG1feShwb2ludC55KCkpIHsgfQogICAgIGV4cGxpY2l0IEZyYWN0aW9u YWxMYXlvdXRQb2ludChjb25zdCBGbG9hdFBvaW50JiBzaXplKSA6IG1feChzaXplLngoKSksIG1f eShzaXplLnkoKSkgeyB9CisgICAgZXhwbGljaXQgRnJhY3Rpb25hbExheW91dFBvaW50KGNvbnN0 IEZyYWN0aW9uYWxMYXlvdXRTaXplJiBzaXplKSA6IG1feChzaXplLndpZHRoKCkpLCBtX3koc2l6 ZS5oZWlnaHQoKSkgeyB9CiAKICAgICBzdGF0aWMgRnJhY3Rpb25hbExheW91dFBvaW50IHplcm8o KSB7IHJldHVybiBGcmFjdGlvbmFsTGF5b3V0UG9pbnQoKTsgfQogCkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3QuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5jcHAJKHJldmlzaW9u IDExNDM5NCkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVj dC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE4NDEsOCArMTg0MSw4IEBAIHZvaWQgUmVuZGVyQm94 TW9kZWxPYmplY3Q6OnBhaW50Qm9yZGVyKGMKICAgICAgICAgICAgICAgICBwYXRoLmFkZFJlY3Qo b3V0ZXJCb3JkZXIucmVjdCgpKTsKIAogICAgICAgICAgICAgaWYgKGhhdmVBbGxEb3VibGVFZGdl cykgewotICAgICAgICAgICAgICAgIExheW91dFJlY3QgaW5uZXJUaGlyZFJlY3QgPSBvdXRlckJv cmRlci5yZWN0KCk7Ci0gICAgICAgICAgICAgICAgTGF5b3V0UmVjdCBvdXRlclRoaXJkUmVjdCA9 IG91dGVyQm9yZGVyLnJlY3QoKTsKKyAgICAgICAgICAgICAgICBJbnRSZWN0IGlubmVyVGhpcmRS ZWN0ID0gb3V0ZXJCb3JkZXIucmVjdCgpOworICAgICAgICAgICAgICAgIEludFJlY3Qgb3V0ZXJU aGlyZFJlY3QgPSBvdXRlckJvcmRlci5yZWN0KCk7CiAgICAgICAgICAgICAgICAgZm9yIChpbnQg c2lkZSA9IEJTVG9wOyBzaWRlIDw9IEJTTGVmdDsgKytzaWRlKSB7CiAgICAgICAgICAgICAgICAg ICAgIGludCBvdXRlcldpZHRoOwogICAgICAgICAgICAgICAgICAgICBpbnQgaW5uZXJXaWR0aDsK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVj dC5oCShyZXZpc2lvbiAxMTQzOTQpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy Qm94TW9kZWxPYmplY3QuaAkod29ya2luZyBjb3B5KQpAQCAtNjIsNyArNjIsNiBAQCBwdWJsaWM6 CiAKICAgICBpbnQgcGl4ZWxTbmFwcGVkT2Zmc2V0TGVmdCgpIGNvbnN0IHsgcmV0dXJuIHJvdW5k VG9JbnQob2Zmc2V0TGVmdCgpKTsgfQogICAgIGludCBwaXhlbFNuYXBwZWRPZmZzZXRUb3AoKSBj b25zdCB7IHJldHVybiByb3VuZFRvSW50KG9mZnNldFRvcCgpKTsgfQotICAgIC8vIEZJWE1FOiBU aGUgaW1wbGVtZW50YXRpb24gZm9yIHRoZXNlIGZ1bmN0aW9ucyB3aWxsIGNoYW5nZSBvbmNlIHdl IG1vdmUgdG8gc3VicGl4ZWwgbGF5b3V0LiBTZWUgYnVnIDYwMzE4LgogICAgIGludCBwaXhlbFNu YXBwZWRPZmZzZXRXaWR0aCgpIGNvbnN0OwogICAgIGludCBwaXhlbFNuYXBwZWRPZmZzZXRIZWln aHQoKSBjb25zdDsKIApJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxl LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGUu Y3BwCShyZXZpc2lvbiAxMTQzOTQpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy VGFibGUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNDAsMTYgKzI0MCwxNiBAQCB2b2lkIFJlbmRl clRhYmxlOjpjb21wdXRlTG9naWNhbFdpZHRoKCkKICAgICAgICAgfQogCiAgICAgICAgIC8vIEVu c3VyZSB3ZSBhcmVuJ3QgYmlnZ2VyIHRoYW4gb3VyIGF2YWlsYWJsZSB3aWR0aC4KLSAgICAgICAg c2V0TG9naWNhbFdpZHRoKG1pbihhdmFpbGFibGVDb250ZW50TG9naWNhbFdpZHRoLCBtYXhQcmVm ZXJyZWRMb2dpY2FsV2lkdGgoKSkpOworICAgICAgICBzZXRMb2dpY2FsV2lkdGgobWluPGludD4o YXZhaWxhYmxlQ29udGVudExvZ2ljYWxXaWR0aCwgbWF4UHJlZmVycmVkTG9naWNhbFdpZHRoKCkp KTsKICAgICB9CiAKICAgICAvLyBFbnN1cmUgd2UgYXJlbid0IHNtYWxsZXIgdGhhbiBvdXIgbWlu IHByZWZlcnJlZCB3aWR0aC4KLSAgICBzZXRMb2dpY2FsV2lkdGgobWF4KGxvZ2ljYWxXaWR0aCgp LCBtaW5QcmVmZXJyZWRMb2dpY2FsV2lkdGgoKSkpOworICAgIHNldExvZ2ljYWxXaWR0aChtYXg8 aW50Pihsb2dpY2FsV2lkdGgoKSwgbWluUHJlZmVycmVkTG9naWNhbFdpZHRoKCkpKTsKIAogICAg IC8vIEVuc3VyZSB3ZSBhcmVuJ3Qgc21hbGxlciB0aGFuIG91ciBtaW4td2lkdGggc3R5bGUuCiAg ICAgTGVuZ3RoIHN0eWxlTWluTG9naWNhbFdpZHRoID0gc3R5bGUoKS0+bG9naWNhbE1pbldpZHRo KCk7CiAgICAgaWYgKHN0eWxlTWluTG9naWNhbFdpZHRoLmlzU3BlY2lmaWVkKCkgJiYgc3R5bGVN aW5Mb2dpY2FsV2lkdGguaXNQb3NpdGl2ZSgpKQotICAgICAgICBzZXRMb2dpY2FsV2lkdGgobWF4 KGxvZ2ljYWxXaWR0aCgpLCBjb252ZXJ0U3R5bGVMb2dpY2FsV2lkdGhUb0NvbXB1dGVkV2lkdGgo c3R5bGVNaW5Mb2dpY2FsV2lkdGgsIGF2YWlsYWJsZUxvZ2ljYWxXaWR0aCkpKTsKKyAgICAgICAg c2V0TG9naWNhbFdpZHRoKG1heDxpbnQ+KGxvZ2ljYWxXaWR0aCgpLCBjb252ZXJ0U3R5bGVMb2dp Y2FsV2lkdGhUb0NvbXB1dGVkV2lkdGgoc3R5bGVNaW5Mb2dpY2FsV2lkdGgsIGF2YWlsYWJsZUxv Z2ljYWxXaWR0aCkpKTsKIAogICAgIC8vIEZpbmFsbHksIHdpdGggb3VyIHRydWUgd2lkdGggZGV0 ZXJtaW5lZCwgY29tcHV0ZSBvdXIgbWFyZ2lucyBmb3IgcmVhbC4KICAgICBzZXRNYXJnaW5TdGFy dCgwKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0LmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHQuaAkocmV2aXNpb24g MTE0Mzk0KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHQuaAkod29ya2lu ZyBjb3B5KQpAQCAtODMsNyArODMsNyBAQCBwdWJsaWM6CiAgICAgICAgICAgICAgICAgICAgICAg ICAgICBmbG9hdCYgYmVnaW5NYXhXLCBmbG9hdCYgZW5kTWF4VywKICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGZsb2F0JiBtaW5XLCBmbG9hdCYgbWF4VywgYm9vbCYgc3RyaXBGcm9udFNwYWNl cyk7CiAKLSAgICB2aXJ0dWFsIExheW91dFJlY3QgbGluZXNCb3VuZGluZ0JveCgpIGNvbnN0Owor ICAgIHZpcnR1YWwgSW50UmVjdCBsaW5lc0JvdW5kaW5nQm94KCkgY29uc3Q7CiAgICAgTGF5b3V0 UmVjdCBsaW5lc1Zpc3VhbE92ZXJmbG93Qm91bmRpbmdCb3goKSBjb25zdDsKIAogICAgIEZsb2F0 UG9pbnQgZmlyc3RSdW5PcmlnaW4oKSBjb25zdDsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9zdHlsZS9SZW5kZXJTdHlsZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmNwcAkocmV2aXNpb24gMTE0Mzk0KQorKysgU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtOTMwLDcgKzkzMCw3IEBAIFJvdW5kZWRSZWN0IFJlbmRlclN0eWxlOjpnZXRSb3VuZGVk Qm9yZGUKICAgICBJbnRSZWN0IHNuYXBwZWRCb3JkZXJSZWN0KHBpeGVsU25hcHBlZEludFJlY3Qo Ym9yZGVyUmVjdCkpOwogICAgIFJvdW5kZWRSZWN0IHJvdW5kZWRSZWN0KHNuYXBwZWRCb3JkZXJS ZWN0KTsKICAgICBpZiAoaGFzQm9yZGVyUmFkaXVzKCkpIHsKLSAgICAgICAgUm91bmRlZFJlY3Q6 OlJhZGlpIHJhZGlpID0gY2FsY1JhZGlpRm9yKHN1cnJvdW5kLT5ib3JkZXIsIGJvcmRlclJlY3Qu c2l6ZSgpLCByZW5kZXJWaWV3KTsKKyAgICAgICAgUm91bmRlZFJlY3Q6OlJhZGlpIHJhZGlpID0g Y2FsY1JhZGlpRm9yKHN1cnJvdW5kLT5ib3JkZXIsIHNuYXBwZWRCb3JkZXJSZWN0LnNpemUoKSwg cmVuZGVyVmlldyk7CiAgICAgICAgIHJhZGlpLnNjYWxlKGNhbGNDb25zdHJhaW50U2NhbGVGb3Io c25hcHBlZEJvcmRlclJlY3QsIHJhZGlpKSk7CiAgICAgICAgIHJvdW5kZWRSZWN0LmluY2x1ZGVM b2dpY2FsRWRnZXMocmFkaWksIGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCksIGluY2x1ZGVMb2dp Y2FsTGVmdEVkZ2UsIGluY2x1ZGVMb2dpY2FsUmlnaHRFZGdlKTsKICAgICB9Cg==