143485 2015-04-07 10:29:36 -0700 ContextMenuItem refactoring 2015-04-07 15:14:12 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 beidson beidson bdakin bfulgham commit-queue oldest_to_newest 1083336 0 beidson 2015-04-07 10:29:36 -0700 ContextMenuItem refactoring to support "null item" This will be a useful concept to have in ContextMenu refactoring and new features that use ContextMenu(Item) 1083337 1 250272 beidson 2015-04-07 10:31:37 -0700 Created attachment 250272 Remove a default parameter Removing this default parameter in a ContextMenuItem constructor will determine whether I can immediately introduce a "ContextMenuItem()" constructor for the null item. EWS will give me the answer! 1083383 2 250283 beidson 2015-04-07 12:32:01 -0700 Created attachment 250283 Try again to get win EWS to look at this. Actually am concerned about Windows, need it ran by EWS. 1083401 3 beidson 2015-04-07 13:25:47 -0700 Great, that works. So I'll be adding here: 1 - An empty constructor and the concept of a "null menu item" 2 - Removing "releasePlatformDescription" from Mac (GTK still needs it) 3 - Renaming "getPlatformDescription" 1083407 4 250293 beidson 2015-04-07 13:38:47 -0700 Created attachment 250293 Patch v1 1083430 5 250293 commit-queue 2015-04-07 14:30:08 -0700 Comment on attachment 250293 Patch v1 Clearing flags on attachment: 250293 Committed r182494: <http://trac.webkit.org/changeset/182494> 1083432 6 commit-queue 2015-04-07 14:30:12 -0700 All reviewed patches have been landed. Closing bug. 1083456 7 bfulgham 2015-04-07 15:14:12 -0700 This broke the Windows build: ..\platform\win\ContextMenuItemWin.cpp(34): error C2511: 'WebCore::ContextMenuItem::ContextMenuItem(void)' : overloaded member function not found in 'WebCore::ContextMenuItem' [C:\cygwin\home\buildbot\slave\win-release\build\Source\WebCore\WebCore.vcxproj\WebCore.vcxproj] C:\cygwin\home\buildbot\slave\win-release\build\Source\WebCore\platform\ContextMenuItem.h(187) : see declaration of 'WebCore::ContextMenuItem' 250272 2015-04-07 10:31:37 -0700 2015-04-07 13:38:47 -0700 Remove a default parameter patch text/plain 693 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0NvbnRleHRNZW51SXRlbS5oIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vQ29udGV4dE1lbnVJdGVtLmgKaW5kZXggOGJhMjgwYy4u N2NiOTlkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vQ29udGV4dE1lbnVJ dGVtLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vQ29udGV4dE1lbnVJdGVtLmgKQEAg LTIyOCw3ICsyMjgsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAjZWxzZQogICAgIHB1YmxpYzoK ICAgICAgICAgV0VCQ09SRV9FWFBPUlQgZXhwbGljaXQgQ29udGV4dE1lbnVJdGVtKFBsYXRmb3Jt TWVudUl0ZW1EZXNjcmlwdGlvbik7Ci0gICAgICAgIGV4cGxpY2l0IENvbnRleHRNZW51SXRlbShD b250ZXh0TWVudSogc3ViTWVudSA9IDApOworICAgICAgICBleHBsaWNpdCBDb250ZXh0TWVudUl0 ZW0oQ29udGV4dE1lbnUqIHN1Yk1lbnUpOwogICAgICAgICBDb250ZXh0TWVudUl0ZW0oQ29udGV4 dE1lbnVBY3Rpb24sIGNvbnN0IFN0cmluZyYsIGJvb2wgZW5hYmxlZCwgYm9vbCBjaGVja2VkLCBW ZWN0b3I8Q29udGV4dE1lbnVJdGVtPiYgc3VibWVudUl0ZW1zKTsKIAogICAgICAgICBXRUJDT1JF X0VYUE9SVCBQbGF0Zm9ybU1lbnVJdGVtRGVzY3JpcHRpb24gcmVsZWFzZVBsYXRmb3JtRGVzY3Jp cHRpb24oKTsK 250283 2015-04-07 12:32:01 -0700 2015-04-07 13:38:47 -0700 Try again to get win EWS to look at this. patch text/plain 693 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0NvbnRleHRNZW51SXRlbS5oIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vQ29udGV4dE1lbnVJdGVtLmgKaW5kZXggOGJhMjgwYy4u N2NiOTlkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vQ29udGV4dE1lbnVJ dGVtLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vQ29udGV4dE1lbnVJdGVtLmgKQEAg LTIyOCw3ICsyMjgsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAjZWxzZQogICAgIHB1YmxpYzoK ICAgICAgICAgV0VCQ09SRV9FWFBPUlQgZXhwbGljaXQgQ29udGV4dE1lbnVJdGVtKFBsYXRmb3Jt TWVudUl0ZW1EZXNjcmlwdGlvbik7Ci0gICAgICAgIGV4cGxpY2l0IENvbnRleHRNZW51SXRlbShD b250ZXh0TWVudSogc3ViTWVudSA9IDApOworICAgICAgICBleHBsaWNpdCBDb250ZXh0TWVudUl0 ZW0oQ29udGV4dE1lbnUqIHN1Yk1lbnUpOwogICAgICAgICBDb250ZXh0TWVudUl0ZW0oQ29udGV4 dE1lbnVBY3Rpb24sIGNvbnN0IFN0cmluZyYsIGJvb2wgZW5hYmxlZCwgYm9vbCBjaGVja2VkLCBW ZWN0b3I8Q29udGV4dE1lbnVJdGVtPiYgc3VibWVudUl0ZW1zKTsKIAogICAgICAgICBXRUJDT1JF X0VYUE9SVCBQbGF0Zm9ybU1lbnVJdGVtRGVzY3JpcHRpb24gcmVsZWFzZVBsYXRmb3JtRGVzY3Jp cHRpb24oKTsK 250293 2015-04-07 13:38:47 -0700 2015-04-07 14:30:08 -0700 Patch v1 patch text/plain 9164 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBmZjEzYzg4Li5iZjJkNGM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEg QEAKKzIwMTUtMDQtMDcgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAg ICAgIENvbnRleHRNZW51SXRlbSByZWZhY3RvcmluZworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQzNDg1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9Db250ZXh0TWVudUl0ZW0uaDoKKyAg ICAgICAgKFdlYkNvcmU6OkNvbnRleHRNZW51SXRlbTo6aXNOdWxsKToKKworICAgICAgICAqIHBs YXRmb3JtL2d0ay9Db250ZXh0TWVudUl0ZW1HdGsuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29u dGV4dE1lbnVJdGVtOjpDb250ZXh0TWVudUl0ZW0pOgorCisgICAgICAgICogcGxhdGZvcm0vbWFj L0NvbnRleHRNZW51SXRlbU1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRleHRNZW51SXRl bTo6Q29udGV4dE1lbnVJdGVtKToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRleHRNZW51SXRlbTo6 cGxhdGZvcm1EZXNjcmlwdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpDb250ZXh0TWVudUl0ZW06 OnNldFN1Yk1lbnUpOgorICAgICAgICAoV2ViQ29yZTo6Q29udGV4dE1lbnVJdGVtOjpyZWxlYXNl UGxhdGZvcm1EZXNjcmlwdGlvbik6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpDb250ZXh0 TWVudUl0ZW06OmdldFBsYXRmb3JtRGVzY3JpcHRpb24pOiBEZWxldGVkLgorCisgICAgICAgICog cGxhdGZvcm0vbWFjL0NvbnRleHRNZW51TWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6Q29udGV4 dE1lbnU6OmFwcGVuZEl0ZW0pOgorICAgICAgICAoV2ViQ29yZTo6Q29udGV4dE1lbnU6Omluc2Vy dEl0ZW0pOgorICAgICAgICAoV2ViQ29yZTo6cGxhdGZvcm1NZW51RGVzY3JpcHRpb24pOgorCisg ICAgICAgICogcGxhdGZvcm0vd2luL0NvbnRleHRNZW51SXRlbVdpbi5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpDb250ZXh0TWVudUl0ZW06OkNvbnRleHRNZW51SXRlbSk6CisKIDIwMTUtMDQtMDcg IEVyaWMgQ2FybHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAgW01hY10g dmlkZW8gcGxheWluZyB0byBleHRlcm5hbCBkZXZpY2Ugc2hvdWxkIG5vdCBiZSBpbnRlcnJ1cHRl ZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vQ29udGV4dE1lbnVJdGVtLmgg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Db250ZXh0TWVudUl0ZW0uaAppbmRleCA4YmEyODBj Li4wOTA1MzRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Db250ZXh0TWVu dUl0ZW0uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Db250ZXh0TWVudUl0ZW0uaApA QCAtMjI4LDExICsyMjgsMTcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogI2Vsc2UKICAgICBwdWJs aWM6CiAgICAgICAgIFdFQkNPUkVfRVhQT1JUIGV4cGxpY2l0IENvbnRleHRNZW51SXRlbShQbGF0 Zm9ybU1lbnVJdGVtRGVzY3JpcHRpb24pOwotICAgICAgICBleHBsaWNpdCBDb250ZXh0TWVudUl0 ZW0oQ29udGV4dE1lbnUqIHN1Yk1lbnUgPSAwKTsKKyAgICAgICAgZXhwbGljaXQgQ29udGV4dE1l bnVJdGVtKENvbnRleHRNZW51KiBzdWJNZW51KTsKICAgICAgICAgQ29udGV4dE1lbnVJdGVtKENv bnRleHRNZW51QWN0aW9uLCBjb25zdCBTdHJpbmcmLCBib29sIGVuYWJsZWQsIGJvb2wgY2hlY2tl ZCwgVmVjdG9yPENvbnRleHRNZW51SXRlbT4mIHN1Ym1lbnVJdGVtcyk7CisgICAgICAgIENvbnRl eHRNZW51SXRlbSgpOwogCisgICAgICAgIGJvb2wgaXNOdWxsKCkgY29uc3QgeyByZXR1cm4gIW1f cGxhdGZvcm1EZXNjcmlwdGlvbjsgfQorCisjaWYgUExBVEZPUk0oR1RLKQogICAgICAgICBXRUJD T1JFX0VYUE9SVCBQbGF0Zm9ybU1lbnVJdGVtRGVzY3JpcHRpb24gcmVsZWFzZVBsYXRmb3JtRGVz Y3JpcHRpb24oKTsKLSAgICAgICAgV0VCQ09SRV9FWFBPUlQgUGxhdGZvcm1NZW51SXRlbURlc2Ny aXB0aW9uIGdldFBsYXRmb3JtRGVzY3JpcHRpb24oKSBjb25zdDsKKyNlbmRpZgorCisgICAgICAg IFdFQkNPUkVfRVhQT1JUIFBsYXRmb3JtTWVudUl0ZW1EZXNjcmlwdGlvbiBwbGF0Zm9ybURlc2Ny aXB0aW9uKCkgY29uc3Q7CiAKICAgICAgICAgV0VCQ09SRV9FWFBPUlQgU3RyaW5nIHRpdGxlKCkg Y29uc3Q7CiAgICAgICAgIHZvaWQgc2V0VGl0bGUoY29uc3QgU3RyaW5nJik7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvQ29udGV4dE1lbnVJdGVtR3RrLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9Db250ZXh0TWVudUl0ZW1HdGsuY3BwCmluZGV4IDU3 OTM1M2YuLjVhYjE0MzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9D b250ZXh0TWVudUl0ZW1HdGsuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9D b250ZXh0TWVudUl0ZW1HdGsuY3BwCkBAIC0xNDAsNiArMTQwLDExIEBAIHN0YXRpYyBQbGF0Zm9y bU1lbnVJdGVtRGVzY3JpcHRpb24gY3JlYXRlUGxhdGZvcm1NZW51SXRlbURlc2NyaXB0aW9uKENv bnRleHRNZW51CiAgICAgcmV0dXJuIGl0ZW07CiB9CiAKK0NvbnRleHRNZW51SXRlbTo6Q29udGV4 dE1lbnVJdGVtKCkKKyAgICA6IG1fcGxhdGZvcm1EZXNjcmlwdGlvbihudWxscHRyKQoreworfQor CiAvLyBFeHRyYWN0IHRoZSBBY3Rpb25UeXBlIGZyb20gdGhlIG1lbnUgaXRlbQogQ29udGV4dE1l bnVJdGVtOjpDb250ZXh0TWVudUl0ZW0oUGxhdGZvcm1NZW51SXRlbURlc2NyaXB0aW9uIGl0ZW0p CiAgICAgOiBtX3BsYXRmb3JtRGVzY3JpcHRpb24oaXRlbSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL21hYy9Db250ZXh0TWVudUl0ZW1NYWMubW0gYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9tYWMvQ29udGV4dE1lbnVJdGVtTWFjLm1tCmluZGV4IDE1MjFlZGEuLjFmZGU4 NzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9Db250ZXh0TWVudUl0 ZW1NYWMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL0NvbnRleHRNZW51SXRl bU1hYy5tbQpAQCAtNDMsNiArNDMsMTAgQEAgc3RhdGljIE5TTXV0YWJsZUFycmF5KiBtZW51VG9B cnJheShOU01lbnUqIG1lbnUpCiAgICAgcmV0dXJuIGl0ZW1zQXJyYXk7CiB9CiAKK0NvbnRleHRN ZW51SXRlbTo6Q29udGV4dE1lbnVJdGVtKCkKK3sKK30KKwogQ29udGV4dE1lbnVJdGVtOjpDb250 ZXh0TWVudUl0ZW0oTlNNZW51SXRlbSogaXRlbSkKIHsKICAgICBtX3BsYXRmb3JtRGVzY3JpcHRp b24gPSBpdGVtOwpAQCAtOTYsMTQgKzEwMCw3IEBAIENvbnRleHRNZW51SXRlbTo6fkNvbnRleHRN ZW51SXRlbSgpCiB7CiB9CiAKLU5TTWVudUl0ZW0gKkNvbnRleHRNZW51SXRlbTo6cmVsZWFzZVBs YXRmb3JtRGVzY3JpcHRpb24oKQotewotICAgIE5TTWVudUl0ZW0gKml0ZW0gPSBbbV9wbGF0Zm9y bURlc2NyaXB0aW9uLmdldCgpIHJldGFpbl07Ci0gICAgbV9wbGF0Zm9ybURlc2NyaXB0aW9uID0g MDsKLSAgICByZXR1cm4gaXRlbTsKLX0KLQotTlNNZW51SXRlbSAqQ29udGV4dE1lbnVJdGVtOjpn ZXRQbGF0Zm9ybURlc2NyaXB0aW9uKCkgY29uc3QKK05TTWVudUl0ZW0gKkNvbnRleHRNZW51SXRl bTo6cGxhdGZvcm1EZXNjcmlwdGlvbigpIGNvbnN0CiB7CiAgICAgcmV0dXJuIG1fcGxhdGZvcm1E ZXNjcmlwdGlvbi5nZXQoKTsKIH0KQEAgLTE2NCw3ICsxNjEsNyBAQCB2b2lkIENvbnRleHRNZW51 SXRlbTo6c2V0U3ViTWVudShWZWN0b3I8Q29udGV4dE1lbnVJdGVtPiYgc3ViTWVudUl0ZW1zKQog ICAgIE5TTWVudSogc3ViTWVudSA9IFtbTlNNZW51IGFsbG9jXSBpbml0XTsKICAgICBbc3ViTWVu dSBzZXRBdXRvZW5hYmxlc0l0ZW1zOk5PXTsKICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwg c3ViTWVudUl0ZW1zLnNpemUoKTsgKytpKQotICAgICAgICBbc3ViTWVudSBhZGRJdGVtOnN1Yk1l bnVJdGVtc1tpXS5yZWxlYXNlUGxhdGZvcm1EZXNjcmlwdGlvbigpXTsKKyAgICAgICAgW3N1Yk1l bnUgYWRkSXRlbTpzdWJNZW51SXRlbXNbaV0ucGxhdGZvcm1EZXNjcmlwdGlvbigpXTsKICAgICAg ICAgCiAgICAgW21fcGxhdGZvcm1EZXNjcmlwdGlvbi5nZXQoKSBzZXRTdWJtZW51OnN1Yk1lbnVd OwogICAgIFtzdWJNZW51IHJlbGVhc2VdOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vbWFjL0NvbnRleHRNZW51TWFjLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFj L0NvbnRleHRNZW51TWFjLm1tCmluZGV4IDRkZDAyOGQuLmY4OGQ2YWMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9Db250ZXh0TWVudU1hYy5tbQorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9tYWMvQ29udGV4dE1lbnVNYWMubW0KQEAgLTQ4LDE4ICs0OCwxMiBA QCBDb250ZXh0TWVudTo6fkNvbnRleHRNZW51KCkKIAogdm9pZCBDb250ZXh0TWVudTo6YXBwZW5k SXRlbShDb250ZXh0TWVudUl0ZW0mIGl0ZW0pCiB7Ci0gICAgTlNNZW51SXRlbSogcGxhdGZvcm1J dGVtID0gaXRlbS5yZWxlYXNlUGxhdGZvcm1EZXNjcmlwdGlvbigpOwotCi0gICAgW21fcGxhdGZv cm1EZXNjcmlwdGlvbi5nZXQoKSBhZGRPYmplY3Q6cGxhdGZvcm1JdGVtXTsKLSAgICBbcGxhdGZv cm1JdGVtIHJlbGVhc2VdOworICAgIFttX3BsYXRmb3JtRGVzY3JpcHRpb24uZ2V0KCkgYWRkT2Jq ZWN0Oml0ZW0ucGxhdGZvcm1EZXNjcmlwdGlvbigpXTsKIH0KIAogdm9pZCBDb250ZXh0TWVudTo6 aW5zZXJ0SXRlbSh1bnNpZ25lZCBwb3NpdGlvbiwgQ29udGV4dE1lbnVJdGVtJiBpdGVtKQogewot ICAgIE5TTWVudUl0ZW0qIHBsYXRmb3JtSXRlbSA9IGl0ZW0ucmVsZWFzZVBsYXRmb3JtRGVzY3Jp cHRpb24oKTsKLQotICAgIFttX3BsYXRmb3JtRGVzY3JpcHRpb24uZ2V0KCkgaW5zZXJ0T2JqZWN0 OnBsYXRmb3JtSXRlbSBhdEluZGV4OnBvc2l0aW9uXTsKLSAgICBbcGxhdGZvcm1JdGVtIHJlbGVh c2VdOworICAgIFttX3BsYXRmb3JtRGVzY3JpcHRpb24uZ2V0KCkgaW5zZXJ0T2JqZWN0Oml0ZW0u cGxhdGZvcm1EZXNjcmlwdGlvbigpIGF0SW5kZXg6cG9zaXRpb25dOwogfQogCiB1bnNpZ25lZCBD b250ZXh0TWVudTo6aXRlbUNvdW50KCkgY29uc3QKQEAgLTk5LDEyICs5Myw5IEBAIFZlY3RvcjxD b250ZXh0TWVudUl0ZW0+IGNvbnRleHRNZW51SXRlbVZlY3RvcihQbGF0Zm9ybU1lbnVEZXNjcmlw dGlvbiBtZW51KQogUGxhdGZvcm1NZW51RGVzY3JpcHRpb24gcGxhdGZvcm1NZW51RGVzY3JpcHRp b24oVmVjdG9yPENvbnRleHRNZW51SXRlbT4mIG1lbnVJdGVtVmVjdG9yKQogewogICAgIFBsYXRm b3JtTWVudURlc2NyaXB0aW9uIHBsYXRmb3JtTWVudSA9IFtbTlNNdXRhYmxlQXJyYXkgYWxsb2Nd IGluaXRXaXRoQ2FwYWNpdHk6bWVudUl0ZW1WZWN0b3Iuc2l6ZSgpXTsKLSAgICBmb3IgKHVuc2ln bmVkIGkgPSAwOyBpIDwgbWVudUl0ZW1WZWN0b3Iuc2l6ZSgpOyArK2kpIHsKLSAgICAgICAgUGxh dGZvcm1NZW51SXRlbURlc2NyaXB0aW9uIHBsYXRmb3JtSXRlbSA9IG1lbnVJdGVtVmVjdG9yW2ld LnJlbGVhc2VQbGF0Zm9ybURlc2NyaXB0aW9uKCk7Ci0gICAgICAgIFtwbGF0Zm9ybU1lbnUgYWRk T2JqZWN0OnBsYXRmb3JtSXRlbV07Ci0gICAgICAgIFtwbGF0Zm9ybUl0ZW0gcmVsZWFzZV07Ci0g ICAgfQotICAgIAorICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBtZW51SXRlbVZlY3Rvci5z aXplKCk7ICsraSkKKyAgICAgICAgW3BsYXRmb3JtTWVudSBhZGRPYmplY3Q6bWVudUl0ZW1WZWN0 b3JbaV0ucGxhdGZvcm1EZXNjcmlwdGlvbigpXTsKKwogICAgIHJldHVybiBbcGxhdGZvcm1NZW51 IGF1dG9yZWxlYXNlXTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v d2luL0NvbnRleHRNZW51SXRlbVdpbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93aW4v Q29udGV4dE1lbnVJdGVtV2luLmNwcAppbmRleCAzYTY0Y2JiLi4wZmI5NWRiIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93aW4vQ29udGV4dE1lbnVJdGVtV2luLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93aW4vQ29udGV4dE1lbnVJdGVtV2luLmNwcApAQCAt MzAsNiArMzAsMTAgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCitDb250ZXh0TWVudUl0ZW06 OkNvbnRleHRNZW51SXRlbSgpCit7Cit9CisKIENvbnRleHRNZW51SXRlbTo6Q29udGV4dE1lbnVJ dGVtKGNvbnN0IE1FTlVJVEVNSU5GTyYgaW5mbykKIHsKICAgICBpZiAoaW5mby5mTWFzayAmIE1J SU1fRlRZUEUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cgYi9Tb3Vy Y2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKaW5kZXggZjczODcxNi4uYzA5YzFiYyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0No YW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDE1LTA0LTA3ICBCcmFkeSBFaWRzb24gIDxiZWlk c29uQGFwcGxlLmNvbT4KKworICAgICAgICBDb250ZXh0TWVudUl0ZW0gcmVmYWN0b3JpbmcKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MzQ4NQorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViQ29yZVN1 cHBvcnQvV2ViQ29udGV4dE1lbnVDbGllbnQubW06CisgICAgICAgIChXZWJDb250ZXh0TWVudUNs aWVudDo6Y29udGV4dE1lbnVJdGVtU2VsZWN0ZWQpOgorCiAyMDE1LTA0LTA2ICBDaHJpcyBEdW1l eiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgQmluZyB2aWRlbyBzZWFyY2ggcmVzdWx0 IHBhZ2VzIGFyZSBub3QgUGFnZUNhY2hlYWJsZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9t YWMvV2ViQ29yZVN1cHBvcnQvV2ViQ29udGV4dE1lbnVDbGllbnQubW0gYi9Tb3VyY2UvV2ViS2l0 L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJDb250ZXh0TWVudUNsaWVudC5tbQppbmRleCBkMDhiMTcx Li42ZDg2MDYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9X ZWJDb250ZXh0TWVudUNsaWVudC5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3Vw cG9ydC9XZWJDb250ZXh0TWVudUNsaWVudC5tbQpAQCAtMzIxLDEyICszMjEsMTAgQEAgdm9pZCBX ZWJDb250ZXh0TWVudUNsaWVudDo6Y29udGV4dE1lbnVJdGVtU2VsZWN0ZWQoQ29udGV4dE1lbnVJ dGVtKiBpdGVtLCBjb25zdAogICAgIFNFTCBzZWxlY3RvciA9IEBzZWxlY3Rvcih3ZWJWaWV3OmNv bnRleHRNZW51SXRlbVNlbGVjdGVkOmZvckVsZW1lbnQ6KTsKICAgICBpZiAoW2RlbGVnYXRlIHJl c3BvbmRzVG9TZWxlY3RvcjpzZWxlY3Rvcl0pIHsKICAgICAgICAgTlNEaWN0aW9uYXJ5ICplbGVt ZW50ID0gW1tXZWJFbGVtZW50RGljdGlvbmFyeSBhbGxvY10gaW5pdFdpdGhIaXRUZXN0UmVzdWx0 OlttX3dlYlZpZXcgcGFnZV0tPmNvbnRleHRNZW51Q29udHJvbGxlcigpLmhpdFRlc3RSZXN1bHQo KV07Ci0gICAgICAgIE5TTWVudUl0ZW0gKnBsYXRmb3JtSXRlbSA9IGl0ZW0tPnJlbGVhc2VQbGF0 Zm9ybURlc2NyaXB0aW9uKCk7CiAKLSAgICAgICAgQ2FsbFVJRGVsZWdhdGUobV93ZWJWaWV3LCBz ZWxlY3RvciwgcGxhdGZvcm1JdGVtLCBlbGVtZW50KTsKKyAgICAgICAgQ2FsbFVJRGVsZWdhdGUo bV93ZWJWaWV3LCBzZWxlY3RvciwgaXRlbS0+cGxhdGZvcm1EZXNjcmlwdGlvbigpLCBlbGVtZW50 KTsKIAogICAgICAgICBbZWxlbWVudCByZWxlYXNlXTsKLSAgICAgICAgW3BsYXRmb3JtSXRlbSBy ZWxlYXNlXTsKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxv ZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCBkODlkMTVjLi4xNDhhYmI0IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTUtMDQtMDcgIEJyYWR5IEVpZHNvbiAgPGJlaWRz b25AYXBwbGUuY29tPgorCisgICAgICAgIENvbnRleHRNZW51SXRlbSByZWZhY3RvcmluZworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQzNDg1CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTaGFyZWQvbWFj L05hdGl2ZUNvbnRleHRNZW51SXRlbS5tbToKKyAgICAgICAgKFdlYktpdDo6TmF0aXZlQ29udGV4 dE1lbnVJdGVtOjpOYXRpdmVDb250ZXh0TWVudUl0ZW0pOgorCiAyMDE1LTA0LTA3ICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KIAogICAgICAgICBTaG91bGQgb25seSBwcm9wYWdhdGUg cHJlc3N1cmUgZXZlbnRzIHdpdGggcmVsZXZhbnQgcGhhc2VzCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9TaGFyZWQvbWFjL05hdGl2ZUNvbnRleHRNZW51SXRlbS5tbSBiL1NvdXJjZS9XZWJL aXQyL1NoYXJlZC9tYWMvTmF0aXZlQ29udGV4dE1lbnVJdGVtLm1tCmluZGV4IGVlMjdkZDQuLmQz Nzg5NDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9tYWMvTmF0aXZlQ29udGV4 dE1lbnVJdGVtLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9tYWMvTmF0aXZlQ29udGV4 dE1lbnVJdGVtLm1tCkBAIC0zNSw3ICszNSw3IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwog bmFtZXNwYWNlIFdlYktpdCB7CiAKIE5hdGl2ZUNvbnRleHRNZW51SXRlbTo6TmF0aXZlQ29udGV4 dE1lbnVJdGVtKGNvbnN0IENvbnRleHRNZW51SXRlbSYgY29yZUl0ZW0pCi0gICAgOiBtX25zTWVu dUl0ZW0oY29yZUl0ZW0uZ2V0UGxhdGZvcm1EZXNjcmlwdGlvbigpKQorICAgIDogbV9uc01lbnVJ dGVtKGNvcmVJdGVtLnBsYXRmb3JtRGVzY3JpcHRpb24oKSkKIHsKIH0KIAo=