151284 2015-11-13 16:49:59 -0800 Clean referencing the options object in the graphics benchmark 2015-11-16 15:22:22 -0800 1 1 1 Unclassified WebKit Animations WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sabouhallawa sabouhallawa cdumez commit-queue dino rniwa simon.fraser oldest_to_newest 1141989 0 sabouhallawa 2015-11-13 16:49:59 -0800 Currently the Benchmark object holds two members for the options: Benchmark.options and Benchmark._options. I think one of them we added by mistake assuming the Benchmark does not hold a reference to the options. Also the Animator references the options through the reference it holds to the Benchmark. 1141998 1 265520 sabouhallawa 2015-11-13 17:24:10 -0800 Created attachment 265520 Patch 1142359 2 265520 commit-queue 2015-11-16 15:22:19 -0800 Comment on attachment 265520 Patch Clearing flags on attachment: 265520 Committed r192491: <http://trac.webkit.org/changeset/192491> 1142360 3 commit-queue 2015-11-16 15:22:22 -0800 All reviewed patches have been landed. Closing bug. 265520 2015-11-13 17:24:10 -0800 2015-11-16 15:22:19 -0800 Patch bug-151284-20151113172403.patch text/plain 13106 sabouhallawa SW5kZXg6IFBlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFBlcmZvcm1h bmNlVGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAxOTI0NTIpCisrKyBQZXJmb3JtYW5jZVRlc3Rz L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDUzIEBACisyMDE1LTExLTEzICBT YWlkIEFib3UtSGFsbGF3YSAgPHNhYm91aGFsbGF3YUBhcHBsZS5jb20+CisKKyAgICAgICAgQ2xl YW4gcmVmZXJlbmNpbmcgdGhlIG9wdGlvbnMgb2JqZWN0IGluIHRoZSBncmFwaGljcyBiZW5jaG1h cmsKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MTI4 NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEdldCBy aWQgb2YgdGhlIEJlbmNobWFyay5vcHRpb25zIG1lbWJlciBhbmQgcmVseSBvbmx5IG9uIHRoZSBw cml2YXRlIG1lbWJlcgorICAgICAgICBCZW5jaG1hcmsuX29wdGlvbnMuIFRoZSBhbmltYXRvciBu ZWVkIHRvIGhhdmUgaXRzIG93biBvcHRpb25zIG1lbWJlciBpbnN0ZWFkCisgICAgICAgIG9mIGFj Y2Vzc2luZyBpdCBmcm9tIGl0cyByZWZlcmVuY2UgdG8gQmVuY2htYXJrIG9iamVjdC4KKworICAg ICAgICAqIEFuaW1vbWV0ZXIvdGVzdHMvYm91bmNpbmctcGFydGljbGVzL3Jlc291cmNlcy9ib3Vu Y2luZy1jYW52YXMtcGFydGljbGVzLmpzOgorICAgICAgICAoQm91bmNpbmdDYW52YXNQYXJ0aWNs ZXNBbmltYXRvcik6CisgICAgICAgIChCb3VuY2luZ0NhbnZhc1BhcnRpY2xlc0JlbmNobWFyay5w cm90b3R5cGUuY3JlYXRlQW5pbWF0b3IpOgorICAgICAgICAqIEFuaW1vbWV0ZXIvdGVzdHMvYm91 bmNpbmctcGFydGljbGVzL3Jlc291cmNlcy9ib3VuY2luZy1wYXJ0aWNsZXMuanM6CisgICAgICAg IChCb3VuY2luZ1BhcnRpY2xlLnByb3RvdHlwZS5hbmltYXRlKToKKyAgICAgICAgKEJvdW5jaW5n UGFydGljbGVzQW5pbWF0b3IpOgorICAgICAgICAoQm91bmNpbmdQYXJ0aWNsZXNCZW5jaG1hcmsu cHJvdG90eXBlLmNyZWF0ZUFuaW1hdG9yKToKKyAgICAgICAgKiBBbmltb21ldGVyL3Rlc3RzL2V4 YW1wbGVzL3Jlc291cmNlcy9jYW52YXMtZWxlY3Ryb25zLmpzOgorICAgICAgICAoQ2FudmFzRWxl Y3Ryb25zU3RhZ2UucHJvdG90eXBlLmFuaW1hdGUpOgorICAgICAgICAoQ2FudmFzRWxlY3Ryb25z QW5pbWF0b3IpOgorICAgICAgICAoQ2FudmFzRWxlY3Ryb25zQmVuY2htYXJrLnByb3RvdHlwZS5j cmVhdGVBbmltYXRvcik6CisgICAgICAgICh3aW5kb3cuYmVuY2htYXJrQ2xpZW50LmNyZWF0ZSk6 CisgICAgICAgICogQW5pbW9tZXRlci90ZXN0cy9leGFtcGxlcy9yZXNvdXJjZXMvY2FudmFzLXN0 YXJzLmpzOgorICAgICAgICAoQ2FudmFzU3RhcnNTdGFnZS5wcm90b3R5cGUuYW5pbWF0ZSk6Cisg ICAgICAgIChDYW52YXNTdGFyc0FuaW1hdG9yKToKKyAgICAgICAgKENhbnZhc1N0YXJzQmVuY2ht YXJrLnByb3RvdHlwZS5jcmVhdGVBbmltYXRvcik6CisgICAgICAgICh3aW5kb3cuYmVuY2htYXJr Q2xpZW50LmNyZWF0ZSk6CisgICAgICAgICogQW5pbW9tZXRlci90ZXN0cy9yZXNvdXJjZXMvbWFp bi5qczoKKyAgICAgICAgKEJlbmNobWFya1N0YXRlLnByb3RvdHlwZS5jdXJyZW50UHJvZ3Jlc3Mp OgorICAgICAgICAoQW5pbWF0b3IpOgorICAgICAgICAoQW5pbWF0b3IucHJvdG90eXBlLmFuaW1h dGUpOgorICAgICAgICAoQmVuY2htYXJrKToKKyAgICAgICAgKEJlbmNobWFyay5wcm90b3R5cGUu dXBkYXRlKToKKyAgICAgICAgKiBBbmltb21ldGVyL3Rlc3RzL3Jlc291cmNlcy9zdGFnZS5qczoK KyAgICAgICAgKFN0YWdlLnByb3RvdHlwZS5jbGVhcik6CisgICAgICAgIChTdGFnZUFuaW1hdG9y KToKKyAgICAgICAgKFN0YWdlQmVuY2htYXJrLnByb3RvdHlwZS5jcmVhdGVBbmltYXRvcik6Cisg ICAgICAgIChTdGFnZUJlbmNobWFyay5wcm90b3R5cGUudHVuZSk6CisgICAgICAgIChTdGFnZUJl bmNobWFyay5wcm90b3R5cGUuc2hvd1Jlc3VsdHMpOgorICAgICAgICAqIEFuaW1vbWV0ZXIvdGVz dHMvc2ltcGxlL3Jlc291cmNlcy9zaW1wbGUtY2FudmFzLmpzOgorICAgICAgICAoU2ltcGxlQ2Fu dmFzU3RhZ2UucHJvdG90eXBlLmFuaW1hdGUpOgorICAgICAgICAoU2ltcGxlQ2FudmFzQW5pbWF0 b3IpOgorICAgICAgICAoU2ltcGxlQ2FudmFzQW5pbWF0b3IucHJvdG90eXBlLmFuaW1hdGUpOgor ICAgICAgICAoU2ltcGxlQ2FudmFzQmVuY2htYXJrLnByb3RvdHlwZS5jcmVhdGVBbmltYXRvcik6 CisgICAgICAgICogQW5pbW9tZXRlci90ZXN0cy90ZW1wbGF0ZS9yZXNvdXJjZXMvdGVtcGxhdGUt Y2FudmFzLmpzOgorICAgICAgICAoVGVtcGxhdGVDYW52YXNTdGFnZS5wcm90b3R5cGUuYW5pbWF0 ZSk6CisgICAgICAgIChUZW1wbGF0ZUNhbnZhc0JlbmNobWFyay5wcm90b3R5cGUuY3JlYXRlQW5p bWF0b3IpOgorICAgICAgICAod2luZG93LmJlbmNobWFya0NsaWVudC5jcmVhdGUpOgorCiAyMDE1 LTExLTA2ICBTYWlkIEFib3UtSGFsbGF3YSAgPHNhYm91aGFsbGF3YUBhcHBsZS5jb20+CiAKICAg ICAgICAgSW5pdGlhbGl6ZSB0aGUgZ3JhcGhpY3MgYmVuY2htYXJrJ3MgS2FsbWFuIGZpbHRlciB3 aXRoIGVzdGltYXRlZCA2MCBGUFMKSW5kZXg6IFBlcmZvcm1hbmNlVGVzdHMvQW5pbW9tZXRlci90 ZXN0cy9ib3VuY2luZy1wYXJ0aWNsZXMvcmVzb3VyY2VzL2JvdW5jaW5nLWNhbnZhcy1wYXJ0aWNs ZXMuanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gUGVyZm9ybWFuY2VUZXN0cy9Bbmltb21ldGVyL3Rlc3RzL2Jv dW5jaW5nLXBhcnRpY2xlcy9yZXNvdXJjZXMvYm91bmNpbmctY2FudmFzLXBhcnRpY2xlcy5qcwko cmV2aXNpb24gMTkyNDAwKQorKysgUGVyZm9ybWFuY2VUZXN0cy9Bbmltb21ldGVyL3Rlc3RzL2Jv dW5jaW5nLXBhcnRpY2xlcy9yZXNvdXJjZXMvYm91bmNpbmctY2FudmFzLXBhcnRpY2xlcy5qcwko d29ya2luZyBjb3B5KQpAQCAtNzYsOSArNzYsOSBAQCBmdW5jdGlvbiBCb3VuY2luZ0NhbnZhc1Bh cnRpY2xlc1N0YWdlKGVsCiBCb3VuY2luZ0NhbnZhc1BhcnRpY2xlc1N0YWdlLnByb3RvdHlwZSA9 IE9iamVjdC5jcmVhdGUoQm91bmNpbmdQYXJ0aWNsZXNTdGFnZS5wcm90b3R5cGUpOwogQm91bmNp bmdDYW52YXNQYXJ0aWNsZXNTdGFnZS5wcm90b3R5cGUuY29uc3RydWN0b3IgPSBCb3VuY2luZ0Nh bnZhc1BhcnRpY2xlc1N0YWdlOwogCi1mdW5jdGlvbiBCb3VuY2luZ0NhbnZhc1BhcnRpY2xlc0Fu aW1hdG9yKGJlbmNobWFyaykKK2Z1bmN0aW9uIEJvdW5jaW5nQ2FudmFzUGFydGljbGVzQW5pbWF0 b3IoYmVuY2htYXJrLCBvcHRpb25zKQogewotICAgIEJvdW5jaW5nUGFydGljbGVzQW5pbWF0b3Iu Y2FsbCh0aGlzLCBiZW5jaG1hcmspOworICAgIEJvdW5jaW5nUGFydGljbGVzQW5pbWF0b3IuY2Fs bCh0aGlzLCBiZW5jaG1hcmssIG9wdGlvbnMpOwogICAgIHRoaXMuX2NvbnRleHQgPSBiZW5jaG1h cmsuX3N0YWdlLmNvbnRleHQ7CiB9CiAKQEAgLTEwMSw1ICsxMDEsNSBAQCBCb3VuY2luZ0NhbnZh c1BhcnRpY2xlc0JlbmNobWFyay5wcm90b3R5CiAKIEJvdW5jaW5nQ2FudmFzUGFydGljbGVzQmVu Y2htYXJrLnByb3RvdHlwZS5jcmVhdGVBbmltYXRvciA9IGZ1bmN0aW9uKCkKIHsKLSAgICByZXR1 cm4gbmV3IEJvdW5jaW5nQ2FudmFzUGFydGljbGVzQW5pbWF0b3IodGhpcyk7CisgICAgcmV0dXJu IG5ldyBCb3VuY2luZ0NhbnZhc1BhcnRpY2xlc0FuaW1hdG9yKHRoaXMsIHRoaXMuX29wdGlvbnMp OwogfQpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKSW5kZXg6IFBlcmZvcm1hbmNlVGVzdHMv QW5pbW9tZXRlci90ZXN0cy9ib3VuY2luZy1wYXJ0aWNsZXMvcmVzb3VyY2VzL2JvdW5jaW5nLXBh cnRpY2xlcy5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBQZXJmb3JtYW5jZVRlc3RzL0FuaW1vbWV0ZXIvdGVz dHMvYm91bmNpbmctcGFydGljbGVzL3Jlc291cmNlcy9ib3VuY2luZy1wYXJ0aWNsZXMuanMJKHJl dmlzaW9uIDE5MjQwMCkKKysrIFBlcmZvcm1hbmNlVGVzdHMvQW5pbW9tZXRlci90ZXN0cy9ib3Vu Y2luZy1wYXJ0aWNsZXMvcmVzb3VyY2VzL2JvdW5jaW5nLXBhcnRpY2xlcy5qcwkod29ya2luZyBj b3B5KQpAQCAtNTcsOSArNTcsOSBAQCBCb3VuY2luZ1BhcnRpY2xlLnByb3RvdHlwZSA9CiAgICAg fQogfQogCi1mdW5jdGlvbiBCb3VuY2luZ1BhcnRpY2xlc0FuaW1hdG9yKGJlbmNobWFyaykKK2Z1 bmN0aW9uIEJvdW5jaW5nUGFydGljbGVzQW5pbWF0b3IoYmVuY2htYXJrLCBvcHRpb25zKQogewot ICAgIFN0YWdlQW5pbWF0b3IuY2FsbCh0aGlzLCBiZW5jaG1hcmspOworICAgIFN0YWdlQW5pbWF0 b3IuY2FsbCh0aGlzLCBiZW5jaG1hcmssIG9wdGlvbnMpOwogfTsKIAogQm91bmNpbmdQYXJ0aWNs ZXNBbmltYXRvci5wcm90b3R5cGUgPSBPYmplY3QuY3JlYXRlKFN0YWdlQW5pbWF0b3IucHJvdG90 eXBlKTsKQEAgLTEyNiw1ICsxMjYsNSBAQCBCb3VuY2luZ1BhcnRpY2xlc0JlbmNobWFyay5wcm90 b3R5cGUuY29uCiAKIEJvdW5jaW5nUGFydGljbGVzQmVuY2htYXJrLnByb3RvdHlwZS5jcmVhdGVB bmltYXRvciA9IGZ1bmN0aW9uKCkKIHsKLSAgICByZXR1cm4gbmV3IEJvdW5jaW5nUGFydGljbGVz QW5pbWF0b3IodGhpcyk7CisgICAgcmV0dXJuIG5ldyBCb3VuY2luZ1BhcnRpY2xlc0FuaW1hdG9y KHRoaXMsIHRoaXMuX29wdGlvbnMpOwogfQpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKSW5k ZXg6IFBlcmZvcm1hbmNlVGVzdHMvQW5pbW9tZXRlci90ZXN0cy9leGFtcGxlcy9yZXNvdXJjZXMv Y2FudmFzLWVsZWN0cm9ucy5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBQZXJmb3JtYW5jZVRlc3RzL0FuaW1v bWV0ZXIvdGVzdHMvZXhhbXBsZXMvcmVzb3VyY2VzL2NhbnZhcy1lbGVjdHJvbnMuanMJKHJldmlz aW9uIDE5MjQwMCkKKysrIFBlcmZvcm1hbmNlVGVzdHMvQW5pbW9tZXRlci90ZXN0cy9leGFtcGxl cy9yZXNvdXJjZXMvY2FudmFzLWVsZWN0cm9ucy5qcwkod29ya2luZyBjb3B5KQpAQCAtODIsOSAr ODIsOSBAQCBDYW52YXNFbGVjdHJvbnNTdGFnZS5wcm90b3R5cGUuYW5pbWF0ZSA9CiAgICAgfSk7 CiB9CiAKLWZ1bmN0aW9uIENhbnZhc0VsZWN0cm9uc0FuaW1hdG9yKGJlbmNobWFyaykKK2Z1bmN0 aW9uIENhbnZhc0VsZWN0cm9uc0FuaW1hdG9yKGJlbmNobWFyaywgb3B0aW9ucykKIHsKLSAgICBB bmltYXRvci5jYWxsKHRoaXMsIGJlbmNobWFyayk7CisgICAgQW5pbWF0b3IuY2FsbCh0aGlzLCBi ZW5jaG1hcmssIG9wdGlvbnMpOwogICAgIHRoaXMuX2NvbnRleHQgPSBiZW5jaG1hcmsuX3N0YWdl LmNvbnRleHQ7CiB9CiAKQEAgLTEyMSw3ICsxMjEsNyBAQCBDYW52YXNFbGVjdHJvbnNCZW5jaG1h cmsucHJvdG90eXBlLmNyZWF0CiBDYW52YXNFbGVjdHJvbnNCZW5jaG1hcmsucHJvdG90eXBlLmNy ZWF0ZUFuaW1hdG9yID0gZnVuY3Rpb24oKQogewogICAgIC8vIEF0dGFjaCB0aGUgYW5pbWF0b3Ig dG8gdGhlIGJlbmNobWFyay4KLSAgICByZXR1cm4gbmV3IENhbnZhc0VsZWN0cm9uc0FuaW1hdG9y KHRoaXMpOworICAgIHJldHVybiBuZXcgQ2FudmFzRWxlY3Ryb25zQW5pbWF0b3IodGhpcywgdGhp cy5fb3B0aW9ucyk7CiB9CiAKIHdpbmRvdy5iZW5jaG1hcmtDbGllbnQuY3JlYXRlID0gZnVuY3Rp b24oc3VpdGUsIHRlc3QsIG9wdGlvbnMsIHJlY29yZFRhYmxlLCBwcm9ncmVzc0JhcikKSW5kZXg6 IFBlcmZvcm1hbmNlVGVzdHMvQW5pbW9tZXRlci90ZXN0cy9leGFtcGxlcy9yZXNvdXJjZXMvY2Fu dmFzLXN0YXJzLmpzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFBlcmZvcm1hbmNlVGVzdHMvQW5pbW9tZXRlci90 ZXN0cy9leGFtcGxlcy9yZXNvdXJjZXMvY2FudmFzLXN0YXJzLmpzCShyZXZpc2lvbiAxOTI0MDAp CisrKyBQZXJmb3JtYW5jZVRlc3RzL0FuaW1vbWV0ZXIvdGVzdHMvZXhhbXBsZXMvcmVzb3VyY2Vz L2NhbnZhcy1zdGFycy5qcwkod29ya2luZyBjb3B5KQpAQCAtODMsOSArODMsOSBAQCBDYW52YXNT dGFyc1N0YWdlLnByb3RvdHlwZS5hbmltYXRlID0gZnVuCiAgICAgfSk7CiB9CiAKLWZ1bmN0aW9u IENhbnZhc1N0YXJzQW5pbWF0b3IoYmVuY2htYXJrKQorZnVuY3Rpb24gQ2FudmFzU3RhcnNBbmlt YXRvcihiZW5jaG1hcmssIG9wdGlvbnMpCiB7Ci0gICBBbmltYXRvci5jYWxsKHRoaXMsIGJlbmNo bWFyayk7CisgICBBbmltYXRvci5jYWxsKHRoaXMsIGJlbmNobWFyaywgb3B0aW9ucyk7CiAgICB0 aGlzLl9jb250ZXh0ID0gYmVuY2htYXJrLl9zdGFnZS5jb250ZXh0OwogfQogCkBAIC0xMTgsNyAr MTE4LDcgQEAgQ2FudmFzU3RhcnNCZW5jaG1hcmsucHJvdG90eXBlLmNyZWF0ZVN0YQogQ2FudmFz U3RhcnNCZW5jaG1hcmsucHJvdG90eXBlLmNyZWF0ZUFuaW1hdG9yID0gZnVuY3Rpb24oKQogewog ICAgLy8gQXR0YWNoIHRoZSBhbmltYXRvciB0byB0aGUgYmVuY2htYXJrLgotICAgcmV0dXJuIG5l dyBDYW52YXNTdGFyc0FuaW1hdG9yKHRoaXMpOworICAgcmV0dXJuIG5ldyBDYW52YXNTdGFyc0Fu aW1hdG9yKHRoaXMsIHRoaXMuX29wdGlvbnMpOwogfQogCiB3aW5kb3cuYmVuY2htYXJrQ2xpZW50 LmNyZWF0ZSA9IGZ1bmN0aW9uKHN1aXRlLCB0ZXN0LCBvcHRpb25zLCByZWNvcmRUYWJsZSwgcHJv Z3Jlc3NCYXIpCkluZGV4OiBQZXJmb3JtYW5jZVRlc3RzL0FuaW1vbWV0ZXIvdGVzdHMvcmVzb3Vy Y2VzL21haW4uanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gUGVyZm9ybWFuY2VUZXN0cy9Bbmltb21ldGVyL3Rl c3RzL3Jlc291cmNlcy9tYWluLmpzCShyZXZpc2lvbiAxOTI0MDApCisrKyBQZXJmb3JtYW5jZVRl c3RzL0FuaW1vbWV0ZXIvdGVzdHMvcmVzb3VyY2VzL21haW4uanMJKHdvcmtpbmcgY29weSkKQEAg LTU5LDkgKzU5LDExIEBAIEJlbmNobWFya1N0YXRlLnByb3RvdHlwZSA9CiAgICAgfQogfQogCi1m dW5jdGlvbiBBbmltYXRvcihiZW5jaG1hcmspCitmdW5jdGlvbiBBbmltYXRvcihiZW5jaG1hcmss IG9wdGlvbnMpCiB7CiAgICAgdGhpcy5fYmVuY2htYXJrID0gYmVuY2htYXJrOworICAgIHRoaXMu X29wdGlvbnMgPSBvcHRpb25zOworICAgIAogICAgIHRoaXMuX2ZyYW1lQ291bnQgPSAwOwogICAg IHRoaXMuX2Ryb3BGcmFtZUNvdW50ID0gMTsKICAgICB0aGlzLl9tZWFzdXJlRnJhbWVDb3VudCA9 IDM7IApAQCAtMTA5LDcgKzExMSw3IEBAIEFuaW1hdG9yLnByb3RvdHlwZSA9CiAgICAgICAgIHZh ciBjdXJyZW50RnJhbWVSYXRlID0gTWF0aC5mbG9vcigxMDAwIC8gKG1lYXN1cmVUaW1lRGVsdGEg LyB0aGlzLl9tZWFzdXJlRnJhbWVDb3VudCkpOwogICAgICAgICAgCiAgICAgICAgIC8vIFVzZSBL YWxtYW4gZmlsdGVyIHRvIGdldCBhIG1vcmUgbm9uLWZsdWN0dWF0aW5nIGZyYW1lIHJhdGUuCi0g ICAgICAgIGlmICh0aGlzLl9iZW5jaG1hcmsub3B0aW9uc1siZXN0aW1hdGVkLWZyYW1lLXJhdGUi XSkKKyAgICAgICAgaWYgKHRoaXMuX29wdGlvbnNbImVzdGltYXRlZC1mcmFtZS1yYXRlIl0pCiAg ICAgICAgICAgICBjdXJyZW50RnJhbWVSYXRlID0gdGhpcy5fZXN0aW1hdG9yLmVzdGltYXRlKGN1 cnJlbnRGcmFtZVJhdGUpOwogICAgICAgICAKICAgICAgICAgLy8gQWRqdXN0IHRoZSB0ZXN0IHRv IHJlYWNoIHRoZSBkZXNpcmVkIEZQUy4KQEAgLTEzOCw3ICsxNDAsNiBAQCBmdW5jdGlvbiBCZW5j aG1hcmsob3B0aW9ucykKICAgICB0aGlzLl9vcHRpb25zID0gb3B0aW9uczsKICAgICB0aGlzLl9t ZXRob2QgPSB0aGlzLl9vcHRpb25zWyJtZXRob2QiXSB8fCAicmVxdWVzdEFuaW1hdGlvbkZyYW1l IjsKIAotICAgIHRoaXMub3B0aW9ucyA9IG9wdGlvbnM7CiAgICAgdGhpcy5fcmVjb3JkSW50ZXJ2 YWwgPSAyMDA7ICAgIAogICAgIHRoaXMuX2lzU2FtcGxpbmcgPSBmYWxzZTsKIApAQCAtMTQ4LDcg KzE0OSw3IEBAIGZ1bmN0aW9uIEJlbmNobWFyayhvcHRpb25zKQogICAgIAogICAgIHRoaXMuX2Nv bnRyb2xsZXIgPSBuZXcgUElEQ29udHJvbGxlcihnYWluLCBvcHRpb25zWyJmcmFtZS1yYXRlIl0s IGxvd1ZhbHVlLCBoaWdoVmFsdWUpOwogICAgIHRoaXMuX3NhbXBsZXIgPSBuZXcgU2FtcGxlcigy KTsKLSAgICB0aGlzLl9zdGF0ZSA9IG5ldyBCZW5jaG1hcmtTdGF0ZSh0aGlzLm9wdGlvbnNbInRl c3QtaW50ZXJ2YWwiXSAqIDEwMDApOworICAgIHRoaXMuX3N0YXRlID0gbmV3IEJlbmNobWFya1N0 YXRlKHRoaXMuX29wdGlvbnNbInRlc3QtaW50ZXJ2YWwiXSAqIDEwMDApOwogfQogCiBCZW5jaG1h cmsucHJvdG90eXBlID0KQEAgLTE3OSwxMSArMTgwLDExIEBAIEJlbmNobWFyay5wcm90b3R5cGUg PQogICAgICAgICB9CiAKICAgICAgICAgdmFyIHR1bmVWYWx1ZSA9IDA7Ci0gICAgICAgIGlmICh0 aGlzLm9wdGlvbnNbImNvbXBsZXhpdHkiXSAmJiAhdGhpcy5vcHRpb25zWyJhZGFwdGl2ZS10ZXN0 Il0pIHsKKyAgICAgICAgaWYgKHRoaXMuX29wdGlvbnNbImNvbXBsZXhpdHkiXSAmJiAhdGhpcy5f b3B0aW9uc1siYWRhcHRpdmUtdGVzdCJdKSB7CiAgICAgICAgICAgICAvLyB0aGlzLnR1bmUoMCkg cmV0dXJucyB0aGUgY3VycmVudCBjb21wbGV4aXR5IG9mIHRoZSB0ZXN0LgotICAgICAgICAgICAg dHVuZVZhbHVlID0gdGhpcy5vcHRpb25zWyJjb21wbGV4aXR5Il0gLSB0aGlzLnR1bmUoMCk7Cisg ICAgICAgICAgICB0dW5lVmFsdWUgPSB0aGlzLl9vcHRpb25zWyJjb21wbGV4aXR5Il0gLSB0aGlz LnR1bmUoMCk7CiAgICAgICAgIH0KLSAgICAgICAgZWxzZSBpZiAoISh0aGlzLl9pc1NhbXBsaW5n ICYmIHRoaXMub3B0aW9uc1siZml4LXRlc3QtY29tcGxleGl0eSJdKSkgeworICAgICAgICBlbHNl IGlmICghKHRoaXMuX2lzU2FtcGxpbmcgJiYgdGhpcy5fb3B0aW9uc1siZml4LXRlc3QtY29tcGxl eGl0eSJdKSkgewogICAgICAgICAgICAgLy8gVGhlIHJlbGF0aW9uc2hpcCBiZXR3ZWVuIGZyYW1l UmF0ZSBhbmQgdGVzdCBjb21wbGV4aXR5IGlzIGludmVyc2UtcHJvcG9ydGlvbmFsIHNvIHdlCiAg ICAgICAgICAgICAvLyBuZWVkIHRvIHVzZSB0aGUgbmVnYXRpdmUgb2YgUElEQ29udHJvbGxlci50 dW5lKCkgdG8gY2hhbmdlIHRoZSBjb21wbGV4aXR5IG9mIHRoZSB0ZXN0LgogICAgICAgICAgICAg dHVuZVZhbHVlID0gLXRoaXMuX2NvbnRyb2xsZXIudHVuZShjdXJyZW50RnJhbWVSYXRlLCB0aW1l RGVsdGEgLyAxMDAwKTsKSW5kZXg6IFBlcmZvcm1hbmNlVGVzdHMvQW5pbW9tZXRlci90ZXN0cy9y ZXNvdXJjZXMvc3RhZ2UuanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gUGVyZm9ybWFuY2VUZXN0cy9Bbmltb21l dGVyL3Rlc3RzL3Jlc291cmNlcy9zdGFnZS5qcwkocmV2aXNpb24gMTkyNDAwKQorKysgUGVyZm9y bWFuY2VUZXN0cy9Bbmltb21ldGVyL3Rlc3RzL3Jlc291cmNlcy9zdGFnZS5qcwkod29ya2luZyBj b3B5KQpAQCAtMTE3LDkgKzExNyw5IEBAIFN0YWdlLnByb3RvdHlwZSA9CiAgICAgfQogfQogCi1m dW5jdGlvbiBTdGFnZUFuaW1hdG9yKGJlbmNobWFyaykKK2Z1bmN0aW9uIFN0YWdlQW5pbWF0b3Io YmVuY2htYXJrLCBvcHRpb25zKQogewotICAgIEFuaW1hdG9yLmNhbGwodGhpcywgYmVuY2htYXJr KTsKKyAgICBBbmltYXRvci5jYWxsKHRoaXMsIGJlbmNobWFyaywgb3B0aW9ucyk7CiB9OwogCiBT dGFnZUFuaW1hdG9yLnByb3RvdHlwZSA9IE9iamVjdC5jcmVhdGUoQW5pbWF0b3IucHJvdG90eXBl KTsKQEAgLTE1OSw3ICsxNTksNyBAQCBTdGFnZUJlbmNobWFyay5wcm90b3R5cGUuY3JlYXRlU3Rh Z2UgPSBmCiAKIFN0YWdlQmVuY2htYXJrLnByb3RvdHlwZS5jcmVhdGVBbmltYXRvciA9IGZ1bmN0 aW9uKCkKIHsKLSAgICByZXR1cm4gbmV3IFN0YWdlQW5pbWF0b3IodGhpcyk7CisgICAgcmV0dXJu IG5ldyBTdGFnZUFuaW1hdG9yKHRoaXMsIHRoaXMuX29wdGlvbnMpOwogfQogCiBTdGFnZUJlbmNo bWFyay5wcm90b3R5cGUudHVuZSA9IGZ1bmN0aW9uKGNvdW50KQpAQCAtMTc3LDcgKzE3Nyw3IEBA IFN0YWdlQmVuY2htYXJrLnByb3RvdHlwZS5zaG93UmVzdWx0cyA9IGYKICAgICBpZiAoIXRoaXMu X3JlY29yZFRhYmxlIHx8ICF0aGlzLl9wcm9ncmVzc0JhciB8fCAhdGhpcy5fdGVzdCkKICAgICAg ICAgcmV0dXJuOwogCi0gICAgaWYgKHRoaXMub3B0aW9uc1sic2hvdy1ydW5uaW5nLXJlc3VsdHMi XSkKKyAgICBpZiAodGhpcy5fb3B0aW9uc1sic2hvdy1ydW5uaW5nLXJlc3VsdHMiXSkKICAgICAg ICAgdGhpcy5fcmVjb3JkVGFibGUuc2hvd1JlY29yZCh0aGlzLl90ZXN0Lm5hbWUsIG1lc3NhZ2Us IHRoaXMuX3NhbXBsZXIudG9KU09OKHRydWUsIGZhbHNlKSk7CiAKICAgICB0aGlzLl9wcm9ncmVz c0Jhci5zZXRQb3MocHJvZ3Jlc3MpOwpJbmRleDogUGVyZm9ybWFuY2VUZXN0cy9Bbmltb21ldGVy L3Rlc3RzL3NpbXBsZS9yZXNvdXJjZXMvc2ltcGxlLWNhbnZhcy5qcwo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBQ ZXJmb3JtYW5jZVRlc3RzL0FuaW1vbWV0ZXIvdGVzdHMvc2ltcGxlL3Jlc291cmNlcy9zaW1wbGUt Y2FudmFzLmpzCShyZXZpc2lvbiAxOTI0MDApCisrKyBQZXJmb3JtYW5jZVRlc3RzL0FuaW1vbWV0 ZXIvdGVzdHMvc2ltcGxlL3Jlc291cmNlcy9zaW1wbGUtY2FudmFzLmpzCSh3b3JraW5nIGNvcHkp CkBAIC0zNiw5ICszNiw5IEBAIFNpbXBsZUNhbnZhc1N0YWdlLnByb3RvdHlwZS5hbmltYXRlID0g ZnUKICAgICB9KTsKIH0KIAotZnVuY3Rpb24gU2ltcGxlQ2FudmFzQW5pbWF0b3IoYmVuY2htYXJr KQorZnVuY3Rpb24gU2ltcGxlQ2FudmFzQW5pbWF0b3IoYmVuY2htYXJrLCBvcHRpb25zKQogewot ICAgIFN0YWdlQW5pbWF0b3IuY2FsbCh0aGlzLCBiZW5jaG1hcmspOworICAgIFN0YWdlQW5pbWF0 b3IuY2FsbCh0aGlzLCBiZW5jaG1hcmssIG9wdGlvbnMpOwogICAgIHRoaXMuX2NvbnRleHQgPSBi ZW5jaG1hcmsuX3N0YWdlLmNvbnRleHQ7CiB9CiAKQEAgLTQ3LDcgKzQ3LDcgQEAgU2ltcGxlQ2Fu dmFzQW5pbWF0b3IucHJvdG90eXBlLmNvbnN0cnVjdAogU2ltcGxlQ2FudmFzQW5pbWF0b3IucHJv dG90eXBlLmFuaW1hdGUgPSBmdW5jdGlvbigpCiB7CiAgICAgdGhpcy5fY29udGV4dC5jbGVhclJl Y3QoMCwgMCwgdGhpcy5fYmVuY2htYXJrLl9zdGFnZS5zaXplLngsIHRoaXMuX2JlbmNobWFyay5f c3RhZ2Uuc2l6ZS55KTsKLSAgICByZXR1cm4gU3RhZ2VBbmltYXRvci5wcm90b3R5cGUuYW5pbWF0 ZS5jYWxsKHRoaXMpOworICAgIHJldHVybiBTdGFnZUFuaW1hdG9yLnByb3RvdHlwZS5hbmltYXRl LmNhbGwodGhpcywgdGhpcy5fb3B0aW9ucyk7CiB9CiAKIApAQCAtNjAsNiArNjAsNiBAQCBmdW5j dGlvbiBTaW1wbGVDYW52YXNCZW5jaG1hcmsoc3VpdGUsIHRlCiBTaW1wbGVDYW52YXNCZW5jaG1h cmsucHJvdG90eXBlID0gT2JqZWN0LmNyZWF0ZShTdGFnZUJlbmNobWFyay5wcm90b3R5cGUpOwog U2ltcGxlQ2FudmFzQmVuY2htYXJrLnByb3RvdHlwZS5jb25zdHJ1Y3RvciA9IFNpbXBsZUNhbnZh c0JlbmNobWFyazsKIFNpbXBsZUNhbnZhc0JlbmNobWFyay5wcm90b3R5cGUuY3JlYXRlQW5pbWF0 b3IgPSBmdW5jdGlvbigpIHsKLSAgICByZXR1cm4gbmV3IFNpbXBsZUNhbnZhc0FuaW1hdG9yKHRo aXMpOworICAgIHJldHVybiBuZXcgU2ltcGxlQ2FudmFzQW5pbWF0b3IodGhpcywgdGhpcy5fb3B0 aW9ucyk7CiB9CiAKSW5kZXg6IFBlcmZvcm1hbmNlVGVzdHMvQW5pbW9tZXRlci90ZXN0cy90ZW1w bGF0ZS9yZXNvdXJjZXMvdGVtcGxhdGUtY2FudmFzLmpzCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFBlcmZvcm1h bmNlVGVzdHMvQW5pbW9tZXRlci90ZXN0cy90ZW1wbGF0ZS9yZXNvdXJjZXMvdGVtcGxhdGUtY2Fu dmFzLmpzCShyZXZpc2lvbiAxOTI0MDApCisrKyBQZXJmb3JtYW5jZVRlc3RzL0FuaW1vbWV0ZXIv dGVzdHMvdGVtcGxhdGUvcmVzb3VyY2VzL3RlbXBsYXRlLWNhbnZhcy5qcwkod29ya2luZyBjb3B5 KQpAQCAtNTcsOSArNTcsOSBAQCBUZW1wbGF0ZUNhbnZhc1N0YWdlLnByb3RvdHlwZS5hbmltYXRl ID0gCiAgICAgLy8gTG9vcCB0aHJvdWdoIGFsbCB5b3VyIG9iamVjdHMgYW5kIGFzayB0aGVtIHRv IGFuaW1hdGUuCiB9CiAKLWZ1bmN0aW9uIFRlbXBsYXRlQ2FudmFzQW5pbWF0b3IoYmVuY2htYXJr KQorZnVuY3Rpb24gVGVtcGxhdGVDYW52YXNBbmltYXRvcihiZW5jaG1hcmssIG9wdGlvbnMpCiB7 Ci0gICAgQW5pbWF0b3IuY2FsbCh0aGlzLCBiZW5jaG1hcmspOworICAgIEFuaW1hdG9yLmNhbGwo dGhpcywgYmVuY2htYXJrLCBvcHRpb25zKTsKICAgICB0aGlzLl9jb250ZXh0ID0gYmVuY2htYXJr Ll9zdGFnZS5jb250ZXh0OwogfQogCkBAIC05Myw3ICs5Myw3IEBAIFRlbXBsYXRlQ2FudmFzQmVu Y2htYXJrLnByb3RvdHlwZS5jcmVhdGUKIFRlbXBsYXRlQ2FudmFzQmVuY2htYXJrLnByb3RvdHlw ZS5jcmVhdGVBbmltYXRvciA9IGZ1bmN0aW9uKCkKIHsKICAgICAvLyBBdHRhY2ggdGhlIGFuaW1h dG9yIHRvIHRoZSBiZW5jaG1hcmsuCi0gICAgcmV0dXJuIG5ldyBUZW1wbGF0ZUNhbnZhc0FuaW1h dG9yKHRoaXMpOworICAgIHJldHVybiBuZXcgVGVtcGxhdGVDYW52YXNBbmltYXRvcih0aGlzLCB0 aGlzLl9vcHRpb25zKTsKIH0KIAogd2luZG93LmJlbmNobWFya0NsaWVudC5jcmVhdGUgPSBmdW5j dGlvbihzdWl0ZSwgdGVzdCwgb3B0aW9ucywgcmVjb3JkVGFibGUsIHByb2dyZXNzQmFyKQo=