139870 2014-12-22 11:38:02 -0800 [SVG -> OTF Converter] Make Placeholder a move-only type 2014-12-23 10:45:07 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mmaxfield mmaxfield commit-queue darin d-r fmalita gyuyoung.kim mitz pdr schenney sergio oldest_to_newest 1057416 0 mmaxfield 2014-12-22 11:38:02 -0800 [SVG -> OTF Converter] Make Placeholder a move-only type 1057418 1 243631 mmaxfield 2014-12-22 11:39:59 -0800 Created attachment 243631 Patch 1057419 2 mmaxfield 2014-12-22 11:40:41 -0800 I'm not sure if there's a better way to do this other than a movedOutOf boolean. 1057433 3 243636 mmaxfield 2014-12-22 12:51:36 -0800 Created attachment 243636 Patch 1057551 4 243636 darin 2014-12-22 22:42:52 -0800 Comment on attachment 243636 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=243636&action=review > Source/WebCore/svg/SVGToOTFFontConversion.cpp:86 > + , m_movedOutOf(false) This initialization should be !ASSERT_DISABLED only. But it should be omitted entirely (see below). > Source/WebCore/svg/SVGToOTFFontConversion.cpp:103 > +#if !ASSERT_DISABLED > + , m_written(other.m_written) > +#endif Doesn’t seem right to me. We should ASSERT(other.m_written) and just initialize m_written to true. > Source/WebCore/svg/SVGToOTFFontConversion.cpp:106 > + other.m_movedOutOf = true; Should only compile this when !ASSERT_DISABLED. > Source/WebCore/svg/SVGToOTFFontConversion.cpp:123 > - ASSERT(m_written); > + ASSERT(m_movedOutOf || m_written); Change doesn’t make sense to me. No reason to check m_movedOutOf here that I can see. > Source/WebCore/svg/SVGToOTFFontConversion.cpp:130 > + unsigned m_movedOutOf : 1; This should be !ASSERT_DISABLED only. This should be bool, not a bit field, because it’s !ASSERT_DISABLED only and size not all that important. This should be initialized here to cut down on initialization in constructors: bool m_movedOutOf { false }; > Source/WebCore/svg/SVGToOTFFontConversion.cpp:132 > + unsigned m_written : 1; This should be bool, not a bit field, because it’s !ASSERT_DISABLED only and size not all that important. This should be initialized here to cut down on initialization in constructors: bool m_written { false }; 1057601 5 243678 mmaxfield 2014-12-23 10:36:39 -0800 Created attachment 243678 Patch 1057603 6 243636 mmaxfield 2014-12-23 10:37:27 -0800 Comment on attachment 243636 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=243636&action=review >> Source/WebCore/svg/SVGToOTFFontConversion.cpp:86 >> + , m_movedOutOf(false) > > This initialization should be !ASSERT_DISABLED only. But it should be omitted entirely (see below). I've removed this variable, and renamed m_written to m_active, because a Placeholder which has been moved from but hasn't written anything yet should be marked as inactive. Populate() will then set m_active to false, and the destructor will ASSERT(!m_active); 1057605 7 243678 andersca 2014-12-23 10:40:22 -0800 Comment on attachment 243678 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=243678&action=review > Source/WebCore/svg/SVGToOTFFontConversion.cpp:90 > + Placeholder(const Placeholder&) = delete; Implementing a move constructor is enough to not make it have a copy constructor, so this isn't needed. 1057607 8 mmaxfield 2014-12-23 10:45:07 -0800 Committed r177688: <http://trac.webkit.org/changeset/177688> 243631 2014-12-22 11:39:59 -0800 2014-12-22 12:51:32 -0800 Patch bug-139870-20141222113959.patch text/plain 2766 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3NjMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzlkYmY3MDA4MzlkZGI2 ZTc0MWE4N2ZjZjcwMjQ1OGY1Y2NlNWEyYS4uNDdjY2YyNDA2ZjBhODAwMzIwMzdhZWZhOWZhYTFk MWQ1ZmJiNzczNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE0LTEyLTIyICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgW1NWRyAtPiBP VEYgQ29udmVydGVyXSBNYWtlIFBsYWNlaG9sZGVyIGEgbW92ZS1vbmx5IHR5cGUKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzOTg3MAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBiZWNh dXNlIHRoZXJlIGlzIG5vIGJlaGF2aW9yIGNoYW5nZS4KKworICAgICAgICAqIHN2Zy9TVkdUb09U RkZvbnRDb252ZXJzaW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNWR1RvT1RGRm9udENvbnZl cnRlcjo6UGxhY2Vob2xkZXI6OlBsYWNlaG9sZGVyKToKKyAgICAgICAgKFdlYkNvcmU6OlNWR1Rv T1RGRm9udENvbnZlcnRlcjo6UGxhY2Vob2xkZXI6OnBvcHVsYXRlKToKKyAgICAgICAgKFdlYkNv cmU6OlNWR1RvT1RGRm9udENvbnZlcnRlcjo6UGxhY2Vob2xkZXI6On5QbGFjZWhvbGRlcik6CisK IDIwMTQtMTItMjIgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBN b3ZlICJBdXRvIiBDU1MgcHJvcGVydGllcyB0byB0aGUgbmV3IFN0eWxlQnVpbGRlcgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvc3ZnL1NWR1RvT1RGRm9udENvbnZlcnNpb24uY3BwIGIvU291 cmNlL1dlYkNvcmUvc3ZnL1NWR1RvT1RGRm9udENvbnZlcnNpb24uY3BwCmluZGV4IGMxN2Q2MmVj YThiNzEzNzc2ZTIwN2FjYTQ3ODE0OGUyMWQyNzY4MDIuLjhhMGQxOTdkOGM2MGQ3ZjkxYjY2NWFl ZWJkYjQwNGY1MmM1OWVlODQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdUb09U RkZvbnRDb252ZXJzaW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHVG9PVEZGb250 Q29udmVyc2lvbi5jcHAKQEAgLTgzLDE1ICs4MywzMyBAQCBwcml2YXRlOgogICAgICAgICAgICAg OiBtX2NvbnZlcnRlcihjb252ZXJ0ZXIpCiAgICAgICAgICAgICAsIG1fYmFzZU9mT2Zmc2V0KGJh c2VPZk9mZnNldCkKICAgICAgICAgICAgICwgbV9sb2NhdGlvbihtX2NvbnZlcnRlci5tX3Jlc3Vs dC5zaXplKCkpCisgICAgICAgICAgICAsIG1fbW92ZWRPdXRPZihmYWxzZSkKICNpZiAhQVNTRVJU X0RJU0FCTEVECiAgICAgICAgICAgICAsIG1fd3JpdHRlbihmYWxzZSkKICNlbmRpZgogICAgICAg ICB7CiAgICAgICAgICAgICBtX2NvbnZlcnRlci5hcHBlbmQxNigwKTsKICAgICAgICAgfQorCisg ICAgICAgIFBsYWNlaG9sZGVyKGNvbnN0IFBsYWNlaG9sZGVyJikgPSBkZWxldGU7CisKKyAgICAg ICAgUGxhY2Vob2xkZXIoUGxhY2Vob2xkZXImJiBvdGhlcikKKyAgICAgICAgICAgIDogbV9jb252 ZXJ0ZXIob3RoZXIubV9jb252ZXJ0ZXIpCisgICAgICAgICAgICAsIG1fYmFzZU9mT2Zmc2V0KG90 aGVyLm1fYmFzZU9mT2Zmc2V0KQorICAgICAgICAgICAgLCBtX2xvY2F0aW9uKG90aGVyLm1fbG9j YXRpb24pCisgICAgICAgICAgICAsIG1fbW92ZWRPdXRPZihmYWxzZSkKKyNpZiAhQVNTRVJUX0RJ U0FCTEVECisgICAgICAgICAgICAsIG1fd3JpdHRlbihvdGhlci5tX3dyaXR0ZW4pCisjZW5kaWYK KyAgICAgICAgeworICAgICAgICAgICAgQVNTRVJUKCFvdGhlci5tX21vdmVkT3V0T2YpOworICAg ICAgICAgICAgb3RoZXIubV9tb3ZlZE91dE9mID0gdHJ1ZTsKKyAgICAgICAgfQorCiAgICAgICAg IHZvaWQgcG9wdWxhdGUoKQogICAgICAgICB7CiAgICAgICAgICAgICBBU1NFUlQoIW1fd3JpdHRl bik7CisgICAgICAgICAgICBBU1NFUlQoIW1fbW92ZWRPdXRPZik7CiAgICAgICAgICAgICBzaXpl X3QgZGVsdGEgPSBtX2NvbnZlcnRlci5tX3Jlc3VsdC5zaXplKCkgLSBtX2Jhc2VPZk9mZnNldDsK ICAgICAgICAgICAgIEFTU0VSVChkZWx0YSA8IHN0ZDo6bnVtZXJpY19saW1pdHM8dWludDE2X3Q+ OjptYXgoKSk7CiAgICAgICAgICAgICBtX2NvbnZlcnRlci5vdmVyd3JpdGUxNihtX2xvY2F0aW9u LCBkZWx0YSk7CkBAIC05OSwxNiArMTE3LDE5IEBAIHByaXZhdGU6CiAgICAgICAgICAgICBtX3dy aXR0ZW4gPSB0cnVlOwogI2VuZGlmCiAgICAgICAgIH0KKwogICAgICAgICB+UGxhY2Vob2xkZXIo KQogICAgICAgICB7Ci0gICAgICAgICAgICBBU1NFUlQobV93cml0dGVuKTsKKyAgICAgICAgICAg IEFTU0VSVCghbV9tb3ZlZE91dE9mIHx8IG1fd3JpdHRlbik7CiAgICAgICAgIH0KKwogICAgIHBy aXZhdGU6CiAgICAgICAgIFNWR1RvT1RGRm9udENvbnZlcnRlciYgbV9jb252ZXJ0ZXI7CiAgICAg ICAgIGNvbnN0IHNpemVfdCBtX2Jhc2VPZk9mZnNldDsKICAgICAgICAgY29uc3Qgc2l6ZV90IG1f bG9jYXRpb247CisgICAgICAgIHVuc2lnbmVkIG1fbW92ZWRPdXRPZiA6IDE7CiAjaWYgIUFTU0VS VF9ESVNBQkxFRAotICAgICAgICBib29sIG1fd3JpdHRlbjsKKyAgICAgICAgdW5zaWduZWQgbV93 cml0dGVuIDogMTsKICNlbmRpZgogICAgIH07CiAK 243636 2014-12-22 12:51:36 -0800 2014-12-23 10:36:36 -0800 Patch bug-139870-20141222125136.patch text/plain 2802 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3NjUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTgxZjAxMTE3MjYwNDYy OGZjMmZkZDNjNTdmMThlMzFhN2EzNmQwMi4uNjE0ODQ2YzE4MDFkY2IwOWQ1ZDkwYzM4ZjNiY2Ux OWMwZTIxZTM2YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE0LTEyLTIyICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgW1NWRyAtPiBP VEYgQ29udmVydGVyXSBNYWtlIFBsYWNlaG9sZGVyIGEgbW92ZS1vbmx5IHR5cGUKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzOTg3MAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBiZWNh dXNlIHRoZXJlIGlzIG5vIGJlaGF2aW9yIGNoYW5nZS4KKworICAgICAgICAqIHN2Zy9TVkdUb09U RkZvbnRDb252ZXJzaW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNWR1RvT1RGRm9udENvbnZl cnRlcjo6UGxhY2Vob2xkZXI6OlBsYWNlaG9sZGVyKToKKyAgICAgICAgKFdlYkNvcmU6OlNWR1Rv T1RGRm9udENvbnZlcnRlcjo6UGxhY2Vob2xkZXI6OnBvcHVsYXRlKToKKyAgICAgICAgKFdlYkNv cmU6OlNWR1RvT1RGRm9udENvbnZlcnRlcjo6UGxhY2Vob2xkZXI6On5QbGFjZWhvbGRlcik6CisK IDIwMTQtMTItMjIgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBb aU9TXSBMb2cgdXNpbmcgRmVhdHVyZUNvdW50ZXIgd2hlbiBhIFBhY2hlQ2FjaGUgZW50cnkgaXMg bm90IHJldXNlZCBiZWNhdXNlIGl0IGV4cGlyZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3N2Zy9TVkdUb09URkZvbnRDb252ZXJzaW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdU b09URkZvbnRDb252ZXJzaW9uLmNwcAppbmRleCBjMTdkNjJlY2E4YjcxMzc3NmUyMDdhY2E0Nzgx NDhlMjFkMjc2ODAyLi4zN2M1MDJjOGEwZmRmNDk1NTZmYzRhNjUwOGRjOTNjNzFjZGVkZmYxIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHVG9PVEZGb250Q29udmVyc2lvbi5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvc3ZnL1NWR1RvT1RGRm9udENvbnZlcnNpb24uY3BwCkBAIC04 MywxNSArODMsMzMgQEAgcHJpdmF0ZToKICAgICAgICAgICAgIDogbV9jb252ZXJ0ZXIoY29udmVy dGVyKQogICAgICAgICAgICAgLCBtX2Jhc2VPZk9mZnNldChiYXNlT2ZPZmZzZXQpCiAgICAgICAg ICAgICAsIG1fbG9jYXRpb24obV9jb252ZXJ0ZXIubV9yZXN1bHQuc2l6ZSgpKQorICAgICAgICAg ICAgLCBtX21vdmVkT3V0T2YoZmFsc2UpCiAjaWYgIUFTU0VSVF9ESVNBQkxFRAogICAgICAgICAg ICAgLCBtX3dyaXR0ZW4oZmFsc2UpCiAjZW5kaWYKICAgICAgICAgewogICAgICAgICAgICAgbV9j b252ZXJ0ZXIuYXBwZW5kMTYoMCk7CiAgICAgICAgIH0KKworICAgICAgICBQbGFjZWhvbGRlcihj b25zdCBQbGFjZWhvbGRlciYpID0gZGVsZXRlOworCisgICAgICAgIFBsYWNlaG9sZGVyKFBsYWNl aG9sZGVyJiYgb3RoZXIpCisgICAgICAgICAgICA6IG1fY29udmVydGVyKG90aGVyLm1fY29udmVy dGVyKQorICAgICAgICAgICAgLCBtX2Jhc2VPZk9mZnNldChvdGhlci5tX2Jhc2VPZk9mZnNldCkK KyAgICAgICAgICAgICwgbV9sb2NhdGlvbihvdGhlci5tX2xvY2F0aW9uKQorICAgICAgICAgICAg LCBtX21vdmVkT3V0T2YoZmFsc2UpCisjaWYgIUFTU0VSVF9ESVNBQkxFRAorICAgICAgICAgICAg LCBtX3dyaXR0ZW4ob3RoZXIubV93cml0dGVuKQorI2VuZGlmCisgICAgICAgIHsKKyAgICAgICAg ICAgIEFTU0VSVCghb3RoZXIubV9tb3ZlZE91dE9mKTsKKyAgICAgICAgICAgIG90aGVyLm1fbW92 ZWRPdXRPZiA9IHRydWU7CisgICAgICAgIH0KKwogICAgICAgICB2b2lkIHBvcHVsYXRlKCkKICAg ICAgICAgewogICAgICAgICAgICAgQVNTRVJUKCFtX3dyaXR0ZW4pOworICAgICAgICAgICAgQVNT RVJUKCFtX21vdmVkT3V0T2YpOwogICAgICAgICAgICAgc2l6ZV90IGRlbHRhID0gbV9jb252ZXJ0 ZXIubV9yZXN1bHQuc2l6ZSgpIC0gbV9iYXNlT2ZPZmZzZXQ7CiAgICAgICAgICAgICBBU1NFUlQo ZGVsdGEgPCBzdGQ6Om51bWVyaWNfbGltaXRzPHVpbnQxNl90Pjo6bWF4KCkpOwogICAgICAgICAg ICAgbV9jb252ZXJ0ZXIub3ZlcndyaXRlMTYobV9sb2NhdGlvbiwgZGVsdGEpOwpAQCAtOTksMTYg KzExNywxOSBAQCBwcml2YXRlOgogICAgICAgICAgICAgbV93cml0dGVuID0gdHJ1ZTsKICNlbmRp ZgogICAgICAgICB9CisKICAgICAgICAgflBsYWNlaG9sZGVyKCkKICAgICAgICAgewotICAgICAg ICAgICAgQVNTRVJUKG1fd3JpdHRlbik7CisgICAgICAgICAgICBBU1NFUlQobV9tb3ZlZE91dE9m IHx8IG1fd3JpdHRlbik7CiAgICAgICAgIH0KKwogICAgIHByaXZhdGU6CiAgICAgICAgIFNWR1Rv T1RGRm9udENvbnZlcnRlciYgbV9jb252ZXJ0ZXI7CiAgICAgICAgIGNvbnN0IHNpemVfdCBtX2Jh c2VPZk9mZnNldDsKICAgICAgICAgY29uc3Qgc2l6ZV90IG1fbG9jYXRpb247CisgICAgICAgIHVu c2lnbmVkIG1fbW92ZWRPdXRPZiA6IDE7CiAjaWYgIUFTU0VSVF9ESVNBQkxFRAotICAgICAgICBi b29sIG1fd3JpdHRlbjsKKyAgICAgICAgdW5zaWduZWQgbV93cml0dGVuIDogMTsKICNlbmRpZgog ICAgIH07CiAK 243678 2014-12-23 10:36:39 -0800 2014-12-23 10:40:22 -0800 Patch bug-139870-20141223103640.patch text/plain 2678 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3Njg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWRkMzAyYzMzYzAyYWQ2 Y2I0MDBhODc3OWQxNTBlMWE5YTZlMzM3NS4uY2M0YmUyNjM5YzBkOTc1NWZkZmNlZmVjNTMyZjg4 ZmYyZjY2NmE4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE0LTEyLTIzICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgW1NWRyAtPiBP VEYgQ29udmVydGVyXSBNYWtlIFBsYWNlaG9sZGVyIGEgbW92ZS1vbmx5IHR5cGUKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzOTg3MAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBiZWNh dXNlIHRoZXJlIGlzIG5vIGJlaGF2aW9yIGNoYW5nZS4KKworICAgICAgICAqIHN2Zy9TVkdUb09U RkZvbnRDb252ZXJzaW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNWR1RvT1RGRm9udENvbnZl cnRlcjo6UGxhY2Vob2xkZXI6OlBsYWNlaG9sZGVyKToKKyAgICAgICAgKFdlYkNvcmU6OlNWR1Rv T1RGRm9udENvbnZlcnRlcjo6UGxhY2Vob2xkZXI6OnBvcHVsYXRlKToKKyAgICAgICAgKFdlYkNv cmU6OlNWR1RvT1RGRm9udENvbnZlcnRlcjo6UGxhY2Vob2xkZXI6On5QbGFjZWhvbGRlcik6CisK IDIwMTQtMTItMjIgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBb aU9TXSBMb2cgd2hpY2ggdHlwZSBvZiByZXNvdXJjZXMgYXJlIGNvbW1vbmx5IGxvYWRlZCB1c2lu ZyBGZWF0dXJlQ291bnRlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3ZnL1NWR1RvT1RG Rm9udENvbnZlcnNpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvc3ZnL1NWR1RvT1RGRm9udENvbnZl cnNpb24uY3BwCmluZGV4IGMxN2Q2MmVjYThiNzEzNzc2ZTIwN2FjYTQ3ODE0OGUyMWQyNzY4MDIu LjRkOWViMWJlMDllYTUxNGQxODEyNzY0ZTI3ZmMzNDgyMjNmYzQ5M2IgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3N2Zy9TVkdUb09URkZvbnRDb252ZXJzaW9uLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9zdmcvU1ZHVG9PVEZGb250Q29udmVyc2lvbi5jcHAKQEAgLTgzLDMyICs4Myw0NyBA QCBwcml2YXRlOgogICAgICAgICAgICAgOiBtX2NvbnZlcnRlcihjb252ZXJ0ZXIpCiAgICAgICAg ICAgICAsIG1fYmFzZU9mT2Zmc2V0KGJhc2VPZk9mZnNldCkKICAgICAgICAgICAgICwgbV9sb2Nh dGlvbihtX2NvbnZlcnRlci5tX3Jlc3VsdC5zaXplKCkpCisgICAgICAgIHsKKyAgICAgICAgICAg IG1fY29udmVydGVyLmFwcGVuZDE2KDApOworICAgICAgICB9CisKKyAgICAgICAgUGxhY2Vob2xk ZXIoY29uc3QgUGxhY2Vob2xkZXImKSA9IGRlbGV0ZTsKKworICAgICAgICBQbGFjZWhvbGRlcihQ bGFjZWhvbGRlciYmIG90aGVyKQorICAgICAgICAgICAgOiBtX2NvbnZlcnRlcihvdGhlci5tX2Nv bnZlcnRlcikKKyAgICAgICAgICAgICwgbV9iYXNlT2ZPZmZzZXQob3RoZXIubV9iYXNlT2ZPZmZz ZXQpCisgICAgICAgICAgICAsIG1fbG9jYXRpb24ob3RoZXIubV9sb2NhdGlvbikKICNpZiAhQVNT RVJUX0RJU0FCTEVECi0gICAgICAgICAgICAsIG1fd3JpdHRlbihmYWxzZSkKKyAgICAgICAgICAg ICwgbV9hY3RpdmUob3RoZXIubV9hY3RpdmUpCiAjZW5kaWYKICAgICAgICAgewotICAgICAgICAg ICAgbV9jb252ZXJ0ZXIuYXBwZW5kMTYoMCk7CisjaWYgIUFTU0VSVF9ESVNBQkxFRAorICAgICAg ICAgICAgb3RoZXIubV9hY3RpdmUgPSBmYWxzZTsKKyNlbmRpZgogICAgICAgICB9CisKICAgICAg ICAgdm9pZCBwb3B1bGF0ZSgpCiAgICAgICAgIHsKLSAgICAgICAgICAgIEFTU0VSVCghbV93cml0 dGVuKTsKKyAgICAgICAgICAgIEFTU0VSVChtX2FjdGl2ZSk7CiAgICAgICAgICAgICBzaXplX3Qg ZGVsdGEgPSBtX2NvbnZlcnRlci5tX3Jlc3VsdC5zaXplKCkgLSBtX2Jhc2VPZk9mZnNldDsKICAg ICAgICAgICAgIEFTU0VSVChkZWx0YSA8IHN0ZDo6bnVtZXJpY19saW1pdHM8dWludDE2X3Q+Ojpt YXgoKSk7CiAgICAgICAgICAgICBtX2NvbnZlcnRlci5vdmVyd3JpdGUxNihtX2xvY2F0aW9uLCBk ZWx0YSk7CiAjaWYgIUFTU0VSVF9ESVNBQkxFRAotICAgICAgICAgICAgbV93cml0dGVuID0gdHJ1 ZTsKKyAgICAgICAgICAgIG1fYWN0aXZlID0gZmFsc2U7CiAjZW5kaWYKICAgICAgICAgfQorCiAg ICAgICAgIH5QbGFjZWhvbGRlcigpCiAgICAgICAgIHsKLSAgICAgICAgICAgIEFTU0VSVChtX3dy aXR0ZW4pOworICAgICAgICAgICAgQVNTRVJUKCFtX2FjdGl2ZSk7CiAgICAgICAgIH0KKwogICAg IHByaXZhdGU6CiAgICAgICAgIFNWR1RvT1RGRm9udENvbnZlcnRlciYgbV9jb252ZXJ0ZXI7CiAg ICAgICAgIGNvbnN0IHNpemVfdCBtX2Jhc2VPZk9mZnNldDsKICAgICAgICAgY29uc3Qgc2l6ZV90 IG1fbG9jYXRpb247CiAjaWYgIUFTU0VSVF9ESVNBQkxFRAotICAgICAgICBib29sIG1fd3JpdHRl bjsKKyAgICAgICAgYm9vbCBtX2FjdGl2ZSA9IHsgdHJ1ZSB9OwogI2VuZGlmCiAgICAgfTsKIAo=