84562 2012-04-22 23:05:28 -0700 Web Inspector: make populateChildren methods private in heap profiler front-end 2012-04-22 23:17:09 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 yurys yurys apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 607482 0 yurys 2012-04-22 23:05:28 -0700 Make populateChildren method on HeapSnapshotConstructorsDataGrid and HeapSnapshotDiffDataGrid should be private. 607488 1 138294 yurys 2012-04-22 23:11:03 -0700 Created attachment 138294 Patch 607490 2 yurys 2012-04-22 23:17:09 -0700 Committed r114872: <http://trac.webkit.org/changeset/114872> 138294 2012-04-22 23:11:03 -0700 2012-04-22 23:13:56 -0700 Patch bug-84562-20120423101101.patch text/plain 13832 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMTE0ODY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDhkYzYyMTNjNWZlNzg4 MzNhZTk2NmY1NzExYWI2NDM4ZDAxYjY1MC4uYjk1YmZmODA0YmI5NTUxNDFhODMzMWVjYTJhMjlk ODZlMDhkODdmOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDEyLTA0LTIyICBZdXJ5 IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IG1ha2UgcG9wdWxhdGVDaGlsZHJlbiBtZXRob2RzIHByaXZhdGUgaW4gaGVhcCBwcm9maWxl ciBmcm9udC1lbmQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTg0NTYyCisKKyAgICAgICAgLSBwb3B1bGF0ZUNoaWxkcmVuIG1ldGhvZCBvbiBIZWFwU25h cHNob3RDb25zdHJ1Y3RvcnNEYXRhR3JpZCBhbmQKKyAgICAgICAgSGVhcFNuYXBzaG90RGlmZkRh dGFHcmlkIG5vdyBpcyBwcml2YXRlLgorICAgICAgICAtIE1hZGUgX2RlZmF1bHRQb3B1bGF0ZUNv dW50IGEgcHVibGljIG1ldGhvZCBvbiBIZWFwU25hcHNob3RTb3J0YWJsZURhdGFHcmlkIHdoaWNo CisgICAgICAgIGlzIG92ZXJyaWRlbiBpbiBzb21lIGRlc2NlbmRhbnRzCisgICAgICAgIC0gUmVt b3ZlZCB1bnVzZWQgSGVhcFNuYXBzaG90UGF0aEZpbmRlclByb3h5CisgICAgICAgIC0gYWRkZWQg Y2xvc3VyZSBjb21waWxlciBhbm5vdGF0aW9ucworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9IZWFwU25hcHNob3RE YXRhR3JpZHMuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90U29ydGFibGVE YXRhR3JpZC5wcm90b3R5cGUuZGVmYXVsdFBvcHVsYXRlQ291bnQpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLkhlYXBTbmFwc2hvdENvbnN0cnVjdG9yc0RhdGFHcmlkLnByb3RvdHlwZS5zZXREYXRh U291cmNlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RDb25zdHJ1Y3RvcnNE YXRhR3JpZC5wcm90b3R5cGUuX2ZpbHRlclNlbGVjdEluZGV4Q2hhbmdlZCk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90RGlmZkRhdGFHcmlkLnByb3RvdHlwZS5kZWZhdWx0UG9w dWxhdGVDb3VudCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90RGlmZkRhdGFH cmlkLnByb3RvdHlwZS5zZXRCYXNlRGF0YVNvdXJjZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu SGVhcFNuYXBzaG90RG9taW5hdG9yc0RhdGFHcmlkLnByb3RvdHlwZS5kZWZhdWx0UG9wdWxhdGVD b3VudCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9IZWFwU25hcHNob3RHcmlkTm9k ZXMuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90R3JpZE5vZGUpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdEdyaWROb2RlLnByb3RvdHlwZS5wb3B1bGF0 ZUNoaWxkcmVuLmNhbGxTZXJpYWxpemUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkhlYXBTbmFw c2hvdERpZmZOb2RlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3REaWZmTm9k ZS5wcm90b3R5cGUucG9wdWxhdGVDaGlsZHJlbi5maXJzdFByb3ZpZGVyUG9wdWxhdGVkKToKKyAg ICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0hlYXBTbmFwc2hvdFByb3h5LmpzOgorCiAyMDEy LTA0LTIyICBTcmlyYW0gTmVlbGFrYW5kYW4gIDxzcmlyYW0ubmVlbGFrYW5kYW5AZ21haWwuY29t PgogCiAgICAgICAgIFN5bmMgdGhlIE1PWl9YMTEgY2hhbmdlcyBmcm9tIHIxNCBvZiBodHRwOi8v Y29kZS5nb29nbGUuY29tL3AvbnBhcGktc2RrLwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9IZWFwU25hcHNob3REYXRhR3JpZHMuanMgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0hlYXBTbmFwc2hvdERhdGFHcmlkcy5qcwppbmRleCBj N2Q0Y2RlMzcxNzM0OTc0ODY4ZGVhOWNmYWNlMTU2ZGY5YzBkMzk1Li5kMTcwMmY0OTkxODE4MDg1 NmMyZDM5NWNjZTM3NTQ2ZTNhODEyYjY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0hlYXBTbmFwc2hvdERhdGFHcmlkcy5qcworKysgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0hlYXBTbmFwc2hvdERhdGFHcmlkcy5qcwpAQCAtMzks NiArMzksMTQgQEAgV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdFNvcnRhYmxlRGF0YUdyaWQgPSBm dW5jdGlvbihjb2x1bW5zKQogfQogCiBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90U29ydGFibGVE YXRhR3JpZC5wcm90b3R5cGUgPSB7CisgICAgLyoqCisgICAgICogQHJldHVybiB7bnVtYmVyfQor ICAgICAqLworICAgIGRlZmF1bHRQb3B1bGF0ZUNvdW50OiBmdW5jdGlvbigpCisgICAgeworICAg ICAgICByZXR1cm4gMTAwOworICAgIH0sCisKICAgICBkaXNwb3NlOiBmdW5jdGlvbigpCiAgICAg ewogICAgICAgICB2YXIgY2hpbGRyZW4gPSB0aGlzLnRvcExldmVsTm9kZXMoKTsKQEAgLTI5Myw4 ICszMDEsNiBAQCBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90Q29udGFpbm1lbnREYXRhR3JpZCA9 IGZ1bmN0aW9uKGNvbHVtbnMpCiB9CiAKIFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RDb250YWlu bWVudERhdGFHcmlkLnByb3RvdHlwZSA9IHsKLSAgICBfZGVmYXVsdFBvcHVsYXRlQ291bnQ6IDEw MCwKLQogICAgIGV4cGFuZFJvdXRlOiBmdW5jdGlvbihyb3V0ZSkKICAgICB7CiAgICAgICAgIGZ1 bmN0aW9uIG5leHRTdGVwKHBhcmVudCwgaG9wSW5kZXgpCkBAIC00MDUsOCArNDExLDYgQEAgV2Vi SW5zcGVjdG9yLkhlYXBTbmFwc2hvdENvbnN0cnVjdG9yc0RhdGFHcmlkID0gZnVuY3Rpb24oKQog fQogCiBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90Q29uc3RydWN0b3JzRGF0YUdyaWQucHJvdG90 eXBlID0gewotICAgIF9kZWZhdWx0UG9wdWxhdGVDb3VudDogMTAwLAotCiAgICAgX3NvcnRGaWVs ZHM6IGZ1bmN0aW9uKHNvcnRDb2x1bW4sIHNvcnRBc2NlbmRpbmcpCiAgICAgewogICAgICAgICBy ZXR1cm4gewpAQCAtNDIzLDEwICs0MjcsMTAgQEAgV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdENv bnN0cnVjdG9yc0RhdGFHcmlkLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5zbmFwc2hvdFZp ZXcgPSBzbmFwc2hvdFZpZXc7CiAgICAgICAgIHRoaXMuc25hcHNob3QgPSBzbmFwc2hvdDsKICAg ICAgICAgaWYgKHRoaXMuX3Byb2ZpbGVJbmRleCA9PT0gLTEpCi0gICAgICAgICAgICB0aGlzLnBv cHVsYXRlQ2hpbGRyZW4oKTsKKyAgICAgICAgICAgIHRoaXMuX3BvcHVsYXRlQ2hpbGRyZW4oKTsK ICAgICB9LAogCi0gICAgcG9wdWxhdGVDaGlsZHJlbjogZnVuY3Rpb24oKQorICAgIF9wb3B1bGF0 ZUNoaWxkcmVuOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICBmdW5jdGlvbiBhZ2dyZWdhdGVz UmVjZWl2ZWQoa2V5LCBhZ2dyZWdhdGVzKQogICAgICAgICB7CkBAIC00NTcsNyArNDYxLDcgQEAg V2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdENvbnN0cnVjdG9yc0RhdGFHcmlkLnByb3RvdHlwZSA9 IHsKICAgICAgICAgICAgIHRoaXMuX21heE5vZGVJZCA9IHByb2ZpbGVzW3Byb2ZpbGVJbmRleF0u bWF4SlNPYmplY3RJZDsKICAgICAgICAgfQogCi0gICAgICAgIHRoaXMucG9wdWxhdGVDaGlsZHJl bigpOworICAgICAgICB0aGlzLl9wb3B1bGF0ZUNoaWxkcmVuKCk7CiAgICAgfSwKIAogfTsKQEAg LTQ4Myw3ICs0ODcsMTQgQEAgV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdERpZmZEYXRhR3JpZCA9 IGZ1bmN0aW9uKCkKIH0KIAogV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdERpZmZEYXRhR3JpZC5w cm90b3R5cGUgPSB7Ci0gICAgX2RlZmF1bHRQb3B1bGF0ZUNvdW50OiA1MCwKKyAgICAvKioKKyAg ICAgKiBAb3ZlcnJpZGUKKyAgICAgKiBAcmV0dXJuIHtudW1iZXJ9CisgICAgICovCisgICAgZGVm YXVsdFBvcHVsYXRlQ291bnQ6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHJldHVybiA1MDsK KyAgICB9LAogCiAgICAgX3NvcnRGaWVsZHM6IGZ1bmN0aW9uKHNvcnRDb2x1bW4sIHNvcnRBc2Nl bmRpbmcpCiAgICAgewpAQCAtNTE5LDEwICs1MzAsMTAgQEAgV2ViSW5zcGVjdG9yLkhlYXBTbmFw c2hvdERpZmZEYXRhR3JpZC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICB0aGlzLmRpc3BhdGNo RXZlbnRUb0xpc3RlbmVycygic29ydGluZyBjb21wbGV0ZSIpOwogICAgICAgICAgICAgcmV0dXJu OwogICAgICAgICB9Ci0gICAgICAgIHRoaXMucG9wdWxhdGVDaGlsZHJlbigpOworICAgICAgICB0 aGlzLl9wb3B1bGF0ZUNoaWxkcmVuKCk7CiAgICAgfSwKIAotICAgIHBvcHVsYXRlQ2hpbGRyZW46 IGZ1bmN0aW9uKCkKKyAgICBfcG9wdWxhdGVDaGlsZHJlbjogZnVuY3Rpb24oKQogICAgIHsKICAg ICAgICAgZnVuY3Rpb24gYmFzZUFnZ3JlZ2F0ZXNSZWNlaXZlZChiYXNlQ2xhc3NlcykKICAgICAg ICAgewpAQCAtNTcyLDcgKzU4MywxNCBAQCBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90RG9taW5h dG9yc0RhdGFHcmlkID0gZnVuY3Rpb24oKQogfQogCiBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90 RG9taW5hdG9yc0RhdGFHcmlkLnByb3RvdHlwZSA9IHsKLSAgICBfZGVmYXVsdFBvcHVsYXRlQ291 bnQ6IDI1LAorICAgIC8qKgorICAgICAqIEBvdmVycmlkZQorICAgICAqIEByZXR1cm4ge251bWJl cn0KKyAgICAgKi8KKyAgICBkZWZhdWx0UG9wdWxhdGVDb3VudDogZnVuY3Rpb24oKQorICAgIHsK KyAgICAgICAgcmV0dXJuIDI1OworICAgIH0sCiAKICAgICBzZXREYXRhU291cmNlOiBmdW5jdGlv bihzbmFwc2hvdFZpZXcsIHNuYXBzaG90KQogICAgIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSGVhcFNuYXBzaG90R3JpZE5vZGVzLmpzIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9IZWFwU25hcHNob3RHcmlkTm9kZXMuanMKaW5k ZXggMzAxMjkzZWYyNDgwNzI3NzBiNWRkZjVhMWFkZDgwMzA1NTJhNWFlNS4uM2YzYWVkMDAyODkz MzM3Mjg2ZWNhYTYzZjZjZTQ3MzFjNmE0OGU0YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9IZWFwU25hcHNob3RHcmlkTm9kZXMuanMKKysrIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9IZWFwU25hcHNob3RHcmlkTm9kZXMuanMKQEAg LTM3LDcgKzM3LDkgQEAKIFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RHcmlkTm9kZSA9IGZ1bmN0 aW9uKHRyZWUsIGhhc0NoaWxkcmVuKQogewogICAgIFdlYkluc3BlY3Rvci5EYXRhR3JpZE5vZGUu Y2FsbCh0aGlzLCBudWxsLCBoYXNDaGlsZHJlbik7Ci0gICAgdGhpcy5fZGVmYXVsdFBvcHVsYXRl Q291bnQgPSB0cmVlLl9kZWZhdWx0UG9wdWxhdGVDb3VudDsKKyAgICAvKioKKyAgICAgKiBAdHlw ZSB7V2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdFByb3ZpZGVyUHJveHl9CisgICAgICovCiAgICAg dGhpcy5fcHJvdmlkZXIgPSBudWxsOwogICAgIHRoaXMuX2RhdGFHcmlkID0gdHJlZTsKICAgICB0 aGlzLmFkZEV2ZW50TGlzdGVuZXIoInBvcHVsYXRlIiwgdGhpcy5fcG9wdWxhdGUsIHRoaXMpOwpA QCAtMTA5LDYgKzExMSwxMCBAQCBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90R3JpZE5vZGUucHJv dG90eXBlID0gewogICAgICAgICB0aGlzLl9wcm92aWRlci5zb3J0QW5kUmV3aW5kKHRoaXMuY29t cGFyYXRvcigpLCBzb3J0ZWQuYmluZCh0aGlzKSk7CiAgICAgfSwKIAorICAgIC8qKgorICAgICAq IEBwYXJhbSB7P251bWJlcn0gaG93TWFueQorICAgICAqIEBwYXJhbSB7P251bWJlcn0gYXRJbmRl eAorICAgICAqLwogICAgIHBvcHVsYXRlQ2hpbGRyZW46IGZ1bmN0aW9uKHByb3ZpZGVyLCBob3dN YW55LCBhdEluZGV4LCBhZnRlclBvcHVsYXRlLCBzdXBwcmVzc05vdGlmeUFib3V0Q29tcGxldGlv bikKICAgICB7CiAgICAgICAgIGlmICghaG93TWFueSAmJiBwcm92aWRlcikgewpAQCAtMTE4LDcg KzEyNCw3IEBAIFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RHcmlkTm9kZS5wcm90b3R5cGUgPSB7 CiAgICAgICAgIHByb3ZpZGVyID0gcHJvdmlkZXIgfHwgdGhpcy5fcHJvdmlkZXI7CiAgICAgICAg IGlmICghKCJpbnN0YW5jZUNvdW50IiBpbiBwcm92aWRlcikpCiAgICAgICAgICAgICBwcm92aWRl ci5pbnN0YW5jZUNvdW50ID0gMDsKLSAgICAgICAgaG93TWFueSA9IGhvd01hbnkgfHwgdGhpcy5f ZGVmYXVsdFBvcHVsYXRlQ291bnQ7CisgICAgICAgIGhvd01hbnkgPSBob3dNYW55IHx8IHRoaXMu X2RhdGFHcmlkLmRlZmF1bHRQb3B1bGF0ZUNvdW50KCk7CiAgICAgICAgIGF0SW5kZXggPSBhdElu ZGV4IHx8IHRoaXMuY2hpbGRyZW4ubGVuZ3RoOwogICAgICAgICB2YXIgaGF2ZVNhdmVkQ2hpbGRy ZW4gPSAhIXRoaXMuX3NhdmVkQ2hpbGRyZW47CiAgICAgICAgIGlmIChoYXZlU2F2ZWRDaGlsZHJl bikgewpAQCAtMTM0LDggKzE0MCw4IEBAIFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RHcmlkTm9k ZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIHsKICAgICAgICAgICAgIGlmIChwYXJ0ID49IGhvd01h bnkpCiAgICAgICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICAgICAgcGFydCArPSB0aGlzLl9k ZWZhdWx0UG9wdWxhdGVDb3VudDsKLSAgICAgICAgICAgIHByb3ZpZGVyLnNlcmlhbGl6ZU5leHRJ dGVtcyh0aGlzLl9kZWZhdWx0UG9wdWxhdGVDb3VudCwgY2hpbGRyZW5SZXRyaWV2ZWQuYmluZCh0 aGlzKSk7CisgICAgICAgICAgICBwYXJ0ICs9IHRoaXMuX2RhdGFHcmlkLmRlZmF1bHRQb3B1bGF0 ZUNvdW50KCk7CisgICAgICAgICAgICBwcm92aWRlci5zZXJpYWxpemVOZXh0SXRlbXModGhpcy5f ZGF0YUdyaWQuZGVmYXVsdFBvcHVsYXRlQ291bnQoKSwgY2hpbGRyZW5SZXRyaWV2ZWQuYmluZCh0 aGlzKSk7CiAgICAgICAgIH0KICAgICAgICAgZnVuY3Rpb24gY2hpbGRyZW5SZXRyaWV2ZWQoaXRl bXMpCiAgICAgICAgIHsKQEAgLTE1OCw3ICsxNjQsNyBAQCBXZWJJbnNwZWN0b3IuSGVhcFNuYXBz aG90R3JpZE5vZGUucHJvdG90eXBlID0gewogICAgICAgICAgICAgfQogCiAgICAgICAgICAgICBp ZiAoaXRlbXMuaGFzTmV4dCkKLSAgICAgICAgICAgICAgICB0aGlzLmluc2VydENoaWxkKG5ldyBX ZWJJbnNwZWN0b3IuU2hvd01vcmVEYXRhR3JpZE5vZGUodGhpcy5wb3B1bGF0ZUNoaWxkcmVuLmJp bmQodGhpcywgcHJvdmlkZXIpLCB0aGlzLl9kZWZhdWx0UG9wdWxhdGVDb3VudCwgbGVuZ3RoKSwg YXRJbmRleCsrKTsKKyAgICAgICAgICAgICAgICB0aGlzLmluc2VydENoaWxkKG5ldyBXZWJJbnNw ZWN0b3IuU2hvd01vcmVEYXRhR3JpZE5vZGUodGhpcy5wb3B1bGF0ZUNoaWxkcmVuLmJpbmQodGhp cywgcHJvdmlkZXIpLCB0aGlzLl9kYXRhR3JpZC5kZWZhdWx0UG9wdWxhdGVDb3VudCgpLCBsZW5n dGgpLCBhdEluZGV4KyspOwogICAgICAgICAgICAgaWYgKGFmdGVyUG9wdWxhdGUpCiAgICAgICAg ICAgICAgICAgYWZ0ZXJQb3B1bGF0ZSgpOwogICAgICAgICAgICAgaWYgKCFzdXBwcmVzc05vdGlm eUFib3V0Q29tcGxldGlvbikgewpAQCAtNjgyLDYgKzY4OCw4IEBAIFdlYkluc3BlY3Rvci5IZWFw U25hcHNob3RDb25zdHJ1Y3Rvck5vZGUucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdlYkluc3BlY3Rv ci5IZWFwCiAKIC8qKgogICogQGNvbnN0cnVjdG9yCisgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5I ZWFwU25hcHNob3RQcm92aWRlclByb3h5fSBpdDEKKyAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLkhl YXBTbmFwc2hvdFByb3ZpZGVyUHJveHl9IGl0MgogICovCiBXZWJJbnNwZWN0b3IuSGVhcFNuYXBz aG90SXRlcmF0b3JzVHVwbGUgPSBmdW5jdGlvbihpdDEsIGl0MikKIHsKQEAgLTcxNiw2ICs3MjQs MTAgQEAgV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdERpZmZOb2RlID0gZnVuY3Rpb24odHJlZSwg Y2xhc3NOYW1lLCBiYXNlQWdncmVnYXRlLCBhZ2cKICAgICB0aGlzLl9uYW1lID0gY2xhc3NOYW1l OwogICAgIHRoaXMuX2Jhc2VJbmRleGVzID0gYmFzZUFnZ3JlZ2F0ZSA/IGJhc2VBZ2dyZWdhdGUu aWR4cyA6IFtdOwogICAgIHRoaXMuX2luZGV4ZXMgPSBhZ2dyZWdhdGUgPyBhZ2dyZWdhdGUuaWR4 cyA6IFtdOworCisgICAgLyoqCisgICAgICogQHR5cGUge1dlYkluc3BlY3Rvci5IZWFwU25hcHNo b3RJdGVyYXRvcnNUdXBsZX0KKyAgICAgKi8KICAgICB0aGlzLl9wcm92aWRlciA9IHRoaXMuX2Ny ZWF0ZU5vZGVzUHJvdmlkZXIodHJlZS5iYXNlU25hcHNob3QsIHRyZWUuc25hcHNob3QsIGFnZ3Jl Z2F0ZSA/IGFnZ3JlZ2F0ZS50eXBlIDogYmFzZUFnZ3JlZ2F0ZS50eXBlLCBjbGFzc05hbWUpOwog fQogCkBAIC04MTUsOSArODI3LDkgQEAgV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdERpZmZOb2Rl LnByb3RvdHlwZSA9IHsKICAgICAgICAgaWYgKCFwcm92aWRlciAmJiAhaG93TWFueSkgewogICAg ICAgICAgICAgdmFyIGZpcnN0UHJvdmlkZXJQb3B1bGF0ZWQgPSBmdW5jdGlvbigpCiAgICAgICAg ICAgICB7Ci0gICAgICAgICAgICAgICAgV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdEdyaWROb2Rl LnByb3RvdHlwZS5wb3B1bGF0ZUNoaWxkcmVuLmNhbGwodGhpcywgdGhpcy5fcHJvdmlkZXIuX2l0 MiwgdGhpcy5fZGVmYXVsdFBvcHVsYXRlQ291bnQsIGF0SW5kZXgsIGFmdGVyUG9wdWxhdGUsIGZh bHNlKTsKKyAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90R3JpZE5vZGUu cHJvdG90eXBlLnBvcHVsYXRlQ2hpbGRyZW4uY2FsbCh0aGlzLCB0aGlzLl9wcm92aWRlci5faXQy LCB0aGlzLl9kYXRhR3JpZC5kZWZhdWx0UG9wdWxhdGVDb3VudCgpLCBhdEluZGV4LCBhZnRlclBv cHVsYXRlLCBmYWxzZSk7CiAgICAgICAgICAgICB9OwotICAgICAgICAgICAgV2ViSW5zcGVjdG9y LkhlYXBTbmFwc2hvdEdyaWROb2RlLnByb3RvdHlwZS5wb3B1bGF0ZUNoaWxkcmVuLmNhbGwodGhp cywgdGhpcy5fcHJvdmlkZXIuX2l0MSwgdGhpcy5fZGVmYXVsdFBvcHVsYXRlQ291bnQsIGF0SW5k ZXgsIGZpcnN0UHJvdmlkZXJQb3B1bGF0ZWQuYmluZCh0aGlzKSwgdHJ1ZSk7CisgICAgICAgICAg ICBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90R3JpZE5vZGUucHJvdG90eXBlLnBvcHVsYXRlQ2hp bGRyZW4uY2FsbCh0aGlzLCB0aGlzLl9wcm92aWRlci5faXQxLCB0aGlzLl9kYXRhR3JpZC5kZWZh dWx0UG9wdWxhdGVDb3VudCgpLCBhdEluZGV4LCBmaXJzdFByb3ZpZGVyUG9wdWxhdGVkLmJpbmQo dGhpcyksIHRydWUpOwogICAgICAgICB9IGVsc2UgaWYgKCFob3dNYW55KSB7CiAgICAgICAgICAg ICB2YXIgZmlyc3RQcm92aWRlclBvcHVsYXRlZCA9IGZ1bmN0aW9uKCkKICAgICAgICAgICAgIHsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSGVhcFNuYXBz aG90UHJveHkuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0hlYXBTbmFw c2hvdFByb3h5LmpzCmluZGV4IDVjN2M5ODFkMzhlNjg2MWQ4ZDQxNjM5YjUyZDRmNWQ0ZWYwZTI1 ZTIuLjk4M2Y3MzY1NTgyMDI2MjZlZjljNDdmMmNkODE5OTRlYzk1OTY5OTAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSGVhcFNuYXBzaG90UHJveHkuanMK KysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9IZWFwU25hcHNob3RQcm94 eS5qcwpAQCAtNTAzLDI5ICs1MDMsNiBAQCBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90UHJvdmlk ZXJQcm94eS5wcm90b3R5cGUuX19wcm90b19fID0gV2ViSW5zcGVjdG9yLkhlYXBTbgogICogQGNv bnN0cnVjdG9yCiAgKiBAZXh0ZW5kcyB7V2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdFByb3h5T2Jq ZWN0fQogICovCi1XZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90UGF0aEZpbmRlclByb3h5ID0gZnVu Y3Rpb24od29ya2VyLCBvYmplY3RJZCkKLXsKLSAgICBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90 UHJveHlPYmplY3QuY2FsbCh0aGlzLCB3b3JrZXIsIG9iamVjdElkKTsKLX0KLQotV2ViSW5zcGVj dG9yLkhlYXBTbmFwc2hvdFBhdGhGaW5kZXJQcm94eS5wcm90b3R5cGUgPSB7Ci0gICAgZmluZE5l eHQ6IGZ1bmN0aW9uKGNhbGxiYWNrKQotICAgIHsKLSAgICAgICAgdGhpcy5jYWxsTWV0aG9kKGNh bGxiYWNrLCAiZmluZE5leHQiKTsKLSAgICB9LAotCi0gICAgdXBkYXRlUm9vdHM6IGZ1bmN0aW9u KGZpbHRlcikKLSAgICB7Ci0gICAgICAgIHRoaXMuY2FsbE1ldGhvZChudWxsLCAidXBkYXRlUm9v dHMiLCBmaWx0ZXIpOwotICAgIH0KLX07Ci0KLVdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RQYXRo RmluZGVyUHJveHkucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdlYkluc3BlY3Rvci5IZWFwU25hcHNo b3RQcm94eU9iamVjdC5wcm90b3R5cGU7Ci0KLS8qKgotICogQGNvbnN0cnVjdG9yCi0gKiBAZXh0 ZW5kcyB7V2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdFByb3h5T2JqZWN0fQotICovCiBXZWJJbnNw ZWN0b3IuSGVhcFNuYXBzaG90c0RpZmZQcm94eSA9IGZ1bmN0aW9uKHdvcmtlciwgb2JqZWN0SWQp CiB7CiAgICAgV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdFByb3h5T2JqZWN0LmNhbGwodGhpcywg d29ya2VyLCBvYmplY3RJZCk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9M YXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggODE2N2U0YmRkMmQwZTFiZjAzZGQxZmU3Mzg2ZDc5 Y2MwMWIwYWMzZS4uNzU2ZGEzZDcxMTk2NjhhYTA0ZWIxZTU1MTkzZjIyMGM3MGNlMjk1NSAxMDA2 NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA0LTIyICBZdXJ5IFNlbWlraGF0c2t5ICA8eXVyeXNA Y2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IG1ha2UgcG9wdWxhdGVDaGls ZHJlbiBtZXRob2RzIHByaXZhdGUgaW4gaGVhcCBwcm9maWxlciBmcm9udC1lbmQKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg0NTYyCisKKyAgICAgICAg LSBNYWRlIF9kZWZhdWx0UG9wdWxhdGVDb3VudCBhIHB1YmxpYyBtZXRob2Qgb24gSGVhcFNuYXBz aG90U29ydGFibGVEYXRhR3JpZCB3aGljaAorICAgICAgICBpcyBvdmVycmlkZW4gaW4gc29tZSBk ZXNjZW5kYW50cworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogaW5zcGVjdG9yL3Byb2ZpbGVyL2hlYXAtc25hcHNob3QtdGVzdC5qczoKKyAgICAgICAg KGluaXRpYWxpemVfSGVhcFNuYXBzaG90VGVzdC5JbnNwZWN0b3JUZXN0LnN0YXJ0UHJvZmlsZXJU ZXN0LmRldGFpbGVkSGVhcFByb2ZpbGVzRW5hYmxlZC5XZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90 Q29udGFpbm1lbnREYXRhR3JpZC5wcm90b3R5cGUuZGVmYXVsdFBvcHVsYXRlQ291bnQpOgorICAg ICAgICAoaW5pdGlhbGl6ZV9IZWFwU25hcHNob3RUZXN0Lkluc3BlY3RvclRlc3Quc3RhcnRQcm9m aWxlclRlc3QuZGV0YWlsZWRIZWFwUHJvZmlsZXNFbmFibGVkLldlYkluc3BlY3Rvci5IZWFwU25h cHNob3RDb25zdHJ1Y3RvcnNEYXRhR3JpZC5wcm90b3R5cGUuZGVmYXVsdFBvcHVsYXRlQ291bnQp OgorICAgICAgICAoaW5pdGlhbGl6ZV9IZWFwU25hcHNob3RUZXN0Lkluc3BlY3RvclRlc3Quc3Rh cnRQcm9maWxlclRlc3QuZGV0YWlsZWRIZWFwUHJvZmlsZXNFbmFibGVkLldlYkluc3BlY3Rvci5I ZWFwU25hcHNob3REaWZmRGF0YUdyaWQucHJvdG90eXBlLmRlZmF1bHRQb3B1bGF0ZUNvdW50KToK KyAgICAgICAgKGluaXRpYWxpemVfSGVhcFNuYXBzaG90VGVzdC5JbnNwZWN0b3JUZXN0LnN0YXJ0 UHJvZmlsZXJUZXN0LmRldGFpbGVkSGVhcFByb2ZpbGVzRW5hYmxlZC5XZWJJbnNwZWN0b3IuSGVh cFNuYXBzaG90RG9taW5hdG9yc0RhdGFHcmlkLnByb3RvdHlwZS5kZWZhdWx0UG9wdWxhdGVDb3Vu dCk6CisgICAgICAgIChpbml0aWFsaXplX0hlYXBTbmFwc2hvdFRlc3QuSW5zcGVjdG9yVGVzdC5z dGFydFByb2ZpbGVyVGVzdC5kZXRhaWxlZEhlYXBQcm9maWxlc0VuYWJsZWQpOgorCiAyMDEyLTA0 LTIyICBQYWJsbyBGbG91cmV0ICA8cGFibG9mQG1vdG9yb2xhLmNvbT4KIAogICAgICAgICBSZXNl dCBldmVudCBwcm9wYWdhdGlvbiBhbmQgY2FuY2VsZWQgZmxhZ3MgaW4gRXZlbnQuaW5pdEV2ZW50 CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvcHJvZmlsZXIvaGVhcC1zbmFwc2hv dC10ZXN0LmpzIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3Byb2ZpbGVyL2hlYXAtc25hcHNob3Qt dGVzdC5qcwppbmRleCBmZjc1MDI5OThlZDAyOTA5ZmM4ODBmZjEyZDY0ZjMyY2M5YTVmNDdmLi5i NzkzNzkwNTZmZWMwNWRmNDg3YmFhNTkwMzM3Y2YwYjlhMzNjYzc0IDEwMDY0NAotLS0gYS9MYXlv dXRUZXN0cy9pbnNwZWN0b3IvcHJvZmlsZXIvaGVhcC1zbmFwc2hvdC10ZXN0LmpzCisrKyBiL0xh eW91dFRlc3RzL2luc3BlY3Rvci9wcm9maWxlci9oZWFwLXNuYXBzaG90LXRlc3QuanMKQEAgLTE3 NSwxMCArMTc1LDEwIEBAIEluc3BlY3RvclRlc3Quc3RhcnRQcm9maWxlclRlc3QgPSBmdW5jdGlv bihjYWxsYmFjaykKICAgICBmdW5jdGlvbiBkZXRhaWxlZEhlYXBQcm9maWxlc0VuYWJsZWQoKQog ICAgIHsKICAgICAgICAgLy8gUmVkdWNlIHRoZSBudW1iZXIgb2YgcG9wdWxhdGVkIG5vZGVzIHRv IHNwZWVkIHVwIHRlc3RpbmcuCi0gICAgICAgIFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RDb250 YWlubWVudERhdGFHcmlkLnByb3RvdHlwZS5fZGVmYXVsdFBvcHVsYXRlQ291bnQgPSAxMDsKLSAg ICAgICAgV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdENvbnN0cnVjdG9yc0RhdGFHcmlkLnByb3Rv dHlwZS5fZGVmYXVsdFBvcHVsYXRlQ291bnQgPSAxMDsKLSAgICAgICAgV2ViSW5zcGVjdG9yLkhl YXBTbmFwc2hvdERpZmZEYXRhR3JpZC5wcm90b3R5cGUuX2RlZmF1bHRQb3B1bGF0ZUNvdW50ID0g NTsKLSAgICAgICAgV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdERvbWluYXRvcnNEYXRhR3JpZC5w cm90b3R5cGUuX2RlZmF1bHRQb3B1bGF0ZUNvdW50ID0gMzsKKyAgICAgICAgV2ViSW5zcGVjdG9y LkhlYXBTbmFwc2hvdENvbnRhaW5tZW50RGF0YUdyaWQucHJvdG90eXBlLmRlZmF1bHRQb3B1bGF0 ZUNvdW50ID0gZnVuY3Rpb24oKSB7IHJldHVybiAxMDsgfTsKKyAgICAgICAgV2ViSW5zcGVjdG9y LkhlYXBTbmFwc2hvdENvbnN0cnVjdG9yc0RhdGFHcmlkLnByb3RvdHlwZS5kZWZhdWx0UG9wdWxh dGVDb3VudCA9IGZ1bmN0aW9uKCkgeyByZXR1cm4gMTA7IH07CisgICAgICAgIFdlYkluc3BlY3Rv ci5IZWFwU25hcHNob3REaWZmRGF0YUdyaWQucHJvdG90eXBlLmRlZmF1bHRQb3B1bGF0ZUNvdW50 ID0gZnVuY3Rpb24oKSB7IHJldHVybiA1OyB9OworICAgICAgICBXZWJJbnNwZWN0b3IuSGVhcFNu YXBzaG90RG9taW5hdG9yc0RhdGFHcmlkLnByb3RvdHlwZS5kZWZhdWx0UG9wdWxhdGVDb3VudCA9 IGZ1bmN0aW9uKCkgeyByZXR1cm4gMzsgfQogICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFJlc3Vs dCgiRGV0YWlsZWQgaGVhcCBwcm9maWxlcyB3ZXJlIGVuYWJsZWQuIik7CiAgICAgICAgIEluc3Bl Y3RvclRlc3Quc2FmZVdyYXAoY2FsbGJhY2spKCk7CiAgICAgfQo=