35785 2010-03-05 01:49:13 -0800 Web Inspector: Do not show link helper in popovers and/or for external resources. 2010-03-05 14:07:06 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 pfeldman pfeldman apavlov bweinstein eric joepeck rik timothy oldest_to_newest 196384 0 pfeldman 2010-03-05 01:49:13 -0800 Subj. 196388 1 50092 loislo 2010-03-05 01:59:30 -0800 Created attachment 50092 initial version of patch 196390 2 50092 pfeldman 2010-03-05 02:04:54 -0800 Comment on attachment 50092 initial version of patch i'll fix change log and land. 196391 3 pfeldman 2010-03-05 02:09:22 -0800 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/English.lproj/localizedStrings.js M WebCore/inspector/front-end/ResourcesPanel.js M WebCore/inspector/front-end/ScriptsPanel.js M WebCore/inspector/front-end/TimelinePanel.js M WebCore/inspector/front-end/inspector.js M WebKit/chromium/ChangeLog M WebKit/chromium/src/js/DebuggerAgent.js Committed r55575 196394 4 apavlov 2010-03-05 02:18:29 -0800 *** Bug 35736 has been marked as a duplicate of this bug. *** 196651 5 eric 2010-03-05 14:07:06 -0800 The tiger bot started failing after this checkin: http://build.webkit.org/results/Tiger%20Intel%20Release/r55575%20(9360)/results.html I'm not sure that it's related though. 50092 2010-03-05 01:59:30 -0800 2010-03-05 02:04:54 -0800 initial version of patch 4_loislo-1 text/plain 11637 loislo ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NzUzZWI4NS4uYjE0YWQ5OSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNCBAQAorMjAxMC0wMy0wNSAgSWx5YSBUaWtob25v dnNreSAgPGxvaXNsb0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgUGF2ZWwg RmVsZG1hbi4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBEbyBub3Qgc2hvdyBsaW5rIGhlbHBl ciBpbiBwb3BvdmVycyBhbmQvb3IgZm9yIGV4dGVybmFsIHJlc291cmNlcy4KKworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzU3ODUKKworICAgICAgICAq IEVuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qczoKKyAgICAgICAgKiBpbnNwZWN0b3Iv ZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291 cmNlc1BhbmVsLnByb3RvdHlwZS5jYW5TaG93U291cmNlTGluZSk6CisgICAgICAgICogaW5zcGVj dG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2Ny aXB0c1BhbmVsLnByb3RvdHlwZS5fc2NyaXB0T3JSZXNvdXJjZUZvclVSTEFuZExpbmUpOgorICAg ICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVQYW5lbC5qczoKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5UaW1lbGluZVBhbmVsLnByb3RvdHlwZS5oaWRlKToKKyAgICAgICAgKiBpbnNw ZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5kb2N1 bWVudE1vdXNlT3Zlcik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuZG9jdW1lbnRDbGljay5mb2xs b3dMaW5rKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5kb2N1bWVudENsaWNrKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5hZGRNYWluRXZlbnRMaXN0ZW5lcnMpOgorCiAyMDEwLTAzLTA0ICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IFRpbW90aHkgSGF0Y2hlci4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvRW5nbGlzaC5scHJvai9sb2Nh bGl6ZWRTdHJpbmdzLmpzIGIvV2ViQ29yZS9FbmdsaXNoLmxwcm9qL2xvY2FsaXplZFN0cmluZ3Mu anMKaW5kZXggNTBkNDU2MDkyNTA5ZTljZDI3ODZmYzkxMGRjMTdiYThmMjIyYjRiNC4uNDI4M2Uy MDljNWVlZjQ3NmYwY2I1YzNhNTQ2NGYyZjIzODMyYjRkZCAxMDA2NDQKR0lUIGJpbmFyeSBwYXRj aApkZWx0YSA1Mwp1Y21YPndqcEAhYnJWVjlYezZQJDw0ODt1ajQ1YlczNDlOX3NsY21GQ0Nye35g Zis3QXRMTDMwcG9EaC0jCgpkZWx0YSAyNQpnY21jYUpqcEBLTnJWVjlYakg7OFIhKD1Cdj5ZTV4o e2ZgZ18wRjRhX2VFPExlCgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1Jlc291cmNlc1BhbmVsLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNl c1BhbmVsLmpzCmluZGV4IGZmMTI4N2UuLmFmOTJiZmIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanMKQEAgLTQ2Nyw3ICs0NjcsNyBAQCBXZWJJbnNw ZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlID0gewogCiAgICAgY2FuU2hvd1NvdXJjZUxp bmU6IGZ1bmN0aW9uKHVybCwgbGluZSkKICAgICB7Ci0gICAgICAgIHJldHVybiAhIVdlYkluc3Bl Y3Rvci5yZXNvdXJjZUZvclVSTCh1cmwpICYmIEluc3BlY3RvckJhY2tlbmQucmVzb3VyY2VUcmFj a2luZ0VuYWJsZWQoKTsKKyAgICAgICAgcmV0dXJuIHRoaXMuX3Jlc291cmNlVHJhY2tpbmdFbmFi bGVkICYmICEhV2ViSW5zcGVjdG9yLnJlc291cmNlRm9yVVJMKHVybCk7CiAgICAgfSwKIAogICAg IHNob3dTb3VyY2VMaW5lOiBmdW5jdGlvbih1cmwsIGxpbmUpCmRpZmYgLS1naXQgYS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcwppbmRleCBmZmRmMjA1Li40NWU1Njc4IDEwMDY0NAot LS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCisrKyBiL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMKQEAgLTUxNywxOSArNTE3 LDIyIEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0gewogCiAgICAgX3Nj cmlwdE9yUmVzb3VyY2VGb3JVUkxBbmRMaW5lOiBmdW5jdGlvbih1cmwsIGxpbmUpIAogICAgIHsK KyAgICAgICAgdmFyIHNjcmlwdFdpdGhNYXRjaGluZ1VybCA9IG51bGw7CiAgICAgICAgIGZvciAo dmFyIHNvdXJjZUlEIGluIHRoaXMuX3NvdXJjZUlETWFwKSB7CiAgICAgICAgICAgICB2YXIgc2Ny aXB0T3JSZXNvdXJjZSA9IHRoaXMuX3NvdXJjZUlETWFwW3NvdXJjZUlEXTsKICAgICAgICAgICAg IGlmIChzY3JpcHRPclJlc291cmNlIGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlNjcmlwdCkgewot ICAgICAgICAgICAgICAgIHZhciBzY3JpcHQgPSBzY3JpcHRPclJlc291cmNlOwotICAgICAgICAg ICAgICAgIGlmIChzY3JpcHQuc3RhcnRpbmdMaW5lIDw9IGxpbmUgJiYgc2NyaXB0LnN0YXJ0aW5n TGluZSArIHNjcmlwdC5saW5lc0NvdW50ID4gbGluZSkKLSAgICAgICAgICAgICAgICAgICAgcmV0 dXJuIHNjcmlwdDsKKyAgICAgICAgICAgICAgICBpZiAoc2NyaXB0T3JSZXNvdXJjZS5zb3VyY2VV UkwgIT09IHVybCkKKyAgICAgICAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICAg ICAgc2NyaXB0V2l0aE1hdGNoaW5nVXJsID0gc2NyaXB0T3JSZXNvdXJjZTsKKyAgICAgICAgICAg ICAgICBpZiAoc2NyaXB0V2l0aE1hdGNoaW5nVXJsLnN0YXJ0aW5nTGluZSA8PSBsaW5lICYmIHNj cmlwdFdpdGhNYXRjaGluZ1VybC5zdGFydGluZ0xpbmUgKyBzY3JpcHRXaXRoTWF0Y2hpbmdVcmwu bGluZXNDb3VudCA+IGxpbmUpCisgICAgICAgICAgICAgICAgICAgIHJldHVybiBzY3JpcHRXaXRo TWF0Y2hpbmdVcmw7CiAgICAgICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgICAgIHZhciBy ZXNvdXJjZSA9IHNjcmlwdE9yUmVzb3VyY2U7CiAgICAgICAgICAgICAgICAgaWYgKHJlc291cmNl LnVybCA9PT0gdXJsKQogICAgICAgICAgICAgICAgICAgICByZXR1cm4gcmVzb3VyY2U7CiAgICAg ICAgICAgICB9CiAgICAgICAgIH0KLSAgICAgICAgcmV0dXJuIG51bGw7CisgICAgICAgIHJldHVy biBzY3JpcHRXaXRoTWF0Y2hpbmdVcmw7CiAgICAgfSwKIAogICAgIHNob3dWaWV3OiBmdW5jdGlv bih2aWV3KQpAQCAtNjkwLDcgKzY5Myw3IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJv dG90eXBlID0gewogICAgICAgICBvcHRpb24ucmVwcmVzZW50ZWRPYmplY3QgPSBzY3JpcHQucmVz b3VyY2UgfHwgc2NyaXB0OwogICAgICAgICBvcHRpb24udXJsID0gZGlzcGxheU5hbWU7CiAgICAg ICAgIG9wdGlvbi5zdGFydGluZ0xpbmUgPSBzY3JpcHQuc3RhcnRpbmdMaW5lOwotICAgICAgICBv cHRpb24udGV4dCA9IHNjcmlwdC5yZXNvdXJjZSA/IGRpc3BsYXlOYW1lIDogU3RyaW5nLnNwcmlu dGYoIiVzOiVkIiwgZGlzcGxheU5hbWUsIHNjcmlwdC5zdGFydGluZ0xpbmUpOworICAgICAgICBv cHRpb24udGV4dCA9IHNjcmlwdC5yZXNvdXJjZSB8fCBzY3JpcHQuc3RhcnRpbmdMaW5lID09PSAx ID8gZGlzcGxheU5hbWUgOiBTdHJpbmcuc3ByaW50ZigiJXM6JWQiLCBkaXNwbGF5TmFtZSwgc2Ny aXB0LnN0YXJ0aW5nTGluZSk7CiAKICAgICAgICAgZnVuY3Rpb24gb3B0aW9uQ29tcGFyZShhLCBi KQogICAgICAgICB7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGlt ZWxpbmVQYW5lbC5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVBhbmVs LmpzCmluZGV4IDg4NDk2MmQuLjJjNDUyZTUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9UaW1lbGluZVBhbmVsLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9UaW1lbGluZVBhbmVsLmpzCkBAIC0yMzksNiArMjM5LDEyIEBAIFdlYkluc3BlY3Rvci5U aW1lbGluZVBhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHRoaXMuX3JlZnJlc2goKTsK ICAgICB9LAogCisgICAgaGlkZTogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgV2ViSW5zcGVj dG9yLlBhbmVsLnByb3RvdHlwZS5oaWRlLmNhbGwodGhpcyk7CisgICAgICAgIHRoaXMuX2Nsb3Nl UmVjb3JkRGV0YWlscygpOworICAgIH0sCisKICAgICBfb25TY3JvbGw6IGZ1bmN0aW9uKGV2ZW50 KQogICAgIHsKICAgICAgICAgdGhpcy5fY2xvc2VSZWNvcmREZXRhaWxzKCk7CmRpZmYgLS1naXQg YS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzIGIvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcwppbmRleCBhYjk5YmUxLi4yYTUwMTQ5IDEwMDY0 NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCisrKyBiL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKQEAgLTYxNywzNyArNjE3LDE3 IEBAIFdlYkluc3BlY3Rvci5kb2N1bWVudE1vdXNlT3ZlciA9IGZ1bmN0aW9uKGV2ZW50KQogICAg ICAgICByZXR1cm47CiAKICAgICBjb25zdCBhbmNob3IgPSBldmVudC50YXJnZXQ7Ci0gICAgaWYg KCFhbmNob3IuaGFzU3R5bGVDbGFzcygid2Via2l0LWh0bWwtZXh0ZXJuYWwtbGluayIpICYmICFh bmNob3IuaGFzU3R5bGVDbGFzcygid2Via2l0LWh0bWwtcmVzb3VyY2UtbGluayIpKQorICAgIGlm ICghYW5jaG9yLmhhc1N0eWxlQ2xhc3MoIndlYmtpdC1odG1sLXJlc291cmNlLWxpbmsiKSkKICAg ICAgICAgcmV0dXJuOwotCi0gICAgaWYgKFdlYkluc3BlY3Rvci5jYW5TaG93U291cmNlTGluZShh bmNob3IuaHJlZiwgYW5jaG9yLmxpbmVOdW1iZXIsIGFuY2hvci5wcmVmZXJyZWRQYW5lbCkgfHwg V2ViSW5zcGVjdG9yLlByb2ZpbGVUeXBlLlVSTFJlZ0V4cC5leGVjKGFuY2hvci5ocmVmKSkKLSAg ICAgICAgcmV0dXJuOwotCi0gICAgV2ViSW5zcGVjdG9yLl9zaG93UG9wdXBUaW1lciA9IHNldFRp bWVvdXQoV2ViSW5zcGVjdG9yLnNob3dCYWRMaW5rUG9wdXAuYmluZChXZWJJbnNwZWN0b3IsIGFu Y2hvciksIDI1MCk7Ci19Ci0KLVdlYkluc3BlY3Rvci5kb2N1bWVudE1vdXNlT3V0ID0gZnVuY3Rp b24oZXZlbnQpCi17Ci0gICAgaWYgKGV2ZW50LnRhcmdldC50YWdOYW1lICE9PSAiQSIpCisgICAg aWYgKFdlYkluc3BlY3Rvci5jYW5TaG93U291cmNlTGluZShhbmNob3IuaHJlZiwgYW5jaG9yLmxp bmVOdW1iZXIsIGFuY2hvci5wcmVmZXJyZWRQYW5lbCkgfHwgV2ViSW5zcGVjdG9yLlByb2ZpbGVU eXBlLlVSTFJlZ0V4cC5leGVjKGFuY2hvci5ocmVmKSkgeworICAgICAgICBpZiAoZXZlbnQudGFy Z2V0Lm9yaWdpbmFsVGl0bGUpCisgICAgICAgICAgICBldmVudC50YXJnZXQudGl0bGUgPSBldmVu dC50YXJnZXQub3JpZ2luYWxUaXRsZTsKICAgICAgICAgcmV0dXJuOwotCi0gICAgaWYgKFdlYklu c3BlY3Rvci5fc2hvd1BvcHVwVGltZXIpIHsKLSAgICAgICAgY2xlYXJUaW1lb3V0KFdlYkluc3Bl Y3Rvci5fc2hvd1BvcHVwVGltZXIpOwotICAgICAgICBkZWxldGUgV2ViSW5zcGVjdG9yLl9zaG93 UG9wdXBUaW1lcjsKLSAgICB9IGVsc2UgaWYgKFdlYkluc3BlY3Rvci5fYmFkTGlua1BvcHVwICYm ICF0aGlzLl9tb3VzZU92ZXJQb3B1cCkKLSAgICAgICAgV2ViSW5zcGVjdG9yLl9oaWRlUG9wdXBU aW1lciA9IHNldFRpbWVvdXQoV2ViSW5zcGVjdG9yLmhpZGVCYWRMaW5rUG9wdXBJZk5lY2Vzc2Fy eS5iaW5kKFdlYkluc3BlY3RvciksIDc1MCk7Ci19Ci0KLVdlYkluc3BlY3Rvci5oaWRlQmFkTGlu a1BvcHVwSWZOZWNlc3NhcnkgPSBmdW5jdGlvbigpCi17Ci0gICAgaWYgKCF0aGlzLl9iYWRMaW5r UG9wdXApCi0gICAgICAgIHJldHVybjsKLSAgICB0aGlzLl9iYWRMaW5rUG9wdXAuaGlkZSgpOwot ICAgIGRlbGV0ZSB0aGlzLl9iYWRMaW5rUG9wdXA7Ci0gICAgaWYgKHRoaXMuX2hpZGVQb3B1cFRp bWVyKSB7Ci0gICAgICAgIGNsZWFyVGltZW91dCh0aGlzLl9oaWRlUG9wdXBUaW1lcik7Ci0gICAg ICAgIGRlbGV0ZSB0aGlzLl9oaWRlUG9wdXBUaW1lcjsKICAgICB9CisKKyAgICBpZiAoIWV2ZW50 LnRhcmdldC5vcmlnaW5hbFRpdGxlKQorICAgICAgICBldmVudC50YXJnZXQub3JpZ2luYWxUaXRs ZSA9IGV2ZW50LnRhcmdldC50aXRsZTsKKyAgICBldmVudC50YXJnZXQudGl0bGUgPSBXZWJJbnNw ZWN0b3IuVUlTdHJpbmcoIkNhbm5vdCBvcGVuIHRoaXMgbGluay4gTWFrZSBzdXJlIHRoYXQgcmVz b3VyY2UgdHJhY2tpbmcgaXMgZW5hYmxlZCBpbiB0aGUgUmVzb3VyY2VzIHBhbmVsLiIpOwogfQog CiBXZWJJbnNwZWN0b3IuZG9jdW1lbnRDbGljayA9IGZ1bmN0aW9uKGV2ZW50KQpAQCAtNjg3LDgg KzY2Nyw2IEBAIFdlYkluc3BlY3Rvci5kb2N1bWVudENsaWNrID0gZnVuY3Rpb24oZXZlbnQpCiAg ICAgICAgICAgICB9CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KLQotICAgICAgICBX ZWJJbnNwZWN0b3Iuc2hvd0JhZExpbmtQb3B1cChhbmNob3IpOwogICAgIH0KIAogICAgIGlmIChX ZWJJbnNwZWN0b3IuZm9sbG93TGlua1RpbWVvdXQpCkBAIC03MDUsNjEgKzY4Myw2IEBAIFdlYklu c3BlY3Rvci5kb2N1bWVudENsaWNrID0gZnVuY3Rpb24oZXZlbnQpCiAgICAgZm9sbG93TGluaygp OwogfQogCi1XZWJJbnNwZWN0b3Iuc2hvd0JhZExpbmtQb3B1cCA9IGZ1bmN0aW9uKGFuY2hvcikK LXsKLSAgICB0aGlzLmhpZGVCYWRMaW5rUG9wdXBJZk5lY2Vzc2FyeSgpOwotCi0gICAgLy8gU2hv dyBhbiBpbmZvIHBvcHVwIGZvciBhIGxpbmsgdGhhdCBjYW5ub3QgYmUgb3BlbmVkIHJpZ2h0IGF3 YXkuCi0gICAgdmFyIHBvcHVwQ29udGVudEVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50 KCJzcGFuIik7Ci0gICAgcG9wdXBDb250ZW50RWxlbWVudC5jbGFzc05hbWUgPSAibW9ub3NwYWNl IjsKLQotICAgIHZhciBtZXNzYWdlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKAotICAgICAgICAi Q2Fubm90IG9wZW4gdGhpcyBsaW5rLiBNYWtlIHN1cmUgdGhhdCByZXNvdXJjZSB0cmFja2luZyBp cyBlbmFibGVkIGluIHRoZSAlcyBwYW5lbC4iKTsKLSAgICB2YXIgYW5jaG9ySW5kZXggPSBtZXNz YWdlLmluZGV4T2YoIiVzIik7Ci0gICAgaWYgKGFuY2hvckluZGV4IDwgMCkgewotICAgICAgICB2 YXIgbGVmdFBhcnQgPSBtZXNzYWdlOwotICAgICAgICB2YXIgcmlnaHRQYXJ0ID0gIiI7Ci0gICAg fSBlbHNlIHsKLSAgICAgICAgdmFyIGxlZnRQYXJ0ID0gbWVzc2FnZS5zdWJzdHJpbmcoMCwgYW5j aG9ySW5kZXgpOwotICAgICAgICB2YXIgcGFuZWxBbmNob3JFbGVtZW50ID0gZG9jdW1lbnQuY3Jl YXRlRWxlbWVudCgiYSIpOwotICAgICAgICBwYW5lbEFuY2hvckVsZW1lbnQuaHJlZiA9ICJ3ZWJr aXQtbGluay1hY3Rpb246Ly9zaG93LXBhbmVsL3Jlc291cmNlcyI7Ci0gICAgICAgIHBhbmVsQW5j aG9yRWxlbWVudC50ZXh0Q29udGVudCA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiUmVzb3VyY2Vz Iik7Ci0gICAgICAgIHZhciByaWdodFBhcnQgPSBtZXNzYWdlLnN1YnN0cmluZyhhbmNob3JJbmRl eCArIDIpOwotICAgIH0KLSAgICBwb3B1cENvbnRlbnRFbGVtZW50LmFwcGVuZENoaWxkKGRvY3Vt ZW50LmNyZWF0ZVRleHROb2RlKGxlZnRQYXJ0KSk7Ci0gICAgaWYgKHBhbmVsQW5jaG9yRWxlbWVu dCkKLSAgICAgICAgcG9wdXBDb250ZW50RWxlbWVudC5hcHBlbmRDaGlsZChwYW5lbEFuY2hvckVs ZW1lbnQpOwotICAgIHBvcHVwQ29udGVudEVsZW1lbnQuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3Jl YXRlVGV4dE5vZGUocmlnaHRQYXJ0KSk7Ci0gICAgdmFyIHBvcHVwID0gbmV3IFdlYkluc3BlY3Rv ci5Qb3BvdmVyKHBvcHVwQ29udGVudEVsZW1lbnQpOwotCi0gICAgaWYgKHBhbmVsQW5jaG9yRWxl bWVudCkKLSAgICAgICAgcGFuZWxBbmNob3JFbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImNsaWNr IiwgdGhpcy5oaWRlQmFkTGlua1BvcHVwSWZOZWNlc3NhcnkuYmluZCh0aGlzKSk7Ci0KLSAgICBm dW5jdGlvbiBwb3B1cE92ZXJPdXQoZXZlbnQpCi0gICAgewotICAgICAgICBpZiAoZXZlbnQudHlw ZSA9PT0gIm1vdXNlb3ZlciIpIHsKLSAgICAgICAgICAgIGlmICh0aGlzLl9tb3VzZU92ZXJQb3B1 cCkKLSAgICAgICAgICAgICAgICByZXR1cm47IC8vIEVudGVyZWQgZnJvbSBjaGlsZC4KLSAgICAg ICAgICAgIGNsZWFyVGltZW91dCh0aGlzLl9oaWRlUG9wdXBUaW1lcik7Ci0gICAgICAgICAgICBk ZWxldGUgdGhpcy5faGlkZVBvcHVwVGltZXI7Ci0gICAgICAgICAgICB0aGlzLl9tb3VzZU92ZXJQ b3B1cCA9IHRydWU7Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICBjb25zdCByZWxUYXJn ZXQgPSBldmVudC5yZWxhdGVkVGFyZ2V0OwotICAgICAgICAgICAgaWYgKHJlbFRhcmdldCAmJiBy ZWxUYXJnZXQuZW5jbG9zaW5nTm9kZU9yU2VsZldpdGhDbGFzcygicG9wb3ZlciIpKQotICAgICAg ICAgICAgICAgIHJldHVybjsgLy8gTGVhdmluZyB0byBjaGlsZC4KLSAgICAgICAgICAgIGRlbGV0 ZSB0aGlzLl9tb3VzZU92ZXJQb3B1cDsKLSAgICAgICAgICAgIHRoaXMuaGlkZUJhZExpbmtQb3B1 cElmTmVjZXNzYXJ5KCk7Ci0gICAgICAgIH0KLSAgICB9Ci0gICAgY29uc3QgYm91bmRIYW5kbGVy ID0gcG9wdXBPdmVyT3V0LmJpbmQodGhpcyk7Ci0gICAgcG9wdXBDb250ZW50RWxlbWVudC5hZGRF dmVudExpc3RlbmVyKCJtb3VzZW92ZXIiLCBib3VuZEhhbmRsZXIsIHRydWUpOwotICAgIHBvcHVw Q29udGVudEVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigibW91c2VvdXQiLCBib3VuZEhhbmRsZXIs IHRydWUpOwotCi0gICAgcG9wdXAuc2hvdyhhbmNob3IpOwotICAgIHRoaXMuX2JhZExpbmtQb3B1 cCA9IHBvcHVwOwotICAgIGRlbGV0ZSB0aGlzLl9zaG93UG9wdXBUaW1lcjsKLX0KLQogV2ViSW5z cGVjdG9yLmRvY3VtZW50S2V5RG93biA9IGZ1bmN0aW9uKGV2ZW50KQogewogICAgIGlmICh0aGlz LmN1cnJlbnRGb2N1c0VsZW1lbnQgJiYgdGhpcy5jdXJyZW50Rm9jdXNFbGVtZW50LmhhbmRsZUtl eUV2ZW50KSB7CkBAIC0xNzIxLDcgKzE2NDQsNiBAQCBXZWJJbnNwZWN0b3IuYWRkTWFpbkV2ZW50 TGlzdGVuZXJzID0gZnVuY3Rpb24oZG9jKQogICAgIGRvYy5kZWZhdWx0Vmlldy5hZGRFdmVudExp c3RlbmVyKCJibHVyIiwgdGhpcy53aW5kb3dCbHVycmVkLmJpbmQodGhpcyksIGZhbHNlKTsKICAg ICBkb2MuYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0aGlzLmRvY3VtZW50Q2xpY2suYmluZCh0 aGlzKSwgdHJ1ZSk7CiAgICAgZG9jLmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNlb3ZlciIsIHRoaXMu ZG9jdW1lbnRNb3VzZU92ZXIuYmluZCh0aGlzKSwgdHJ1ZSk7Ci0gICAgZG9jLmFkZEV2ZW50TGlz dGVuZXIoIm1vdXNlb3V0IiwgdGhpcy5kb2N1bWVudE1vdXNlT3V0LmJpbmQodGhpcyksIHRydWUp OwogfQogCiBXZWJJbnNwZWN0b3IuX3NlYXJjaEZpZWxkTWFudWFsRm9jdXMgPSBmdW5jdGlvbihl dmVudCkKZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCmluZGV4IGFkZjk2YjkuLmQyODJlZWUgMTAwNjQ0Ci0tLSBhL1dlYktp dC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAt MSwzICsxLDE1IEBACisyMDEwLTAzLTA1ICBwZmVsZG1hbiAgPHBmZWxkbWFuQFBGRUxETUFOLVdJ TjcuYWQuY29ycC5nb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIGNsZWFuCisKKyAgICAgICAgTmVlZCBhIHNob3J0IGRlc2NyaXB0aW9u IGFuZCBidWcgVVJMIChPT1BTISkKKworICAgICAgICAqIHNyYy9qcy9EZWJ1Z2dlckFnZW50Lmpz OgorICAgICAgICAoZGV2dG9vbHMuRGVidWdnZXJBZ2VudC5wcm90b3R5cGUuaW5pdFVJKToKKyAg ICAgICAgKGRldnRvb2xzLkRlYnVnZ2VyQWdlbnQucHJvdG90eXBlLmFkZFNjcmlwdEluZm9fKToK KwogMjAxMC0wMy0wNCAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KIAog ICAgICAgICBOb3QgcmV2aWV3ZWQ6IGNocm9taXVtIHRlc3RzIGZpeC4KZGlmZiAtLWdpdCBhL1dl YktpdC9jaHJvbWl1bS9zcmMvanMvRGVidWdnZXJBZ2VudC5qcyBiL1dlYktpdC9jaHJvbWl1bS9z cmMvanMvRGVidWdnZXJBZ2VudC5qcwppbmRleCA4NzNjZmZiLi5mNGVjY2IxIDEwMDY0NAotLS0g YS9XZWJLaXQvY2hyb21pdW0vc3JjL2pzL0RlYnVnZ2VyQWdlbnQuanMKKysrIGIvV2ViS2l0L2No cm9taXVtL3NyYy9qcy9EZWJ1Z2dlckFnZW50LmpzCkBAIC0xODEsNyArMTgxLDcgQEAgZGV2dG9v bHMuRGVidWdnZXJBZ2VudC5wcm90b3R5cGUuaW5pdFVJID0gZnVuY3Rpb24oKQogICAgICAgICAv LyBwZW5kaW5nIGFkZGl0aW9uIGludG8gdGhlIFVJLgogICAgICAgICBmb3IgKHZhciBzY3JpcHRJ ZCBpbiB0aGlzLnBhcnNlZFNjcmlwdHNfKSB7CiAgICAgICAgICAgdmFyIHNjcmlwdCA9IHRoaXMu cGFyc2VkU2NyaXB0c19bc2NyaXB0SWRdOwotICAgICAgICAgIFdlYkluc3BlY3Rvci5wYXJzZWRT Y3JpcHRTb3VyY2Uoc2NyaXB0SWQsIHNjcmlwdC5nZXRVcmwoKSwgdW5kZWZpbmVkIC8qIHNjcmlw dCBzb3VyY2UgKi8sIHNjcmlwdC5nZXRMaW5lT2Zmc2V0KCkpOworICAgICAgICAgIFdlYkluc3Bl Y3Rvci5wYXJzZWRTY3JpcHRTb3VyY2Uoc2NyaXB0SWQsIHNjcmlwdC5nZXRVcmwoKSwgdW5kZWZp bmVkIC8qIHNjcmlwdCBzb3VyY2UgKi8sIHNjcmlwdC5nZXRMaW5lT2Zmc2V0KCkgKyAxKTsKICAg ICAgICAgfQogICAgICAgICByZXR1cm47CiAgICAgfQpAQCAtOTI2LDcgKzkyNiw3IEBAIGRldnRv b2xzLkRlYnVnZ2VyQWdlbnQucHJvdG90eXBlLmFkZFNjcmlwdEluZm9fID0gZnVuY3Rpb24oc2Ny aXB0LCBtc2cpCiAgICAgdGhpcy5wYXJzZWRTY3JpcHRzX1tzY3JpcHQuaWRdID0gbmV3IGRldnRv b2xzLlNjcmlwdEluZm8oc2NyaXB0LmlkLCBzY3JpcHQubmFtZSwgc2NyaXB0LmxpbmVPZmZzZXQs IGNvbnRleHRUeXBlKTsKICAgICBpZiAodGhpcy5zY3JpcHRzUGFuZWxJbml0aWFsaXplZF8pIHsK ICAgICAgICAgLy8gT25seSByZXBvcnQgc2NyaXB0IGFzIHBhcnNlZCBhZnRlciBzY3JpcHRzIHBh bmVsIGhhcyBiZWVuIHNob3duLgotICAgICAgICBXZWJJbnNwZWN0b3IucGFyc2VkU2NyaXB0U291 cmNlKHNjcmlwdC5pZCwgc2NyaXB0Lm5hbWUsIHNjcmlwdC5zb3VyY2UsIHNjcmlwdC5saW5lT2Zm c2V0KTsKKyAgICAgICAgV2ViSW5zcGVjdG9yLnBhcnNlZFNjcmlwdFNvdXJjZShzY3JpcHQuaWQs IHNjcmlwdC5uYW1lLCBzY3JpcHQuc291cmNlLCBzY3JpcHQubGluZU9mZnNldCArIDEpOwogICAg IH0KIH07CiAK