102522 2012-11-16 08:31:18 -0800 Web Inspector: [Canvas] if many canvases are being instrumented show the screenshot of the first one 2012-11-30 06:21:34 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 103739 1 aandrey aandrey apavlov keishi loislo pfeldman pmuellr vsevik web-inspector-bugs webkit.review.bot yurys oldest_to_newest 769310 0 aandrey 2012-11-16 08:31:18 -0800 When many canvases are being instrumented we'll want to show replay screenshots for each canvas. Meanwhile, show the screenshot of the first one (instead of the last one), as it's likely to be the "main" canvas. Patch to follow. 769316 1 174696 aandrey 2012-11-16 08:38:57 -0800 Created attachment 174696 Patch 770496 2 174696 webkit.review.bot 2012-11-19 02:04:11 -0800 Comment on attachment 174696 Patch Clearing flags on attachment: 174696 Committed r135130: <http://trac.webkit.org/changeset/135130> 770497 3 webkit.review.bot 2012-11-19 02:04:15 -0800 All reviewed patches have been landed. Closing bug. 174696 2012-11-16 08:38:57 -0800 2012-11-19 02:04:11 -0800 Patch bug-102522-20121116203652.patch text/plain 11964 aandrey U3VidmVyc2lvbiBSZXZpc2lvbjogMTM0NzY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjJhNDdlMzMwMTY1NTJh MjU5NzkyZGNmMDc0YzI0NTUzOTk3MGFkMC4uNjk1NDJmMDdlZDNmNmIzZjMwNmY4MmE2OTFlNDk0 YjM4NGM2NmRhNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTExLTE2ICBBbmRy ZXkgQWRhaWtpbiAgPGFhbmRyZXlAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFtDYW52YXNdIGlmIG1hbnkgY2FudmFzZXMgYXJlIGJlaW5nIGluc3RydW1lbnRlZCBzaG93 IHRoZSBzY3JlZW5zaG90IG9mIHRoZSBmaXJzdCBvbmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMjUyMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFdoZW4gbWFueSBjYW52YXNlcyBhcmUgYmVpbmcgaW5z dHJ1bWVudGVkIHdlJ2xsIHdhbnQgdG8gc2hvdyByZXBsYXkgc2NyZWVuc2hvdHMgZm9yIGVhY2gg Y2FudmFzLgorICAgICAgICBNZWFud2hpbGUsIHNob3cgdGhlIHNjcmVlbnNob3Qgb2YgdGhlIGZp cnN0IG9uZSAoaW5zdGVhZCBvZiB0aGUgbGFzdCBvbmUpLCBhcyBpdCdzIGxpa2VseSB0byBiZSB0 aGUgIm1haW4iIGNhbnZhcy4KKyAgICAgICAgRHJpdmUtYnk6IGFkZCBtb3JlIHR5cGlmaWNhdGlv biBmb3IgdGhlIEpTIGNvbXBpbGVyLgorICAgICAgICBEcml2ZS1ieTogY3JlYXRlIGEgbmV3IGNh bnZhcyBmb3IgV2ViR0wgcmVwbGF5IGV2ZXJ5IHRpbWUgKHNpbWlsYXIgdG8gMkQgcmVwbGF5KSB0 byBhdm9pZCBwcm9ibGVtcyB3aXRoIHJlc2V0dGluZyB0aGUgY29udGV4dCBzdGF0ZS4KKworICAg ICAgICAqIGluc3BlY3Rvci9JbmplY3RlZFNjcmlwdENhbnZhc01vZHVsZVNvdXJjZS5qczoKKyAg ICAgICAgKC4pOgorCiAyMDEyLTExLTE1ICBBbmRyZXkgQWRhaWtpbiAgPGFhbmRyZXlAY2hyb21p dW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFtXZWJHTF0gY2xvbmVOb2RlIGZvciBp bWFnZXMgd2l0aCByZXZva2VkIEJsb2IgVVJJcyBmYWlscwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0Q2FudmFzTW9kdWxlU291cmNlLmpzIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0Q2FudmFzTW9kdWxlU291cmNlLmpz CmluZGV4IDIzNzA4MjY2NDU1NmNlOWYyOWJjYmJkYjdjN2Q1N2RmY2E5ZTg0YzguLjBlMTllNGM1 YzcyMzVkZTVkYWI0MmQ3OGRhNDgyYTZlMzdjN2I2ODQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdENhbnZhc01vZHVsZVNvdXJjZS5qcworKysgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHRDYW52YXNNb2R1bGVTb3VyY2Uu anMKQEAgLTQyMCw3ICs0MjAsNyBAQCBDYWxsLnByb3RvdHlwZSA9IHsKIAogICAgIC8qKgogICAg ICAqIEBwYXJhbSB7Q2FjaGV9IGNhY2hlCi0gICAgICogQHJldHVybiB7UmVwbGF5YWJsZUNhbGx9 CisgICAgICogQHJldHVybiB7IVJlcGxheWFibGVDYWxsfQogICAgICAqLwogICAgIHRvUmVwbGF5 YWJsZTogZnVuY3Rpb24oY2FjaGUpCiAgICAgewpAQCAtNDM3LDcgKzQzNyw3IEBAIENhbGwucHJv dG90eXBlID0gewogICAgIC8qKgogICAgICAqIEBwYXJhbSB7UmVwbGF5YWJsZUNhbGx9IHJlcGxh eWFibGVDYWxsCiAgICAgICogQHBhcmFtIHtDYWNoZX0gY2FjaGUKLSAgICAgKiBAcmV0dXJuIHtD YWxsfQorICAgICAqIEByZXR1cm4geyFDYWxsfQogICAgICAqLwogICAgIHJlcGxheTogZnVuY3Rp b24ocmVwbGF5YWJsZUNhbGwsIGNhY2hlKQogICAgIHsKQEAgLTU2MSw3ICs1NjEsNyBAQCBSZXBs YXlhYmxlQ2FsbC5wcm90b3R5cGUgPSB7CiAKICAgICAvKioKICAgICAgKiBAcGFyYW0ge0NhY2hl fSBjYWNoZQotICAgICAqIEByZXR1cm4ge0NhbGx9CisgICAgICogQHJldHVybiB7IUNhbGx9CiAg ICAgICovCiAgICAgcmVwbGF5OiBmdW5jdGlvbihjYWNoZSkKICAgICB7CkBAIC01NzYsOCArNTc2 LDExIEBAIFJlcGxheWFibGVDYWxsLnByb3RvdHlwZSA9IHsKICAqLwogZnVuY3Rpb24gUmVzb3Vy Y2Uod3JhcHBlZE9iamVjdCkKIHsKKyAgICAvKiogQHR5cGUge251bWJlcn0gKi8KICAgICB0aGlz Ll9pZCA9ICsrUmVzb3VyY2UuX3VuaXF1ZUlkOworICAgIC8qKiBAdHlwZSB7UmVzb3VyY2VUcmFj a2luZ01hbmFnZXJ9ICovCiAgICAgdGhpcy5fcmVzb3VyY2VNYW5hZ2VyID0gbnVsbDsKKyAgICAv KiogQHR5cGUgeyFBcnJheS48Q2FsbD59ICovCiAgICAgdGhpcy5fY2FsbHMgPSBbXTsKICAgICB0 aGlzLnNldFdyYXBwZWRPYmplY3Qod3JhcHBlZE9iamVjdCk7CiB9CkBAIC02NzgsNyArNjgxLDcg QEAgUmVzb3VyY2UucHJvdG90eXBlID0gewogICAgIH0sCiAKICAgICAvKioKLSAgICAgKiBAcmV0 dXJuIHtBcnJheS48Q2FsbD59CisgICAgICogQHJldHVybiB7IUFycmF5LjxDYWxsPn0KICAgICAg Ki8KICAgICBjYWxsczogZnVuY3Rpb24oKQogICAgIHsKQEAgLTY4Nyw3ICs2OTAsNyBAQCBSZXNv dXJjZS5wcm90b3R5cGUgPSB7CiAKICAgICAvKioKICAgICAgKiBAcGFyYW0ge0NhY2hlfSBjYWNo ZQotICAgICAqIEByZXR1cm4ge1JlcGxheWFibGVSZXNvdXJjZX0KKyAgICAgKiBAcmV0dXJuIHsh UmVwbGF5YWJsZVJlc291cmNlfQogICAgICAqLwogICAgIHRvUmVwbGF5YWJsZTogZnVuY3Rpb24o Y2FjaGUpCiAgICAgewpAQCAtNzE4LDcgKzcyMSw3IEBAIFJlc291cmNlLnByb3RvdHlwZSA9IHsK ICAgICAvKioKICAgICAgKiBAcGFyYW0ge09iamVjdH0gZGF0YQogICAgICAqIEBwYXJhbSB7Q2Fj aGV9IGNhY2hlCi0gICAgICogQHJldHVybiB7UmVzb3VyY2V9CisgICAgICogQHJldHVybiB7IVJl c291cmNlfQogICAgICAqLwogICAgIHJlcGxheTogZnVuY3Rpb24oZGF0YSwgY2FjaGUpCiAgICAg ewpAQCAtODE3LDEyICs4MjAsMTIgQEAgUmVzb3VyY2UucHJvdG90eXBlID0gewogICAgIH0sCiAK ICAgICAvKioKLSAgICAgKiBAcGFyYW0ge1Jlc291cmNlfSByZXNvdXJjZQotICAgICAqIEBwYXJh bSB7T2JqZWN0fSBvcmlnaW5hbE9iamVjdAotICAgICAqIEBwYXJhbSB7RnVuY3Rpb259IG9yaWdp bmFsRnVuY3Rpb24KKyAgICAgKiBAcGFyYW0geyFSZXNvdXJjZX0gcmVzb3VyY2UKKyAgICAgKiBA cGFyYW0geyFPYmplY3R9IG9yaWdpbmFsT2JqZWN0CisgICAgICogQHBhcmFtIHshRnVuY3Rpb259 IG9yaWdpbmFsRnVuY3Rpb24KICAgICAgKiBAcGFyYW0ge3N0cmluZ30gZnVuY3Rpb25OYW1lCi0g ICAgICogQHBhcmFtIHtGdW5jdGlvbn0gY3VzdG9tV3JhcEZ1bmN0aW9uCi0gICAgICogQHJldHVy biB7RnVuY3Rpb259CisgICAgICogQHBhcmFtIHshRnVuY3Rpb259IGN1c3RvbVdyYXBGdW5jdGlv bgorICAgICAqIEByZXR1cm4geyFGdW5jdGlvbn0KICAgICAgKi8KICAgICBfd3JhcEN1c3RvbUZ1 bmN0aW9uOiBmdW5jdGlvbihyZXNvdXJjZSwgb3JpZ2luYWxPYmplY3QsIG9yaWdpbmFsRnVuY3Rp b24sIGZ1bmN0aW9uTmFtZSwgY3VzdG9tV3JhcEZ1bmN0aW9uKQogICAgIHsKQEAgLTg0NCwxMSAr ODQ3LDExIEBAIFJlc291cmNlLnByb3RvdHlwZSA9IHsKICAgICB9LAogCiAgICAgLyoqCi0gICAg ICogQHBhcmFtIHtSZXNvdXJjZX0gcmVzb3VyY2UKLSAgICAgKiBAcGFyYW0ge09iamVjdH0gb3Jp Z2luYWxPYmplY3QKLSAgICAgKiBAcGFyYW0ge0Z1bmN0aW9ufSBvcmlnaW5hbEZ1bmN0aW9uCisg ICAgICogQHBhcmFtIHshUmVzb3VyY2V9IHJlc291cmNlCisgICAgICogQHBhcmFtIHshT2JqZWN0 fSBvcmlnaW5hbE9iamVjdAorICAgICAqIEBwYXJhbSB7IUZ1bmN0aW9ufSBvcmlnaW5hbEZ1bmN0 aW9uCiAgICAgICogQHBhcmFtIHtzdHJpbmd9IGZ1bmN0aW9uTmFtZQotICAgICAqIEByZXR1cm4g e0Z1bmN0aW9ufQorICAgICAqIEByZXR1cm4geyFGdW5jdGlvbn0KICAgICAgKi8KICAgICBfd3Jh cEZ1bmN0aW9uOiBmdW5jdGlvbihyZXNvdXJjZSwgb3JpZ2luYWxPYmplY3QsIG9yaWdpbmFsRnVu Y3Rpb24sIGZ1bmN0aW9uTmFtZSkKICAgICB7CkBAIC04NjcsMTAgKzg3MCwxMCBAQCBSZXNvdXJj ZS5wcm90b3R5cGUgPSB7CiAgICAgfSwKIAogICAgIC8qKgotICAgICAqIEBwYXJhbSB7UmVzb3Vy Y2V9IHJlc291cmNlCi0gICAgICogQHBhcmFtIHtPYmplY3R9IG9yaWdpbmFsT2JqZWN0CisgICAg ICogQHBhcmFtIHshUmVzb3VyY2V9IHJlc291cmNlCisgICAgICogQHBhcmFtIHshT2JqZWN0fSBv cmlnaW5hbE9iamVjdAogICAgICAqIEBwYXJhbSB7c3RyaW5nfSBwcm9wZXJ0eU5hbWUKLSAgICAg KiBAcmV0dXJuIHtGdW5jdGlvbn0KKyAgICAgKiBAcmV0dXJuIHtmdW5jdGlvbigqKX0KICAgICAg Ki8KICAgICBfd3JhcFByb3BlcnR5U2V0dGVyOiBmdW5jdGlvbihyZXNvdXJjZSwgb3JpZ2luYWxP YmplY3QsIHByb3BlcnR5TmFtZSkKICAgICB7CkBAIC05MzAsNyArOTMzLDcgQEAgUmVzb3VyY2Uu V3JhcEZ1bmN0aW9uLnByb3RvdHlwZSA9IHsKICAgICB9LAogCiAgICAgLyoqCi0gICAgICogQHJl dHVybiB7Q2FsbH0KKyAgICAgKiBAcmV0dXJuIHshQ2FsbH0KICAgICAgKi8KICAgICBjYWxsOiBm dW5jdGlvbigpCiAgICAgewpAQCAtOTg1LDcgKzk4OCw3IEBAIGZ1bmN0aW9uIFJlcGxheWFibGVS ZXNvdXJjZShvcmlnaW5hbFJlc291cmNlLCBkYXRhKQogUmVwbGF5YWJsZVJlc291cmNlLnByb3Rv dHlwZSA9IHsKICAgICAvKioKICAgICAgKiBAcGFyYW0ge0NhY2hlfSBjYWNoZQotICAgICAqIEBy ZXR1cm4ge1Jlc291cmNlfQorICAgICAqIEByZXR1cm4geyFSZXNvdXJjZX0KICAgICAgKi8KICAg ICByZXBsYXk6IGZ1bmN0aW9uKGNhY2hlKQogICAgIHsKQEAgLTEwNTAsNiArMTA1Myw3IEBAIExv Z0V2ZXJ5dGhpbmdSZXNvdXJjZS5wcm90b3R5cGUgPSB7CiBmdW5jdGlvbiBXZWJHTEJvdW5kUmVz b3VyY2Uod3JhcHBlZE9iamVjdCkKIHsKICAgICBSZXNvdXJjZS5jYWxsKHRoaXMsIHdyYXBwZWRP YmplY3QpOworICAgIC8qKiBAdHlwZSB7IU9iamVjdC48c3RyaW5nLCAqPn0gKi8KICAgICB0aGlz Ll9zdGF0ZSA9IHt9OwogfQogCkBAIC0yMjkwLDcgKzIyOTQsOSBAQCBDYW52YXNSZW5kZXJpbmdD b250ZXh0MkRSZXNvdXJjZS5wcm90b3R5cGUgPSB7CiAgKi8KIGZ1bmN0aW9uIFRyYWNlTG9nKCkK IHsKKyAgICAvKiogQHR5cGUgeyFBcnJheS48UmVwbGF5YWJsZUNhbGw+fSAqLwogICAgIHRoaXMu X3JlcGxheWFibGVDYWxscyA9IFtdOworICAgIC8qKiBAdHlwZSB7IUNhY2hlfSAqLwogICAgIHRo aXMuX3JlcGxheWFibGVzQ2FjaGUgPSBuZXcgQ2FjaGUoKTsKIH0KIApAQCAtMjMwNCw3ICsyMzEw LDcgQEAgVHJhY2VMb2cucHJvdG90eXBlID0gewogICAgIH0sCiAKICAgICAvKioKLSAgICAgKiBA cmV0dXJuIHtBcnJheS48UmVwbGF5YWJsZUNhbGw+fQorICAgICAqIEByZXR1cm4geyFBcnJheS48 UmVwbGF5YWJsZUNhbGw+fQogICAgICAqLwogICAgIHJlcGxheWFibGVDYWxsczogZnVuY3Rpb24o KQogICAgIHsKQEAgLTIzMTIsNyArMjMxOCw3IEBAIFRyYWNlTG9nLnByb3RvdHlwZSA9IHsKICAg ICB9LAogCiAgICAgLyoqCi0gICAgICogQHBhcmFtIHtSZXNvdXJjZX0gcmVzb3VyY2UKKyAgICAg KiBAcGFyYW0geyFSZXNvdXJjZX0gcmVzb3VyY2UKICAgICAgKi8KICAgICBjYXB0dXJlUmVzb3Vy Y2U6IGZ1bmN0aW9uKHJlc291cmNlKQogICAgIHsKQEAgLTIzMjAsNyArMjMyNiw3IEBAIFRyYWNl TG9nLnByb3RvdHlwZSA9IHsKICAgICB9LAogCiAgICAgLyoqCi0gICAgICogQHBhcmFtIHtDYWxs fSBjYWxsCisgICAgICogQHBhcmFtIHshQ2FsbH0gY2FsbAogICAgICAqLwogICAgIGFkZENhbGw6 IGZ1bmN0aW9uKGNhbGwpCiAgICAgewpAQCAtMjMzNSwxOCArMjM0MSwyNCBAQCBUcmFjZUxvZy5w cm90b3R5cGUgPSB7CiAKIC8qKgogICogQGNvbnN0cnVjdG9yCi0gKiBAcGFyYW0ge1RyYWNlTG9n fSB0cmFjZUxvZworICogQHBhcmFtIHshVHJhY2VMb2d9IHRyYWNlTG9nCisgKiBAcGFyYW0ge2Z1 bmN0aW9uKCk9fSByZXNldENhbGxiYWNrCiAgKi8KLWZ1bmN0aW9uIFRyYWNlTG9nUGxheWVyKHRy YWNlTG9nKQorZnVuY3Rpb24gVHJhY2VMb2dQbGF5ZXIodHJhY2VMb2csIHJlc2V0Q2FsbGJhY2sp CiB7CisgICAgLyoqIEB0eXBlIHshVHJhY2VMb2d9ICovCiAgICAgdGhpcy5fdHJhY2VMb2cgPSB0 cmFjZUxvZzsKKyAgICAvKiogQHR5cGUge251bWJlcn0gKi8KICAgICB0aGlzLl9uZXh0UmVwbGF5 U3RlcCA9IDA7CisgICAgLyoqIEB0eXBlIHshQ2FjaGV9ICovCiAgICAgdGhpcy5fcmVwbGF5V29y bGRDYWNoZSA9IG5ldyBDYWNoZSgpOworICAgIC8qKiBAdHlwZSB7ZnVuY3Rpb24oKXx1bmRlZmlu ZWR9ICovCisgICAgdGhpcy5fcmVzZXRDYWxsYmFjayA9IHJlc2V0Q2FsbGJhY2s7CiB9CiAKIFRy YWNlTG9nUGxheWVyLnByb3RvdHlwZSA9IHsKICAgICAvKioKLSAgICAgKiBAcmV0dXJuIHtUcmFj ZUxvZ30KKyAgICAgKiBAcmV0dXJuIHshVHJhY2VMb2d9CiAgICAgICovCiAgICAgdHJhY2VMb2c6 IGZ1bmN0aW9uKCkKICAgICB7CkBAIC0yMzYzLDkgKzIzNzUsMTAgQEAgVHJhY2VMb2dQbGF5ZXIu cHJvdG90eXBlID0gewogCiAgICAgcmVzZXQ6IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIC8v IEZJWE1FOiBQcmV2ZW50IG1lbW9yeSBsZWFrczogZGV0YWNoIGFuZCBkZWxldGUgYWxsIG9sZCBy ZXNvdXJjZXMgT1IgcmV1c2UgdGhlbSBPUiBjcmVhdGUgYSBuZXcgcmVwbGF5IGNhbnZhcyBldmVy eSB0aW1lLgogICAgICAgICB0aGlzLl9uZXh0UmVwbGF5U3RlcCA9IDA7CiAgICAgICAgIHRoaXMu X3JlcGxheVdvcmxkQ2FjaGUucmVzZXQoKTsKKyAgICAgICAgaWYgKHRoaXMuX3Jlc2V0Q2FsbGJh Y2spCisgICAgICAgICAgICB0aGlzLl9yZXNldENhbGxiYWNrKCk7CiAgICAgfSwKIAogICAgIHN0 ZXA6IGZ1bmN0aW9uKCkKQEAgLTI0NTYsNyArMjQ2OSw3IEBAIFJlc291cmNlVHJhY2tpbmdNYW5h Z2VyLnByb3RvdHlwZSA9IHsKICAgICB9LAogCiAgICAgLyoqCi0gICAgICogQHBhcmFtIHtSZXNv dXJjZX0gcmVzb3VyY2UKKyAgICAgKiBAcGFyYW0geyFSZXNvdXJjZX0gcmVzb3VyY2UKICAgICAg KiBAcGFyYW0ge0FycmF5fEFyZ3VtZW50c30gYXJncwogICAgICAqLwogICAgIGNhcHR1cmVBcmd1 bWVudHM6IGZ1bmN0aW9uKHJlc291cmNlLCBhcmdzKQpAQCAtMjQ3Miw3ICsyNDg1LDcgQEAgUmVz b3VyY2VUcmFja2luZ01hbmFnZXIucHJvdG90eXBlID0gewogICAgIH0sCiAKICAgICAvKioKLSAg ICAgKiBAcGFyYW0ge0NhbGx9IGNhbGwKKyAgICAgKiBAcGFyYW0geyFDYWxsfSBjYWxsCiAgICAg ICovCiAgICAgY2FwdHVyZUNhbGw6IGZ1bmN0aW9uKGNhbGwpCiAgICAgewpAQCAtMjUwNCwxMSAr MjUxNywxNiBAQCBSZXNvdXJjZVRyYWNraW5nTWFuYWdlci5wcm90b3R5cGUgPSB7CiAgKi8KIHZh ciBJbmplY3RlZFNjcmlwdCA9IGZ1bmN0aW9uKCkKIHsKKyAgICAvKiogQHR5cGUgeyFSZXNvdXJj ZVRyYWNraW5nTWFuYWdlcn0gKi8KICAgICB0aGlzLl9tYW5hZ2VyID0gbmV3IFJlc291cmNlVHJh Y2tpbmdNYW5hZ2VyKCk7CisgICAgLyoqIEB0eXBlIHtudW1iZXJ9ICovCiAgICAgdGhpcy5fbGFz dFRyYWNlTG9nSWQgPSAwOworICAgIC8qKiBAdHlwZSB7IU9iamVjdC48c3RyaW5nLCBUcmFjZUxv Zz59ICovCiAgICAgdGhpcy5fdHJhY2VMb2dzID0ge307CisgICAgLyoqIEB0eXBlIHtUcmFjZUxv Z1BsYXllcn0gKi8KICAgICB0aGlzLl90cmFjZUxvZ1BsYXllciA9IG51bGw7Ci0gICAgdGhpcy5f cmVwbGF5Q29udGV4dCA9IG51bGw7CisgICAgLyoqIEB0eXBlIHshQXJyYXkuPHt0eXBlOiBzdHJp bmcsIGNvbnRleHQ6IE9iamVjdH0+fSAqLworICAgIHRoaXMuX3JlcGxheUNvbnRleHRzID0gW107 CiB9CiAKIEluamVjdGVkU2NyaXB0LnByb3RvdHlwZSA9IHsKQEAgLTI2MDMsMTYgKzI2MjEsMTgg QEAgSW5qZWN0ZWRTY3JpcHQucHJvdG90eXBlID0gewogICAgICAgICB2YXIgdHJhY2VMb2cgPSB0 aGlzLl90cmFjZUxvZ3NbaWRdOwogICAgICAgICBpZiAoIXRyYWNlTG9nKQogICAgICAgICAgICAg cmV0dXJuICIiOwotICAgICAgICBpZiAoIXRoaXMuX3RyYWNlTG9nUGxheWVyIHx8IHRoaXMuX3Ry YWNlTG9nUGxheWVyLnRyYWNlTG9nKCkgIT09IHRyYWNlTG9nKQotICAgICAgICAgICAgdGhpcy5f dHJhY2VMb2dQbGF5ZXIgPSBuZXcgVHJhY2VMb2dQbGF5ZXIodHJhY2VMb2cpOworICAgICAgICBp ZiAoIXRoaXMuX3RyYWNlTG9nUGxheWVyIHx8IHRoaXMuX3RyYWNlTG9nUGxheWVyLnRyYWNlTG9n KCkgIT09IHRyYWNlTG9nKSB7CisgICAgICAgICAgICB0aGlzLl9yZXBsYXlDb250ZXh0cyA9IFtd OworICAgICAgICAgICAgdGhpcy5fdHJhY2VMb2dQbGF5ZXIgPSBuZXcgVHJhY2VMb2dQbGF5ZXIo dHJhY2VMb2csIHRoaXMuX29uVHJhY2VMb2dQbGF5ZXJSZXNldC5iaW5kKHRoaXMpKTsKKyAgICAg ICAgfQogICAgICAgICB0aGlzLl90cmFjZUxvZ1BsYXllci5zdGVwVG8oc3RlcE5vKTsKLSAgICAg ICAgaWYgKCF0aGlzLl9yZXBsYXlDb250ZXh0KSB7CisgICAgICAgIGlmICghdGhpcy5fcmVwbGF5 Q29udGV4dHMubGVuZ3RoKSB7CiAgICAgICAgICAgICBjb25zb2xlLmVycm9yKCJBU1NFUlRfTk9U X1JFQUNIRUQ6IHJlcGxheVRyYWNlTG9nIGZhaWxlZCB0byBjcmVhdGUgYSByZXBsYXkgY2FudmFz PyEiKTsKICAgICAgICAgICAgIHJldHVybiAiIjsKICAgICAgICAgfQogICAgICAgICAvLyBSZXR1 cm4gY3VycmVudCBzY3JlZW5zaG90LgogICAgICAgICAvLyBGSVhNRTogU3VwcG9ydCByZXBsYXlp bmcgc2V2ZXJhbCBjYW52YXNlcyBzaW11bHRhbmVvdXNseS4KLSAgICAgICAgcmV0dXJuIHRoaXMu X3JlcGxheUNvbnRleHQuY2FudmFzLnRvRGF0YVVSTCgpOworICAgICAgICByZXR1cm4gdGhpcy5f cmVwbGF5Q29udGV4dHNbMF0uY29udGV4dC5jYW52YXMudG9EYXRhVVJMKCk7CiAgICAgfSwKIAog ICAgIC8qKgpAQCAtMjYyMywzNSArMjY0MywzMiBAQCBJbmplY3RlZFNjcmlwdC5wcm90b3R5cGUg PSB7CiAgICAgICAgIHJldHVybiAie1wiaW5qZWN0ZWRTY3JpcHRJZFwiOiIgKyBpbmplY3RlZFNj cmlwdElkICsgIixcInRyYWNlTG9nSWRcIjoiICsgKCsrdGhpcy5fbGFzdFRyYWNlTG9nSWQpICsg In0iOwogICAgIH0sCiAKKyAgICBfb25UcmFjZUxvZ1BsYXllclJlc2V0OiBmdW5jdGlvbigpCisg ICAgeworICAgICAgICB0aGlzLl9yZXBsYXlDb250ZXh0cyA9IFtdOworICAgIH0sCisKICAgICAv KioKICAgICAgKiBAcGFyYW0geyFXZWJHTFJlbmRlcmluZ0NvbnRleHR9IG9yaWdpbmFsR2xDb250 ZXh0CiAgICAgICogQHJldHVybiB7V2ViR0xSZW5kZXJpbmdDb250ZXh0fQogICAgICAqLwogICAg IF9jb25zdHJ1Y3RXZWJHTFJlcGxheUNvbnRleHQ6IGZ1bmN0aW9uKG9yaWdpbmFsR2xDb250ZXh0 KQogICAgIHsKLSAgICAgICAgdmFyIHJlcGxheUNvbnRleHQgPSBvcmlnaW5hbEdsQ29udGV4dFsi X19yZXBsYXlDb250ZXh0Il07Ci0gICAgICAgIGlmICghcmVwbGF5Q29udGV4dCkgewotICAgICAg ICAgICAgdmFyIGNhbnZhcyA9IG9yaWdpbmFsR2xDb250ZXh0LmNhbnZhcy5jbG9uZU5vZGUodHJ1 ZSk7Ci0gICAgICAgICAgICB2YXIgYXR0cmlidXRlcyA9IG9yaWdpbmFsR2xDb250ZXh0LmdldENv bnRleHRBdHRyaWJ1dGVzKCk7Ci0gICAgICAgICAgICB2YXIgY29udGV4dElkcyA9IFsiZXhwZXJp bWVudGFsLXdlYmdsIiwgIndlYmtpdC0zZCIsICIzZCJdOwotICAgICAgICAgICAgZm9yICh2YXIg aSA9IDAsIGNvbnRleHRJZDsgY29udGV4dElkID0gY29udGV4dElkc1tpXTsgKytpKSB7Ci0gICAg ICAgICAgICAgICAgcmVwbGF5Q29udGV4dCA9IGNhbnZhcy5nZXRDb250ZXh0KGNvbnRleHRJZCwg YXR0cmlidXRlcyk7Ci0gICAgICAgICAgICAgICAgaWYgKHJlcGxheUNvbnRleHQpIHsKLSAgICAg ICAgICAgICAgICAgICAgcmVwbGF5Q29udGV4dCA9IC8qKiBAdHlwZSB7V2ViR0xSZW5kZXJpbmdD b250ZXh0fSAqLyAoUmVzb3VyY2Uud3JhcHBlZE9iamVjdChyZXBsYXlDb250ZXh0KSk7Ci0gICAg ICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgICAgIH0KKyAgICAgICAgdmFyIGNh bnZhcyA9IG9yaWdpbmFsR2xDb250ZXh0LmNhbnZhcy5jbG9uZU5vZGUodHJ1ZSk7CisgICAgICAg IHZhciBhdHRyaWJ1dGVzID0gb3JpZ2luYWxHbENvbnRleHQuZ2V0Q29udGV4dEF0dHJpYnV0ZXMo KTsKKyAgICAgICAgdmFyIGNvbnRleHRJZHMgPSBbImV4cGVyaW1lbnRhbC13ZWJnbCIsICJ3ZWJr aXQtM2QiLCAiM2QiXTsKKyAgICAgICAgZm9yICh2YXIgaSA9IDAsIGNvbnRleHRJZDsgY29udGV4 dElkID0gY29udGV4dElkc1tpXTsgKytpKSB7CisgICAgICAgICAgICB2YXIgcmVwbGF5Q29udGV4 dCA9IGNhbnZhcy5nZXRDb250ZXh0KGNvbnRleHRJZCwgYXR0cmlidXRlcyk7CisgICAgICAgICAg ICBpZiAocmVwbGF5Q29udGV4dCkgeworICAgICAgICAgICAgICAgIHJlcGxheUNvbnRleHQgPSAv KiogQHR5cGUge1dlYkdMUmVuZGVyaW5nQ29udGV4dH0gKi8gKFJlc291cmNlLndyYXBwZWRPYmpl Y3QocmVwbGF5Q29udGV4dCkpOworICAgICAgICAgICAgICAgIHRoaXMuX3JlcGxheUNvbnRleHRz LnB1c2goeworICAgICAgICAgICAgICAgICAgICB0eXBlOiAiM2QiLAorICAgICAgICAgICAgICAg ICAgICBjb250ZXh0OiByZXBsYXlDb250ZXh0CisgICAgICAgICAgICAgICAgfSk7CisgICAgICAg ICAgICAgICAgcmV0dXJuIHJlcGxheUNvbnRleHQ7CiAgICAgICAgICAgICB9Ci0gICAgICAgICAg ICBPYmplY3QuZGVmaW5lUHJvcGVydHkob3JpZ2luYWxHbENvbnRleHQsICJfX3JlcGxheUNvbnRl eHQiLCB7Ci0gICAgICAgICAgICAgICAgdmFsdWU6IHJlcGxheUNvbnRleHQsCi0gICAgICAgICAg ICAgICAgd3JpdGFibGU6IGZhbHNlLAotICAgICAgICAgICAgICAgIGVudW1lcmFibGU6IGZhbHNl LAotICAgICAgICAgICAgICAgIGNvbmZpZ3VyYWJsZTogdHJ1ZQotICAgICAgICAgICAgfSk7Ci0g ICAgICAgICAgICB0aGlzLl9yZXBsYXlDb250ZXh0ID0gcmVwbGF5Q29udGV4dDsKLSAgICAgICAg fSBlbHNlIHsKLSAgICAgICAgICAgIC8vIEZJWE1FOiBSZXNldCB0aGUgcmVwbGF5IEdMIHN0YXRl IGFuZCBjbGVhciB0aGUgY2FudmFzLgogICAgICAgICB9Ci0gICAgICAgIHJldHVybiByZXBsYXlD b250ZXh0OworICAgICAgICByZXR1cm4gbnVsbDsKICAgICB9LAogCiAgICAgLyoqCkBAIC0yNjYz LDcgKzI2ODAsMTAgQEAgSW5qZWN0ZWRTY3JpcHQucHJvdG90eXBlID0gewogICAgICAgICAvLyBD cmVhdGUgYSBuZXcgMkQgY29udGV4dCBlYWNoIHRpbWUgdG8gc3RhcnQgd2l0aCBhbiBlbXB0eSBj b250ZXh0IGRyYXdpbmcgc3RhdGUgc3RhY2sgKG1hbmFnZWQgYnkgc2F2ZSgpIGFuZCByZXN0b3Jl KCkgbWV0aG9kcykuCiAgICAgICAgIHZhciBjYW52YXMgPSBvcmlnaW5hbENvbnRleHQuY2FudmFz LmNsb25lTm9kZSh0cnVlKTsKICAgICAgICAgdmFyIHJlcGxheUNvbnRleHQgPSAvKiogQHR5cGUg e0NhbnZhc1JlbmRlcmluZ0NvbnRleHQyRH0gKi8gKFJlc291cmNlLndyYXBwZWRPYmplY3QoY2Fu dmFzLmdldENvbnRleHQoIjJkIikpKTsKLSAgICAgICAgdGhpcy5fcmVwbGF5Q29udGV4dCA9IHJl cGxheUNvbnRleHQ7CisgICAgICAgIHRoaXMuX3JlcGxheUNvbnRleHRzLnB1c2goeworICAgICAg ICAgICAgdHlwZTogIjJkIiwKKyAgICAgICAgICAgIGNvbnRleHQ6IHJlcGxheUNvbnRleHQKKyAg ICAgICAgfSk7CiAgICAgICAgIHJldHVybiByZXBsYXlDb250ZXh0OwogICAgIH0KIH0K