212584 2020-05-31 14:48:23 -0700 Tidy up Source/WebCore/page/DragController.h 2020-05-31 19:17:33 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED DoNotImportToRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh aestes andersca megan_gardner thorton webkit-bug-importer oldest_to_newest 1657803 0 wenson_hsieh 2020-05-31 14:48:23 -0700 Miscellaneous style fixes. 1657804 1 400709 wenson_hsieh 2020-05-31 15:21:03 -0700 Created attachment 400709 Patch 1657819 2 400709 wenson_hsieh 2020-05-31 19:05:50 -0700 Comment on attachment 400709 Patch Thanks for the review! 1657820 3 ews-feeder 2020-05-31 19:17:32 -0700 Committed r262367: <https://trac.webkit.org/changeset/262367> All reviewed patches have been landed. Closing bug and clearing flags on attachment 400709. 400709 2020-05-31 15:21:03 -0700 2020-05-31 19:17:33 -0700 Patch bug-212584-20200531152103.patch text/plain 13371 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyMzMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2QxOWUxNTNiZDE2MDVk OTczNTA4NjdlZjVkOWVlZDBjYTRmMDBlMC4uOTU0YjRkYzA2ZGQ4NGEwNjQwZmVkMTE5Njg5OTBj MjkyMTE5ZGU4MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDIwLTA1LTMxICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIFRpZHkgdXAgU291 cmNlL1dlYkNvcmUvcGFnZS9EcmFnQ29udHJvbGxlci5oCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTI1ODQKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVbmluZGVudCB0aGUgYERyYWdDb250cm9sbGVyYCBj bGFzcyBieSAxIGluZGVudGF0aW9uIGxldmVsLCB0byBhZGhlcmUgd2l0aAorICAgICAgICA8aHR0 cHM6Ly93ZWJraXQub3JnL2NvZGUtc3R5bGUtZ3VpZGVsaW5lcy8jaW5kZW50YXRpb24tbmFtZXNw YWNlPi4gQWxzbywgcmVtb3ZlCisgICAgICAgIHNvbWUgc3RyYXkgdHJhaWxpbmcgd2hpdGVzcGFj ZS4KKworICAgICAgICBObyBjaGFuZ2UgaW4gYmVoYXZpb3IuCisKKyAgICAgICAgKiBwYWdlL0Ry YWdDb250cm9sbGVyLmg6CisgICAgICAgIChXZWJDb3JlOjpEcmFnQ29udHJvbGxlcjo6bW91c2VJ c092ZXJGaWxlSW5wdXQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6RHJhZ0NvbnRyb2xsZXI6 Om51bWJlck9mSXRlbXNUb0JlQWNjZXB0ZWQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6RHJh Z0NvbnRyb2xsZXI6OnNldERpZEluaXRpYXRlRHJhZyk6CisgICAgICAgIChXZWJDb3JlOjpEcmFn Q29udHJvbGxlcjo6ZGlkSW5pdGlhdGVEcmFnIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkRy YWdDb250cm9sbGVyOjpzb3VyY2VEcmFnT3BlcmF0aW9uIGNvbnN0KToKKyAgICAgICAgKFdlYkNv cmU6OkRyYWdDb250cm9sbGVyOjpkcmFnZ2luZ0ltYWdlVVJMIGNvbnN0KToKKyAgICAgICAgKFdl YkNvcmU6OkRyYWdDb250cm9sbGVyOjpzZXREcmFnT2Zmc2V0KToKKyAgICAgICAgKFdlYkNvcmU6 OkRyYWdDb250cm9sbGVyOjpkcmFnT2Zmc2V0IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkRy YWdDb250cm9sbGVyOjpkcmFnU291cmNlQWN0aW9uIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6 OkRyYWdDb250cm9sbGVyOjpkcmFnSGFuZGxpbmdNZXRob2QgY29uc3QpOgorICAgICAgICAoV2Vi Q29yZTo6RHJhZ0NvbnRyb2xsZXI6OmRvY3VtZW50VW5kZXJNb3VzZSBjb25zdCk6CisgICAgICAg IChXZWJDb3JlOjpEcmFnQ29udHJvbGxlcjo6ZHJhZ0Rlc3RpbmF0aW9uQWN0aW9uTWFzayBjb25z dCk6CisgICAgICAgIChXZWJDb3JlOjpEcmFnQ29udHJvbGxlcjo6ZHJvcHBlZEltYWdlUGxhY2Vo b2xkZXJzIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkRyYWdDb250cm9sbGVyOjpkcm9wcGVk SW1hZ2VQbGFjZWhvbGRlclJhbmdlIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkRyYWdDb250 cm9sbGVyOjpjYW5Mb2FkRGF0YUZyb21EcmFnZ2luZ1Bhc3RlYm9hcmQgY29uc3QpOgorICAgICAg ICAoV2ViQ29yZTo6RHJhZ0NvbnRyb2xsZXI6OmNsaWVudCBjb25zdCk6CisKIDIwMjAtMDUtMjkg IEFuZHkgRXN0ZXMgIDxhZXN0ZXNAYXBwbGUuY29tPgogCiAgICAgICAgIFtBcHBsZSBQYXldIFJl bW92ZSBjb25kaXRpb25hbHMgZm9yIEVOQUJMRV9BUFBMRV9QQVlfU0VTU0lPTl9WKDN8NCkKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRHJhZ0NvbnRyb2xsZXIuaCBiL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvRHJhZ0NvbnRyb2xsZXIuaAppbmRleCA0NTFkZDU4YzVlM2M1YzdmMWUzY2Iy ODViMDJlMTllNmQ4NWI3Y2Q2Li45NTdmYWIxMGY2MDMwN2I3Nzk2YmE3MTIxYjljYjc3NzY2N2Vj Y2NhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RyYWdDb250cm9sbGVyLmgKKysr IGIvU291cmNlL1dlYkNvcmUvcGFnZS9EcmFnQ29udHJvbGxlci5oCkBAIC01MCwxMTYgKzUwLDEx NiBAQCBzdHJ1Y3QgRHJhZ0l0ZW07CiBzdHJ1Y3QgRHJhZ1N0YXRlOwogc3RydWN0IFByb21pc2Vk QXR0YWNobWVudEluZm87CiAKLSAgICBjbGFzcyBEcmFnQ29udHJvbGxlciB7Ci0gICAgICAgIFdU Rl9NQUtFX05PTkNPUFlBQkxFKERyYWdDb250cm9sbGVyKTsgV1RGX01BS0VfRkFTVF9BTExPQ0FU RUQ7Ci0gICAgcHVibGljOgotICAgICAgICBEcmFnQ29udHJvbGxlcihQYWdlJiwgc3RkOjp1bmlx dWVfcHRyPERyYWdDbGllbnQ+JiYpOwotICAgICAgICB+RHJhZ0NvbnRyb2xsZXIoKTsKLQotICAg ICAgICBzdGF0aWMgRHJhZ09wZXJhdGlvbiBwbGF0Zm9ybUdlbmVyaWNEcmFnT3BlcmF0aW9uKCk7 Ci0KLSAgICAgICAgV0VCQ09SRV9FWFBPUlQgRHJhZ09wZXJhdGlvbiBkcmFnRW50ZXJlZChjb25z dCBEcmFnRGF0YSYpOwotICAgICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIGRyYWdFeGl0ZWQoY29u c3QgRHJhZ0RhdGEmKTsKLSAgICAgICAgV0VCQ09SRV9FWFBPUlQgRHJhZ09wZXJhdGlvbiBkcmFn VXBkYXRlZChjb25zdCBEcmFnRGF0YSYpOwotICAgICAgICBXRUJDT1JFX0VYUE9SVCBib29sIHBl cmZvcm1EcmFnT3BlcmF0aW9uKGNvbnN0IERyYWdEYXRhJik7Ci0gICAgICAgIFdFQkNPUkVfRVhQ T1JUIHZvaWQgZHJhZ0NhbmNlbGxlZCgpOwotCi0gICAgICAgIGJvb2wgbW91c2VJc092ZXJGaWxl SW5wdXQoKSBjb25zdCB7IHJldHVybiBtX2ZpbGVJbnB1dEVsZW1lbnRVbmRlck1vdXNlOyB9Ci0g ICAgICAgIHVuc2lnbmVkIG51bWJlck9mSXRlbXNUb0JlQWNjZXB0ZWQoKSBjb25zdCB7IHJldHVy biBtX251bWJlck9mSXRlbXNUb0JlQWNjZXB0ZWQ7IH0KLQotICAgICAgICAvLyBGSVhNRTogSXQg c2hvdWxkIGJlIHBvc3NpYmxlIHRvIHJlbW92ZSBhIG51bWJlciBvZiB0aGVzZSBhY2Nlc3NvcnMg b25jZSBhbGwKLSAgICAgICAgLy8gZHJhZyBsb2dpYyBpcyBpbiBXZWJDb3JlLgotICAgICAgICB2 b2lkIHNldERpZEluaXRpYXRlRHJhZyhib29sIGluaXRpYXRlZCkgeyBtX2RpZEluaXRpYXRlRHJh ZyA9IGluaXRpYXRlZDsgfSAKLSAgICAgICAgYm9vbCBkaWRJbml0aWF0ZURyYWcoKSBjb25zdCB7 IHJldHVybiBtX2RpZEluaXRpYXRlRHJhZzsgfQotICAgICAgICBEcmFnT3BlcmF0aW9uIHNvdXJj ZURyYWdPcGVyYXRpb24oKSBjb25zdCB7IHJldHVybiBtX3NvdXJjZURyYWdPcGVyYXRpb247IH0K LSAgICAgICAgY29uc3QgVVJMJiBkcmFnZ2luZ0ltYWdlVVJMKCkgY29uc3QgeyByZXR1cm4gbV9k cmFnZ2luZ0ltYWdlVVJMOyB9Ci0gICAgICAgIHZvaWQgc2V0RHJhZ09mZnNldChjb25zdCBJbnRQ b2ludCYgb2Zmc2V0KSB7IG1fZHJhZ09mZnNldCA9IG9mZnNldDsgfQotICAgICAgICBjb25zdCBJ bnRQb2ludCYgZHJhZ09mZnNldCgpIGNvbnN0IHsgcmV0dXJuIG1fZHJhZ09mZnNldDsgfQotICAg ICAgICBEcmFnU291cmNlQWN0aW9uIGRyYWdTb3VyY2VBY3Rpb24oKSBjb25zdCB7IHJldHVybiBt X2RyYWdTb3VyY2VBY3Rpb247IH0KLSAgICAgICAgRHJhZ0hhbmRsaW5nTWV0aG9kIGRyYWdIYW5k bGluZ01ldGhvZCgpIGNvbnN0IHsgcmV0dXJuIG1fZHJhZ0hhbmRsaW5nTWV0aG9kOyB9Ci0KLSAg ICAgICAgRG9jdW1lbnQqIGRvY3VtZW50VW5kZXJNb3VzZSgpIGNvbnN0IHsgcmV0dXJuIG1fZG9j dW1lbnRVbmRlck1vdXNlLmdldCgpOyB9Ci0gICAgICAgIE9wdGlvblNldDxEcmFnRGVzdGluYXRp b25BY3Rpb24+IGRyYWdEZXN0aW5hdGlvbkFjdGlvbk1hc2soKSBjb25zdCB7IHJldHVybiBtX2Ry YWdEZXN0aW5hdGlvbkFjdGlvbk1hc2s7IH0KLSAgICAgICAgRHJhZ1NvdXJjZUFjdGlvbiBkZWxl Z2F0ZURyYWdTb3VyY2VBY3Rpb24oY29uc3QgSW50UG9pbnQmIHJvb3RWaWV3UG9pbnQpOwotICAg ICAgICAKLSAgICAgICAgRWxlbWVudCogZHJhZ2dhYmxlRWxlbWVudChjb25zdCBGcmFtZSosIEVs ZW1lbnQqIHN0YXJ0LCBjb25zdCBJbnRQb2ludCYsIERyYWdTdGF0ZSYpIGNvbnN0OwotICAgICAg ICBXRUJDT1JFX0VYUE9SVCB2b2lkIGRyYWdFbmRlZCgpOwotICAgICAgICAKLSAgICAgICAgV0VC Q09SRV9FWFBPUlQgdm9pZCBwbGFjZURyYWdDYXJldChjb25zdCBJbnRQb2ludCYpOwotCi0gICAg ICAgIGNvbnN0IFZlY3RvcjxSZWY8SFRNTEltYWdlRWxlbWVudD4+JiBkcm9wcGVkSW1hZ2VQbGFj ZWhvbGRlcnMoKSBjb25zdCB7IHJldHVybiBtX2Ryb3BwZWRJbWFnZVBsYWNlaG9sZGVyczsgfQot ICAgICAgICBjb25zdCBSZWZQdHI8UmFuZ2U+JiBkcm9wcGVkSW1hZ2VQbGFjZWhvbGRlclJhbmdl KCkgY29uc3QgeyByZXR1cm4gbV9kcm9wcGVkSW1hZ2VQbGFjZWhvbGRlclJhbmdlOyB9Ci0KLSAg ICAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBmaW5hbGl6ZURyb3BwZWRJbWFnZVBsYWNlaG9sZGVy KEhUTUxJbWFnZUVsZW1lbnQmKTsKLSAgICAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBpbnNlcnRE cm9wcGVkSW1hZ2VQbGFjZWhvbGRlcnNBdENhcmV0KGNvbnN0IFZlY3RvcjxJbnRTaXplPiYgaW1h Z2VTaXplcyk7Ci0gICAgICAgIAotICAgICAgICBib29sIHN0YXJ0RHJhZyhGcmFtZSYgc3JjLCBj b25zdCBEcmFnU3RhdGUmLCBEcmFnT3BlcmF0aW9uIHNyY09wLCBjb25zdCBQbGF0Zm9ybU1vdXNl RXZlbnQmIGRyYWdFdmVudCwgY29uc3QgSW50UG9pbnQmIGRyYWdPcmlnaW4sIEhhc05vbkRlZmF1 bHRQYXN0ZWJvYXJkRGF0YSk7Ci0gICAgICAgIHN0YXRpYyBjb25zdCBJbnRTaXplJiBtYXhEcmFn SW1hZ2VTaXplKCk7Ci0gICAgICAgIAotICAgICAgICBzdGF0aWMgY29uc3QgaW50IE1heE9yaWdp bmFsSW1hZ2VBcmVhOwotICAgICAgICBzdGF0aWMgY29uc3QgaW50IERyYWdJY29uUmlnaHRJbnNl dDsKLSAgICAgICAgc3RhdGljIGNvbnN0IGludCBEcmFnSWNvbkJvdHRvbUluc2V0OyAgICAgICAg Ci0gICAgICAgIHN0YXRpYyBjb25zdCBmbG9hdCBEcmFnSW1hZ2VBbHBoYTsKLQotICAgIHByaXZh dGU6Ci0gICAgICAgIHZvaWQgdXBkYXRlU3VwcG9ydGVkVHlwZUlkZW50aWZpZXJzRm9yRHJhZ0hh bmRsaW5nTWV0aG9kKERyYWdIYW5kbGluZ01ldGhvZCwgY29uc3QgRHJhZ0RhdGEmKSBjb25zdDsK LSAgICAgICAgYm9vbCBkaXNwYXRjaFRleHRJbnB1dEV2ZW50Rm9yKEZyYW1lKiwgY29uc3QgRHJh Z0RhdGEmKTsKLSAgICAgICAgYm9vbCBjYW5Qcm9jZXNzRHJhZyhjb25zdCBEcmFnRGF0YSYpOwot ICAgICAgICBib29sIGNvbmNsdWRlRWRpdERyYWcoY29uc3QgRHJhZ0RhdGEmKTsKLSAgICAgICAg RHJhZ09wZXJhdGlvbiBkcmFnRW50ZXJlZE9yVXBkYXRlZChjb25zdCBEcmFnRGF0YSYpOwotICAg ICAgICBEcmFnT3BlcmF0aW9uIG9wZXJhdGlvbkZvckxvYWQoY29uc3QgRHJhZ0RhdGEmKTsKLSAg ICAgICAgRHJhZ0hhbmRsaW5nTWV0aG9kIHRyeURvY3VtZW50RHJhZyhjb25zdCBEcmFnRGF0YSYs IE9wdGlvblNldDxEcmFnRGVzdGluYXRpb25BY3Rpb24+LCBEcmFnT3BlcmF0aW9uJik7Ci0gICAg ICAgIGJvb2wgdHJ5REhUTUxEcmFnKGNvbnN0IERyYWdEYXRhJiwgRHJhZ09wZXJhdGlvbiYpOwot ICAgICAgICBEcmFnT3BlcmF0aW9uIGRyYWdPcGVyYXRpb24oY29uc3QgRHJhZ0RhdGEmKTsKLSAg ICAgICAgdm9pZCBjbGVhckRyYWdDYXJldCgpOwotICAgICAgICBib29sIGRyYWdJc01vdmUoRnJh bWVTZWxlY3Rpb24mLCBjb25zdCBEcmFnRGF0YSYpOwotICAgICAgICBib29sIGlzQ29weUtleURv d24oY29uc3QgRHJhZ0RhdGEmKTsKLQotICAgICAgICB2b2lkIG1vdXNlTW92ZWRJbnRvRG9jdW1l bnQoRG9jdW1lbnQqKTsKLSAgICAgICAgYm9vbCBzaG91bGRVc2VDYWNoZWRJbWFnZUZvckRyYWdJ bWFnZShjb25zdCBJbWFnZSYpIGNvbnN0OwotCi0gICAgICAgIHZvaWQgZG9JbWFnZURyYWcoRWxl bWVudCYsIGNvbnN0IEludFBvaW50JiwgY29uc3QgSW50UmVjdCYsIEZyYW1lJiwgSW50UG9pbnQm LCBjb25zdCBEcmFnU3RhdGUmLCBQcm9taXNlZEF0dGFjaG1lbnRJbmZvJiYpOwotICAgICAgICB2 b2lkIGRvU3lzdGVtRHJhZyhEcmFnSW1hZ2UsIGNvbnN0IEludFBvaW50JiwgY29uc3QgSW50UG9p bnQmLCBGcmFtZSYsIGNvbnN0IERyYWdTdGF0ZSYsIFByb21pc2VkQXR0YWNobWVudEluZm8mJik7 Ci0KLSAgICAgICAgdm9pZCBiZWdpbkRyYWcoRHJhZ0l0ZW0sIEZyYW1lJiwgY29uc3QgSW50UG9p bnQmIG1vdXNlRG93blBvaW50LCBjb25zdCBJbnRQb2ludCYgbW91c2VEcmFnZ2VkUG9pbnQsIERh dGFUcmFuc2ZlciYsIERyYWdTb3VyY2VBY3Rpb24pOwotCi0gICAgICAgIGJvb2wgY2FuTG9hZERh dGFGcm9tRHJhZ2dpbmdQYXN0ZWJvYXJkKCkgY29uc3QKLSAgICAgICAgeworY2xhc3MgRHJhZ0Nv bnRyb2xsZXIgeworICAgIFdURl9NQUtFX05PTkNPUFlBQkxFKERyYWdDb250cm9sbGVyKTsgV1RG X01BS0VfRkFTVF9BTExPQ0FURUQ7CitwdWJsaWM6CisgICAgRHJhZ0NvbnRyb2xsZXIoUGFnZSYs IHN0ZDo6dW5pcXVlX3B0cjxEcmFnQ2xpZW50PiYmKTsKKyAgICB+RHJhZ0NvbnRyb2xsZXIoKTsK KworICAgIHN0YXRpYyBEcmFnT3BlcmF0aW9uIHBsYXRmb3JtR2VuZXJpY0RyYWdPcGVyYXRpb24o KTsKKworICAgIFdFQkNPUkVfRVhQT1JUIERyYWdPcGVyYXRpb24gZHJhZ0VudGVyZWQoY29uc3Qg RHJhZ0RhdGEmKTsKKyAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIGRyYWdFeGl0ZWQoY29uc3QgRHJh Z0RhdGEmKTsKKyAgICBXRUJDT1JFX0VYUE9SVCBEcmFnT3BlcmF0aW9uIGRyYWdVcGRhdGVkKGNv bnN0IERyYWdEYXRhJik7CisgICAgV0VCQ09SRV9FWFBPUlQgYm9vbCBwZXJmb3JtRHJhZ09wZXJh dGlvbihjb25zdCBEcmFnRGF0YSYpOworICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgZHJhZ0NhbmNl bGxlZCgpOworCisgICAgYm9vbCBtb3VzZUlzT3ZlckZpbGVJbnB1dCgpIGNvbnN0IHsgcmV0dXJu IG1fZmlsZUlucHV0RWxlbWVudFVuZGVyTW91c2U7IH0KKyAgICB1bnNpZ25lZCBudW1iZXJPZkl0 ZW1zVG9CZUFjY2VwdGVkKCkgY29uc3QgeyByZXR1cm4gbV9udW1iZXJPZkl0ZW1zVG9CZUFjY2Vw dGVkOyB9CisKKyAgICAvLyBGSVhNRTogSXQgc2hvdWxkIGJlIHBvc3NpYmxlIHRvIHJlbW92ZSBh IG51bWJlciBvZiB0aGVzZSBhY2Nlc3NvcnMgb25jZSBhbGwKKyAgICAvLyBkcmFnIGxvZ2ljIGlz IGluIFdlYkNvcmUuCisgICAgdm9pZCBzZXREaWRJbml0aWF0ZURyYWcoYm9vbCBpbml0aWF0ZWQp IHsgbV9kaWRJbml0aWF0ZURyYWcgPSBpbml0aWF0ZWQ7IH0KKyAgICBib29sIGRpZEluaXRpYXRl RHJhZygpIGNvbnN0IHsgcmV0dXJuIG1fZGlkSW5pdGlhdGVEcmFnOyB9CisgICAgRHJhZ09wZXJh dGlvbiBzb3VyY2VEcmFnT3BlcmF0aW9uKCkgY29uc3QgeyByZXR1cm4gbV9zb3VyY2VEcmFnT3Bl cmF0aW9uOyB9CisgICAgY29uc3QgVVJMJiBkcmFnZ2luZ0ltYWdlVVJMKCkgY29uc3QgeyByZXR1 cm4gbV9kcmFnZ2luZ0ltYWdlVVJMOyB9CisgICAgdm9pZCBzZXREcmFnT2Zmc2V0KGNvbnN0IElu dFBvaW50JiBvZmZzZXQpIHsgbV9kcmFnT2Zmc2V0ID0gb2Zmc2V0OyB9CisgICAgY29uc3QgSW50 UG9pbnQmIGRyYWdPZmZzZXQoKSBjb25zdCB7IHJldHVybiBtX2RyYWdPZmZzZXQ7IH0KKyAgICBE cmFnU291cmNlQWN0aW9uIGRyYWdTb3VyY2VBY3Rpb24oKSBjb25zdCB7IHJldHVybiBtX2RyYWdT b3VyY2VBY3Rpb247IH0KKyAgICBEcmFnSGFuZGxpbmdNZXRob2QgZHJhZ0hhbmRsaW5nTWV0aG9k KCkgY29uc3QgeyByZXR1cm4gbV9kcmFnSGFuZGxpbmdNZXRob2Q7IH0KKworICAgIERvY3VtZW50 KiBkb2N1bWVudFVuZGVyTW91c2UoKSBjb25zdCB7IHJldHVybiBtX2RvY3VtZW50VW5kZXJNb3Vz ZS5nZXQoKTsgfQorICAgIE9wdGlvblNldDxEcmFnRGVzdGluYXRpb25BY3Rpb24+IGRyYWdEZXN0 aW5hdGlvbkFjdGlvbk1hc2soKSBjb25zdCB7IHJldHVybiBtX2RyYWdEZXN0aW5hdGlvbkFjdGlv bk1hc2s7IH0KKyAgICBEcmFnU291cmNlQWN0aW9uIGRlbGVnYXRlRHJhZ1NvdXJjZUFjdGlvbihj b25zdCBJbnRQb2ludCYgcm9vdFZpZXdQb2ludCk7CisKKyAgICBFbGVtZW50KiBkcmFnZ2FibGVF bGVtZW50KGNvbnN0IEZyYW1lKiwgRWxlbWVudCogc3RhcnQsIGNvbnN0IEludFBvaW50JiwgRHJh Z1N0YXRlJikgY29uc3Q7CisgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBkcmFnRW5kZWQoKTsKKwor ICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgcGxhY2VEcmFnQ2FyZXQoY29uc3QgSW50UG9pbnQmKTsK KworICAgIGNvbnN0IFZlY3RvcjxSZWY8SFRNTEltYWdlRWxlbWVudD4+JiBkcm9wcGVkSW1hZ2VQ bGFjZWhvbGRlcnMoKSBjb25zdCB7IHJldHVybiBtX2Ryb3BwZWRJbWFnZVBsYWNlaG9sZGVyczsg fQorICAgIGNvbnN0IFJlZlB0cjxSYW5nZT4mIGRyb3BwZWRJbWFnZVBsYWNlaG9sZGVyUmFuZ2Uo KSBjb25zdCB7IHJldHVybiBtX2Ryb3BwZWRJbWFnZVBsYWNlaG9sZGVyUmFuZ2U7IH0KKworICAg IFdFQkNPUkVfRVhQT1JUIHZvaWQgZmluYWxpemVEcm9wcGVkSW1hZ2VQbGFjZWhvbGRlcihIVE1M SW1hZ2VFbGVtZW50Jik7CisgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBpbnNlcnREcm9wcGVkSW1h Z2VQbGFjZWhvbGRlcnNBdENhcmV0KGNvbnN0IFZlY3RvcjxJbnRTaXplPiYgaW1hZ2VTaXplcyk7 CisKKyAgICBib29sIHN0YXJ0RHJhZyhGcmFtZSYgc3JjLCBjb25zdCBEcmFnU3RhdGUmLCBEcmFn T3BlcmF0aW9uIHNyY09wLCBjb25zdCBQbGF0Zm9ybU1vdXNlRXZlbnQmIGRyYWdFdmVudCwgY29u c3QgSW50UG9pbnQmIGRyYWdPcmlnaW4sIEhhc05vbkRlZmF1bHRQYXN0ZWJvYXJkRGF0YSk7Cisg ICAgc3RhdGljIGNvbnN0IEludFNpemUmIG1heERyYWdJbWFnZVNpemUoKTsKKworICAgIHN0YXRp YyBjb25zdCBpbnQgTWF4T3JpZ2luYWxJbWFnZUFyZWE7CisgICAgc3RhdGljIGNvbnN0IGludCBE cmFnSWNvblJpZ2h0SW5zZXQ7CisgICAgc3RhdGljIGNvbnN0IGludCBEcmFnSWNvbkJvdHRvbUlu c2V0OworICAgIHN0YXRpYyBjb25zdCBmbG9hdCBEcmFnSW1hZ2VBbHBoYTsKKworcHJpdmF0ZToK KyAgICB2b2lkIHVwZGF0ZVN1cHBvcnRlZFR5cGVJZGVudGlmaWVyc0ZvckRyYWdIYW5kbGluZ01l dGhvZChEcmFnSGFuZGxpbmdNZXRob2QsIGNvbnN0IERyYWdEYXRhJikgY29uc3Q7CisgICAgYm9v bCBkaXNwYXRjaFRleHRJbnB1dEV2ZW50Rm9yKEZyYW1lKiwgY29uc3QgRHJhZ0RhdGEmKTsKKyAg ICBib29sIGNhblByb2Nlc3NEcmFnKGNvbnN0IERyYWdEYXRhJik7CisgICAgYm9vbCBjb25jbHVk ZUVkaXREcmFnKGNvbnN0IERyYWdEYXRhJik7CisgICAgRHJhZ09wZXJhdGlvbiBkcmFnRW50ZXJl ZE9yVXBkYXRlZChjb25zdCBEcmFnRGF0YSYpOworICAgIERyYWdPcGVyYXRpb24gb3BlcmF0aW9u Rm9yTG9hZChjb25zdCBEcmFnRGF0YSYpOworICAgIERyYWdIYW5kbGluZ01ldGhvZCB0cnlEb2N1 bWVudERyYWcoY29uc3QgRHJhZ0RhdGEmLCBPcHRpb25TZXQ8RHJhZ0Rlc3RpbmF0aW9uQWN0aW9u PiwgRHJhZ09wZXJhdGlvbiYpOworICAgIGJvb2wgdHJ5REhUTUxEcmFnKGNvbnN0IERyYWdEYXRh JiwgRHJhZ09wZXJhdGlvbiYpOworICAgIERyYWdPcGVyYXRpb24gZHJhZ09wZXJhdGlvbihjb25z dCBEcmFnRGF0YSYpOworICAgIHZvaWQgY2xlYXJEcmFnQ2FyZXQoKTsKKyAgICBib29sIGRyYWdJ c01vdmUoRnJhbWVTZWxlY3Rpb24mLCBjb25zdCBEcmFnRGF0YSYpOworICAgIGJvb2wgaXNDb3B5 S2V5RG93bihjb25zdCBEcmFnRGF0YSYpOworCisgICAgdm9pZCBtb3VzZU1vdmVkSW50b0RvY3Vt ZW50KERvY3VtZW50Kik7CisgICAgYm9vbCBzaG91bGRVc2VDYWNoZWRJbWFnZUZvckRyYWdJbWFn ZShjb25zdCBJbWFnZSYpIGNvbnN0OworCisgICAgdm9pZCBkb0ltYWdlRHJhZyhFbGVtZW50Jiwg Y29uc3QgSW50UG9pbnQmLCBjb25zdCBJbnRSZWN0JiwgRnJhbWUmLCBJbnRQb2ludCYsIGNvbnN0 IERyYWdTdGF0ZSYsIFByb21pc2VkQXR0YWNobWVudEluZm8mJik7CisgICAgdm9pZCBkb1N5c3Rl bURyYWcoRHJhZ0ltYWdlLCBjb25zdCBJbnRQb2ludCYsIGNvbnN0IEludFBvaW50JiwgRnJhbWUm LCBjb25zdCBEcmFnU3RhdGUmLCBQcm9taXNlZEF0dGFjaG1lbnRJbmZvJiYpOworCisgICAgdm9p ZCBiZWdpbkRyYWcoRHJhZ0l0ZW0sIEZyYW1lJiwgY29uc3QgSW50UG9pbnQmIG1vdXNlRG93blBv aW50LCBjb25zdCBJbnRQb2ludCYgbW91c2VEcmFnZ2VkUG9pbnQsIERhdGFUcmFuc2ZlciYsIERy YWdTb3VyY2VBY3Rpb24pOworCisgICAgYm9vbCBjYW5Mb2FkRGF0YUZyb21EcmFnZ2luZ1Bhc3Rl Ym9hcmQoKSBjb25zdAorICAgIHsKICNpZiBFTkFCTEUoREFUQV9JTlRFUkFDVElPTikKLSAgICAg ICAgICAgIHJldHVybiBtX2lzUGVyZm9ybWluZ0Ryb3A7CisgICAgICAgIHJldHVybiBtX2lzUGVy Zm9ybWluZ0Ryb3A7CiAjZWxzZQotICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgIHJl dHVybiB0cnVlOwogI2VuZGlmCi0gICAgICAgIH0KKyAgICB9CiAKLSAgICAgICAgRHJhZ0NsaWVu dCYgY2xpZW50KCkgY29uc3QgeyByZXR1cm4gKm1fY2xpZW50OyB9CisgICAgRHJhZ0NsaWVudCYg Y2xpZW50KCkgY29uc3QgeyByZXR1cm4gKm1fY2xpZW50OyB9CiAKLSAgICAgICAgYm9vbCB0cnlU b1VwZGF0ZURyb3BwZWRJbWFnZVBsYWNlaG9sZGVycyhjb25zdCBEcmFnRGF0YSYpOwotICAgICAg ICB2b2lkIHJlbW92ZUFsbERyb3BwZWRJbWFnZVBsYWNlaG9sZGVycygpOworICAgIGJvb2wgdHJ5 VG9VcGRhdGVEcm9wcGVkSW1hZ2VQbGFjZWhvbGRlcnMoY29uc3QgRHJhZ0RhdGEmKTsKKyAgICB2 b2lkIHJlbW92ZUFsbERyb3BwZWRJbWFnZVBsYWNlaG9sZGVycygpOwogCi0gICAgICAgIHZvaWQg Y2xlYW51cEFmdGVyU3lzdGVtRHJhZygpOwotICAgICAgICB2b2lkIGRlY2xhcmVBbmRXcml0ZURy YWdJbWFnZShEYXRhVHJhbnNmZXImLCBFbGVtZW50JiwgY29uc3QgVVJMJiwgY29uc3QgU3RyaW5n JiBsYWJlbCk7CisgICAgdm9pZCBjbGVhbnVwQWZ0ZXJTeXN0ZW1EcmFnKCk7CisgICAgdm9pZCBk ZWNsYXJlQW5kV3JpdGVEcmFnSW1hZ2UoRGF0YVRyYW5zZmVyJiwgRWxlbWVudCYsIGNvbnN0IFVS TCYsIGNvbnN0IFN0cmluZyYgbGFiZWwpOwogCi0gICAgICAgIFBhZ2UmIG1fcGFnZTsKLSAgICAg ICAgc3RkOjp1bmlxdWVfcHRyPERyYWdDbGllbnQ+IG1fY2xpZW50OworICAgIFBhZ2UmIG1fcGFn ZTsKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8RHJhZ0NsaWVudD4gbV9jbGllbnQ7CiAKLSAgICAgICAg UmVmUHRyPERvY3VtZW50PiBtX2RvY3VtZW50VW5kZXJNb3VzZTsgLy8gVGhlIGRvY3VtZW50IHRo ZSBtb3VzZSB3YXMgbGFzdCBkcmFnZ2VkIG92ZXIuCi0gICAgICAgIFJlZlB0cjxEb2N1bWVudD4g bV9kcmFnSW5pdGlhdG9yOyAvLyBUaGUgRG9jdW1lbnQgKGlmIGFueSkgdGhhdCBpbml0aWF0ZWQg dGhlIGRyYWcuCi0gICAgICAgIFJlZlB0cjxIVE1MSW5wdXRFbGVtZW50PiBtX2ZpbGVJbnB1dEVs ZW1lbnRVbmRlck1vdXNlOwotICAgICAgICB1bnNpZ25lZCBtX251bWJlck9mSXRlbXNUb0JlQWNj ZXB0ZWQgeyAwIH07Ci0gICAgICAgIERyYWdIYW5kbGluZ01ldGhvZCBtX2RyYWdIYW5kbGluZ01l dGhvZCB7IERyYWdIYW5kbGluZ01ldGhvZDo6Tm9uZSB9OworICAgIFJlZlB0cjxEb2N1bWVudD4g bV9kb2N1bWVudFVuZGVyTW91c2U7IC8vIFRoZSBkb2N1bWVudCB0aGUgbW91c2Ugd2FzIGxhc3Qg ZHJhZ2dlZCBvdmVyLgorICAgIFJlZlB0cjxEb2N1bWVudD4gbV9kcmFnSW5pdGlhdG9yOyAvLyBU aGUgRG9jdW1lbnQgKGlmIGFueSkgdGhhdCBpbml0aWF0ZWQgdGhlIGRyYWcuCisgICAgUmVmUHRy PEhUTUxJbnB1dEVsZW1lbnQ+IG1fZmlsZUlucHV0RWxlbWVudFVuZGVyTW91c2U7CisgICAgdW5z aWduZWQgbV9udW1iZXJPZkl0ZW1zVG9CZUFjY2VwdGVkIHsgMCB9OworICAgIERyYWdIYW5kbGlu Z01ldGhvZCBtX2RyYWdIYW5kbGluZ01ldGhvZCB7IERyYWdIYW5kbGluZ01ldGhvZDo6Tm9uZSB9 OwogCi0gICAgICAgIE9wdGlvblNldDxEcmFnRGVzdGluYXRpb25BY3Rpb24+IG1fZHJhZ0Rlc3Rp bmF0aW9uQWN0aW9uTWFzazsKLSAgICAgICAgRHJhZ1NvdXJjZUFjdGlvbiBtX2RyYWdTb3VyY2VB Y3Rpb24geyBEcmFnU291cmNlQWN0aW9uTm9uZSB9OwotICAgICAgICBib29sIG1fZGlkSW5pdGlh dGVEcmFnIHsgZmFsc2UgfTsKLSAgICAgICAgRHJhZ09wZXJhdGlvbiBtX3NvdXJjZURyYWdPcGVy YXRpb24geyBEcmFnT3BlcmF0aW9uTm9uZSB9OyAvLyBTZXQgaW4gc3RhcnREcmFnIHdoZW4gYSBk cmFnIHN0YXJ0cyBmcm9tIGEgbW91c2UgZG93biB3aXRoaW4gV2ViS2l0Ci0gICAgICAgIEludFBv aW50IG1fZHJhZ09mZnNldDsKLSAgICAgICAgVVJMIG1fZHJhZ2dpbmdJbWFnZVVSTDsKLSAgICAg ICAgYm9vbCBtX2lzUGVyZm9ybWluZ0Ryb3AgeyBmYWxzZSB9OwotICAgICAgICBWZWN0b3I8UmVm PEhUTUxJbWFnZUVsZW1lbnQ+PiBtX2Ryb3BwZWRJbWFnZVBsYWNlaG9sZGVyczsKLSAgICAgICAg UmVmUHRyPFJhbmdlPiBtX2Ryb3BwZWRJbWFnZVBsYWNlaG9sZGVyUmFuZ2U7Ci0gICAgfTsKKyAg ICBPcHRpb25TZXQ8RHJhZ0Rlc3RpbmF0aW9uQWN0aW9uPiBtX2RyYWdEZXN0aW5hdGlvbkFjdGlv bk1hc2s7CisgICAgRHJhZ1NvdXJjZUFjdGlvbiBtX2RyYWdTb3VyY2VBY3Rpb24geyBEcmFnU291 cmNlQWN0aW9uTm9uZSB9OworICAgIGJvb2wgbV9kaWRJbml0aWF0ZURyYWcgeyBmYWxzZSB9Owor ICAgIERyYWdPcGVyYXRpb24gbV9zb3VyY2VEcmFnT3BlcmF0aW9uIHsgRHJhZ09wZXJhdGlvbk5v bmUgfTsgLy8gU2V0IGluIHN0YXJ0RHJhZyB3aGVuIGEgZHJhZyBzdGFydHMgZnJvbSBhIG1vdXNl IGRvd24gd2l0aGluIFdlYktpdAorICAgIEludFBvaW50IG1fZHJhZ09mZnNldDsKKyAgICBVUkwg bV9kcmFnZ2luZ0ltYWdlVVJMOworICAgIGJvb2wgbV9pc1BlcmZvcm1pbmdEcm9wIHsgZmFsc2Ug fTsKKyAgICBWZWN0b3I8UmVmPEhUTUxJbWFnZUVsZW1lbnQ+PiBtX2Ryb3BwZWRJbWFnZVBsYWNl aG9sZGVyczsKKyAgICBSZWZQdHI8UmFuZ2U+IG1fZHJvcHBlZEltYWdlUGxhY2Vob2xkZXJSYW5n ZTsKK307CiAKLSAgICBXRUJDT1JFX0VYUE9SVCBib29sIGlzRHJhZ2dhYmxlTGluayhjb25zdCBF bGVtZW50Jik7CitXRUJDT1JFX0VYUE9SVCBib29sIGlzRHJhZ2dhYmxlTGluayhjb25zdCBFbGVt ZW50Jik7CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK