122421 2013-10-06 12:52:04 -0700 Clean up ContentData 2013-10-06 13:13:11 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca allan.jensen commit-queue esprehn+autocc glenn gyuyoung.kim kondapallykalyan macpherson menard oldest_to_newest 936828 0 andersca 2013-10-06 12:52:04 -0700 Clean up ContentData 936829 1 213521 andersca 2013-10-06 12:54:25 -0700 Created attachment 213521 Patch 936831 2 213521 kling 2013-10-06 12:59:16 -0700 Comment on attachment 213521 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=213521&action=review > Source/WebCore/rendering/style/ContentData.h:50 > + virtual std::unique_ptr<ContentData> clone() const; override > Source/WebCore/rendering/style/ContentData.h:65 > + ImageContentData(PassRefPtr<StyleImage> image) explicit > Source/WebCore/rendering/style/ContentData.h:97 > + TextContentData(const String& text) explicit > Source/WebCore/rendering/style/ContentData.h:123 > + CounterContentData(std::unique_ptr<CounterContent> counter) explicit > Source/WebCore/rendering/style/ContentData.h:153 > + QuoteContentData(QuoteType quote) explicit 936836 3 andersca 2013-10-06 13:13:11 -0700 Committed r157005: <http://trac.webkit.org/changeset/157005> 213521 2013-10-06 12:54:25 -0700 2013-10-06 12:59:16 -0700 Patch bug-122421-20131006125424.patch text/plain 14593 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTU3MDAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDE4OTcwZTFlNWQwZjAw ZTk2Y2RmMDljMmJhN2Y5ODI3MzEwYmVjNy4uNDljZjliMDZhNDFiZGFhMWIyNDJkYjdkMTM5NGMz M2U3YjAwMzAxZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEzLTEwLTA2ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgQ2xlYW4gdXAgQ29u dGVudERhdGEKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEyMjQyMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFJlcGxhY2UgdXNlcyBvZiBPd25QdHIgd2l0aCBzdGQ6OnVuaXF1ZV9wdHIgYW5kIGdldCByaWQg b2YgdGhlIENvbnRlbnREYXRhOjpjcmVhdGUgb3ZlcmxvYWRzLgorCisgICAgICAgICogY3NzL1N0 eWxlUmVzb2x2ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGVSZXNvbHZlcjo6YXBwbHlQ cm9wZXJ0eSk6CisgICAgICAgICogcmVuZGVyaW5nL3N0eWxlL0NvbnRlbnREYXRhLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkNvbnRlbnREYXRhOjpjbG9uZSk6CisgICAgICAgICogcmVuZGVyaW5n L3N0eWxlL0NvbnRlbnREYXRhLmg6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50RGF0YTo6c2V0 TmV4dCk6CisgICAgICAgICogcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlclN0eWxlOjphcHBlbmRDb250ZW50KToKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlclN0eWxlOjpzZXRDb250ZW50KToKKyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUv UmVuZGVyU3R5bGUuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUvU3R5bGVSYXJlTm9uSW5o ZXJpdGVkRGF0YS5oOgorCiAyMDEzLTEwLTA2ICBaYW4gRG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdh bGlhLmNvbT4KIAogICAgICAgICBbV2ViSURMXSBBbm5vdGF0ZSBJREwgaW50ZXJmYWNlcyB1bmRl ciBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVzLyB3aXRoIHRoZSBPcGVyYXRpb25zTm90RGVsZXRhYmxl IGF0dHJpYnV0ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUmVzb2x2ZXIu Y3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUmVzb2x2ZXIuY3BwCmluZGV4IGJkNzNlYzFj ZTIwMGYwMzAxMTMzNjg4MTY4MzQ3YjE5ZjJlMWM5OTguLjg4YjFhMDdlOWU1ODI4MTk3YzliODYz NmY4YzlmMjk1NTEyNTQ5Y2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJl c29sdmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSZXNvbHZlci5jcHAKQEAg LTIxODksOCArMjE4OSw4IEBAIHZvaWQgU3R5bGVSZXNvbHZlcjo6YXBwbHlQcm9wZXJ0eShDU1NQ cm9wZXJ0eUlEIGlkLCBDU1NWYWx1ZSogdmFsdWUpCiAgICAgICAgICAgICAgICAgICAgIENTU1Zh bHVlSUQgbGlzdFN0eWxlSWRlbnQgPSBjb3VudGVyVmFsdWUtPmxpc3RTdHlsZUlkZW50KCk7CiAg ICAgICAgICAgICAgICAgICAgIGlmIChsaXN0U3R5bGVJZGVudCAhPSBDU1NWYWx1ZU5vbmUpCiAg ICAgICAgICAgICAgICAgICAgICAgICBsaXN0U3R5bGVUeXBlID0gc3RhdGljX2Nhc3Q8RUxpc3RT dHlsZVR5cGU+KGxpc3RTdHlsZUlkZW50IC0gQ1NTVmFsdWVEaXNjKTsKLSAgICAgICAgICAgICAg ICAgICAgT3duUHRyPENvdW50ZXJDb250ZW50PiBjb3VudGVyID0gYWRvcHRQdHIobmV3IENvdW50 ZXJDb250ZW50KGNvdW50ZXJWYWx1ZS0+aWRlbnRpZmllcigpLCBsaXN0U3R5bGVUeXBlLCBjb3Vu dGVyVmFsdWUtPnNlcGFyYXRvcigpKSk7Ci0gICAgICAgICAgICAgICAgICAgIHN0YXRlLnN0eWxl KCktPnNldENvbnRlbnQoY291bnRlci5yZWxlYXNlKCksIGRpZFNldCk7CisgICAgICAgICAgICAg ICAgICAgIGF1dG8gY291bnRlciA9IHN0ZDo6bWFrZV91bmlxdWU8Q291bnRlckNvbnRlbnQ+KGNv dW50ZXJWYWx1ZS0+aWRlbnRpZmllcigpLCBsaXN0U3R5bGVUeXBlLCBjb3VudGVyVmFsdWUtPnNl cGFyYXRvcigpKTsKKyAgICAgICAgICAgICAgICAgICAgc3RhdGUuc3R5bGUoKS0+c2V0Q29udGVu dChzdGQ6Om1vdmUoY291bnRlciksIGRpZFNldCk7CiAgICAgICAgICAgICAgICAgICAgIGRpZFNl dCA9IHRydWU7CiAgICAgICAgICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgICAgICAgICAg c3dpdGNoIChjb250ZW50VmFsdWUtPmdldFZhbHVlSUQoKSkgewpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL0NvbnRlbnREYXRhLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9zdHlsZS9Db250ZW50RGF0YS5jcHAKaW5kZXggNDc4ZjlhNWJjMmVhNDU3N2U3 YWQ3ZTZkZTc5NjI5M2IxMzE3OThjOC4uZmIxMjZmODIyMzk1MzAzNjRmZmQ1ZDdkM2JjYmQ1Njhl ZjQ5YWY0ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL0NvbnRl bnREYXRhLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvQ29udGVudERh dGEuY3BwCkBAIC0zMywzOCArMzMsMTggQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1QYXNz T3duUHRyPENvbnRlbnREYXRhPiBDb250ZW50RGF0YTo6Y3JlYXRlKFBhc3NSZWZQdHI8U3R5bGVJ bWFnZT4gaW1hZ2UpCitzdGQ6OnVuaXF1ZV9wdHI8Q29udGVudERhdGE+IENvbnRlbnREYXRhOjpj bG9uZSgpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIGFkb3B0UHRyKG5ldyBJbWFnZUNvbnRlbnREYXRh KGltYWdlKSk7Ci19Ci0KLVBhc3NPd25QdHI8Q29udGVudERhdGE+IENvbnRlbnREYXRhOjpjcmVh dGUoY29uc3QgU3RyaW5nJiB0ZXh0KQotewotICAgIHJldHVybiBhZG9wdFB0cihuZXcgVGV4dENv bnRlbnREYXRhKHRleHQpKTsKLX0KLQotUGFzc093blB0cjxDb250ZW50RGF0YT4gQ29udGVudERh dGE6OmNyZWF0ZShQYXNzT3duUHRyPENvdW50ZXJDb250ZW50PiBjb3VudGVyKQotewotICAgIHJl dHVybiBhZG9wdFB0cihuZXcgQ291bnRlckNvbnRlbnREYXRhKGNvdW50ZXIpKTsKLX0KLQotUGFz c093blB0cjxDb250ZW50RGF0YT4gQ29udGVudERhdGE6OmNyZWF0ZShRdW90ZVR5cGUgcXVvdGUp Ci17Ci0gICAgcmV0dXJuIGFkb3B0UHRyKG5ldyBRdW90ZUNvbnRlbnREYXRhKHF1b3RlKSk7Ci19 Ci0KLVBhc3NPd25QdHI8Q29udGVudERhdGE+IENvbnRlbnREYXRhOjpjbG9uZSgpIGNvbnN0Ci17 Ci0gICAgT3duUHRyPENvbnRlbnREYXRhPiByZXN1bHQgPSBjbG9uZUludGVybmFsKCk7CisgICAg YXV0byByZXN1bHQgPSBjbG9uZUludGVybmFsKCk7CiAgICAgCiAgICAgQ29udGVudERhdGEqIGxh c3ROZXdEYXRhID0gcmVzdWx0LmdldCgpOwogICAgIGZvciAoY29uc3QgQ29udGVudERhdGEqIGNv bnRlbnREYXRhID0gbmV4dCgpOyBjb250ZW50RGF0YTsgY29udGVudERhdGEgPSBjb250ZW50RGF0 YS0+bmV4dCgpKSB7Ci0gICAgICAgIE93blB0cjxDb250ZW50RGF0YT4gbmV3RGF0YSA9IGNvbnRl bnREYXRhLT5jbG9uZUludGVybmFsKCk7Ci0gICAgICAgIGxhc3ROZXdEYXRhLT5zZXROZXh0KG5l d0RhdGEucmVsZWFzZSgpKTsKKyAgICAgICAgYXV0byBuZXdEYXRhID0gY29udGVudERhdGEtPmNs b25lSW50ZXJuYWwoKTsKKyAgICAgICAgbGFzdE5ld0RhdGEtPnNldE5leHQoc3RkOjptb3ZlKG5l d0RhdGEpKTsKICAgICAgICAgbGFzdE5ld0RhdGEgPSBsYXN0TmV3RGF0YS0+bmV4dCgpOwogICAg IH0KICAgICAgICAgCi0gICAgcmV0dXJuIHJlc3VsdC5yZWxlYXNlKCk7CisgICAgcmV0dXJuIHJl c3VsdDsKIH0KIAogUmVuZGVyT2JqZWN0KiBJbWFnZUNvbnRlbnREYXRhOjpjcmVhdGVSZW5kZXJl cihEb2N1bWVudCYgZG9jdW1lbnQsIFJlbmRlclN0eWxlJiBwc2V1ZG9TdHlsZSkgY29uc3QKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9Db250ZW50RGF0YS5oIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL0NvbnRlbnREYXRhLmgKaW5kZXggYTYwMWE4 Y2QzNjA4YTFjMmQ3ODhjNDZiNTI3ZjRkZjY4NDgzNGViMS4uYTljYjQzODQ4NWFkOWIwYWE2MTY3 OTUwZDc0NTcyODYyMGNiZmE1NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L3N0eWxlL0NvbnRlbnREYXRhLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxl L0NvbnRlbnREYXRhLmgKQEAgLTI4LDcgKzI4LDYgQEAKICNpbmNsdWRlICJDb3VudGVyQ29udGVu dC5oIgogI2luY2x1ZGUgIlN0eWxlSW1hZ2UuaCIKICNpbmNsdWRlIDx3dGYvT3duUHRyLmg+Ci0j aW5jbHVkZSA8d3RmL1Bhc3NPd25QdHIuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCkBAIC0z OSwxMSArMzgsNiBAQCBjbGFzcyBSZW5kZXJTdHlsZTsKIGNsYXNzIENvbnRlbnREYXRhIHsKICAg ICBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKIHB1YmxpYzoKLSAgICBzdGF0aWMgUGFzc093blB0 cjxDb250ZW50RGF0YT4gY3JlYXRlKFBhc3NSZWZQdHI8U3R5bGVJbWFnZT4pOwotICAgIHN0YXRp YyBQYXNzT3duUHRyPENvbnRlbnREYXRhPiBjcmVhdGUoY29uc3QgU3RyaW5nJik7Ci0gICAgc3Rh dGljIFBhc3NPd25QdHI8Q29udGVudERhdGE+IGNyZWF0ZShQYXNzT3duUHRyPENvdW50ZXJDb250 ZW50Pik7Ci0gICAgc3RhdGljIFBhc3NPd25QdHI8Q29udGVudERhdGE+IGNyZWF0ZShRdW90ZVR5 cGUpOwotICAgIAogICAgIHZpcnR1YWwgfkNvbnRlbnREYXRhKCkgeyB9CiAKICAgICB2aXJ0dWFs IGJvb2wgaXNDb3VudGVyKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KQEAgLTUzLDIyICs0Nywy NiBAQCBwdWJsaWM6CiAKICAgICB2aXJ0dWFsIFJlbmRlck9iamVjdCogY3JlYXRlUmVuZGVyZXIo RG9jdW1lbnQmLCBSZW5kZXJTdHlsZSYpIGNvbnN0ID0gMDsKIAotICAgIHZpcnR1YWwgUGFzc093 blB0cjxDb250ZW50RGF0YT4gY2xvbmUoKSBjb25zdDsKKyAgICB2aXJ0dWFsIHN0ZDo6dW5pcXVl X3B0cjxDb250ZW50RGF0YT4gY2xvbmUoKSBjb25zdDsKIAogICAgIENvbnRlbnREYXRhKiBuZXh0 KCkgY29uc3QgeyByZXR1cm4gbV9uZXh0LmdldCgpOyB9Ci0gICAgdm9pZCBzZXROZXh0KFBhc3NP d25QdHI8Q29udGVudERhdGE+IG5leHQpIHsgbV9uZXh0ID0gbmV4dDsgfQorICAgIHZvaWQgc2V0 TmV4dChzdGQ6OnVuaXF1ZV9wdHI8Q29udGVudERhdGE+IG5leHQpIHsgbV9uZXh0ID0gc3RkOjpt b3ZlKG5leHQpOyB9CiAKICAgICB2aXJ0dWFsIGJvb2wgZXF1YWxzKGNvbnN0IENvbnRlbnREYXRh JikgY29uc3QgPSAwOwogCiBwcml2YXRlOgotICAgIHZpcnR1YWwgUGFzc093blB0cjxDb250ZW50 RGF0YT4gY2xvbmVJbnRlcm5hbCgpIGNvbnN0ID0gMDsKKyAgICB2aXJ0dWFsIHN0ZDo6dW5pcXVl X3B0cjxDb250ZW50RGF0YT4gY2xvbmVJbnRlcm5hbCgpIGNvbnN0ID0gMDsKIAotICAgIE93blB0 cjxDb250ZW50RGF0YT4gbV9uZXh0OworICAgIHN0ZDo6dW5pcXVlX3B0cjxDb250ZW50RGF0YT4g bV9uZXh0OwogfTsKIAogY2xhc3MgSW1hZ2VDb250ZW50RGF0YSBGSU5BTCA6IHB1YmxpYyBDb250 ZW50RGF0YSB7Ci0gICAgZnJpZW5kIGNsYXNzIENvbnRlbnREYXRhOwogcHVibGljOgorICAgIElt YWdlQ29udGVudERhdGEoUGFzc1JlZlB0cjxTdHlsZUltYWdlPiBpbWFnZSkKKyAgICAgICAgOiBt X2ltYWdlKGltYWdlKQorICAgIHsKKyAgICB9CisKICAgICBjb25zdCBTdHlsZUltYWdlKiBpbWFn ZSgpIGNvbnN0IHsgcmV0dXJuIG1faW1hZ2UuZ2V0KCk7IH0KICAgICBTdHlsZUltYWdlKiBpbWFn ZSgpIHsgcmV0dXJuIG1faW1hZ2UuZ2V0KCk7IH0KICAgICB2b2lkIHNldEltYWdlKFBhc3NSZWZQ dHI8U3R5bGVJbWFnZT4gaW1hZ2UpIHsgbV9pbWFnZSA9IGltYWdlOyB9CkBAIC04NCwyMyArODIs MjMgQEAgcHVibGljOgogICAgIH0KIAogcHJpdmF0ZToKLSAgICBJbWFnZUNvbnRlbnREYXRhKFBh c3NSZWZQdHI8U3R5bGVJbWFnZT4gaW1hZ2UpCi0gICAgICAgIDogbV9pbWFnZShpbWFnZSkKLSAg ICB7Ci0gICAgfQotCi0gICAgdmlydHVhbCBQYXNzT3duUHRyPENvbnRlbnREYXRhPiBjbG9uZUlu dGVybmFsKCkgY29uc3QKKyAgICB2aXJ0dWFsIHN0ZDo6dW5pcXVlX3B0cjxDb250ZW50RGF0YT4g Y2xvbmVJbnRlcm5hbCgpIGNvbnN0IE9WRVJSSURFCiAgICAgewogICAgICAgICBSZWZQdHI8U3R5 bGVJbWFnZT4gaW1hZ2UgPSBjb25zdF9jYXN0PFN0eWxlSW1hZ2UqPih0aGlzLT5pbWFnZSgpKTsK LSAgICAgICAgcmV0dXJuIGNyZWF0ZShpbWFnZS5yZWxlYXNlKCkpOworCisgICAgICAgIHJldHVy biBzdGQ6Om1ha2VfdW5pcXVlPEltYWdlQ29udGVudERhdGE+KGltYWdlLnJlbGVhc2UoKSk7CiAg ICAgfQogCiAgICAgUmVmUHRyPFN0eWxlSW1hZ2U+IG1faW1hZ2U7CiB9OwogCiBjbGFzcyBUZXh0 Q29udGVudERhdGEgRklOQUwgOiBwdWJsaWMgQ29udGVudERhdGEgewotICAgIGZyaWVuZCBjbGFz cyBDb250ZW50RGF0YTsKIHB1YmxpYzoKKyAgICBUZXh0Q29udGVudERhdGEoY29uc3QgU3RyaW5n JiB0ZXh0KQorICAgICAgICA6IG1fdGV4dCh0ZXh0KQorICAgIHsKKyAgICB9CisKICAgICBjb25z dCBTdHJpbmcmIHRleHQoKSBjb25zdCB7IHJldHVybiBtX3RleHQ7IH0KICAgICB2b2lkIHNldFRl eHQoY29uc3QgU3RyaW5nJiB0ZXh0KSB7IG1fdGV4dCA9IHRleHQ7IH0KIApAQCAtMTE1LDM1ICsx MTMsMjkgQEAgcHVibGljOgogICAgIH0KIAogcHJpdmF0ZToKLSAgICBUZXh0Q29udGVudERhdGEo Y29uc3QgU3RyaW5nJiB0ZXh0KQotICAgICAgICA6IG1fdGV4dCh0ZXh0KQotICAgIHsKLSAgICB9 Ci0KLSAgICB2aXJ0dWFsIFBhc3NPd25QdHI8Q29udGVudERhdGE+IGNsb25lSW50ZXJuYWwoKSBj b25zdCB7IHJldHVybiBjcmVhdGUodGV4dCgpKTsgfQorICAgIHZpcnR1YWwgc3RkOjp1bmlxdWVf cHRyPENvbnRlbnREYXRhPiBjbG9uZUludGVybmFsKCkgY29uc3QgeyByZXR1cm4gc3RkOjptYWtl X3VuaXF1ZTxUZXh0Q29udGVudERhdGE+KHRleHQoKSk7IH0KIAogICAgIFN0cmluZyBtX3RleHQ7 CiB9OwogCiBjbGFzcyBDb3VudGVyQ29udGVudERhdGEgRklOQUwgOiBwdWJsaWMgQ29udGVudERh dGEgewotICAgIGZyaWVuZCBjbGFzcyBDb250ZW50RGF0YTsKIHB1YmxpYzoKKyAgICBDb3VudGVy Q29udGVudERhdGEoc3RkOjp1bmlxdWVfcHRyPENvdW50ZXJDb250ZW50PiBjb3VudGVyKQorICAg ICAgICA6IG1fY291bnRlcihzdGQ6Om1vdmUoY291bnRlcikpCisgICAgeworICAgIH0KKwogICAg IGNvbnN0IENvdW50ZXJDb250ZW50KiBjb3VudGVyKCkgY29uc3QgeyByZXR1cm4gbV9jb3VudGVy LmdldCgpOyB9Ci0gICAgdm9pZCBzZXRDb3VudGVyKFBhc3NPd25QdHI8Q291bnRlckNvbnRlbnQ+ IGNvdW50ZXIpIHsgbV9jb3VudGVyID0gY291bnRlcjsgfQorICAgIHZvaWQgc2V0Q291bnRlcihz dGQ6OnVuaXF1ZV9wdHI8Q291bnRlckNvbnRlbnQ+IGNvdW50ZXIpIHsgbV9jb3VudGVyID0gc3Rk Ojptb3ZlKGNvdW50ZXIpOyB9CiAKICAgICB2aXJ0dWFsIGJvb2wgaXNDb3VudGVyKCkgY29uc3Qg T1ZFUlJJREUgeyByZXR1cm4gdHJ1ZTsgfQogICAgIHZpcnR1YWwgUmVuZGVyT2JqZWN0KiBjcmVh dGVSZW5kZXJlcihEb2N1bWVudCYsIFJlbmRlclN0eWxlJikgY29uc3QgT1ZFUlJJREU7CiAKIHBy aXZhdGU6Ci0gICAgQ291bnRlckNvbnRlbnREYXRhKFBhc3NPd25QdHI8Q291bnRlckNvbnRlbnQ+ IGNvdW50ZXIpCi0gICAgICAgIDogbV9jb3VudGVyKGNvdW50ZXIpCisgICAgdmlydHVhbCBzdGQ6 OnVuaXF1ZV9wdHI8Q29udGVudERhdGE+IGNsb25lSW50ZXJuYWwoKSBjb25zdCBPVkVSUklERQog ICAgIHsKLSAgICB9Ci0KLSAgICB2aXJ0dWFsIFBhc3NPd25QdHI8Q29udGVudERhdGE+IGNsb25l SW50ZXJuYWwoKSBjb25zdAotICAgIHsKLSAgICAgICAgT3duUHRyPENvdW50ZXJDb250ZW50PiBj b3VudGVyRGF0YSA9IGFkb3B0UHRyKG5ldyBDb3VudGVyQ29udGVudCgqY291bnRlcigpKSk7Ci0g ICAgICAgIHJldHVybiBjcmVhdGUoY291bnRlckRhdGEucmVsZWFzZSgpKTsKKyAgICAgICAgYXV0 byBjb3VudGVyRGF0YSA9IHN0ZDo6bWFrZV91bmlxdWU8Q291bnRlckNvbnRlbnQ+KCpjb3VudGVy KCkpOworICAgICAgICByZXR1cm4gc3RkOjptYWtlX3VuaXF1ZTxDb3VudGVyQ29udGVudERhdGE+ KHN0ZDo6bW92ZShjb3VudGVyRGF0YSkpOwogICAgIH0KIAogICAgIHZpcnR1YWwgYm9vbCBlcXVh bHMoY29uc3QgQ29udGVudERhdGEmIGRhdGEpIGNvbnN0IE9WRVJSSURFCkBAIC0xNTMsMTIgKzE0 NSwxNiBAQCBwcml2YXRlOgogICAgICAgICByZXR1cm4gKnN0YXRpY19jYXN0PGNvbnN0IENvdW50 ZXJDb250ZW50RGF0YSY+KGRhdGEpLmNvdW50ZXIoKSA9PSAqY291bnRlcigpOwogICAgIH0KIAot ICAgIE93blB0cjxDb3VudGVyQ29udGVudD4gbV9jb3VudGVyOworICAgIHN0ZDo6dW5pcXVlX3B0 cjxDb3VudGVyQ29udGVudD4gbV9jb3VudGVyOwogfTsKIAogY2xhc3MgUXVvdGVDb250ZW50RGF0 YSBGSU5BTCA6IHB1YmxpYyBDb250ZW50RGF0YSB7Ci0gICAgZnJpZW5kIGNsYXNzIENvbnRlbnRE YXRhOwogcHVibGljOgorICAgIFF1b3RlQ29udGVudERhdGEoUXVvdGVUeXBlIHF1b3RlKQorICAg ICAgICA6IG1fcXVvdGUocXVvdGUpCisgICAgeworICAgIH0KKwogICAgIFF1b3RlVHlwZSBxdW90 ZSgpIGNvbnN0IHsgcmV0dXJuIG1fcXVvdGU7IH0KICAgICB2b2lkIHNldFF1b3RlKFF1b3RlVHlw ZSBxdW90ZSkgeyBtX3F1b3RlID0gcXVvdGU7IH0KIApAQCAtMTczLDEyICsxNjksNyBAQCBwdWJs aWM6CiAgICAgfQogCiBwcml2YXRlOgotICAgIFF1b3RlQ29udGVudERhdGEoUXVvdGVUeXBlIHF1 b3RlKQotICAgICAgICA6IG1fcXVvdGUocXVvdGUpCi0gICAgewotICAgIH0KLQotICAgIHZpcnR1 YWwgUGFzc093blB0cjxDb250ZW50RGF0YT4gY2xvbmVJbnRlcm5hbCgpIGNvbnN0IHsgcmV0dXJu IGNyZWF0ZShxdW90ZSgpKTsgfQorICAgIHZpcnR1YWwgc3RkOjp1bmlxdWVfcHRyPENvbnRlbnRE YXRhPiBjbG9uZUludGVybmFsKCkgY29uc3QgT1ZFUlJJREUgeyByZXR1cm4gc3RkOjptYWtlX3Vu aXF1ZTxRdW90ZUNvbnRlbnREYXRhPihxdW90ZSgpKTsgfQogCiAgICAgUXVvdGVUeXBlIG1fcXVv dGU7CiB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRl clN0eWxlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5j cHAKaW5kZXggMzFlYjMwN2MxMDlmY2I5NzE1NDIyNzcxY2I5MzIyNjljN2ZkMTA3ZS4uNWUxZmY3 ZTQ3ODdlZTMwMzQwZGE2MjZhZWNjNmU2MGNkMDY4M2IxNyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuY3BwCkBAIC05MjIsMTcgKzkyMiwxNyBAQCB2 b2lkIFJlbmRlclN0eWxlOjpjbGVhckNvbnRlbnQoKQogICAgICAgICByYXJlTm9uSW5oZXJpdGVk RGF0YS5hY2Nlc3MoKS0+bV9jb250ZW50ID0gbnVsbHB0cjsKIH0KIAotdm9pZCBSZW5kZXJTdHls ZTo6YXBwZW5kQ29udGVudChQYXNzT3duUHRyPENvbnRlbnREYXRhPiBjb250ZW50RGF0YSkKK3Zv aWQgUmVuZGVyU3R5bGU6OmFwcGVuZENvbnRlbnQoc3RkOjp1bmlxdWVfcHRyPENvbnRlbnREYXRh PiBjb250ZW50RGF0YSkKIHsKLSAgICBPd25QdHI8Q29udGVudERhdGE+JiBjb250ZW50ID0gcmFy ZU5vbkluaGVyaXRlZERhdGEuYWNjZXNzKCktPm1fY29udGVudDsKKyAgICBhdXRvJiBjb250ZW50 ID0gcmFyZU5vbkluaGVyaXRlZERhdGEuYWNjZXNzKCktPm1fY29udGVudDsKICAgICBDb250ZW50 RGF0YSogbGFzdENvbnRlbnQgPSBjb250ZW50LmdldCgpOwogICAgIHdoaWxlIChsYXN0Q29udGVu dCAmJiBsYXN0Q29udGVudC0+bmV4dCgpKQogICAgICAgICBsYXN0Q29udGVudCA9IGxhc3RDb250 ZW50LT5uZXh0KCk7CiAKICAgICBpZiAobGFzdENvbnRlbnQpCi0gICAgICAgIGxhc3RDb250ZW50 LT5zZXROZXh0KGNvbnRlbnREYXRhKTsKKyAgICAgICAgbGFzdENvbnRlbnQtPnNldE5leHQoc3Rk Ojptb3ZlKGNvbnRlbnREYXRhKSk7CiAgICAgZWxzZQotICAgICAgICBjb250ZW50ID0gY29udGVu dERhdGE7CisgICAgICAgIGNvbnRlbnQgPSBzdGQ6Om1vdmUoY29udGVudERhdGEpOwogfQogCiB2 b2lkIFJlbmRlclN0eWxlOjpzZXRDb250ZW50KFBhc3NSZWZQdHI8U3R5bGVJbWFnZT4gaW1hZ2Us IGJvb2wgYWRkKQpAQCAtOTQxLDE2ICs5NDEsMTYgQEAgdm9pZCBSZW5kZXJTdHlsZTo6c2V0Q29u dGVudChQYXNzUmVmUHRyPFN0eWxlSW1hZ2U+IGltYWdlLCBib29sIGFkZCkKICAgICAgICAgcmV0 dXJuOwogICAgICAgICAKICAgICBpZiAoYWRkKSB7Ci0gICAgICAgIGFwcGVuZENvbnRlbnQoQ29u dGVudERhdGE6OmNyZWF0ZShpbWFnZSkpOworICAgICAgICBhcHBlbmRDb250ZW50KHN0ZDo6bWFr ZV91bmlxdWU8SW1hZ2VDb250ZW50RGF0YT4oaW1hZ2UpKTsKICAgICAgICAgcmV0dXJuOwogICAg IH0KIAotICAgIHJhcmVOb25Jbmhlcml0ZWREYXRhLmFjY2VzcygpLT5tX2NvbnRlbnQgPSBDb250 ZW50RGF0YTo6Y3JlYXRlKGltYWdlKTsKKyAgICByYXJlTm9uSW5oZXJpdGVkRGF0YS5hY2Nlc3Mo KS0+bV9jb250ZW50ID0gc3RkOjptYWtlX3VuaXF1ZTxJbWFnZUNvbnRlbnREYXRhPihpbWFnZSk7 CiB9CiAKIHZvaWQgUmVuZGVyU3R5bGU6OnNldENvbnRlbnQoY29uc3QgU3RyaW5nJiBzdHJpbmcs IGJvb2wgYWRkKQogewotICAgIE93blB0cjxDb250ZW50RGF0YT4mIGNvbnRlbnQgPSByYXJlTm9u SW5oZXJpdGVkRGF0YS5hY2Nlc3MoKS0+bV9jb250ZW50OworICAgIGF1dG8mIGNvbnRlbnQgPSBy YXJlTm9uSW5oZXJpdGVkRGF0YS5hY2Nlc3MoKS0+bV9jb250ZW50OwogICAgIGlmIChhZGQpIHsK ICAgICAgICAgQ29udGVudERhdGEqIGxhc3RDb250ZW50ID0gY29udGVudC5nZXQoKTsKICAgICAg ICAgd2hpbGUgKGxhc3RDb250ZW50ICYmIGxhc3RDb250ZW50LT5uZXh0KCkpCkBAIC05NjIsMzYg Kzk2MiwzNiBAQCB2b2lkIFJlbmRlclN0eWxlOjpzZXRDb250ZW50KGNvbnN0IFN0cmluZyYgc3Ry aW5nLCBib29sIGFkZCkKICAgICAgICAgICAgICAgICBUZXh0Q29udGVudERhdGEqIHRleHRDb250 ZW50ID0gc3RhdGljX2Nhc3Q8VGV4dENvbnRlbnREYXRhKj4obGFzdENvbnRlbnQpOwogICAgICAg ICAgICAgICAgIHRleHRDb250ZW50LT5zZXRUZXh0KHRleHRDb250ZW50LT50ZXh0KCkgKyBzdHJp bmcpOwogICAgICAgICAgICAgfSBlbHNlCi0gICAgICAgICAgICAgICAgbGFzdENvbnRlbnQtPnNl dE5leHQoQ29udGVudERhdGE6OmNyZWF0ZShzdHJpbmcpKTsKKyAgICAgICAgICAgICAgICBsYXN0 Q29udGVudC0+c2V0TmV4dChzdGQ6Om1ha2VfdW5pcXVlPFRleHRDb250ZW50RGF0YT4oc3RyaW5n KSk7CiAKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogICAgIH0KIAotICAgIGNvbnRl bnQgPSBDb250ZW50RGF0YTo6Y3JlYXRlKHN0cmluZyk7CisgICAgY29udGVudCA9IHN0ZDo6bWFr ZV91bmlxdWU8VGV4dENvbnRlbnREYXRhPihzdHJpbmcpOwogfQogCi12b2lkIFJlbmRlclN0eWxl OjpzZXRDb250ZW50KFBhc3NPd25QdHI8Q291bnRlckNvbnRlbnQ+IGNvdW50ZXIsIGJvb2wgYWRk KQordm9pZCBSZW5kZXJTdHlsZTo6c2V0Q29udGVudChzdGQ6OnVuaXF1ZV9wdHI8Q291bnRlckNv bnRlbnQ+IGNvdW50ZXIsIGJvb2wgYWRkKQogewogICAgIGlmICghY291bnRlcikKICAgICAgICAg cmV0dXJuOwogCiAgICAgaWYgKGFkZCkgewotICAgICAgICBhcHBlbmRDb250ZW50KENvbnRlbnRE YXRhOjpjcmVhdGUoY291bnRlcikpOworICAgICAgICBhcHBlbmRDb250ZW50KHN0ZDo6bWFrZV91 bmlxdWU8Q291bnRlckNvbnRlbnREYXRhPihzdGQ6Om1vdmUoY291bnRlcikpKTsKICAgICAgICAg cmV0dXJuOwogICAgIH0KIAotICAgIHJhcmVOb25Jbmhlcml0ZWREYXRhLmFjY2VzcygpLT5tX2Nv bnRlbnQgPSBDb250ZW50RGF0YTo6Y3JlYXRlKGNvdW50ZXIpOworICAgIHJhcmVOb25Jbmhlcml0 ZWREYXRhLmFjY2VzcygpLT5tX2NvbnRlbnQgPSBzdGQ6Om1ha2VfdW5pcXVlPENvdW50ZXJDb250 ZW50RGF0YT4oc3RkOjptb3ZlKGNvdW50ZXIpKTsKIH0KIAogdm9pZCBSZW5kZXJTdHlsZTo6c2V0 Q29udGVudChRdW90ZVR5cGUgcXVvdGUsIGJvb2wgYWRkKQogewogICAgIGlmIChhZGQpIHsKLSAg ICAgICAgYXBwZW5kQ29udGVudChDb250ZW50RGF0YTo6Y3JlYXRlKHF1b3RlKSk7CisgICAgICAg IGFwcGVuZENvbnRlbnQoc3RkOjptYWtlX3VuaXF1ZTxRdW90ZUNvbnRlbnREYXRhPihxdW90ZSkp OwogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgcmFyZU5vbkluaGVyaXRlZERhdGEuYWNj ZXNzKCktPm1fY29udGVudCA9IENvbnRlbnREYXRhOjpjcmVhdGUocXVvdGUpOworICAgIHJhcmVO b25Jbmhlcml0ZWREYXRhLmFjY2VzcygpLT5tX2NvbnRlbnQgPSBzdGQ6Om1ha2VfdW5pcXVlPFF1 b3RlQ29udGVudERhdGE+KHF1b3RlKTsKIH0KICAgICAKIGlubGluZSBib29sIHJlcXVpcmVUcmFu c2Zvcm1PcmlnaW4oY29uc3QgVmVjdG9yPFJlZlB0cjxUcmFuc2Zvcm1PcGVyYXRpb24+ID4mIHRy YW5zZm9ybU9wZXJhdGlvbnMsIFJlbmRlclN0eWxlOjpBcHBseVRyYW5zZm9ybU9yaWdpbiBhcHBs eU9yaWdpbikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5k ZXJTdHlsZS5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmgK aW5kZXggZDFhYTVhODU3NjFiYzg4ZTQzYTgxZmQ5NGExOGNmYWNmN2MyZGNhNC4uMjJjNTM2OGUy NWY2YTUxMDg0YzlkZTU3ZjBjOTU5YmJhYWQzNTVlMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmgKQEAgLTE1NTQsNyArMTU1NCw3IEBAIHB1YmxpYzoK ICAgICB2b2lkIGNsZWFyQ29udGVudCgpOwogICAgIHZvaWQgc2V0Q29udGVudChjb25zdCBTdHJp bmcmLCBib29sIGFkZCA9IGZhbHNlKTsKICAgICB2b2lkIHNldENvbnRlbnQoUGFzc1JlZlB0cjxT dHlsZUltYWdlPiwgYm9vbCBhZGQgPSBmYWxzZSk7Ci0gICAgdm9pZCBzZXRDb250ZW50KFBhc3NP d25QdHI8Q291bnRlckNvbnRlbnQ+LCBib29sIGFkZCA9IGZhbHNlKTsKKyAgICB2b2lkIHNldENv bnRlbnQoc3RkOjp1bmlxdWVfcHRyPENvdW50ZXJDb250ZW50PiwgYm9vbCBhZGQgPSBmYWxzZSk7 CiAgICAgdm9pZCBzZXRDb250ZW50KFF1b3RlVHlwZSwgYm9vbCBhZGQgPSBmYWxzZSk7CiAKICAg ICBjb25zdCBDb3VudGVyRGlyZWN0aXZlTWFwKiBjb3VudGVyRGlyZWN0aXZlcygpIGNvbnN0OwpA QCAtMTkwMCw3ICsxOTAwLDcgQEAgcHJpdmF0ZToKICAgICBDb2xvciBsaWdodGluZ0NvbG9yKCkg Y29uc3QgeyByZXR1cm4gc3ZnU3R5bGUoKS0+bGlnaHRpbmdDb2xvcigpOyB9CiAjZW5kaWYKIAot ICAgIHZvaWQgYXBwZW5kQ29udGVudChQYXNzT3duUHRyPENvbnRlbnREYXRhPik7CisgICAgdm9p ZCBhcHBlbmRDb250ZW50KHN0ZDo6dW5pcXVlX3B0cjxDb250ZW50RGF0YT4pOwogfTsKIAogaW5s aW5lIGludCBhZGp1c3RGb3JBYnNvbHV0ZVpvb20oaW50IHZhbHVlLCBjb25zdCBSZW5kZXJTdHls ZSogc3R5bGUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvU3R5 bGVSYXJlTm9uSW5oZXJpdGVkRGF0YS5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxl L1N0eWxlUmFyZU5vbkluaGVyaXRlZERhdGEuaAppbmRleCBmNDI2ZTMxZDI4NjY2NDU1OTQ1YjA0 MDFiZDNkZTFhOGEwZmVkMjk2Li40MjQ3NTUyNGU0MDAyNjUyNmM2ZTcyZTE0ZjIzMWQ1YmYxNDQ4 ZjAyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvU3R5bGVSYXJl Tm9uSW5oZXJpdGVkRGF0YS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9T dHlsZVJhcmVOb25Jbmhlcml0ZWREYXRhLmgKQEAgLTEyMyw3ICsxMjMsNyBAQCBwdWJsaWM6CiAg ICAgRGF0YVJlZjxTdHlsZUdyaWREYXRhPiBtX2dyaWQ7CiAgICAgRGF0YVJlZjxTdHlsZUdyaWRJ dGVtRGF0YT4gbV9ncmlkSXRlbTsKIAotICAgIE93blB0cjxDb250ZW50RGF0YT4gbV9jb250ZW50 OworICAgIHN0ZDo6dW5pcXVlX3B0cjxDb250ZW50RGF0YT4gbV9jb250ZW50OwogICAgIE93blB0 cjxDb3VudGVyRGlyZWN0aXZlTWFwPiBtX2NvdW50ZXJEaXJlY3RpdmVzOwogCiAgICAgT3duUHRy PFNoYWRvd0RhdGE+IG1fYm94U2hhZG93OyAgLy8gRm9yIGJveC1zaGFkb3cgZGVjb3JhdGlvbnMu Cg==