95319 2012-08-29 03:10:46 -0700 Web Inspector: Extract StylesUISourceCodeProvider to separate file. 2012-08-29 03:31:06 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 vsevik vsevik apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 707256 0 vsevik 2012-08-29 03:10:46 -0700 patch to follow. 707257 1 161168 vsevik 2012-08-29 03:11:48 -0700 Created attachment 161168 Patch 707271 2 vsevik 2012-08-29 03:31:06 -0700 Committed r126979: <http://trac.webkit.org/changeset/126979> 161168 2012-08-29 03:11:48 -0700 2012-08-29 03:12:51 -0700 Patch bug-95319-20120829141138.patch text/plain 12986 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2OTc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmMwMTQ0NjNiYTNjMjFm NGFjYjY4NDVlNWQzYzUwYjg1OTI0ZTM5NS4uNDRmNzExMTg2ZDllNjY0NWYzMDA1MzQ2NDkyZTQx YmMyYTMzMTE3ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEyLTA4LTI5ICBWc2V2 b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IEV4dHJhY3QgU3R5bGVzVUlTb3VyY2VDb2RlUHJvdmlkZXIgdG8gc2VwYXJhdGUgZmlsZS4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk1MzE5CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJDb3Jl Lmd5cGk6CisgICAgICAgICogV2ViQ29yZS52Y3Byb2ovV2ViQ29yZS52Y3Byb2o6CisgICAgICAg ICogaW5zcGVjdG9yL2NvbXBpbGUtZnJvbnQtZW5kLnB5OgorICAgICAgICAqIGluc3BlY3Rvci9m cm9udC1lbmQvU3R5bGVTb3VyY2UuanM6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9T dHlsZXNVSVNvdXJjZUNvZGVQcm92aWRlci5qczogQ29waWVkIGZyb20gU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZVNvdXJjZS5qcy4KKyAgICAgICAgKFdlYkluc3BlY3Rv ci5TdHlsZXNVSVNvdXJjZUNvZGVQcm92aWRlcik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU3R5 bGVzVUlTb3VyY2VDb2RlUHJvdmlkZXIucHJvdG90eXBlLnVpU291cmNlQ29kZXMpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlN0eWxlc1VJU291cmNlQ29kZVByb3ZpZGVyLnByb3RvdHlwZS5yYXdM b2NhdGlvblRvVUlMb2NhdGlvbik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU3R5bGVzVUlTb3Vy Y2VDb2RlUHJvdmlkZXIucHJvdG90eXBlLnVpTG9jYXRpb25Ub1Jhd0xvY2F0aW9uKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5TdHlsZXNVSVNvdXJjZUNvZGVQcm92aWRlci5wcm90b3R5cGUuX3Bv cHVsYXRlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TdHlsZXNVSVNvdXJjZUNvZGVQcm92aWRl ci5wcm90b3R5cGUuX3Jlc291cmNlQWRkZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlN0eWxl c1VJU291cmNlQ29kZVByb3ZpZGVyLnByb3RvdHlwZS5yZXNldCk6CisgICAgICAgICogaW5zcGVj dG9yL2Zyb250LWVuZC9XZWJLaXQucXJjOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQv aW5zcGVjdG9yLmh0bWw6CisKIDIwMTItMDgtMjkgIElseWEgVGlraG9ub3Zza3kgIDxsb2lzbG9A Y2hyb21pdW0ub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQ6IFNpbmdsZSBsaW5lIGJ1aWxkIGZp eC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZ3lwaSBiL1NvdXJjZS9XZWJD b3JlL1dlYkNvcmUuZ3lwaQppbmRleCBmNmM3NmNhNDA0NmZjMzYxNDg2N2Q1YWViMGI4ZWZhMTZi ZDY5Mzc1Li4yMGE1OGE3ZTllNjA1MTQ2NGNmZmY4MTg3NmRkNjM4ZDIzNGMzYjYzIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cGkKKysrIGIvU291cmNlL1dlYkNvcmUvV2Vi Q29yZS5neXBpCkBAIC02MzkxLDYgKzYzOTEsNyBAQAogICAgICAgICAgICAgJ2luc3BlY3Rvci9m cm9udC1lbmQvU3BsaXRWaWV3LmpzJywKICAgICAgICAgICAgICdpbnNwZWN0b3IvZnJvbnQtZW5k L1N0YXR1c0JhckJ1dHRvbi5qcycsCiAgICAgICAgICAgICAnaW5zcGVjdG9yL2Zyb250LWVuZC9T dHlsZVNvdXJjZS5qcycsCisgICAgICAgICAgICAnaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNV SVNvdXJjZUNvZGVQcm92aWRlci5qcycsCiAgICAgICAgICAgICAnaW5zcGVjdG9yL2Zyb250LWVu ZC9UYWJiZWRQYW5lLmpzJywKICAgICAgICAgICAgICdpbnNwZWN0b3IvZnJvbnQtZW5kL1Rlc3RD b250cm9sbGVyLmpzJywKICAgICAgICAgICAgICdpbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRFZGl0 b3IuanMnLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS52Y3Byb2ovV2ViQ29y ZS52Y3Byb2ogYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnZjcHJvai9XZWJDb3JlLnZjcHJvagpp bmRleCA5ODYzZDlhZjI2ZTJjZjg2MTJjZTYzMjA5NjFmMmUzYmUyOTljYjJjLi4wMzQyZDczOGYy YTMxODc2ZDEyYmE5MDJkOTI4OWQ0MTNkM2VlOTJhIDEwMDc1NQotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9XZWJDb3JlLnZjcHJvai9XZWJDb3JlLnZjcHJvagorKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJD b3JlLnZjcHJvai9XZWJDb3JlLnZjcHJvagpAQCAtNzY1OTgsNiArNzY1OTgsMTAgQEAKIAkJCQkJ PgogCQkJCTwvRmlsZT4KIAkJCQk8RmlsZQorCQkJCQlSZWxhdGl2ZVBhdGg9Ii4uXGluc3BlY3Rv clxmcm9udC1lbmRcU3R5bGVzVUlTb3VyY2VDb2RlUHJvdmlkZXIuanMiCisJCQkJCT4KKwkJCQk8 L0ZpbGU+CisJCQkJPEZpbGUKIAkJCQkJUmVsYXRpdmVQYXRoPSIuLlxpbnNwZWN0b3JcZnJvbnQt ZW5kXFN0eWxlU291cmNlLmpzIgogCQkJCQk+CiAJCQkJPC9GaWxlPgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2NvbXBpbGUtZnJvbnQtZW5kLnB5IGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2NvbXBpbGUtZnJvbnQtZW5kLnB5CmluZGV4IDlmMDMzZTJkZmQwOTgyMTBl YWUxODgzNDJiMmQxMTNkZTk1NWZkMDYuLmZjZmEwNGVkM2M0OGY4ZmU3ZTQ5YjAwZGFiNGM4Yjkx ZWNmODA4MGEgMTAwNzU1Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9jb21waWxlLWZy b250LWVuZC5weQorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvY29tcGlsZS1mcm9udC1l bmQucHkKQEAgLTkwLDYgKzkwLDcgQEAgbW9kdWxlcyA9IFsKICAgICAgICAgICAgICJTbmlwcGV0 U3RvcmFnZS5qcyIsCiAgICAgICAgICAgICAiU291cmNlTWFwcGluZy5qcyIsCiAgICAgICAgICAg ICAiU3R5bGVTb3VyY2UuanMiLAorICAgICAgICAgICAgIlN0eWxlc1VJU291cmNlQ29kZVByb3Zp ZGVyLmpzIiwKICAgICAgICAgICAgICJUaW1lbGluZU1hbmFnZXIuanMiLAogICAgICAgICAgICAg IlJhd1NvdXJjZUNvZGUuanMiLAogICAgICAgICAgICAgIlJlbW90ZU9iamVjdC5qcyIsCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlU291cmNlLmpz IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZVNvdXJjZS5qcwppbmRl eCA2ZTM4NzNhOTE4YjA1NDMyZDIxMWVjMTgzMTE4ODUzYWVkMTIxZDIzLi40ZDIxZjUxOGE3Y2Iy ZGY3ZmJhNGI4NmE0NWNhOTcyNTI0NWFlYzNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlU291cmNlLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvU3R5bGVTb3VyY2UuanMKQEAgLTI4LDk0ICsyOCw2IEBACiAKIC8q KgogICogQGNvbnN0cnVjdG9yCi0gKiBAZXh0ZW5kcyB7V2ViSW5zcGVjdG9yLk9iamVjdH0KLSAq IEBpbXBsZW1lbnRzIHtXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlUHJvdmlkZXJ9Ci0gKiBAaW1w bGVtZW50cyB7V2ViSW5zcGVjdG9yLlNvdXJjZU1hcHBpbmd9Ci0gKi8KLVdlYkluc3BlY3Rvci5T dHlsZXNVSVNvdXJjZUNvZGVQcm92aWRlciA9IGZ1bmN0aW9uKCkKLXsKLSAgICAvKioKLSAgICAg KiBAdHlwZSB7QXJyYXkuPFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGU+fQotICAgICAqLwotICAg IHRoaXMuX3VpU291cmNlQ29kZXMgPSBbXTsKLSAgICB0aGlzLl91aVNvdXJjZUNvZGVGb3JVUkwg PSB7fTsKLSAgICBXZWJJbnNwZWN0b3IucmVzb3VyY2VUcmVlTW9kZWwuYWRkRXZlbnRMaXN0ZW5l cihXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlTW9kZWwuRXZlbnRUeXBlcy5SZXNvdXJjZUFkZGVk LCB0aGlzLl9yZXNvdXJjZUFkZGVkLCB0aGlzKTsKLX0KLQotV2ViSW5zcGVjdG9yLlN0eWxlc1VJ U291cmNlQ29kZVByb3ZpZGVyLnByb3RvdHlwZSA9IHsKLSAgICAvKioKLSAgICAgKiBAcmV0dXJu IHtBcnJheS48V2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZT59Ci0gICAgICovCi0gICAgdWlTb3Vy Y2VDb2RlczogZnVuY3Rpb24oKQotICAgIHsKLSAgICAgICAgcmV0dXJuIHRoaXMuX3VpU291cmNl Q29kZXM7Ci0gICAgfSwKLQotICAgIC8qKgotICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlJh d0xvY2F0aW9ufSByYXdMb2NhdGlvbgotICAgICAqIEByZXR1cm4ge1dlYkluc3BlY3Rvci5VSUxv Y2F0aW9ufQotICAgICAqLwotICAgIHJhd0xvY2F0aW9uVG9VSUxvY2F0aW9uOiBmdW5jdGlvbihy YXdMb2NhdGlvbikKLSAgICB7Ci0gICAgICAgIHZhciBsb2NhdGlvbiA9IC8qKiBAdHlwZSBXZWJJ bnNwZWN0b3IuQ1NTTG9jYXRpb24gKi8gcmF3TG9jYXRpb247Ci0gICAgICAgIHZhciB1aVNvdXJj ZUNvZGUgPSB0aGlzLl91aVNvdXJjZUNvZGVGb3JVUkxbbG9jYXRpb24udXJsXTsKLSAgICAgICAg cmV0dXJuIG5ldyBXZWJJbnNwZWN0b3IuVUlMb2NhdGlvbih1aVNvdXJjZUNvZGUsIGxvY2F0aW9u LmxpbmVOdW1iZXIsIDApOwotICAgIH0sCi0KLSAgICAvKioKLSAgICAgKiBAcGFyYW0ge1dlYklu c3BlY3Rvci5VSVNvdXJjZUNvZGV9IHVpU291cmNlQ29kZQotICAgICAqIEBwYXJhbSB7bnVtYmVy fSBsaW5lTnVtYmVyCi0gICAgICogQHBhcmFtIHtudW1iZXJ9IGNvbHVtbk51bWJlcgotICAgICAq IEByZXR1cm4ge1dlYkluc3BlY3Rvci5SYXdMb2NhdGlvbn0KLSAgICAgKi8KLSAgICB1aUxvY2F0 aW9uVG9SYXdMb2NhdGlvbjogZnVuY3Rpb24odWlTb3VyY2VDb2RlLCBsaW5lTnVtYmVyLCBjb2x1 bW5OdW1iZXIpCi0gICAgewotICAgICAgICByZXR1cm4gbmV3IFdlYkluc3BlY3Rvci5DU1NMb2Nh dGlvbih1aVNvdXJjZUNvZGUuY29udGVudFVSTCgpIHx8ICIiLCBsaW5lTnVtYmVyKTsKLSAgICB9 LAotCi0gICAgX3BvcHVsYXRlOiBmdW5jdGlvbigpCi0gICAgewotICAgICAgICBmdW5jdGlvbiBw b3B1bGF0ZUZyYW1lKGZyYW1lKQotICAgICAgICB7Ci0gICAgICAgICAgICBmb3IgKHZhciBpID0g MDsgaSA8IGZyYW1lLmNoaWxkRnJhbWVzLmxlbmd0aDsgKytpKQotICAgICAgICAgICAgICAgIHBv cHVsYXRlRnJhbWUuY2FsbCh0aGlzLCBmcmFtZS5jaGlsZEZyYW1lc1tpXSk7Ci0KLSAgICAgICAg ICAgIHZhciByZXNvdXJjZXMgPSBmcmFtZS5yZXNvdXJjZXMoKTsKLSAgICAgICAgICAgIGZvciAo dmFyIGkgPSAwOyBpIDwgcmVzb3VyY2VzLmxlbmd0aDsgKytpKQotICAgICAgICAgICAgICAgIHRo aXMuX3Jlc291cmNlQWRkZWQoe2RhdGE6cmVzb3VyY2VzW2ldfSk7Ci0gICAgICAgIH0KLQotICAg ICAgICBwb3B1bGF0ZUZyYW1lLmNhbGwodGhpcywgV2ViSW5zcGVjdG9yLnJlc291cmNlVHJlZU1v ZGVsLm1haW5GcmFtZSk7Ci0gICAgfSwKLQotICAgIC8qKgotICAgICAqIEBwYXJhbSB7V2ViSW5z cGVjdG9yLkV2ZW50fSBldmVudAotICAgICAqLwotICAgIF9yZXNvdXJjZUFkZGVkOiBmdW5jdGlv bihldmVudCkKLSAgICB7Ci0gICAgICAgIHZhciByZXNvdXJjZSA9IC8qKiBAdHlwZSB7V2ViSW5z cGVjdG9yLlJlc291cmNlfSAqLyBldmVudC5kYXRhOwotICAgICAgICBpZiAocmVzb3VyY2UudHlw ZSAhPT0gV2ViSW5zcGVjdG9yLnJlc291cmNlVHlwZXMuU3R5bGVzaGVldCkKLSAgICAgICAgICAg IHJldHVybjsKLSAgICAgICAgdmFyIHVpU291cmNlQ29kZSA9IG5ldyBXZWJJbnNwZWN0b3IuU3R5 bGVTb3VyY2UocmVzb3VyY2UpOwotICAgICAgICB0aGlzLl91aVNvdXJjZUNvZGVzLnB1c2godWlT b3VyY2VDb2RlKTsKLSAgICAgICAgdGhpcy5fdWlTb3VyY2VDb2RlRm9yVVJMW3Jlc291cmNlLnVy bF0gPSB1aVNvdXJjZUNvZGU7Ci0gICAgICAgIFdlYkluc3BlY3Rvci5jc3NNb2RlbC5zZXRTb3Vy Y2VNYXBwaW5nKHJlc291cmNlLnVybCwgdGhpcyk7Ci0gICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVu dFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGVQcm92aWRlci5FdmVudHMuVUlT b3VyY2VDb2RlQWRkZWQsIHVpU291cmNlQ29kZSk7Ci0gICAgfSwKLQotICAgIHJlc2V0OiBmdW5j dGlvbigpCi0gICAgewotICAgICAgICB0aGlzLl91aVNvdXJjZUNvZGVzID0gW107Ci0gICAgICAg IHRoaXMuX3VpU291cmNlQ29kZUZvclVSTCA9IHt9OwotICAgICAgICBXZWJJbnNwZWN0b3IuY3Nz TW9kZWwucmVzZXRTb3VyY2VNYXBwaW5ncygpOwotICAgICAgICB0aGlzLl9wb3B1bGF0ZSgpOwot ICAgIH0KLX0KLQotV2ViSW5zcGVjdG9yLlN0eWxlc1VJU291cmNlQ29kZVByb3ZpZGVyLnByb3Rv dHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuT2JqZWN0LnByb3RvdHlwZTsKLQotLyoqCi0g KiBAY29uc3RydWN0b3IKICAqIEBleHRlbmRzIHtXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlfQog ICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuUmVzb3VyY2V9IHJlc291cmNlCiAgKi8KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzVUlTb3VyY2VDb2Rl UHJvdmlkZXIuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1VJ U291cmNlQ29kZVByb3ZpZGVyLmpzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjc3MzRhMGU1MDA3Y2UzNjkwMWRiODJi NWM1YzVmNWEzMWFlMTQ5NjkKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1VJU291cmNlQ29kZVByb3ZpZGVyLmpzCkBAIC0wLDAgKzEs MTE3IEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDEyIEdvb2dsZSBJbmMuIEFsbCByaWdodHMg cmVzZXJ2ZWQuCisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJp bmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0 ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMgYXJlCisgKiBtZXQ6Cisg KgorICogICAgICogUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRo ZSBhYm92ZSBjb3B5cmlnaHQKKyAqIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5k IHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqICAgICAqIFJlZGlzdHJpYnV0aW9ucyBpbiBi aW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUKKyAqIGNvcHlyaWdodCBub3RpY2Us IHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIKKyAq IGluIHRoZSBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0 aCB0aGUKKyAqIGRpc3RyaWJ1dGlvbi4KKyAqICAgICAqIE5laXRoZXIgdGhlIG5hbWUgb2YgR29v Z2xlIEluYy4gbm9yIHRoZSBuYW1lcyBvZiBpdHMKKyAqIGNvbnRyaWJ1dG9ycyBtYXkgYmUgdXNl ZCB0byBlbmRvcnNlIG9yIHByb21vdGUgcHJvZHVjdHMgZGVyaXZlZCBmcm9tCisgKiB0aGlzIHNv ZnR3YXJlIHdpdGhvdXQgc3BlY2lmaWMgcHJpb3Igd3JpdHRlbiBwZXJtaXNzaW9uLgorICoKKyAq IFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgVEhFIENPUFlSSUdIVCBIT0xERVJTIEFORCBD T05UUklCVVRPUlMKKyAqICJBUyBJUyIgQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFO VElFUywgSU5DTFVESU5HLCBCVVQgTk9UCisgKiBMSU1JVEVEIFRPLCBUSEUgSU1QTElFRCBXQVJS QU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IKKyAqIEEgUEFSVElDVUxB UiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBUSEUgQ09QWVJJR0hU CisgKiBPV05FUiBPUiBDT05UUklCVVRPUlMgQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJ UkVDVCwgSU5DSURFTlRBTCwKKyAqIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElB TCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QKKyAqIExJTUlURUQgVE8sIFBST0NVUkVNRU5U IE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLAorICogREFUQSwg T1IgUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQg T04gQU5ZCisgKiBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJ Q1QgTElBQklMSVRZLCBPUiBUT1JUCisgKiAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJX SVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKKyAqIE9GIFRISVMgU09GVFdB UkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisg Ki8KKworLyoqCisgKiBAY29uc3RydWN0b3IKKyAqIEBleHRlbmRzIHtXZWJJbnNwZWN0b3IuT2Jq ZWN0fQorICogQGltcGxlbWVudHMge1dlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGVQcm92aWRlcn0K KyAqIEBpbXBsZW1lbnRzIHtXZWJJbnNwZWN0b3IuU291cmNlTWFwcGluZ30KKyAqLworV2ViSW5z cGVjdG9yLlN0eWxlc1VJU291cmNlQ29kZVByb3ZpZGVyID0gZnVuY3Rpb24oKQoreworICAgIC8q KgorICAgICAqIEB0eXBlIHtBcnJheS48V2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZT59CisgICAg ICovCisgICAgdGhpcy5fdWlTb3VyY2VDb2RlcyA9IFtdOworICAgIHRoaXMuX3VpU291cmNlQ29k ZUZvclVSTCA9IHt9OworICAgIFdlYkluc3BlY3Rvci5yZXNvdXJjZVRyZWVNb2RlbC5hZGRFdmVu dExpc3RlbmVyKFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVNb2RlbC5FdmVudFR5cGVzLlJlc291 cmNlQWRkZWQsIHRoaXMuX3Jlc291cmNlQWRkZWQsIHRoaXMpOworfQorCitXZWJJbnNwZWN0b3Iu U3R5bGVzVUlTb3VyY2VDb2RlUHJvdmlkZXIucHJvdG90eXBlID0geworICAgIC8qKgorICAgICAq IEByZXR1cm4ge0FycmF5LjxXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlPn0KKyAgICAgKi8KKyAg ICB1aVNvdXJjZUNvZGVzOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5f dWlTb3VyY2VDb2RlczsKKyAgICB9LAorCisgICAgLyoqCisgICAgICogQHBhcmFtIHtXZWJJbnNw ZWN0b3IuUmF3TG9jYXRpb259IHJhd0xvY2F0aW9uCisgICAgICogQHJldHVybiB7V2ViSW5zcGVj dG9yLlVJTG9jYXRpb259CisgICAgICovCisgICAgcmF3TG9jYXRpb25Ub1VJTG9jYXRpb246IGZ1 bmN0aW9uKHJhd0xvY2F0aW9uKQorICAgIHsKKyAgICAgICAgdmFyIGxvY2F0aW9uID0gLyoqIEB0 eXBlIFdlYkluc3BlY3Rvci5DU1NMb2NhdGlvbiAqLyByYXdMb2NhdGlvbjsKKyAgICAgICAgdmFy IHVpU291cmNlQ29kZSA9IHRoaXMuX3VpU291cmNlQ29kZUZvclVSTFtsb2NhdGlvbi51cmxdOwor ICAgICAgICByZXR1cm4gbmV3IFdlYkluc3BlY3Rvci5VSUxvY2F0aW9uKHVpU291cmNlQ29kZSwg bG9jYXRpb24ubGluZU51bWJlciwgMCk7CisgICAgfSwKKworICAgIC8qKgorICAgICAqIEBwYXJh bSB7V2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZX0gdWlTb3VyY2VDb2RlCisgICAgICogQHBhcmFt IHtudW1iZXJ9IGxpbmVOdW1iZXIKKyAgICAgKiBAcGFyYW0ge251bWJlcn0gY29sdW1uTnVtYmVy CisgICAgICogQHJldHVybiB7V2ViSW5zcGVjdG9yLlJhd0xvY2F0aW9ufQorICAgICAqLworICAg IHVpTG9jYXRpb25Ub1Jhd0xvY2F0aW9uOiBmdW5jdGlvbih1aVNvdXJjZUNvZGUsIGxpbmVOdW1i ZXIsIGNvbHVtbk51bWJlcikKKyAgICB7CisgICAgICAgIHJldHVybiBuZXcgV2ViSW5zcGVjdG9y LkNTU0xvY2F0aW9uKHVpU291cmNlQ29kZS5jb250ZW50VVJMKCkgfHwgIiIsIGxpbmVOdW1iZXIp OworICAgIH0sCisKKyAgICBfcG9wdWxhdGU6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIGZ1 bmN0aW9uIHBvcHVsYXRlRnJhbWUoZnJhbWUpCisgICAgICAgIHsKKyAgICAgICAgICAgIGZvciAo dmFyIGkgPSAwOyBpIDwgZnJhbWUuY2hpbGRGcmFtZXMubGVuZ3RoOyArK2kpCisgICAgICAgICAg ICAgICAgcG9wdWxhdGVGcmFtZS5jYWxsKHRoaXMsIGZyYW1lLmNoaWxkRnJhbWVzW2ldKTsKKwor ICAgICAgICAgICAgdmFyIHJlc291cmNlcyA9IGZyYW1lLnJlc291cmNlcygpOworICAgICAgICAg ICAgZm9yICh2YXIgaSA9IDA7IGkgPCByZXNvdXJjZXMubGVuZ3RoOyArK2kpCisgICAgICAgICAg ICAgICAgdGhpcy5fcmVzb3VyY2VBZGRlZCh7ZGF0YTpyZXNvdXJjZXNbaV19KTsKKyAgICAgICAg fQorCisgICAgICAgIHBvcHVsYXRlRnJhbWUuY2FsbCh0aGlzLCBXZWJJbnNwZWN0b3IucmVzb3Vy Y2VUcmVlTW9kZWwubWFpbkZyYW1lKTsKKyAgICB9LAorCisgICAgLyoqCisgICAgICogQHBhcmFt IHtXZWJJbnNwZWN0b3IuRXZlbnR9IGV2ZW50CisgICAgICovCisgICAgX3Jlc291cmNlQWRkZWQ6 IGZ1bmN0aW9uKGV2ZW50KQorICAgIHsKKyAgICAgICAgdmFyIHJlc291cmNlID0gLyoqIEB0eXBl IHtXZWJJbnNwZWN0b3IuUmVzb3VyY2V9ICovIGV2ZW50LmRhdGE7CisgICAgICAgIGlmIChyZXNv dXJjZS50eXBlICE9PSBXZWJJbnNwZWN0b3IucmVzb3VyY2VUeXBlcy5TdHlsZXNoZWV0KQorICAg ICAgICAgICAgcmV0dXJuOworICAgICAgICB2YXIgdWlTb3VyY2VDb2RlID0gbmV3IFdlYkluc3Bl Y3Rvci5TdHlsZVNvdXJjZShyZXNvdXJjZSk7CisgICAgICAgIHRoaXMuX3VpU291cmNlQ29kZXMu cHVzaCh1aVNvdXJjZUNvZGUpOworICAgICAgICB0aGlzLl91aVNvdXJjZUNvZGVGb3JVUkxbcmVz b3VyY2UudXJsXSA9IHVpU291cmNlQ29kZTsKKyAgICAgICAgV2ViSW5zcGVjdG9yLmNzc01vZGVs LnNldFNvdXJjZU1hcHBpbmcocmVzb3VyY2UudXJsLCB0aGlzKTsKKyAgICAgICAgdGhpcy5kaXNw YXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZVByb3ZpZGVyLkV2 ZW50cy5VSVNvdXJjZUNvZGVBZGRlZCwgdWlTb3VyY2VDb2RlKTsKKyAgICB9LAorCisgICAgcmVz ZXQ6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHRoaXMuX3VpU291cmNlQ29kZXMgPSBbXTsK KyAgICAgICAgdGhpcy5fdWlTb3VyY2VDb2RlRm9yVVJMID0ge307CisgICAgICAgIFdlYkluc3Bl Y3Rvci5jc3NNb2RlbC5yZXNldFNvdXJjZU1hcHBpbmdzKCk7CisgICAgICAgIHRoaXMuX3BvcHVs YXRlKCk7CisgICAgfQorfQorCitXZWJJbnNwZWN0b3IuU3R5bGVzVUlTb3VyY2VDb2RlUHJvdmlk ZXIucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdlYkluc3BlY3Rvci5PYmplY3QucHJvdG90eXBlOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9XZWJLaXQucXJj IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9XZWJLaXQucXJjCmluZGV4IGU5 ZDE1MTIwOTM2ZGM2YWQzOTJkMGVhNzNmZTI2MTllN2NkOWEwYjkuLmRkMTgyNzI0MjYyZjNlMDVh YjRkZTY4MmZmNGYzZmUxOTUwMWY5OTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvV2ViS2l0LnFyYworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1dlYktpdC5xcmMKQEAgLTE4MCw2ICsxODAsNyBAQAogICAgIDxmaWxlPlN0YXR1 c0JhckJ1dHRvbi5qczwvZmlsZT4KICAgICA8ZmlsZT5TdHlsZVNoZWV0T3V0bGluZURpYWxvZy5q czwvZmlsZT4KICAgICA8ZmlsZT5TdHlsZVNvdXJjZS5qczwvZmlsZT4KKyAgICA8ZmlsZT5TdHls ZXNVSVNvdXJjZUNvZGVQcm92aWRlci5qczwvZmlsZT4KICAgICA8ZmlsZT5TdHlsZXNTaWRlYmFy UGFuZS5qczwvZmlsZT4KICAgICA8ZmlsZT5UYWJiZWRFZGl0b3JDb250YWluZXIuanM8L2ZpbGU+ CiAgICAgPGZpbGU+VGFiYmVkUGFuZS5qczwvZmlsZT4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmh0bWwgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5odG1sCmluZGV4IDRmMzk3MTI5NjI5OTcxNTUx Yzk2Y2YyZDZiZGMxMjYxMTBiOTc2ZGEuLmQ3ZTg1MzY4OWRmYWIzYWE3ZDgxYjZmNTFjYTM4ODhj NjgwZjQ3Y2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv aW5zcGVjdG9yLmh0bWwKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9p bnNwZWN0b3IuaHRtbApAQCAtMTYxLDYgKzE2MSw3IEBAIFRISVMgU09GVFdBUkUsIEVWRU4gSUYg QURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAgICAgPHNjcmlwdCB0 eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0iU25pcHBldFN0b3JhZ2UuanMiPjwvc2NyaXB0Pgog ICAgIDxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0IiBzcmM9IlNjcmlwdFNuaXBwZXRNb2Rl bC5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0i UHJvZ3Jlc3NCYXIuanMiPjwvc2NyaXB0PgorICAgIDxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2Ny aXB0IiBzcmM9IlN0eWxlc1VJU291cmNlQ29kZVByb3ZpZGVyLmpzIj48L3NjcmlwdD4KICAgICA8 c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCIgc3JjPSJTdHlsZVNvdXJjZS5qcyI+PC9zY3Jp cHQ+CiAgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0iRWxlbWVudHNQYW5l bERlc2NyaXB0b3IuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2Ny aXB0IiBzcmM9Ik5ldHdvcmtQYW5lbERlc2NyaXB0b3IuanMiPjwvc2NyaXB0Pgo=