90199 2012-06-28 13:10:31 -0700 Improve compositing logging output 2012-06-28 13:28:58 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser dino eric simon.fraser thorton webkit.review.bot oldest_to_newest 659731 0 simon.fraser 2012-06-28 13:10:31 -0700 Improve compositing logging output 659737 1 149993 simon.fraser 2012-06-28 13:17:15 -0700 Created attachment 149993 Patch 659745 2 149993 thorton 2012-06-28 13:23:24 -0700 Comment on attachment 149993 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=149993&action=review > Source/WebCore/ChangeLog:11 > + 2. Show element classnames s/classnames/class names/? > Source/WebCore/platform/graphics/GraphicsLayer.cpp:518 > + return static_cast<double>(4 * size().width()) * size().height(); Can we strictly assume {RGBA (in whatever order)}8888 for everyone? > Source/WebCore/rendering/RenderLayerBacking.cpp:1544 > + name += " id=\'" + static_cast<Element*>(node)->getIdAttribute() + "\'"; This is going to be awesome. 659749 3 simon.fraser 2012-06-28 13:28:58 -0700 http://trac.webkit.org/changeset/121461 149993 2012-06-28 13:17:15 -0700 2012-06-28 13:23:24 -0700 Patch bug-90199-20120628131715.patch text/plain 15619 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTIxNDQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmI1MzRjZGFjMDExNjVj OTk3OGM0MzY2M2VlOTlhYjFlODI3M2M5My4uNDcwMzFiNzI2NDNiM2YzNDBmMzg2MjdkYTI4Yzlm OTk4ZWQzY2JhZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDEyLTA2LTI4ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIEltcHJvdmUgY29t cG9zaXRpbmcgbG9nZ2luZyBvdXRwdXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTkwMTk5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgSW1wcm92ZSB0aGUgY29tcG9zaXRpbmcgbG9nZ2luZyBjaGFubmVsIG91 dHB1dCBpbiBhIGZldworICAgICAgICB1c2VmdWwgd2F5czoKKyAgICAgICAgMS4gUmVwb3J0IG1l bW9yeSB1c2UsIHJhdGhlciB0aGFuIG1lZ2FwaXhlbHMKKyAgICAgICAgMi4gU2hvdyBlbGVtZW50 IGNsYXNzbmFtZXMKKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzTGF5ZXIu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllcjo6YmFja2luZ1N0b3JlTWVtb3J5 RXN0aW1hdGUpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzTGF5ZXIuaDoK KyAgICAgICAgKEdyYXBoaWNzTGF5ZXIpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nh L0dyYXBoaWNzTGF5ZXJDQS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0xheWVyQ0E6 OmJhY2tpbmdTdG9yZU1lbW9yeUVzdGltYXRlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy9jYS9HcmFwaGljc0xheWVyQ0EuaDoKKyAgICAgICAgKEdyYXBoaWNzTGF5ZXJDQSk6CisgICAg ICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJMYXllckJhY2tpbmc6Om5hbWVGb3JMYXllcik6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJMYXllckJhY2tpbmc6OmJhY2tpbmdTdG9yZU1lbW9yeUVzdGltYXRlKToKKyAgICAgICAg KiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmg6CisgICAgICAgIChSZW5kZXJMYXllckJh Y2tpbmcpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpSZW5kZXJMYXllckNvbXBv c2l0b3IpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp1cGRhdGVD b21wb3NpdGluZ0xheWVycyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0 b3I6OmxvZ0xheWVySW5mbyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0 b3I6OnVwZGF0ZU92ZXJmbG93Q29udHJvbHNMYXllcnMpOgorICAgICAgICAqIHJlbmRlcmluZy9S ZW5kZXJMYXllckNvbXBvc2l0b3IuaDoKKyAgICAgICAgKFJlbmRlckxheWVyQ29tcG9zaXRvcik6 CisKIDIwMTItMDYtMjggIEthbGV2IExlbWJlciAgPGthbGV2bGVtYmVyQGdtYWlsLmNvbT4KIAog ICAgICAgICBbR1RLXSBSZW1vdmUgV2luZG93cyBzdXBwb3J0IGZyb20gcGx1Z2lucy9ndGsvCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0xheWVy LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzTGF5ZXIuY3Bw CmluZGV4IDEwZDdiN2ZjOGRhNGY0ODZkMDNlMDMzZmI0ODIxMTU4NjFhZjYyZjAuLjlhNTJmYjY3 YjQ3NjMyODk2YzFjNjVjNGRmNzIwODE2MWVmYTcwNzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzTGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzTGF5ZXIuY3BwCkBAIC01MDksMTMgKzUwOSwx MyBAQCBpbnQgR3JhcGhpY3NMYXllcjo6dmFsaWRhdGVUcmFuc2Zvcm1PcGVyYXRpb25zKGNvbnN0 IEtleWZyYW1lVmFsdWVMaXN0JiB2YWx1ZUxpcwogICAgIHJldHVybiBmaXJzdEluZGV4OwogfQog Ci1kb3VibGUgR3JhcGhpY3NMYXllcjo6YmFja2luZ1N0b3JlQXJlYSgpIGNvbnN0Citkb3VibGUg R3JhcGhpY3NMYXllcjo6YmFja2luZ1N0b3JlTWVtb3J5RXN0aW1hdGUoKSBjb25zdAogewogICAg IGlmICghZHJhd3NDb250ZW50KCkpCiAgICAgICAgIHJldHVybiAwOwogICAgIAogICAgIC8vIEVm ZmVjdHMgb2YgcGFnZSBhbmQgZGV2aWNlIHNjYWxlIGFyZSBpZ25vcmVkOyBzdWJjbGFzc2VzIHNo b3VsZCBvdmVycmlkZSB0byB0YWtlIHRoZXNlIGludG8gYWNjb3VudC4KLSAgICByZXR1cm4gc3Rh dGljX2Nhc3Q8ZG91YmxlPihzaXplKCkud2lkdGgoKSkgKiBzaXplKCkuaGVpZ2h0KCk7CisgICAg cmV0dXJuIHN0YXRpY19jYXN0PGRvdWJsZT4oNCAqIHNpemUoKS53aWR0aCgpKSAqIHNpemUoKS5o ZWlnaHQoKTsKIH0KIAogc3RhdGljIHZvaWQgd3JpdGVJbmRlbnQoVGV4dFN0cmVhbSYgdHMsIGlu dCBpbmRlbnQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9H cmFwaGljc0xheWVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGlj c0xheWVyLmgKaW5kZXggMTZjNzNhNDgzOGUwNDQ3ZTVhYWVhMjY0MGNmMjM2NGZlZDA4NmIzMy4u ZTAwYzc5NTg4YWE2Mjk1NzExODQxMjZmN2E5NTIxYmRlZjcxMGYwNCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NMYXllci5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzTGF5ZXIuaApAQCAtNDI2LDggKzQy Niw4IEBAIHB1YmxpYzoKICAgICAvLyBwb2ludGVycyBmb3IgdGhlIGxheWVycyBhbmQgdGltaW5n IGRhdGEgd2lsbCBiZSBpbmNsdWRlZCBpbiB0aGUgcmV0dXJuZWQgc3RyaW5nLgogICAgIFN0cmlu ZyBsYXllclRyZWVBc1RleHQoTGF5ZXJUcmVlQXNUZXh0QmVoYXZpb3IgPSBMYXllclRyZWVBc1Rl eHRCZWhhdmlvck5vcm1hbCkgY29uc3Q7CiAKLSAgICAvLyBSZXR1cm4gYW4gZXN0aW1hdGUgb2Yg dGhlIGJhY2tpbmcgc3RvcmUgYXJlYSAoaW4gcGl4ZWxzKS4gTWF5IGJlIGluY29ycmVjdCBmb3Ig dGlsZWQgbGF5ZXJzLgotICAgIHZpcnR1YWwgZG91YmxlIGJhY2tpbmdTdG9yZUFyZWEoKSBjb25z dDsKKyAgICAvLyBSZXR1cm4gYW4gZXN0aW1hdGUgb2YgdGhlIGJhY2tpbmcgc3RvcmUgbWVtb3J5 IGNvc3QgKGluIGJ5dGVzKS4gTWF5IGJlIGluY29ycmVjdCBmb3IgdGlsZWQgbGF5ZXJzLgorICAg IHZpcnR1YWwgZG91YmxlIGJhY2tpbmdTdG9yZU1lbW9yeUVzdGltYXRlKCkgY29uc3Q7CiAKICAg ICBib29sIHVzaW5nVGlsZWRMYXllcigpIGNvbnN0IHsgcmV0dXJuIG1fdXNpbmdUaWxlZExheWVy OyB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL0dy YXBoaWNzTGF5ZXJDQS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9H cmFwaGljc0xheWVyQ0EuY3BwCmluZGV4IDA4M2ZiN2EyNmJiY2U3YzIxNDEyMTVjOWZkZDExOWVk YzdiMzQ4MDkuLmVlNjBiODMxOGYyMWVkZTRjZTRhOWFjY2JlMGMxN2UxMThlOGZlMmMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL0dyYXBoaWNzTGF5ZXJD QS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvR3JhcGhpY3NM YXllckNBLmNwcApAQCAtMjgzNSwxMyArMjgzNSwxMyBAQCB2b2lkIEdyYXBoaWNzTGF5ZXJDQTo6 bm90ZUxheWVyUHJvcGVydHlDaGFuZ2VkKExheWVyQ2hhbmdlRmxhZ3MgZmxhZ3MpCiAgICAgbV91 bmNvbW1pdHRlZENoYW5nZXMgfD0gZmxhZ3M7CiB9CiAKLWRvdWJsZSBHcmFwaGljc0xheWVyQ0E6 OmJhY2tpbmdTdG9yZUFyZWEoKSBjb25zdAorZG91YmxlIEdyYXBoaWNzTGF5ZXJDQTo6YmFja2lu Z1N0b3JlTWVtb3J5RXN0aW1hdGUoKSBjb25zdAogewogICAgIGlmICghZHJhd3NDb250ZW50KCkp CiAgICAgICAgIHJldHVybiAwOwogICAgIAogICAgIC8vIGNvbnRlbnRzTGF5ZXIgaXMgZ2l2ZW4g dG8gdXMsIHNvIHdlIGRvbid0IHJlYWxseSBrbm93IGFueXRoaW5nIGFib3V0IGl0cyBjb250ZW50 cy4KLSAgICByZXR1cm4gc3RhdGljX2Nhc3Q8ZG91YmxlPihzaXplKCkud2lkdGgoKSkgKiBzaXpl KCkuaGVpZ2h0KCkgKiBtX2xheWVyLT5jb250ZW50c1NjYWxlKCk7CisgICAgcmV0dXJuIHN0YXRp Y19jYXN0PGRvdWJsZT4oNCAqIHNpemUoKS53aWR0aCgpKSAqIHNpemUoKS5oZWlnaHQoKSAqIG1f bGF5ZXItPmNvbnRlbnRzU2NhbGUoKTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvR3JhcGhpY3NMYXll ckNBLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9HcmFwaGljc0xheWVy Q0EuaAppbmRleCA0ZDVmMDFiOWQ0NmI1NWFlM2MwYWFmZjY5NzViMTE2MmUyMWU4YmU0Li5kNWI0 YzJjNjE3MGUwZjRmNDFhNTkzNjM1MDI2N2E1Yjc3MzhkMGQ1IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9HcmFwaGljc0xheWVyQ0EuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9HcmFwaGljc0xheWVyQ0EuaApAQCAtMTYy LDcgKzE2Miw3IEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCB2b2lkIHBsYXRmb3JtQ0FMYXllckRp ZENyZWF0ZVRpbGVzKGNvbnN0IFZlY3RvcjxGbG9hdFJlY3Q+JiBkaXJ0eVJlY3RzKSBPVkVSUklE RTsKICAgICB2aXJ0dWFsIGZsb2F0IHBsYXRmb3JtQ0FMYXllckRldmljZVNjYWxlRmFjdG9yKCkg T1ZFUlJJREU7CiAKLSAgICB2aXJ0dWFsIGRvdWJsZSBiYWNraW5nU3RvcmVBcmVhKCkgY29uc3Q7 CisgICAgdmlydHVhbCBkb3VibGUgYmFja2luZ1N0b3JlTWVtb3J5RXN0aW1hdGUoKSBjb25zdDsK IAogICAgIHZvaWQgdXBkYXRlT3BhY2l0eU9uTGF5ZXIoKTsKICAgICAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAKaW5kZXggZjlhODE4YTE1NmQ5 Njk1ZWY0ZmUwOTlkYWMxMWVmY2RlYWQxZDk2NC4uNzUwNzMyM2EyMWVhYjU5YmY1MzY3ZjVjNzU4 NmYzYjdhYjdiMzdkMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckxheWVyQmFja2luZy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxh eWVyQmFja2luZy5jcHAKQEAgLTE1NDEsNyArMTU0MSwxOCBAQCBTdHJpbmcgUmVuZGVyTGF5ZXJC YWNraW5nOjpuYW1lRm9yTGF5ZXIoKSBjb25zdAogICAgICAgICBpZiAobm9kZS0+aXNFbGVtZW50 Tm9kZSgpKQogICAgICAgICAgICAgbmFtZSArPSAiICIgKyBzdGF0aWNfY2FzdDxFbGVtZW50Kj4o bm9kZSktPnRhZ05hbWUoKTsKICAgICAgICAgaWYgKG5vZGUtPmhhc0lEKCkpCi0gICAgICAgICAg ICBuYW1lICs9ICIgXCciICsgc3RhdGljX2Nhc3Q8RWxlbWVudCo+KG5vZGUpLT5nZXRJZEF0dHJp YnV0ZSgpICsgIlwnIjsKKyAgICAgICAgICAgIG5hbWUgKz0gIiBpZD1cJyIgKyBzdGF0aWNfY2Fz dDxFbGVtZW50Kj4obm9kZSktPmdldElkQXR0cmlidXRlKCkgKyAiXCciOworCisgICAgICAgIGlm IChub2RlLT5oYXNDbGFzcygpKSB7CisgICAgICAgICAgICBTdHlsZWRFbGVtZW50KiBzdHlsZWRF bGVtZW50ID0gc3RhdGljX2Nhc3Q8U3R5bGVkRWxlbWVudCo+KG5vZGUpOworICAgICAgICAgICAg U3RyaW5nIGNsYXNzZXM7CisgICAgICAgICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IHN0eWxl ZEVsZW1lbnQtPmNsYXNzTmFtZXMoKS5zaXplKCk7ICsraSkgeworICAgICAgICAgICAgICAgIGlm IChpID4gMCkKKyAgICAgICAgICAgICAgICAgICAgY2xhc3NlcyArPSAiICI7CisgICAgICAgICAg ICAgICAgY2xhc3NlcyArPSBzdHlsZWRFbGVtZW50LT5jbGFzc05hbWVzKClbaV07CisgICAgICAg ICAgICB9CisgICAgICAgICAgICBuYW1lICs9ICIgY2xhc3M9XCciICsgY2xhc3NlcyArICJcJyI7 CisgICAgICAgIH0KICAgICB9CiAKICAgICBpZiAobV9vd25pbmdMYXllci0+aXNSZWZsZWN0aW9u KCkpCkBAIC0xNTYxLDI3ICsxNTcyLDI3IEBAIENvbXBvc2l0aW5nTGF5ZXJUeXBlIFJlbmRlckxh eWVyQmFja2luZzo6Y29tcG9zaXRpbmdMYXllclR5cGUoKSBjb25zdAogICAgIHJldHVybiBDb250 YWluZXJDb21wb3NpdGluZ0xheWVyOwogfQogCi1kb3VibGUgUmVuZGVyTGF5ZXJCYWNraW5nOjpi YWNraW5nU3RvcmVBcmVhKCkgY29uc3QKK2RvdWJsZSBSZW5kZXJMYXllckJhY2tpbmc6OmJhY2tp bmdTdG9yZU1lbW9yeUVzdGltYXRlKCkgY29uc3QKIHsKLSAgICBkb3VibGUgYmFja2luZ0FyZWE7 CisgICAgZG91YmxlIGJhY2tpbmdNZW1vcnk7CiAgICAgCiAgICAgLy8gbV9hbmNlc3RvckNsaXBw aW5nTGF5ZXIgYW5kIG1fY2xpcHBpbmdMYXllciBhcmUganVzdCB1c2VkIGZvciBtYXNraW5nLCBz byBoYXZlIG5vIGJhY2tpbmcuCi0gICAgYmFja2luZ0FyZWEgPSBtX2dyYXBoaWNzTGF5ZXItPmJh Y2tpbmdTdG9yZUFyZWEoKTsKKyAgICBiYWNraW5nTWVtb3J5ID0gbV9ncmFwaGljc0xheWVyLT5i YWNraW5nU3RvcmVNZW1vcnlFc3RpbWF0ZSgpOwogICAgIGlmIChtX2ZvcmVncm91bmRMYXllcikK LSAgICAgICAgYmFja2luZ0FyZWEgKz0gbV9mb3JlZ3JvdW5kTGF5ZXItPmJhY2tpbmdTdG9yZUFy ZWEoKTsKKyAgICAgICAgYmFja2luZ01lbW9yeSArPSBtX2ZvcmVncm91bmRMYXllci0+YmFja2lu Z1N0b3JlTWVtb3J5RXN0aW1hdGUoKTsKICAgICBpZiAobV9tYXNrTGF5ZXIpCi0gICAgICAgIGJh Y2tpbmdBcmVhICs9IG1fbWFza0xheWVyLT5iYWNraW5nU3RvcmVBcmVhKCk7CisgICAgICAgIGJh Y2tpbmdNZW1vcnkgKz0gbV9tYXNrTGF5ZXItPmJhY2tpbmdTdG9yZU1lbW9yeUVzdGltYXRlKCk7 CiAKICAgICBpZiAobV9sYXllckZvckhvcml6b250YWxTY3JvbGxiYXIpCi0gICAgICAgIGJhY2tp bmdBcmVhICs9IG1fbGF5ZXJGb3JIb3Jpem9udGFsU2Nyb2xsYmFyLT5iYWNraW5nU3RvcmVBcmVh KCk7CisgICAgICAgIGJhY2tpbmdNZW1vcnkgKz0gbV9sYXllckZvckhvcml6b250YWxTY3JvbGxi YXItPmJhY2tpbmdTdG9yZU1lbW9yeUVzdGltYXRlKCk7CiAKICAgICBpZiAobV9sYXllckZvclZl cnRpY2FsU2Nyb2xsYmFyKQotICAgICAgICBiYWNraW5nQXJlYSArPSBtX2xheWVyRm9yVmVydGlj YWxTY3JvbGxiYXItPmJhY2tpbmdTdG9yZUFyZWEoKTsKKyAgICAgICAgYmFja2luZ01lbW9yeSAr PSBtX2xheWVyRm9yVmVydGljYWxTY3JvbGxiYXItPmJhY2tpbmdTdG9yZU1lbW9yeUVzdGltYXRl KCk7CiAKICAgICBpZiAobV9sYXllckZvclNjcm9sbENvcm5lcikKLSAgICAgICAgYmFja2luZ0Fy ZWEgKz0gbV9sYXllckZvclNjcm9sbENvcm5lci0+YmFja2luZ1N0b3JlQXJlYSgpOworICAgICAg ICBiYWNraW5nTWVtb3J5ICs9IG1fbGF5ZXJGb3JTY3JvbGxDb3JuZXItPmJhY2tpbmdTdG9yZU1l bW9yeUVzdGltYXRlKCk7CiAgICAgCi0gICAgcmV0dXJuIGJhY2tpbmdBcmVhOworICAgIHJldHVy biBiYWNraW5nTWVtb3J5OwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmggYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmgKaW5kZXggZDg3MTg4NThlYWY2 YmNlNDE5MDA0YjYxOTQ5ZjJmZTE5MGIwZDM4Mi4uZmUyNGJjM2ZhOGQ4N2NmNTYwZjcxMTQ4NjMw M2I0MGNhMzY3MDJkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckxheWVyQmFja2luZy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXll ckJhY2tpbmcuaApAQCAtMTYwLDcgKzE2MCw3IEBAIHB1YmxpYzoKICNlbmRpZgogCiAgICAgLy8g UmV0dXJuIGFuIGVzdGltYXRlIG9mIHRoZSBiYWNraW5nIHN0b3JlIGFyZWEgKGluIHBpeGVscykg YWxsb2NhdGVkIGJ5IHRoaXMgb2JqZWN0J3MgR3JhcGhpY3NMYXllcnMuCi0gICAgZG91YmxlIGJh Y2tpbmdTdG9yZUFyZWEoKSBjb25zdDsKKyAgICBkb3VibGUgYmFja2luZ1N0b3JlTWVtb3J5RXN0 aW1hdGUoKSBjb25zdDsKIAogICAgIFN0cmluZyBuYW1lRm9yTGF5ZXIoKSBjb25zdDsKICAgICAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0 b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5j cHAKaW5kZXggMjg2OWY2NjUzODAwZmM1NDA4YTEzZTJhMzcwZGUyNmQ1NjgxNjcwNS4uOTJhYmRk YmU2ZTUxMmQwMzQ3NzA0N2ZhMGI2MjViODZlNTYxZjRhZiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAKQEAgLTE3Miw4ICsxNzIs NiBAQCBzdGF0aWMgaW5saW5lIGJvb2wgY29tcG9zaXRpbmdMb2dFbmFibGVkKCkKICNlbmRpZgog fQogCi0jZGVmaW5lIFBJWEVMU19QRVJfTUVHQVBJWEVMIDEwMDAwMDAuMAotCiBSZW5kZXJMYXll ckNvbXBvc2l0b3I6OlJlbmRlckxheWVyQ29tcG9zaXRvcihSZW5kZXJWaWV3KiByZW5kZXJWaWV3 KQogICAgIDogbV9yZW5kZXJWaWV3KHJlbmRlclZpZXcpCiAgICAgLCBtX3VwZGF0ZUNvbXBvc2l0 aW5nTGF5ZXJzVGltZXIodGhpcywgJlJlbmRlckxheWVyQ29tcG9zaXRvcjo6dXBkYXRlQ29tcG9z aXRpbmdMYXllcnNUaW1lckZpcmVkKQpAQCAtMTk0LDggKzE5Miw4IEBAIFJlbmRlckxheWVyQ29t cG9zaXRvcjo6UmVuZGVyTGF5ZXJDb21wb3NpdG9yKFJlbmRlclZpZXcqIHJlbmRlclZpZXcpCiAg ICAgLCBtX3Jvb3RMYXllclVwZGF0ZUNvdW50KDApCiAgICAgLCBtX29ibGlnYXRlQ29tcG9zaXRl ZExheWVyQ291bnQoMCkKICAgICAsIG1fc2Vjb25kYXJ5Q29tcG9zaXRlZExheWVyQ291bnQoMCkK LSAgICAsIG1fb2JsaWdhdG9yeUJhY2tpbmdBcmVhTWVnYVBpeGVscygwKQotICAgICwgbV9zZWNv bmRhcnlCYWNraW5nQXJlYU1lZ2FQaXhlbHMoMCkKKyAgICAsIG1fb2JsaWdhdG9yeUJhY2tpbmdT dG9yZUJ5dGVzKDApCisgICAgLCBtX3NlY29uZGFyeUJhY2tpbmdTdG9yZUJ5dGVzKDApCiAjZW5k aWYKIHsKIH0KQEAgLTQxNSw4ICs0MTMsOCBAQCB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6 dXBkYXRlQ29tcG9zaXRpbmdMYXllcnMoQ29tcG9zaXRpbmdVcGRhdGVUeXBlIHVwZGF0ZQogICAg IGlmIChjb21wb3NpdGluZ0xvZ0VuYWJsZWQoKSAmJiBpc0Z1bGxVcGRhdGUgJiYgKG5lZWRIaWVy YXJjaHlVcGRhdGUgfHwgbmVlZEdlb21ldHJ5VXBkYXRlKSkgewogICAgICAgICBtX29ibGlnYXRl Q29tcG9zaXRlZExheWVyQ291bnQgPSAwOwogICAgICAgICBtX3NlY29uZGFyeUNvbXBvc2l0ZWRM YXllckNvdW50ID0gMDsKLSAgICAgICAgbV9vYmxpZ2F0b3J5QmFja2luZ0FyZWFNZWdhUGl4ZWxz ID0gMDsKLSAgICAgICAgbV9zZWNvbmRhcnlCYWNraW5nQXJlYU1lZ2FQaXhlbHMgPSAwOworICAg ICAgICBtX29ibGlnYXRvcnlCYWNraW5nU3RvcmVCeXRlcyA9IDA7CisgICAgICAgIG1fc2Vjb25k YXJ5QmFja2luZ1N0b3JlQnl0ZXMgPSAwOwogCiAgICAgICAgIEZyYW1lKiBmcmFtZSA9IG1fcmVu ZGVyVmlldy0+ZnJhbWVWaWV3KCktPmZyYW1lKCk7CiAgICAgICAgIGJvb2wgaXNNYWluRnJhbWUg PSAhbV9yZW5kZXJWaWV3LT5kb2N1bWVudCgpLT5vd25lckVsZW1lbnQoKTsKQEAgLTQ0OCwxMSAr NDQ2LDExIEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp1cGRhdGVDb21wb3NpdGluZ0xh eWVycyhDb21wb3NpdGluZ1VwZGF0ZVR5cGUgdXBkYXRlCiAjaWYgIUxPR19ESVNBQkxFRAogICAg IGlmIChjb21wb3NpdGluZ0xvZ0VuYWJsZWQoKSAmJiBpc0Z1bGxVcGRhdGUgJiYgKG5lZWRIaWVy YXJjaHlVcGRhdGUgfHwgbmVlZEdlb21ldHJ5VXBkYXRlKSkgewogICAgICAgICBkb3VibGUgZW5k VGltZSA9IGN1cnJlbnRUaW1lKCk7Ci0gICAgICAgIExPRyhDb21wb3NpdGluZywgIlRvdGFsIGxh eWVycyAgIHByaW1hcnkgICBzZWNvbmRhcnkgICBvYmxpZ2F0b3J5IGJhY2tpbmcgKE1QKSAgIHNl Y29uZGFyeSBiYWNraW5nKE1QKSAgIHRvdGFsIGJhY2tpbmcgKE1QKSAgdXBkYXRlIHRpbWUgKG1z KVxuIik7CisgICAgICAgIExPRyhDb21wb3NpdGluZywgIlRvdGFsIGxheWVycyAgIHByaW1hcnkg ICBzZWNvbmRhcnkgICBvYmxpZ2F0b3J5IGJhY2tpbmcgKEtCKSAgIHNlY29uZGFyeSBiYWNraW5n KEtCKSAgIHRvdGFsIGJhY2tpbmcgKEtCKSAgdXBkYXRlIHRpbWUgKG1zKVxuIik7CiAKICAgICAg ICAgTE9HKENvbXBvc2l0aW5nLCAiJThkICUxMWQgJTlkICUyMC4yZiAlMjIuMmYgJTIyLjJmICUx OC4yZlxuIiwKICAgICAgICAgICAgIG1fb2JsaWdhdGVDb21wb3NpdGVkTGF5ZXJDb3VudCArIG1f c2Vjb25kYXJ5Q29tcG9zaXRlZExheWVyQ291bnQsIG1fb2JsaWdhdGVDb21wb3NpdGVkTGF5ZXJD b3VudCwKLSAgICAgICAgICAgIG1fc2Vjb25kYXJ5Q29tcG9zaXRlZExheWVyQ291bnQsIG1fb2Js aWdhdG9yeUJhY2tpbmdBcmVhTWVnYVBpeGVscywgbV9zZWNvbmRhcnlCYWNraW5nQXJlYU1lZ2FQ aXhlbHMsIG1fb2JsaWdhdG9yeUJhY2tpbmdBcmVhTWVnYVBpeGVscyArIG1fc2Vjb25kYXJ5QmFj a2luZ0FyZWFNZWdhUGl4ZWxzLCAxMDAwLjAgKiAoZW5kVGltZSAtIHN0YXJ0VGltZSkpOworICAg ICAgICAgICAgbV9zZWNvbmRhcnlDb21wb3NpdGVkTGF5ZXJDb3VudCwgbV9vYmxpZ2F0b3J5QmFj a2luZ1N0b3JlQnl0ZXMgLyAxMDI0LCBtX3NlY29uZGFyeUJhY2tpbmdTdG9yZUJ5dGVzIC8gMTAy NCwgKG1fb2JsaWdhdG9yeUJhY2tpbmdTdG9yZUJ5dGVzICsgbV9zZWNvbmRhcnlCYWNraW5nU3Rv cmVCeXRlcykgLyAxMDI0LCAxMDAwLjAgKiAoZW5kVGltZSAtIHN0YXJ0VGltZSkpOwogICAgIH0K ICNlbmRpZgogICAgIEFTU0VSVCh1cGRhdGVSb290IHx8ICFtX2NvbXBvc2l0aW5nTGF5ZXJzTmVl ZFJlYnVpbGQpOwpAQCAtNDcwLDE0ICs0NjgsMTQgQEAgdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0 b3I6OmxvZ0xheWVySW5mbyhjb25zdCBSZW5kZXJMYXllciogbGF5ZXIsIGludCBkZXB0aCkKICAg ICBSZW5kZXJMYXllckJhY2tpbmcqIGJhY2tpbmcgPSBsYXllci0+YmFja2luZygpOwogICAgIGlm IChyZXF1aXJlc0NvbXBvc2l0aW5nTGF5ZXIobGF5ZXIpIHx8IGxheWVyLT5pc1Jvb3RMYXllcigp KSB7CiAgICAgICAgICsrbV9vYmxpZ2F0ZUNvbXBvc2l0ZWRMYXllckNvdW50OwotICAgICAgICBt X29ibGlnYXRvcnlCYWNraW5nQXJlYU1lZ2FQaXhlbHMgKz0gYmFja2luZy0+YmFja2luZ1N0b3Jl QXJlYSgpIC8gUElYRUxTX1BFUl9NRUdBUElYRUw7CisgICAgICAgIG1fb2JsaWdhdG9yeUJhY2tp bmdTdG9yZUJ5dGVzICs9IGJhY2tpbmctPmJhY2tpbmdTdG9yZU1lbW9yeUVzdGltYXRlKCk7CiAg ICAgfSBlbHNlIHsKICAgICAgICAgKyttX3NlY29uZGFyeUNvbXBvc2l0ZWRMYXllckNvdW50Owot ICAgICAgICBtX3NlY29uZGFyeUJhY2tpbmdBcmVhTWVnYVBpeGVscyArPSBiYWNraW5nLT5iYWNr aW5nU3RvcmVBcmVhKCkgLyBQSVhFTFNfUEVSX01FR0FQSVhFTDsKKyAgICAgICAgbV9zZWNvbmRh cnlCYWNraW5nU3RvcmVCeXRlcyArPSBiYWNraW5nLT5iYWNraW5nU3RvcmVNZW1vcnlFc3RpbWF0 ZSgpOwogICAgIH0KIAotICAgIExPRyhDb21wb3NpdGluZywgIiUqcCAlZHglZCAlLjNmTVAgKCVz KSAlc1xuIiwgMTIgKyBkZXB0aCAqIDIsIGxheWVyLCBiYWNraW5nLT5jb21wb3NpdGVkQm91bmRz KCkud2lkdGgoKSwgYmFja2luZy0+Y29tcG9zaXRlZEJvdW5kcygpLmhlaWdodCgpLAotICAgICAg ICBiYWNraW5nLT5iYWNraW5nU3RvcmVBcmVhKCkgLyBQSVhFTFNfUEVSX01FR0FQSVhFTCwKKyAg ICBMT0coQ29tcG9zaXRpbmcsICIlKnAgJWR4JWQgJS4yZktCICglcykgJXNcbiIsIDEyICsgZGVw dGggKiAyLCBsYXllciwgYmFja2luZy0+Y29tcG9zaXRlZEJvdW5kcygpLndpZHRoKCksIGJhY2tp bmctPmNvbXBvc2l0ZWRCb3VuZHMoKS5oZWlnaHQoKSwKKyAgICAgICAgYmFja2luZy0+YmFja2lu Z1N0b3JlTWVtb3J5RXN0aW1hdGUoKSAvIDEwMjQsCiAgICAgICAgIHJlYXNvbkZvckNvbXBvc2l0 aW5nKGxheWVyKSwgbGF5ZXItPmJhY2tpbmcoKS0+bmFtZUZvckxheWVyKCkudXRmOCgpLmRhdGEo KSk7CiB9CiAjZW5kaWYKQEAgLTIwODcsMTIgKzIwODUsMTIgQEAgdm9pZCBSZW5kZXJMYXllckNv bXBvc2l0b3I6OnVwZGF0ZU92ZXJmbG93Q29udHJvbHNMYXllcnMoKQogICAgIGlmIChyZXF1aXJl c0hvcml6b250YWxTY3JvbGxiYXJMYXllcigpKSB7CiAgICAgICAgIGlmICghbV9sYXllckZvckhv cml6b250YWxTY3JvbGxiYXIpIHsKICAgICAgICAgICAgIG1fbGF5ZXJGb3JIb3Jpem9udGFsU2Ny b2xsYmFyID0gR3JhcGhpY3NMYXllcjo6Y3JlYXRlKHRoaXMpOwotICAgICNpZm5kZWYgTkRFQlVH CisjaWZuZGVmIE5ERUJVRwogICAgICAgICAgICAgbV9sYXllckZvckhvcml6b250YWxTY3JvbGxi YXItPnNldE5hbWUoImhvcml6b250YWwgc2Nyb2xsYmFyIik7Ci0gICAgI2VuZGlmCi0gICAgI2lm IFBMQVRGT1JNKE1BQykgJiYgVVNFKENBKQorI2VuZGlmCisjaWYgUExBVEZPUk0oTUFDKSAmJiBV U0UoQ0EpCiAgICAgICAgICAgICBtX2xheWVyRm9ySG9yaXpvbnRhbFNjcm9sbGJhci0+c2V0QWNj ZWxlcmF0ZXNEcmF3aW5nKGFjY2VsZXJhdGVkRHJhd2luZ0VuYWJsZWQoKSk7Ci0gICAgI2VuZGlm CisjZW5kaWYKICAgICAgICAgICAgIG1fb3ZlcmZsb3dDb250cm9sc0hvc3RMYXllci0+YWRkQ2hp bGQobV9sYXllckZvckhvcml6b250YWxTY3JvbGxiYXIuZ2V0KCkpOwogCiAgICAgICAgICAgICBp ZiAoU2Nyb2xsaW5nQ29vcmRpbmF0b3IqIHNjcm9sbGluZ0Nvb3JkaW5hdG9yID0gdGhpcy0+c2Ny b2xsaW5nQ29vcmRpbmF0b3IoKSkKQEAgLTIxMDksMTIgKzIxMDcsMTIgQEAgdm9pZCBSZW5kZXJM YXllckNvbXBvc2l0b3I6OnVwZGF0ZU92ZXJmbG93Q29udHJvbHNMYXllcnMoKQogICAgIGlmIChy ZXF1aXJlc1ZlcnRpY2FsU2Nyb2xsYmFyTGF5ZXIoKSkgewogICAgICAgICBpZiAoIW1fbGF5ZXJG b3JWZXJ0aWNhbFNjcm9sbGJhcikgewogICAgICAgICAgICAgbV9sYXllckZvclZlcnRpY2FsU2Ny b2xsYmFyID0gR3JhcGhpY3NMYXllcjo6Y3JlYXRlKHRoaXMpOwotICAgICNpZm5kZWYgTkRFQlVH CisjaWZuZGVmIE5ERUJVRwogICAgICAgICAgICAgbV9sYXllckZvclZlcnRpY2FsU2Nyb2xsYmFy LT5zZXROYW1lKCJ2ZXJ0aWNhbCBzY3JvbGxiYXIiKTsKLSAgICAjZW5kaWYKLSAgICAjaWYgUExB VEZPUk0oTUFDKSAmJiBVU0UoQ0EpCi0gICAgICAgICAgICBtX2xheWVyRm9yVmVydGljYWxTY3Jv bGxiYXItPnNldEFjY2VsZXJhdGVzRHJhd2luZyhhY2NlbGVyYXRlZERyYXdpbmdFbmFibGVkKCkp OwotICAgICNlbmRpZgorI2VuZGlmCisjaWYgUExBVEZPUk0oTUFDKSAmJiBVU0UoQ0EpCisgICAg ICAgIG1fbGF5ZXJGb3JWZXJ0aWNhbFNjcm9sbGJhci0+c2V0QWNjZWxlcmF0ZXNEcmF3aW5nKGFj Y2VsZXJhdGVkRHJhd2luZ0VuYWJsZWQoKSk7CisjZW5kaWYKICAgICAgICAgICAgIG1fb3ZlcmZs b3dDb250cm9sc0hvc3RMYXllci0+YWRkQ2hpbGQobV9sYXllckZvclZlcnRpY2FsU2Nyb2xsYmFy LmdldCgpKTsKIAogICAgICAgICAgICAgaWYgKFNjcm9sbGluZ0Nvb3JkaW5hdG9yKiBzY3JvbGxp bmdDb29yZGluYXRvciA9IHRoaXMtPnNjcm9sbGluZ0Nvb3JkaW5hdG9yKCkpCkBAIC0yMTMxLDEy ICsyMTI5LDEyIEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp1cGRhdGVPdmVyZmxvd0Nv bnRyb2xzTGF5ZXJzKCkKICAgICBpZiAocmVxdWlyZXNTY3JvbGxDb3JuZXJMYXllcigpKSB7CiAg ICAgICAgIGlmICghbV9sYXllckZvclNjcm9sbENvcm5lcikgewogICAgICAgICAgICAgbV9sYXll ckZvclNjcm9sbENvcm5lciA9IEdyYXBoaWNzTGF5ZXI6OmNyZWF0ZSh0aGlzKTsKLSAgICAjaWZu ZGVmIE5ERUJVRworI2lmbmRlZiBOREVCVUcKICAgICAgICAgICAgIG1fbGF5ZXJGb3JTY3JvbGxD b3JuZXItPnNldE5hbWUoInNjcm9sbCBjb3JuZXIiKTsKLSAgICAjZW5kaWYKLSAgICAjaWYgUExB VEZPUk0oTUFDKSAmJiBVU0UoQ0EpCisjZW5kaWYKKyNpZiBQTEFURk9STShNQUMpICYmIFVTRShD QSkKICAgICAgICAgICAgIG1fbGF5ZXJGb3JTY3JvbGxDb3JuZXItPnNldEFjY2VsZXJhdGVzRHJh d2luZyhhY2NlbGVyYXRlZERyYXdpbmdFbmFibGVkKCkpOwotICAgICNlbmRpZgorI2VuZGlmCiAg ICAgICAgICAgICBtX292ZXJmbG93Q29udHJvbHNIb3N0TGF5ZXItPmFkZENoaWxkKG1fbGF5ZXJG b3JTY3JvbGxDb3JuZXIuZ2V0KCkpOwogICAgICAgICB9CiAgICAgfSBlbHNlIGlmIChtX2xheWVy Rm9yU2Nyb2xsQ29ybmVyKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyTGF5ZXJDb21wb3NpdG9yLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy TGF5ZXJDb21wb3NpdG9yLmgKaW5kZXggZmYyNGM5NjQ4YTEyZTkwNzg4ZmNmY2E0NTEwMmRmNDAy NjM0OGFjNi4uNWI4N2U1M2M0YTg1NzhhMWM1YWQ2YzdiYzJjZTBjMTdiNGRiNDVjOCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuaApAQCAt MzUzLDggKzM1Myw4IEBAIHByaXZhdGU6CiAgICAgaW50IG1fcm9vdExheWVyVXBkYXRlQ291bnQ7 CiAgICAgaW50IG1fb2JsaWdhdGVDb21wb3NpdGVkTGF5ZXJDb3VudDsgLy8gY291bnQgb2YgbGF5 ZXIgdGhhdCBoYXZlIHRvIGJlIGNvbXBvc2l0ZWQuCiAgICAgaW50IG1fc2Vjb25kYXJ5Q29tcG9z aXRlZExheWVyQ291bnQ7IC8vIGNvdW50IG9mIGxheWVycyB0aGF0IGhhdmUgdG8gYmUgY29tcG9z aXRlZCBiZWNhdXNlIG9mIHN0YWNraW5nIG9yIG92ZXJsYXAuCi0gICAgZG91YmxlIG1fb2JsaWdh dG9yeUJhY2tpbmdBcmVhTWVnYVBpeGVsczsKLSAgICBkb3VibGUgbV9zZWNvbmRhcnlCYWNraW5n QXJlYU1lZ2FQaXhlbHM7CisgICAgZG91YmxlIG1fb2JsaWdhdG9yeUJhY2tpbmdTdG9yZUJ5dGVz OworICAgIGRvdWJsZSBtX3NlY29uZGFyeUJhY2tpbmdTdG9yZUJ5dGVzOwogI2VuZGlmCiB9Owog Cg==