40307 2010-06-08 10:25:28 -0700 [GTK] DragDataGtk should use DataObjectGtk as the platformDragData 2010-06-29 08:38:29 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 30623 39843 1 mrobinson webkit-unassigned oldest_to_newest 235318 0 mrobinson 2010-06-08 10:25:28 -0700 DataObjectGtk contains the current state of a drop, so it should be used as the platformDragData in DataObjectGtk. 235372 1 58161 mrobinson 2010-06-08 11:06:45 -0700 Created attachment 58161 Patch 237417 2 58161 eric 2010-06-12 19:06:04 -0700 Comment on attachment 58161 Patch WebCore/platform/DragData.h:  + typedef void* DragDataRef; Can't this just be class DataObjectGtk; instead of having to include the header? WebCore/platform/gtk/DragDataGtk.cpp:93 + RefPtr<DocumentFragment> fragment(createFragmentFromMarkup(document, m_platformDragData->markup(), "")); Why store this in a ref ptr at all? 238172 3 58735 mrobinson 2010-06-14 17:49:43 -0700 Created attachment 58735 Patch with Eric's suggestions 238173 4 mrobinson 2010-06-14 17:50:28 -0700 (In reply to comment #2) Thank you for your review. I've incorporated both of your suggestions in a new patch. 244227 5 58735 xan.lopez 2010-06-29 05:21:55 -0700 Comment on attachment 58735 Patch with Eric's suggestions Correctomundo. 244314 6 58735 mrobinson 2010-06-29 08:38:24 -0700 Comment on attachment 58735 Patch with Eric's suggestions Clearing flags on attachment: 58735 Committed r62124: <http://trac.webkit.org/changeset/62124> 244315 7 mrobinson 2010-06-29 08:38:29 -0700 All reviewed patches have been landed. Closing bug. 58161 2010-06-08 11:06:45 -0700 2010-06-14 17:49:41 -0700 Patch bug-40307-20100608110644.patch text/plain 4333 mrobinson ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YmU2MTBlZTNjYzdhZTE4YjZiZDVmZmUxNzk3Y2MwMDE3NTg1MGI0OC4uYzI3ODIyZDE4YjE4MTky NGUxYmJhMDU0YjA2NjY0YTVlM2IxZmYzNiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNSBAQAorMjAxMC0wNi0wOCAgTWFy dGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0dUS10gRHJhZ0RhdGFHdGsgc2hvdWxkIHVz ZSBEYXRhT2JqZWN0R3RrIGFzIHRoZSBwbGF0Zm9ybURyYWdEYXRhCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MDMwNworCisgICAgICAgIFVzZSBEYXRh T2JqZWN0R3RrIGFzIHRoZSBwbGF0Zm9ybURyYWdEYXRhIGZvciBEcmFnRGF0YUd0ay4gRGF0YU9i amVjdEd0aworICAgICAgICBjb250YWlucyBhbGwgdGhlIGluZm9ybWF0aW9uIG5lY2Vzc2FyeSB0 byBrZWVwIHRyYWNrIG9mIGRyb3BzIGluIHByb2dyZXNzLgorCisgICAgICAgICogcGxhdGZvcm0v RHJhZ0RhdGEuaDogVXNlIGEgRGF0YU9iamVjdEd0ayogYXMgdGhlIHBsYXRmb3JtIGRyYWcgZGF0 YS4KKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvRHJhZ0RhdGFHdGsuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6RHJhZ0RhdGE6OmNvbnRhaW5zRmlsZXMpOiBSZXRyaWV2ZSBpbmZvcm1hdGlvbiB2aWEg cGxhdGZvcm1EcmFnRGF0YS4KKyAgICAgICAgKFdlYkNvcmU6OkRyYWdEYXRhOjphc0ZpbGVuYW1l cyk6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6RHJhZ0RhdGE6OmNvbnRhaW5zUGxhaW5UZXh0 KTogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpEcmFnRGF0YTo6YXNQbGFpblRleHQpOiBEaXR0 by4KKyAgICAgICAgKFdlYkNvcmU6OkRyYWdEYXRhOjpjcmVhdGVDbGlwYm9hcmQpOiBDcmVhdGUg dGhlIENsaXBib2FyZCB3aXRoIHRoZSBwbGF0Zm9ybURyYWdEYXRhLgorICAgICAgICAoV2ViQ29y ZTo6RHJhZ0RhdGE6OmNvbnRhaW5zQ29tcGF0aWJsZUNvbnRlbnQpOiBSZXRyaWV2ZSBpbmZvcm1h dGlvbiB2aWEgcGxhdGZvcm1EcmFnRGF0YS4KKyAgICAgICAgKFdlYkNvcmU6OkRyYWdEYXRhOjpj b250YWluc1VSTCk6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6RHJhZ0RhdGE6OmFzVVJMKTog RGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpEcmFnRGF0YTo6YXNGcmFnbWVudCk6IERpdHRvLgor CiAyMDEwLTA2LTA4ICBBbmRyYXMgQmVjc2kgIDxhYmVjc2lAd2Via2l0Lm9yZz4KIAogICAgICAg ICBVbnJldmlld2VkIGJ1aWxkIGZpeCBhZnRlciByNjA3ODUuCmRpZmYgLS1naXQgYS9XZWJDb3Jl L3BsYXRmb3JtL0RyYWdEYXRhLmggYi9XZWJDb3JlL3BsYXRmb3JtL0RyYWdEYXRhLmgKaW5kZXgg MDA3ZjdkNzE3NTU3ZTIzNGZlYjQ1ZDdhYjg2MDNiMGVmYjJhYmE4ZS4uYzNhZWU0ZWMyNDhlMjc4 ZjNkYzI2MDEyZjFkYTc4NzNiMjA1ZmJmZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9E cmFnRGF0YS5oCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vRHJhZ0RhdGEuaApAQCAtNTIsOCArNTIs OCBAQCB0eXBlZGVmIHN0cnVjdCBJRGF0YU9iamVjdCogRHJhZ0RhdGFSZWY7CiAjZWxpZiBQTEFU Rk9STShXWCkKIHR5cGVkZWYgY2xhc3Mgd3hEYXRhT2JqZWN0KiBEcmFnRGF0YVJlZjsKICNlbGlm IFBMQVRGT1JNKEdUSykKLS8vIEZJWE1FOiB0aGlzIHNob3VsZCBwcm9iYWJseSBiZSBzb21ldGhp bmcgZ2RrLXNwZWNpZmljCi10eXBlZGVmIHZvaWQqIERyYWdEYXRhUmVmOworI2luY2x1ZGUgIkRh dGFPYmplY3RHdGsuaCIKK3R5cGVkZWYgV2ViQ29yZTo6RGF0YU9iamVjdEd0ayogRHJhZ0RhdGFS ZWY7CiAjZWxpZiBQTEFURk9STShDSFJPTUlVTSkKICNpbmNsdWRlICJEcmFnRGF0YVJlZi5oIgog I2VsaWYgUExBVEZPUk0oSEFJS1UpCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9E cmFnRGF0YUd0ay5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2d0ay9EcmFnRGF0YUd0ay5jcHAKaW5k ZXggNjliMzE2MTQzMTgwNzE0YjRhYmM3M2QyZTE1OGRhMTVlYjgzNWE2YS4uOGViOWZhYTY3ZDVj ZWRkYjE3ZTZiYzg1OGVjMjcyMWQwMTNhNzlmZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9y bS9ndGsvRHJhZ0RhdGFHdGsuY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0RyYWdEYXRh R3RrLmNwcApAQCAtMTgsOCArMTgsMTAgQEAKICNpbmNsdWRlICJEcmFnRGF0YS5oIgogCiAjaW5j bHVkZSAiQ2xpcGJvYXJkLmgiCisjaW5jbHVkZSAiQ2xpcGJvYXJkR3RrLmgiCiAjaW5jbHVkZSAi RG9jdW1lbnQuaCIKICNpbmNsdWRlICJEb2N1bWVudEZyYWdtZW50LmgiCisjaW5jbHVkZSAibWFy a3VwLmgiCiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIApAQCAtMzUsMjEgKzM3LDI0IEBAIGJvb2wg RHJhZ0RhdGE6OmNvbnRhaW5zQ29sb3IoKSBjb25zdAogCiBib29sIERyYWdEYXRhOjpjb250YWlu c0ZpbGVzKCkgY29uc3QKIHsKLSAgICByZXR1cm4gZmFsc2U7CisgICAgcmV0dXJuICFtX3BsYXRm b3JtRHJhZ0RhdGEtPmZpbGVzKCkuaXNFbXB0eSgpOwogfQogCiB2b2lkIERyYWdEYXRhOjphc0Zp bGVuYW1lcyhWZWN0b3I8U3RyaW5nPiYgcmVzdWx0KSBjb25zdAogeworICAgIFZlY3RvcjxTdHJp bmc+IGZpbGVzKG1fcGxhdGZvcm1EcmFnRGF0YS0+ZmlsZXMoKSk7CisgICAgZm9yIChzaXplX3Qg aSA9IDA7IGkgPCBmaWxlcy5zaXplKCk7IGkrKykKKyAgICAgICAgcmVzdWx0LmFwcGVuZChmaWxl c1tpXSk7CiB9CiAKIGJvb2wgRHJhZ0RhdGE6OmNvbnRhaW5zUGxhaW5UZXh0KCkgY29uc3QKIHsK LSAgICByZXR1cm4gZmFsc2U7CisgICAgcmV0dXJuIG1fcGxhdGZvcm1EcmFnRGF0YS0+aGFzVGV4 dCgpOwogfQogCiBTdHJpbmcgRHJhZ0RhdGE6OmFzUGxhaW5UZXh0KCkgY29uc3QKIHsKLSAgICBy ZXR1cm4gU3RyaW5nKCk7CisgICAgcmV0dXJuIG1fcGxhdGZvcm1EcmFnRGF0YS0+dGV4dCgpOwog fQogCiBDb2xvciBEcmFnRGF0YTo6YXNDb2xvcigpIGNvbnN0CkBAIC01NywzMCArNjIsMzYgQEAg Q29sb3IgRHJhZ0RhdGE6OmFzQ29sb3IoKSBjb25zdAogICAgIHJldHVybiBDb2xvcigpOwogfQog Ci1QYXNzUmVmUHRyPENsaXBib2FyZD4gRHJhZ0RhdGE6OmNyZWF0ZUNsaXBib2FyZChDbGlwYm9h cmRBY2Nlc3NQb2xpY3kpIGNvbnN0CitQYXNzUmVmUHRyPENsaXBib2FyZD4gRHJhZ0RhdGE6OmNy ZWF0ZUNsaXBib2FyZChDbGlwYm9hcmRBY2Nlc3NQb2xpY3kgcG9saWN5KSBjb25zdAogewotICAg IHJldHVybiAwOworICAgIHJldHVybiBDbGlwYm9hcmRHdGs6OmNyZWF0ZShwb2xpY3ksIG1fcGxh dGZvcm1EcmFnRGF0YSwgdHJ1ZSk7CiB9CiAKIGJvb2wgRHJhZ0RhdGE6OmNvbnRhaW5zQ29tcGF0 aWJsZUNvbnRlbnQoKSBjb25zdAogewotICAgIHJldHVybiBmYWxzZTsKKyAgICByZXR1cm4gY29u dGFpbnNQbGFpblRleHQoKSB8fCBjb250YWluc1VSTCgpIHx8IG1fcGxhdGZvcm1EcmFnRGF0YS0+ aGFzTWFya3VwKCkgfHwgY29udGFpbnNDb2xvcigpIHx8IGNvbnRhaW5zRmlsZXMoKTsKIH0KIAog Ym9vbCBEcmFnRGF0YTo6Y29udGFpbnNVUkwoKSBjb25zdAogewotICAgIHJldHVybiBmYWxzZTsK KyAgICByZXR1cm4gbV9wbGF0Zm9ybURyYWdEYXRhLT5oYXNVUkwoKTsKIH0KIAogU3RyaW5nIERy YWdEYXRhOjphc1VSTChTdHJpbmcqIHRpdGxlKSBjb25zdAogewotICAgIHJldHVybiBTdHJpbmco KTsKKyAgICBTdHJpbmcgdXJsKG1fcGxhdGZvcm1EcmFnRGF0YS0+dXJsKCkpOworICAgIGlmICh0 aXRsZSkKKyAgICAgICAgKnRpdGxlID0gbV9wbGF0Zm9ybURyYWdEYXRhLT51cmxMYWJlbCgpOwor ICAgIHJldHVybiB1cmw7CiB9CiAKLQotUGFzc1JlZlB0cjxEb2N1bWVudEZyYWdtZW50PiBEcmFn RGF0YTo6YXNGcmFnbWVudChEb2N1bWVudCopIGNvbnN0CitQYXNzUmVmUHRyPERvY3VtZW50RnJh Z21lbnQ+IERyYWdEYXRhOjphc0ZyYWdtZW50KERvY3VtZW50KiBkb2N1bWVudCkgY29uc3QKIHsK LSAgICByZXR1cm4gMDsKKyAgICBpZiAoIW1fcGxhdGZvcm1EcmFnRGF0YS0+aGFzTWFya3VwKCkp CisgICAgICAgIHJldHVybiAwOworCisgICAgUmVmUHRyPERvY3VtZW50RnJhZ21lbnQ+IGZyYWdt ZW50KGNyZWF0ZUZyYWdtZW50RnJvbU1hcmt1cChkb2N1bWVudCwgbV9wbGF0Zm9ybURyYWdEYXRh LT5tYXJrdXAoKSwgIiIpKTsKKyAgICByZXR1cm4gZnJhZ21lbnQucmVsZWFzZSgpOwogfQogCiB9 Cg== 58735 2010-06-14 17:49:43 -0700 2010-06-29 08:38:24 -0700 Patch with Eric's suggestions bug-40307-20100614174944.patch text/plain 4358 mrobinson ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YzRkMTE3ZTcxYzFlMDdiNDk1MjRiYWU4MjUwYTUxNjY1YzUyOGNhZC4uNTNjZjY4ZWY3ZGFkNmRm M2VlZmRmMzhjZWI0MGZiN2Y4YWE1ZjlhOCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNSBAQAorMjAxMC0wNi0xNCAgTWFy dGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0dUS10gRHJhZ0RhdGFHdGsgc2hvdWxkIHVz ZSBEYXRhT2JqZWN0R3RrIGFzIHRoZSBwbGF0Zm9ybURyYWdEYXRhCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MDMwNworCisgICAgICAgIFVzZSBEYXRh T2JqZWN0R3RrIGFzIHRoZSBwbGF0Zm9ybURyYWdEYXRhIGZvciBEcmFnRGF0YUd0ay4gRGF0YU9i amVjdEd0aworICAgICAgICBjb250YWlucyBhbGwgdGhlIGluZm9ybWF0aW9uIG5lY2Vzc2FyeSB0 byBrZWVwIHRyYWNrIG9mIGRyb3BzIGluIHByb2dyZXNzLgorCisgICAgICAgICogcGxhdGZvcm0v RHJhZ0RhdGEuaDogVXNlIGEgRGF0YU9iamVjdEd0ayogYXMgdGhlIHBsYXRmb3JtIGRyYWcgZGF0 YS4KKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvRHJhZ0RhdGFHdGsuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6RHJhZ0RhdGE6OmNvbnRhaW5zRmlsZXMpOiBSZXRyaWV2ZSBpbmZvcm1hdGlvbiB2aWEg cGxhdGZvcm1EcmFnRGF0YS4KKyAgICAgICAgKFdlYkNvcmU6OkRyYWdEYXRhOjphc0ZpbGVuYW1l cyk6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6RHJhZ0RhdGE6OmNvbnRhaW5zUGxhaW5UZXh0 KTogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpEcmFnRGF0YTo6YXNQbGFpblRleHQpOiBEaXR0 by4KKyAgICAgICAgKFdlYkNvcmU6OkRyYWdEYXRhOjpjcmVhdGVDbGlwYm9hcmQpOiBDcmVhdGUg dGhlIENsaXBib2FyZCB3aXRoIHRoZSBwbGF0Zm9ybURyYWdEYXRhLgorICAgICAgICAoV2ViQ29y ZTo6RHJhZ0RhdGE6OmNvbnRhaW5zQ29tcGF0aWJsZUNvbnRlbnQpOiBSZXRyaWV2ZSBpbmZvcm1h dGlvbiB2aWEgcGxhdGZvcm1EcmFnRGF0YS4KKyAgICAgICAgKFdlYkNvcmU6OkRyYWdEYXRhOjpj b250YWluc1VSTCk6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6RHJhZ0RhdGE6OmFzVVJMKTog RGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpEcmFnRGF0YTo6YXNGcmFnbWVudCk6IERpdHRvLgor CiAyMDEwLTA2LTE0ICBFcmljIFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KIAogICAgICAgICBS ZXZpZXdlZCBieSBBZGFtIEJhcnRoLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9EcmFn RGF0YS5oIGIvV2ViQ29yZS9wbGF0Zm9ybS9EcmFnRGF0YS5oCmluZGV4IDdlMmNjNGQwODhkOGZj ZmRjY2ZlOGVkMDYyNmQwN2MxMjU4MWM5N2EuLmQ2Njg5NjMwOTY5MzRkYWZkZjhlMTZkMWMxNmJk MTc3ZDY5MjkzYWUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vRHJhZ0RhdGEuaAorKysg Yi9XZWJDb3JlL3BsYXRmb3JtL0RyYWdEYXRhLmgKQEAgLTUyLDggKzUyLDEwIEBAIHR5cGVkZWYg c3RydWN0IElEYXRhT2JqZWN0KiBEcmFnRGF0YVJlZjsKICNlbGlmIFBMQVRGT1JNKFdYKQogdHlw ZWRlZiBjbGFzcyB3eERhdGFPYmplY3QqIERyYWdEYXRhUmVmOwogI2VsaWYgUExBVEZPUk0oR1RL KQotLy8gRklYTUU6IHRoaXMgc2hvdWxkIHByb2JhYmx5IGJlIHNvbWV0aGluZyBnZGstc3BlY2lm aWMKLXR5cGVkZWYgdm9pZCogRHJhZ0RhdGFSZWY7CituYW1lc3BhY2UgV2ViQ29yZSB7CitjbGFz cyBEYXRhT2JqZWN0R3RrOworfQordHlwZWRlZiBXZWJDb3JlOjpEYXRhT2JqZWN0R3RrKiBEcmFn RGF0YVJlZjsKICNlbGlmIFBMQVRGT1JNKENIUk9NSVVNKQogI2luY2x1ZGUgIkRyYWdEYXRhUmVm LmgiCiAjZWxpZiBQTEFURk9STShIQUlLVSkKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0v Z3RrL0RyYWdEYXRhR3RrLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0RyYWdEYXRhR3RrLmNw cAppbmRleCA0ZWQzYmMxZmJiY2MxNGJkMzRkZGVlZTc3ZGIxMGE3YzgwNTQwOWQ4Li42OGY3ZmZj ZGI4MmMzZTE1ZmRhZWVmMDc3OGFiZWIyZDQ5NzVlYzRhIDEwMDY0NAotLS0gYS9XZWJDb3JlL3Bs YXRmb3JtL2d0ay9EcmFnRGF0YUd0ay5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvRHJh Z0RhdGFHdGsuY3BwCkBAIC0xOCw4ICsxOCwxMCBAQAogI2luY2x1ZGUgIkRyYWdEYXRhLmgiCiAK ICNpbmNsdWRlICJDbGlwYm9hcmQuaCIKKyNpbmNsdWRlICJDbGlwYm9hcmRHdGsuaCIKICNpbmNs dWRlICJEb2N1bWVudC5oIgogI2luY2x1ZGUgIkRvY3VtZW50RnJhZ21lbnQuaCIKKyNpbmNsdWRl ICJtYXJrdXAuaCIKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCkBAIC0zNSwyMSArMzcsMjQgQEAg Ym9vbCBEcmFnRGF0YTo6Y29udGFpbnNDb2xvcigpIGNvbnN0CiAKIGJvb2wgRHJhZ0RhdGE6OmNv bnRhaW5zRmlsZXMoKSBjb25zdAogewotICAgIHJldHVybiBmYWxzZTsKKyAgICByZXR1cm4gIW1f cGxhdGZvcm1EcmFnRGF0YS0+ZmlsZXMoKS5pc0VtcHR5KCk7CiB9CiAKIHZvaWQgRHJhZ0RhdGE6 OmFzRmlsZW5hbWVzKFZlY3RvcjxTdHJpbmc+JiByZXN1bHQpIGNvbnN0CiB7CisgICAgVmVjdG9y PFN0cmluZz4gZmlsZXMobV9wbGF0Zm9ybURyYWdEYXRhLT5maWxlcygpKTsKKyAgICBmb3IgKHNp emVfdCBpID0gMDsgaSA8IGZpbGVzLnNpemUoKTsgaSsrKQorICAgICAgICByZXN1bHQuYXBwZW5k KGZpbGVzW2ldKTsKIH0KIAogYm9vbCBEcmFnRGF0YTo6Y29udGFpbnNQbGFpblRleHQoKSBjb25z dAogewotICAgIHJldHVybiBmYWxzZTsKKyAgICByZXR1cm4gbV9wbGF0Zm9ybURyYWdEYXRhLT5o YXNUZXh0KCk7CiB9CiAKIFN0cmluZyBEcmFnRGF0YTo6YXNQbGFpblRleHQoKSBjb25zdAogewot ICAgIHJldHVybiBTdHJpbmcoKTsKKyAgICByZXR1cm4gbV9wbGF0Zm9ybURyYWdEYXRhLT50ZXh0 KCk7CiB9CiAKIENvbG9yIERyYWdEYXRhOjphc0NvbG9yKCkgY29uc3QKQEAgLTU3LDMwICs2Miwz NiBAQCBDb2xvciBEcmFnRGF0YTo6YXNDb2xvcigpIGNvbnN0CiAgICAgcmV0dXJuIENvbG9yKCk7 CiB9CiAKLVBhc3NSZWZQdHI8Q2xpcGJvYXJkPiBEcmFnRGF0YTo6Y3JlYXRlQ2xpcGJvYXJkKENs aXBib2FyZEFjY2Vzc1BvbGljeSkgY29uc3QKK1Bhc3NSZWZQdHI8Q2xpcGJvYXJkPiBEcmFnRGF0 YTo6Y3JlYXRlQ2xpcGJvYXJkKENsaXBib2FyZEFjY2Vzc1BvbGljeSBwb2xpY3kpIGNvbnN0CiB7 Ci0gICAgcmV0dXJuIDA7CisgICAgcmV0dXJuIENsaXBib2FyZEd0azo6Y3JlYXRlKHBvbGljeSwg bV9wbGF0Zm9ybURyYWdEYXRhLCB0cnVlKTsKIH0KIAogYm9vbCBEcmFnRGF0YTo6Y29udGFpbnND b21wYXRpYmxlQ29udGVudCgpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIGZhbHNlOworICAgIHJldHVy biBjb250YWluc1BsYWluVGV4dCgpIHx8IGNvbnRhaW5zVVJMKCkgfHwgbV9wbGF0Zm9ybURyYWdE YXRhLT5oYXNNYXJrdXAoKSB8fCBjb250YWluc0NvbG9yKCkgfHwgY29udGFpbnNGaWxlcygpOwog fQogCiBib29sIERyYWdEYXRhOjpjb250YWluc1VSTChGaWxlbmFtZUNvbnZlcnNpb25Qb2xpY3kg ZmlsZW5hbWVQb2xpY3kpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIGZhbHNlOworICAgIHJldHVybiBt X3BsYXRmb3JtRHJhZ0RhdGEtPmhhc1VSTCgpOwogfQogCiBTdHJpbmcgRHJhZ0RhdGE6OmFzVVJM KEZpbGVuYW1lQ29udmVyc2lvblBvbGljeSBmaWxlbmFtZVBvbGljeSwgU3RyaW5nKiB0aXRsZSkg Y29uc3QKIHsKLSAgICByZXR1cm4gU3RyaW5nKCk7CisgICAgU3RyaW5nIHVybChtX3BsYXRmb3Jt RHJhZ0RhdGEtPnVybCgpKTsKKyAgICBpZiAodGl0bGUpCisgICAgICAgICp0aXRsZSA9IG1fcGxh dGZvcm1EcmFnRGF0YS0+dXJsTGFiZWwoKTsKKyAgICByZXR1cm4gdXJsOwogfQogCiAKLVBhc3NS ZWZQdHI8RG9jdW1lbnRGcmFnbWVudD4gRHJhZ0RhdGE6OmFzRnJhZ21lbnQoRG9jdW1lbnQqKSBj b25zdAorUGFzc1JlZlB0cjxEb2N1bWVudEZyYWdtZW50PiBEcmFnRGF0YTo6YXNGcmFnbWVudChE b2N1bWVudCogZG9jdW1lbnQpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIDA7CisgICAgaWYgKCFtX3Bs YXRmb3JtRHJhZ0RhdGEtPmhhc01hcmt1cCgpKQorICAgICAgICByZXR1cm4gMDsKKworICAgIHJl dHVybiBjcmVhdGVGcmFnbWVudEZyb21NYXJrdXAoZG9jdW1lbnQsIG1fcGxhdGZvcm1EcmFnRGF0 YS0+bWFya3VwKCksICIiKTsKIH0KIAogfQo=