92124 2012-07-24 08:52:31 -0700 Web Inspector: introduce UISourceCodeFrame. 2012-07-24 10:09:33 -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 webkit.review.bot yurys oldest_to_newest 676876 0 pfeldman 2012-07-24 08:52:31 -0700 Just a generic implementation of SourceFrame over UISourceCode. 676879 1 154077 pfeldman 2012-07-24 08:55:33 -0700 Created attachment 154077 Patch 676945 2 154077 webkit.review.bot 2012-07-24 10:09:28 -0700 Comment on attachment 154077 Patch Clearing flags on attachment: 154077 Committed r123488: <http://trac.webkit.org/changeset/123488> 676946 3 webkit.review.bot 2012-07-24 10:09:33 -0700 All reviewed patches have been landed. Closing bug. 154077 2012-07-24 08:55:33 -0700 2012-07-24 10:09:28 -0700 Patch bug-92124-20120724195524.patch text/plain 12136 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTIzNDc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWI2NzNlMWRkYzdmOTYy YWZkNmU3ZmZlZmRiNTIyMDg2MmIzYTYwOS4uZmU1MTNlNWMyYTBjOTFiYjhjMTQ1YWNmN2UyMDhi OTRhNzRjY2ZjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEyLTA3LTI0ICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IGludHJvZHVjZSBVSVNvdXJjZUNvZGVGcmFtZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkyMTI0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgR2VuZXJpYyBpbXBsZW1lbnRhdGlvbiBvZiBTb3VyY2VG cmFtZSBvdmVyIFVJU291cmNlQ29kZSBhZGRlZC4KKworICAgICAgICAqIFdlYkNvcmUuZ3lwaToK KyAgICAgICAgKiBXZWJDb3JlLnZjcHJvai9XZWJDb3JlLnZjcHJvajoKKyAgICAgICAgKiBpbnNw ZWN0b3IvY29tcGlsZS1mcm9udC1lbmQucHk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVu ZC9TY3JpcHRzUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnBy b3RvdHlwZS5fY3JlYXRlU291cmNlRnJhbWUpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1l bmQvU3R5bGVzUGFuZWwuanM6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9VSVNvdXJj ZUNvZGVGcmFtZS5qczogQWRkZWQuCisgICAgICAgIChXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2Rl RnJhbWUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZUZyYW1lLnByb3RvdHlw ZS5jYW5FZGl0U291cmNlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGVGcmFt ZS5wcm90b3R5cGUuY29tbWl0RWRpdGluZyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVUlTb3Vy Y2VDb2RlRnJhbWUucHJvdG90eXBlLmFmdGVyVGV4dENoYW5nZWQpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlVJU291cmNlQ29kZUZyYW1lLnByb3RvdHlwZS5fZGlkRWRpdENvbnRlbnQpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZUZyYW1lLnByb3RvdHlwZS5fb25Db250ZW50 Q2hhbmdlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlRnJhbWUucHJvdG90 eXBlLnBvcHVsYXRlVGV4dEFyZWFDb250ZXh0TWVudSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC9XZWJLaXQucXJjOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVj dG9yLmh0bWw6CisKIDIwMTItMDctMjQgIERvbWluaWsgUsO2dHRzY2hlcyAgPGRvbWluaWsucm90 dHNjaGVzQGludGVsLmNvbT4KIAogICAgICAgICBIYXJmQnV6ekZhY2VORy5oIGZvcndhcmQgZGVj bGFyYXRpb25zIGNvbmZsaWN0IHdpdGggbmV3ZXIgdmVyc2lvbnMgb2YgSGFyZmJ1enoKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZ3lwaSBiL1NvdXJjZS9XZWJDb3JlL1dlYkNv cmUuZ3lwaQppbmRleCAzOTVlMjc4NTY5ZGI2MzhmNWE2OGRkNjM3YzdiYWU5NjE3MTQ0OThiLi42 NDVkZjYzY2JjZjBmMDIwMzQxNTNmZWViMGYyMGQxY2FmZGVhZjFmIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9XZWJDb3JlLmd5cGkKKysrIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5neXBp CkBAIC02NDI5LDYgKzY0MjksNyBAQAogICAgICAgICAgICAgJ2luc3BlY3Rvci9mcm9udC1lbmQv VG9wRG93blByb2ZpbGVEYXRhR3JpZFRyZWUuanMnLAogICAgICAgICAgICAgJ2luc3BlY3Rvci9m cm9udC1lbmQvdHJlZW91dGxpbmUuanMnLAogICAgICAgICAgICAgJ2luc3BlY3Rvci9mcm9udC1l bmQvVUlTb3VyY2VDb2RlLmpzJywKKyAgICAgICAgICAgICdpbnNwZWN0b3IvZnJvbnQtZW5kL1VJ U291cmNlQ29kZUZyYW1lLmpzJywKICAgICAgICAgICAgICdpbnNwZWN0b3IvZnJvbnQtZW5kL1VJ VXRpbHMuanMnLAogICAgICAgICAgICAgJ2luc3BlY3Rvci9mcm9udC1lbmQvVXNlckFnZW50U3Vw cG9ydC5qcycsCiAgICAgICAgICAgICAnaW5zcGVjdG9yL2Zyb250LWVuZC9Vc2VyTWV0cmljcy5q cycsCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnZjcHJvai9XZWJDb3JlLnZj cHJvaiBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUudmNwcm9qL1dlYkNvcmUudmNwcm9qCmluZGV4 IGYyODQwOThmNWEzODBkODVlZDhlMzRmYjFiYTFlYzZkYTVjZWY3NDguLjhmNDgzNTNlMGE0YWE2 Y2IxN2IxNzU2Y2IxMTg3NTJhZmE3MzJkYTQgMTAwNzU1Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1dl YkNvcmUudmNwcm9qL1dlYkNvcmUudmNwcm9qCisrKyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUu dmNwcm9qL1dlYkNvcmUudmNwcm9qCkBAIC03NTkzNCw2ICs3NTkzNCwxMCBAQAogCQkJCQk+CiAJ CQkJPC9GaWxlPgogCQkJCTxGaWxlCisJCQkJCVJlbGF0aXZlUGF0aD0iLi5caW5zcGVjdG9yXGZy b250LWVuZFxVSVNvdXJjZUNvZGVGcmFtZS5qcyIKKwkJCQkJPgorCQkJCTwvRmlsZT4KKwkJCQk8 RmlsZQogCQkJCQlSZWxhdGl2ZVBhdGg9Ii4uXGluc3BlY3Rvclxmcm9udC1lbmRcVUlVdGlscy5q cyIKIAkJCQkJPgogCQkJCTwvRmlsZT4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9jb21waWxlLWZyb250LWVuZC5weSBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9jb21w aWxlLWZyb250LWVuZC5weQppbmRleCAzNzU4M2Y3OGE3YzFlZGU5N2UwZjBiYTdmZjQ3MTljYzFl YjZhZmM2Li5kOTIzMzkzYWNmOTIwZTA0MzE5M2EwZGQ5MTA4NjdmMDIxM2ZkYTU1IDEwMDc1NQot LS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvY29tcGlsZS1mcm9udC1lbmQucHkKKysrIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2NvbXBpbGUtZnJvbnQtZW5kLnB5CkBAIC0xNzEsNiAr MTcxLDcgQEAgbW9kdWxlcyA9IFsKICAgICAgICAgICAgICJQcm9wZXJ0aWVzU2lkZWJhclBhbmUu anMiLAogICAgICAgICAgICAgIlNvdXJjZUZyYW1lLmpzIiwKICAgICAgICAgICAgICJUaW1lbGlu ZUdyaWQuanMiLAorICAgICAgICAgICAgIlVJU291cmNlQ29kZUZyYW1lLmpzIiwKICAgICAgICAg XQogICAgIH0sCiAgICAgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9TY3JpcHRzUGFuZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1NjcmlwdHNQYW5lbC5qcwppbmRleCA2MTc1OGY2NjZkNmEzNTViNjkyZmUwM2ZlNDg3NTM0 OThmODBhMWU5Li4xY2U4OWZjNjJlZTNlZWRlMTk2ZTQ3NzVjYmI2MGI1Yzk4OGFkMzkxIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5q cworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5q cwpAQCAtNDY0LDE0ICs0NjQsOSBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlw ZSA9IHsKICAgICAgICAgaWYgKHVpU291cmNlQ29kZSBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5K YXZhU2NyaXB0U291cmNlKSB7CiAgICAgICAgICAgICB2YXIgamF2YVNjcmlwdFNvdXJjZSA9IC8q KiBAdHlwZSB7V2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2V9ICovIHVpU291cmNlQ29kZTsK ICAgICAgICAgICAgIHNvdXJjZUZyYW1lID0gbmV3IFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291 cmNlRnJhbWUodGhpcywgamF2YVNjcmlwdFNvdXJjZSk7Ci0gICAgICAgIH0gZWxzZSBpZiAodWlT b3VyY2VDb2RlIGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlN0eWxlU291cmNlKSB7Ci0gICAgICAg ICAgICB2YXIgc3R5bGVTb3VyY2UgPSAvKiogQHR5cGUge1dlYkluc3BlY3Rvci5TdHlsZVNvdXJj ZX0gKi8gdWlTb3VyY2VDb2RlOwotICAgICAgICAgICAgc291cmNlRnJhbWUgPSBuZXcgV2ViSW5z cGVjdG9yLlN0eWxlU291cmNlRnJhbWUoc3R5bGVTb3VyY2UpOwotICAgICAgICB9IGVsc2Ugewot ICAgICAgICAgICAgY29uc29sZS5hc3NlcnQoZmFsc2UsICJVbmtub3duIFVJU291cmNlQ29kZSB0 eXBlIik7Ci0gICAgICAgICAgICBzb3VyY2VGcmFtZSA9IG5ldyBXZWJJbnNwZWN0b3IuU291cmNl RnJhbWUodWlTb3VyY2VDb2RlKTsKLSAgICAgICAgfQotICAgICAgICAgCisgICAgICAgIH0gZWxz ZQorICAgICAgICAgICAgc291cmNlRnJhbWUgPSBuZXcgV2ViSW5zcGVjdG9yLlVJU291cmNlQ29k ZUZyYW1lKHVpU291cmNlQ29kZSk7CisKICAgICAgICAgdGhpcy5fc291cmNlRnJhbWVzQnlVSVNv dXJjZUNvZGUucHV0KHVpU291cmNlQ29kZSwgc291cmNlRnJhbWUpOwogICAgICAgICByZXR1cm4g c291cmNlRnJhbWU7CiAgICAgfSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvU3R5bGVzUGFuZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1N0eWxlc1BhbmVsLmpzCmluZGV4IGQzZWUwOGYwYjlmNmY5ZjBkNjhjOGI2MWU2ODdk YmNkZGNiZjYzN2MuLmFkMWFiNGE2NzRhOTBjOThjODU5ZGNjZjA4NWI0MjNmOTAxZmE5ZjEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzUGFuZWwu anMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNQYW5lbC5q cwpAQCAtMTY4LDczICsxNjgsNiBAQCBXZWJJbnNwZWN0b3IuSW5zcGVjdG9yU3R5bGVTb3VyY2Uu cHJvdG90eXBlLl9fcHJvdG9fXyA9IFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZAogCiAvKioKICAq IEBjb25zdHJ1Y3RvcgotICogQGV4dGVuZHMge1dlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZX0KLSAq IEBwYXJhbSB7V2ViSW5zcGVjdG9yLlN0eWxlU291cmNlfSBzdHlsZVNvdXJjZQotICovCi1XZWJJ bnNwZWN0b3IuU3R5bGVTb3VyY2VGcmFtZSA9IGZ1bmN0aW9uKHN0eWxlU291cmNlKQotewotICAg IHRoaXMuX3N0eWxlU291cmNlID0gc3R5bGVTb3VyY2U7Ci0gICAgV2ViSW5zcGVjdG9yLlNvdXJj ZUZyYW1lLmNhbGwodGhpcywgdGhpcy5fc3R5bGVTb3VyY2UpOwotICAgIHRoaXMuX3N0eWxlU291 cmNlLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZS5FdmVudHMuQ29u dGVudENoYW5nZWQsIHRoaXMuX29uQ29udGVudENoYW5nZWQsIHRoaXMpOwotfQotCi1XZWJJbnNw ZWN0b3IuU3R5bGVTb3VyY2VGcmFtZS5wcm90b3R5cGUgPSB7Ci0gICAgLyoqCi0gICAgICogQHJl dHVybiB7Ym9vbGVhbn0KLSAgICAgKi8KLSAgICBjYW5FZGl0U291cmNlOiBmdW5jdGlvbigpCi0g ICAgewotICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICB9LAotCi0gICAgLyoqCi0gICAgICogQHBh cmFtIHtzdHJpbmd9IHRleHQKLSAgICAgKi8KLSAgICBjb21taXRFZGl0aW5nOiBmdW5jdGlvbih0 ZXh0KQotICAgIHsKLSAgICAgICAgaWYgKCF0aGlzLl9zdHlsZVNvdXJjZS5pc0RpcnR5KCkpCi0g ICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAgdGhpcy5faXNDb21taXR0aW5nRWRpdGluZyA9 IHRydWU7Ci0gICAgICAgIHRoaXMuX3N0eWxlU291cmNlLmNvbW1pdFdvcmtpbmdDb3B5KHRoaXMu X2RpZEVkaXRDb250ZW50LmJpbmQodGhpcykpOwotICAgIH0sCi0KLSAgICBhZnRlclRleHRDaGFu Z2VkOiBmdW5jdGlvbihvbGRSYW5nZSwgbmV3UmFuZ2UpCi0gICAgewotICAgICAgICB0aGlzLl9z dHlsZVNvdXJjZS5zZXRXb3JraW5nQ29weSh0aGlzLnRleHRNb2RlbC50ZXh0KCkpOwotICAgIH0s Ci0KLSAgICBfZGlkRWRpdENvbnRlbnQ6IGZ1bmN0aW9uKGVycm9yKQotICAgIHsKLSAgICAgICAg aWYgKGVycm9yKSB7Ci0gICAgICAgICAgICBXZWJJbnNwZWN0b3IubG9nKGVycm9yLCBXZWJJbnNw ZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZUxldmVsLkVycm9yLCB0cnVlKTsKLSAgICAgICAg ICAgIHJldHVybjsKLSAgICAgICAgfQotICAgICAgICBkZWxldGUgdGhpcy5faXNDb21taXR0aW5n RWRpdGluZzsKLSAgICB9LAotCi0gICAgLyoqCi0gICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3Iu RXZlbnR9IGV2ZW50Ci0gICAgICovCi0gICAgX29uQ29udGVudENoYW5nZWQ6IGZ1bmN0aW9uKGV2 ZW50KQotICAgIHsKLSAgICAgICAgaWYgKCF0aGlzLl9pc0NvbW1pdHRpbmdFZGl0aW5nKQotICAg ICAgICAgICAgdGhpcy5zZXRDb250ZW50KHRoaXMuX3N0eWxlU291cmNlLmNvbnRlbnQoKSB8fCAi IiwgZmFsc2UsICJ0ZXh0L2NzcyIpOwotICAgIH0sCi0KLSAgICBwb3B1bGF0ZVRleHRBcmVhQ29u dGV4dE1lbnU6IGZ1bmN0aW9uKGNvbnRleHRNZW51LCBsaW5lTnVtYmVyKQotICAgIHsKLSAgICAg ICAgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZS5wb3B1bGF0ZVRleHRBcmVhQ29u dGV4dE1lbnUuY2FsbCh0aGlzLCBjb250ZXh0TWVudSwgbGluZU51bWJlcik7Ci0gICAgICAgIHZh ciBzY3JpcHRzUGFuZWwgPSBXZWJJbnNwZWN0b3IucGFuZWxzLnNjcmlwdHM7Ci0gICAgICAgIGNv bnRleHRNZW51LmFwcGVuZEFwcGxpY2FibGVJdGVtcyh0aGlzLl9zdHlsZVNvdXJjZSk7Ci0gICAg ICAgIGNvbnRleHRNZW51LmFwcGVuZFNlcGFyYXRvcigpOwotICAgIH0KLX0KLQotV2ViSW5zcGVj dG9yLlN0eWxlU291cmNlRnJhbWUucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdlYkluc3BlY3Rvci5T b3VyY2VGcmFtZS5wcm90b3R5cGU7Ci0KLS8qKgotICogQGNvbnN0cnVjdG9yCiAgKiBAaW1wbGVt ZW50cyB7V2ViSW5zcGVjdG9yLlNlbGVjdGlvbkRpYWxvZ0NvbnRlbnRQcm92aWRlcn0KICAqIEBw YXJhbSB7V2ViSW5zcGVjdG9yLlZpZXd9IHZpZXcKICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlN0 eWxlU291cmNlfSBzdHlsZVNvdXJjZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9VSVNvdXJjZUNvZGVGcmFtZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvVUlTb3VyY2VDb2RlRnJhbWUuanMKbmV3IGZpbGUgbW9kZSAxMDA2NDQK aW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZGI5OGRmODc3 Y2Q2NjlhNDU5ZWExYmI5NDMyZTczYzg4NGZiYWQ4YQotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVUlTb3VyY2VDb2RlRnJhbWUuanMKQEAgLTAs MCArMSw5MyBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAxMiBHb29nbGUgSW5jLiBBbGwgcmln aHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFu ZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVy bWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zIGFyZQorICogbWV0 OgorICoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0 aGUgYWJvdmUgY29weXJpZ2h0CisgKiBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFu ZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKgorICogMi4gUmVkaXN0cmlidXRpb25zIGlu IGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZQorICogY29weXJpZ2h0IG5vdGlj ZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lcgor ICogaW4gdGhlIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3 aXRoIHRoZQorICogZGlzdHJpYnV0aW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklE RUQgQlkgR09PR0xFIElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMKKyAqICJBUyBJUyIgQU5EIEFO WSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UCisgKiBM SU1JVEVEIFRPLCBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQg RklUTkVTUyBGT1IKKyAqIEEgUEFSVElDVUxBUiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBO TyBFVkVOVCBTSEFMTCBHT09HTEUgSU5DLgorICogT1IgSVRTIENPTlRSSUJVVE9SUyBCRSBMSUFC TEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLAorICogU1BFQ0lBTCwgRVhF TVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVAorICog TElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsg TE9TUyBPRiBVU0UsCisgKiBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJ T04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkKKyAqIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdI RVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKKyAqIChJTkNMVURJ TkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhF IFVTRQorICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJ TElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisvKioKKyAqIEBjb25zdHJ1Y3RvcgorICogQGV4 dGVuZHMge1dlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZX0KKyAqIEBwYXJhbSB7V2ViSW5zcGVjdG9y LlVJU291cmNlQ29kZX0gdWlTb3VyY2VDb2RlCisgKi8KK1dlYkluc3BlY3Rvci5VSVNvdXJjZUNv ZGVGcmFtZSA9IGZ1bmN0aW9uKHVpU291cmNlQ29kZSkKK3sKKyAgICB0aGlzLl91aVNvdXJjZUNv ZGUgPSB1aVNvdXJjZUNvZGU7CisgICAgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLmNhbGwodGhp cywgdGhpcy5fdWlTb3VyY2VDb2RlKTsKKyAgICB0aGlzLl91aVNvdXJjZUNvZGUuYWRkRXZlbnRM aXN0ZW5lcihXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlLkV2ZW50cy5Db250ZW50Q2hhbmdlZCwg dGhpcy5fb25Db250ZW50Q2hhbmdlZCwgdGhpcyk7Cit9CisKK1dlYkluc3BlY3Rvci5VSVNvdXJj ZUNvZGVGcmFtZS5wcm90b3R5cGUgPSB7CisgICAgLyoqCisgICAgICogQHJldHVybiB7Ym9vbGVh bn0KKyAgICAgKi8KKyAgICBjYW5FZGl0U291cmNlOiBmdW5jdGlvbigpCisgICAgeworICAgICAg ICByZXR1cm4gdHJ1ZTsKKyAgICB9LAorCisgICAgLyoqCisgICAgICogQHBhcmFtIHtzdHJpbmd9 IHRleHQKKyAgICAgKi8KKyAgICBjb21taXRFZGl0aW5nOiBmdW5jdGlvbih0ZXh0KQorICAgIHsK KyAgICAgICAgaWYgKCF0aGlzLl91aVNvdXJjZUNvZGUuaXNEaXJ0eSgpKQorICAgICAgICAgICAg cmV0dXJuOworCisgICAgICAgIHRoaXMuX2lzQ29tbWl0dGluZ0VkaXRpbmcgPSB0cnVlOworICAg ICAgICB0aGlzLl91aVNvdXJjZUNvZGUuY29tbWl0V29ya2luZ0NvcHkodGhpcy5fZGlkRWRpdENv bnRlbnQuYmluZCh0aGlzKSk7CisgICAgfSwKKworICAgIGFmdGVyVGV4dENoYW5nZWQ6IGZ1bmN0 aW9uKG9sZFJhbmdlLCBuZXdSYW5nZSkKKyAgICB7CisgICAgICAgIHRoaXMuX3VpU291cmNlQ29k ZS5zZXRXb3JraW5nQ29weSh0aGlzLnRleHRNb2RlbC50ZXh0KCkpOworICAgIH0sCisKKyAgICBf ZGlkRWRpdENvbnRlbnQ6IGZ1bmN0aW9uKGVycm9yKQorICAgIHsKKyAgICAgICAgaWYgKGVycm9y KSB7CisgICAgICAgICAgICBXZWJJbnNwZWN0b3IubG9nKGVycm9yLCBXZWJJbnNwZWN0b3IuQ29u c29sZU1lc3NhZ2UuTWVzc2FnZUxldmVsLkVycm9yLCB0cnVlKTsKKyAgICAgICAgICAgIHJldHVy bjsKKyAgICAgICAgfQorICAgICAgICBkZWxldGUgdGhpcy5faXNDb21taXR0aW5nRWRpdGluZzsK KyAgICB9LAorCisgICAgLyoqCisgICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuRXZlbnR9IGV2 ZW50CisgICAgICovCisgICAgX29uQ29udGVudENoYW5nZWQ6IGZ1bmN0aW9uKGV2ZW50KQorICAg IHsKKyAgICAgICAgaWYgKCF0aGlzLl9pc0NvbW1pdHRpbmdFZGl0aW5nKQorICAgICAgICAgICAg dGhpcy5zZXRDb250ZW50KHRoaXMuX3VpU291cmNlQ29kZS5jb250ZW50KCkgfHwgIiIsIGZhbHNl LCB0aGlzLl91aVNvdXJjZUNvZGUuY29udGVudFR5cGUoKS5jYW5vbmljYWxNaW1lVHlwZSgpKTsK KyAgICB9LAorCisgICAgcG9wdWxhdGVUZXh0QXJlYUNvbnRleHRNZW51OiBmdW5jdGlvbihjb250 ZXh0TWVudSwgbGluZU51bWJlcikKKyAgICB7CisgICAgICAgIFdlYkluc3BlY3Rvci5Tb3VyY2VG cmFtZS5wcm90b3R5cGUucG9wdWxhdGVUZXh0QXJlYUNvbnRleHRNZW51LmNhbGwodGhpcywgY29u dGV4dE1lbnUsIGxpbmVOdW1iZXIpOworICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRBcHBsaWNh YmxlSXRlbXModGhpcy5fdWlTb3VyY2VDb2RlKTsKKyAgICAgICAgY29udGV4dE1lbnUuYXBwZW5k U2VwYXJhdG9yKCk7CisgICAgfQorfQorCitXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlRnJhbWUu cHJvdG90eXBlLl9fcHJvdG9fXyA9IFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGU7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1dlYktpdC5x cmMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1dlYktpdC5xcmMKaW5kZXgg MGYxMzdmY2ZjYTE4ODdiZTdhZmQ3NzAxM2ZiNjkwZGQ2YWY3NjgwNi4uNDM0NTI1ZTExYTM4MDlh OTU1OTk1ZGUwOTUzNGQwMTFjYzBhNjE5NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9XZWJLaXQucXJjCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvV2ViS2l0LnFyYwpAQCAtMTgxLDYgKzE4MSw3IEBACiAgICAgPGZpbGU+VG9w RG93blByb2ZpbGVEYXRhR3JpZFRyZWUuanM8L2ZpbGU+CiAgICAgPGZpbGU+dHJlZW91dGxpbmUu anM8L2ZpbGU+CiAgICAgPGZpbGU+VUlTb3VyY2VDb2RlLmpzPC9maWxlPgorICAgIDxmaWxlPlVJ U291cmNlQ29kZUZyYW1lLmpzPC9maWxlPgogICAgIDxmaWxlPlVJVXRpbHMuanM8L2ZpbGU+CiAg ICAgPGZpbGU+VXNlckFnZW50U3VwcG9ydC5qczwvZmlsZT4KICAgICA8ZmlsZT5Vc2VyTWV0cmlj cy5qczwvZmlsZT4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvaW5zcGVjdG9yLmh0bWwgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2lu c3BlY3Rvci5odG1sCmluZGV4IDE1OTc5OGJhYWNhNjU2MmZjYjFiYWM1ZjY4YTAzNmE4ZWUzZDZj ZWMuLjYxOTA2NDBlMzMyYmM4OTYwYWVjMzM4OGQ2OTQ4ZTZiOTY2YTk1MzUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmh0bWwKKysrIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuaHRtbApAQCAtMTIx LDYgKzEyMSw3IEBAIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lC SUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQi IHNyYz0iTmV0d29ya1BhbmVsLmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0IHR5cGU9InRleHQv amF2YXNjcmlwdCIgc3JjPSJUZXh0RWRpdG9yLmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0IHR5 cGU9InRleHQvamF2YXNjcmlwdCIgc3JjPSJTb3VyY2VGcmFtZS5qcyI+PC9zY3JpcHQ+CisgICAg PHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0iVUlTb3VyY2VDb2RlRnJhbWUuanMi Pjwvc2NyaXB0PgogICAgIDxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0IiBzcmM9IlJlc291 cmNlVmlldy5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQi IHNyYz0iUmVxdWVzdFZpZXcuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgdHlwZT0idGV4dC9q YXZhc2NyaXB0IiBzcmM9IkphdmFTY3JpcHRTb3VyY2VGcmFtZS5qcyI+PC9zY3JpcHQ+Cg==