139758 2014-12-17 17:02:44 -0800 Get rid of FrameLoader::defaultObjectContentType 2014-12-17 17:55:35 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca commit-queue japhet oldest_to_newest 1056619 0 andersca 2014-12-17 17:02:44 -0800 Get rid of FrameLoader::defaultObjectContentType 1056624 1 243470 andersca 2014-12-17 17:03:58 -0800 Created attachment 243470 Patch 1056646 2 243472 andersca 2014-12-17 17:37:39 -0800 Created attachment 243472 Patch 1056687 3 243472 ggaren 2014-12-17 17:55:05 -0800 Comment on attachment 243472 Patch r=me if it builds 1056689 4 andersca 2014-12-17 17:55:35 -0800 Committed r177482: <http://trac.webkit.org/changeset/177482> 243470 2014-12-17 17:03:58 -0800 2014-12-17 17:37:36 -0800 Patch bug-139758-20141217170448.patch text/plain 5887 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3NDY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjFmYjY0ZGRmZGI4MGIx YzQxYzhmZWMwNWFjNWJhNGQwZmM3MjIzMC4uZDY1NDhiMjQxMWE5NGFlZTBiZDIxNGM1ZjVmZWFj MDRmOGZlY2JkNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE0LTEyLTE3ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgR2V0IHJpZCBvZiBG cmFtZUxvYWRlcjo6ZGVmYXVsdE9iamVjdENvbnRlbnRUeXBlCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzk3NTgKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb3ZlIHRoZSBGcmFtZUxvYWRlcjo6ZGVmYXVs dE9iamVjdENvbnRlbnRUeXBlIGltcGxlbWVudGF0aW9uIHRvIGl0cyBvbmx5IGNhbGxlciBpbiBX ZWJLaXQvd2luLgorCisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpkZWZhdWx0T2JqZWN0Q29udGVudFR5cGUpOiBEZWxldGVk LgorICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRlci5oOgorCiAyMDE0LTEyLTE3ICBwZWF2b0Bv dXRsb29rLmNvbSAgPHBlYXZvQG91dGxvb2suY29tPgogCiAgICAgICAgIFtDdXJsXSBDb21waWxl IGVycm9yLCBzZXRXYXNDYWNoZWQgbWV0aG9kIGhhcyBiZWVuIHJlbW92ZWQuCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L3dpbi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L3dpbi9DaGFuZ2VM b2cKaW5kZXggMmEzZWUxNWMwMmYyYTE3MDQ4MjRiYzQ0YTI5YjNhZjk4NGFkOTA0NS4uOGU5NTRm ZTBiMzViNzQ2YTg2NjgxMWI3M2RiMWJlMzdiNzEwY2VmMyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC93aW4vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZwpAQCAt MSwzICsxLDEzIEBACisyMDE0LTEyLTE3ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBs ZS5jb20+CisKKyAgICAgICAgR2V0IHJpZCBvZiBGcmFtZUxvYWRlcjo6ZGVmYXVsdE9iamVjdENv bnRlbnRUeXBlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMzk3NTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIFdlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcDoKKyAgICAgICAgKFdl YkZyYW1lTG9hZGVyQ2xpZW50OjpvYmplY3RDb250ZW50VHlwZSk6CisKIDIwMTQtMTItMTYgIEFu ZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgogCiAgICAgICAgIFVzZSBSZWYgZm9yIFNl Y3VyaXR5T3JpZ2luLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9h ZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKaW5kZXggMjdm NTI4NTIxMDYwZWQ3NjllZmM4MjNlZmYyMzMzZGQ2Y2U3YzQxNS4uY2FjMmIxZGI0NGRkNTI3Nzk4 YTJkYTU4MGRkZDdjYTMzMWI5YTgxZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVy L0ZyYW1lTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIu Y3BwCkBAIC05NTcsNDEgKzk1Nyw2IEBAIHZvaWQgRnJhbWVMb2FkZXI6OmxvYWRBcmNoaXZlKFBh c3NSZWZQdHI8QXJjaGl2ZT4gYXJjaGl2ZSkKIH0KICNlbmRpZiAvLyBFTkFCTEUoV0VCX0FSQ0hJ VkUpIHx8IEVOQUJMRShNSFRNTCkKIAotT2JqZWN0Q29udGVudFR5cGUgRnJhbWVMb2FkZXI6OmRl ZmF1bHRPYmplY3RDb250ZW50VHlwZShjb25zdCBVUkwmIHVybCwgY29uc3QgU3RyaW5nJiBtaW1l VHlwZUluLCBib29sIHNob3VsZFByZWZlclBsdWdJbnNGb3JJbWFnZXMpCi17Ci0gICAgU3RyaW5n IG1pbWVUeXBlID0gbWltZVR5cGVJbjsKLQotICAgIGlmIChtaW1lVHlwZS5pc0VtcHR5KCkpCi0g ICAgICAgIG1pbWVUeXBlID0gbWltZVR5cGVGcm9tVVJMKHVybCk7Ci0KLSNpZiAhUExBVEZPUk0o Q09DT0EpICYmICFQTEFURk9STShFRkwpIC8vIE1hYyBoYXMgbm8gUGx1Z2luRGF0YWJhc2UsIG5v ciBkb2VzIEVGTAotICAgIGlmIChtaW1lVHlwZS5pc0VtcHR5KCkpIHsKLSAgICAgICAgU3RyaW5n IGRlY29kZWRQYXRoID0gZGVjb2RlVVJMRXNjYXBlU2VxdWVuY2VzKHVybC5wYXRoKCkpOwotICAg ICAgICBtaW1lVHlwZSA9IFBsdWdpbkRhdGFiYXNlOjppbnN0YWxsZWRQbHVnaW5zKCktPk1JTUVU eXBlRm9yRXh0ZW5zaW9uKGRlY29kZWRQYXRoLnN1YnN0cmluZyhkZWNvZGVkUGF0aC5yZXZlcnNl RmluZCgnLicpICsgMSkpOwotICAgIH0KLSNlbmRpZgotCi0gICAgaWYgKG1pbWVUeXBlLmlzRW1w dHkoKSkKLSAgICAgICAgcmV0dXJuIE9iamVjdENvbnRlbnRGcmFtZTsgLy8gR28gYWhlYWQgYW5k IGhvcGUgdGhhdCB3ZSBjYW4gZGlzcGxheSB0aGUgY29udGVudC4KLQotI2lmICFQTEFURk9STShD T0NPQSkgJiYgIVBMQVRGT1JNKEVGTCkgLy8gTWFjIGhhcyBubyBQbHVnaW5EYXRhYmFzZSwgbm9y IGRvZXMgRUZMCi0gICAgYm9vbCBwbHVnSW5TdXBwb3J0c01JTUVUeXBlID0gUGx1Z2luRGF0YWJh c2U6Omluc3RhbGxlZFBsdWdpbnMoKS0+aXNNSU1FVHlwZVJlZ2lzdGVyZWQobWltZVR5cGUpOwot I2Vsc2UKLSAgICBib29sIHBsdWdJblN1cHBvcnRzTUlNRVR5cGUgPSBmYWxzZTsKLSNlbmRpZgot Ci0gICAgaWYgKE1JTUVUeXBlUmVnaXN0cnk6OmlzU3VwcG9ydGVkSW1hZ2VNSU1FVHlwZShtaW1l VHlwZSkpCi0gICAgICAgIHJldHVybiBzaG91bGRQcmVmZXJQbHVnSW5zRm9ySW1hZ2VzICYmIHBs dWdJblN1cHBvcnRzTUlNRVR5cGUgPyBXZWJDb3JlOjpPYmplY3RDb250ZW50TmV0c2NhcGVQbHVn aW4gOiBXZWJDb3JlOjpPYmplY3RDb250ZW50SW1hZ2U7Ci0KLSAgICBpZiAocGx1Z0luU3VwcG9y dHNNSU1FVHlwZSkKLSAgICAgICAgcmV0dXJuIFdlYkNvcmU6Ok9iamVjdENvbnRlbnROZXRzY2Fw ZVBsdWdpbjsKLQotICAgIGlmIChNSU1FVHlwZVJlZ2lzdHJ5Ojppc1N1cHBvcnRlZE5vbkltYWdl TUlNRVR5cGUobWltZVR5cGUpKQotICAgICAgICByZXR1cm4gV2ViQ29yZTo6T2JqZWN0Q29udGVu dEZyYW1lOwotCi0gICAgcmV0dXJuIFdlYkNvcmU6Ok9iamVjdENvbnRlbnROb25lOwotfQotCiBT dHJpbmcgRnJhbWVMb2FkZXI6Om91dGdvaW5nUmVmZXJyZXIoKSBjb25zdAogewogICAgIC8vIFNl ZSBodHRwOi8vd3d3LndoYXR3Zy5vcmcvc3BlY3Mvd2ViLWFwcHMvY3VycmVudC13b3JrLyNmZXRj aGluZy1yZXNvdXJjZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxv YWRlci5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmgKaW5kZXggNTcxM2E2 NDE2ZjdkMTJiNGY0OTBkNzVlODhjZWZmNDgzODkxODIwNS4uNmQ1NTgwNjY1N2YxYzkzMzljNDBl OTAyM2Y2MDJhYmU5OWNmNGNkYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0Zy YW1lTG9hZGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmgKQEAg LTI2Nyw4ICsyNjcsNiBAQCBwdWJsaWM6CiAKICAgICBib29sIHN1cHByZXNzT3BlbmVySW5OZXdG cmFtZSgpIGNvbnN0IHsgcmV0dXJuIG1fc3VwcHJlc3NPcGVuZXJJbk5ld0ZyYW1lOyB9CiAKLSAg ICBzdGF0aWMgT2JqZWN0Q29udGVudFR5cGUgZGVmYXVsdE9iamVjdENvbnRlbnRUeXBlKGNvbnN0 IFVSTCYsIGNvbnN0IFN0cmluZyYgbWltZVR5cGUsIGJvb2wgc2hvdWxkUHJlZmVyUGx1Z0luc0Zv ckltYWdlcyk7Ci0KICAgICBib29sIHF1aWNrUmVkaXJlY3RDb21pbmcoKSBjb25zdCB7IHJldHVy biBtX3F1aWNrUmVkaXJlY3RDb21pbmc7IH0KIAogICAgIFdFQkNPUkVfRVhQT1JUIGJvb2wgc2hv dWxkQ2xvc2UoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvd2luL1dlYkNvcmVTdXBwb3J0 L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcCBiL1NvdXJjZS9XZWJLaXQvd2luL1dlYkNvcmVTdXBw b3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcAppbmRleCBhODg0ZGEyOGEwM2JiODA2NTZhMjA4 MTE1ZWYwOGUzNDkwMzdlZjI3Li5hN2Y1MmM4YjExMWI4MjBlZGJiMzU1NGY3NzY5NzU0YTRkMjNk MWQwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJGcmFt ZUxvYWRlckNsaWVudC5jcHAKKysrIGIvU291cmNlL1dlYktpdC93aW4vV2ViQ29yZVN1cHBvcnQv V2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCkBAIC0xMDc3LDcgKzEwNzcsMzEgQEAgUGFzc1JlZlB0 cjxGcmFtZT4gV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmNyZWF0ZUZyYW1lKGNvbnN0IFVSTCYgVVJM LCBjb25zdCBTdHJpbmcKIAogT2JqZWN0Q29udGVudFR5cGUgV2ViRnJhbWVMb2FkZXJDbGllbnQ6 Om9iamVjdENvbnRlbnRUeXBlKGNvbnN0IFVSTCYgdXJsLCBjb25zdCBTdHJpbmcmIG1pbWVUeXBl LCBib29sIHNob3VsZFByZWZlclBsdWdJbnNGb3JJbWFnZXMpCiB7Ci0gICAgcmV0dXJuIFdlYkNv cmU6OkZyYW1lTG9hZGVyOjpkZWZhdWx0T2JqZWN0Q29udGVudFR5cGUodXJsLCBtaW1lVHlwZSwg c2hvdWxkUHJlZmVyUGx1Z0luc0ZvckltYWdlcyk7CisgICAgU3RyaW5nIG1pbWVUeXBlID0gbWlt ZVR5cGVJbjsKKworICAgIGlmIChtaW1lVHlwZS5pc0VtcHR5KCkpCisgICAgICAgIG1pbWVUeXBl ID0gbWltZVR5cGVGcm9tVVJMKHVybCk7CisKKyAgICBpZiAobWltZVR5cGUuaXNFbXB0eSgpKSB7 CisgICAgICAgIFN0cmluZyBkZWNvZGVkUGF0aCA9IGRlY29kZVVSTEVzY2FwZVNlcXVlbmNlcyh1 cmwucGF0aCgpKTsKKyAgICAgICAgbWltZVR5cGUgPSBQbHVnaW5EYXRhYmFzZTo6aW5zdGFsbGVk UGx1Z2lucygpLT5NSU1FVHlwZUZvckV4dGVuc2lvbihkZWNvZGVkUGF0aC5zdWJzdHJpbmcoZGVj b2RlZFBhdGgucmV2ZXJzZUZpbmQoJy4nKSArIDEpKTsKKyAgICB9CisKKyAgICBpZiAobWltZVR5 cGUuaXNFbXB0eSgpKQorICAgICAgICByZXR1cm4gT2JqZWN0Q29udGVudEZyYW1lOyAvLyBHbyBh aGVhZCBhbmQgaG9wZSB0aGF0IHdlIGNhbiBkaXNwbGF5IHRoZSBjb250ZW50LgorCisgICAgYm9v bCBwbHVnSW5TdXBwb3J0c01JTUVUeXBlID0gUGx1Z2luRGF0YWJhc2U6Omluc3RhbGxlZFBsdWdp bnMoKS0+aXNNSU1FVHlwZVJlZ2lzdGVyZWQobWltZVR5cGUpOworCisgICAgaWYgKE1JTUVUeXBl UmVnaXN0cnk6OmlzU3VwcG9ydGVkSW1hZ2VNSU1FVHlwZShtaW1lVHlwZSkpCisgICAgICAgIHJl dHVybiBzaG91bGRQcmVmZXJQbHVnSW5zRm9ySW1hZ2VzICYmIHBsdWdJblN1cHBvcnRzTUlNRVR5 cGUgPyBXZWJDb3JlOjpPYmplY3RDb250ZW50TmV0c2NhcGVQbHVnaW4gOiBXZWJDb3JlOjpPYmpl Y3RDb250ZW50SW1hZ2U7CisKKyAgICBpZiAocGx1Z0luU3VwcG9ydHNNSU1FVHlwZSkKKyAgICAg ICAgcmV0dXJuIFdlYkNvcmU6Ok9iamVjdENvbnRlbnROZXRzY2FwZVBsdWdpbjsKKworICAgIGlm IChNSU1FVHlwZVJlZ2lzdHJ5Ojppc1N1cHBvcnRlZE5vbkltYWdlTUlNRVR5cGUobWltZVR5cGUp KQorICAgICAgICByZXR1cm4gV2ViQ29yZTo6T2JqZWN0Q29udGVudEZyYW1lOworCisgICAgcmV0 dXJuIFdlYkNvcmU6Ok9iamVjdENvbnRlbnROb25lOwogfQogCiB2b2lkIFdlYkZyYW1lTG9hZGVy Q2xpZW50OjpkaXNwYXRjaERpZEZhaWxUb1N0YXJ0UGx1Z2luKGNvbnN0IFBsdWdpblZpZXcqIHBs dWdpblZpZXcpIGNvbnN0Cg== 243472 2014-12-17 17:37:39 -0800 2014-12-17 17:55:05 -0800 Patch bug-139758-20141217173829.patch text/plain 6399 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3NDY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjFmYjY0ZGRmZGI4MGIx YzQxYzhmZWMwNWFjNWJhNGQwZmM3MjIzMC4uZDY1NDhiMjQxMWE5NGFlZTBiZDIxNGM1ZjVmZWFj MDRmOGZlY2JkNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE0LTEyLTE3ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgR2V0IHJpZCBvZiBG cmFtZUxvYWRlcjo6ZGVmYXVsdE9iamVjdENvbnRlbnRUeXBlCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzk3NTgKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb3ZlIHRoZSBGcmFtZUxvYWRlcjo6ZGVmYXVs dE9iamVjdENvbnRlbnRUeXBlIGltcGxlbWVudGF0aW9uIHRvIGl0cyBvbmx5IGNhbGxlciBpbiBX ZWJLaXQvd2luLgorCisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpkZWZhdWx0T2JqZWN0Q29udGVudFR5cGUpOiBEZWxldGVk LgorICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRlci5oOgorCiAyMDE0LTEyLTE3ICBwZWF2b0Bv dXRsb29rLmNvbSAgPHBlYXZvQG91dGxvb2suY29tPgogCiAgICAgICAgIFtDdXJsXSBDb21waWxl IGVycm9yLCBzZXRXYXNDYWNoZWQgbWV0aG9kIGhhcyBiZWVuIHJlbW92ZWQuCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L3dpbi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L3dpbi9DaGFuZ2VM b2cKaW5kZXggMmEzZWUxNWMwMmYyYTE3MDQ4MjRiYzQ0YTI5YjNhZjk4NGFkOTA0NS4uOGU5NTRm ZTBiMzViNzQ2YTg2NjgxMWI3M2RiMWJlMzdiNzEwY2VmMyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC93aW4vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZwpAQCAt MSwzICsxLDEzIEBACisyMDE0LTEyLTE3ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBs ZS5jb20+CisKKyAgICAgICAgR2V0IHJpZCBvZiBGcmFtZUxvYWRlcjo6ZGVmYXVsdE9iamVjdENv bnRlbnRUeXBlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMzk3NTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIFdlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcDoKKyAgICAgICAgKFdl YkZyYW1lTG9hZGVyQ2xpZW50OjpvYmplY3RDb250ZW50VHlwZSk6CisKIDIwMTQtMTItMTYgIEFu ZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgogCiAgICAgICAgIFVzZSBSZWYgZm9yIFNl Y3VyaXR5T3JpZ2luLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9h ZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKaW5kZXggMjdm NTI4NTIxMDYwZWQ3NjllZmM4MjNlZmYyMzMzZGQ2Y2U3YzQxNS4uY2FjMmIxZGI0NGRkNTI3Nzk4 YTJkYTU4MGRkZDdjYTMzMWI5YTgxZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVy L0ZyYW1lTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIu Y3BwCkBAIC05NTcsNDEgKzk1Nyw2IEBAIHZvaWQgRnJhbWVMb2FkZXI6OmxvYWRBcmNoaXZlKFBh c3NSZWZQdHI8QXJjaGl2ZT4gYXJjaGl2ZSkKIH0KICNlbmRpZiAvLyBFTkFCTEUoV0VCX0FSQ0hJ VkUpIHx8IEVOQUJMRShNSFRNTCkKIAotT2JqZWN0Q29udGVudFR5cGUgRnJhbWVMb2FkZXI6OmRl ZmF1bHRPYmplY3RDb250ZW50VHlwZShjb25zdCBVUkwmIHVybCwgY29uc3QgU3RyaW5nJiBtaW1l VHlwZUluLCBib29sIHNob3VsZFByZWZlclBsdWdJbnNGb3JJbWFnZXMpCi17Ci0gICAgU3RyaW5n IG1pbWVUeXBlID0gbWltZVR5cGVJbjsKLQotICAgIGlmIChtaW1lVHlwZS5pc0VtcHR5KCkpCi0g ICAgICAgIG1pbWVUeXBlID0gbWltZVR5cGVGcm9tVVJMKHVybCk7Ci0KLSNpZiAhUExBVEZPUk0o Q09DT0EpICYmICFQTEFURk9STShFRkwpIC8vIE1hYyBoYXMgbm8gUGx1Z2luRGF0YWJhc2UsIG5v ciBkb2VzIEVGTAotICAgIGlmIChtaW1lVHlwZS5pc0VtcHR5KCkpIHsKLSAgICAgICAgU3RyaW5n IGRlY29kZWRQYXRoID0gZGVjb2RlVVJMRXNjYXBlU2VxdWVuY2VzKHVybC5wYXRoKCkpOwotICAg ICAgICBtaW1lVHlwZSA9IFBsdWdpbkRhdGFiYXNlOjppbnN0YWxsZWRQbHVnaW5zKCktPk1JTUVU eXBlRm9yRXh0ZW5zaW9uKGRlY29kZWRQYXRoLnN1YnN0cmluZyhkZWNvZGVkUGF0aC5yZXZlcnNl RmluZCgnLicpICsgMSkpOwotICAgIH0KLSNlbmRpZgotCi0gICAgaWYgKG1pbWVUeXBlLmlzRW1w dHkoKSkKLSAgICAgICAgcmV0dXJuIE9iamVjdENvbnRlbnRGcmFtZTsgLy8gR28gYWhlYWQgYW5k IGhvcGUgdGhhdCB3ZSBjYW4gZGlzcGxheSB0aGUgY29udGVudC4KLQotI2lmICFQTEFURk9STShD T0NPQSkgJiYgIVBMQVRGT1JNKEVGTCkgLy8gTWFjIGhhcyBubyBQbHVnaW5EYXRhYmFzZSwgbm9y IGRvZXMgRUZMCi0gICAgYm9vbCBwbHVnSW5TdXBwb3J0c01JTUVUeXBlID0gUGx1Z2luRGF0YWJh c2U6Omluc3RhbGxlZFBsdWdpbnMoKS0+aXNNSU1FVHlwZVJlZ2lzdGVyZWQobWltZVR5cGUpOwot I2Vsc2UKLSAgICBib29sIHBsdWdJblN1cHBvcnRzTUlNRVR5cGUgPSBmYWxzZTsKLSNlbmRpZgot Ci0gICAgaWYgKE1JTUVUeXBlUmVnaXN0cnk6OmlzU3VwcG9ydGVkSW1hZ2VNSU1FVHlwZShtaW1l VHlwZSkpCi0gICAgICAgIHJldHVybiBzaG91bGRQcmVmZXJQbHVnSW5zRm9ySW1hZ2VzICYmIHBs dWdJblN1cHBvcnRzTUlNRVR5cGUgPyBXZWJDb3JlOjpPYmplY3RDb250ZW50TmV0c2NhcGVQbHVn aW4gOiBXZWJDb3JlOjpPYmplY3RDb250ZW50SW1hZ2U7Ci0KLSAgICBpZiAocGx1Z0luU3VwcG9y dHNNSU1FVHlwZSkKLSAgICAgICAgcmV0dXJuIFdlYkNvcmU6Ok9iamVjdENvbnRlbnROZXRzY2Fw ZVBsdWdpbjsKLQotICAgIGlmIChNSU1FVHlwZVJlZ2lzdHJ5Ojppc1N1cHBvcnRlZE5vbkltYWdl TUlNRVR5cGUobWltZVR5cGUpKQotICAgICAgICByZXR1cm4gV2ViQ29yZTo6T2JqZWN0Q29udGVu dEZyYW1lOwotCi0gICAgcmV0dXJuIFdlYkNvcmU6Ok9iamVjdENvbnRlbnROb25lOwotfQotCiBT dHJpbmcgRnJhbWVMb2FkZXI6Om91dGdvaW5nUmVmZXJyZXIoKSBjb25zdAogewogICAgIC8vIFNl ZSBodHRwOi8vd3d3LndoYXR3Zy5vcmcvc3BlY3Mvd2ViLWFwcHMvY3VycmVudC13b3JrLyNmZXRj aGluZy1yZXNvdXJjZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxv YWRlci5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmgKaW5kZXggNTcxM2E2 NDE2ZjdkMTJiNGY0OTBkNzVlODhjZWZmNDgzODkxODIwNS4uNmQ1NTgwNjY1N2YxYzkzMzljNDBl OTAyM2Y2MDJhYmU5OWNmNGNkYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0Zy YW1lTG9hZGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmgKQEAg LTI2Nyw4ICsyNjcsNiBAQCBwdWJsaWM6CiAKICAgICBib29sIHN1cHByZXNzT3BlbmVySW5OZXdG cmFtZSgpIGNvbnN0IHsgcmV0dXJuIG1fc3VwcHJlc3NPcGVuZXJJbk5ld0ZyYW1lOyB9CiAKLSAg ICBzdGF0aWMgT2JqZWN0Q29udGVudFR5cGUgZGVmYXVsdE9iamVjdENvbnRlbnRUeXBlKGNvbnN0 IFVSTCYsIGNvbnN0IFN0cmluZyYgbWltZVR5cGUsIGJvb2wgc2hvdWxkUHJlZmVyUGx1Z0luc0Zv ckltYWdlcyk7Ci0KICAgICBib29sIHF1aWNrUmVkaXJlY3RDb21pbmcoKSBjb25zdCB7IHJldHVy biBtX3F1aWNrUmVkaXJlY3RDb21pbmc7IH0KIAogICAgIFdFQkNPUkVfRVhQT1JUIGJvb2wgc2hv dWxkQ2xvc2UoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvd2luL1dlYkNvcmVTdXBwb3J0 L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcCBiL1NvdXJjZS9XZWJLaXQvd2luL1dlYkNvcmVTdXBw b3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcAppbmRleCBhODg0ZGEyOGEwM2JiODA2NTZhMjA4 MTE1ZWYwOGUzNDkwMzdlZjI3Li5iOGJkNjRkNTQ1NmFhMzdkZjc0MmZjYmUyNmFmNjRmOGY5ZDk3 OTk3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJGcmFt ZUxvYWRlckNsaWVudC5jcHAKKysrIGIvU291cmNlL1dlYktpdC93aW4vV2ViQ29yZVN1cHBvcnQv V2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCkBAIC03MSw3ICs3MSw5IEBACiAjaW5jbHVkZSA8V2Vi Q29yZS9IVE1MUGx1Z0luRWxlbWVudC5oPgogI2luY2x1ZGUgPFdlYkNvcmUvSGlzdG9yeUl0ZW0u aD4KICNpbmNsdWRlIDxXZWJDb3JlL0xvY2FsaXplZFN0cmluZ3MuaD4KKyNpbmNsdWRlIDxXZWJD b3JlL01JTUVUeXBlUmVnaXN0cnkuaD4KICNpbmNsdWRlIDxXZWJDb3JlL1BhZ2UuaD4KKyNpbmNs dWRlIDxXZWJDb3JlL1BsdWdpbkRhdGFiYXNlLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9QbHVnaW5Q YWNrYWdlLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9QbHVnaW5WaWV3Lmg+CiAjaW5jbHVkZSA8V2Vi Q29yZS9Qb2xpY3lDaGVja2VyLmg+CkBAIC0xMDc1LDkgKzEwNzcsMzMgQEAgUGFzc1JlZlB0cjxG cmFtZT4gV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmNyZWF0ZUZyYW1lKGNvbnN0IFVSTCYgVVJMLCBj b25zdCBTdHJpbmcKICAgICByZXR1cm4gY2hpbGRGcmFtZS5yZWxlYXNlKCk7CiB9CiAKLU9iamVj dENvbnRlbnRUeXBlIFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpvYmplY3RDb250ZW50VHlwZShjb25z dCBVUkwmIHVybCwgY29uc3QgU3RyaW5nJiBtaW1lVHlwZSwgYm9vbCBzaG91bGRQcmVmZXJQbHVn SW5zRm9ySW1hZ2VzKQorT2JqZWN0Q29udGVudFR5cGUgV2ViRnJhbWVMb2FkZXJDbGllbnQ6Om9i amVjdENvbnRlbnRUeXBlKGNvbnN0IFVSTCYgdXJsLCBjb25zdCBTdHJpbmcmIG1pbWVUeXBlSW4s IGJvb2wgc2hvdWxkUHJlZmVyUGx1Z0luc0ZvckltYWdlcykKIHsKLSAgICByZXR1cm4gV2ViQ29y ZTo6RnJhbWVMb2FkZXI6OmRlZmF1bHRPYmplY3RDb250ZW50VHlwZSh1cmwsIG1pbWVUeXBlLCBz aG91bGRQcmVmZXJQbHVnSW5zRm9ySW1hZ2VzKTsKKyAgICBTdHJpbmcgbWltZVR5cGUgPSBtaW1l VHlwZUluOworCisgICAgaWYgKG1pbWVUeXBlLmlzRW1wdHkoKSkKKyAgICAgICAgbWltZVR5cGUg PSBtaW1lVHlwZUZyb21VUkwodXJsKTsKKworICAgIGlmIChtaW1lVHlwZS5pc0VtcHR5KCkpIHsK KyAgICAgICAgU3RyaW5nIGRlY29kZWRQYXRoID0gZGVjb2RlVVJMRXNjYXBlU2VxdWVuY2VzKHVy bC5wYXRoKCkpOworICAgICAgICBtaW1lVHlwZSA9IFBsdWdpbkRhdGFiYXNlOjppbnN0YWxsZWRQ bHVnaW5zKCktPk1JTUVUeXBlRm9yRXh0ZW5zaW9uKGRlY29kZWRQYXRoLnN1YnN0cmluZyhkZWNv ZGVkUGF0aC5yZXZlcnNlRmluZCgnLicpICsgMSkpOworICAgIH0KKworICAgIGlmIChtaW1lVHlw ZS5pc0VtcHR5KCkpCisgICAgICAgIHJldHVybiBPYmplY3RDb250ZW50RnJhbWU7IC8vIEdvIGFo ZWFkIGFuZCBob3BlIHRoYXQgd2UgY2FuIGRpc3BsYXkgdGhlIGNvbnRlbnQuCisKKyAgICBib29s IHBsdWdJblN1cHBvcnRzTUlNRVR5cGUgPSBQbHVnaW5EYXRhYmFzZTo6aW5zdGFsbGVkUGx1Z2lu cygpLT5pc01JTUVUeXBlUmVnaXN0ZXJlZChtaW1lVHlwZSk7CisKKyAgICBpZiAoTUlNRVR5cGVS ZWdpc3RyeTo6aXNTdXBwb3J0ZWRJbWFnZU1JTUVUeXBlKG1pbWVUeXBlKSkKKyAgICAgICAgcmV0 dXJuIHNob3VsZFByZWZlclBsdWdJbnNGb3JJbWFnZXMgJiYgcGx1Z0luU3VwcG9ydHNNSU1FVHlw ZSA/IFdlYkNvcmU6Ok9iamVjdENvbnRlbnROZXRzY2FwZVBsdWdpbiA6IFdlYkNvcmU6Ok9iamVj dENvbnRlbnRJbWFnZTsKKworICAgIGlmIChwbHVnSW5TdXBwb3J0c01JTUVUeXBlKQorICAgICAg ICByZXR1cm4gV2ViQ29yZTo6T2JqZWN0Q29udGVudE5ldHNjYXBlUGx1Z2luOworCisgICAgaWYg KE1JTUVUeXBlUmVnaXN0cnk6OmlzU3VwcG9ydGVkTm9uSW1hZ2VNSU1FVHlwZShtaW1lVHlwZSkp CisgICAgICAgIHJldHVybiBXZWJDb3JlOjpPYmplY3RDb250ZW50RnJhbWU7CisKKyAgICByZXR1 cm4gV2ViQ29yZTo6T2JqZWN0Q29udGVudE5vbmU7CiB9CiAKIHZvaWQgV2ViRnJhbWVMb2FkZXJD bGllbnQ6OmRpc3BhdGNoRGlkRmFpbFRvU3RhcnRQbHVnaW4oY29uc3QgUGx1Z2luVmlldyogcGx1 Z2luVmlldykgY29uc3QK