173674 2017-06-21 16:00:00 -0700 Increase memory kill limits for WebContent processes that manage multiple tabs. 2017-06-27 01:00:53 -0700 1 1 1 Unclassified WebKit Web Template Framework WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar, Performance P2 Normal --- 1 kling kling cdumez commit-queue ggaren kling koivisto mitz oldest_to_newest 1321661 0 kling 2017-06-21 16:00:00 -0700 Since <a target=_blank> open in the same WebContent process, we should be nice and give them a little extra margin on their memory kill limits. 1321692 1 313570 kling 2017-06-21 17:20:12 -0700 Created attachment 313570 Patch 1321693 2 313570 ggaren 2017-06-21 17:22:58 -0700 Comment on attachment 313570 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=313570&action=review r=me > Source/WTF/ChangeLog:3 > + Increase memory kill limits for WebContent process that manage multiple tabs. processes 1321698 3 313572 kling 2017-06-21 17:34:38 -0700 Created attachment 313572 Patch for landing 1321700 4 313572 commit-queue 2017-06-21 17:36:25 -0700 Comment on attachment 313572 Patch for landing Rejecting attachment 313572 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-02', 'apply-attachment', '--no-update', '--non-interactive', 313572, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Last 500 characters of output: unk #1 succeeded at 1 with fuzz 3. patching file Source/WebCore/page/Page.cpp Hunk #1 succeeded at 287 (offset 1 line). Hunk #2 succeeded at 316 (offset 1 line). patching file Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp Hunk #1 FAILED at 1293. 1 out of 1 hunk FAILED -- saving rejects to file Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp.rej Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Full output: http://webkit-queues.webkit.org/results/3974756 1321704 5 313574 kling 2017-06-21 17:41:55 -0700 Created attachment 313574 Patch for landing :| 1321707 6 313574 commit-queue 2017-06-21 18:09:29 -0700 Comment on attachment 313574 Patch for landing Clearing flags on attachment: 313574 Committed r218669: <http://trac.webkit.org/changeset/218669> 1321708 7 commit-queue 2017-06-21 18:09:31 -0700 All reviewed patches have been landed. Closing bug. 1321897 8 mitz 2017-06-22 08:34:33 -0700 Would have been better to use the term “page” or even “view” rather than “tab” in this context (and similar contexts in WebKit). The macOS Mail app, for example, uses one web process for multiple web views in a single conversation view (and across multiple conversation views), which do not appear as separate tabs or even windows. 1321955 9 kling 2017-06-22 10:37:16 -0700 (In reply to mitz from comment #8) > Would have been better to use the term “page” or even “view” rather than > “tab” in this context (and similar contexts in WebKit). The macOS Mail app, > for example, uses one web process for multiple web views in a single > conversation view (and across multiple conversation views), which do not > appear as separate tabs or even windows. Sure, that's a fair point. Let's go with Page then, since that's the name of the object we're counting. Long term I'd like us to come up with a better name for Page :| 1323099 10 kling 2017-06-27 01:00:53 -0700 <rdar://problem/32567548> 313570 2017-06-21 17:20:12 -0700 2017-06-21 17:34:38 -0700 Patch bug-173674.diff text/plain 5605 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nIGIvU291cmNlL1dURi9DaGFuZ2VMb2cK aW5kZXggYTk2YmNiN2M3MGEuLmI4N2NkNmE2ZTM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL0No YW5nZUxvZworKysgYi9Tb3VyY2UvV1RGL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE3 LTA2LTIxICBBbmRyZWFzIEtsaW5nICA8YWtsaW5nQGFwcGxlLmNvbT4KKworICAgICAgICBJbmNy ZWFzZSBtZW1vcnkga2lsbCBsaW1pdHMgZm9yIFdlYkNvbnRlbnQgcHJvY2VzcyB0aGF0IG1hbmFn ZSBtdWx0aXBsZSB0YWJzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTczNjc0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgV2hlbiBvcGVuaW5nIDxhIHRhcmdldD1fYmxhbms+IGxpbmtzLCB3ZSBjdXJyZW50 bHkgaGF2ZSB0byB1c2UgdGhlIHNhbWUgV2ViQ29udGVudAorICAgICAgICBwcm9jZXNzIGZvciB0 aGUgbmV3IHRhYiwgdG8gc3VwcG9ydCBzY3JpcHRpbmcgdGhlIHdpbmRvdy5vcGVuZXIgb2JqZWN0 LgorICAgICAgICBUaGlzIG1lYW5zIHRoYXQgc29tZSBXZWJDb250ZW50IHByb2Nlc3NlcyBlbmQg dXAgaG9zdGluZyBtdWx0aXBsZSB0YWJzLCBtYWtpbmcgaXQKKyAgICAgICAgbW9yZSBsaWtlbHkg dGhhdCB0aG9zZSBwcm9jZXNzZXMgd2lsbCBoaXQgdGhlIG1lbW9yeSBsaW1pdHMuCisKKyAgICAg ICAgQWRkcmVzcyB0aGlzIGJ5IGFkZGluZyBzb21lIGFkZGl0aW9uYWwgYWxsb3dhbmNlIGZvciBt dWx0aS10YWIgcHJvY2Vzc2VzOgorCisgICAgICAgICAgICBGb3IgZWFjaCBhZGRpdGlvbmFsIHRh YiwgdXAgdG8gNCB0YWJzLCBhZGQgMUdCIHRvIHRoZSBtZW1vcnkga2lsbCBsaW1pdC4KKworICAg ICAgICAqIHd0Zi9NZW1vcnlQcmVzc3VyZUhhbmRsZXIuY3BwOgorICAgICAgICAoV1RGOjp0aHJl c2hvbGRGb3JNZW1vcnlLaWxsV2l0aFByb2Nlc3NTdGF0ZSk6CisgICAgICAgIChXVEY6Ok1lbW9y eVByZXNzdXJlSGFuZGxlcjo6c2V0VGFiQ291bnQpOgorICAgICAgICAoV1RGOjpNZW1vcnlQcmVz c3VyZUhhbmRsZXI6OnRocmVzaG9sZEZvck1lbW9yeUtpbGwpOgorICAgICAgICAoV1RGOjpNZW1v cnlQcmVzc3VyZUhhbmRsZXI6Om1lYXN1cmVtZW50VGltZXJGaXJlZCk6CisgICAgICAgICogd3Rm L01lbW9yeVByZXNzdXJlSGFuZGxlci5oOgorCiAyMDE3LTA2LTIwICBLb25zdGFudGluIFRva2Fy ZXYgIDxhbm51bGVuQHlhbmRleC5ydT4KIAogICAgICAgICBSZW1vdmUgZXhjZXNzaXZlIGluY2x1 ZGUgZGlyZWN0aXZlcyBmcm9tIFdURgpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvTWVtb3J5 UHJlc3N1cmVIYW5kbGVyLmNwcCBiL1NvdXJjZS9XVEYvd3RmL01lbW9yeVByZXNzdXJlSGFuZGxl ci5jcHAKaW5kZXggODdlYTU4MjkwM2YuLjBlMTNiM2U4NTkzIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V1RGL3d0Zi9NZW1vcnlQcmVzc3VyZUhhbmRsZXIuY3BwCisrKyBiL1NvdXJjZS9XVEYvd3RmL01l bW9yeVByZXNzdXJlSGFuZGxlci5jcHAKQEAgLTgxLDIxICs4MSwzNCBAQCBzdGF0aWMgY29uc3Qg Y2hhciogdG9TdHJpbmcoTWVtb3J5VXNhZ2VQb2xpY3kgcG9saWN5KQogfQogI2VuZGlmCiAKLXN0 YXRpYyBzaXplX3QgdGhyZXNob2xkRm9yTWVtb3J5S2lsbFdpdGhQcm9jZXNzU3RhdGUoV2Vic2Ft UHJvY2Vzc1N0YXRlIHByb2Nlc3NTdGF0ZSkKK3N0YXRpYyBzaXplX3QgdGhyZXNob2xkRm9yTWVt b3J5S2lsbFdpdGhQcm9jZXNzU3RhdGUoV2Vic2FtUHJvY2Vzc1N0YXRlIHByb2Nlc3NTdGF0ZSwg dW5zaWduZWQgdGFiQ291bnQpCiB7CiAjaWYgQ1BVKFg4Nl82NCkgfHwgQ1BVKEFSTTY0KQorICAg IHNpemVfdCBiYXNlVGhyZXNob2xkOwogICAgIGlmIChwcm9jZXNzU3RhdGUgPT0gV2Vic2FtUHJv Y2Vzc1N0YXRlOjpBY3RpdmUpCi0gICAgICAgIHJldHVybiA0ICogR0I7Ci0gICAgcmV0dXJuIDIg KiBHQjsKKyAgICAgICAgYmFzZVRocmVzaG9sZCA9IDQgKiBHQjsKKyAgICBlbHNlCisgICAgICAg IGJhc2VUaHJlc2hvbGQgPSAyICogR0I7CisgICAgaWYgKHRhYkNvdW50IDw9IDEpCisgICAgICAg IHJldHVybiBiYXNlVGhyZXNob2xkOworICAgIHJldHVybiBiYXNlVGhyZXNob2xkICsgKHN0ZDo6 bWluKHRhYkNvdW50IC0gMSwgNHUpICogMSAqIEdCKTsKICNlbHNlCiAgICAgVU5VU0VEX1BBUkFN KHByb2Nlc3NTdGF0ZSk7CisgICAgVU5VU0VEX1BBUkFNKHRhYkNvdW50KTsKICAgICByZXR1cm4g MyAqIEdCOwogI2VuZGlmCiB9CiAKK3ZvaWQgTWVtb3J5UHJlc3N1cmVIYW5kbGVyOjpzZXRUYWJD b3VudCh1bnNpZ25lZCB0YWJDb3VudCkKK3sKKyAgICBpZiAoc2luZ2xldG9uKCkubV90YWJDb3Vu dCA9PSB0YWJDb3VudCkKKyAgICAgICAgcmV0dXJuOworICAgIHNpbmdsZXRvbigpLm1fdGFiQ291 bnQgPSB0YWJDb3VudDsKK30KKwogc2l6ZV90IE1lbW9yeVByZXNzdXJlSGFuZGxlcjo6dGhyZXNo b2xkRm9yTWVtb3J5S2lsbCgpCiB7Ci0gICAgcmV0dXJuIHRocmVzaG9sZEZvck1lbW9yeUtpbGxX aXRoUHJvY2Vzc1N0YXRlKG1fcHJvY2Vzc1N0YXRlKTsKKyAgICByZXR1cm4gdGhyZXNob2xkRm9y TWVtb3J5S2lsbFdpdGhQcm9jZXNzU3RhdGUobV9wcm9jZXNzU3RhdGUsIG1fdGFiQ291bnQpOwog fQogCiBzdGF0aWMgc2l6ZV90IHRocmVzaG9sZEZvclBvbGljeShNZW1vcnlVc2FnZVBvbGljeSBw b2xpY3kpCkBAIC0xNzYsNyArMTg5LDcgQEAgdm9pZCBNZW1vcnlQcmVzc3VyZUhhbmRsZXI6Om1l YXN1cmVtZW50VGltZXJGaXJlZCgpCiAgICAgICAgIGJyZWFrOwogICAgIH0KIAotICAgIGlmIChw cm9jZXNzU3RhdGUoKSA9PSBXZWJzYW1Qcm9jZXNzU3RhdGU6OkFjdGl2ZSAmJiBmb290cHJpbnQu dmFsdWUoKSA+IHRocmVzaG9sZEZvck1lbW9yeUtpbGxXaXRoUHJvY2Vzc1N0YXRlKFdlYnNhbVBy b2Nlc3NTdGF0ZTo6SW5hY3RpdmUpKQorICAgIGlmIChwcm9jZXNzU3RhdGUoKSA9PSBXZWJzYW1Q cm9jZXNzU3RhdGU6OkFjdGl2ZSAmJiBmb290cHJpbnQudmFsdWUoKSA+IHRocmVzaG9sZEZvck1l bW9yeUtpbGxXaXRoUHJvY2Vzc1N0YXRlKFdlYnNhbVByb2Nlc3NTdGF0ZTo6SW5hY3RpdmUsIG1f dGFiQ291bnQpKQogICAgICAgICBkb2VzRXhjZWVkSW5hY3RpdmVMaW1pdFdoaWxlQWN0aXZlKCk7 CiAgICAgZWxzZQogICAgICAgICBkb2VzTm90RXhjZWVkSW5hY3RpdmVMaW1pdFdoaWxlQWN0aXZl KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9NZW1vcnlQcmVzc3VyZUhhbmRsZXIuaCBi L1NvdXJjZS9XVEYvd3RmL01lbW9yeVByZXNzdXJlSGFuZGxlci5oCmluZGV4IGNiMTZlYTkwZDk5 Li5jZjVkYzM0MzI1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvTWVtb3J5UHJlc3N1cmVI YW5kbGVyLmgKKysrIGIvU291cmNlL1dURi93dGYvTWVtb3J5UHJlc3N1cmVIYW5kbGVyLmgKQEAg LTE0Nyw2ICsxNDcsOCBAQCBwdWJsaWM6CiAgICAgV1RGX0VYUE9SVF9QUklWQVRFIHZvaWQgc2V0 UHJvY2Vzc1N0YXRlKFdlYnNhbVByb2Nlc3NTdGF0ZSk7CiAgICAgV2Vic2FtUHJvY2Vzc1N0YXRl IHByb2Nlc3NTdGF0ZSgpIGNvbnN0IHsgcmV0dXJuIG1fcHJvY2Vzc1N0YXRlOyB9CiAKKyAgICBX VEZfRVhQT1JUX1BSSVZBVEUgc3RhdGljIHZvaWQgc2V0VGFiQ291bnQodW5zaWduZWQpOworCiBw cml2YXRlOgogICAgIHNpemVfdCB0aHJlc2hvbGRGb3JNZW1vcnlLaWxsKCk7CiAgICAgdm9pZCBt ZW1vcnlQcmVzc3VyZVN0YXR1c0NoYW5nZWQoKTsKQEAgLTE5MCw2ICsxOTIsOCBAQCBwcml2YXRl OgogCiAgICAgV2Vic2FtUHJvY2Vzc1N0YXRlIG1fcHJvY2Vzc1N0YXRlIHsgV2Vic2FtUHJvY2Vz c1N0YXRlOjpJbmFjdGl2ZSB9OwogCisgICAgdW5zaWduZWQgbV90YWJDb3VudCB7IDAgfTsKKwog ICAgIGJvb2wgbV9pbnN0YWxsZWQgeyBmYWxzZSB9OwogICAgIExvd01lbW9yeUhhbmRsZXIgbV9s b3dNZW1vcnlIYW5kbGVyOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cg Yi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGUzNmJhYzMzYjEuLjM2Yzc2MjRmYWRi IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNv cmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTctMDYtMjEgIEFuZHJlYXMgS2xpbmcg IDxha2xpbmdAYXBwbGUuY29tPgorCisgICAgICAgIEluY3JlYXNlIG1lbW9yeSBraWxsIGxpbWl0 cyBmb3IgV2ViQ29udGVudCBwcm9jZXNzIHRoYXQgbWFuYWdlIG11bHRpcGxlIHRhYnMuCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzM2NzQKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQbHVtYiB0aGUgbm9u LXV0aWxpdHkgUGFnZSBjb3VudCBkb3duIHRvIFdURjo6TWVtb3J5UHJlc3N1cmVIYW5kbGVyLgor CisgICAgICAgICogcGFnZS9QYWdlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2U6OlBhZ2Up OgorICAgICAgICAoV2ViQ29yZTo6UGFnZTo6flBhZ2UpOgorCiAyMDE3LTA2LTIwICBBbmRyZWFz IEtsaW5nICA8YWtsaW5nQGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TXSBFbnN1cmUgdGhhdCBH cmFwaGljc1NlcnZpY2VzIGlzIGluaXRpYWxpemVkIGJlZm9yZSBjYWxsaW5nIEdTRm9udFB1cmdl Rm9udENhY2hlKCkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwIGIv U291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcAppbmRleCAwMWZhZDM0NTg5Zi4uNWEyYThkNWU0 MGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcGFnZS9QYWdlLmNwcApAQCAtMjg2LDggKzI4NiwxMCBAQCBQYWdlOjpQYWdlKFBh Z2VDb25maWd1cmF0aW9uJiYgcGFnZUNvbmZpZ3VyYXRpb24pCiAKICAgICBBU1NFUlQoIWFsbFBh Z2VzLT5jb250YWlucyh0aGlzKSk7CiAgICAgYWxsUGFnZXMtPmFkZCh0aGlzKTsKLSAgICBpZiAo IWlzVXRpbGl0eVBhZ2UoKSkKKyAgICBpZiAoIWlzVXRpbGl0eVBhZ2UoKSkgewogICAgICAgICAr K25vblV0aWxpdHlQYWdlQ291bnQ7CisgICAgICAgIE1lbW9yeVByZXNzdXJlSGFuZGxlcjo6c2V0 VGFiQ291bnQobm9uVXRpbGl0eVBhZ2VDb3VudCk7CisgICAgfQogCiAjaWZuZGVmIE5ERUJVRwog ICAgIHBhZ2VDb3VudGVyLmluY3JlbWVudCgpOwpAQCAtMzEzLDggKzMxNSwxMCBAQCBQYWdlOjp+ UGFnZSgpCiAgICAgbV9tYWluRnJhbWUtPnNldFZpZXcobnVsbHB0cik7CiAgICAgc2V0R3JvdXBO YW1lKFN0cmluZygpKTsKICAgICBhbGxQYWdlcy0+cmVtb3ZlKHRoaXMpOwotICAgIGlmICghaXNV dGlsaXR5UGFnZSgpKQorICAgIGlmICghaXNVdGlsaXR5UGFnZSgpKSB7CiAgICAgICAgIC0tbm9u VXRpbGl0eVBhZ2VDb3VudDsKKyAgICAgICAgTWVtb3J5UHJlc3N1cmVIYW5kbGVyOjpzZXRUYWJD b3VudChub25VdGlsaXR5UGFnZUNvdW50KTsKKyAgICB9CiAgICAgCiAgICAgbV9zZXR0aW5ncy0+ cGFnZURlc3Ryb3llZCgpOwogCg== 313572 2017-06-21 17:34:38 -0700 2017-06-21 17:41:55 -0700 Patch for landing land-173674.diff text/plain 6560 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nIGIvU291cmNlL1dURi9DaGFuZ2VMb2cK aW5kZXggYTk2YmNiN2M3MGEuLmMxNWI3ZDljZWUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL0No YW5nZUxvZworKysgYi9Tb3VyY2UvV1RGL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE3 LTA2LTIxICBBbmRyZWFzIEtsaW5nICA8YWtsaW5nQGFwcGxlLmNvbT4KKworICAgICAgICBJbmNy ZWFzZSBtZW1vcnkga2lsbCBsaW1pdHMgZm9yIFdlYkNvbnRlbnQgcHJvY2Vzc2VzIHRoYXQgbWFu YWdlIG11bHRpcGxlIHRhYnMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNzM2NzQKKworICAgICAgICBSZXZpZXdlZCBieSBHZW9mZnJleSBHYXJlbi4K KworICAgICAgICBXaGVuIG9wZW5pbmcgPGEgdGFyZ2V0PV9ibGFuaz4gbGlua3MsIHdlIGN1cnJl bnRseSBoYXZlIHRvIHVzZSB0aGUgc2FtZSBXZWJDb250ZW50CisgICAgICAgIHByb2Nlc3MgZm9y IHRoZSBuZXcgdGFiLCB0byBzdXBwb3J0IHNjcmlwdGluZyB0aGUgd2luZG93Lm9wZW5lciBvYmpl Y3QuCisgICAgICAgIFRoaXMgbWVhbnMgdGhhdCBzb21lIFdlYkNvbnRlbnQgcHJvY2Vzc2VzIGVu ZCB1cCBob3N0aW5nIG11bHRpcGxlIHRhYnMsIG1ha2luZyBpdAorICAgICAgICBtb3JlIGxpa2Vs eSB0aGF0IHRob3NlIHByb2Nlc3NlcyB3aWxsIGhpdCB0aGUgbWVtb3J5IGxpbWl0cy4KKworICAg ICAgICBBZGRyZXNzIHRoaXMgYnkgYWRkaW5nIHNvbWUgYWRkaXRpb25hbCBhbGxvd2FuY2UgZm9y IG11bHRpLXRhYiBwcm9jZXNzZXM6CisKKyAgICAgICAgICAgIEZvciBlYWNoIGFkZGl0aW9uYWwg dGFiLCB1cCB0byA0IHRhYnMsIGFkZCAxR0IgdG8gdGhlIG1lbW9yeSBraWxsIGxpbWl0LgorCisg ICAgICAgICogd3RmL01lbW9yeVByZXNzdXJlSGFuZGxlci5jcHA6CisgICAgICAgIChXVEY6OnRo cmVzaG9sZEZvck1lbW9yeUtpbGxXaXRoUHJvY2Vzc1N0YXRlKToKKyAgICAgICAgKFdURjo6TWVt b3J5UHJlc3N1cmVIYW5kbGVyOjpzZXRUYWJDb3VudCk6CisgICAgICAgIChXVEY6Ok1lbW9yeVBy ZXNzdXJlSGFuZGxlcjo6dGhyZXNob2xkRm9yTWVtb3J5S2lsbCk6CisgICAgICAgIChXVEY6Ok1l bW9yeVByZXNzdXJlSGFuZGxlcjo6bWVhc3VyZW1lbnRUaW1lckZpcmVkKToKKyAgICAgICAgKiB3 dGYvTWVtb3J5UHJlc3N1cmVIYW5kbGVyLmg6CisKIDIwMTctMDYtMjAgIEtvbnN0YW50aW4gVG9r YXJldiAgPGFubnVsZW5AeWFuZGV4LnJ1PgogCiAgICAgICAgIFJlbW92ZSBleGNlc3NpdmUgaW5j bHVkZSBkaXJlY3RpdmVzIGZyb20gV1RGCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9NZW1v cnlQcmVzc3VyZUhhbmRsZXIuY3BwIGIvU291cmNlL1dURi93dGYvTWVtb3J5UHJlc3N1cmVIYW5k bGVyLmNwcAppbmRleCA4N2VhNTgyOTAzZi4uMGUxM2IzZTg1OTMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XVEYvd3RmL01lbW9yeVByZXNzdXJlSGFuZGxlci5jcHAKKysrIGIvU291cmNlL1dURi93dGYv TWVtb3J5UHJlc3N1cmVIYW5kbGVyLmNwcApAQCAtODEsMjEgKzgxLDM0IEBAIHN0YXRpYyBjb25z dCBjaGFyKiB0b1N0cmluZyhNZW1vcnlVc2FnZVBvbGljeSBwb2xpY3kpCiB9CiAjZW5kaWYKIAot c3RhdGljIHNpemVfdCB0aHJlc2hvbGRGb3JNZW1vcnlLaWxsV2l0aFByb2Nlc3NTdGF0ZShXZWJz YW1Qcm9jZXNzU3RhdGUgcHJvY2Vzc1N0YXRlKQorc3RhdGljIHNpemVfdCB0aHJlc2hvbGRGb3JN ZW1vcnlLaWxsV2l0aFByb2Nlc3NTdGF0ZShXZWJzYW1Qcm9jZXNzU3RhdGUgcHJvY2Vzc1N0YXRl LCB1bnNpZ25lZCB0YWJDb3VudCkKIHsKICNpZiBDUFUoWDg2XzY0KSB8fCBDUFUoQVJNNjQpCisg ICAgc2l6ZV90IGJhc2VUaHJlc2hvbGQ7CiAgICAgaWYgKHByb2Nlc3NTdGF0ZSA9PSBXZWJzYW1Q cm9jZXNzU3RhdGU6OkFjdGl2ZSkKLSAgICAgICAgcmV0dXJuIDQgKiBHQjsKLSAgICByZXR1cm4g MiAqIEdCOworICAgICAgICBiYXNlVGhyZXNob2xkID0gNCAqIEdCOworICAgIGVsc2UKKyAgICAg ICAgYmFzZVRocmVzaG9sZCA9IDIgKiBHQjsKKyAgICBpZiAodGFiQ291bnQgPD0gMSkKKyAgICAg ICAgcmV0dXJuIGJhc2VUaHJlc2hvbGQ7CisgICAgcmV0dXJuIGJhc2VUaHJlc2hvbGQgKyAoc3Rk OjptaW4odGFiQ291bnQgLSAxLCA0dSkgKiAxICogR0IpOwogI2Vsc2UKICAgICBVTlVTRURfUEFS QU0ocHJvY2Vzc1N0YXRlKTsKKyAgICBVTlVTRURfUEFSQU0odGFiQ291bnQpOwogICAgIHJldHVy biAzICogR0I7CiAjZW5kaWYKIH0KIAordm9pZCBNZW1vcnlQcmVzc3VyZUhhbmRsZXI6OnNldFRh YkNvdW50KHVuc2lnbmVkIHRhYkNvdW50KQoreworICAgIGlmIChzaW5nbGV0b24oKS5tX3RhYkNv dW50ID09IHRhYkNvdW50KQorICAgICAgICByZXR1cm47CisgICAgc2luZ2xldG9uKCkubV90YWJD b3VudCA9IHRhYkNvdW50OworfQorCiBzaXplX3QgTWVtb3J5UHJlc3N1cmVIYW5kbGVyOjp0aHJl c2hvbGRGb3JNZW1vcnlLaWxsKCkKIHsKLSAgICByZXR1cm4gdGhyZXNob2xkRm9yTWVtb3J5S2ls bFdpdGhQcm9jZXNzU3RhdGUobV9wcm9jZXNzU3RhdGUpOworICAgIHJldHVybiB0aHJlc2hvbGRG b3JNZW1vcnlLaWxsV2l0aFByb2Nlc3NTdGF0ZShtX3Byb2Nlc3NTdGF0ZSwgbV90YWJDb3VudCk7 CiB9CiAKIHN0YXRpYyBzaXplX3QgdGhyZXNob2xkRm9yUG9saWN5KE1lbW9yeVVzYWdlUG9saWN5 IHBvbGljeSkKQEAgLTE3Niw3ICsxODksNyBAQCB2b2lkIE1lbW9yeVByZXNzdXJlSGFuZGxlcjo6 bWVhc3VyZW1lbnRUaW1lckZpcmVkKCkKICAgICAgICAgYnJlYWs7CiAgICAgfQogCi0gICAgaWYg KHByb2Nlc3NTdGF0ZSgpID09IFdlYnNhbVByb2Nlc3NTdGF0ZTo6QWN0aXZlICYmIGZvb3Rwcmlu dC52YWx1ZSgpID4gdGhyZXNob2xkRm9yTWVtb3J5S2lsbFdpdGhQcm9jZXNzU3RhdGUoV2Vic2Ft UHJvY2Vzc1N0YXRlOjpJbmFjdGl2ZSkpCisgICAgaWYgKHByb2Nlc3NTdGF0ZSgpID09IFdlYnNh bVByb2Nlc3NTdGF0ZTo6QWN0aXZlICYmIGZvb3RwcmludC52YWx1ZSgpID4gdGhyZXNob2xkRm9y TWVtb3J5S2lsbFdpdGhQcm9jZXNzU3RhdGUoV2Vic2FtUHJvY2Vzc1N0YXRlOjpJbmFjdGl2ZSwg bV90YWJDb3VudCkpCiAgICAgICAgIGRvZXNFeGNlZWRJbmFjdGl2ZUxpbWl0V2hpbGVBY3RpdmUo KTsKICAgICBlbHNlCiAgICAgICAgIGRvZXNOb3RFeGNlZWRJbmFjdGl2ZUxpbWl0V2hpbGVBY3Rp dmUoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL01lbW9yeVByZXNzdXJlSGFuZGxlci5o IGIvU291cmNlL1dURi93dGYvTWVtb3J5UHJlc3N1cmVIYW5kbGVyLmgKaW5kZXggY2IxNmVhOTBk OTkuLmNmNWRjMzQzMjVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9NZW1vcnlQcmVzc3Vy ZUhhbmRsZXIuaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9NZW1vcnlQcmVzc3VyZUhhbmRsZXIuaApA QCAtMTQ3LDYgKzE0Nyw4IEBAIHB1YmxpYzoKICAgICBXVEZfRVhQT1JUX1BSSVZBVEUgdm9pZCBz ZXRQcm9jZXNzU3RhdGUoV2Vic2FtUHJvY2Vzc1N0YXRlKTsKICAgICBXZWJzYW1Qcm9jZXNzU3Rh dGUgcHJvY2Vzc1N0YXRlKCkgY29uc3QgeyByZXR1cm4gbV9wcm9jZXNzU3RhdGU7IH0KIAorICAg IFdURl9FWFBPUlRfUFJJVkFURSBzdGF0aWMgdm9pZCBzZXRUYWJDb3VudCh1bnNpZ25lZCk7CisK IHByaXZhdGU6CiAgICAgc2l6ZV90IHRocmVzaG9sZEZvck1lbW9yeUtpbGwoKTsKICAgICB2b2lk IG1lbW9yeVByZXNzdXJlU3RhdHVzQ2hhbmdlZCgpOwpAQCAtMTkwLDYgKzE5Miw4IEBAIHByaXZh dGU6CiAKICAgICBXZWJzYW1Qcm9jZXNzU3RhdGUgbV9wcm9jZXNzU3RhdGUgeyBXZWJzYW1Qcm9j ZXNzU3RhdGU6OkluYWN0aXZlIH07CiAKKyAgICB1bnNpZ25lZCBtX3RhYkNvdW50IHsgMCB9Owor CiAgICAgYm9vbCBtX2luc3RhbGxlZCB7IGZhbHNlIH07CiAgICAgTG93TWVtb3J5SGFuZGxlciBt X2xvd01lbW9yeUhhbmRsZXI7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBkZTM2YmFjMzNiMS4uNjkyYTVmZDI1 MjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxNy0wNi0yMSAgQW5kcmVhcyBLbGlu ZyAgPGFrbGluZ0BhcHBsZS5jb20+CisKKyAgICAgICAgSW5jcmVhc2UgbWVtb3J5IGtpbGwgbGlt aXRzIGZvciBXZWJDb250ZW50IHByb2Nlc3NlcyB0aGF0IG1hbmFnZSBtdWx0aXBsZSB0YWJzLgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTczNjc0CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgR2VvZmZyZXkgR2FyZW4uCisKKyAgICAgICAgUGx1bWIgdGhl IG5vbi11dGlsaXR5IFBhZ2UgY291bnQgZG93biB0byBXVEY6Ok1lbW9yeVByZXNzdXJlSGFuZGxl ci4KKworICAgICAgICAqIHBhZ2UvUGFnZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQYWdlOjpQ YWdlKToKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2U6On5QYWdlKToKKwogMjAxNy0wNi0yMCAgQW5k cmVhcyBLbGluZyAgPGFrbGluZ0BhcHBsZS5jb20+CiAKICAgICAgICAgW2lPU10gRW5zdXJlIHRo YXQgR3JhcGhpY3NTZXJ2aWNlcyBpcyBpbml0aWFsaXplZCBiZWZvcmUgY2FsbGluZyBHU0ZvbnRQ dXJnZUZvbnRDYWNoZSgpLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAKaW5kZXggMDFmYWQzNDU4OWYuLjVhMmE4 ZDVlNDBlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAKQEAgLTI4Niw4ICsyODYsMTAgQEAgUGFnZTo6UGFn ZShQYWdlQ29uZmlndXJhdGlvbiYmIHBhZ2VDb25maWd1cmF0aW9uKQogCiAgICAgQVNTRVJUKCFh bGxQYWdlcy0+Y29udGFpbnModGhpcykpOwogICAgIGFsbFBhZ2VzLT5hZGQodGhpcyk7Ci0gICAg aWYgKCFpc1V0aWxpdHlQYWdlKCkpCisgICAgaWYgKCFpc1V0aWxpdHlQYWdlKCkpIHsKICAgICAg ICAgKytub25VdGlsaXR5UGFnZUNvdW50OworICAgICAgICBNZW1vcnlQcmVzc3VyZUhhbmRsZXI6 OnNldFRhYkNvdW50KG5vblV0aWxpdHlQYWdlQ291bnQpOworICAgIH0KIAogI2lmbmRlZiBOREVC VUcKICAgICBwYWdlQ291bnRlci5pbmNyZW1lbnQoKTsKQEAgLTMxMyw4ICszMTUsMTAgQEAgUGFn ZTo6flBhZ2UoKQogICAgIG1fbWFpbkZyYW1lLT5zZXRWaWV3KG51bGxwdHIpOwogICAgIHNldEdy b3VwTmFtZShTdHJpbmcoKSk7CiAgICAgYWxsUGFnZXMtPnJlbW92ZSh0aGlzKTsKLSAgICBpZiAo IWlzVXRpbGl0eVBhZ2UoKSkKKyAgICBpZiAoIWlzVXRpbGl0eVBhZ2UoKSkgewogICAgICAgICAt LW5vblV0aWxpdHlQYWdlQ291bnQ7CisgICAgICAgIE1lbW9yeVByZXNzdXJlSGFuZGxlcjo6c2V0 VGFiQ291bnQobm9uVXRpbGl0eVBhZ2VDb3VudCk7CisgICAgfQogICAgIAogICAgIG1fc2V0dGlu Z3MtPnBhZ2VEZXN0cm95ZWQoKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY29jb2EvRm9udENhY2hlQ29yZVRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9udENhY2hlQ29yZVRleHQuY3BwCmluZGV4IDA4ZjAz ZGYyOTQ2Li5jYzc0NDE5ZjZjOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY29jb2EvRm9udENhY2hlQ29yZVRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0ZvbnRDYWNoZUNvcmVUZXh0LmNwcApAQCAtMTI5Myw3 ICsxMjkzLDcgQEAgc3RhdGljIFJldGFpblB0cjxDVEZvbnRSZWY+IGxvb2t1cEZhbGxiYWNrRm9u dChDVEZvbnRSZWYgZm9udCwgRm9udFNlbGVjdGlvblZhbHUKIAogICAgIENGSW5kZXggY292ZXJl ZExlbmd0aCA9IDA7CiAgICAgUmV0YWluUHRyPENURm9udFJlZj4gcmVzdWx0OwotI2lmIFVTRV9Q TEFURk9STV9TWVNURU1fRkFMTEJBQ0tfTElTVCB8fCAoUExBVEZPUk0oTUFDKSAmJiBfX01BQ19P U19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEIDwgMTAxMjAwKQorI2lmIFVTRV9QTEFURk9STV9TWVNU RU1fRkFMTEJBQ0tfTElTVCB8fCAoUExBVEZPUk0oTUFDKSAmJiBfX01BQ19PU19YX1ZFUlNJT05f TUlOX1JFUVVJUkVEIDwgMTAxMzAwKQogICAgIHJlc3VsdCA9IGFkb3B0Q0YoQ1RGb250Q3JlYXRl Rm9yQ2hhcmFjdGVyc1dpdGhMYW5ndWFnZShmb250LCBjaGFyYWN0ZXJzLCBsZW5ndGgsIGxvY2Fs ZVN0cmluZy5nZXQoKSwgJmNvdmVyZWRMZW5ndGgpKTsKICNlbHNlCiAgICAgcmVzdWx0ID0gYWRv cHRDRihDVEZvbnRDcmVhdGVQaHlzaWNhbEZvbnRGb3JDaGFyYWN0ZXJzV2l0aExhbmd1YWdlKGZv bnQsIGNoYXJhY3RlcnMsIGxlbmd0aCwgbG9jYWxlU3RyaW5nLmdldCgpLCAmY292ZXJlZExlbmd0 aCkpOwo= 313574 2017-06-21 17:41:55 -0700 2017-06-21 18:09:29 -0700 Patch for landing land-173674.diff text/plain 5609 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nIGIvU291cmNlL1dURi9DaGFuZ2VMb2cK aW5kZXggYTk2YmNiN2M3MGEuLmMxNWI3ZDljZWUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL0No YW5nZUxvZworKysgYi9Tb3VyY2UvV1RGL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE3 LTA2LTIxICBBbmRyZWFzIEtsaW5nICA8YWtsaW5nQGFwcGxlLmNvbT4KKworICAgICAgICBJbmNy ZWFzZSBtZW1vcnkga2lsbCBsaW1pdHMgZm9yIFdlYkNvbnRlbnQgcHJvY2Vzc2VzIHRoYXQgbWFu YWdlIG11bHRpcGxlIHRhYnMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNzM2NzQKKworICAgICAgICBSZXZpZXdlZCBieSBHZW9mZnJleSBHYXJlbi4K KworICAgICAgICBXaGVuIG9wZW5pbmcgPGEgdGFyZ2V0PV9ibGFuaz4gbGlua3MsIHdlIGN1cnJl bnRseSBoYXZlIHRvIHVzZSB0aGUgc2FtZSBXZWJDb250ZW50CisgICAgICAgIHByb2Nlc3MgZm9y IHRoZSBuZXcgdGFiLCB0byBzdXBwb3J0IHNjcmlwdGluZyB0aGUgd2luZG93Lm9wZW5lciBvYmpl Y3QuCisgICAgICAgIFRoaXMgbWVhbnMgdGhhdCBzb21lIFdlYkNvbnRlbnQgcHJvY2Vzc2VzIGVu ZCB1cCBob3N0aW5nIG11bHRpcGxlIHRhYnMsIG1ha2luZyBpdAorICAgICAgICBtb3JlIGxpa2Vs eSB0aGF0IHRob3NlIHByb2Nlc3NlcyB3aWxsIGhpdCB0aGUgbWVtb3J5IGxpbWl0cy4KKworICAg ICAgICBBZGRyZXNzIHRoaXMgYnkgYWRkaW5nIHNvbWUgYWRkaXRpb25hbCBhbGxvd2FuY2UgZm9y IG11bHRpLXRhYiBwcm9jZXNzZXM6CisKKyAgICAgICAgICAgIEZvciBlYWNoIGFkZGl0aW9uYWwg dGFiLCB1cCB0byA0IHRhYnMsIGFkZCAxR0IgdG8gdGhlIG1lbW9yeSBraWxsIGxpbWl0LgorCisg ICAgICAgICogd3RmL01lbW9yeVByZXNzdXJlSGFuZGxlci5jcHA6CisgICAgICAgIChXVEY6OnRo cmVzaG9sZEZvck1lbW9yeUtpbGxXaXRoUHJvY2Vzc1N0YXRlKToKKyAgICAgICAgKFdURjo6TWVt b3J5UHJlc3N1cmVIYW5kbGVyOjpzZXRUYWJDb3VudCk6CisgICAgICAgIChXVEY6Ok1lbW9yeVBy ZXNzdXJlSGFuZGxlcjo6dGhyZXNob2xkRm9yTWVtb3J5S2lsbCk6CisgICAgICAgIChXVEY6Ok1l bW9yeVByZXNzdXJlSGFuZGxlcjo6bWVhc3VyZW1lbnRUaW1lckZpcmVkKToKKyAgICAgICAgKiB3 dGYvTWVtb3J5UHJlc3N1cmVIYW5kbGVyLmg6CisKIDIwMTctMDYtMjAgIEtvbnN0YW50aW4gVG9r YXJldiAgPGFubnVsZW5AeWFuZGV4LnJ1PgogCiAgICAgICAgIFJlbW92ZSBleGNlc3NpdmUgaW5j bHVkZSBkaXJlY3RpdmVzIGZyb20gV1RGCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9NZW1v cnlQcmVzc3VyZUhhbmRsZXIuY3BwIGIvU291cmNlL1dURi93dGYvTWVtb3J5UHJlc3N1cmVIYW5k bGVyLmNwcAppbmRleCA4N2VhNTgyOTAzZi4uMGUxM2IzZTg1OTMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XVEYvd3RmL01lbW9yeVByZXNzdXJlSGFuZGxlci5jcHAKKysrIGIvU291cmNlL1dURi93dGYv TWVtb3J5UHJlc3N1cmVIYW5kbGVyLmNwcApAQCAtODEsMjEgKzgxLDM0IEBAIHN0YXRpYyBjb25z dCBjaGFyKiB0b1N0cmluZyhNZW1vcnlVc2FnZVBvbGljeSBwb2xpY3kpCiB9CiAjZW5kaWYKIAot c3RhdGljIHNpemVfdCB0aHJlc2hvbGRGb3JNZW1vcnlLaWxsV2l0aFByb2Nlc3NTdGF0ZShXZWJz YW1Qcm9jZXNzU3RhdGUgcHJvY2Vzc1N0YXRlKQorc3RhdGljIHNpemVfdCB0aHJlc2hvbGRGb3JN ZW1vcnlLaWxsV2l0aFByb2Nlc3NTdGF0ZShXZWJzYW1Qcm9jZXNzU3RhdGUgcHJvY2Vzc1N0YXRl LCB1bnNpZ25lZCB0YWJDb3VudCkKIHsKICNpZiBDUFUoWDg2XzY0KSB8fCBDUFUoQVJNNjQpCisg ICAgc2l6ZV90IGJhc2VUaHJlc2hvbGQ7CiAgICAgaWYgKHByb2Nlc3NTdGF0ZSA9PSBXZWJzYW1Q cm9jZXNzU3RhdGU6OkFjdGl2ZSkKLSAgICAgICAgcmV0dXJuIDQgKiBHQjsKLSAgICByZXR1cm4g MiAqIEdCOworICAgICAgICBiYXNlVGhyZXNob2xkID0gNCAqIEdCOworICAgIGVsc2UKKyAgICAg ICAgYmFzZVRocmVzaG9sZCA9IDIgKiBHQjsKKyAgICBpZiAodGFiQ291bnQgPD0gMSkKKyAgICAg ICAgcmV0dXJuIGJhc2VUaHJlc2hvbGQ7CisgICAgcmV0dXJuIGJhc2VUaHJlc2hvbGQgKyAoc3Rk OjptaW4odGFiQ291bnQgLSAxLCA0dSkgKiAxICogR0IpOwogI2Vsc2UKICAgICBVTlVTRURfUEFS QU0ocHJvY2Vzc1N0YXRlKTsKKyAgICBVTlVTRURfUEFSQU0odGFiQ291bnQpOwogICAgIHJldHVy biAzICogR0I7CiAjZW5kaWYKIH0KIAordm9pZCBNZW1vcnlQcmVzc3VyZUhhbmRsZXI6OnNldFRh YkNvdW50KHVuc2lnbmVkIHRhYkNvdW50KQoreworICAgIGlmIChzaW5nbGV0b24oKS5tX3RhYkNv dW50ID09IHRhYkNvdW50KQorICAgICAgICByZXR1cm47CisgICAgc2luZ2xldG9uKCkubV90YWJD b3VudCA9IHRhYkNvdW50OworfQorCiBzaXplX3QgTWVtb3J5UHJlc3N1cmVIYW5kbGVyOjp0aHJl c2hvbGRGb3JNZW1vcnlLaWxsKCkKIHsKLSAgICByZXR1cm4gdGhyZXNob2xkRm9yTWVtb3J5S2ls bFdpdGhQcm9jZXNzU3RhdGUobV9wcm9jZXNzU3RhdGUpOworICAgIHJldHVybiB0aHJlc2hvbGRG b3JNZW1vcnlLaWxsV2l0aFByb2Nlc3NTdGF0ZShtX3Byb2Nlc3NTdGF0ZSwgbV90YWJDb3VudCk7 CiB9CiAKIHN0YXRpYyBzaXplX3QgdGhyZXNob2xkRm9yUG9saWN5KE1lbW9yeVVzYWdlUG9saWN5 IHBvbGljeSkKQEAgLTE3Niw3ICsxODksNyBAQCB2b2lkIE1lbW9yeVByZXNzdXJlSGFuZGxlcjo6 bWVhc3VyZW1lbnRUaW1lckZpcmVkKCkKICAgICAgICAgYnJlYWs7CiAgICAgfQogCi0gICAgaWYg KHByb2Nlc3NTdGF0ZSgpID09IFdlYnNhbVByb2Nlc3NTdGF0ZTo6QWN0aXZlICYmIGZvb3Rwcmlu dC52YWx1ZSgpID4gdGhyZXNob2xkRm9yTWVtb3J5S2lsbFdpdGhQcm9jZXNzU3RhdGUoV2Vic2Ft UHJvY2Vzc1N0YXRlOjpJbmFjdGl2ZSkpCisgICAgaWYgKHByb2Nlc3NTdGF0ZSgpID09IFdlYnNh bVByb2Nlc3NTdGF0ZTo6QWN0aXZlICYmIGZvb3RwcmludC52YWx1ZSgpID4gdGhyZXNob2xkRm9y TWVtb3J5S2lsbFdpdGhQcm9jZXNzU3RhdGUoV2Vic2FtUHJvY2Vzc1N0YXRlOjpJbmFjdGl2ZSwg bV90YWJDb3VudCkpCiAgICAgICAgIGRvZXNFeGNlZWRJbmFjdGl2ZUxpbWl0V2hpbGVBY3RpdmUo KTsKICAgICBlbHNlCiAgICAgICAgIGRvZXNOb3RFeGNlZWRJbmFjdGl2ZUxpbWl0V2hpbGVBY3Rp dmUoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL01lbW9yeVByZXNzdXJlSGFuZGxlci5o IGIvU291cmNlL1dURi93dGYvTWVtb3J5UHJlc3N1cmVIYW5kbGVyLmgKaW5kZXggY2IxNmVhOTBk OTkuLmNmNWRjMzQzMjVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9NZW1vcnlQcmVzc3Vy ZUhhbmRsZXIuaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9NZW1vcnlQcmVzc3VyZUhhbmRsZXIuaApA QCAtMTQ3LDYgKzE0Nyw4IEBAIHB1YmxpYzoKICAgICBXVEZfRVhQT1JUX1BSSVZBVEUgdm9pZCBz ZXRQcm9jZXNzU3RhdGUoV2Vic2FtUHJvY2Vzc1N0YXRlKTsKICAgICBXZWJzYW1Qcm9jZXNzU3Rh dGUgcHJvY2Vzc1N0YXRlKCkgY29uc3QgeyByZXR1cm4gbV9wcm9jZXNzU3RhdGU7IH0KIAorICAg IFdURl9FWFBPUlRfUFJJVkFURSBzdGF0aWMgdm9pZCBzZXRUYWJDb3VudCh1bnNpZ25lZCk7CisK IHByaXZhdGU6CiAgICAgc2l6ZV90IHRocmVzaG9sZEZvck1lbW9yeUtpbGwoKTsKICAgICB2b2lk IG1lbW9yeVByZXNzdXJlU3RhdHVzQ2hhbmdlZCgpOwpAQCAtMTkwLDYgKzE5Miw4IEBAIHByaXZh dGU6CiAKICAgICBXZWJzYW1Qcm9jZXNzU3RhdGUgbV9wcm9jZXNzU3RhdGUgeyBXZWJzYW1Qcm9j ZXNzU3RhdGU6OkluYWN0aXZlIH07CiAKKyAgICB1bnNpZ25lZCBtX3RhYkNvdW50IHsgMCB9Owor CiAgICAgYm9vbCBtX2luc3RhbGxlZCB7IGZhbHNlIH07CiAgICAgTG93TWVtb3J5SGFuZGxlciBt X2xvd01lbW9yeUhhbmRsZXI7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBkZTM2YmFjMzNiMS4uNjkyYTVmZDI1 MjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxNy0wNi0yMSAgQW5kcmVhcyBLbGlu ZyAgPGFrbGluZ0BhcHBsZS5jb20+CisKKyAgICAgICAgSW5jcmVhc2UgbWVtb3J5IGtpbGwgbGlt aXRzIGZvciBXZWJDb250ZW50IHByb2Nlc3NlcyB0aGF0IG1hbmFnZSBtdWx0aXBsZSB0YWJzLgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTczNjc0CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgR2VvZmZyZXkgR2FyZW4uCisKKyAgICAgICAgUGx1bWIgdGhl IG5vbi11dGlsaXR5IFBhZ2UgY291bnQgZG93biB0byBXVEY6Ok1lbW9yeVByZXNzdXJlSGFuZGxl ci4KKworICAgICAgICAqIHBhZ2UvUGFnZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQYWdlOjpQ YWdlKToKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2U6On5QYWdlKToKKwogMjAxNy0wNi0yMCAgQW5k cmVhcyBLbGluZyAgPGFrbGluZ0BhcHBsZS5jb20+CiAKICAgICAgICAgW2lPU10gRW5zdXJlIHRo YXQgR3JhcGhpY3NTZXJ2aWNlcyBpcyBpbml0aWFsaXplZCBiZWZvcmUgY2FsbGluZyBHU0ZvbnRQ dXJnZUZvbnRDYWNoZSgpLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAKaW5kZXggMDFmYWQzNDU4OWYuLjVhMmE4 ZDVlNDBlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAKQEAgLTI4Niw4ICsyODYsMTAgQEAgUGFnZTo6UGFn ZShQYWdlQ29uZmlndXJhdGlvbiYmIHBhZ2VDb25maWd1cmF0aW9uKQogCiAgICAgQVNTRVJUKCFh bGxQYWdlcy0+Y29udGFpbnModGhpcykpOwogICAgIGFsbFBhZ2VzLT5hZGQodGhpcyk7Ci0gICAg aWYgKCFpc1V0aWxpdHlQYWdlKCkpCisgICAgaWYgKCFpc1V0aWxpdHlQYWdlKCkpIHsKICAgICAg ICAgKytub25VdGlsaXR5UGFnZUNvdW50OworICAgICAgICBNZW1vcnlQcmVzc3VyZUhhbmRsZXI6 OnNldFRhYkNvdW50KG5vblV0aWxpdHlQYWdlQ291bnQpOworICAgIH0KIAogI2lmbmRlZiBOREVC VUcKICAgICBwYWdlQ291bnRlci5pbmNyZW1lbnQoKTsKQEAgLTMxMyw4ICszMTUsMTAgQEAgUGFn ZTo6flBhZ2UoKQogICAgIG1fbWFpbkZyYW1lLT5zZXRWaWV3KG51bGxwdHIpOwogICAgIHNldEdy b3VwTmFtZShTdHJpbmcoKSk7CiAgICAgYWxsUGFnZXMtPnJlbW92ZSh0aGlzKTsKLSAgICBpZiAo IWlzVXRpbGl0eVBhZ2UoKSkKKyAgICBpZiAoIWlzVXRpbGl0eVBhZ2UoKSkgewogICAgICAgICAt LW5vblV0aWxpdHlQYWdlQ291bnQ7CisgICAgICAgIE1lbW9yeVByZXNzdXJlSGFuZGxlcjo6c2V0 VGFiQ291bnQobm9uVXRpbGl0eVBhZ2VDb3VudCk7CisgICAgfQogICAgIAogICAgIG1fc2V0dGlu Z3MtPnBhZ2VEZXN0cm95ZWQoKTsKIAo=