86742 2012-05-17 08:40:54 -0700 Web Inspector: create SourceFrames with content providers. 2012-05-17 09:04:57 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 626606 0 pfeldman 2012-05-17 08:40:54 -0700 Simple refactoring. 626618 1 142483 pfeldman 2012-05-17 08:56:34 -0700 Created attachment 142483 Patch 626624 2 pfeldman 2012-05-17 09:04:57 -0700 Committed r117455: <http://trac.webkit.org/changeset/117455> 142483 2012-05-17 08:56:34 -0700 2012-05-17 09:00:02 -0700 Patch bug-86742-20120517195632.patch text/plain 10173 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTE3NDUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWIyZmE5MmVjZGQzYWQ2 MzdjN2MyZmMxYTdjZWQ3ZGViODRmZWQyNy4uYjE2NzY2MGE5OWU0MjFhMWQxYjQzODFhNGMzMmZj MmI3OTViNTBiZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMyIEBACiAyMDEyLTA1LTE3ICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgogCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IGNyZWF0ZSBTb3VyY2VGcmFtZXMgd2l0aCBjb250ZW50IHByb3ZpZGVycy4KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg2NzQyCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU2ltcGxlIHJlZmFjdG9yaW5n LgorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9KYXZhU2NyaXB0U291cmNlRnJhbWUu anM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdFNvdXJjZUZyYW1lKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291cmNlRnJhbWUucHJvdG90eXBlLmNvbW1pdEVk aXRpbmcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2VGcmFtZS5wcm90 b3R5cGUuYWZ0ZXJUZXh0Q2hhbmdlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSmF2YVNjcmlw dFNvdXJjZUZyYW1lLnByb3RvdHlwZS5fZGlkRWRpdENvbnRlbnQpOgorICAgICAgICAqIGluc3Bl Y3Rvci9mcm9udC1lbmQvUmVzb3VyY2VWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJl c291cmNlU291cmNlRnJhbWUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlU291cmNl RnJhbWUucHJvdG90eXBlLmdldCByZXNvdXJjZSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250 LWVuZC9TY3JpcHRzUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVs LnByb3RvdHlwZS5fY3JlYXRlU291cmNlRnJhbWUpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9u dC1lbmQvU291cmNlRnJhbWUuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZS5fZW5zdXJlQ29u dGVudExvYWRlZCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNQYW5lbC5q czoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TdHlsZVNvdXJjZUZyYW1lKToKKyAgICAgICAgKiBp bnNwZWN0b3IvZnJvbnQtZW5kL1VJU291cmNlQ29kZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5VSVNvdXJjZUNvZGUucHJvdG90eXBlLmNvbnRlbnRVUkwpOgorCisyMDEyLTA1LTE3ICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgorCiAgICAgICAgIFdlYiBJbnNwZWN0 b3I6IGNvbnZlcnQgc3R5bGVzIHBhbmVsIGludG8gVUlTb3VyY2VDb2RlUHJvdmlkZXIgaW4gdGhl IHNjcmlwdHMgcGFuZWwuCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD04NjczNAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL0phdmFTY3JpcHRTb3VyY2VGcmFtZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvSmF2YVNjcmlwdFNvdXJjZUZyYW1lLmpzCmluZGV4IGJlMTIxM2RhMzc2NDRj MjVmNzAxMDU0MGJiMmViZjBiY2I4ZTM5ODAuLjllNTYxYWI4ZTgyNjlmMzkyYTM1Nzc0YTUzZWVj MTQwM2JkNTcwMjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvSmF2YVNjcmlwdFNvdXJjZUZyYW1lLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvSmF2YVNjcmlwdFNvdXJjZUZyYW1lLmpzCkBAIC00NCw3ICs0NCw3IEBAIFdl Ykluc3BlY3Rvci5KYXZhU2NyaXB0U291cmNlRnJhbWUgPSBmdW5jdGlvbihzY3JpcHRzUGFuZWws IHVpU291cmNlQ29kZSkKICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGxvY2F0aW9ucy5sZW5ndGg7 ICsraSkKICAgICAgICAgdGhpcy5fYnJlYWtwb2ludEFkZGVkKHtkYXRhOmxvY2F0aW9uc1tpXX0p OwogCi0gICAgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLmNhbGwodGhpcywgdWlTb3VyY2VDb2Rl LnVybCk7CisgICAgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLmNhbGwodGhpcywgdWlTb3VyY2VD b2RlKTsKIAogICAgIHRoaXMuX3BvcG92ZXJIZWxwZXIgPSBuZXcgV2ViSW5zcGVjdG9yLk9iamVj dFBvcG92ZXJIZWxwZXIodGhpcy50ZXh0Vmlld2VyLmVsZW1lbnQsCiAgICAgICAgICAgICB0aGlz Ll9nZXRQb3BvdmVyQW5jaG9yLmJpbmQodGhpcyksIHRoaXMuX3Jlc29sdmVPYmplY3RGb3JQb3Bv dmVyLmJpbmQodGhpcyksIHRoaXMuX29uSGlkZVBvcG92ZXIuYmluZCh0aGlzKSwgdHJ1ZSk7CkBA IC04MCwyNCArODAsNiBAQCBXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdFNvdXJjZUZyYW1lLnByb3Rv dHlwZSA9IHsKICAgICB9LAogCiAgICAgLyoqCi0gICAgICogQHBhcmFtIHtmdW5jdGlvbig/c3Ry aW5nLCBib29sZWFuLCBzdHJpbmcpfSBjYWxsYmFjawotICAgICAqLwotICAgIHJlcXVlc3RDb250 ZW50OiBmdW5jdGlvbihjYWxsYmFjaykKLSAgICB7Ci0gICAgICAgIC8qKgotICAgICAgICAgKiBA cGFyYW0gez9zdHJpbmd9IGNvbnRlbnQKLSAgICAgICAgICogQHBhcmFtIHtib29sZWFufSBjb250 ZW50RW5jb2RlZAotICAgICAgICAgKiBAcGFyYW0ge3N0cmluZ30gbWltZVR5cGUKLSAgICAgICAg ICovCi0gICAgICAgIGZ1bmN0aW9uIG15Y2FsbGJhY2soY29udGVudCwgY29udGVudEVuY29kZWQs IG1pbWVUeXBlKQotICAgICAgICB7Ci0gICAgICAgICAgICB0aGlzLl9vcmlnaW5hbENvbnRlbnQg PSBjb250ZW50OwotICAgICAgICAgICAgY2FsbGJhY2soY29udGVudCwgY29udGVudEVuY29kZWQs IG1pbWVUeXBlKTsKLSAgICAgICAgfQotICAgICAgICB0aGlzLl91aVNvdXJjZUNvZGUucmVxdWVz dENvbnRlbnQobXljYWxsYmFjay5iaW5kKHRoaXMpKTsKLSAgICB9LAotCi0gICAgLyoqCiAgICAg ICogQHJldHVybiB7Ym9vbGVhbn0KICAgICAgKi8KICAgICBjYW5FZGl0U291cmNlOiBmdW5jdGlv bigpCkBAIC0xMTMsNyArOTUsNyBAQCBXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdFNvdXJjZUZyYW1l LnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5fZWRpdGluZ0NvbnRlbnQgPSB0cnVlOwogICAg ICAgICBpZiAoIXRoaXMuX3VpU291cmNlQ29kZS5pc0RpcnR5KCkpCiAgICAgICAgICAgICByZXR1 cm47Ci0gICAgICAgIHRoaXMuX3VpU291cmNlQ29kZS5jb21taXRXb3JraW5nQ29weSh0aGlzLl9k aWRFZGl0Q29udGVudC5iaW5kKHRoaXMsIHRleHQpKTsKKyAgICAgICAgdGhpcy5fdWlTb3VyY2VD b2RlLmNvbW1pdFdvcmtpbmdDb3B5KHRoaXMuX2RpZEVkaXRDb250ZW50LmJpbmQodGhpcykpOwog ICAgIH0sCiAKICAgICAvKioKQEAgLTE3Myw3ICsxNTUsNyBAQCBXZWJJbnNwZWN0b3IuSmF2YVNj cmlwdFNvdXJjZUZyYW1lLnByb3RvdHlwZSA9IHsKICAgICB7CiAgICAgICAgIHRoaXMuX3VpU291 cmNlQ29kZS5zZXRXb3JraW5nQ29weSh0aGlzLnRleHRNb2RlbC50ZXh0KTsKICAgICAgICAgaWYg KCF0aGlzLl91aVNvdXJjZUNvZGUuaXNEaXJ0eSgpKQotICAgICAgICAgICAgdGhpcy5fZGlkRWRp dENvbnRlbnQodGhpcy5fb3JpZ2luYWxDb250ZW50LCBudWxsKTsKKyAgICAgICAgICAgIHRoaXMu X2RpZEVkaXRDb250ZW50KG51bGwpOwogICAgIH0sCiAKICAgICBiZWZvcmVUZXh0Q2hhbmdlZDog ZnVuY3Rpb24oKQpAQCAtMTkzLDcgKzE3NSw3IEBAIFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291 cmNlRnJhbWUucHJvdG90eXBlID0gewogICAgICAgICBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUu cHJvdG90eXBlLmJlZm9yZVRleHRDaGFuZ2VkLmNhbGwodGhpcyk7CiAgICAgfSwKIAotICAgIF9k aWRFZGl0Q29udGVudDogZnVuY3Rpb24oY29udGVudCwgZXJyb3IpCisgICAgX2RpZEVkaXRDb250 ZW50OiBmdW5jdGlvbihlcnJvcikKICAgICB7CiAgICAgICAgIGRlbGV0ZSB0aGlzLl9lZGl0aW5n Q29udGVudDsKIApAQCAtMjAyLDggKzE4NCw2IEBAIFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291 cmNlRnJhbWUucHJvdG90eXBlID0gewogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAK LSAgICAgICAgdGhpcy5fb3JpZ2luYWxDb250ZW50ID0gY29udGVudDsKLQogICAgICAgICAvLyBS ZXN0b3JlIGFsbCBtdXRlZCBicmVha3BvaW50cy4KICAgICAgICAgZm9yICh2YXIgbGluZU51bWJl ciA9IDA7IGxpbmVOdW1iZXIgPCB0aGlzLnRleHRNb2RlbC5saW5lc0NvdW50OyArK2xpbmVOdW1i ZXIpIHsKICAgICAgICAgICAgIHZhciBicmVha3BvaW50RGVjb3JhdGlvbiA9IHRoaXMudGV4dE1v ZGVsLmdldEF0dHJpYnV0ZShsaW5lTnVtYmVyLCAiYnJlYWtwb2ludCIpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVZpZXcuanMgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlVmlldy5qcwppbmRleCBiNjY2 M2Q2ZDJhYzUyMmUxMTRmYTk3MzMzZTk5MjRmMmFiYmRkNDQxLi45NGEyNDExZjlkMWYxMWMzODFk ODg4NDkzZDRkMWY2YTRiNGRiYjFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1Jlc291cmNlVmlldy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1Jlc291cmNlVmlldy5qcwpAQCAtODMsNyArODMsNyBAQCBXZWJJbnNwZWN0 b3IuUmVzb3VyY2VWaWV3Lm5vblNvdXJjZVZpZXdGb3JSZXNvdXJjZSA9IGZ1bmN0aW9uKHJlc291 cmNlKQogV2ViSW5zcGVjdG9yLlJlc291cmNlU291cmNlRnJhbWUgPSBmdW5jdGlvbihyZXNvdXJj ZSkKIHsKICAgICB0aGlzLl9yZXNvdXJjZSA9IHJlc291cmNlOwotICAgIFdlYkluc3BlY3Rvci5T b3VyY2VGcmFtZS5jYWxsKHRoaXMsIHJlc291cmNlLnVybCk7CisgICAgV2ViSW5zcGVjdG9yLlNv dXJjZUZyYW1lLmNhbGwodGhpcywgcmVzb3VyY2UpOwogICAgIHRoaXMuX3Jlc291cmNlLmFkZEV2 ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlJlc291cmNlLkV2ZW50cy5SZXZpc2lvbkFkZGVkLCB0 aGlzLl9jb250ZW50Q2hhbmdlZCwgdGhpcyk7CiB9CiAKQEAgLTkzLDIzICs5Myw2IEBAIFdlYklu c3BlY3Rvci5SZXNvdXJjZVNvdXJjZUZyYW1lLnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJu IHRoaXMuX3Jlc291cmNlOwogICAgIH0sCiAKLSAgICAvKioKLSAgICAgKiBAcGFyYW0ge2Z1bmN0 aW9uKD9zdHJpbmcsYm9vbGVhbixzdHJpbmcpfSBjYWxsYmFjawotICAgICAqLwotICAgIHJlcXVl c3RDb250ZW50OiBmdW5jdGlvbihjYWxsYmFjaykKLSAgICB7Ci0gICAgICAgIC8qKgotICAgICAg ICAgKiBAcGFyYW0gez9zdHJpbmd9IGNvbnRlbnQKLSAgICAgICAgICogQHBhcmFtIHtib29sZWFu fSBjb250ZW50RW5jb2RlZAotICAgICAgICAgKiBAcGFyYW0ge3N0cmluZ30gbWltZVR5cGUKLSAg ICAgICAgICovCi0gICAgICAgIGZ1bmN0aW9uIGNhbGxiYWNrV3JhcHBlcihjb250ZW50LCBjb250 ZW50RW5jb2RlZCwgbWltZVR5cGUpCi0gICAgICAgIHsKLSAgICAgICAgICAgIGNhbGxiYWNrKGNv bnRlbnQsIGNvbnRlbnRFbmNvZGVkLCBtaW1lVHlwZSk7Ci0gICAgICAgIH0KLSAgICAgICAgdGhp cy5yZXNvdXJjZS5yZXF1ZXN0Q29udGVudChjYWxsYmFja1dyYXBwZXIuYmluZCh0aGlzKSk7Ci0g ICAgfSwKLQogICAgIF9jb250ZW50Q2hhbmdlZDogZnVuY3Rpb24oZXZlbnQpCiAgICAgewogICAg ICAgICB0aGlzLnNldENvbnRlbnQodGhpcy5fcmVzb3VyY2UuY29udGVudCwgZmFsc2UsIHRoaXMu X3Jlc291cmNlLmNhbm9uaWNhbE1pbWVUeXBlKCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcwppbmRleCBkY2ViOGJkNGI2MWNlNDc0 ZDIyOTBlNTUyN2YzMTBjNmRiMmNlOTk1Li40NGQ2YjNjZmUxYTFiMjRiZWExOTQyYjQ2NjdiZGM4 ODUxODQwODY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1NjcmlwdHNQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1NjcmlwdHNQYW5lbC5qcwpAQCAtNDY4LDcgKzQ2OCw3IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRz UGFuZWwucHJvdG90eXBlID0gewogICAgICAgICAgICAgc291cmNlRnJhbWUgPSBuZXcgV2ViSW5z cGVjdG9yLlN0eWxlU291cmNlRnJhbWUodWlTb3VyY2VDb2RlKTsKICAgICAgICAgZWxzZSB7CiAg ICAgICAgICAgICBjb25zb2xlLmFzc2VydChmYWxzZSwgIlVua25vd24gVUlTb3VyY2VDb2RlIHR5 cGUiKTsKLSAgICAgICAgICAgIHNvdXJjZUZyYW1lID0gbmV3IFdlYkluc3BlY3Rvci5Tb3VyY2VG cmFtZSh1aVNvdXJjZUNvZGUudXJsKTsKKyAgICAgICAgICAgIHNvdXJjZUZyYW1lID0gbmV3IFdl Ykluc3BlY3Rvci5Tb3VyY2VGcmFtZSh1aVNvdXJjZUNvZGUpOwogICAgICAgICB9CiAgICAgICAg ICAKICAgICAgICAgdGhpcy5fc291cmNlRnJhbWVzQnlVSVNvdXJjZUNvZGUucHV0KHVpU291cmNl Q29kZSwgc291cmNlRnJhbWUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9Tb3VyY2VGcmFtZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvU291cmNlRnJhbWUuanMKaW5kZXggM2YwYjBjODM5NTMwMzA3ZDQ5Yzc3ODExOTc2ZDQ4 Y2NkMTVjNTQxYS4uYjZkZjc1ZjI4OWQ5ZDI3MWY3MTc0OTdkNjVmYzU2MmNhYzhkMDI3NiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGcmFtZS5q cworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZyYW1lLmpz CkBAIC0zMSwxMyArMzEsMTUgQEAKIC8qKgogICogQGV4dGVuZHMge1dlYkluc3BlY3Rvci5WaWV3 fQogICogQGNvbnN0cnVjdG9yCisgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5Db250ZW50UHJvdmlk ZXJ9IGNvbnRlbnRQcm92aWRlcgogICovCi1XZWJJbnNwZWN0b3IuU291cmNlRnJhbWUgPSBmdW5j dGlvbih1cmwpCitXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUgPSBmdW5jdGlvbihjb250ZW50UHJv dmlkZXIpCiB7CiAgICAgV2ViSW5zcGVjdG9yLlZpZXcuY2FsbCh0aGlzKTsKICAgICB0aGlzLmVs ZW1lbnQuYWRkU3R5bGVDbGFzcygic2NyaXB0LXZpZXciKTsKIAotICAgIHRoaXMuX3VybCA9IHVy bDsKKyAgICB0aGlzLl91cmwgPSBjb250ZW50UHJvdmlkZXIuY29udGVudFVSTCgpOworICAgIHRo aXMuX2NvbnRlbnRQcm92aWRlciA9IGNvbnRlbnRQcm92aWRlcjsKIAogICAgIHRoaXMuX3RleHRN b2RlbCA9IG5ldyBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1vZGVsKCk7CiAKQEAgLTExNCwxOCAr MTE2LDExIEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUgPSB7CiAgICAgewog ICAgICAgICBpZiAoIXRoaXMuX2NvbnRlbnRSZXF1ZXN0ZWQpIHsKICAgICAgICAgICAgIHRoaXMu X2NvbnRlbnRSZXF1ZXN0ZWQgPSB0cnVlOwotICAgICAgICAgICAgdGhpcy5yZXF1ZXN0Q29udGVu dCh0aGlzLnNldENvbnRlbnQuYmluZCh0aGlzKSk7CisgICAgICAgICAgICB0aGlzLl9jb250ZW50 UHJvdmlkZXIucmVxdWVzdENvbnRlbnQodGhpcy5zZXRDb250ZW50LmJpbmQodGhpcykpOwogICAg ICAgICB9CiAgICAgfSwKIAogICAgIC8qKgotICAgICAqIEBwYXJhbSB7ZnVuY3Rpb24oP3N0cmlu ZywgYm9vbGVhbiwgc3RyaW5nKX0gY2FsbGJhY2sKLSAgICAgKi8KLSAgICByZXF1ZXN0Q29udGVu dDogZnVuY3Rpb24oY2FsbGJhY2spCi0gICAgewotICAgIH0sCi0KLSAgICAvKioKICAgICAgKiBA cGFyYW0ge1RleHREaWZmfSBkaWZmRGF0YQogICAgICAqLwogICAgIG1hcmtEaWZmOiBmdW5jdGlv bihkaWZmRGF0YSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvU3R5bGVzUGFuZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0 eWxlc1BhbmVsLmpzCmluZGV4IDJjODYwNmRmODc4MGRkOWNmY2Q4YjUyNjQ0NjA2ZTk0NmJiYWY5 ZDIuLjA1ZDQyMGExOTE3NTVmOWNkMGY2OThlYzFiN2I1MjhlYjUzZDEyOTMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzUGFuZWwuanMKKysrIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNQYW5lbC5qcwpAQCAtMTEz LDcgKzExMyw3IEBAIFdlYkluc3BlY3Rvci5TdHlsZVNvdXJjZUZyYW1lID0gZnVuY3Rpb24oc3R5 bGVTb3VyY2UpCiB7CiAgICAgdGhpcy5fcmVzb3VyY2UgPSBzdHlsZVNvdXJjZS5fcmVzb3VyY2U7 CiAgICAgdGhpcy5fc3R5bGVTb3VyY2UgPSBzdHlsZVNvdXJjZTsKLSAgICBXZWJJbnNwZWN0b3Iu U291cmNlRnJhbWUuY2FsbCh0aGlzLCB0aGlzLl9yZXNvdXJjZS51cmwpOworICAgIFdlYkluc3Bl Y3Rvci5Tb3VyY2VGcmFtZS5jYWxsKHRoaXMsIHRoaXMuX3N0eWxlU291cmNlKTsKICAgICB0aGlz Ll9yZXNvdXJjZS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5SZXNvdXJjZS5FdmVudHMu UmV2aXNpb25BZGRlZCwgdGhpcy5fY29udGVudENoYW5nZWQsIHRoaXMpOwogfQogCkBAIC0xMjcs MTQgKzEyNyw2IEBAIFdlYkluc3BlY3Rvci5TdHlsZVNvdXJjZUZyYW1lLnByb3RvdHlwZSA9IHsK ICAgICB9LAogCiAgICAgLyoqCi0gICAgICogQHBhcmFtIHtmdW5jdGlvbig/c3RyaW5nLGJvb2xl YW4sc3RyaW5nKX0gY2FsbGJhY2sKLSAgICAgKi8KLSAgICByZXF1ZXN0Q29udGVudDogZnVuY3Rp b24oY2FsbGJhY2spCi0gICAgewotICAgICAgICB0aGlzLl9zdHlsZVNvdXJjZS5yZXF1ZXN0Q29u dGVudChjYWxsYmFjayk7Ci0gICAgfSwKLQotICAgIC8qKgogICAgICAqIEBwYXJhbSB7c3RyaW5n fSB0ZXh0CiAgICAgICovCiAgICAgY29tbWl0RWRpdGluZzogZnVuY3Rpb24odGV4dCkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVUlTb3VyY2VDb2RlLmpz IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9VSVNvdXJjZUNvZGUuanMKaW5k ZXggY2ZmM2YxYjY3NjRiZTViYjhmYTg1OWUwZjI2MWIyYTBjMjFmZjU5NS4uMmVlNzkwZDFlN2Iy Y2M2M2I4YTRhMTgzNTdmNmMwZjNiZjkzYjk5NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9VSVNvdXJjZUNvZGUuanMKKysrIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9VSVNvdXJjZUNvZGUuanMKQEAgLTMyLDYgKzMyLDcgQEAKIC8q KgogICogQGNvbnN0cnVjdG9yCiAgKiBAZXh0ZW5kcyB7V2ViSW5zcGVjdG9yLk9iamVjdH0KKyAq IEBpbXBsZW1lbnRzIHtXZWJJbnNwZWN0b3IuQ29udGVudFByb3ZpZGVyfQogICogQHBhcmFtIHtz dHJpbmd9IHVybAogICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuQ29udGVudFByb3ZpZGVyfSBjb250 ZW50UHJvdmlkZXIKICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlNvdXJjZU1hcHBpbmc9fSBzb3Vy Y2VNYXBwaW5nCkBAIC05MSw2ICs5MiwxNCBAQCBXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlLnBy b3RvdHlwZSA9IHsKICAgICB9LAogCiAgICAgLyoqCisgICAgICogQHJldHVybiB7P3N0cmluZ30K KyAgICAgKi8KKyAgICBjb250ZW50VVJMOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICByZXR1 cm4gdGhpcy5fdXJsOworICAgIH0sCisKKyAgICAvKioKICAgICAgKiBAcGFyYW0ge2Z1bmN0aW9u KD9zdHJpbmcsYm9vbGVhbixzdHJpbmcpfSBjYWxsYmFjawogICAgICAqLwogICAgIHJlcXVlc3RD b250ZW50OiBmdW5jdGlvbihjYWxsYmFjaykK