111185 2013-03-01 08:44:07 -0800 [Qt] Use Qt5.1 supportedMimeTypes methods. 2013-03-07 05:54:42 -0800 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 allan.jensen allan.jensen hausmann jturcotte webkit-ews oldest_to_newest 845207 0 allan.jensen 2013-03-01 08:44:07 -0800 QImageReader and QImageWriter now includes methods that returns the supported mimetypes directly, so we don't have to guess them from the format keys. This should not a make any difference to the official imageformat plugins, but is cleaner and likely to fix 3rd party plugins. 845209 1 190971 allan.jensen 2013-03-01 08:46:09 -0800 Created attachment 190971 Patch 845216 2 190971 webkit-ews 2013-03-01 08:57:37 -0800 Comment on attachment 190971 Patch Attachment 190971 did not pass qt-ews (qt): Output: http://webkit-commit-queue.appspot.com/results/16836263 845220 3 190971 webkit-ews 2013-03-01 09:00:41 -0800 Comment on attachment 190971 Patch Attachment 190971 did not pass qt-wk2-ews (qt): Output: http://webkit-commit-queue.appspot.com/results/16867009 845230 4 190971 allan.jensen 2013-03-01 09:17:11 -0800 Comment on attachment 190971 Patch C&P error 845246 5 190979 allan.jensen 2013-03-01 09:46:36 -0800 Created attachment 190979 Patch 848757 6 190979 jturcotte 2013-03-06 05:40:58 -0800 Comment on attachment 190979 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=190979&action=review We should remove the old code as soon as 5.1 has been released, those ifdef are getting heavy. > Source/WebCore/platform/MIMETypeRegistry.cpp:248 > +#if QT_VERSION >= 0x050100 #if QT_VERSION >= QT_VERSION_CHECK(5, 1, 0) > Source/WebCore/platform/MIMETypeRegistry.cpp:265 > + // Don't treat SVG as images directly if we can handle them internally. "internally" is ambiguous, adding something like "let WebKit handle them" could help. > Source/WebCore/platform/MIMETypeRegistry.cpp:295 > +#if QT_VERSION >= 0x050100 ditto > Source/WebCore/platform/MIMETypeRegistry.cpp:307 > +#endif This could deserve a "// QT_VERSION" as well 849990 7 191978 allan.jensen 2013-03-07 05:30:28 -0800 Created attachment 191978 Patch 850005 8 allan.jensen 2013-03-07 05:54:42 -0800 Committed r145066: <http://trac.webkit.org/changeset/145066> 190971 2013-03-01 08:46:09 -0800 2013-03-01 09:46:31 -0800 Patch bug-111185-20130301174133.patch text/plain 3447 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ0NDQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWYxYWVhMTliMjc0OTJh Nzk4MDNlZWJjYTU4NzQxMjlkMDgzNWQ1NC4uMDcxZDU0ZjY0MTZlZWQxOGE3OWU5NjEzZmNkM2Rk N2NkMmJiYjdhZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEzLTAzLTAxICBBbGxh biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGlnaWEuY29tPgorCisgICAgICAgIFtR dF0gVXNlIFF0NS4xIHN1cHBvcnRlZE1pbWVUeXBlcyBtZXRob2RzLgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTExMTg1CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXNlcyB0aGUgc3VwcG9ydGVkTWltZVR5 cGVzKCkgbWV0aG9kcyBmcm9tIFFJbWFnZVJlYWRlciBhbmQgUUltYWdlV3JpdGVyIHdoZW4gYXZh aWxhYmxlLgorCisgICAgICAgICogcGxhdGZvcm0vTUlNRVR5cGVSZWdpc3RyeS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjppbml0aWFsaXplU3VwcG9ydGVkSW1hZ2VNSU1FVHlwZXMpOgorICAgICAg ICAoV2ViQ29yZTo6aW5pdGlhbGl6ZVN1cHBvcnRlZEltYWdlTUlNRVR5cGVzRm9yRW5jb2Rpbmcp OgorCiAyMDEzLTAzLTAxICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNv bT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByMTQ0NDQzLgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTUlNRVR5cGVSZWdpc3RyeS5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9NSU1FVHlwZVJlZ2lzdHJ5LmNwcAppbmRleCA4NjkxYWM4M2IxMWJl YzI1YWY4ZmRjMmVlZjk2YTM4MmUyYmUyZDgwLi40NDk0ZjYxMDY5OGEwODgzMzI3MGQwODE2YjU4 ZGNlYTEzY2I3OTU0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9NSU1FVHlw ZVJlZ2lzdHJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9NSU1FVHlwZVJlZ2lz dHJ5LmNwcApAQCAtMjQ1LDIxICsyNDUsMjkgQEAgc3RhdGljIHZvaWQgaW5pdGlhbGl6ZVN1cHBv cnRlZEltYWdlTUlNRVR5cGVzKCkKICAgICB9CiAKICNpZiBQTEFURk9STShRVCkKKyNpZiBRVF9W RVJTSU9OID49IDB4MDUwMTAwCisgICAgUUxpc3Q8UUJ5dGVBcnJheT4gbWltZVR5cGVzID0gUUlt YWdlUmVhZGVyOjpzdXBwb3J0ZWRNaW1lVHlwZXMoKTsKKyAgICBRX0ZPUkVBQ0goY29uc3QgUUJ5 dGVBcnJheSYgbWltZVR5cGUsIG1pbWVUeXBlcykgeworICAgICAgICBzdXBwb3J0ZWRJbWFnZU1J TUVUeXBlcy0+YWRkKG1pbWVUeXBlLmNvbnN0RGF0YSgpKTsKKyAgICAgICAgc3VwcG9ydGVkSW1h Z2VSZXNvdXJjZU1JTUVUeXBlcy0+YWRkKG1pbWVUeXBlLmNvbnN0RGF0YSgpKTsKKyAgICB9Cisj ZWxzZQogICAgIFFMaXN0PFFCeXRlQXJyYXk+IGZvcm1hdHMgPSBRSW1hZ2VSZWFkZXI6OnN1cHBv cnRlZEltYWdlRm9ybWF0cygpOwotICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgc3RhdGljX2Nh c3Q8c2l6ZV90Pihmb3JtYXRzLnNpemUoKSk7ICsraSkgewotI2lmIEVOQUJMRShTVkcpCi0gICAg ICAgIC8vIFF0IGhhcyBzdXBwb3J0IGZvciBTVkcsIGJ1dCB3ZSB3YW50IHRvIHVzZSBLU1ZHMgot ICAgICAgICBpZiAoZm9ybWF0cy5hdChpKS50b0xvd2VyKCkuc3RhcnRzV2l0aCgic3ZnIikpCi0g ICAgICAgICAgICBjb250aW51ZTsKLSNlbmRpZiAvLyBFTkFCTEUoU1ZHKQorICAgIFFfRk9SRUFD SChjb25zdCBRQnl0ZUFycmF5JiBmb3JtYXQsIGZvcm1hdHMpIHsKICAgICAgICAgU3RyaW5nIG1p bWVUeXBlID0gTUlNRVR5cGVSZWdpc3RyeTo6Z2V0TUlNRVR5cGVGb3JFeHRlbnNpb24oZm9ybWF0 cy5hdChpKS5jb25zdERhdGEoKSk7CiAgICAgICAgIGlmICghbWltZVR5cGUuaXNFbXB0eSgpKSB7 CiAgICAgICAgICAgICBzdXBwb3J0ZWRJbWFnZU1JTUVUeXBlcy0+YWRkKG1pbWVUeXBlKTsKICAg ICAgICAgICAgIHN1cHBvcnRlZEltYWdlUmVzb3VyY2VNSU1FVHlwZXMtPmFkZChtaW1lVHlwZSk7 CiAgICAgICAgIH0KLSAgICAgfQotI2VuZGlmIC8vIFBMQVRGT1JNKFFUKQorICAgIH0KKyNlbmRp ZiAvLyBRVF9WRVJTSU9OCisjaWYgRU5BQkxFKFNWRykKKyAgICAvLyAgRG9uJ3QgdHJlYXQgU1ZH IGFzIGltYWdlcyBkaXJlY3RseSBpZiB3ZSBjYW4gaGFuZGxlIHRoZW0gaW50ZXJuYWxseS4KKyAg ICBzdXBwb3J0ZWRJbWFnZU1JTUVUeXBlcy0+cmVtb3ZlKCJpbWFnZS9zdmcreG1sIik7CisgICAg c3VwcG9ydGVkSW1hZ2VSZXNvdXJjZU1JTUVUeXBlcy0+cmVtb3ZlKCJpbWFnZS9zdmcreG1sIik7 CiAjZW5kaWYKKyNlbmRpZiAvLyBQTEFURk9STShRVCkKKyNlbmRpZiAvLyBVU0UoQ0cpCiB9CiAK IHN0YXRpYyB2b2lkIGluaXRpYWxpemVTdXBwb3J0ZWRJbWFnZU1JTUVUeXBlc0ZvckVuY29kaW5n KCkKQEAgLTI4NCwxMiArMjkyLDE5IEBAIHN0YXRpYyB2b2lkIGluaXRpYWxpemVTdXBwb3J0ZWRJ bWFnZU1JTUVUeXBlc0ZvckVuY29kaW5nKCkKICAgICBzdXBwb3J0ZWRJbWFnZU1JTUVUeXBlc0Zv ckVuY29kaW5nLT5hZGQoImltYWdlL2dpZiIpOwogI2VuZGlmCiAjZWxpZiBQTEFURk9STShRVCkK KyNpZiBRVF9WRVJTSU9OID49IDB4MDUwMTAwCisgICAgUUxpc3Q8UUJ5dGVBcnJheT4gbWltZVR5 cGVzID0gUUltYWdlV3JpdGVyOjpzdXBwb3J0ZWRNaW1lVHlwZXMoKTsKKyAgICBRX0ZPUkVBQ0go Y29uc3QgUUJ5dGVBcnJheSYgbWltZVR5cGUsIG1pbWVUeXBlcykgeworICAgICAgICBzdXBwb3J0 ZWRJbWFnZU1JTUVUeXBlc0ZvckVuY29kaW5nLT5hZGQobWltZVR5cGUuY29uc3REYXRhKCkpOwor ICAgIH0KKyNlbHNlCiAgICAgUUxpc3Q8UUJ5dGVBcnJheT4gZm9ybWF0cyA9IFFJbWFnZVdyaXRl cjo6c3VwcG9ydGVkSW1hZ2VGb3JtYXRzKCk7CiAgICAgZm9yIChpbnQgaSA9IDA7IGkgPCBmb3Jt YXRzLnNpemUoKTsgKytpKSB7CiAgICAgICAgIFN0cmluZyBtaW1lVHlwZSA9IE1JTUVUeXBlUmVn aXN0cnk6OmdldE1JTUVUeXBlRm9yRXh0ZW5zaW9uKGZvcm1hdHMuYXQoaSkuY29uc3REYXRhKCkp OwogICAgICAgICBpZiAoIW1pbWVUeXBlLmlzRW1wdHkoKSkKICAgICAgICAgICAgIHN1cHBvcnRl ZEltYWdlTUlNRVR5cGVzRm9yRW5jb2RpbmctPmFkZChtaW1lVHlwZSk7CiAgICAgfQorI2VuZGlm CiAjZWxpZiBQTEFURk9STShHVEspCiAgICAgc3VwcG9ydGVkSW1hZ2VNSU1FVHlwZXNGb3JFbmNv ZGluZy0+YWRkKCJpbWFnZS9wbmciKTsKICAgICBzdXBwb3J0ZWRJbWFnZU1JTUVUeXBlc0ZvckVu Y29kaW5nLT5hZGQoImltYWdlL2pwZWciKTsK 190979 2013-03-01 09:46:36 -0800 2013-03-07 05:30:24 -0800 Patch bug-111185-20130301184159.patch text/plain 3443 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ0NDQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWYxYWVhMTliMjc0OTJh Nzk4MDNlZWJjYTU4NzQxMjlkMDgzNWQ1NC4uMDcxZDU0ZjY0MTZlZWQxOGE3OWU5NjEzZmNkM2Rk N2NkMmJiYjdhZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEzLTAzLTAxICBBbGxh biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGlnaWEuY29tPgorCisgICAgICAgIFtR dF0gVXNlIFF0NS4xIHN1cHBvcnRlZE1pbWVUeXBlcyBtZXRob2RzLgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTExMTg1CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXNlcyB0aGUgc3VwcG9ydGVkTWltZVR5 cGVzKCkgbWV0aG9kcyBmcm9tIFFJbWFnZVJlYWRlciBhbmQgUUltYWdlV3JpdGVyIHdoZW4gYXZh aWxhYmxlLgorCisgICAgICAgICogcGxhdGZvcm0vTUlNRVR5cGVSZWdpc3RyeS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjppbml0aWFsaXplU3VwcG9ydGVkSW1hZ2VNSU1FVHlwZXMpOgorICAgICAg ICAoV2ViQ29yZTo6aW5pdGlhbGl6ZVN1cHBvcnRlZEltYWdlTUlNRVR5cGVzRm9yRW5jb2Rpbmcp OgorCiAyMDEzLTAzLTAxICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNv bT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByMTQ0NDQzLgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTUlNRVR5cGVSZWdpc3RyeS5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9NSU1FVHlwZVJlZ2lzdHJ5LmNwcAppbmRleCA4NjkxYWM4M2IxMWJl YzI1YWY4ZmRjMmVlZjk2YTM4MmUyYmUyZDgwLi5lNmRiODM0Y2ZiMDkyZGI2ZTdjZWMzMGRlNGZl NTM4NmExMjhjNjM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9NSU1FVHlw ZVJlZ2lzdHJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9NSU1FVHlwZVJlZ2lz dHJ5LmNwcApAQCAtMjQ1LDIxICsyNDUsMjkgQEAgc3RhdGljIHZvaWQgaW5pdGlhbGl6ZVN1cHBv cnRlZEltYWdlTUlNRVR5cGVzKCkKICAgICB9CiAKICNpZiBQTEFURk9STShRVCkKKyNpZiBRVF9W RVJTSU9OID49IDB4MDUwMTAwCisgICAgUUxpc3Q8UUJ5dGVBcnJheT4gbWltZVR5cGVzID0gUUlt YWdlUmVhZGVyOjpzdXBwb3J0ZWRNaW1lVHlwZXMoKTsKKyAgICBRX0ZPUkVBQ0goY29uc3QgUUJ5 dGVBcnJheSYgbWltZVR5cGUsIG1pbWVUeXBlcykgeworICAgICAgICBzdXBwb3J0ZWRJbWFnZU1J TUVUeXBlcy0+YWRkKG1pbWVUeXBlLmNvbnN0RGF0YSgpKTsKKyAgICAgICAgc3VwcG9ydGVkSW1h Z2VSZXNvdXJjZU1JTUVUeXBlcy0+YWRkKG1pbWVUeXBlLmNvbnN0RGF0YSgpKTsKKyAgICB9Cisj ZWxzZQogICAgIFFMaXN0PFFCeXRlQXJyYXk+IGZvcm1hdHMgPSBRSW1hZ2VSZWFkZXI6OnN1cHBv cnRlZEltYWdlRm9ybWF0cygpOwotICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgc3RhdGljX2Nh c3Q8c2l6ZV90Pihmb3JtYXRzLnNpemUoKSk7ICsraSkgewotI2lmIEVOQUJMRShTVkcpCi0gICAg ICAgIC8vIFF0IGhhcyBzdXBwb3J0IGZvciBTVkcsIGJ1dCB3ZSB3YW50IHRvIHVzZSBLU1ZHMgot ICAgICAgICBpZiAoZm9ybWF0cy5hdChpKS50b0xvd2VyKCkuc3RhcnRzV2l0aCgic3ZnIikpCi0g ICAgICAgICAgICBjb250aW51ZTsKLSNlbmRpZiAvLyBFTkFCTEUoU1ZHKQorICAgIGZvciAoaW50 IGkgPSAwOyBpIDwgZm9ybWF0cy5zaXplKCk7ICsraSkgewogICAgICAgICBTdHJpbmcgbWltZVR5 cGUgPSBNSU1FVHlwZVJlZ2lzdHJ5OjpnZXRNSU1FVHlwZUZvckV4dGVuc2lvbihmb3JtYXRzLmF0 KGkpLmNvbnN0RGF0YSgpKTsKICAgICAgICAgaWYgKCFtaW1lVHlwZS5pc0VtcHR5KCkpIHsKICAg ICAgICAgICAgIHN1cHBvcnRlZEltYWdlTUlNRVR5cGVzLT5hZGQobWltZVR5cGUpOwogICAgICAg ICAgICAgc3VwcG9ydGVkSW1hZ2VSZXNvdXJjZU1JTUVUeXBlcy0+YWRkKG1pbWVUeXBlKTsKICAg ICAgICAgfQotICAgICB9Ci0jZW5kaWYgLy8gUExBVEZPUk0oUVQpCisgICAgfQorI2VuZGlmIC8v IFFUX1ZFUlNJT04KKyNpZiBFTkFCTEUoU1ZHKQorICAgIC8vICBEb24ndCB0cmVhdCBTVkcgYXMg aW1hZ2VzIGRpcmVjdGx5IGlmIHdlIGNhbiBoYW5kbGUgdGhlbSBpbnRlcm5hbGx5LgorICAgIHN1 cHBvcnRlZEltYWdlTUlNRVR5cGVzLT5yZW1vdmUoImltYWdlL3N2Zyt4bWwiKTsKKyAgICBzdXBw b3J0ZWRJbWFnZVJlc291cmNlTUlNRVR5cGVzLT5yZW1vdmUoImltYWdlL3N2Zyt4bWwiKTsKICNl bmRpZgorI2VuZGlmIC8vIFBMQVRGT1JNKFFUKQorI2VuZGlmIC8vIFVTRShDRykKIH0KIAogc3Rh dGljIHZvaWQgaW5pdGlhbGl6ZVN1cHBvcnRlZEltYWdlTUlNRVR5cGVzRm9yRW5jb2RpbmcoKQpA QCAtMjg0LDEyICsyOTIsMTkgQEAgc3RhdGljIHZvaWQgaW5pdGlhbGl6ZVN1cHBvcnRlZEltYWdl TUlNRVR5cGVzRm9yRW5jb2RpbmcoKQogICAgIHN1cHBvcnRlZEltYWdlTUlNRVR5cGVzRm9yRW5j b2RpbmctPmFkZCgiaW1hZ2UvZ2lmIik7CiAjZW5kaWYKICNlbGlmIFBMQVRGT1JNKFFUKQorI2lm IFFUX1ZFUlNJT04gPj0gMHgwNTAxMDAKKyAgICBRTGlzdDxRQnl0ZUFycmF5PiBtaW1lVHlwZXMg PSBRSW1hZ2VXcml0ZXI6OnN1cHBvcnRlZE1pbWVUeXBlcygpOworICAgIFFfRk9SRUFDSChjb25z dCBRQnl0ZUFycmF5JiBtaW1lVHlwZSwgbWltZVR5cGVzKSB7CisgICAgICAgIHN1cHBvcnRlZElt YWdlTUlNRVR5cGVzRm9yRW5jb2RpbmctPmFkZChtaW1lVHlwZS5jb25zdERhdGEoKSk7CisgICAg fQorI2Vsc2UKICAgICBRTGlzdDxRQnl0ZUFycmF5PiBmb3JtYXRzID0gUUltYWdlV3JpdGVyOjpz dXBwb3J0ZWRJbWFnZUZvcm1hdHMoKTsKICAgICBmb3IgKGludCBpID0gMDsgaSA8IGZvcm1hdHMu c2l6ZSgpOyArK2kpIHsKICAgICAgICAgU3RyaW5nIG1pbWVUeXBlID0gTUlNRVR5cGVSZWdpc3Ry eTo6Z2V0TUlNRVR5cGVGb3JFeHRlbnNpb24oZm9ybWF0cy5hdChpKS5jb25zdERhdGEoKSk7CiAg ICAgICAgIGlmICghbWltZVR5cGUuaXNFbXB0eSgpKQogICAgICAgICAgICAgc3VwcG9ydGVkSW1h Z2VNSU1FVHlwZXNGb3JFbmNvZGluZy0+YWRkKG1pbWVUeXBlKTsKICAgICB9CisjZW5kaWYKICNl bGlmIFBMQVRGT1JNKEdUSykKICAgICBzdXBwb3J0ZWRJbWFnZU1JTUVUeXBlc0ZvckVuY29kaW5n LT5hZGQoImltYWdlL3BuZyIpOwogICAgIHN1cHBvcnRlZEltYWdlTUlNRVR5cGVzRm9yRW5jb2Rp bmctPmFkZCgiaW1hZ2UvanBlZyIpOwo= 191978 2013-03-07 05:30:28 -0800 2013-03-07 05:46:05 -0800 Patch bug-111185-20130307142542.patch text/plain 3501 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1MDY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjBlZmM5ODkzNmFjNDJm MmQ4M2NhMjlmZTU5Zjk2NjBlY2E5N2QwMS4uODIwNGE3ZWFmMmYxYzhjYjU2ZmY1OGUxYjcyNWJm OWU0M2FiMmI0OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEzLTAzLTA3ICBBbGxh biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGlnaWEuY29tPgorCisgICAgICAgIFtR dF0gVXNlIFF0NS4xIHN1cHBvcnRlZE1pbWVUeXBlcyBtZXRob2RzLgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTExMTg1CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXNlcyB0aGUgc3VwcG9ydGVkTWltZVR5 cGVzKCkgbWV0aG9kcyBmcm9tIFFJbWFnZVJlYWRlciBhbmQgUUltYWdlV3JpdGVyIHdoZW4gYXZh aWxhYmxlLgorCisgICAgICAgICogcGxhdGZvcm0vTUlNRVR5cGVSZWdpc3RyeS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjppbml0aWFsaXplU3VwcG9ydGVkSW1hZ2VNSU1FVHlwZXMpOgorICAgICAg ICAoV2ViQ29yZTo6aW5pdGlhbGl6ZVN1cHBvcnRlZEltYWdlTUlNRVR5cGVzRm9yRW5jb2Rpbmcp OgorCiAyMDEzLTAzLTA3ICBBbmRyZXkgTHVzaG5pa292ICA8bHVzaG5pa292QGNocm9taXVtLm9y Zz4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBbQUNFXSBndXR0ZXIgc2l6ZSBzaG91bGQgYmUg Zml4ZWQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9NSU1FVHlwZVJlZ2lz dHJ5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL01JTUVUeXBlUmVnaXN0cnkuY3BwCmlu ZGV4IDg2OTFhYzgzYjExYmVjMjVhZjhmZGMyZWVmOTZhMzgyZTJiZTJkODAuLjQ5ZDc0MWI4YzNm YTMxOTFjYjc3YWE3MTAxZDdmYWE2MWMxNGZkYTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL01JTUVUeXBlUmVnaXN0cnkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL01JTUVUeXBlUmVnaXN0cnkuY3BwCkBAIC0yNDUsMjEgKzI0NSwyOSBAQCBzdGF0aWMgdm9p ZCBpbml0aWFsaXplU3VwcG9ydGVkSW1hZ2VNSU1FVHlwZXMoKQogICAgIH0KIAogI2lmIFBMQVRG T1JNKFFUKQorI2lmIFFUX1ZFUlNJT04gPj0gUVRfVkVSU0lPTl9DSEVDSyg1LCAxLCAwKQorICAg IFFMaXN0PFFCeXRlQXJyYXk+IG1pbWVUeXBlcyA9IFFJbWFnZVJlYWRlcjo6c3VwcG9ydGVkTWlt ZVR5cGVzKCk7CisgICAgUV9GT1JFQUNIKGNvbnN0IFFCeXRlQXJyYXkmIG1pbWVUeXBlLCBtaW1l VHlwZXMpIHsKKyAgICAgICAgc3VwcG9ydGVkSW1hZ2VNSU1FVHlwZXMtPmFkZChtaW1lVHlwZS5j b25zdERhdGEoKSk7CisgICAgICAgIHN1cHBvcnRlZEltYWdlUmVzb3VyY2VNSU1FVHlwZXMtPmFk ZChtaW1lVHlwZS5jb25zdERhdGEoKSk7CisgICAgfQorI2Vsc2UKICAgICBRTGlzdDxRQnl0ZUFy cmF5PiBmb3JtYXRzID0gUUltYWdlUmVhZGVyOjpzdXBwb3J0ZWRJbWFnZUZvcm1hdHMoKTsKLSAg ICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IHN0YXRpY19jYXN0PHNpemVfdD4oZm9ybWF0cy5zaXpl KCkpOyArK2kpIHsKLSNpZiBFTkFCTEUoU1ZHKQotICAgICAgICAvLyBRdCBoYXMgc3VwcG9ydCBm b3IgU1ZHLCBidXQgd2Ugd2FudCB0byB1c2UgS1NWRzIKLSAgICAgICAgaWYgKGZvcm1hdHMuYXQo aSkudG9Mb3dlcigpLnN0YXJ0c1dpdGgoInN2ZyIpKQotICAgICAgICAgICAgY29udGludWU7Ci0j ZW5kaWYgLy8gRU5BQkxFKFNWRykKKyAgICBmb3IgKGludCBpID0gMDsgaSA8IGZvcm1hdHMuc2l6 ZSgpOyArK2kpIHsKICAgICAgICAgU3RyaW5nIG1pbWVUeXBlID0gTUlNRVR5cGVSZWdpc3RyeTo6 Z2V0TUlNRVR5cGVGb3JFeHRlbnNpb24oZm9ybWF0cy5hdChpKS5jb25zdERhdGEoKSk7CiAgICAg ICAgIGlmICghbWltZVR5cGUuaXNFbXB0eSgpKSB7CiAgICAgICAgICAgICBzdXBwb3J0ZWRJbWFn ZU1JTUVUeXBlcy0+YWRkKG1pbWVUeXBlKTsKICAgICAgICAgICAgIHN1cHBvcnRlZEltYWdlUmVz b3VyY2VNSU1FVHlwZXMtPmFkZChtaW1lVHlwZSk7CiAgICAgICAgIH0KLSAgICAgfQotI2VuZGlm IC8vIFBMQVRGT1JNKFFUKQorICAgIH0KKyNlbmRpZiAvLyBRVF9WRVJTSU9OCisjaWYgRU5BQkxF KFNWRykKKyAgICAvLyBEbyBub3QgdHJlYXQgU1ZHIGFzIGltYWdlcyBkaXJlY3RseSBpZiBXZWJL aXQgY2FuIGhhbmRsZSB0aGVtLgorICAgIHN1cHBvcnRlZEltYWdlTUlNRVR5cGVzLT5yZW1vdmUo ImltYWdlL3N2Zyt4bWwiKTsKKyAgICBzdXBwb3J0ZWRJbWFnZVJlc291cmNlTUlNRVR5cGVzLT5y ZW1vdmUoImltYWdlL3N2Zyt4bWwiKTsKICNlbmRpZgorI2VuZGlmIC8vIFBMQVRGT1JNKFFUKQor I2VuZGlmIC8vIFVTRShDRykKIH0KIAogc3RhdGljIHZvaWQgaW5pdGlhbGl6ZVN1cHBvcnRlZElt YWdlTUlNRVR5cGVzRm9yRW5jb2RpbmcoKQpAQCAtMjg0LDEyICsyOTIsMTkgQEAgc3RhdGljIHZv aWQgaW5pdGlhbGl6ZVN1cHBvcnRlZEltYWdlTUlNRVR5cGVzRm9yRW5jb2RpbmcoKQogICAgIHN1 cHBvcnRlZEltYWdlTUlNRVR5cGVzRm9yRW5jb2RpbmctPmFkZCgiaW1hZ2UvZ2lmIik7CiAjZW5k aWYKICNlbGlmIFBMQVRGT1JNKFFUKQorI2lmIFFUX1ZFUlNJT04gPj0gUVRfVkVSU0lPTl9DSEVD Syg1LCAxLCAwKQorICAgIFFMaXN0PFFCeXRlQXJyYXk+IG1pbWVUeXBlcyA9IFFJbWFnZVdyaXRl cjo6c3VwcG9ydGVkTWltZVR5cGVzKCk7CisgICAgUV9GT1JFQUNIKGNvbnN0IFFCeXRlQXJyYXkm IG1pbWVUeXBlLCBtaW1lVHlwZXMpIHsKKyAgICAgICAgc3VwcG9ydGVkSW1hZ2VNSU1FVHlwZXNG b3JFbmNvZGluZy0+YWRkKG1pbWVUeXBlLmNvbnN0RGF0YSgpKTsKKyAgICB9CisjZWxzZQogICAg IFFMaXN0PFFCeXRlQXJyYXk+IGZvcm1hdHMgPSBRSW1hZ2VXcml0ZXI6OnN1cHBvcnRlZEltYWdl Rm9ybWF0cygpOwogICAgIGZvciAoaW50IGkgPSAwOyBpIDwgZm9ybWF0cy5zaXplKCk7ICsraSkg ewogICAgICAgICBTdHJpbmcgbWltZVR5cGUgPSBNSU1FVHlwZVJlZ2lzdHJ5OjpnZXRNSU1FVHlw ZUZvckV4dGVuc2lvbihmb3JtYXRzLmF0KGkpLmNvbnN0RGF0YSgpKTsKICAgICAgICAgaWYgKCFt aW1lVHlwZS5pc0VtcHR5KCkpCiAgICAgICAgICAgICBzdXBwb3J0ZWRJbWFnZU1JTUVUeXBlc0Zv ckVuY29kaW5nLT5hZGQobWltZVR5cGUpOwogICAgIH0KKyNlbmRpZiAvLyBRVF9WRVJTSU9OCiAj ZWxpZiBQTEFURk9STShHVEspCiAgICAgc3VwcG9ydGVkSW1hZ2VNSU1FVHlwZXNGb3JFbmNvZGlu Zy0+YWRkKCJpbWFnZS9wbmciKTsKICAgICBzdXBwb3J0ZWRJbWFnZU1JTUVUeXBlc0ZvckVuY29k aW5nLT5hZGQoImltYWdlL2pwZWciKTsK