198242 2019-05-24 21:44:45 -0700 [iOS] Respect -[NSItemProvider preferredPresentationSize] when dropping images 2019-05-25 11:59:29 -0700 1 1 1 Unclassified WebKit HTML Editing WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 198243 1 wenson_hsieh wenson_hsieh bdakin commit-queue thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1539161 0 wenson_hsieh 2019-05-24 21:44:45 -0700 We're going to need this in order to fix <rdar://problem/35205373>, in Mail compose. 1539162 1 370622 wenson_hsieh 2019-05-24 22:22:16 -0700 Created attachment 370622 Patch 1539218 2 370622 wenson_hsieh 2019-05-25 11:32:12 -0700 Comment on attachment 370622 Patch Thanks for the review! 1539221 3 370622 commit-queue 2019-05-25 11:59:28 -0700 Comment on attachment 370622 Patch Clearing flags on attachment: 370622 Committed r245775: <https://trac.webkit.org/changeset/245775> 1539222 4 commit-queue 2019-05-25 11:59:29 -0700 All reviewed patches have been landed. Closing bug. 370622 2019-05-24 22:22:16 -0700 2019-05-25 11:59:28 -0700 Patch bug-198242-20190524222215.patch text/plain 14464 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ1NzUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTcyYjgxZjdlNmU3ZTE3 YzUyYzcxZThiYTljMzhmZTdkNzYzNjMwZS4uZWIyY2M0MjExOGQ5NmM5Y2I0YzRjOTJlNjk2MTI4 MGU5ZGU2N2UzNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ0IEBACisyMDE5LTA1LTI0ICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdIFJlc3Bl Y3QgLVtOU0l0ZW1Qcm92aWRlciBwcmVmZXJyZWRQcmVzZW50YXRpb25TaXplXSB3aGVuIGRyb3Bw aW5nIGltYWdlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTk4MjQyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgVGVhY2ggdGhlIHdlYiBjb250ZW50IHJlYWRlciB0byByZXNwZWN0IHRoZSAtcHJlZmVycmVk UHJlc2VudGF0aW9uU2l6ZSB3aGVuIGNyZWF0aW5nIGF0dGFjaG1lbnQtYmFja2VkIGltYWdlCisg ICAgICAgIGVsZW1lbnRzLiBTZWUgYmVsb3cgZm9yIG1vcmUgZGV0YWlscy4KKworICAgICAgICBU ZXN0OiBXS0F0dGFjaG1lbnRUZXN0c0lPUy5JbnNlcnREcm9wcGVkSW1hZ2VXaXRoUHJlZmVycmVk UHJlc2VudGF0aW9uU2l6ZQorCisgICAgICAgICogZWRpdGluZy9XZWJDb250ZW50UmVhZGVyLmg6 CisgICAgICAgICogZWRpdGluZy9jb2NvYS9XZWJDb250ZW50UmVhZGVyQ29jb2EubW06CisgICAg ICAgIChXZWJDb3JlOjphdHRhY2htZW50Rm9yRmlsZVBhdGgpOgorICAgICAgICAoV2ViQ29yZTo6 YXR0YWNobWVudEZvckRhdGEpOgorCisgICAgICAgIFdoZW4gY3JlYXRpbmcgYXR0YWNobWVudC1i YWNrZWQgaW1hZ2UgZWxlbWVudHMsIGFkZGl0aW9uYWxseSBzZXQgd2lkdGggYW5kIGhlaWdodCBh dHRyaWJ1dGVzIGZyb20gdGhlIHByZWZlcnJlZAorICAgICAgICBwcmVzZW50YXRpb24gc2l6ZSwg aWYgc3BlY2lmaWVkLgorCisgICAgICAgIChXZWJDb3JlOjpXZWJDb250ZW50UmVhZGVyOjpyZWFk RmlsZVBhdGgpOgorCisgICAgICAgIEFkZCBhIHZlcnNpb24gb2YgcmVhZEZpbGVQYXRoIHRoYXQg dGFrZXMgYSBzaW5nbGUgZmlsZSBwYXRoLCBhbmQgYW4gb3B0aW9uYWwgcHJlZmVycmVkIHByZXNl bnRhdGlvbiBzaXplLgorCisgICAgICAgIChXZWJDb3JlOjpXZWJDb250ZW50UmVhZGVyOjpyZWFk RmlsZVBhdGhzKToKKworICAgICAgICBSZWltcGxlbWVudCByZWFkRmlsZVBhdGhzIGluIHRlcm1z IG9mIHJlYWRGaWxlUGF0aC4KKworICAgICAgICAoV2ViQ29yZTo6V2ViQ29udGVudFJlYWRlcjo6 cmVhZERhdGFCdWZmZXIpOgorCisgICAgICAgIEFkZCBtb3JlIHBsdW1iaW5nIGZvciBwcmVmZXJy ZWRQcmVzZW50YXRpb25TaXplLgorCisgICAgICAgICogcGxhdGZvcm0vUGFzdGVib2FyZC5oOgor ICAgICAgICAoV2ViQ29yZTo6UGFzdGVib2FyZFdlYkNvbnRlbnRSZWFkZXI6OnJlYWRGaWxlUGF0 aCk6CisgICAgICAgIChXZWJDb3JlOjpQYXN0ZWJvYXJkV2ViQ29udGVudFJlYWRlcjo6cmVhZERh dGFCdWZmZXIpOgorICAgICAgICAqIHBsYXRmb3JtL2lvcy9QYXN0ZWJvYXJkSU9TLm1tOgorICAg ICAgICAoV2ViQ29yZTo6UGFzdGVib2FyZDo6cmVhZCk6CisgICAgICAgIChXZWJDb3JlOjpQYXN0 ZWJvYXJkOjpyZWFkUmVzcGVjdGluZ1VUSUZpZGVsaXRpZXMpOgorCisgICAgICAgIEZvcndhcmQg UGFzdGVib2FyZEl0ZW1JbmZvJ3MgcHJlZmVycmVkUHJlc2VudGF0aW9uU2l6ZSB0byB0aGUgd2Vi IGNvbnRlbnQgcmVhZGVyLgorCiAyMDE5LTA1LTI0ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFw cGxlLmNvbT4KIAogICAgICAgICBNYWtlIHN1cmUgY29tcGxldGlvbiBoYW5kbGVyIGlzIGFsd2F5 cyBjYWxsZWQgaW4gU1dTZXJ2ZXI6OnN0YXJ0U3VzcGVuc2lvbgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvZWRpdGluZy9XZWJDb250ZW50UmVhZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9lZGl0 aW5nL1dlYkNvbnRlbnRSZWFkZXIuaAppbmRleCAzMGMwOGNlNDNjMWFiYzAyMjQ3N2IyYWU5YjMz NzBkNDEyNTNmNjRhLi45Yzk2NDEwMjlkNjEyMzQ0NWNmZTU4ZTZlNTcwZTI4MzcwOTYyNTAxIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1dlYkNvbnRlbnRSZWFkZXIuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1dlYkNvbnRlbnRSZWFkZXIuaApAQCAtNzEsMTMgKzcx LDE0IEBAIHB1YmxpYzoKIHByaXZhdGU6CiAjaWYgUExBVEZPUk0oQ09DT0EpCiAgICAgYm9vbCBy ZWFkV2ViQXJjaGl2ZShTaGFyZWRCdWZmZXImKSBvdmVycmlkZTsKKyAgICBib29sIHJlYWRGaWxl UGF0aChjb25zdCBTdHJpbmcmLCBPcHRpb25hbDxGbG9hdFNpemU+IHByZWZlcnJlZFByZXNlbnRh dGlvblNpemUgPSB7IH0pIG92ZXJyaWRlOwogICAgIGJvb2wgcmVhZEZpbGVQYXRocyhjb25zdCBW ZWN0b3I8U3RyaW5nPiYpIG92ZXJyaWRlOwogICAgIGJvb2wgcmVhZEhUTUwoY29uc3QgU3RyaW5n Jikgb3ZlcnJpZGU7CiAgICAgYm9vbCByZWFkUlRGRChTaGFyZWRCdWZmZXImKSBvdmVycmlkZTsK ICAgICBib29sIHJlYWRSVEYoU2hhcmVkQnVmZmVyJikgb3ZlcnJpZGU7CiAgICAgYm9vbCByZWFk SW1hZ2UoUmVmPFNoYXJlZEJ1ZmZlcj4mJiwgY29uc3QgU3RyaW5nJiB0eXBlLCBPcHRpb25hbDxG bG9hdFNpemU+IHByZWZlcnJlZFByZXNlbnRhdGlvblNpemUgPSB7IH0pIG92ZXJyaWRlOwogICAg IGJvb2wgcmVhZFVSTChjb25zdCBVUkwmLCBjb25zdCBTdHJpbmcmIHRpdGxlKSBvdmVycmlkZTsK LSAgICBib29sIHJlYWREYXRhQnVmZmVyKFNoYXJlZEJ1ZmZlciYsIGNvbnN0IFN0cmluZyYgdHlw ZSwgY29uc3QgU3RyaW5nJiBuYW1lKSBvdmVycmlkZTsKKyAgICBib29sIHJlYWREYXRhQnVmZmVy KFNoYXJlZEJ1ZmZlciYsIGNvbnN0IFN0cmluZyYgdHlwZSwgY29uc3QgU3RyaW5nJiBuYW1lLCBP cHRpb25hbDxGbG9hdFNpemU+IHByZWZlcnJlZFByZXNlbnRhdGlvblNpemUgPSB7IH0pIG92ZXJy aWRlOwogI2VuZGlmCiAgICAgYm9vbCByZWFkUGxhaW5UZXh0KGNvbnN0IFN0cmluZyYpIG92ZXJy aWRlOwogfTsKQEAgLTk0LDEzICs5NSwxNCBAQCBwdWJsaWM6CiBwcml2YXRlOgogI2lmIFBMQVRG T1JNKENPQ09BKQogICAgIGJvb2wgcmVhZFdlYkFyY2hpdmUoU2hhcmVkQnVmZmVyJikgb3ZlcnJp ZGU7CisgICAgYm9vbCByZWFkRmlsZVBhdGgoY29uc3QgU3RyaW5nJiwgT3B0aW9uYWw8RmxvYXRT aXplPiA9IHsgfSkgb3ZlcnJpZGUgeyByZXR1cm4gZmFsc2U7IH0KICAgICBib29sIHJlYWRGaWxl UGF0aHMoY29uc3QgVmVjdG9yPFN0cmluZz4mKSBvdmVycmlkZSB7IHJldHVybiBmYWxzZTsgfQog ICAgIGJvb2wgcmVhZEhUTUwoY29uc3QgU3RyaW5nJikgb3ZlcnJpZGU7CiAgICAgYm9vbCByZWFk UlRGRChTaGFyZWRCdWZmZXImKSBvdmVycmlkZTsKICAgICBib29sIHJlYWRSVEYoU2hhcmVkQnVm ZmVyJikgb3ZlcnJpZGU7CiAgICAgYm9vbCByZWFkSW1hZ2UoUmVmPFNoYXJlZEJ1ZmZlcj4mJiwg Y29uc3QgU3RyaW5nJiwgT3B0aW9uYWw8RmxvYXRTaXplPiA9IHsgfSkgb3ZlcnJpZGUgeyByZXR1 cm4gZmFsc2U7IH0KICAgICBib29sIHJlYWRVUkwoY29uc3QgVVJMJiwgY29uc3QgU3RyaW5nJikg b3ZlcnJpZGUgeyByZXR1cm4gZmFsc2U7IH0KLSAgICBib29sIHJlYWREYXRhQnVmZmVyKFNoYXJl ZEJ1ZmZlciYsIGNvbnN0IFN0cmluZyYsIGNvbnN0IFN0cmluZyYpIG92ZXJyaWRlIHsgcmV0dXJu IGZhbHNlOyB9CisgICAgYm9vbCByZWFkRGF0YUJ1ZmZlcihTaGFyZWRCdWZmZXImLCBjb25zdCBT dHJpbmcmLCBjb25zdCBTdHJpbmcmLCBPcHRpb25hbDxGbG9hdFNpemU+ID0geyB9KSBvdmVycmlk ZSB7IHJldHVybiBmYWxzZTsgfQogI2VuZGlmCiAgICAgYm9vbCByZWFkUGxhaW5UZXh0KGNvbnN0 IFN0cmluZyYpIG92ZXJyaWRlIHsgcmV0dXJuIGZhbHNlOyB9CiB9OwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvZWRpdGluZy9jb2NvYS9XZWJDb250ZW50UmVhZGVyQ29jb2EubW0gYi9Tb3Vy Y2UvV2ViQ29yZS9lZGl0aW5nL2NvY29hL1dlYkNvbnRlbnRSZWFkZXJDb2NvYS5tbQppbmRleCBh NzA1ODllOTlmM2Y3NDEwODBiNjI1NTQxN2VlOWMyYWUyOGJlZmFhLi41MzJhODRhOWM0NWUxZjI0 NDYwZGEyNTc1ODkzOTgxNWIwOGE4MjUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9lZGl0 aW5nL2NvY29hL1dlYkNvbnRlbnRSZWFkZXJDb2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9l ZGl0aW5nL2NvY29hL1dlYkNvbnRlbnRSZWFkZXJDb2NvYS5tbQpAQCAtNjk1LDcgKzY5NSw3IEBA IGJvb2wgV2ViQ29udGVudFJlYWRlcjo6cmVhZEltYWdlKFJlZjxTaGFyZWRCdWZmZXI+JiYgYnVm ZmVyLCBjb25zdCBTdHJpbmcmIHR5cGUsCiAKICNpZiBFTkFCTEUoQVRUQUNITUVOVF9FTEVNRU5U KQogCi1zdGF0aWMgUmVmPEhUTUxFbGVtZW50PiBhdHRhY2htZW50Rm9yRmlsZVBhdGgoRnJhbWUm IGZyYW1lLCBjb25zdCBTdHJpbmcmIHBhdGgpCitzdGF0aWMgUmVmPEhUTUxFbGVtZW50PiBhdHRh Y2htZW50Rm9yRmlsZVBhdGgoRnJhbWUmIGZyYW1lLCBjb25zdCBTdHJpbmcmIHBhdGgsIE9wdGlv bmFsPEZsb2F0U2l6ZT4gcHJlZmVycmVkU2l6ZSkKIHsKICAgICBhdXRvIGRvY3VtZW50ID0gbWFr ZVJlZigqZnJhbWUuZG9jdW1lbnQoKSk7CiAgICAgYXV0byBhdHRhY2htZW50ID0gSFRNTEF0dGFj aG1lbnRFbGVtZW50OjpjcmVhdGUoSFRNTE5hbWVzOjphdHRhY2htZW50VGFnLCBkb2N1bWVudCk7 CkBAIC03MjMsNiArNzIzLDEwIEBAIHN0YXRpYyBSZWY8SFRNTEVsZW1lbnQ+IGF0dGFjaG1lbnRG b3JGaWxlUGF0aChGcmFtZSYgZnJhbWUsIGNvbnN0IFN0cmluZyYgcGF0aCkKICAgICAgICAgYXV0 byBpbWFnZSA9IEhUTUxJbWFnZUVsZW1lbnQ6OmNyZWF0ZShkb2N1bWVudCk7CiAgICAgICAgIGlt YWdlLT5zZXRBdHRyaWJ1dGVXaXRob3V0U3luY2hyb25pemF0aW9uKEhUTUxOYW1lczo6c3JjQXR0 ciwgRE9NVVJMOjpjcmVhdGVPYmplY3RVUkwoZG9jdW1lbnQsIEZpbGU6OmNyZWF0ZShwYXRoKSkp OwogICAgICAgICBpbWFnZS0+c2V0QXR0YWNobWVudEVsZW1lbnQoV1RGTW92ZShhdHRhY2htZW50 KSk7CisgICAgICAgIGlmIChwcmVmZXJyZWRTaXplKSB7CisgICAgICAgICAgICBpbWFnZS0+c2V0 QXR0cmlidXRlV2l0aG91dFN5bmNocm9uaXphdGlvbihIVE1MTmFtZXM6OndpZHRoQXR0ciwgQXRv bWljU3RyaW5nOjpudW1iZXIocHJlZmVycmVkU2l6ZS0+d2lkdGgoKSkpOworICAgICAgICAgICAg aW1hZ2UtPnNldEF0dHJpYnV0ZVdpdGhvdXRTeW5jaHJvbml6YXRpb24oSFRNTE5hbWVzOjpoZWln aHRBdHRyLCBBdG9taWNTdHJpbmc6Om51bWJlcihwcmVmZXJyZWRTaXplLT5oZWlnaHQoKSkpOwor ICAgICAgICB9CiAgICAgICAgIHJldHVybiBpbWFnZTsKICAgICB9CiAKQEAgLTczMCw3ICs3MzQs NyBAQCBzdGF0aWMgUmVmPEhUTUxFbGVtZW50PiBhdHRhY2htZW50Rm9yRmlsZVBhdGgoRnJhbWUm IGZyYW1lLCBjb25zdCBTdHJpbmcmIHBhdGgpCiAgICAgcmV0dXJuIGF0dGFjaG1lbnQ7CiB9CiAK LXN0YXRpYyBSZWY8SFRNTEVsZW1lbnQ+IGF0dGFjaG1lbnRGb3JEYXRhKEZyYW1lJiBmcmFtZSwg U2hhcmVkQnVmZmVyJiBidWZmZXIsIGNvbnN0IFN0cmluZyYgY29udGVudFR5cGUsIGNvbnN0IFN0 cmluZyYgbmFtZSkKK3N0YXRpYyBSZWY8SFRNTEVsZW1lbnQ+IGF0dGFjaG1lbnRGb3JEYXRhKEZy YW1lJiBmcmFtZSwgU2hhcmVkQnVmZmVyJiBidWZmZXIsIGNvbnN0IFN0cmluZyYgY29udGVudFR5 cGUsIGNvbnN0IFN0cmluZyYgbmFtZSwgT3B0aW9uYWw8RmxvYXRTaXplPiBwcmVmZXJyZWRTaXpl KQogewogICAgIGF1dG8gZG9jdW1lbnQgPSBtYWtlUmVmKCpmcmFtZS5kb2N1bWVudCgpKTsKICAg ICBhdXRvIGF0dGFjaG1lbnQgPSBIVE1MQXR0YWNobWVudEVsZW1lbnQ6OmNyZWF0ZShIVE1MTmFt ZXM6OmF0dGFjaG1lbnRUYWcsIGRvY3VtZW50KTsKQEAgLTc1Nyw2ICs3NjEsMTAgQEAgc3RhdGlj IFJlZjxIVE1MRWxlbWVudD4gYXR0YWNobWVudEZvckRhdGEoRnJhbWUmIGZyYW1lLCBTaGFyZWRC dWZmZXImIGJ1ZmZlciwgY28KICAgICAgICAgYXV0byBpbWFnZSA9IEhUTUxJbWFnZUVsZW1lbnQ6 OmNyZWF0ZShkb2N1bWVudCk7CiAgICAgICAgIGltYWdlLT5zZXRBdHRyaWJ1dGVXaXRob3V0U3lu Y2hyb25pemF0aW9uKEhUTUxOYW1lczo6c3JjQXR0ciwgRE9NVVJMOjpjcmVhdGVPYmplY3RVUkwo ZG9jdW1lbnQsIEZpbGU6OmNyZWF0ZShCbG9iOjpjcmVhdGUoYnVmZmVyLCBXVEZNb3ZlKHR5cGVG b3JBdHRhY2htZW50RWxlbWVudCkpLCBXVEZNb3ZlKGZpbGVOYW1lKSkpKTsKICAgICAgICAgaW1h Z2UtPnNldEF0dGFjaG1lbnRFbGVtZW50KFdURk1vdmUoYXR0YWNobWVudCkpOworICAgICAgICBp ZiAocHJlZmVycmVkU2l6ZSkgeworICAgICAgICAgICAgaW1hZ2UtPnNldEF0dHJpYnV0ZVdpdGhv dXRTeW5jaHJvbml6YXRpb24oSFRNTE5hbWVzOjp3aWR0aEF0dHIsIEF0b21pY1N0cmluZzo6bnVt YmVyKHByZWZlcnJlZFNpemUtPndpZHRoKCkpKTsKKyAgICAgICAgICAgIGltYWdlLT5zZXRBdHRy aWJ1dGVXaXRob3V0U3luY2hyb25pemF0aW9uKEhUTUxOYW1lczo6aGVpZ2h0QXR0ciwgQXRvbWlj U3RyaW5nOjpudW1iZXIocHJlZmVycmVkU2l6ZS0+aGVpZ2h0KCkpKTsKKyAgICAgICAgfQogICAg ICAgICByZXR1cm4gaW1hZ2U7CiAgICAgfQogCkBAIC03NjYsOSArNzc0LDkgQEAgc3RhdGljIFJl ZjxIVE1MRWxlbWVudD4gYXR0YWNobWVudEZvckRhdGEoRnJhbWUmIGZyYW1lLCBTaGFyZWRCdWZm ZXImIGJ1ZmZlciwgY28KIAogI2VuZGlmIC8vIEVOQUJMRShBVFRBQ0hNRU5UX0VMRU1FTlQpCiAK LWJvb2wgV2ViQ29udGVudFJlYWRlcjo6cmVhZEZpbGVQYXRocyhjb25zdCBWZWN0b3I8U3RyaW5n PiYgcGF0aHMpCitib29sIFdlYkNvbnRlbnRSZWFkZXI6OnJlYWRGaWxlUGF0aChjb25zdCBTdHJp bmcmIHBhdGgsIE9wdGlvbmFsPEZsb2F0U2l6ZT4gcHJlZmVycmVkUHJlc2VudGF0aW9uU2l6ZSkK IHsKLSAgICBpZiAocGF0aHMuaXNFbXB0eSgpIHx8ICFmcmFtZS5kb2N1bWVudCgpKQorICAgIGlm IChwYXRoLmlzRW1wdHkoKSB8fCAhZnJhbWUuZG9jdW1lbnQoKSkKICAgICAgICAgcmV0dXJuIGZh bHNlOwogCiAgICAgYXV0byYgZG9jdW1lbnQgPSAqZnJhbWUuZG9jdW1lbnQoKTsKQEAgLTc3Niwx NSArNzg0LDI0IEBAIGJvb2wgV2ViQ29udGVudFJlYWRlcjo6cmVhZEZpbGVQYXRocyhjb25zdCBW ZWN0b3I8U3RyaW5nPiYgcGF0aHMpCiAgICAgICAgIGZyYWdtZW50ID0gZG9jdW1lbnQuY3JlYXRl RG9jdW1lbnRGcmFnbWVudCgpOwogCiAjaWYgRU5BQkxFKEFUVEFDSE1FTlRfRUxFTUVOVCkKLSAg ICBpZiAoUnVudGltZUVuYWJsZWRGZWF0dXJlczo6c2hhcmVkRmVhdHVyZXMoKS5hdHRhY2htZW50 RWxlbWVudEVuYWJsZWQoKSkgewotICAgICAgICBmb3IgKGF1dG8mIHBhdGggOiBwYXRocykKLSAg ICAgICAgICAgIGZyYWdtZW50LT5hcHBlbmRDaGlsZChhdHRhY2htZW50Rm9yRmlsZVBhdGgoZnJh bWUsIHBhdGgpKTsKLSAgICB9CisgICAgaWYgKFJ1bnRpbWVFbmFibGVkRmVhdHVyZXM6OnNoYXJl ZEZlYXR1cmVzKCkuYXR0YWNobWVudEVsZW1lbnRFbmFibGVkKCkpCisgICAgICAgIGZyYWdtZW50 LT5hcHBlbmRDaGlsZChhdHRhY2htZW50Rm9yRmlsZVBhdGgoZnJhbWUsIHBhdGgsIHByZWZlcnJl ZFByZXNlbnRhdGlvblNpemUpKTsKICNlbmRpZgogCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKK2Jv b2wgV2ViQ29udGVudFJlYWRlcjo6cmVhZEZpbGVQYXRocyhjb25zdCBWZWN0b3I8U3RyaW5nPiYg cGF0aHMpCit7CisgICAgaWYgKHBhdGhzLmlzRW1wdHkoKSB8fCAhZnJhbWUuZG9jdW1lbnQoKSkK KyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgZm9yIChhdXRvJiBwYXRoIDogcGF0aHMpCisg ICAgICAgIHJlYWRGaWxlUGF0aChwYXRoKTsKKworICAgIHJldHVybiB0cnVlOworfQorCiBib29s IFdlYkNvbnRlbnRSZWFkZXI6OnJlYWRVUkwoY29uc3QgVVJMJiB1cmwsIGNvbnN0IFN0cmluZyYg dGl0bGUpCiB7CiAgICAgaWYgKHVybC5pc0VtcHR5KCkpCkBAIC04MTYsNyArODMzLDcgQEAgYm9v bCBXZWJDb250ZW50UmVhZGVyOjpyZWFkVVJMKGNvbnN0IFVSTCYgdXJsLCBjb25zdCBTdHJpbmcm IHRpdGxlKQogICAgIHJldHVybiB0cnVlOwogfQogCi1ib29sIFdlYkNvbnRlbnRSZWFkZXI6OnJl YWREYXRhQnVmZmVyKFNoYXJlZEJ1ZmZlciYgYnVmZmVyLCBjb25zdCBTdHJpbmcmIHR5cGUsIGNv bnN0IFN0cmluZyYgbmFtZSkKK2Jvb2wgV2ViQ29udGVudFJlYWRlcjo6cmVhZERhdGFCdWZmZXIo U2hhcmVkQnVmZmVyJiBidWZmZXIsIGNvbnN0IFN0cmluZyYgdHlwZSwgY29uc3QgU3RyaW5nJiBu YW1lLCBPcHRpb25hbDxGbG9hdFNpemU+IHByZWZlcnJlZFByZXNlbnRhdGlvblNpemUpCiB7CiAg ICAgaWYgKGJ1ZmZlci5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKQEAgLTgzMiw3 ICs4NDksNyBAQCBib29sIFdlYkNvbnRlbnRSZWFkZXI6OnJlYWREYXRhQnVmZmVyKFNoYXJlZEJ1 ZmZlciYgYnVmZmVyLCBjb25zdCBTdHJpbmcmIHR5cGUsCiAgICAgICAgIGZyYWdtZW50ID0gZG9j dW1lbnQtPmNyZWF0ZURvY3VtZW50RnJhZ21lbnQoKTsKIAogI2lmIEVOQUJMRShBVFRBQ0hNRU5U X0VMRU1FTlQpCi0gICAgZnJhZ21lbnQtPmFwcGVuZENoaWxkKGF0dGFjaG1lbnRGb3JEYXRhKGZy YW1lLCBidWZmZXIsIHR5cGUsIG5hbWUpKTsKKyAgICBmcmFnbWVudC0+YXBwZW5kQ2hpbGQoYXR0 YWNobWVudEZvckRhdGEoZnJhbWUsIGJ1ZmZlciwgdHlwZSwgbmFtZSwgcHJlZmVycmVkUHJlc2Vu dGF0aW9uU2l6ZSkpOwogI2Vsc2UKICAgICBVTlVTRURfUEFSQU0odHlwZSk7CiAgICAgVU5VU0VE X1BBUkFNKG5hbWUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vUGFzdGVi b2FyZC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vUGFzdGVib2FyZC5oCmluZGV4IDJjMTc0 MTVlODg5YjMzNGI4M2NmOWI5MzY3MzdiNjExMTQ4YjkwM2EuLjY0N2RjNWZjNGE5YmIwZDliNDM1 ZWMxODFjNGU1MjM2ZmNjMWRjMTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L1Bhc3RlYm9hcmQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9QYXN0ZWJvYXJkLmgK QEAgLTEzNiwxMyArMTM2LDE0IEBAIHB1YmxpYzoKIAogI2lmIFBMQVRGT1JNKENPQ09BKQogICAg IHZpcnR1YWwgYm9vbCByZWFkV2ViQXJjaGl2ZShTaGFyZWRCdWZmZXImKSA9IDA7CisgICAgdmly dHVhbCBib29sIHJlYWRGaWxlUGF0aChjb25zdCBTdHJpbmcmLCBPcHRpb25hbDxGbG9hdFNpemU+ IHByZWZlcnJlZFByZXNlbnRhdGlvblNpemUgPSB7IH0pID0gMDsKICAgICB2aXJ0dWFsIGJvb2wg cmVhZEZpbGVQYXRocyhjb25zdCBWZWN0b3I8U3RyaW5nPiYpID0gMDsKICAgICB2aXJ0dWFsIGJv b2wgcmVhZEhUTUwoY29uc3QgU3RyaW5nJikgPSAwOwogICAgIHZpcnR1YWwgYm9vbCByZWFkUlRG RChTaGFyZWRCdWZmZXImKSA9IDA7CiAgICAgdmlydHVhbCBib29sIHJlYWRSVEYoU2hhcmVkQnVm ZmVyJikgPSAwOwogICAgIHZpcnR1YWwgYm9vbCByZWFkSW1hZ2UoUmVmPFNoYXJlZEJ1ZmZlcj4m JiwgY29uc3QgU3RyaW5nJiB0eXBlLCBPcHRpb25hbDxGbG9hdFNpemU+IHByZWZlcnJlZFByZXNl bnRhdGlvblNpemUgPSB7IH0pID0gMDsKICAgICB2aXJ0dWFsIGJvb2wgcmVhZFVSTChjb25zdCBV UkwmLCBjb25zdCBTdHJpbmcmIHRpdGxlKSA9IDA7Ci0gICAgdmlydHVhbCBib29sIHJlYWREYXRh QnVmZmVyKFNoYXJlZEJ1ZmZlciYsIGNvbnN0IFN0cmluZyYgdHlwZSwgY29uc3QgU3RyaW5nJiBu YW1lKSA9IDA7CisgICAgdmlydHVhbCBib29sIHJlYWREYXRhQnVmZmVyKFNoYXJlZEJ1ZmZlciYs IGNvbnN0IFN0cmluZyYgdHlwZSwgY29uc3QgU3RyaW5nJiBuYW1lLCBPcHRpb25hbDxGbG9hdFNp emU+IHByZWZlcnJlZFByZXNlbnRhdGlvblNpemUgPSB7IH0pID0gMDsKICNlbmRpZgogICAgIHZp cnR1YWwgYm9vbCByZWFkUGxhaW5UZXh0KGNvbnN0IFN0cmluZyYpID0gMDsKIH07CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvUGFzdGVib2FyZElPUy5tbSBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9QYXN0ZWJvYXJkSU9TLm1tCmluZGV4IDZmZTIzZDlkODdk M2Q1NmJmYWU4ZmY4MjNlNmI1MDUyM2MwZWZhNDMuLjQxNjI5NTY3N2Y3YWVmMmQzYjhkYWIxZWQ2 ZTQ3NzdmOTcyZDNlYTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9Q YXN0ZWJvYXJkSU9TLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9QYXN0ZWJv YXJkSU9TLm1tCkBAIC0zMDcsNyArMzA3LDcgQEAgdm9pZCBQYXN0ZWJvYXJkOjpyZWFkKFBhc3Rl Ym9hcmRXZWJDb250ZW50UmVhZGVyJiByZWFkZXIsIFdlYkNvbnRlbnRSZWFkaW5nUG9saWMKICAg ICAgICAgICAgIGF1dG8gdHlwZUZvckZpbGVVcGxvYWQgPSBpbmZvLmNvbnRlbnRUeXBlRm9ySGln aGVzdEZpZGVsaXR5SXRlbSgpOwogICAgICAgICAgICAgaWYgKGF1dG8gYnVmZmVyID0gc3RyYXRl Z3kucmVhZEJ1ZmZlckZyb21QYXN0ZWJvYXJkKGksIHR5cGVGb3JGaWxlVXBsb2FkLCBtX3Bhc3Rl Ym9hcmROYW1lKSkgewogICAgICAgICAgICAgICAgIHJlYWRVUkxBbG9uZ3NpZGVBdHRhY2htZW50 SWZOZWNlc3NhcnkocmVhZGVyLCBzdHJhdGVneSwgdHlwZUZvckZpbGVVcGxvYWQsIG1fcGFzdGVi b2FyZE5hbWUsIGkpOwotICAgICAgICAgICAgICAgIHJlYWRlci5yZWFkRGF0YUJ1ZmZlcigqYnVm ZmVyLCB0eXBlRm9yRmlsZVVwbG9hZCwgaW5mby5zdWdnZXN0ZWRGaWxlTmFtZSk7CisgICAgICAg ICAgICAgICAgcmVhZGVyLnJlYWREYXRhQnVmZmVyKCpidWZmZXIsIHR5cGVGb3JGaWxlVXBsb2Fk LCBpbmZvLnN1Z2dlc3RlZEZpbGVOYW1lLCBpbmZvLnByZWZlcnJlZFByZXNlbnRhdGlvblNpemUp OwogICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICAgICAgfQogICAgICAgICB9CkBA IC0zNDcsNyArMzQ3LDcgQEAgdm9pZCBQYXN0ZWJvYXJkOjpyZWFkUmVzcGVjdGluZ1VUSUZpZGVs aXRpZXMoUGFzdGVib2FyZFdlYkNvbnRlbnRSZWFkZXImIHJlYWRlciwKICAgICAgICAgYm9vbCBj YW5SZWFkQXR0YWNobWVudCA9IHBvbGljeSA9PSBXZWJDb250ZW50UmVhZGluZ1BvbGljeTo6QW55 VHlwZSAmJiBSdW50aW1lRW5hYmxlZEZlYXR1cmVzOjpzaGFyZWRGZWF0dXJlcygpLmF0dGFjaG1l bnRFbGVtZW50RW5hYmxlZCgpICYmICFhdHRhY2htZW50RmlsZVBhdGguaXNFbXB0eSgpOwogICAg ICAgICBpZiAoY2FuUmVhZEF0dGFjaG1lbnQgJiYgcHJlZmVyc0F0dGFjaG1lbnRSZXByZXNlbnRh dGlvbihpbmZvKSkgewogICAgICAgICAgICAgcmVhZFVSTEFsb25nc2lkZUF0dGFjaG1lbnRJZk5l Y2Vzc2FyeShyZWFkZXIsIHN0cmF0ZWd5LCBpbmZvLmNvbnRlbnRUeXBlRm9ySGlnaGVzdEZpZGVs aXR5SXRlbSgpLCBtX3Bhc3RlYm9hcmROYW1lLCBpbmRleCk7Ci0gICAgICAgICAgICByZWFkZXIu cmVhZEZpbGVQYXRocyh7IFdURk1vdmUoYXR0YWNobWVudEZpbGVQYXRoKSB9KTsKKyAgICAgICAg ICAgIHJlYWRlci5yZWFkRmlsZVBhdGgoV1RGTW92ZShhdHRhY2htZW50RmlsZVBhdGgpLCBpbmZv LnByZWZlcnJlZFByZXNlbnRhdGlvblNpemUpOwogICAgICAgICAgICAgY29udGludWU7CiAgICAg ICAgIH0KICNlbmRpZgpAQCAtMzY2LDcgKzM2Niw3IEBAIHZvaWQgUGFzdGVib2FyZDo6cmVhZFJl c3BlY3RpbmdVVElGaWRlbGl0aWVzKFBhc3RlYm9hcmRXZWJDb250ZW50UmVhZGVyJiByZWFkZXIs CiAgICAgICAgIH0KICNpZiBFTkFCTEUoQVRUQUNITUVOVF9FTEVNRU5UKQogICAgICAgICBpZiAo Y2FuUmVhZEF0dGFjaG1lbnQgJiYgcmVzdWx0ID09IFJlYWRlclJlc3VsdDo6RGlkTm90UmVhZFR5 cGUpCi0gICAgICAgICAgICByZWFkZXIucmVhZEZpbGVQYXRocyh7IFdURk1vdmUoYXR0YWNobWVu dEZpbGVQYXRoKSB9KTsKKyAgICAgICAgICAgIHJlYWRlci5yZWFkRmlsZVBhdGgoV1RGTW92ZShh dHRhY2htZW50RmlsZVBhdGgpLCBpbmZvLnByZWZlcnJlZFByZXNlbnRhdGlvblNpemUpOwogI2Vu ZGlmCiAgICAgfQogfQpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdl TG9nCmluZGV4IDAxMDExZmQ1NTM3MGU0ZWVmM2M2MGNhMTc0OTE5YTRkZDY1ZDhjMDYuLjMyZDYx YzY0NGVhZGYyYmYyYWIxMjc3OWIxYzNlMGU3ZTkyMzY3Y2IgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0No YW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxOS0wNS0y NCAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9T XSBSZXNwZWN0IC1bTlNJdGVtUHJvdmlkZXIgcHJlZmVycmVkUHJlc2VudGF0aW9uU2l6ZV0gd2hl biBkcm9wcGluZyBpbWFnZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE5ODI0MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIEFkZCBhIG5ldyB0ZXN0IHRoYXQgc2ltdWxhdGVzIGRyb3BwaW5nIGFuIGltYWdl IHdpdGggYSBwcmVmZXJyZWQgcHJlc2VudGF0aW9uIHNpemUgaW50byBhbiBlZGl0YWJsZSBlbGVt ZW50CisgICAgICAgIHdpdGggYXR0YWNobWVudCBlbGVtZW50cyBlbmFibGVkLgorCisgICAgICAg ICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XS0F0dGFjaG1lbnRUZXN0cy5tbToK KyAgICAgICAgKFRlc3RXZWJLaXRBUEk6OlRFU1QpOgorCiAyMDE5LTA1LTI0ICBZdXN1a2UgU3V6 dWtpICA8eXN1enVraUBhcHBsZS5jb20+CiAKICAgICAgICAgTWFrZSBkaXNwbGF5LXByb2ZpbGVy LW91dHB1dCB3b3JrIHdpdGggbmV3ZXIgSGlnaExpbmUKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RX ZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV0tBdHRhY2htZW50VGVzdHMubW0gYi9Ub29scy9U ZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dLQXR0YWNobWVudFRlc3RzLm1tCmluZGV4 IDAxYzBjMjU1ZDcwYTczNzE2MDc3MjZiNWI5NjUwYThlOWEwNzFjOGYuLjEwOTExNmJjNGM2NzAw MWEwZWEyNmY2MzNkZDQwMGQ0MDM5MDY3MzEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRB UEkvVGVzdHMvV2ViS2l0Q29jb2EvV0tBdHRhY2htZW50VGVzdHMubW0KKysrIGIvVG9vbHMvVGVz dFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XS0F0dGFjaG1lbnRUZXN0cy5tbQpAQCAtMTYz MSw2ICsxNjMxLDIxIEBAIFRFU1QoV0tBdHRhY2htZW50VGVzdHNJT1MsIEluc2VydERyb3BwZWRJ bWFnZUFzQXR0YWNobWVudCkKICAgICB9CiB9CiAKK1RFU1QoV0tBdHRhY2htZW50VGVzdHNJT1Ms IEluc2VydERyb3BwZWRJbWFnZVdpdGhQcmVmZXJyZWRQcmVzZW50YXRpb25TaXplKQoreworICAg IGF1dG8gd2ViVmlldyA9IHdlYlZpZXdGb3JUZXN0aW5nQXR0YWNobWVudHMoKTsKKyAgICBhdXRv IGRyYWdBbmREcm9wU2ltdWxhdG9yID0gYWRvcHROUyhbW0RyYWdBbmREcm9wU2ltdWxhdG9yIGFs bG9jXSBpbml0V2l0aFdlYlZpZXc6d2ViVmlldy5nZXQoKV0pOworICAgIGF1dG8gaXRlbSA9IGFk b3B0TlMoW1tOU0l0ZW1Qcm92aWRlciBhbGxvY10gaW5pdF0pOworICAgIFtpdGVtIHJlZ2lzdGVy RGF0YTp0ZXN0SW1hZ2VEYXRhKCkgdHlwZTooX19icmlkZ2UgTlNTdHJpbmcgKilrVVRUeXBlUE5H XTsKKyAgICBbaXRlbSBzZXRQcmVmZXJyZWRQcmVzZW50YXRpb25TaXplOkNHU2l6ZU1ha2UoMjAw LCAxMDApXTsKKyAgICBbZHJhZ0FuZERyb3BTaW11bGF0b3Igc2V0RXh0ZXJuYWxJdGVtUHJvdmlk ZXJzOkBbIGl0ZW0uZ2V0KCkgXV07CisgICAgW2RyYWdBbmREcm9wU2ltdWxhdG9yIHJ1bkZyb206 Q0dQb2ludFplcm8gdG86Q0dQb2ludE1ha2UoNTAsIDUwKV07CisKKyAgICBDR1NpemUgaW1hZ2VF bGVtZW50U2l6ZSA9IFt3ZWJWaWV3IGltYWdlRWxlbWVudFNpemVdOworICAgIEVYUEVDVF9FUSgy MDAsIGltYWdlRWxlbWVudFNpemUud2lkdGgpOworICAgIEVYUEVDVF9FUSgxMDAsIGltYWdlRWxl bWVudFNpemUuaGVpZ2h0KTsKK30KKwogVEVTVChXS0F0dGFjaG1lbnRUZXN0c0lPUywgSW5zZXJ0 RHJvcHBlZEF0dHJpYnV0ZWRTdHJpbmdDb250YWluaW5nQXR0YWNobWVudCkKIHsKICAgICBhdXRv IHdlYlZpZXcgPSB3ZWJWaWV3Rm9yVGVzdGluZ0F0dGFjaG1lbnRzKCk7Cg==