85701 2012-05-05 02:31:14 -0700 Web Inspector: simplify the JavaScriptOutline dialog interaction. 2012-05-05 02:45:35 -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 616926 0 pfeldman 2012-05-05 02:31:14 -0700 Removed bidirectional dependency between scripts panel and outline dialog. 616927 1 140387 pfeldman 2012-05-05 02:38:28 -0700 Created attachment 140387 Patch 616929 2 pfeldman 2012-05-05 02:45:35 -0700 Committed r116216: <http://trac.webkit.org/changeset/116216> 140387 2012-05-05 02:38:28 -0700 2012-05-05 02:44:02 -0700 Patch bug-85701-20120505133826.patch text/plain 10681 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTE2MjE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGMxNzMzZDgwNmIwODJh YzBlMWJkNDU0MjdkYmRkMzBmZDZlMWRmZS4uODE5ODk4NzUxYWJhN2JkMzcxNzg1ZTQxMjJmMDZk MTRjYzlhYTg5YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEyLTA1LTA1ICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IHNpbXBsaWZ5IHRoZSBKYXZhU2NyaXB0T3V0bGluZSBkaWFsb2cgaW50ZXJhY3Rpb24uCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NTcwMQorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW92ZWQgYmlk aXJlY3Rpb25hbCBkZXBlbmRlbmN5IGJldHdlZW4gc2NyaXB0cyBwYW5lbCBhbmQgb3V0bGluZSBk aWFsb2cuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0ZpbHRlcmVkSXRlbVNlbGVj dGlvbkRpYWxvZy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0T3V0bGluZURp YWxvZyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdE91dGxpbmVEaWFsb2cuc2hv dyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdE91dGxpbmVEaWFsb2cucHJvdG90 eXBlLnJlcXVlc3RJdGVtcyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdE91dGxp bmVEaWFsb2cucHJvdG90eXBlLl9kaWRCdWlsZE91dGxpbmVDaHVuayk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuSmF2YVNjcmlwdE91dGxpbmVEaWFsb2cucHJvdG90eXBlLnNlbGVjdEl0ZW0pOgor ICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0Rm9ybWF0dGVyV29ya2VyLmpzOgor ICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUuYWRkVG9XYXRjaCk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5fc2hvd0phdmFTY3JpcHRPdXRs aW5lRGlhbG9nKToKKwogMjAxMi0wNS0wNCAgSWx5YSBUaWtob25vdnNreSAgPGxvaXNsb0BjaHJv bWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogYW5ub3RhdGUgUHJvZmlsZXJBZ2Vu dC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRmlsdGVy ZWRJdGVtU2VsZWN0aW9uRGlhbG9nLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9GaWx0ZXJlZEl0ZW1TZWxlY3Rpb25EaWFsb2cuanMKaW5kZXggYWRkMzMyYzg0YTc0ZGIz MWJhNWJkZjdlYjJhOTVhMDk1MWY2YTExYS4uMGE4NDViOTM3MzY0YzM1ZGMxYzI2ZWUyNDY1MzJh NzVlNmVkNDRiMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9GaWx0ZXJlZEl0ZW1TZWxlY3Rpb25EaWFsb2cuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9GaWx0ZXJlZEl0ZW1TZWxlY3Rpb25EaWFsb2cuanMKQEAgLTQ2Miw1 NSArNDYyLDI5IEBAIFdlYkluc3BlY3Rvci5TZWxlY3Rpb25EaWFsb2dDb250ZW50UHJvdmlkZXIu cHJvdG90eXBlID0gewogLyoqCiAgKiBAY29uc3RydWN0b3IKICAqIEBpbXBsZW1lbnRzIHtXZWJJ bnNwZWN0b3IuU2VsZWN0aW9uRGlhbG9nQ29udGVudFByb3ZpZGVyfQorICogQHBhcmFtIHtXZWJJ bnNwZWN0b3IuVmlld30gdmlldworICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuQ29udGVudFByb3Zp ZGVyfSBjb250ZW50UHJvdmlkZXIKICAqLwotV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRPdXRsaW5l RGlhbG9nID0gZnVuY3Rpb24ocGFuZWwsIHZpZXcpCitXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdE91 dGxpbmVEaWFsb2cgPSBmdW5jdGlvbih2aWV3LCBjb250ZW50UHJvdmlkZXIpCiB7CiAgICAgV2Vi SW5zcGVjdG9yLlNlbGVjdGlvbkRpYWxvZ0NvbnRlbnRQcm92aWRlci5jYWxsKHRoaXMpOwogCiAg ICAgdGhpcy5fZnVuY3Rpb25JdGVtcyA9IFtdOwotCi0gICAgdGhpcy5fcGFuZWwgPSBwYW5lbDsK ICAgICB0aGlzLl92aWV3ID0gdmlldzsKKyAgICB0aGlzLl9jb250ZW50UHJvdmlkZXIgPSBjb250 ZW50UHJvdmlkZXI7CiB9CiAKIC8qKgotICogQHBhcmFtIHt7Y2h1bmssIGluZGV4LCB0b3RhbCwg aWR9fSBkYXRhCisgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5WaWV3fSB2aWV3CisgKiBAcGFyYW0g e1dlYkluc3BlY3Rvci5Db250ZW50UHJvdmlkZXJ9IGNvbnRlbnRQcm92aWRlcgogICovCi1XZWJJ bnNwZWN0b3IuSmF2YVNjcmlwdE91dGxpbmVEaWFsb2cuZGlkQWRkQ2h1bmsgPSBmdW5jdGlvbihk YXRhKQotewotICAgIHZhciBpbnN0YW5jZSA9IFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0T3V0bGlu ZURpYWxvZy5faW5zdGFuY2U7Ci0gICAgaWYgKCFpbnN0YW5jZSkKLSAgICAgICAgcmV0dXJuOwot Ci0gICAgaWYgKGRhdGEuaWQgIT09IGluc3RhbmNlLl92aWV3LnVpU291cmNlQ29kZS5pZCkKLSAg ICAgICAgcmV0dXJuOwotCi0gICAgaW5zdGFuY2UuX2FwcGVuZEl0ZW1FbGVtZW50cyhkYXRhLmNo dW5rLCBkYXRhLmluZGV4LCBkYXRhLnRvdGFsKTsKLX0sCi0KLVdlYkluc3BlY3Rvci5KYXZhU2Ny aXB0T3V0bGluZURpYWxvZy5pbnN0YWxsID0gZnVuY3Rpb24ocGFuZWwsIHZpZXdHZXR0ZXIpCi17 Ci0gICAgZnVuY3Rpb24gc2hvd0phdmFTY3JpcHRPdXRsaW5lRGlhbG9nKCkKLSAgICB7Ci0gICAg ICAgICB2YXIgdmlldyA9IHZpZXdHZXR0ZXIoKTsKLSAgICAgICAgIGlmICh2aWV3KQotICAgICAg ICAgICAgIFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0T3V0bGluZURpYWxvZy5fc2hvdyhwYW5lbCwg dmlldyk7Ci0gICAgfQotCi0gICAgdmFyIGphdmFTY3JpcHRPdXRsaW5lU2hvcnRjdXQgPSBXZWJJ bnNwZWN0b3IuSmF2YVNjcmlwdE91dGxpbmVEaWFsb2cuY3JlYXRlU2hvcnRjdXQoKTsKLSAgICBw YW5lbC5yZWdpc3RlclNob3J0Y3V0KGphdmFTY3JpcHRPdXRsaW5lU2hvcnRjdXQua2V5LCBzaG93 SmF2YVNjcmlwdE91dGxpbmVEaWFsb2cpOwotfQotCi1XZWJJbnNwZWN0b3IuSmF2YVNjcmlwdE91 dGxpbmVEaWFsb2cuX3Nob3cgPSBmdW5jdGlvbihwYW5lbCwgc291cmNlVmlldykKK1dlYkluc3Bl Y3Rvci5KYXZhU2NyaXB0T3V0bGluZURpYWxvZy5zaG93ID0gZnVuY3Rpb24odmlldywgY29udGVu dFByb3ZpZGVyKQogewogICAgIGlmIChXZWJJbnNwZWN0b3IuRGlhbG9nLmN1cnJlbnRJbnN0YW5j ZSgpKQotICAgICAgICByZXR1cm47Ci0gICAgaWYgKCFzb3VyY2VWaWV3IHx8ICFzb3VyY2VWaWV3 LmNhbkhpZ2hsaWdodExpbmUoKSkKLSAgICAgICAgcmV0dXJuOwotICAgIFdlYkluc3BlY3Rvci5K YXZhU2NyaXB0T3V0bGluZURpYWxvZy5faW5zdGFuY2UgPSBuZXcgV2ViSW5zcGVjdG9yLkphdmFT Y3JpcHRPdXRsaW5lRGlhbG9nKHBhbmVsLCBzb3VyY2VWaWV3KTsKLQotICAgIHZhciBmaWx0ZXJl ZEl0ZW1TZWxlY3Rpb25EaWFsb2cgPSBuZXcgV2ViSW5zcGVjdG9yLkZpbHRlcmVkSXRlbVNlbGVj dGlvbkRpYWxvZyhXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdE91dGxpbmVEaWFsb2cuX2luc3RhbmNl KTsKLSAgICBXZWJJbnNwZWN0b3IuRGlhbG9nLnNob3coc291cmNlVmlldy5lbGVtZW50LCBmaWx0 ZXJlZEl0ZW1TZWxlY3Rpb25EaWFsb2cpOworICAgICAgICByZXR1cm4gbnVsbDsKKyAgICB2YXIg ZGVsZWdhdGUgPSBuZXcgV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRPdXRsaW5lRGlhbG9nKHZpZXcs IGNvbnRlbnRQcm92aWRlcik7CisgICAgdmFyIGZpbHRlcmVkSXRlbVNlbGVjdGlvbkRpYWxvZyA9 IG5ldyBXZWJJbnNwZWN0b3IuRmlsdGVyZWRJdGVtU2VsZWN0aW9uRGlhbG9nKGRlbGVnYXRlKTsK KyAgICBXZWJJbnNwZWN0b3IuRGlhbG9nLnNob3codmlldy5lbGVtZW50LCBmaWx0ZXJlZEl0ZW1T ZWxlY3Rpb25EaWFsb2cpOwogfQogCiBXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdE91dGxpbmVEaWFs b2cuY3JlYXRlU2hvcnRjdXQgPSBmdW5jdGlvbigpCkBAIC01NTEsOCArNTI1LDM3IEBAIFdlYklu c3BlY3Rvci5KYXZhU2NyaXB0T3V0bGluZURpYWxvZy5wcm90b3R5cGUgPSB7CiAgICAgICovCiAg ICAgcmVxdWVzdEl0ZW1zOiBmdW5jdGlvbihjYWxsYmFjaykKICAgICB7Ci0gICAgICAgIHRoaXMu X2l0ZW1zQWRkZWRDYWxsYmFjayA9IGNhbGxiYWNrOwotICAgICAgICB0aGlzLl9wYW5lbC5yZXF1 ZXN0VmlzaWJsZVNjcmlwdE91dGxpbmUoKTsKKyAgICAgICAgLyoqCisgICAgICAgICAqIEBwYXJh bSB7P3N0cmluZ30gY29udGVudAorICAgICAgICAgKiBAcGFyYW0ge2Jvb2xlYW59IGNvbnRlbnRF bmNvZGVkCisgICAgICAgICAqIEBwYXJhbSB7c3RyaW5nfSBtaW1lVHlwZQorICAgICAgICAgKi8K KyAgICAgICAgZnVuY3Rpb24gY29udGVudENhbGxiYWNrKGNvbnRlbnQsIGNvbnRlbnRFbmNvZGVk LCBtaW1lVHlwZSkKKyAgICAgICAgeworICAgICAgICAgICAgaWYgKHRoaXMuX291dGxpbmVXb3Jr ZXIpCisgICAgICAgICAgICAgICAgdGhpcy5fb3V0bGluZVdvcmtlci50ZXJtaW5hdGUoKTsKKyAg ICAgICAgICAgIHRoaXMuX291dGxpbmVXb3JrZXIgPSBuZXcgV29ya2VyKCJTY3JpcHRGb3JtYXR0 ZXJXb3JrZXIuanMiKTsKKyAgICAgICAgICAgIHRoaXMuX291dGxpbmVXb3JrZXIub25tZXNzYWdl ID0gdGhpcy5fZGlkQnVpbGRPdXRsaW5lQ2h1bmsuYmluZCh0aGlzLCBjYWxsYmFjayk7CisgICAg ICAgICAgICBjb25zdCBtZXRob2QgPSAib3V0bGluZSI7CisgICAgICAgICAgICB0aGlzLl9vdXRs aW5lV29ya2VyLnBvc3RNZXNzYWdlKHsgbWV0aG9kOiBtZXRob2QsIHBhcmFtczogeyBjb250ZW50 OiBjb250ZW50IH0gfSk7CisgICAgICAgIH0KKyAgICAgICAgdGhpcy5fY29udGVudFByb3ZpZGVy LnJlcXVlc3RDb250ZW50KGNvbnRlbnRDYWxsYmFjay5iaW5kKHRoaXMpKTsKKyAgICB9LAorCisg ICAgX2RpZEJ1aWxkT3V0bGluZUNodW5rOiBmdW5jdGlvbihjYWxsYmFjaywgZXZlbnQpCisgICAg eworICAgICAgICB2YXIgZGF0YSA9IGV2ZW50LmRhdGE7CisKKyAgICAgICAgdmFyIGluZGV4ID0g dGhpcy5fZnVuY3Rpb25JdGVtcy5sZW5ndGg7CisgICAgICAgIHZhciBjaHVuayA9IGRhdGFbImNo dW5rIl07CisgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgY2h1bmsubGVuZ3RoOyArK2kpCisg ICAgICAgICAgICB0aGlzLl9mdW5jdGlvbkl0ZW1zLnB1c2goY2h1bmtbaV0pOworICAgICAgICBj YWxsYmFjayhpbmRleCwgY2h1bmsubGVuZ3RoLCBkYXRhLmluZGV4LCBkYXRhLnRvdGFsKTsKKwor ICAgICAgICBpZiAoZGF0YS50b3RhbCA9PT0gZGF0YS5pbmRleCAmJiB0aGlzLl9vdXRsaW5lV29y a2VyKSB7CisgICAgICAgICAgICB0aGlzLl9vdXRsaW5lV29ya2VyLnRlcm1pbmF0ZSgpOworICAg ICAgICAgICAgZGVsZXRlIHRoaXMuX291dGxpbmVXb3JrZXI7CisgICAgICAgIH0KICAgICB9LAog CiAgICAgLyoqCkBAIC01NjQsMjEgKzU2Nyw2IEBAIFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0T3V0 bGluZURpYWxvZy5wcm90b3R5cGUgPSB7CiAgICAgICAgIGlmICghaXNOYU4obGluZU51bWJlcikg JiYgbGluZU51bWJlciA+PSAwKQogICAgICAgICAgICAgdGhpcy5fdmlldy5oaWdobGlnaHRMaW5l KGxpbmVOdW1iZXIpOwogICAgICAgICB0aGlzLl92aWV3LmZvY3VzKCk7Ci0gICAgICAgIGRlbGV0 ZSBXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdE91dGxpbmVEaWFsb2cuX2luc3RhbmNlOwotICAgIH0s Ci0KLSAgICAvKioKLSAgICAgKiBAcGFyYW0ge0FycmF5LjxPYmplY3Q+fSBjaHVuawotICAgICAq IEBwYXJhbSB7bnVtYmVyfSBjaHVua0luZGV4Ci0gICAgICogQHBhcmFtIHtudW1iZXJ9IGNodW5r Q291bnQKLSAgICAgKi8KLSAgICBfYXBwZW5kSXRlbUVsZW1lbnRzOiBmdW5jdGlvbihjaHVuaywg Y2h1bmtJbmRleCwgY2h1bmtDb3VudCkKLSAgICB7Ci0gICAgICAgIHZhciBpbmRleCA9IHRoaXMu X2Z1bmN0aW9uSXRlbXMubGVuZ3RoOwotICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGNodW5r Lmxlbmd0aDsgKytpKSB7Ci0gICAgICAgICAgICB0aGlzLl9mdW5jdGlvbkl0ZW1zLnB1c2goY2h1 bmtbaV0pOwotICAgICAgICB9Ci0gICAgICAgIHRoaXMuX2l0ZW1zQWRkZWRDYWxsYmFjayhpbmRl eCwgY2h1bmsubGVuZ3RoLCBjaHVua0luZGV4LCBjaHVua0NvdW50KTsKICAgICB9CiB9CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0Rm9ybWF0 dGVyV29ya2VyLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRG b3JtYXR0ZXJXb3JrZXIuanMKaW5kZXggNTZjNjY4ZmM0NzVlMzMxZTA2YzUwNzBjNmFlMDNmM2Nj YTgxZWJlNS4uMTNjN2EwZTc1YjU2YjVkMjM0MDVhZjdiMjFiOTI0MTY1N2I1OTE2NiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRGb3JtYXR0ZXJX b3JrZXIuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRG b3JtYXR0ZXJXb3JrZXIuanMKQEAgLTEzMCwxMyArMTMwLDEzIEBAIGZ1bmN0aW9uIG91dGxpbmUo cGFyYW1zKQogICAgICAgICAgICAgY29sdW1uID0gbmV3Q29sdW1uOwogCiAgICAgICAgICAgICBp ZiAocHJvY2Vzc2VkQ2h1bmtDaGFyYWN0ZXJzID49IGNodW5rU2l6ZSkgewotICAgICAgICAgICAg ICAgIHBvc3RNZXNzYWdlKHsgY2h1bms6IG91dGxpbmVDaHVuaywgaWQ6IHBhcmFtcy5pZCwgdG90 YWw6IGNodW5rQ291bnQsIGluZGV4OiBjdXJyZW50Q2h1bmsrKyB9KTsKKyAgICAgICAgICAgICAg ICBwb3N0TWVzc2FnZSh7IGNodW5rOiBvdXRsaW5lQ2h1bmssIHRvdGFsOiBjaHVua0NvdW50LCBp bmRleDogY3VycmVudENodW5rKysgfSk7CiAgICAgICAgICAgICAgICAgb3V0bGluZUNodW5rID0g W107CiAgICAgICAgICAgICAgICAgcHJvY2Vzc2VkQ2h1bmtDaGFyYWN0ZXJzID0gMDsKICAgICAg ICAgICAgIH0KICAgICAgICAgfSB3aGlsZSAoY29sdW1uIDwgbGluZS5sZW5ndGgpOwogICAgIH0K LSAgICBwb3N0TWVzc2FnZSh7IGNodW5rOiBvdXRsaW5lQ2h1bmssIGlkOiBwYXJhbXMuaWQsIHRv dGFsOiBjaHVua0NvdW50LCBpbmRleDogY2h1bmtDb3VudCB9KTsKKyAgICBwb3N0TWVzc2FnZSh7 IGNodW5rOiBvdXRsaW5lQ2h1bmssIHRvdGFsOiBjaHVua0NvdW50LCBpbmRleDogY2h1bmtDb3Vu dCB9KTsKIH0KIAogZnVuY3Rpb24gZm9ybWF0U2NyaXB0KGNvbnRlbnQsIG1hcHBpbmcsIG9mZnNl dCwgZm9ybWF0dGVkT2Zmc2V0LCBpbmRlbnRTdHJpbmcpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCmluZGV4IGZmY2FkZTUxZjE1MWFi NGYxZWFhZWUzMWE1Y2FlMzA5Mjg1NGQzNmYuLmEyMmU0N2FlY2RjNzVhMzVlMWMzZjAwZTc2Yzc0 YjdjY2VmYTkzNjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvU2NyaXB0c1BhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvU2NyaXB0c1BhbmVsLmpzCkBAIC00NCw3ICs0NCw2IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRz UGFuZWwgPSBmdW5jdGlvbihwcmVzZW50YXRpb25Nb2RlbCkKICAgICAgICAgcmV0dXJuIHRoaXMu dmlzaWJsZVZpZXc7CiAgICAgfQogICAgIFdlYkluc3BlY3Rvci5Hb1RvTGluZURpYWxvZy5pbnN0 YWxsKHRoaXMsIHZpZXdHZXR0ZXIuYmluZCh0aGlzKSk7Ci0gICAgV2ViSW5zcGVjdG9yLkphdmFT Y3JpcHRPdXRsaW5lRGlhbG9nLmluc3RhbGwodGhpcywgdmlld0dldHRlci5iaW5kKHRoaXMpKTsK IAogICAgIHRoaXMuZGVidWdUb29sYmFyID0gdGhpcy5fY3JlYXRlRGVidWdUb29sYmFyKCk7CiAK QEAgLTEyNiw2ICsxMjUsNyBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsID0gZnVuY3Rpb24o cHJlc2VudGF0aW9uTW9kZWwpCiAKICAgICB2YXIgc2NyaXB0T3V0bGluZVNob3J0Y3V0ID0gV2Vi SW5zcGVjdG9yLkphdmFTY3JpcHRPdXRsaW5lRGlhbG9nLmNyZWF0ZVNob3J0Y3V0KCk7CiAgICAg aGVscFNlY3Rpb24uYWRkS2V5KHNjcmlwdE91dGxpbmVTaG9ydGN1dC5uYW1lLCBXZWJJbnNwZWN0 b3IuVUlTdHJpbmcoIkdvIHRvIGZ1bmN0aW9uIikpOworICAgIHRoaXMucmVnaXN0ZXJTaG9ydGN1 dChzY3JpcHRPdXRsaW5lU2hvcnRjdXQua2V5LCB0aGlzLl9zaG93SmF2YVNjcmlwdE91dGxpbmVE aWFsb2cuYmluZCh0aGlzKSk7CiAKICAgICB2YXIgcGFuZWxFbmFibGVySGVhZGluZyA9IFdlYklu c3BlY3Rvci5VSVN0cmluZygiWW91IG5lZWQgdG8gZW5hYmxlIGRlYnVnZ2luZyBiZWZvcmUgeW91 IGNhbiB1c2UgdGhlIFNjcmlwdHMgcGFuZWwuIik7CiAgICAgdmFyIHBhbmVsRW5hYmxlckRpc2Ns YWltZXIgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkVuYWJsaW5nIGRlYnVnZ2luZyB3aWxsIG1h a2Ugc2NyaXB0cyBydW4gc2xvd2VyLiIpOwpAQCAtMjEzLDE3ICsyMTMsNiBAQCBXZWJJbnNwZWN0 b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5fbmF2aWdhdG9yQ29u dHJvbGxlci53YXNTaG93bigpOwogICAgIH0sCiAKLSAgICBfZGlkQnVpbGRPdXRsaW5lQ2h1bms6 IGZ1bmN0aW9uKGV2ZW50KQotICAgIHsKLSAgICAgICAgV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRP dXRsaW5lRGlhbG9nLmRpZEFkZENodW5rKGV2ZW50LmRhdGEpOwotICAgICAgICBpZiAoZXZlbnQu ZGF0YS50b3RhbCA9PT0gZXZlbnQuZGF0YS5pbmRleCkgewotICAgICAgICAgICAgaWYgKHRoaXMu X291dGxpbmVXb3JrZXIpIHsKLSAgICAgICAgICAgICAgICB0aGlzLl9vdXRsaW5lV29ya2VyLnRl cm1pbmF0ZSgpOwotICAgICAgICAgICAgICAgIGRlbGV0ZSB0aGlzLl9vdXRsaW5lV29ya2VyOwot ICAgICAgICAgICAgfQotICAgICAgICB9Ci0gICAgfSwKLQogICAgIC8qKgogICAgICAqIEBwYXJh bSB7V2ViSW5zcGVjdG9yLkV2ZW50fSBldmVudAogICAgICAqLwpAQCAtNDQ5LDI4ICs0MzgsNiBA QCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJu IHNvdXJjZUZyYW1lOwogICAgIH0sCiAKLSAgICByZXF1ZXN0VmlzaWJsZVNjcmlwdE91dGxpbmU6 IGZ1bmN0aW9uKCkKLSAgICB7Ci0gICAgICAgIAotICAgICAgICAvKioKLSAgICAgICAgICogQHBh cmFtIHs/c3RyaW5nfSBjb250ZW50Ci0gICAgICAgICAqIEBwYXJhbSB7Ym9vbGVhbn0gY29udGVu dEVuY29kZWQKLSAgICAgICAgICogQHBhcmFtIHtzdHJpbmd9IG1pbWVUeXBlCi0gICAgICAgICAq LwotICAgICAgICBmdW5jdGlvbiBjb250ZW50Q2FsbGJhY2soY29udGVudCwgY29udGVudEVuY29k ZWQsIG1pbWVUeXBlKQotICAgICAgICB7Ci0gICAgICAgICAgICBpZiAodGhpcy5fb3V0bGluZVdv cmtlcikKLSAgICAgICAgICAgICAgICB0aGlzLl9vdXRsaW5lV29ya2VyLnRlcm1pbmF0ZSgpOwot ICAgICAgICAgICAgdGhpcy5fb3V0bGluZVdvcmtlciA9IG5ldyBXb3JrZXIoIlNjcmlwdEZvcm1h dHRlcldvcmtlci5qcyIpOwotICAgICAgICAgICAgdGhpcy5fb3V0bGluZVdvcmtlci5vbm1lc3Nh Z2UgPSB0aGlzLl9kaWRCdWlsZE91dGxpbmVDaHVuay5iaW5kKHRoaXMpOwotICAgICAgICAgICAg Y29uc3QgbWV0aG9kID0gIm91dGxpbmUiOwotICAgICAgICAgICAgdGhpcy5fb3V0bGluZVdvcmtl ci5wb3N0TWVzc2FnZSh7IG1ldGhvZDogbWV0aG9kLCBwYXJhbXM6IHsgY29udGVudDogY29udGVu dCwgaWQ6IHRoaXMudmlzaWJsZVZpZXcudWlTb3VyY2VDb2RlLmlkIH0gfSk7Ci0gICAgICAgIH0K LQotICAgICAgICBpZiAodGhpcy52aXNpYmxlVmlldy51aVNvdXJjZUNvZGUpCi0gICAgICAgICAg ICB0aGlzLnZpc2libGVWaWV3LnVpU291cmNlQ29kZS5yZXF1ZXN0Q29udGVudChjb250ZW50Q2Fs bGJhY2suYmluZCh0aGlzKSk7Ci0gICAgfSwKLQogICAgIC8qKgogICAgICAqIEBwYXJhbSB7V2Vi SW5zcGVjdG9yLlVJU291cmNlQ29kZX0gdWlTb3VyY2VDb2RlCiAgICAgICogQHJldHVybiB7V2Vi SW5zcGVjdG9yLlNvdXJjZUZyYW1lfQpAQCAtOTUyLDYgKzkxOSwxMSBAQCBXZWJJbnNwZWN0b3Iu U2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICBhZGRUb1dhdGNoOiBmdW5jdGlvbihleHBy ZXNzaW9uKQogICAgIHsKICAgICAgICAgdGhpcy5zaWRlYmFyUGFuZXMud2F0Y2hFeHByZXNzaW9u cy5hZGRFeHByZXNzaW9uKGV4cHJlc3Npb24pOworICAgIH0sCisKKyAgICBfc2hvd0phdmFTY3Jp cHRPdXRsaW5lRGlhbG9nOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICAgV2ViSW5zcGVjdG9y LkphdmFTY3JpcHRPdXRsaW5lRGlhbG9nLnNob3codGhpcy52aXNpYmxlVmlldywgdGhpcy52aXNp YmxlVmlldyk7CiAgICAgfQogfQogCg==