34143 2010-01-25 11:30:04 -0800 Enhance externalRepresentation() to make it more useful for layer debugging 2010-01-26 17:08:36 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All OS X 10.5 RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser oldest_to_newest 184386 0 simon.fraser 2010-01-25 11:30:04 -0800 I'd like to be able to use externalRepresentation() to see the RenderLayer hierarchy for all layers, and with indentation for layers, to make it easier to debug layer-related problems. This will have to be conditional behaviour, to avoid affecting DRT output. 184421 1 47370 simon.fraser 2010-01-25 15:02:00 -0800 Created attachment 47370 Patch 184842 2 simon.fraser 2010-01-26 17:08:36 -0800 http://trac.webkit.org/changeset/53874 47370 2010-01-25 15:02:00 -0800 2010-01-26 16:26:09 -0800 Patch bug-34143-20100125150159.patch text/plain 12298 simon.fraser ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YmVmNmMzYi4uZWFlODA4OCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMCBAQAorMjAxMC0wMS0yNSAgU2ltb24gRnJhc2Vy ICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBFbmhhbmNlIGV4dGVybmFsUmVwcmVzZW50YXRpb24oKSB0byBt YWtlIGl0IG1vcmUgdXNlZnVsIGZvciBsYXllciBkZWJ1Z2dpbmcKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM0MTQzCisKKyAgICAgICAgRW5oYW5jZSBl eHRlcm5hbFJlcHJlc2VudGF0aW9uKCkgdG8gb3V0cHV0IGFkZGl0aW9uYWwgaW5mb3JtYXRpb24g YWJvdXQgbGF5ZXJzIHdoZW4gY2VydGFpbiBmbGFncyBhcmUgcGFzc2VkLgorICAgICAgICBUaGUg bmV3IGZsYWdzIGFsbG93IHlvdSB0byBzaG93IGFsbCBsYXllcnMgKG5vdCBqdXN0IHRob3NlIHRo YXQgd291bGQgcGFpbnQpLCB0byB0aGUgc3RydWN0dXJlIG9mIHRoZSB6LW9yZGVyCisgICAgICAg IGFuZCBub3JtYWwgZmxvdyBsaXN0cywgYW5kIHRvIHNob3cgd2hpY2ggbGF5ZXJzIGFyZSBjb21w b3NpdGVkLgorCisgICAgICAgICogV2ViQ29yZS5iYXNlLmV4cDogVGhlIHNpZ25hdHVyZSBvZiBl eHRlcm5hbFJlcHJlc2VudGF0aW9uKCkgY2hhbmdlZC4KKworICAgICAgICAqIHBsYXRmb3JtL3Rl eHQvVGV4dFN0cmVhbS5oOiBBZGQgb3BlcmF0b3I8PCh2b2lkKikKKyAgICAgICAgKiBwbGF0Zm9y bS90ZXh0L1RleHRTdHJlYW0uY3BwOiBJbXBsZW1lbnQgb3BlcmF0b3I8PCh2b2lkKikKKworICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllci5oOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5k ZXJMYXllci5jcHA6CisgICAgICAgIChzaG93TGF5ZXJUcmVlKTogTmV3IG1ldGhvZCBvdXRzaWRl IHRoZSBXZWJDb3JlIG5hbWVzcGFjZSwgZm9yIGVhc2Ugb2YgY2FsbGluZyBmcm9tIGdkYi4KKwor ICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUcmVlQXNUZXh0Lmg6IE5ldyBiZWhhdmlvciBmbGFn cyBmb3IgZXh0ZXJuYWxSZXByZXNlbnRhdGlvbigpLgorICAgICAgICAqIHJlbmRlcmluZy9SZW5k ZXJUcmVlQXNUZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OndyaXRlKTogT3V0cHV0IGNvbXBv c2l0aW5nIGluZm9ybWF0aW9uIGlmIHJlcXVlc3RlZC4gQWxzbyBjbGVhbiB1cCBzb21lIC0xLzEg bWFnaWMKKyAgICAgICAgbnVtYmVycyB3aXRoIGFuIGVudW0uCisgICAgICAgIChXZWJDb3JlOjp3 cml0ZUxheWVycyk6IElmIHJlcXVlc3RlZCwgc2hvdyBsYXllciBuZXN0aW5nIHZpYSB0aGUgei1v cmRlciBhbmQgbm9ybWFsIGZsb3cgbGlzdHMuCisgICAgICAgIChXZWJDb3JlOjpleHRlcm5hbFJl cHJlc2VudGF0aW9uKTogTmV3IGFyZ3VtZW50cworCiAyMDEwLTAxLTI1ICBQYXZlbCBGZWxkbWFu ICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFRpbW90aHkg SGF0Y2hlci4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvV2ViQ29yZS5iYXNlLmV4cCBiL1dlYkNvcmUv V2ViQ29yZS5iYXNlLmV4cAppbmRleCBlMjM0ODY4Li44ZWFiZmFlIDEwMDY0NAotLS0gYS9XZWJD b3JlL1dlYkNvcmUuYmFzZS5leHAKKysrIGIvV2ViQ29yZS9XZWJDb3JlLmJhc2UuZXhwCkBAIC00 MzYsNyArNDM2LDcgQEAgX19aTjdXZWJDb3JlMjJTY3JpcHRFeGVjdXRpb25Db250ZXh0MjZjYW5T dXNwZW5kQWN0aXZlRE9NT2JqZWN0c0V2CiBfX1pON1dlYkNvcmUyMmFwcGxpY2F0aW9uSXNBcHBs ZU1haWxFdgogX19aTjdXZWJDb3JlMjJjb3VudGVyVmFsdWVGb3JFbGVtZW50RVBOU183RWxlbWVu dEUKIF9fWk43V2ViQ29yZTIyY3JlYXRlRnJhZ21lbnRGcm9tVGV4dEVQTlNfNVJhbmdlRVJLTlNf NlN0cmluZ0UKLV9fWk43V2ViQ29yZTIyZXh0ZXJuYWxSZXByZXNlbnRhdGlvbkVQTlNfNUZyYW1l RQorX19aTjdXZWJDb3JlMjJleHRlcm5hbFJlcHJlc2VudGF0aW9uRVBOU181RnJhbWVFagogX19a TjdXZWJDb3JlMjNBcHBsaWNhdGlvbkNhY2hlU3RvcmFnZTE0c2V0TWF4aW11bVNpemVFeAogX19a TjdXZWJDb3JlMjNBcHBsaWNhdGlvbkNhY2hlU3RvcmFnZTE2c3RvcmVDb3B5T2ZDYWNoZUVSS05T XzZTdHJpbmdFUE5TXzIwQXBwbGljYXRpb25DYWNoZUhvc3RFCiBfX1pON1dlYkNvcmUyM0FwcGxp Y2F0aW9uQ2FjaGVTdG9yYWdlMTdzZXRDYWNoZURpcmVjdG9yeUVSS05TXzZTdHJpbmdFCmRpZmYg LS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvVGV4dFN0cmVhbS5jcHAgYi9XZWJDb3JlL3Bs YXRmb3JtL3RleHQvVGV4dFN0cmVhbS5jcHAKaW5kZXggNTdjMTMyOC4uYmFhYThiOSAxMDA2NDQK LS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L1RleHRTdHJlYW0uY3BwCisrKyBiL1dlYkNvcmUv cGxhdGZvcm0vdGV4dC9UZXh0U3RyZWFtLmNwcApAQCAtOTAsNiArOTAsMTMgQEAgVGV4dFN0cmVh bSYgVGV4dFN0cmVhbTo6b3BlcmF0b3I8PChjb25zdCBjaGFyKiBzdHJpbmcpCiAgICAgcmV0dXJu ICp0aGlzOwogfQogCitUZXh0U3RyZWFtJiBUZXh0U3RyZWFtOjpvcGVyYXRvcjw8KHZvaWQqIHAp Cit7CisgICAgY2hhciBidWZmZXJbcHJpbnRCdWZmZXJTaXplXTsKKyAgICBzbnByaW50ZihidWZm ZXIsIHNpemVvZihidWZmZXIpIC0gMSwgIiVwIiwgcCk7CisgICAgcmV0dXJuICp0aGlzIDw8IGJ1 ZmZlcjsKK30KKwogVGV4dFN0cmVhbSYgVGV4dFN0cmVhbTo6b3BlcmF0b3I8PChjb25zdCBTdHJp bmcmIHN0cmluZykKIHsKICAgICBhcHBlbmQobV90ZXh0LCBzdHJpbmcpOwpkaWZmIC0tZ2l0IGEv V2ViQ29yZS9wbGF0Zm9ybS90ZXh0L1RleHRTdHJlYW0uaCBiL1dlYkNvcmUvcGxhdGZvcm0vdGV4 dC9UZXh0U3RyZWFtLmgKaW5kZXggYjZiY2VhOC4uZGZhYTA0OCAxMDA2NDQKLS0tIGEvV2ViQ29y ZS9wbGF0Zm9ybS90ZXh0L1RleHRTdHJlYW0uaAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL3RleHQv VGV4dFN0cmVhbS5oCkBAIC00Myw2ICs0Myw3IEBAIHB1YmxpYzoKICAgICBUZXh0U3RyZWFtJiBv cGVyYXRvcjw8KGZsb2F0KTsKICAgICBUZXh0U3RyZWFtJiBvcGVyYXRvcjw8KGRvdWJsZSk7CiAg ICAgVGV4dFN0cmVhbSYgb3BlcmF0b3I8PChjb25zdCBjaGFyKik7CisgICAgVGV4dFN0cmVhbSYg b3BlcmF0b3I8PCh2b2lkKik7CiAgICAgVGV4dFN0cmVhbSYgb3BlcmF0b3I8PChjb25zdCBTdHJp bmcmKTsKICNpZiBPUyhXSU5ET1dTKSAmJiBQTEFURk9STShYODZfNjQpICYmIENPTVBJTEVSKE1T VkMpCiAgICAgVGV4dFN0cmVhbSYgb3BlcmF0b3I8PCh1bnNpZ25lZCBfX2ludDY0KTsKZGlmZiAt LWdpdCBhL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcCBiL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckxheWVyLmNwcAppbmRleCA4NmIzMWVlLi45NWYxZjdkIDEwMDY0NAotLS0gYS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKKysrIGIvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyTGF5ZXIuY3BwCkBAIC03MywxMSArNzMsMTMgQEAKICNpbmNsdWRlICJSZW5kZXJTY3Jv bGxiYXIuaCIKICNpbmNsdWRlICJSZW5kZXJTY3JvbGxiYXJQYXJ0LmgiCiAjaW5jbHVkZSAiUmVu ZGVyVGhlbWUuaCIKKyNpbmNsdWRlICJSZW5kZXJUcmVlQXNUZXh0LmgiCiAjaW5jbHVkZSAiUmVu ZGVyVmlldy5oIgogI2luY2x1ZGUgIlNjYWxlVHJhbnNmb3JtT3BlcmF0aW9uLmgiCiAjaW5jbHVk ZSAiU2Nyb2xsYmFyLmgiCiAjaW5jbHVkZSAiU2Nyb2xsYmFyVGhlbWUuaCIKICNpbmNsdWRlICJT ZWxlY3Rpb25Db250cm9sbGVyLmgiCisjaW5jbHVkZSAiVGV4dFN0cmVhbS5oIgogI2luY2x1ZGUg IlRyYW5zZm9ybWF0aW9uTWF0cml4LmgiCiAjaW5jbHVkZSAiVHJhbnNmb3JtU3RhdGUuaCIKICNp bmNsdWRlICJUcmFuc2xhdGVUcmFuc2Zvcm1PcGVyYXRpb24uaCIKQEAgLTM0OTgsMyArMzUwMCwx NiBAQCB2b2lkIFJlbmRlckxheWVyOjp1cGRhdGVSZWZsZWN0aW9uU3R5bGUoKQogfQogCiB9IC8v IG5hbWVzcGFjZSBXZWJDb3JlCisKKyNpZm5kZWYgTkRFQlVHCit2b2lkIHNob3dMYXllclRyZWUo Y29uc3QgV2ViQ29yZTo6UmVuZGVyTGF5ZXIqIGxheWVyKQoreworICAgIGlmICghbGF5ZXIpCisg ICAgICAgIHJldHVybjsKKworICAgIGlmIChXZWJDb3JlOjpGcmFtZSogZnJhbWUgPSBsYXllci0+ cmVuZGVyZXIoKS0+ZG9jdW1lbnQoKS0+ZnJhbWUoKSkgeworICAgICAgICBXZWJDb3JlOjpTdHJp bmcgb3V0cHV0ID0gZXh0ZXJuYWxSZXByZXNlbnRhdGlvbihmcmFtZSwgV2ViQ29yZTo6UmVuZGVy QXNUZXh0U2hvd0FsbExheWVycyB8IFdlYkNvcmU6OlJlbmRlckFzVGV4dFNob3dMYXllck5lc3Rp bmcgfCBXZWJDb3JlOjpSZW5kZXJBc1RleHRTaG93Q29tcG9zaXRlZExheWVycyk7CisgICAgICAg IGZwcmludGYoc3RkZXJyLCAiJXNcbiIsIG91dHB1dC51dGY4KCkuZGF0YSgpKTsKKyAgICB9Cit9 CisjZW5kaWYKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmggYi9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oCmluZGV4IDkyZjY5MjcuLjNjZGFkM2EgMTAw NjQ0Ci0tLSBhL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmgKKysrIGIvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaApAQCAtNjY0LDQgKzY2NCw5IEBAIHByaXZhdGU6CiAKIH0g Ly8gbmFtZXNwYWNlIFdlYkNvcmUKIAorI2lmbmRlZiBOREVCVUcKKy8vIE91dHNpZGUgdGhlIFdl YkNvcmUgbmFtZXNwYWNlIGZvciBlYXNlIG9mIGludm9jYXRpb24gZnJvbSBnZGIuCit2b2lkIHNo b3dMYXllclRyZWUoY29uc3QgV2ViQ29yZTo6UmVuZGVyTGF5ZXIqIGxheWVyKTsKKyNlbmRpZgor CiAjZW5kaWYgLy8gUmVuZGVyTGF5ZXJfaApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyVHJlZUFzVGV4dC5jcHAgYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUcmVlQXNUZXh0 LmNwcAppbmRleCBhNmY1MTQ0Li5hZDZiMWQzIDEwMDY0NAotLS0gYS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJUcmVlQXNUZXh0LmNwcAorKysgYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUcmVl QXNUZXh0LmNwcApAQCAtNTcsNiArNTcsMTAgQEAKICNpbmNsdWRlICJTVkdSZW5kZXJUcmVlQXNU ZXh0LmgiCiAjZW5kaWYKIAorI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKKyNpbmNs dWRlICJSZW5kZXJMYXllckJhY2tpbmcuaCIKKyNlbmRpZgorCiAjaWYgUExBVEZPUk0oUVQpCiAj aW5jbHVkZSA8UVdpZGdldD4KICNlbmRpZgpAQCAtNjUsNyArNjksNyBAQCBuYW1lc3BhY2UgV2Vi Q29yZSB7CiAKIHVzaW5nIG5hbWVzcGFjZSBIVE1MTmFtZXM7CiAKLXN0YXRpYyB2b2lkIHdyaXRl TGF5ZXJzKFRleHRTdHJlYW0mLCBjb25zdCBSZW5kZXJMYXllciogcm9vdExheWVyLCBSZW5kZXJM YXllciosIGNvbnN0IEludFJlY3QmIHBhaW50RGlydHlSZWN0LCBpbnQgaW5kZW50ID0gMCk7Citz dGF0aWMgdm9pZCB3cml0ZUxheWVycyhUZXh0U3RyZWFtJiwgY29uc3QgUmVuZGVyTGF5ZXIqIHJv b3RMYXllciwgUmVuZGVyTGF5ZXIqLCBjb25zdCBJbnRSZWN0JiBwYWludERpcnR5UmVjdCwgaW50 IGluZGVudCA9IDAsIFJlbmRlckFzVGV4dEJlaGF2aW9yIGJlaGF2aW9yID0gUmVuZGVyQXNUZXh0 QmVoYXZpb3JOb3JtYWwpOwogCiAjaWYgIUVOQUJMRShTVkcpCiBzdGF0aWMgVGV4dFN0cmVhbSAm b3BlcmF0b3I8PChUZXh0U3RyZWFtJiB0cywgY29uc3QgSW50UmVjdCYgcikKQEAgLTQ0NCw5ICs0 NDgsMTUgQEAgdm9pZCB3cml0ZShUZXh0U3RyZWFtJiB0cywgY29uc3QgUmVuZGVyT2JqZWN0JiBv LCBpbnQgaW5kZW50KQogICAgIH0KIH0KIAorZW51bSBMYXllclBhaW50UGhhc2UgeworICAgIExh eWVyUGFpbnRQaGFzZUFsbCA9IDAsCisgICAgTGF5ZXJQYWludFBoYXNlQmFja2dyb3VuZCA9IC0x LAorICAgIExheWVyUGFpbnRQaGFzZUZvcmVncm91bmQgPSAxCit9OworCiBzdGF0aWMgdm9pZCB3 cml0ZShUZXh0U3RyZWFtJiB0cywgUmVuZGVyTGF5ZXImIGwsCiAgICAgICAgICAgICAgICAgICBj b25zdCBJbnRSZWN0JiBsYXllckJvdW5kcywgY29uc3QgSW50UmVjdCYgYmFja2dyb3VuZENsaXBS ZWN0LCBjb25zdCBJbnRSZWN0JiBjbGlwUmVjdCwgY29uc3QgSW50UmVjdCYgb3V0bGluZUNsaXBS ZWN0LAotICAgICAgICAgICAgICAgICAgaW50IGxheWVyVHlwZSA9IDAsIGludCBpbmRlbnQgPSAw KQorICAgICAgICAgICAgICAgICAgTGF5ZXJQYWludFBoYXNlIHBhaW50UGhhc2UgPSBMYXllclBh aW50UGhhc2VBbGwsIGludCBpbmRlbnQgPSAwLCBSZW5kZXJBc1RleHRCZWhhdmlvciBiZWhhdmlv ciA9IFJlbmRlckFzVGV4dEJlaGF2aW9yTm9ybWFsKQogewogICAgIHdyaXRlSW5kZW50KHRzLCBp bmRlbnQpOwogCkBAIC00NzIsMTkgKzQ4MiwyNiBAQCBzdGF0aWMgdm9pZCB3cml0ZShUZXh0U3Ry ZWFtJiB0cywgUmVuZGVyTGF5ZXImIGwsCiAgICAgICAgICAgICB0cyA8PCAiIHNjcm9sbEhlaWdo dCAiIDw8IGwuc2Nyb2xsSGVpZ2h0KCk7CiAgICAgfQogCi0gICAgaWYgKGxheWVyVHlwZSA9PSAt MSkKKyAgICBpZiAocGFpbnRQaGFzZSA9PSBMYXllclBhaW50UGhhc2VCYWNrZ3JvdW5kKQogICAg ICAgICB0cyA8PCAiIGxheWVyVHlwZTogYmFja2dyb3VuZCBvbmx5IjsKLSAgICBlbHNlIGlmIChs YXllclR5cGUgPT0gMSkKKyAgICBlbHNlIGlmIChwYWludFBoYXNlID09IExheWVyUGFpbnRQaGFz ZUZvcmVncm91bmQpCiAgICAgICAgIHRzIDw8ICIgbGF5ZXJUeXBlOiBmb3JlZ3JvdW5kIG9ubHki OwotCisgICAgCisjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQorICAgIGlmIChiZWhh dmlvciAmIFJlbmRlckFzVGV4dFNob3dDb21wb3NpdGVkTGF5ZXJzKSB7CisgICAgICAgIGlmIChs LmlzQ29tcG9zaXRlZCgpKQorICAgICAgICAgICAgdHMgPDwgIiAoY29tcG9zaXRlZCwgYm91bmRz ICIgPDwgbC5iYWNraW5nKCktPmNvbXBvc2l0ZWRCb3VuZHMoKSA8PCAiKSI7CisgICAgfQorI2Vu ZGlmCisgICAgCiAgICAgdHMgPDwgIlxuIjsKIAotICAgIGlmIChsYXllclR5cGUgIT0gLTEpCisg ICAgaWYgKHBhaW50UGhhc2UgIT0gTGF5ZXJQYWludFBoYXNlQmFja2dyb3VuZCkKICAgICAgICAg d3JpdGUodHMsICpsLnJlbmRlcmVyKCksIGluZGVudCArIDEpOwogfQogCiBzdGF0aWMgdm9pZCB3 cml0ZUxheWVycyhUZXh0U3RyZWFtJiB0cywgY29uc3QgUmVuZGVyTGF5ZXIqIHJvb3RMYXllciwg UmVuZGVyTGF5ZXIqIGwsCi0gICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBJbnRSZWN0JiBw YWludERpcnR5UmVjdCwgaW50IGluZGVudCkKKyAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0 IEludFJlY3QmIHBhaW50RGlydHlSZWN0LCBpbnQgaW5kZW50LCBSZW5kZXJBc1RleHRCZWhhdmlv ciBiZWhhdmlvcikKIHsKICAgICAvLyBDYWxjdWxhdGUgdGhlIGNsaXAgcmVjdHMgd2Ugc2hvdWxk IHVzZS4KICAgICBJbnRSZWN0IGxheWVyQm91bmRzLCBkYW1hZ2VSZWN0LCBjbGlwUmVjdFRvQXBw bHksIG91dGxpbmVSZWN0OwpAQCAtNDk0LDI5ICs1MTEsNDYgQEAgc3RhdGljIHZvaWQgd3JpdGVM YXllcnMoVGV4dFN0cmVhbSYgdHMsIGNvbnN0IFJlbmRlckxheWVyKiByb290TGF5ZXIsIFJlbmRl ckxheWUKICAgICBsLT51cGRhdGVaT3JkZXJMaXN0cygpOwogICAgIGwtPnVwZGF0ZU5vcm1hbEZs b3dMaXN0KCk7CiAKLSAgICBib29sIHNob3VsZFBhaW50ID0gbC0+aW50ZXJzZWN0c0RhbWFnZVJl Y3QobGF5ZXJCb3VuZHMsIGRhbWFnZVJlY3QsIHJvb3RMYXllcik7CisgICAgYm9vbCBzaG91bGRQ YWludCA9IChiZWhhdmlvciAmIFJlbmRlckFzVGV4dFNob3dBbGxMYXllcnMpID8gdHJ1ZSA6IGwt PmludGVyc2VjdHNEYW1hZ2VSZWN0KGxheWVyQm91bmRzLCBkYW1hZ2VSZWN0LCByb290TGF5ZXIp OwogICAgIFZlY3RvcjxSZW5kZXJMYXllcio+KiBuZWdMaXN0ID0gbC0+bmVnWk9yZGVyTGlzdCgp OwotICAgIGlmIChzaG91bGRQYWludCAmJiBuZWdMaXN0ICYmIG5lZ0xpc3QtPnNpemUoKSA+IDAp Ci0gICAgICAgIHdyaXRlKHRzLCAqbCwgbGF5ZXJCb3VuZHMsIGRhbWFnZVJlY3QsIGNsaXBSZWN0 VG9BcHBseSwgb3V0bGluZVJlY3QsIC0xLCBpbmRlbnQpOworICAgIGJvb2wgcGFpbnRzQmFja2dy b3VuZFNlcGFyYXRlbHkgPSBuZWdMaXN0ICYmIG5lZ0xpc3QtPnNpemUoKSA+IDA7CisgICAgaWYg KHNob3VsZFBhaW50ICYmIHBhaW50c0JhY2tncm91bmRTZXBhcmF0ZWx5KQorICAgICAgICB3cml0 ZSh0cywgKmwsIGxheWVyQm91bmRzLCBkYW1hZ2VSZWN0LCBjbGlwUmVjdFRvQXBwbHksIG91dGxp bmVSZWN0LCBMYXllclBhaW50UGhhc2VCYWNrZ3JvdW5kLCBpbmRlbnQsIGJlaGF2aW9yKTsKIAog ICAgIGlmIChuZWdMaXN0KSB7CisgICAgICAgIGludCBjdXJySW5kZW50ID0gaW5kZW50OworICAg ICAgICBpZiAoYmVoYXZpb3IgJiBSZW5kZXJBc1RleHRTaG93TGF5ZXJOZXN0aW5nKSB7CisgICAg ICAgICAgICB3cml0ZUluZGVudCh0cywgaW5kZW50KTsKKyAgICAgICAgICAgIHRzIDw8ICIgbmVn YXRpdmUgei1vcmRlciBsaXN0KCIgPDwgbmVnTGlzdC0+c2l6ZSgpIDw8ICIpXG4iOworICAgICAg ICAgICAgKytjdXJySW5kZW50OworICAgICAgICB9CiAgICAgICAgIGZvciAodW5zaWduZWQgaSA9 IDA7IGkgIT0gbmVnTGlzdC0+c2l6ZSgpOyArK2kpCi0gICAgICAgICAgICB3cml0ZUxheWVycyh0 cywgcm9vdExheWVyLCBuZWdMaXN0LT5hdChpKSwgcGFpbnREaXJ0eVJlY3QsIGluZGVudCk7Cisg ICAgICAgICAgICB3cml0ZUxheWVycyh0cywgcm9vdExheWVyLCBuZWdMaXN0LT5hdChpKSwgcGFp bnREaXJ0eVJlY3QsIGN1cnJJbmRlbnQsIGJlaGF2aW9yKTsKICAgICB9CiAKICAgICBpZiAoc2hv dWxkUGFpbnQpCi0gICAgICAgIHdyaXRlKHRzLCAqbCwgbGF5ZXJCb3VuZHMsIGRhbWFnZVJlY3Qs IGNsaXBSZWN0VG9BcHBseSwgb3V0bGluZVJlY3QsIG5lZ0xpc3QgJiYgbmVnTGlzdC0+c2l6ZSgp ID4gMCwgaW5kZW50KTsKLQotICAgIFZlY3RvcjxSZW5kZXJMYXllcio+KiBub3JtYWxGbG93TGlz dCA9IGwtPm5vcm1hbEZsb3dMaXN0KCk7Ci0gICAgaWYgKG5vcm1hbEZsb3dMaXN0KSB7CisgICAg ICAgIHdyaXRlKHRzLCAqbCwgbGF5ZXJCb3VuZHMsIGRhbWFnZVJlY3QsIGNsaXBSZWN0VG9BcHBs eSwgb3V0bGluZVJlY3QsIHBhaW50c0JhY2tncm91bmRTZXBhcmF0ZWx5ID8gTGF5ZXJQYWludFBo YXNlRm9yZWdyb3VuZCA6IExheWVyUGFpbnRQaGFzZUFsbCwgaW5kZW50LCBiZWhhdmlvcik7CisK KyAgICBpZiAoVmVjdG9yPFJlbmRlckxheWVyKj4qIG5vcm1hbEZsb3dMaXN0ID0gbC0+bm9ybWFs Rmxvd0xpc3QoKSkgeworICAgICAgICBpbnQgY3VyckluZGVudCA9IGluZGVudDsKKyAgICAgICAg aWYgKGJlaGF2aW9yICYgUmVuZGVyQXNUZXh0U2hvd0xheWVyTmVzdGluZykgeworICAgICAgICAg ICAgd3JpdGVJbmRlbnQodHMsIGluZGVudCk7CisgICAgICAgICAgICB0cyA8PCAiIG5vcm1hbCBm bG93IGxpc3QoIiA8PCBub3JtYWxGbG93TGlzdC0+c2l6ZSgpIDw8ICIpXG4iOworICAgICAgICAg ICAgKytjdXJySW5kZW50OworICAgICAgICB9CiAgICAgICAgIGZvciAodW5zaWduZWQgaSA9IDA7 IGkgIT0gbm9ybWFsRmxvd0xpc3QtPnNpemUoKTsgKytpKQotICAgICAgICAgICAgd3JpdGVMYXll cnModHMsIHJvb3RMYXllciwgbm9ybWFsRmxvd0xpc3QtPmF0KGkpLCBwYWludERpcnR5UmVjdCwg aW5kZW50KTsKKyAgICAgICAgICAgIHdyaXRlTGF5ZXJzKHRzLCByb290TGF5ZXIsIG5vcm1hbEZs b3dMaXN0LT5hdChpKSwgcGFpbnREaXJ0eVJlY3QsIGN1cnJJbmRlbnQsIGJlaGF2aW9yKTsKICAg ICB9CiAKLSAgICBWZWN0b3I8UmVuZGVyTGF5ZXIqPiogcG9zTGlzdCA9IGwtPnBvc1pPcmRlckxp c3QoKTsKLSAgICBpZiAocG9zTGlzdCkgeworICAgIGlmIChWZWN0b3I8UmVuZGVyTGF5ZXIqPiog cG9zTGlzdCA9IGwtPnBvc1pPcmRlckxpc3QoKSkgeworICAgICAgICBpbnQgY3VyckluZGVudCA9 IGluZGVudDsKKyAgICAgICAgaWYgKGJlaGF2aW9yICYgUmVuZGVyQXNUZXh0U2hvd0xheWVyTmVz dGluZykgeworICAgICAgICAgICAgd3JpdGVJbmRlbnQodHMsIGluZGVudCk7CisgICAgICAgICAg ICB0cyA8PCAiIHBvc2l0aXZlIHotb3JkZXIgbGlzdCgiIDw8IHBvc0xpc3QtPnNpemUoKSA8PCAi KVxuIjsKKyAgICAgICAgICAgICsrY3VyckluZGVudDsKKyAgICAgICAgfQogICAgICAgICBmb3Ig KHVuc2lnbmVkIGkgPSAwOyBpICE9IHBvc0xpc3QtPnNpemUoKTsgKytpKQotICAgICAgICAgICAg d3JpdGVMYXllcnModHMsIHJvb3RMYXllciwgcG9zTGlzdC0+YXQoaSksIHBhaW50RGlydHlSZWN0 LCBpbmRlbnQpOworICAgICAgICAgICAgd3JpdGVMYXllcnModHMsIHJvb3RMYXllciwgcG9zTGlz dC0+YXQoaSksIHBhaW50RGlydHlSZWN0LCBjdXJySW5kZW50LCBiZWhhdmlvcik7CiAgICAgfQog fQogCkBAIC01NjIsNyArNTk2LDcgQEAgc3RhdGljIHZvaWQgd3JpdGVTZWxlY3Rpb24oVGV4dFN0 cmVhbSYgdHMsIGNvbnN0IFJlbmRlck9iamVjdCogbykKICAgICAgICAgICAgPDwgInNlbGVjdGlv biBlbmQ6ICAgcG9zaXRpb24gIiA8PCBzZWxlY3Rpb24uZW5kKCkuZGVwcmVjYXRlZEVkaXRpbmdP ZmZzZXQoKSA8PCAiIG9mICIgPDwgbm9kZVBvc2l0aW9uKHNlbGVjdGlvbi5lbmQoKS5ub2RlKCkp IDw8ICJcbiI7CiB9CiAKLVN0cmluZyBleHRlcm5hbFJlcHJlc2VudGF0aW9uKEZyYW1lKiBmcmFt ZSkKK1N0cmluZyBleHRlcm5hbFJlcHJlc2VudGF0aW9uKEZyYW1lKiBmcmFtZSwgUmVuZGVyQXNU ZXh0QmVoYXZpb3IgYmVoYXZpb3IpCiB7CiAgICAgZnJhbWUtPmRvY3VtZW50KCktPnVwZGF0ZUxh eW91dCgpOwogCkBAIC01NzYsNyArNjEwLDcgQEAgU3RyaW5nIGV4dGVybmFsUmVwcmVzZW50YXRp b24oRnJhbWUqIGZyYW1lKQogI2VuZGlmCiAgICAgaWYgKG8tPmhhc0xheWVyKCkpIHsKICAgICAg ICAgUmVuZGVyTGF5ZXIqIGwgPSB0b1JlbmRlckJveChvKS0+bGF5ZXIoKTsKLSAgICAgICAgd3Jp dGVMYXllcnModHMsIGwsIGwsIEludFJlY3QobC0+eCgpLCBsLT55KCksIGwtPndpZHRoKCksIGwt PmhlaWdodCgpKSk7CisgICAgICAgIHdyaXRlTGF5ZXJzKHRzLCBsLCBsLCBJbnRSZWN0KGwtPngo KSwgbC0+eSgpLCBsLT53aWR0aCgpLCBsLT5oZWlnaHQoKSksIDAsIGJlaGF2aW9yKTsKICAgICAg ICAgd3JpdGVTZWxlY3Rpb24odHMsIG8pOwogICAgIH0KICAgICByZXR1cm4gdHMucmVsZWFzZSgp OwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVHJlZUFzVGV4dC5oIGIvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyVHJlZUFzVGV4dC5oCmluZGV4IGIwMGY3YzkuLjEzNTI1ZTcg MTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRyZWVBc1RleHQuaAorKysgYi9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUcmVlQXNUZXh0LmgKQEAgLTM0LDcgKzM0LDE1IEBAIGNs YXNzIFJlbmRlck9iamVjdDsKIGNsYXNzIFN0cmluZzsKIGNsYXNzIFRleHRTdHJlYW07CiAKLVN0 cmluZyBleHRlcm5hbFJlcHJlc2VudGF0aW9uKEZyYW1lKik7CitlbnVtIFJlbmRlckFzVGV4dEJl aGF2aW9yRmxhZ3MgeworICAgIFJlbmRlckFzVGV4dEJlaGF2aW9yTm9ybWFsID0gMCwKKyAgICBS ZW5kZXJBc1RleHRTaG93QWxsTGF5ZXJzID0gMSA8PCAwLCAvLyBEdW1wIGFsbCBsYXllcnMsIG5v dCBqdXN0IHRob3NlIHRoYXQgd291bGQgcGFpbnQuCisgICAgUmVuZGVyQXNUZXh0U2hvd0xheWVy TmVzdGluZyA9IDEgPDwgMSwgLy8gQW5ub3RhdGUgdGhlIGxheWVyIGxpc3RzLgorICAgIFJlbmRl ckFzVGV4dFNob3dDb21wb3NpdGVkTGF5ZXJzID0gMSA8PCAyIC8vIFNob3cgd2hpY2ggbGF5ZXJz IGFyZSBjb21wb3NpdGVkLgorfTsKK3R5cGVkZWYgdW5zaWduZWQgUmVuZGVyQXNUZXh0QmVoYXZp b3I7CisKK1N0cmluZyBleHRlcm5hbFJlcHJlc2VudGF0aW9uKEZyYW1lKiwgUmVuZGVyQXNUZXh0 QmVoYXZpb3IgPSBSZW5kZXJBc1RleHRCZWhhdmlvck5vcm1hbCk7CiB2b2lkIHdyaXRlKFRleHRT dHJlYW0mLCBjb25zdCBSZW5kZXJPYmplY3QmLCBpbnQgaW5kZW50ID0gMCk7CiAKIC8vIEhlbHBl ciBmdW5jdGlvbiBzaGFyZWQgd2l0aCBTVkdSZW5kZXJUcmVlQXNUZXh0Cg==