75108 2011-12-22 11:52:37 -0800 [Chromium] remove all references to the legacy accelerated 2d Canvas implementation 2012-01-09 13:25:45 -0800 1 1 1 Unclassified WebKit Canvas 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 junov junov dglazkov fishd kbr mdelaney7 reed senorblanco simon.fraser tkent vangelis webkit.review.bot oldest_to_newest 526413 0 junov 2011-12-22 11:52:37 -0800 Clean out traces of the old GLES2 2D Canvas implementation. The legacy accelerated 2d canvas implementation was already mostly ripped-out, but there are still some dangling remnants that need cleaned out such as http://trac.webkit.org/changeset/85720 531226 1 121458 junov 2012-01-06 12:00:22 -0800 Created attachment 121458 Patch 531233 2 121458 senorblanco 2012-01-06 12:02:40 -0800 Comment on attachment 121458 Patch Yay. r=me 531234 3 webkit.review.bot 2012-01-06 12:03:59 -0800 Please wait for approval from fishd@chromium.org before submitting because this patch contains changes to the Chromium public API. 531238 4 121458 senorblanco 2012-01-06 12:05:25 -0800 Comment on attachment 121458 Patch Removing my r+ as instructed until we get an ok from Darin. 531257 5 121458 webkit.review.bot 2012-01-06 12:19:57 -0800 Comment on attachment 121458 Patch Attachment 121458 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/11168043 531332 6 senorblanco 2012-01-06 13:19:12 -0800 (In reply to comment #5) > (From update of attachment 121458 [details]) > Attachment 121458 [details] did not pass chromium-ews (chromium-xvfb): > Output: http://queues.webkit.org/results/11168043 Hmm, looks like there are still some traces left: Last 500 characters of output: ) out/Release/obj.target/DumpRenderTree/Tools/DumpRenderTree/chromium/WebPreferences.o Tools/DumpRenderTree/chromium/WebPreferences.cpp: In member function 'void WebPreferences::applyTo(WebKit::WebView*)': Tools/DumpRenderTree/chromium/WebPreferences.cpp:221: error: 'class WebKit::WebSettings' has no member named 'setLegacyAccelerated2dCanvasEnabled' 532164 7 junov 2012-01-09 06:51:13 -0800 (In reply to comment #6) > Hmm, looks like there are still some traces left: D'Oh! Once again, I got burned by diff+patch because WebKit maps to multiple sub repos in Chromium... So anoying. Good thing there's EWS. New, complete patch coming right up... 532166 8 121664 junov 2012-01-09 06:59:27 -0800 Created attachment 121664 Patch 532241 9 121664 webkit.review.bot 2012-01-09 09:31:32 -0800 Comment on attachment 121664 Patch Rejecting attachment 121664 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: on 930 --non-interactive --force --accept theirs-conflict --ignore-externals returned non-zero exit status 1 in /mnt/git/webkit-commit-queue/Source/WebKit/chromium Error: 'depot_tools/gclient sync --force --reset --delete_unversioned_trees' failed 3 tries and returned 256 at Tools/Scripts/update-webkit-chromium line 106. Re-trying 'depot_tools/gclient sync --force --reset --delete_unversioned_trees' No such file or directory at /mnt/git/webkit-commit-queue/Tools/Scripts/webkitdirs.pm line 2259. Full output: http://queues.webkit.org/results/11186519 532434 10 121664 senorblanco 2012-01-09 12:44:37 -0800 Comment on attachment 121664 Patch I'm going to try setting CQ+ again to see if was perhaps just bot weirdness. 532435 11 junov 2012-01-09 12:46:54 -0800 I just updated my client -> no conflicts. Looks like it was just commit bot flakiness. 532481 12 121664 webkit.review.bot 2012-01-09 13:25:40 -0800 Comment on attachment 121664 Patch Clearing flags on attachment: 121664 Committed r104485: <http://trac.webkit.org/changeset/104485> 532482 13 webkit.review.bot 2012-01-09 13:25:45 -0800 All reviewed patches have been landed. Closing bug. 121458 2012-01-06 12:00:22 -0800 2012-01-09 06:59:22 -0800 Patch bug-75108-20120106150020.patch text/plain 5806 junov SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwNDMxMCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDEyLTAxLTA2ICBKdXN0aW4g Tm92b3NhZCAgPGp1bm92QGNocm9taXVtLm9yZz4KKworICAgICAgICBbQ2hyb21pdW1dIHJlbW92 ZSBhbGwgcmVmZXJlbmNlcyB0byB0aGUgbGVnYWN5IGFjY2VsZXJhdGVkIDJkIENhbnZhcworICAg ICAgICBpbXBsZW1lbnRhdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NzUxMDgKKworICAgICAgICBDb2RlIGNsZWFudXA6IHJlbW92aW5nIGFuIG9s ZCBzZXR0aW5ncyBmbGFnIHRoYXQgaXMgbm8gbG9uZ2VyCisgICAgICAgIHJlZmVyZW5jZWQuCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwYWdlL1Nl dHRpbmdzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNldHRpbmdzOjpTZXR0aW5ncyk6CisgICAg ICAgICogcGFnZS9TZXR0aW5ncy5oOgorCiAyMDEyLTAxLTA2ICBXZWkgSmFtZXMgIDxqYW1lcy53 ZWlAaW50ZWwuY29tPgogCiAgICAgICAgIFVzZSBWZWN0b3JNYXRoIGxpYiB3aGVuIHBvc3NpYmxl IHRvIG9wdGltaXplIHRoZSBwcm9jZXNzaW5nIGluIFdlYkF1ZGlvIEF1ZGlvQnVzCkluZGV4OiBT b3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9wYWdlL1NldHRpbmdzLmNwcAkocmV2aXNpb24gMTA0MzAyKQorKysgU291cmNlL1dlYkNv cmUvcGFnZS9TZXR0aW5ncy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE5Miw3ICsxOTIsNiBAQCBT ZXR0aW5nczo6U2V0dGluZ3MoUGFnZSogcGFnZSkKICAgICAsIG1fcHJpdmlsZWdlZFdlYkdMRXh0 ZW5zaW9uc0VuYWJsZWQoZmFsc2UpCiAgICAgLCBtX3dlYkF1ZGlvRW5hYmxlZChmYWxzZSkKICAg ICAsIG1fYWNjZWxlcmF0ZWRDYW52YXMyZEVuYWJsZWQoZmFsc2UpCi0gICAgLCBtX2xlZ2FjeUFj Y2VsZXJhdGVkQ2FudmFzMmRFbmFibGVkKGZhbHNlKQogICAgICwgbV9sb2FkRGVmZXJyaW5nRW5h YmxlZCh0cnVlKQogICAgICwgbV90aWxlZEJhY2tpbmdTdG9yZUVuYWJsZWQoZmFsc2UpCiAgICAg LCBtX3BhZ2luYXRlRHVyaW5nTGF5b3V0RW5hYmxlZChmYWxzZSkKQEAgLTgxMCwxMSArODA5LDYg QEAgdm9pZCBTZXR0aW5nczo6c2V0QWNjZWxlcmF0ZWQyZENhbnZhc0VuYQogICAgIG1fYWNjZWxl cmF0ZWRDYW52YXMyZEVuYWJsZWQgPSBlbmFibGVkOwogfQogCi12b2lkIFNldHRpbmdzOjpzZXRM ZWdhY3lBY2NlbGVyYXRlZDJkQ2FudmFzRW5hYmxlZChib29sIGVuYWJsZWQpCi17Ci0gICAgbV9s ZWdhY3lBY2NlbGVyYXRlZENhbnZhczJkRW5hYmxlZCA9IGVuYWJsZWQ7Ci19Ci0KIHZvaWQgU2V0 dGluZ3M6OnNldE1pbmltdW1BY2NlbGVyYXRlZDJkQ2FudmFzU2l6ZShpbnQgbnVtUGl4ZWxzKQog ewogICAgIG1fbWluaW11bUFjY2VsZXJhdGVkMmRDYW52YXNTaXplID0gbnVtUGl4ZWxzOwpJbmRl eDogU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3BhZ2UvU2V0dGluZ3MuaAkocmV2aXNpb24gMTA0MzAyKQorKysgU291cmNlL1dlYkNv cmUvcGFnZS9TZXR0aW5ncy5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNjAsOSArMzYwLDYgQEAgbmFt ZXNwYWNlIFdlYkNvcmUgewogICAgICAgICB2b2lkIHNldEFjY2VsZXJhdGVkMmRDYW52YXNFbmFi bGVkKGJvb2wpOwogICAgICAgICBib29sIGFjY2VsZXJhdGVkMmRDYW52YXNFbmFibGVkKCkgY29u c3QgeyByZXR1cm4gbV9hY2NlbGVyYXRlZENhbnZhczJkRW5hYmxlZDsgfQogCi0gICAgICAgIHZv aWQgc2V0TGVnYWN5QWNjZWxlcmF0ZWQyZENhbnZhc0VuYWJsZWQoYm9vbCk7Ci0gICAgICAgIGJv b2wgbGVnYWN5QWNjZWxlcmF0ZWQyZENhbnZhc0VuYWJsZWQoKSBjb25zdCB7IHJldHVybiBtX2xl Z2FjeUFjY2VsZXJhdGVkQ2FudmFzMmRFbmFibGVkOyB9Ci0KICAgICAgICAgLy8gTnVtYmVyIG9m IHBpeGVscyBiZWxvdyB3aGljaCAyRCBjYW52YXMgaXMgcmVuZGVyZWQgaW4gc29mdHdhcmUKICAg ICAgICAgLy8gZXZlbiBpZiBoYXJkd2FyZSBhY2NlbGVyYXRpb24gaXMgZW5hYmxlZC4KICAgICAg ICAgLy8gSGFyZHdhcmUgYWNjZWxlcmF0aW9uIGlzIHVzZWZ1bCBmb3IgbGFyZ2UgY2FudmFzZXMg d2hlcmUgaXQgY2FuIGF2b2lkIHRoZQpAQCAtNjEyLDcgKzYwOSw2IEBAIG5hbWVzcGFjZSBXZWJD b3JlIHsKICAgICAgICAgYm9vbCBtX3ByaXZpbGVnZWRXZWJHTEV4dGVuc2lvbnNFbmFibGVkIDog MTsKICAgICAgICAgYm9vbCBtX3dlYkF1ZGlvRW5hYmxlZCA6IDE7CiAgICAgICAgIGJvb2wgbV9h Y2NlbGVyYXRlZENhbnZhczJkRW5hYmxlZCA6IDE7Ci0gICAgICAgIGJvb2wgbV9sZWdhY3lBY2Nl bGVyYXRlZENhbnZhczJkRW5hYmxlZCA6IDE7CiAgICAgICAgIGJvb2wgbV9sb2FkRGVmZXJyaW5n RW5hYmxlZCA6IDE7CiAgICAgICAgIGJvb2wgbV90aWxlZEJhY2tpbmdTdG9yZUVuYWJsZWQgOiAx OwogICAgICAgICBib29sIG1fcGFnaW5hdGVEdXJpbmdMYXlvdXRFbmFibGVkIDogMTsKSW5kZXg6 IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiAxMDQzMTApCisrKyBTb3VyY2UvV2Vi S2l0L2Nocm9taXVtL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisy MDEyLTAxLTA2ICBKdXN0aW4gTm92b3NhZCAgPGp1bm92QGNocm9taXVtLm9yZz4KKworICAgICAg ICBbQ2hyb21pdW1dIHJlbW92ZSBhbGwgcmVmZXJlbmNlcyB0byB0aGUgbGVnYWN5IGFjY2VsZXJh dGVkIDJkIENhbnZhcworICAgICAgICBpbXBsZW1lbnRhdGlvbgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzUxMDgKKworICAgICAgICBQdXJnaW5nIGFu IG9sZCBzZXR0aW5ncyBmbGFnIHRoYXQgaXMgbm8gbG9uZ2VyIHJlZmVyZW5jZWQKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHB1YmxpYy9XZWJTZXR0 aW5ncy5oOgorICAgICAgICAqIHNyYy9XZWJTZXR0aW5nc0ltcGwuY3BwOgorICAgICAgICAqIHNy Yy9XZWJTZXR0aW5nc0ltcGwuaDoKKwogMjAxMi0wMS0wNSAgSm9jaGVuIEVpc2luZ2VyICA8am9j aGVuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBDaGVjayB3aGV0aGVyIGEgV2ViVmlldyBleGlz dHMgYmVmb3JlIGFjY2Vzc2luZyBpdCBpbiBTdG9yYWdlQXJlYVByb3h5LiBUaGlzIGlzIG5vdCBu ZWNlc3NhcmlseSB0aGUgY2FzZSwgZS5nLiBmb3IgZGV0YWNoZWQgaWZyYW1lcy4KSW5kZXg6IFNv dXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlNldHRpbmdzLmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViU2V0dGluZ3MuaAkocmV2aXNpb24gMTA0 MzAyKQorKysgU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViU2V0dGluZ3MuaAkod29y a2luZyBjb3B5KQpAQCAtMTE1LDcgKzExNSw2IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQg c2V0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ0ZvckFuaW1hdGlvbkVuYWJsZWQoYm9vbCkgPSAwOwog ICAgIHZpcnR1YWwgdm9pZCBzZXRBY2NlbGVyYXRlZDJkQ2FudmFzRW5hYmxlZChib29sKSA9IDA7 CiAgICAgdmlydHVhbCB2b2lkIHNldEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdGb3JGaXhlZFBvc2l0 aW9uRW5hYmxlZChib29sKSAgPSAwOwotICAgIHZpcnR1YWwgdm9pZCBzZXRMZWdhY3lBY2NlbGVy YXRlZDJkQ2FudmFzRW5hYmxlZChib29sKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIHNldE1pbmlt dW1BY2NlbGVyYXRlZDJkQ2FudmFzU2l6ZShpbnQpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgc2V0 QWNjZWxlcmF0ZWRGaWx0ZXJzRW5hYmxlZChib29sKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIHNl dE1lbW9yeUluZm9FbmFibGVkKGJvb2wpID0gMDsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21p dW0vc3JjL1dlYlNldHRpbmdzSW1wbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9j aHJvbWl1bS9zcmMvV2ViU2V0dGluZ3NJbXBsLmNwcAkocmV2aXNpb24gMTA0MzAyKQorKysgU291 cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViU2V0dGluZ3NJbXBsLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMzY4LDExICszNjgsNiBAQCB2b2lkIFdlYlNldHRpbmdzSW1wbDo6c2V0QWNjZWxlcmF0 ZWQyZENhCiAgICAgbV9zZXR0aW5ncy0+c2V0QWNjZWxlcmF0ZWQyZENhbnZhc0VuYWJsZWQoZW5h YmxlZCk7CiB9CiAKLXZvaWQgV2ViU2V0dGluZ3NJbXBsOjpzZXRMZWdhY3lBY2NlbGVyYXRlZDJk Q2FudmFzRW5hYmxlZChib29sIGVuYWJsZWQpCi17Ci0gICAgbV9zZXR0aW5ncy0+c2V0TGVnYWN5 QWNjZWxlcmF0ZWQyZENhbnZhc0VuYWJsZWQoZW5hYmxlZCk7Ci19Ci0KIHZvaWQgV2ViU2V0dGlu Z3NJbXBsOjpzZXRBY2NlbGVyYXRlZENvbXBvc2l0aW5nRm9yRml4ZWRQb3NpdGlvbkVuYWJsZWQo Ym9vbCBlbmFibGVkKQogewogICAgIG1fc2V0dGluZ3MtPnNldEFjY2VsZXJhdGVkQ29tcG9zaXRp bmdGb3JGaXhlZFBvc2l0aW9uRW5hYmxlZChlbmFibGVkKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL1dlYlNldHRpbmdzSW1wbC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvY2hyb21pdW0vc3JjL1dlYlNldHRpbmdzSW1wbC5oCShyZXZpc2lvbiAxMDQzMDIpCisrKyBT b3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJTZXR0aW5nc0ltcGwuaAkod29ya2luZyBjb3B5 KQpAQCAtMTA3LDcgKzEwNyw2IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgc2V0QWNjZWxl cmF0ZWRDb21wb3NpdGluZ0ZvckFuaW1hdGlvbkVuYWJsZWQoYm9vbCk7CiAgICAgdmlydHVhbCB2 b2lkIHNldEFjY2VsZXJhdGVkMmRDYW52YXNFbmFibGVkKGJvb2wpOwogICAgIHZpcnR1YWwgdm9p ZCBzZXRBY2NlbGVyYXRlZENvbXBvc2l0aW5nRm9yRml4ZWRQb3NpdGlvbkVuYWJsZWQoYm9vbCk7 Ci0gICAgdmlydHVhbCB2b2lkIHNldExlZ2FjeUFjY2VsZXJhdGVkMmRDYW52YXNFbmFibGVkKGJv b2wpOwogICAgIHZpcnR1YWwgdm9pZCBzZXRNaW5pbXVtQWNjZWxlcmF0ZWQyZENhbnZhc1NpemUo aW50KTsKICAgICB2aXJ0dWFsIHZvaWQgc2V0QWNjZWxlcmF0ZWRGaWx0ZXJzRW5hYmxlZChib29s KTsKICAgICB2aXJ0dWFsIHZvaWQgc2V0TWVtb3J5SW5mb0VuYWJsZWQoYm9vbCk7Cg== 121664 2012-01-09 06:59:27 -0800 2012-01-09 13:25:40 -0800 Patch bug-75108-20120109095925.patch text/plain 13155 junov SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwNDQ1NykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDEyLTAxLTA5ICBKdXN0aW4g Tm92b3NhZCAgPGp1bm92QGNocm9taXVtLm9yZz4KKworICAgICAgICBbQ2hyb21pdW1dIHJlbW92 ZSBhbGwgcmVmZXJlbmNlcyB0byB0aGUgbGVnYWN5IGFjY2VsZXJhdGVkIDJkIENhbnZhcworICAg ICAgICBpbXBsZW1lbnRhdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NzUxMDgKKworICAgICAgICBQdXJnaW5nIGFuIG9sZCBzZXR0aW5ncyBmbGFn IHRoYXQgaXMgbm8gbG9uZ2VyIHJlZmVyZW5jZWQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIHBhZ2UvU2V0dGluZ3MuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6U2V0dGluZ3M6OlNldHRpbmdzKToKKyAgICAgICAgKiBwYWdlL1NldHRpbmdzLmg6CisK IDIwMTItMDEtMDkgIENhaW8gTWFyY2VsbyBkZSBPbGl2ZWlyYSBGaWxobyAgPGNhaW8ub2xpdmVp cmFAb3BlbmJvc3NhLm9yZz4KIAogICAgICAgICBVc2UgVmVjdG9yPE93blB0cj4gZm9yIG1fdmll d3BvcnREZXBlbmRlbnRNZWRpYVF1ZXJ5UmVzdWx0cyBpbiBDU1NTdHlsZVNlbGVjdG9yCkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9wYWdlL1NldHRpbmdzLmNwcAkocmV2aXNpb24gMTA0MzAyKQorKysgU291cmNlL1dl YkNvcmUvcGFnZS9TZXR0aW5ncy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE5Miw3ICsxOTIsNiBA QCBTZXR0aW5nczo6U2V0dGluZ3MoUGFnZSogcGFnZSkKICAgICAsIG1fcHJpdmlsZWdlZFdlYkdM RXh0ZW5zaW9uc0VuYWJsZWQoZmFsc2UpCiAgICAgLCBtX3dlYkF1ZGlvRW5hYmxlZChmYWxzZSkK ICAgICAsIG1fYWNjZWxlcmF0ZWRDYW52YXMyZEVuYWJsZWQoZmFsc2UpCi0gICAgLCBtX2xlZ2Fj eUFjY2VsZXJhdGVkQ2FudmFzMmRFbmFibGVkKGZhbHNlKQogICAgICwgbV9sb2FkRGVmZXJyaW5n RW5hYmxlZCh0cnVlKQogICAgICwgbV90aWxlZEJhY2tpbmdTdG9yZUVuYWJsZWQoZmFsc2UpCiAg ICAgLCBtX3BhZ2luYXRlRHVyaW5nTGF5b3V0RW5hYmxlZChmYWxzZSkKQEAgLTgxMCwxMSArODA5 LDYgQEAgdm9pZCBTZXR0aW5nczo6c2V0QWNjZWxlcmF0ZWQyZENhbnZhc0VuYQogICAgIG1fYWNj ZWxlcmF0ZWRDYW52YXMyZEVuYWJsZWQgPSBlbmFibGVkOwogfQogCi12b2lkIFNldHRpbmdzOjpz ZXRMZWdhY3lBY2NlbGVyYXRlZDJkQ2FudmFzRW5hYmxlZChib29sIGVuYWJsZWQpCi17Ci0gICAg bV9sZWdhY3lBY2NlbGVyYXRlZENhbnZhczJkRW5hYmxlZCA9IGVuYWJsZWQ7Ci19Ci0KIHZvaWQg U2V0dGluZ3M6OnNldE1pbmltdW1BY2NlbGVyYXRlZDJkQ2FudmFzU2l6ZShpbnQgbnVtUGl4ZWxz KQogewogICAgIG1fbWluaW11bUFjY2VsZXJhdGVkMmRDYW52YXNTaXplID0gbnVtUGl4ZWxzOwpJ bmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MuaAkocmV2aXNpb24gMTA0MzAyKQorKysgU291cmNlL1dl YkNvcmUvcGFnZS9TZXR0aW5ncy5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNjAsOSArMzYwLDYgQEAg bmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICB2b2lkIHNldEFjY2VsZXJhdGVkMmRDYW52YXNF bmFibGVkKGJvb2wpOwogICAgICAgICBib29sIGFjY2VsZXJhdGVkMmRDYW52YXNFbmFibGVkKCkg Y29uc3QgeyByZXR1cm4gbV9hY2NlbGVyYXRlZENhbnZhczJkRW5hYmxlZDsgfQogCi0gICAgICAg IHZvaWQgc2V0TGVnYWN5QWNjZWxlcmF0ZWQyZENhbnZhc0VuYWJsZWQoYm9vbCk7Ci0gICAgICAg IGJvb2wgbGVnYWN5QWNjZWxlcmF0ZWQyZENhbnZhc0VuYWJsZWQoKSBjb25zdCB7IHJldHVybiBt X2xlZ2FjeUFjY2VsZXJhdGVkQ2FudmFzMmRFbmFibGVkOyB9Ci0KICAgICAgICAgLy8gTnVtYmVy IG9mIHBpeGVscyBiZWxvdyB3aGljaCAyRCBjYW52YXMgaXMgcmVuZGVyZWQgaW4gc29mdHdhcmUK ICAgICAgICAgLy8gZXZlbiBpZiBoYXJkd2FyZSBhY2NlbGVyYXRpb24gaXMgZW5hYmxlZC4KICAg ICAgICAgLy8gSGFyZHdhcmUgYWNjZWxlcmF0aW9uIGlzIHVzZWZ1bCBmb3IgbGFyZ2UgY2FudmFz ZXMgd2hlcmUgaXQgY2FuIGF2b2lkIHRoZQpAQCAtNjEyLDcgKzYwOSw2IEBAIG5hbWVzcGFjZSBX ZWJDb3JlIHsKICAgICAgICAgYm9vbCBtX3ByaXZpbGVnZWRXZWJHTEV4dGVuc2lvbnNFbmFibGVk IDogMTsKICAgICAgICAgYm9vbCBtX3dlYkF1ZGlvRW5hYmxlZCA6IDE7CiAgICAgICAgIGJvb2wg bV9hY2NlbGVyYXRlZENhbnZhczJkRW5hYmxlZCA6IDE7Ci0gICAgICAgIGJvb2wgbV9sZWdhY3lB Y2NlbGVyYXRlZENhbnZhczJkRW5hYmxlZCA6IDE7CiAgICAgICAgIGJvb2wgbV9sb2FkRGVmZXJy aW5nRW5hYmxlZCA6IDE7CiAgICAgICAgIGJvb2wgbV90aWxlZEJhY2tpbmdTdG9yZUVuYWJsZWQg OiAxOwogICAgICAgICBib29sIG1fcGFnaW5hdGVEdXJpbmdMYXlvdXRFbmFibGVkIDogMTsKSW5k ZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiAxMDQ0NTcpCisrKyBTb3VyY2Uv V2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBA CisyMDEyLTAxLTA5ICBKdXN0aW4gTm92b3NhZCAgPGp1bm92QGNocm9taXVtLm9yZz4KKworICAg ICAgICBbQ2hyb21pdW1dIHJlbW92ZSBhbGwgcmVmZXJlbmNlcyB0byB0aGUgbGVnYWN5IGFjY2Vs ZXJhdGVkIDJkIENhbnZhcworICAgICAgICBpbXBsZW1lbnRhdGlvbgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzUxMDgKKworICAgICAgICBQdXJnaW5n IGFuIG9sZCBzZXR0aW5ncyBmbGFnIHRoYXQgaXMgbm8gbG9uZ2VyIHJlZmVyZW5jZWQKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHB1YmxpYy9XZWJT ZXR0aW5ncy5oOgorICAgICAgICAqIHNyYy9XZWJTZXR0aW5nc0ltcGwuY3BwOgorICAgICAgICAq IHNyYy9XZWJTZXR0aW5nc0ltcGwuaDoKKwogMjAxMi0wMS0wOCAgRGF2aWQgTGV2aW4gIDxsZXZp bkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW2Nocm9taXVtXSBpZnJhbWVzIGluIGFuIGF1dG9y ZXNpemVkIHdpbmRvdyBnZXQgc2l6ZWQgaW5jb3JyZWN0bHkuCkluZGV4OiBTb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3B1YmxpYy9XZWJTZXR0aW5ncy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvY2hyb21pdW0vcHVibGljL1dlYlNldHRpbmdzLmgJKHJldmlzaW9uIDEwNDMwMikKKysrIFNv dXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlNldHRpbmdzLmgJKHdvcmtpbmcgY29weSkK QEAgLTExNSw3ICsxMTUsNiBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHNldEFjY2VsZXJh dGVkQ29tcG9zaXRpbmdGb3JBbmltYXRpb25FbmFibGVkKGJvb2wpID0gMDsKICAgICB2aXJ0dWFs IHZvaWQgc2V0QWNjZWxlcmF0ZWQyZENhbnZhc0VuYWJsZWQoYm9vbCkgPSAwOwogICAgIHZpcnR1 YWwgdm9pZCBzZXRBY2NlbGVyYXRlZENvbXBvc2l0aW5nRm9yRml4ZWRQb3NpdGlvbkVuYWJsZWQo Ym9vbCkgID0gMDsKLSAgICB2aXJ0dWFsIHZvaWQgc2V0TGVnYWN5QWNjZWxlcmF0ZWQyZENhbnZh c0VuYWJsZWQoYm9vbCkgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBzZXRNaW5pbXVtQWNjZWxlcmF0 ZWQyZENhbnZhc1NpemUoaW50KSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIHNldEFjY2VsZXJhdGVk RmlsdGVyc0VuYWJsZWQoYm9vbCkgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBzZXRNZW1vcnlJbmZv RW5hYmxlZChib29sKSA9IDA7CkluZGV4OiBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJT ZXR0aW5nc0ltcGwuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3Jj L1dlYlNldHRpbmdzSW1wbC5jcHAJKHJldmlzaW9uIDEwNDMwMikKKysrIFNvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL1dlYlNldHRpbmdzSW1wbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM2OCwx MSArMzY4LDYgQEAgdm9pZCBXZWJTZXR0aW5nc0ltcGw6OnNldEFjY2VsZXJhdGVkMmRDYQogICAg IG1fc2V0dGluZ3MtPnNldEFjY2VsZXJhdGVkMmRDYW52YXNFbmFibGVkKGVuYWJsZWQpOwogfQog Ci12b2lkIFdlYlNldHRpbmdzSW1wbDo6c2V0TGVnYWN5QWNjZWxlcmF0ZWQyZENhbnZhc0VuYWJs ZWQoYm9vbCBlbmFibGVkKQotewotICAgIG1fc2V0dGluZ3MtPnNldExlZ2FjeUFjY2VsZXJhdGVk MmRDYW52YXNFbmFibGVkKGVuYWJsZWQpOwotfQotCiB2b2lkIFdlYlNldHRpbmdzSW1wbDo6c2V0 QWNjZWxlcmF0ZWRDb21wb3NpdGluZ0ZvckZpeGVkUG9zaXRpb25FbmFibGVkKGJvb2wgZW5hYmxl ZCkKIHsKICAgICBtX3NldHRpbmdzLT5zZXRBY2NlbGVyYXRlZENvbXBvc2l0aW5nRm9yRml4ZWRQ b3NpdGlvbkVuYWJsZWQoZW5hYmxlZCk7CkluZGV4OiBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Ny Yy9XZWJTZXR0aW5nc0ltcGwuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJTZXR0aW5nc0ltcGwuaAkocmV2aXNpb24gMTA0MzAyKQorKysgU291cmNlL1dlYktp dC9jaHJvbWl1bS9zcmMvV2ViU2V0dGluZ3NJbXBsLmgJKHdvcmtpbmcgY29weSkKQEAgLTEwNyw3 ICsxMDcsNiBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHNldEFjY2VsZXJhdGVkQ29tcG9z aXRpbmdGb3JBbmltYXRpb25FbmFibGVkKGJvb2wpOwogICAgIHZpcnR1YWwgdm9pZCBzZXRBY2Nl bGVyYXRlZDJkQ2FudmFzRW5hYmxlZChib29sKTsKICAgICB2aXJ0dWFsIHZvaWQgc2V0QWNjZWxl cmF0ZWRDb21wb3NpdGluZ0ZvckZpeGVkUG9zaXRpb25FbmFibGVkKGJvb2wpOwotICAgIHZpcnR1 YWwgdm9pZCBzZXRMZWdhY3lBY2NlbGVyYXRlZDJkQ2FudmFzRW5hYmxlZChib29sKTsKICAgICB2 aXJ0dWFsIHZvaWQgc2V0TWluaW11bUFjY2VsZXJhdGVkMmRDYW52YXNTaXplKGludCk7CiAgICAg dmlydHVhbCB2b2lkIHNldEFjY2VsZXJhdGVkRmlsdGVyc0VuYWJsZWQoYm9vbCk7CiAgICAgdmly dHVhbCB2b2lkIHNldE1lbW9yeUluZm9FbmFibGVkKGJvb2wpOwpJbmRleDogVG9vbHMvQ2hhbmdl TG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0NoYW5nZUxvZwkocmV2aXNpb24gMTA0NDU3KQorKysg VG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTItMDEt MDkgIEp1c3RpbiBOb3Zvc2FkICA8anVub3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtDaHJv bWl1bV0gcmVtb3ZlIGFsbCByZWZlcmVuY2VzIHRvIHRoZSBsZWdhY3kgYWNjZWxlcmF0ZWQgMmQg Q2FudmFzCisgICAgICAgIGltcGxlbWVudGF0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NTEwOAorCisgICAgICAgIFB1cmdpbmcgYW4gb2xkIHNl dHRpbmdzIGZsYWcgdGhhdCBpcyBubyBsb25nZXIgcmVmZXJlbmNlZAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvY2hyb21p dW0vRHVtcFJlbmRlclRyZWUuY3BwOgorICAgICAgICAobWFpbik6CisgICAgICAgICogRHVtcFJl bmRlclRyZWUvY2hyb21pdW0vVGVzdFNoZWxsLmNwcDoKKyAgICAgICAgKFRlc3RTaGVsbDo6VGVz dFNoZWxsKToKKyAgICAgICAgKFRlc3RTaGVsbDo6cmVzZXRXZWJTZXR0aW5ncyk6CisgICAgICAg ICogRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vVGVzdFNoZWxsLmg6CisgICAgICAgIChUZXN0U2hl bGw6OnNldEFjY2VsZXJhdGVkMmRDYW52YXNFbmFibGVkKToKKyAgICAgICAgKiBEdW1wUmVuZGVy VHJlZS9jaHJvbWl1bS9XZWJQcmVmZXJlbmNlcy5jcHA6CisgICAgICAgIChXZWJQcmVmZXJlbmNl czo6cmVzZXQpOgorICAgICAgICAoV2ViUHJlZmVyZW5jZXM6OmFwcGx5VG8pOgorICAgICAgICAq IER1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlByZWZlcmVuY2VzLmg6CisKIDIwMTItMDEtMDkg IEFsZXhhbmRlciBGw6Zyw7h5ICA8YWhmQDB4OTAuZGs+CiAKICAgICAgICAgW1F0XSBBZGQgc3Vw cG9ydCBmb3IgZHluYW1pY2FsbHkgZW5hYmxpbmcgYW5kIGRpc2FibGluZyB0b3VjaCBtb2NraW5n IGluIHRoZSBRdCBNaW5pQnJvd3NlcgpJbmRleDogVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21p dW0vRHVtcFJlbmRlclRyZWUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0R1bXBSZW5kZXJUcmVl L2Nocm9taXVtL0R1bXBSZW5kZXJUcmVlLmNwcAkocmV2aXNpb24gMTA0MzAyKQorKysgVG9vbHMv RHVtcFJlbmRlclRyZWUvY2hyb21pdW0vRHVtcFJlbmRlclRyZWUuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC01Niw3ICs1Niw2IEBAIHN0YXRpYyBjb25zdCBjaGFyIG9wdGlvbkhhcmR3YXJlQWNjZWxl cmEKIHN0YXRpYyBjb25zdCBjaGFyIG9wdGlvbkVuYWJsZVRocmVhZGVkQ29tcG9zaXRpbmdbXSA9 ICItLWVuYWJsZS10aHJlYWRlZC1jb21wb3NpdGluZyI7CiBzdGF0aWMgY29uc3QgY2hhciBvcHRp b25Gb3JjZUNvbXBvc2l0aW5nTW9kZVtdID0gIi0tZm9yY2UtY29tcG9zaXRpbmctbW9kZSI7CiBz dGF0aWMgY29uc3QgY2hhciBvcHRpb25FbmFibGVBY2NlbGVyYXRlZDJEQ2FudmFzW10gPSAiLS1l bmFibGUtYWNjZWxlcmF0ZWQtMmQtY2FudmFzIjsKLXN0YXRpYyBjb25zdCBjaGFyIG9wdGlvbkVu YWJsZUxlZ2FjeUFjY2VsZXJhdGVkMkRDYW52YXNbXSA9ICItLWVuYWJsZS1sZWdhY3ktYWNjZWxl cmF0ZWQtMmQtY2FudmFzIjsKIHN0YXRpYyBjb25zdCBjaGFyIG9wdGlvbkVuYWJsZUFjY2VsZXJh dGVkUGFpbnRpbmdbXSA9ICItLWVuYWJsZS1hY2NlbGVyYXRlZC1wYWludGluZyI7CiBzdGF0aWMg Y29uc3QgY2hhciBvcHRpb25FbmFibGVBY2NlbGVyYXRlZENvbXBvc2l0aW5nRm9yVmlkZW9bXSA9 ICItLWVuYWJsZS1hY2NlbGVyYXRlZC12aWRlbyI7CiBzdGF0aWMgY29uc3QgY2hhciBvcHRpb25F bmFibGVDb21wb3NpdGVUb1RleHR1cmVbXSA9ICItLWVuYWJsZS1jb21wb3NpdGUtdG8tdGV4dHVy ZSI7CkBAIC0xNDQsNyArMTQzLDYgQEAgaW50IG1haW4oaW50IGFyZ2MsIGNoYXIqIGFyZ3ZbXSkK ICAgICBib29sIGNvbXBvc2l0ZVRvVGV4dHVyZSA9IGZhbHNlOwogICAgIGJvb2wgZm9yY2VDb21w b3NpdGluZ01vZGUgPSBmYWxzZTsKICAgICBib29sIGFjY2VsZXJhdGVkMkRDYW52YXNFbmFibGVk ID0gZmFsc2U7Ci0gICAgYm9vbCBsZWdhY3lBY2NlbGVyYXRlZDJEQ2FudmFzRW5hYmxlZCA9IGZh bHNlOwogICAgIGJvb2wgYWNjZWxlcmF0ZWRQYWludGluZ0VuYWJsZWQgPSBmYWxzZTsKICAgICBi b29sIHBlclRpbGVQYWludGluZ0VuYWJsZWQgPSBmYWxzZTsKICAgICBib29sIHN0cmVzc09wdCA9 IGZhbHNlOwpAQCAtMTg4LDggKzE4Niw2IEBAIGludCBtYWluKGludCBhcmdjLCBjaGFyKiBhcmd2 W10pCiAgICAgICAgICAgICBmb3JjZUNvbXBvc2l0aW5nTW9kZSA9IHRydWU7CiAgICAgICAgIGVs c2UgaWYgKGFyZ3VtZW50ID09IG9wdGlvbkVuYWJsZUFjY2VsZXJhdGVkMkRDYW52YXMpCiAgICAg ICAgICAgICBhY2NlbGVyYXRlZDJEQ2FudmFzRW5hYmxlZCA9IHRydWU7Ci0gICAgICAgIGVsc2Ug aWYgKGFyZ3VtZW50ID09IG9wdGlvbkVuYWJsZUxlZ2FjeUFjY2VsZXJhdGVkMkRDYW52YXMpCi0g ICAgICAgICAgICBsZWdhY3lBY2NlbGVyYXRlZDJEQ2FudmFzRW5hYmxlZCA9IHRydWU7CiAgICAg ICAgIGVsc2UgaWYgKGFyZ3VtZW50ID09IG9wdGlvbkVuYWJsZUFjY2VsZXJhdGVkUGFpbnRpbmcp CiAgICAgICAgICAgICBhY2NlbGVyYXRlZFBhaW50aW5nRW5hYmxlZCA9IHRydWU7CiAgICAgICAg IGVsc2UgaWYgKCFhcmd1bWVudC5maW5kKG9wdGlvblVzZUdyYXBoaWNzQ29udGV4dDNESW1wbGVt ZW50YXRpb24pKSB7CkBAIC0yNDAsNyArMjM2LDYgQEAgaW50IG1haW4oaW50IGFyZ2MsIGNoYXIq IGFyZ3ZbXSkKICAgICAgICAgc2hlbGwuc2V0Q29tcG9zaXRlVG9UZXh0dXJlKGNvbXBvc2l0ZVRv VGV4dHVyZSk7CiAgICAgICAgIHNoZWxsLnNldEZvcmNlQ29tcG9zaXRpbmdNb2RlKGZvcmNlQ29t cG9zaXRpbmdNb2RlKTsKICAgICAgICAgc2hlbGwuc2V0QWNjZWxlcmF0ZWQyZENhbnZhc0VuYWJs ZWQoYWNjZWxlcmF0ZWQyRENhbnZhc0VuYWJsZWQpOwotICAgICAgICBzaGVsbC5zZXRMZWdhY3lB Y2NlbGVyYXRlZDJkQ2FudmFzRW5hYmxlZChsZWdhY3lBY2NlbGVyYXRlZDJEQ2FudmFzRW5hYmxl ZCk7CiAgICAgICAgIHNoZWxsLnNldEFjY2VsZXJhdGVkUGFpbnRpbmdFbmFibGVkKGFjY2VsZXJh dGVkUGFpbnRpbmdFbmFibGVkKTsKICAgICAgICAgc2hlbGwuc2V0UGVyVGlsZVBhaW50aW5nRW5h YmxlZChwZXJUaWxlUGFpbnRpbmdFbmFibGVkKTsKICAgICAgICAgc2hlbGwuc2V0SmF2YVNjcmlw dEZsYWdzKGphdmFTY3JpcHRGbGFncyk7CkluZGV4OiBUb29scy9EdW1wUmVuZGVyVHJlZS9jaHJv bWl1bS9UZXN0U2hlbGwuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0R1bXBSZW5kZXJUcmVlL2No cm9taXVtL1Rlc3RTaGVsbC5jcHAJKHJldmlzaW9uIDEwNDMwMikKKysrIFRvb2xzL0R1bXBSZW5k ZXJUcmVlL2Nocm9taXVtL1Rlc3RTaGVsbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTExMSw3ICsx MTEsNiBAQCBUZXN0U2hlbGw6OlRlc3RTaGVsbChib29sIHRlc3RTaGVsbE1vZGUpCiAgICAgLCBt X2NvbXBvc2l0ZVRvVGV4dHVyZShmYWxzZSkKICAgICAsIG1fZm9yY2VDb21wb3NpdGluZ01vZGUo ZmFsc2UpCiAgICAgLCBtX2FjY2VsZXJhdGVkMmRDYW52YXNFbmFibGVkKGZhbHNlKQotICAgICwg bV9sZWdhY3lBY2NlbGVyYXRlZDJkQ2FudmFzRW5hYmxlZChmYWxzZSkKICAgICAsIG1fYWNjZWxl cmF0ZWRQYWludGluZ0VuYWJsZWQoZmFsc2UpCiAgICAgLCBtX3BlclRpbGVQYWludGluZ0VuYWJs ZWQoZmFsc2UpCiAgICAgLCBtX3N0cmVzc09wdChmYWxzZSkKQEAgLTIxOSw3ICsyMTgsNiBAQCB2 b2lkIFRlc3RTaGVsbDo6cmVzZXRXZWJTZXR0aW5ncyhXZWJWaWV3CiAgICAgbV9wcmVmcy5jb21w b3NpdGVUb1RleHR1cmUgPSBtX2NvbXBvc2l0ZVRvVGV4dHVyZTsKICAgICBtX3ByZWZzLmZvcmNl Q29tcG9zaXRpbmdNb2RlID0gbV9mb3JjZUNvbXBvc2l0aW5nTW9kZTsKICAgICBtX3ByZWZzLmFj Y2VsZXJhdGVkMmRDYW52YXNFbmFibGVkID0gbV9hY2NlbGVyYXRlZDJkQ2FudmFzRW5hYmxlZDsK LSAgICBtX3ByZWZzLmxlZ2FjeUFjY2VsZXJhdGVkMmRDYW52YXNFbmFibGVkID0gbV9sZWdhY3lB Y2NlbGVyYXRlZDJkQ2FudmFzRW5hYmxlZDsKICAgICBtX3ByZWZzLmFjY2VsZXJhdGVkUGFpbnRp bmdFbmFibGVkID0gbV9hY2NlbGVyYXRlZFBhaW50aW5nRW5hYmxlZDsKICAgICBtX3ByZWZzLnBl clRpbGVQYWludGluZ0VuYWJsZWQgPSBtX3BlclRpbGVQYWludGluZ0VuYWJsZWQ7CiAgICAgbV9w cmVmcy5hcHBseVRvKCZ3ZWJWaWV3KTsKSW5kZXg6IFRvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9t aXVtL1Rlc3RTaGVsbC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9t aXVtL1Rlc3RTaGVsbC5oCShyZXZpc2lvbiAxMDQzMDIpCisrKyBUb29scy9EdW1wUmVuZGVyVHJl ZS9jaHJvbWl1bS9UZXN0U2hlbGwuaAkod29ya2luZyBjb3B5KQpAQCAtMTM2LDcgKzEzNiw2IEBA IHB1YmxpYzoKICAgICB2b2lkIHNldENvbXBvc2l0ZVRvVGV4dHVyZShib29sIGVuYWJsZWQpIHsg bV9jb21wb3NpdGVUb1RleHR1cmUgPSBlbmFibGVkOyB9CiAgICAgdm9pZCBzZXRGb3JjZUNvbXBv c2l0aW5nTW9kZShib29sIGVuYWJsZWQpIHsgbV9mb3JjZUNvbXBvc2l0aW5nTW9kZSA9IGVuYWJs ZWQ7IH0KICAgICB2b2lkIHNldEFjY2VsZXJhdGVkMmRDYW52YXNFbmFibGVkKGJvb2wgZW5hYmxl ZCkgeyBtX2FjY2VsZXJhdGVkMmRDYW52YXNFbmFibGVkID0gZW5hYmxlZDsgfQotICAgIHZvaWQg c2V0TGVnYWN5QWNjZWxlcmF0ZWQyZENhbnZhc0VuYWJsZWQoYm9vbCBlbmFibGVkKSB7IG1fbGVn YWN5QWNjZWxlcmF0ZWQyZENhbnZhc0VuYWJsZWQgPSBlbmFibGVkOyB9CiAgICAgdm9pZCBzZXRB Y2NlbGVyYXRlZFBhaW50aW5nRW5hYmxlZChib29sIGVuYWJsZWQpIHsgbV9hY2NlbGVyYXRlZFBh aW50aW5nRW5hYmxlZCA9IGVuYWJsZWQ7IH0KICAgICB2b2lkIHNldFBlclRpbGVQYWludGluZ0Vu YWJsZWQoYm9vbCBlbmFibGVkKSB7IG1fcGVyVGlsZVBhaW50aW5nRW5hYmxlZCA9IGVuYWJsZWQ7 IH0KICNpZiBkZWZpbmVkKE9TX1dJTikKQEAgLTIyNiw3ICsyMjUsNiBAQCBwcml2YXRlOgogICAg IGJvb2wgbV9jb21wb3NpdGVUb1RleHR1cmU7CiAgICAgYm9vbCBtX2ZvcmNlQ29tcG9zaXRpbmdN b2RlOwogICAgIGJvb2wgbV9hY2NlbGVyYXRlZDJkQ2FudmFzRW5hYmxlZDsKLSAgICBib29sIG1f bGVnYWN5QWNjZWxlcmF0ZWQyZENhbnZhc0VuYWJsZWQ7CiAgICAgYm9vbCBtX2FjY2VsZXJhdGVk UGFpbnRpbmdFbmFibGVkOwogICAgIGJvb2wgbV9wZXJUaWxlUGFpbnRpbmdFbmFibGVkOwogICAg IFdlYlByZWZlcmVuY2VzIG1fcHJlZnM7CkluZGV4OiBUb29scy9EdW1wUmVuZGVyVHJlZS9jaHJv bWl1bS9XZWJQcmVmZXJlbmNlcy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvRHVtcFJlbmRlclRy ZWUvY2hyb21pdW0vV2ViUHJlZmVyZW5jZXMuY3BwCShyZXZpc2lvbiAxMDQzMDIpCisrKyBUb29s cy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJQcmVmZXJlbmNlcy5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTExMiw3ICsxMTIsNiBAQCB2b2lkIFdlYlByZWZlcmVuY2VzOjpyZXNldCgpCiAgICAg YWNjZWxlcmF0ZWRDb21wb3NpdGluZ0VuYWJsZWQgPSBmYWxzZTsKICAgICBjb21wb3NpdGVUb1Rl eHR1cmUgPSBmYWxzZTsKICAgICBhY2NlbGVyYXRlZDJkQ2FudmFzRW5hYmxlZCA9IGZhbHNlOwot ICAgIGxlZ2FjeUFjY2VsZXJhdGVkMmRDYW52YXNFbmFibGVkID0gZmFsc2U7CiAgICAgYWNjZWxl cmF0ZWRQYWludGluZ0VuYWJsZWQgPSBmYWxzZTsKICAgICBmb3JjZUNvbXBvc2l0aW5nTW9kZSA9 IGZhbHNlOwogICAgIGhpeGllNzZXZWJTb2NrZXRQcm90b2NvbEVuYWJsZWQgPSB0cnVlOwpAQCAt MjE4LDcgKzIxNyw2IEBAIHZvaWQgV2ViUHJlZmVyZW5jZXM6OmFwcGx5VG8oV2ViVmlldyogd2UK ICAgICBzZXR0aW5ncy0+c2V0Q29tcG9zaXRlVG9UZXh0dXJlRW5hYmxlZChjb21wb3NpdGVUb1Rl eHR1cmUpOwogICAgIHNldHRpbmdzLT5zZXRGb3JjZUNvbXBvc2l0aW5nTW9kZShmb3JjZUNvbXBv c2l0aW5nTW9kZSk7CiAgICAgc2V0dGluZ3MtPnNldEFjY2VsZXJhdGVkMmRDYW52YXNFbmFibGVk KGFjY2VsZXJhdGVkMmRDYW52YXNFbmFibGVkKTsKLSAgICBzZXR0aW5ncy0+c2V0TGVnYWN5QWNj ZWxlcmF0ZWQyZENhbnZhc0VuYWJsZWQobGVnYWN5QWNjZWxlcmF0ZWQyZENhbnZhc0VuYWJsZWQp OwogICAgIHNldHRpbmdzLT5zZXRBY2NlbGVyYXRlZFBhaW50aW5nRW5hYmxlZChhY2NlbGVyYXRl ZFBhaW50aW5nRW5hYmxlZCk7CiAgICAgc2V0dGluZ3MtPnNldEhpeGllNzZXZWJTb2NrZXRQcm90 b2NvbEVuYWJsZWQoaGl4aWU3NldlYlNvY2tldFByb3RvY29sRW5hYmxlZCk7CiAgICAgc2V0dGlu Z3MtPnNldFBlclRpbGVQYWludGluZ0VuYWJsZWQocGVyVGlsZVBhaW50aW5nRW5hYmxlZCk7Cklu ZGV4OiBUb29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJQcmVmZXJlbmNlcy5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFRvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlByZWZlcmVuY2VzLmgJ KHJldmlzaW9uIDEwNDMwMikKKysrIFRvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlBy ZWZlcmVuY2VzLmgJKHdvcmtpbmcgY29weSkKQEAgLTEwNiw3ICsxMDYsNiBAQCBzdHJ1Y3QgV2Vi UHJlZmVyZW5jZXMgewogICAgIGJvb2wgY29tcG9zaXRlVG9UZXh0dXJlOwogICAgIGJvb2wgZm9y Y2VDb21wb3NpdGluZ01vZGU7CiAgICAgYm9vbCBhY2NlbGVyYXRlZDJkQ2FudmFzRW5hYmxlZDsK LSAgICBib29sIGxlZ2FjeUFjY2VsZXJhdGVkMmRDYW52YXNFbmFibGVkOwogICAgIGJvb2wgYWNj ZWxlcmF0ZWRQYWludGluZ0VuYWJsZWQ7CiAgICAgYm9vbCBoaXhpZTc2V2ViU29ja2V0UHJvdG9j b2xFbmFibGVkOwogICAgIGJvb2wgcGVyVGlsZVBhaW50aW5nRW5hYmxlZDsK