98122 2012-10-02 00:17:10 -0700 Web Inspector: move runScript into the snippets model 2012-10-02 01:20:50 -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 732363 0 pfeldman 2012-10-02 00:17:10 -0700 It should not be a part of console view (SnippetsModel should not depend on the UI) 732369 1 166629 pfeldman 2012-10-02 00:26:42 -0700 Created attachment 166629 Patch 732409 2 pfeldman 2012-10-02 01:20:50 -0700 Committed r130136: <http://trac.webkit.org/changeset/130136> 166629 2012-10-02 00:26:42 -0700 2012-10-02 01:12:35 -0700 Patch bug-98122-20121002112554.patch text/plain 13209 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTMwMTE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzNiY2E1MTEwY2Q3MzAz YjA0YjdjYTkwYzQ2NmMwM2NhOGEwZWNmMi4uMjllYzBiZDExZjljM2NjODczNmY2M2ZjZTE4NDg3 ZTYyYzBlYzg2YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDEyLTEwLTAyICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IG1vdmUgcnVuU2NyaXB0IGludG8gdGhlIHNuaXBwZXRzIG1vZGVsCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05ODEyMgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIC0gTW92ZXMgcnVuU2NyaXB0IGludG8g dGhlIFNuaXBwZXRzTW9kZWwKKyAgICAgICAgLSBEcml2ZS1ieTogYW5ub3RhdGVzIG1vcmUgUnVu dGltZU1vZGVsIG1ldGhvZHMKKyAgICAgICAgLSBjb21tb24sIHNkaywgdWksIGNvbXBvbmVudHMs IGVsZW1lbnRzLCBuZXR3b3JrLCByZXNvdXJjZXMsIG5ldHdvcmssCisgICAgICAgICAgc2NyaXB0 cywgY29uc29sZSwgdGltZWxpbmUsIHdvcmtlcnMsIHRlc3RzCisgICAgICAgICAgbW9kdWxlcyBu b3cgY29tcGlsZSB3aXRoIG5vIGVycm9ycyBpbiBkZWRpY2F0ZWQgY29tcGlsYXRpb24gbW9kZS4K KworICAgICAgICAqIGluc3BlY3Rvci9jb21waWxlLWZyb250LWVuZC5weToKKyAgICAgICAgKiBp bnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzOgorICAgICAgICAqIGluc3BlY3Rvci9m cm9udC1lbmQvRGF0YWJhc2VRdWVyeVZpZXcuanM6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250 LWVuZC9SdW50aW1lTW9kZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUnVudGltZU1vZGVs LnByb3RvdHlwZS5jb21wbGV0aW9uc0ZvclRleHRQcm9tcHQpOgorICAgICAgICAqIGluc3BlY3Rv ci9mcm9udC1lbmQvU2NyaXB0U25pcHBldE1vZGVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlNjcmlwdFNuaXBwZXRNb2RlbC5wcm90b3R5cGUuZXZhbHVhdGVTY3JpcHRTbmlwcGV0LmNvbXBp bGVDYWxsYmFjayk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0U25pcHBldE1vZGVsLnBy b3RvdHlwZS5ldmFsdWF0ZVNjcmlwdFNuaXBwZXQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNj cmlwdFNuaXBwZXRNb2RlbC5wcm90b3R5cGUuX3J1blNjcmlwdCk6CisgICAgICAgICogaW5zcGVj dG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5qczoKKyAgICAgICAgKiBpbnNwZWN0b3Iv ZnJvbnQtZW5kL1RleHRQcm9tcHQuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dFByb21w dC5wcm90b3R5cGUuY29tcGxldGUpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvZXh0 ZXJucy5qczoKKwogMjAxMi0xMC0wMSAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGNocm9taXVt Lm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBtb3ZlIGNvbXBsZXRpb25zIGNhbGN1bGF0 aW9uIGludG8gUnVudGltZU1vZGVsIChwYXJ0IDEpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvY29tcGlsZS1mcm9udC1lbmQucHkgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvY29tcGlsZS1mcm9udC1lbmQucHkKaW5kZXggZDRhYzVkY2Y5NTA2Njg5NTE1NTc4OTQyMzQ3 YjU4YmM3YjZkMWE2ZS4uM2QxOGVhNzdkMjQ4YWUwMTAxMDEyMGQ2MjkzNDE2YWViOTQ3YjcyNyAx MDA3NTUKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2NvbXBpbGUtZnJvbnQtZW5kLnB5 CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9jb21waWxlLWZyb250LWVuZC5weQpAQCAt NDYsNiArNDYsNyBAQCBtb2R1bGVzID0gWwogICAgICAgICAiZGVwZW5kZW5jaWVzIjogW10sCiAg ICAgICAgICJzb3VyY2VzIjogWwogICAgICAgICAgICAgIkNvbG9yLmpzIiwKKyAgICAgICAgICAg ICJET01FeHRlbnNpb24uanMiLAogICAgICAgICAgICAgIk9iamVjdC5qcyIsCiAgICAgICAgICAg ICAiUGFyc2VkVVJMLmpzIiwKICAgICAgICAgICAgICJQcm9ncmVzcy5qcyIsCkBAIC04NSw2ICs4 Niw3IEBAIG1vZHVsZXMgPSBbCiAgICAgICAgICAgICAiTmV0d29ya0xvZy5qcyIsCiAgICAgICAg ICAgICAiTmV0d29ya1VJU291cmNlQ29kZVByb3ZpZGVyLmpzIiwKICAgICAgICAgICAgICJQcmVz ZW50YXRpb25Db25zb2xlTWVzc2FnZUhlbHBlci5qcyIsCisgICAgICAgICAgICAiUnVudGltZU1v ZGVsLmpzIiwKICAgICAgICAgICAgICJTQVNTU291cmNlTWFwcGluZy5qcyIsCiAgICAgICAgICAg ICAiU2NyaXB0LmpzIiwKICAgICAgICAgICAgICJTY3JpcHRGb3JtYXR0ZXIuanMiLApAQCAtMTE0 LDcgKzExNiw2IEBAIG1vZHVsZXMgPSBbCiAgICAgICAgICJzb3VyY2VzIjogWwogICAgICAgICAg ICAgIkNoZWNrYm94LmpzIiwKICAgICAgICAgICAgICJDb250ZXh0TWVudS5qcyIsCi0gICAgICAg ICAgICAiRE9NRXh0ZW5zaW9uLmpzIiwKICAgICAgICAgICAgICJET01TeW50YXhIaWdobGlnaHRl ci5qcyIsCiAgICAgICAgICAgICAiRGF0YUdyaWQuanMiLAogICAgICAgICAgICAgIkRlZmF1bHRU ZXh0RWRpdG9yLmpzIiwKQEAgLTE3MSw3ICsxNzIsNiBAQCBtb2R1bGVzID0gWwogICAgICAgICAg ICAgIk5hdGl2ZUJyZWFrcG9pbnRzU2lkZWJhclBhbmUuanMiLAogICAgICAgICAgICAgIk9iamVj dFBvcG92ZXJIZWxwZXIuanMiLAogICAgICAgICAgICAgIk9iamVjdFByb3BlcnRpZXNTZWN0aW9u LmpzIiwKLSAgICAgICAgICAgICJSdW50aW1lTW9kZWwuanMiLAogICAgICAgICAgICAgIlNvdXJj ZUZyYW1lLmpzIiwKICAgICAgICAgICAgICJSZXNvdXJjZVZpZXcuanMiLAogICAgICAgICBdCkBA IC0yMjYsNyArMjI2LDcgQEAgbW9kdWxlcyA9IFsKICAgICB9LAogICAgIHsKICAgICAgICAgIm5h bWUiOiAic2NyaXB0cyIsCi0gICAgICAgICJkZXBlbmRlbmNpZXMiOiBbImNvbXBvbmVudHMiXSwK KyAgICAgICAgImRlcGVuZGVuY2llcyI6IFsiY29tcG9uZW50cyIsICJ3b3JrZXJzIl0sCiAgICAg ICAgICJzb3VyY2VzIjogWwogICAgICAgICAgICAgIkJyZWFrcG9pbnRzU2lkZWJhclBhbmUuanMi LAogICAgICAgICAgICAgIkNhbGxTdGFja1NpZGViYXJQYW5lLmpzIiwKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZVZpZXcuanMgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzCmluZGV4IDkwODliMzQw MzE0YmZiM2NkN2Y3MTIyOWNmOTJlNGQ3MDJhMmYyZTkuLjllYzEzMGNhNjUxNWYyN2M1Nzk3NzE1 MDdhZWQ2OGU2ODkyYjIxZjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvQ29uc29sZVZpZXcuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9Db25zb2xlVmlldy5qcwpAQCAtNTUzLDI4ICs1NTMsNiBAQCBXZWJJbnNwZWN0b3Iu Q29uc29sZVZpZXcucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl9hcHBlbmRDb21tYW5kKHN0 ciwgIiIsIHRydWUsIGZhbHNlKTsKICAgICB9LAogCi0gICAgcnVuU2NyaXB0OiBmdW5jdGlvbihz Y3JpcHRJZCkKLSAgICB7Ci0gICAgICAgIHZhciBjdXJyZW50RXhlY3V0aW9uQ29udGV4dCA9IFdl Ykluc3BlY3Rvci5ydW50aW1lTW9kZWwuY3VycmVudEV4ZWN1dGlvbkNvbnRleHQoKTsKLSAgICAg ICAgRGVidWdnZXJBZ2VudC5ydW5TY3JpcHQoc2NyaXB0SWQsIGN1cnJlbnRFeGVjdXRpb25Db250 ZXh0ID8gY3VycmVudEV4ZWN1dGlvbkNvbnRleHQuaWQgOiB1bmRlZmluZWQsICJjb25zb2xlIiwg ZmFsc2UsIHJ1bkNhbGxiYWNrLmJpbmQodGhpcykpOwotICAgICAgICBXZWJJbnNwZWN0b3IudXNl ck1ldHJpY3MuQ29uc29sZUV2YWx1YXRlZC5yZWNvcmQoKTsKLQotICAgICAgICAvKioKLSAgICAg ICAgICogQHBhcmFtIHs/c3RyaW5nfSBlcnJvcgotICAgICAgICAgKiBAcGFyYW0gez9SdW50aW1l QWdlbnQuUmVtb3RlT2JqZWN0fSByZXN1bHQKLSAgICAgICAgICogQHBhcmFtIHtib29sZWFuPX0g d2FzVGhyb3duCi0gICAgICAgICAqLwotICAgICAgICBmdW5jdGlvbiBydW5DYWxsYmFjayhlcnJv ciwgcmVzdWx0LCB3YXNUaHJvd24pCi0gICAgICAgIHsKLSAgICAgICAgICAgIGlmIChlcnJvcikg ewotICAgICAgICAgICAgICAgIGNvbnNvbGUuZXJyb3IoZXJyb3IpOwotICAgICAgICAgICAgICAg IHJldHVybjsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIAotICAgICAgICAgICAgdGhpcy5f cHJpbnRSZXN1bHQocmVzdWx0LCB3YXNUaHJvd24sIG51bGwpOwotICAgICAgICB9Ci0gICAgfSwK LQogICAgIF9wcmludFJlc3VsdDogZnVuY3Rpb24ocmVzdWx0LCB3YXNUaHJvd24sIG9yaWdpbmF0 aW5nQ29tbWFuZCkKICAgICB7CiAgICAgICAgIGlmICghcmVzdWx0KQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EYXRhYmFzZVF1ZXJ5Vmlldy5qcyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGF0YWJhc2VRdWVyeVZpZXcuanMKaW5k ZXggZWVjN2FkMWY2NzZkNmUxNDUzYWI2MmVlYmNkOGNmYTkwNzBhOGJlZC4uNWU3OGNmYjhjZTEw M2ViYTZiN2YyYWUxZDVhNjYyZDE0NzM5MzU1YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9EYXRhYmFzZVF1ZXJ5Vmlldy5qcworKysgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RhdGFiYXNlUXVlcnlWaWV3LmpzCkBAIC02MSw3ICs2 MSwxMyBAQCBXZWJJbnNwZWN0b3IuRGF0YWJhc2VRdWVyeVZpZXcucHJvdG90eXBlID0gewogICAg ICAgICAgICAgdGhpcy5wcm9tcHQubW92ZUNhcmV0VG9FbmRPZlByb21wdCgpOwogICAgIH0sCiAg ICAgCi0gICAgY29tcGxldGlvbnM6IGZ1bmN0aW9uKHRleHRQcm9tcHQsIHdvcmRSYW5nZSwgZm9y Y2UsIGNvbXBsZXRpb25zUmVhZHlDYWxsYmFjaykKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge0Vs ZW1lbnR9IHByb3h5RWxlbWVudAorICAgICAqIEBwYXJhbSB7UmFuZ2V9IHdvcmRSYW5nZQorICAg ICAqIEBwYXJhbSB7Ym9vbGVhbn0gZm9yY2UKKyAgICAgKiBAcGFyYW0ge2Z1bmN0aW9uKEFycmF5 LjxzdHJpbmc+KX0gY29tcGxldGlvbnNSZWFkeUNhbGxiYWNrCisgICAgICovCisgICAgY29tcGxl dGlvbnM6IGZ1bmN0aW9uKHByb3h5RWxlbWVudCwgd29yZFJhbmdlLCBmb3JjZSwgY29tcGxldGlv bnNSZWFkeUNhbGxiYWNrKQogICAgIHsKICAgICAgICAgdmFyIHByZWZpeCA9IHdvcmRSYW5nZS50 b1N0cmluZygpLnRvTG93ZXJDYXNlKCk7CiAgICAgICAgIGlmICghcHJlZml4Lmxlbmd0aCAmJiAh Zm9yY2UpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1J1 bnRpbWVNb2RlbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUnVudGlt ZU1vZGVsLmpzCmluZGV4IGFhZTIwMGNkOGZjYjk5ZjhjZGZjNjQ1NjgyMTkxNjEwOTdmZmQ5Zjku LjE1OWFjYjQ4NGEwMWI1NWEzNmJlZGU5ZTM3ZDIyODc1MjcxYTNjYjMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUnVudGltZU1vZGVsLmpzCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUnVudGltZU1vZGVsLmpzCkBAIC0xNjQs MTUgKzE2NCwyNyBAQCBXZWJJbnNwZWN0b3IuUnVudGltZU1vZGVsLnByb3RvdHlwZSA9IHsKICAg ICAgICAgUnVudGltZUFnZW50LmV2YWx1YXRlKGV4cHJlc3Npb24sIG9iamVjdEdyb3VwLCBpbmNs dWRlQ29tbWFuZExpbmVBUEksIGRvTm90UGF1c2VPbkV4Y2VwdGlvbnNBbmRNdXRlQ29uc29sZSwg dGhpcy5fY3VycmVudEV4ZWN1dGlvbkNvbnRleHQgPyB0aGlzLl9jdXJyZW50RXhlY3V0aW9uQ29u dGV4dC5pZCA6IHVuZGVmaW5lZCwgcmV0dXJuQnlWYWx1ZSwgZXZhbENhbGxiYWNrKTsKICAgICB9 LAogCi0gICAgY29tcGxldGlvbnNGb3JUZXh0UHJvbXB0OiBmdW5jdGlvbih0ZXh0UHJvbXB0LCB3 b3JkUmFuZ2UsIGZvcmNlLCBjb21wbGV0aW9uc1JlYWR5Q2FsbGJhY2spCisgICAgLyoqCisgICAg ICogQHBhcmFtIHtFbGVtZW50fSBwcm94eUVsZW1lbnQKKyAgICAgKiBAcGFyYW0ge1JhbmdlfSB3 b3JkUmFuZ2UKKyAgICAgKiBAcGFyYW0ge2Jvb2xlYW59IGZvcmNlCisgICAgICogQHBhcmFtIHtm dW5jdGlvbihBcnJheS48c3RyaW5nPil9IGNvbXBsZXRpb25zUmVhZHlDYWxsYmFjaworICAgICAq LworICAgIGNvbXBsZXRpb25zRm9yVGV4dFByb21wdDogZnVuY3Rpb24ocHJveHlFbGVtZW50LCB3 b3JkUmFuZ2UsIGZvcmNlLCBjb21wbGV0aW9uc1JlYWR5Q2FsbGJhY2spCiAgICAgewogICAgICAg ICAvLyBQYXNzIGxlc3Mgc3RvcCBjaGFyYWN0ZXJzIHRvIHJhbmdlT2ZXb3JkIHNvIHRoZSByYW5n ZSB3aWxsIGJlIGEgbW9yZSBjb21wbGV0ZSBleHByZXNzaW9uLgotICAgICAgICB2YXIgZXhwcmVz c2lvblJhbmdlID0gd29yZFJhbmdlLnN0YXJ0Q29udGFpbmVyLnJhbmdlT2ZXb3JkKHdvcmRSYW5n ZS5zdGFydE9mZnNldCwgIiA9OlsoezssISstKi8mfF48PiIsIHRleHRQcm9tcHQucHJveHlFbGVt ZW50LCAiYmFja3dhcmQiKTsKKyAgICAgICAgdmFyIGV4cHJlc3Npb25SYW5nZSA9IHdvcmRSYW5n ZS5zdGFydENvbnRhaW5lci5yYW5nZU9mV29yZCh3b3JkUmFuZ2Uuc3RhcnRPZmZzZXQsICIgPTpb KHs7LCErLSovJnxePD4iLCBwcm94eUVsZW1lbnQsICJiYWNrd2FyZCIpOwogICAgICAgICB2YXIg ZXhwcmVzc2lvblN0cmluZyA9IGV4cHJlc3Npb25SYW5nZS50b1N0cmluZygpOwogICAgICAgICB2 YXIgcHJlZml4ID0gd29yZFJhbmdlLnRvU3RyaW5nKCk7CiAgICAgICAgIHRoaXMuX2NvbXBsZXRp b25zRm9yRXhwcmVzc2lvbihleHByZXNzaW9uU3RyaW5nLCBwcmVmaXgsIGZvcmNlLCBjb21wbGV0 aW9uc1JlYWR5Q2FsbGJhY2spOwogICAgIH0sCiAKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge3N0 cmluZ30gZXhwcmVzc2lvblN0cmluZworICAgICAqIEBwYXJhbSB7c3RyaW5nfSBwcmVmaXgKKyAg ICAgKiBAcGFyYW0ge2Jvb2xlYW59IGZvcmNlCisgICAgICogQHBhcmFtIHtmdW5jdGlvbihBcnJh eS48c3RyaW5nPil9IGNvbXBsZXRpb25zUmVhZHlDYWxsYmFjaworICAgICAqLwogICAgIF9jb21w bGV0aW9uc0ZvckV4cHJlc3Npb246IGZ1bmN0aW9uKGV4cHJlc3Npb25TdHJpbmcsIHByZWZpeCwg Zm9yY2UsIGNvbXBsZXRpb25zUmVhZHlDYWxsYmFjaykKICAgICB7CiAgICAgICAgIHZhciBsYXN0 SW5kZXggPSBleHByZXNzaW9uU3RyaW5nLmxlbmd0aCAtIDE7CkBAIC0yNjEsNiArMjczLDE0IEBA IFdlYkluc3BlY3Rvci5SdW50aW1lTW9kZWwucHJvdG90eXBlID0gewogICAgICAgICB9CiAgICAg fSwKIAorICAgIC8qKgorICAgICAqIEBwYXJhbSB7ZnVuY3Rpb24oQXJyYXkuPHN0cmluZz4pfSBj b21wbGV0aW9uc1JlYWR5Q2FsbGJhY2sKKyAgICAgKiBAcGFyYW0ge2Jvb2xlYW59IGRvdE5vdGF0 aW9uCisgICAgICogQHBhcmFtIHtib29sZWFufSBicmFja2V0Tm90YXRpb24KKyAgICAgKiBAcGFy YW0ge3N0cmluZ30gZXhwcmVzc2lvblN0cmluZworICAgICAqIEBwYXJhbSB7c3RyaW5nfSBwcmVm aXgKKyAgICAgKiBAcGFyYW0ge0FycmF5LjxzdHJpbmc+fSBwcm9wZXJ0aWVzCisgICAgICovCiAg ICAgX3JlcG9ydENvbXBsZXRpb25zOiBmdW5jdGlvbihjb21wbGV0aW9uc1JlYWR5Q2FsbGJhY2ss IGRvdE5vdGF0aW9uLCBicmFja2V0Tm90YXRpb24sIGV4cHJlc3Npb25TdHJpbmcsIHByZWZpeCwg cHJvcGVydGllcykgewogICAgICAgICBpZiAoYnJhY2tldE5vdGF0aW9uKSB7CiAgICAgICAgICAg ICBpZiAocHJlZml4Lmxlbmd0aCAmJiBwcmVmaXhbMF0gPT09ICInIikKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0U25pcHBldE1vZGVsLmpzIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRTbmlwcGV0TW9kZWwuanMK aW5kZXggN2Y4NTEwOTEzMWNlZWVjYTI2MjAwZjhkYThkNTJhYmFhMWY3MDQ1ZC4uNGYwMTRlODVl MzFhYTVmOThlNTRkNzY1OGJhZDU2NzdkMmEzM2ZhNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRTbmlwcGV0TW9kZWwuanMKKysrIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRTbmlwcGV0TW9kZWwuanMKQEAgLTIx Miw3ICsyMTIsMzMgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdFNuaXBwZXRNb2RlbC5wcm90b3R5cGUg PSB7CiAgICAgICAgICAgICB2YXIgYnJlYWtwb2ludExvY2F0aW9ucyA9IHRoaXMuX3JlbW92ZUJy ZWFrcG9pbnRzKHNuaXBwZXRKYXZhU2NyaXB0U291cmNlKTsKICAgICAgICAgICAgIHRoaXMuX3Jl c3RvcmVCcmVha3BvaW50cyhzbmlwcGV0SmF2YVNjcmlwdFNvdXJjZSwgYnJlYWtwb2ludExvY2F0 aW9ucyk7CiAKLSAgICAgICAgICAgIFdlYkluc3BlY3Rvci5jb25zb2xlVmlldy5ydW5TY3JpcHQo c2NyaXB0SWQpOworICAgICAgICAgICAgdGhpcy5fcnVuU2NyaXB0KHNjcmlwdElkKTsKKyAgICAg ICAgfQorICAgIH0sCisKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge0RlYnVnZ2VyQWdlbnQuU2Ny aXB0SWR9IHNjcmlwdElkCisgICAgICovCisgICAgX3J1blNjcmlwdDogZnVuY3Rpb24oc2NyaXB0 SWQpCisgICAgeworICAgICAgICB2YXIgY3VycmVudEV4ZWN1dGlvbkNvbnRleHQgPSBXZWJJbnNw ZWN0b3IucnVudGltZU1vZGVsLmN1cnJlbnRFeGVjdXRpb25Db250ZXh0KCk7CisgICAgICAgIERl YnVnZ2VyQWdlbnQucnVuU2NyaXB0KHNjcmlwdElkLCBjdXJyZW50RXhlY3V0aW9uQ29udGV4dCA/ IGN1cnJlbnRFeGVjdXRpb25Db250ZXh0LmlkIDogdW5kZWZpbmVkLCAiY29uc29sZSIsIGZhbHNl LCBydW5DYWxsYmFjay5iaW5kKHRoaXMpKTsKKworICAgICAgICAvKioKKyAgICAgICAgICogQHBh cmFtIHs/c3RyaW5nfSBlcnJvcgorICAgICAgICAgKiBAcGFyYW0gez9SdW50aW1lQWdlbnQuUmVt b3RlT2JqZWN0fSByZXN1bHQKKyAgICAgICAgICogQHBhcmFtIHtib29sZWFuPX0gd2FzVGhyb3du CisgICAgICAgICAqLworICAgICAgICBmdW5jdGlvbiBydW5DYWxsYmFjayhlcnJvciwgcmVzdWx0 LCB3YXNUaHJvd24pCisgICAgICAgIHsKKyAgICAgICAgICAgIGlmIChlcnJvcikgeworICAgICAg ICAgICAgICAgIGNvbnNvbGUuZXJyb3IoZXJyb3IpOworICAgICAgICAgICAgICAgIHJldHVybjsK KyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgdmFyIGxldmVsID0gKHdhc1Rocm93biA/IFdl Ykluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlTGV2ZWwuRXJyb3IgOiBXZWJJbnNwZWN0 b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZUxldmVsLkxvZyk7CisgICAgICAgICAgICB2YXIgbWVz c2FnZSA9IFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5jcmVhdGUoV2ViSW5zcGVjdG9yLkNv bnNvbGVNZXNzYWdlLk1lc3NhZ2VTb3VyY2UuSlMsIGxldmVsLCAiIiwgdW5kZWZpbmVkLCB1bmRl ZmluZWQsIHVuZGVmaW5lZCwgdW5kZWZpbmVkLCBbcmVzdWx0XSk7CisgICAgICAgICAgICBXZWJJ bnNwZWN0b3IuY29uc29sZS5hZGRNZXNzYWdlKG1lc3NhZ2UpCiAgICAgICAgIH0KICAgICB9LAog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1Np ZGViYXJQYW5lLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNT aWRlYmFyUGFuZS5qcwppbmRleCBlMThjNjM1OWMzNDMxMWYyYzM5ZmZlZmJkNWRlOWQ4OWU3Zjgw NjgxLi5iMDc5MGJiMWMwMzY3NWQ1NmIxMzc4NjNiNTc5MzRiYzM0OTczNTgyIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1NpZGViYXJQYW5lLmpz CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzU2lkZWJhclBh bmUuanMKQEAgLTI1ODMsNyArMjU4MywxMyBAQCBXZWJJbnNwZWN0b3IuU3R5bGVzU2lkZWJhclBh bmUuQ1NTUHJvcGVydHlQcm9tcHQucHJvdG90eXBlID0gewogICAgICAgICByZXR1cm4gdGhpcy5f Y3NzQ29tcGxldGlvbnMua2V5U2V0KCkuaGFzT3duUHJvcGVydHkod29yZCk7CiAgICAgfSwKIAot ICAgIF9idWlsZFByb3BlcnR5Q29tcGxldGlvbnM6IGZ1bmN0aW9uKHRleHRQcm9tcHQsIHdvcmRS YW5nZSwgZm9yY2UsIGNvbXBsZXRpb25zUmVhZHlDYWxsYmFjaykKKyAgICAvKioKKyAgICAgKiBA cGFyYW0ge0VsZW1lbnR9IHByb3h5RWxlbWVudAorICAgICAqIEBwYXJhbSB7UmFuZ2V9IHdvcmRS YW5nZQorICAgICAqIEBwYXJhbSB7Ym9vbGVhbn0gZm9yY2UKKyAgICAgKiBAcGFyYW0ge2Z1bmN0 aW9uKEFycmF5LjxzdHJpbmc+KX0gY29tcGxldGlvbnNSZWFkeUNhbGxiYWNrCisgICAgICovCisg ICAgX2J1aWxkUHJvcGVydHlDb21wbGV0aW9uczogZnVuY3Rpb24ocHJveHlFbGVtZW50LCB3b3Jk UmFuZ2UsIGZvcmNlLCBjb21wbGV0aW9uc1JlYWR5Q2FsbGJhY2spCiAgICAgewogICAgICAgICB2 YXIgcHJlZml4ID0gd29yZFJhbmdlLnRvU3RyaW5nKCkudG9Mb3dlckNhc2UoKTsKICAgICAgICAg aWYgKCFwcmVmaXggJiYgIWZvcmNlKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9UZXh0UHJvbXB0LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9UZXh0UHJvbXB0LmpzCmluZGV4IDU2NDlmMDFhOWEwODM0YzNmZDJkNDA0MGQ2OGM0 OWFiOTk5OWNkZjEuLmMwZTU3ZmE3NzA5M2YzMzgxMTUzZjVjZWQ4OWZjMjJhNzE5ZDI5ZjQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGV4dFByb21wdC5q cworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRQcm9tcHQuanMK QEAgLTMwLDcgKzMwLDcgQEAKIC8qKgogICogQGNvbnN0cnVjdG9yCiAgKiBAZXh0ZW5kcyBXZWJJ bnNwZWN0b3IuT2JqZWN0Ci0gKiBAcGFyYW0ge2Z1bmN0aW9uKFdlYkluc3BlY3Rvci5UZXh0UHJv bXB0LCBSYW5nZSwgYm9vbGVhbiwgZnVuY3Rpb24oQXJyYXkuPHN0cmluZz49KSl9IGNvbXBsZXRp b25zCisgKiBAcGFyYW0ge2Z1bmN0aW9uKEVsZW1lbnQsIFJhbmdlLCBib29sZWFuLCBmdW5jdGlv bihBcnJheS48c3RyaW5nPj0pKX0gY29tcGxldGlvbnMKICAqIEBwYXJhbSB7c3RyaW5nPX0gc3Rv cENoYXJhY3RlcnMKICAqLwogV2ViSW5zcGVjdG9yLlRleHRQcm9tcHQgPSBmdW5jdGlvbihjb21w bGV0aW9ucywgc3RvcENoYXJhY3RlcnMpCkBAIC0zOTEsNyArMzkxLDcgQEAgV2ViSW5zcGVjdG9y LlRleHRQcm9tcHQucHJvdG90eXBlID0gewogCiAgICAgICAgIHZhciB3b3JkUHJlZml4UmFuZ2Ug PSBzZWxlY3Rpb25SYW5nZS5zdGFydENvbnRhaW5lci5yYW5nZU9mV29yZChzZWxlY3Rpb25SYW5n ZS5zdGFydE9mZnNldCwgdGhpcy5fY29tcGxldGlvblN0b3BDaGFyYWN0ZXJzLCB0aGlzLl9lbGVt ZW50LCAiYmFja3dhcmQiKTsKICAgICAgICAgdGhpcy5fd2FpdGluZ0ZvckNvbXBsZXRpb25zID0g dHJ1ZTsKLSAgICAgICAgdGhpcy5fbG9hZENvbXBsZXRpb25zKHRoaXMsIHdvcmRQcmVmaXhSYW5n ZSwgZm9yY2UsIHRoaXMuX2NvbXBsZXRpb25zUmVhZHkuYmluZCh0aGlzLCBzZWxlY3Rpb24sIGF1 dG8sIHdvcmRQcmVmaXhSYW5nZSwgISFyZXZlcnNlKSk7CisgICAgICAgIHRoaXMuX2xvYWRDb21w bGV0aW9ucyh0aGlzLnByb3h5RWxlbWVudCwgd29yZFByZWZpeFJhbmdlLCBmb3JjZSwgdGhpcy5f Y29tcGxldGlvbnNSZWFkeS5iaW5kKHRoaXMsIHNlbGVjdGlvbiwgYXV0bywgd29yZFByZWZpeFJh bmdlLCAhIXJldmVyc2UpKTsKICAgICB9LAogCiAgICAgX2JveEZvckFuY2hvckF0U3RhcnQ6IGZ1 bmN0aW9uKHNlbGVjdGlvbiwgdGV4dFJhbmdlKQpAQCAtNzU3LDcgKzc1Nyw3IEBAIFdlYkluc3Bl Y3Rvci5UZXh0UHJvbXB0LnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuT2JqZWN0 LnByb3RvdHlwZTsKIC8qKgogICogQGNvbnN0cnVjdG9yCiAgKiBAZXh0ZW5kcyB7V2ViSW5zcGVj dG9yLlRleHRQcm9tcHR9Ci0gKiBAcGFyYW0ge2Z1bmN0aW9uKFdlYkluc3BlY3Rvci5UZXh0UHJv bXB0LCBSYW5nZSwgYm9vbGVhbiwgZnVuY3Rpb24oQXJyYXkuPHN0cmluZz49KSl9IGNvbXBsZXRp b25zCisgKiBAcGFyYW0ge2Z1bmN0aW9uKEVsZW1lbnQsIFJhbmdlLCBib29sZWFuLCBmdW5jdGlv bihBcnJheS48c3RyaW5nPj0pKX0gY29tcGxldGlvbnMKICAqIEBwYXJhbSB7c3RyaW5nPX0gc3Rv cENoYXJhY3RlcnMKICAqLwogV2ViSW5zcGVjdG9yLlRleHRQcm9tcHRXaXRoSGlzdG9yeSA9IGZ1 bmN0aW9uKGNvbXBsZXRpb25zLCBzdG9wQ2hhcmFjdGVycykKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvZXh0ZXJucy5qcyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvZXh0ZXJucy5qcwppbmRleCA4Y2Y1M2QyNmM1Zjc1N2VlMWNjZjIw NWQxMTBmZDI1MDliOWQyMmFkLi40MzAyNDI3ODEyNzM0NDkxM2I0YzNkN2U3NzMxZTE3YjhlZmJm YTUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2V4dGVy bnMuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9leHRlcm5zLmpz CkBAIC0xMTAsNyArMTEwLDggQEAgRE9NQXBwbGljYXRpb25DYWNoZS5wcm90b3R5cGUuRE9XTkxP QURJTkcgPSAzOwogRE9NQXBwbGljYXRpb25DYWNoZS5wcm90b3R5cGUuVVBEQVRFUkVBRFkgPSA0 OwogRE9NQXBwbGljYXRpb25DYWNoZS5wcm90b3R5cGUuT0JTT0xFVEUgPSA1OwogCi0KKy8qKiBA dHlwZSB7Tm9kZX0gKi8KK1JhbmdlLnByb3RvdHlwZS5zdGFydENvbnRhaW5lcjsKIAogLy8gSW5z cGVjdG9yIEJhY2tlbmQKIHZhciBJbnNwZWN0b3JCYWNrZW5kID0ge30K