110325 2013-02-20 04:20:24 -0800 Web Inspector: [Canvas] Remove arrays of DataGrid nodes from the View 2013-02-21 06:17:10 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 aandrey aandrey apavlov keishi loislo pfeldman pmuellr vsevik web-inspector-bugs webkit.review.bot yurys oldest_to_newest 837336 0 aandrey 2013-02-20 04:20:24 -0800 Remove arrays of DataGrid nodes from the View and use live DataGrid instead. This is a prerequisite to support a non-fixed layered tree in the grid (for example, to hide a single frame group node, or to combine several draw call groups into a pattern group). Patch to follow. 837339 1 189285 aandrey 2013-02-20 04:23:50 -0800 Created attachment 189285 Patch 838374 2 189285 webkit.review.bot 2013-02-21 06:17:06 -0800 Comment on attachment 189285 Patch Clearing flags on attachment: 189285 Committed r143595: <http://trac.webkit.org/changeset/143595> 838375 3 webkit.review.bot 2013-02-21 06:17:10 -0800 All reviewed patches have been landed. Closing bug. 189285 2013-02-20 04:23:50 -0800 2013-02-21 06:17:06 -0800 Patch bug-110325-20130220162011.patch text/plain 12879 aandrey U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzNDMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2NmMjdlOGYzZDY5M2Zj Zjk1N2MzMjdiZjAxZGQ1NDZiYWZjYWRhOC4uNmQ0NDM2ZjFhYWFlYjEzM2QyMmUzNDEyZmVmZmYw NDE4MWU5M2I5YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDEzLTAyLTIwICBBbmRy ZXkgQWRhaWtpbiAgPGFhbmRyZXlAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFtDYW52YXNdIFJlbW92ZSBhcnJheXMgb2YgRGF0YUdyaWQgbm9kZXMgZnJvbSB0aGUgVmll dworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEwMzI1 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3Zl IGFycmF5cyBvZiBEYXRhR3JpZCBub2RlcyBmcm9tIHRoZSBDYW52YXNQcm9maWxlVmlldyBhbmQg dXNlIGxpdmUgRGF0YUdyaWQgaW5zdGVhZC4KKyAgICAgICAgVGhpcyBpcyBhIHByZXJlcXVpc2l0 ZSB0byBzdXBwb3J0IGEgbm9uLWZpeGVkIGxheWVyZWQgdHJlZSBpbiB0aGUgZ3JpZCAoZm9yIGV4 YW1wbGUsIHRvIGhpZGUKKyAgICAgICAgYSBzaW5nbGUgZnJhbWUgZ3JvdXAgbm9kZSwgb3IgdG8g Y29tYmluZSBzZXZlcmFsIGRyYXcgY2FsbCBncm91cHMgaW50byBhIHBhdHRlcm4gZ3JvdXApLgor ICAgICAgICBEcml2ZS1ieTogYWRkZWQgYW4gYXNzZXJ0IHRvIGluamVjdGVkIGNhbnZhcyBtb2R1 bGUuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHRDYW52YXNNb2R1bGVTb3Vy Y2UuanM6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9DYW52YXNQcm9maWxlVmlldy5q czoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5DYW52YXNQcm9maWxlVmlldyk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuQ2FudmFzUHJvZmlsZVZpZXcucHJvdG90eXBlLmRpc3Bvc2UpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLkNhbnZhc1Byb2ZpbGVWaWV3LnByb3RvdHlwZS5fZGlkUmVjZWl2ZVRy YWNlTG9nKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5DYW52YXNQcm9maWxlVmlldy5wcm90b3R5 cGUuX3JlcXVlc3RUcmFjZUxvZyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ2FudmFzUHJvZmls ZVZpZXcucHJvdG90eXBlLl9zZWxlY3RlZENhbGxJbmRleCk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuQ2FudmFzUHJvZmlsZVZpZXcucHJvdG90eXBlLl9wZWVrTGFzdFJlY3Vyc2l2ZWx5KToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5DYW52YXNQcm9maWxlVmlldy5wcm90b3R5cGUuX2FwcGVuZENh bGxOb2Rlcyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ2FudmFzUHJvZmlsZVZpZXcucHJvdG90 eXBlLik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ2FudmFzUHJvZmlsZVZpZXcucHJvdG90eXBl LnNwbGl0RHJhd0NhbGxHcm91cCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ2FudmFzUHJvZmls ZVZpZXcucHJvdG90eXBlLl9hcHBlbmRDYWxsTm9kZXNUb0ZyYW1lTm9kZSk6CisKIDIwMTMtMDIt MTkgIEFuZHJleSBBZGFpa2luICA8YWFuZHJleUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgRmV3 IG1ldGhvZHMgaW4gV2ViR0xSZW5kZXJpbmdDb250ZXh0LmlkbCBoYXZlIGluY29ycmVjdCBzaWdu YXR1cmVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3Jp cHRDYW52YXNNb2R1bGVTb3VyY2UuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5qZWN0 ZWRTY3JpcHRDYW52YXNNb2R1bGVTb3VyY2UuanMKaW5kZXggMmNkMjU1Zjc0NzQ4ZGZiZThkNDFi ZjZhMjY2YjY3MjFiMzVjZDI2Ny4uOWQzZGFiYjQ0NmIxZDE3NjExYTk1ZjkyOWU3Y2VhOGRhNDgz ODg2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0 Q2FudmFzTW9kdWxlU291cmNlLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9Jbmpl Y3RlZFNjcmlwdENhbnZhc01vZHVsZVNvdXJjZS5qcwpAQCAtMTkyNiw2ICsxOTI2LDggQEAgV2Vi R0xSZW5kZXJpbmdDb250ZXh0UmVzb3VyY2UucHJvdG90eXBlID0gewogICAgICAgICAgICAgICAg IGJyZWFrOwogICAgICAgICB9CiAKKyAgICAgICAgY29uc29sZS5hc3NlcnQocmVwbGF5Q29udGV4 dCwgIkZhaWxlZCB0byBjcmVhdGUgYSBXZWJHTFJlbmRlcmluZ0NvbnRleHQgZm9yIHRoZSByZXBs YXkuIik7CisKICAgICAgICAgdmFyIGdsID0gLyoqIEB0eXBlIHshV2ViR0xSZW5kZXJpbmdDb250 ZXh0fSAqLyAoUmVzb3VyY2Uud3JhcHBlZE9iamVjdChyZXBsYXlDb250ZXh0KSk7CiAgICAgICAg IHRoaXMuc2V0V3JhcHBlZE9iamVjdChnbCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvQ2FudmFzUHJvZmlsZVZpZXcuanMgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NhbnZhc1Byb2ZpbGVWaWV3LmpzCmluZGV4IDk0NzMzNGFl ZTY4ZThhYjczOWJkNDJkMWZmNTNkY2E4NmIzNTkwNDkuLjMyOWMxOTRiNjYwYzFmYzFiZTczOTA5 NTRmM2RlOGVlMWZmZTA1NmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvQ2FudmFzUHJvZmlsZVZpZXcuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9DYW52YXNQcm9maWxlVmlldy5qcwpAQCAtODcsMTUgKzg3LDggQEAgV2Vi SW5zcGVjdG9yLkNhbnZhc1Byb2ZpbGVWaWV3ID0gZnVuY3Rpb24ocHJvZmlsZSkKICAgICB0aGlz Ll9sb2dHcmlkLnNob3cobG9nR3JpZENvbnRhaW5lcik7CiAgICAgdGhpcy5fbG9nR3JpZC5hZGRF dmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5EYXRhR3JpZC5FdmVudHMuU2VsZWN0ZWROb2RlLCB0 aGlzLl9yZXBsYXlUcmFjZUxvZy5iaW5kKHRoaXMpKTsKIAotICAgIC8qKiBAdHlwZSB7IUFycmF5 LjxXZWJJbnNwZWN0b3IuRGF0YUdyaWROb2RlPn0gKi8KLSAgICB0aGlzLl9sb2dHcmlkTm9kZXMg PSBbXTsKLSAgICAvKiogQHR5cGUgeyFBcnJheS48V2ViSW5zcGVjdG9yLkRhdGFHcmlkTm9kZT59 ICovCi0gICAgdGhpcy5fZHJhd0NhbGxHcm91cHMgPSBbXTsKLSAgICAvKiogQHR5cGUgeyFBcnJh eS48V2ViSW5zcGVjdG9yLkRhdGFHcmlkTm9kZT59ICovCi0gICAgdGhpcy5fZnJhbWVHcm91cHMg PSBbXTsKLQogICAgIHRoaXMuX3NwbGl0Vmlldy5zaG93KHRoaXMuZWxlbWVudCk7Ci0gICAgdGhp cy5fcmVxdWVzdFRyYWNlTG9nKCk7CisgICAgdGhpcy5fcmVxdWVzdFRyYWNlTG9nKDApOwogfQog CiAvKioKQEAgLTEwNyw5ICsxMDAsNiBAQCBXZWJJbnNwZWN0b3IuQ2FudmFzUHJvZmlsZVZpZXcu VHJhY2VMb2dQb2xsaW5nSW50ZXJ2YWwgPSA1MDA7CiBXZWJJbnNwZWN0b3IuQ2FudmFzUHJvZmls ZVZpZXcucHJvdG90eXBlID0gewogICAgIGRpc3Bvc2U6IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAg ICAgIHRoaXMuX2xvZ0dyaWROb2RlcyA9IFtdOwotICAgICAgICB0aGlzLl9kcmF3Q2FsbEdyb3Vw Tm9kZXMgPSBbXTsKLSAgICAgICAgdGhpcy5fZnJhbWVHcm91cHMgPSBbXTsKICAgICAgICAgdGhp cy5fbGlua2lmaWVyLnJlc2V0KCk7CiAgICAgfSwKIApAQCAtMjgzLDI0ICsyNzMsMjkgQEAgV2Vi SW5zcGVjdG9yLkNhbnZhc1Byb2ZpbGVWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5f ZW5hYmxlV2FpdEljb24oZmFsc2UpOwogICAgICAgICBpZiAoZXJyb3IgfHwgIXRyYWNlTG9nKQog ICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB2YXIgY2FsbE5vZGVzID0gW107CiAgICAgICAg IHZhciBjYWxscyA9IHRyYWNlTG9nLmNhbGxzOworICAgICAgICB2YXIgaW5kZXggPSB0cmFjZUxv Zy5zdGFydE9mZnNldDsKICAgICAgICAgZm9yICh2YXIgaSA9IDAsIG4gPSBjYWxscy5sZW5ndGg7 IGkgPCBuOyArK2kpIHsKICAgICAgICAgICAgIHZhciBjYWxsID0gY2FsbHNbaV07CiAgICAgICAg ICAgICB0aGlzLl9yZXF1ZXN0UmVwbGF5Q29udGV4dEluZm8oY2FsbC5jb250ZXh0SWQpOwotICAg ICAgICAgICAgdmFyIGluZGV4ID0gdHJhY2VMb2cuc3RhcnRPZmZzZXQgKyBpOwotICAgICAgICAg ICAgdmFyIGdyaWROb2RlID0gdGhpcy5fY3JlYXRlQ2FsbE5vZGUoaW5kZXgsIGNhbGwpOwotICAg ICAgICAgICAgdGhpcy5fYXBwZW5kQ2FsbE5vZGUoZ3JpZE5vZGUpOworICAgICAgICAgICAgdmFy IGdyaWROb2RlID0gdGhpcy5fY3JlYXRlQ2FsbE5vZGUoaW5kZXgrKywgY2FsbCk7CisgICAgICAg ICAgICBjYWxsTm9kZXMucHVzaChncmlkTm9kZSk7CiAgICAgICAgIH0KKyAgICAgICAgdGhpcy5f YXBwZW5kQ2FsbE5vZGVzKGNhbGxOb2Rlcyk7CiAgICAgICAgIGlmICh0cmFjZUxvZy5hbGl2ZSkK LSAgICAgICAgICAgIHNldFRpbWVvdXQodGhpcy5fcmVxdWVzdFRyYWNlTG9nLmJpbmQodGhpcyks IFdlYkluc3BlY3Rvci5DYW52YXNQcm9maWxlVmlldy5UcmFjZUxvZ1BvbGxpbmdJbnRlcnZhbCk7 CisgICAgICAgICAgICBzZXRUaW1lb3V0KHRoaXMuX3JlcXVlc3RUcmFjZUxvZy5iaW5kKHRoaXMs IGluZGV4KSwgV2ViSW5zcGVjdG9yLkNhbnZhc1Byb2ZpbGVWaWV3LlRyYWNlTG9nUG9sbGluZ0lu dGVydmFsKTsKICAgICAgICAgdGhpcy5fcHJvZmlsZS5fdXBkYXRlQ2FwdHVyaW5nU3RhdHVzKHRy YWNlTG9nKTsKICAgICAgICAgdGhpcy5fb25SZXBsYXlMYXN0U3RlcENsaWNrKCk7IC8vIEF1dG9t YXRpY2FsbHkgcmVwbGF5IHRoZSBsYXN0IHN0ZXAuCiAgICAgfSwKIAotICAgIF9yZXF1ZXN0VHJh Y2VMb2c6IGZ1bmN0aW9uKCkKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge251bWJlcn0gb2Zmc2V0 CisgICAgICovCisgICAgX3JlcXVlc3RUcmFjZUxvZzogZnVuY3Rpb24ob2Zmc2V0KQogICAgIHsK ICAgICAgICAgdGhpcy5fZW5hYmxlV2FpdEljb24odHJ1ZSk7Ci0gICAgICAgIENhbnZhc0FnZW50 LmdldFRyYWNlTG9nKHRoaXMuX3RyYWNlTG9nSWQsIHRoaXMuX2xvZ0dyaWROb2Rlcy5sZW5ndGgs IHVuZGVmaW5lZCwgdGhpcy5fZGlkUmVjZWl2ZVRyYWNlTG9nLmJpbmQodGhpcykpOworICAgICAg ICBDYW52YXNBZ2VudC5nZXRUcmFjZUxvZyh0aGlzLl90cmFjZUxvZ0lkLCBvZmZzZXQsIHVuZGVm aW5lZCwgdGhpcy5fZGlkUmVjZWl2ZVRyYWNlTG9nLmJpbmQodGhpcykpOwogICAgIH0sCiAKICAg ICAvKioKQEAgLTMzMiwxMDMgKzMyNywxMTAgQEAgV2ViSW5zcGVjdG9yLkNhbnZhc1Byb2ZpbGVW aWV3LnByb3RvdHlwZSA9IHsKICAgICBfc2VsZWN0ZWRDYWxsSW5kZXg6IGZ1bmN0aW9uKCkKICAg ICB7CiAgICAgICAgIHZhciBub2RlID0gdGhpcy5fbG9nR3JpZC5zZWxlY3RlZE5vZGU7Ci0gICAg ICAgIHdoaWxlIChub2RlKSB7Ci0gICAgICAgICAgICBpZiAodHlwZW9mIG5vZGUuaW5kZXggPT09 ICJudW1iZXIiKQotICAgICAgICAgICAgICAgIHJldHVybiBub2RlLmluZGV4OwotICAgICAgICAg ICAgbm9kZSA9IG5vZGUuY2hpbGRyZW4ucGVla0xhc3QoKTsKLSAgICAgICAgfQotICAgICAgICBy ZXR1cm4gLTE7CisgICAgICAgIHJldHVybiBub2RlID8gdGhpcy5fcGVla0xhc3RSZWN1cnNpdmVs eShub2RlKS5pbmRleCA6IC0xOwogICAgIH0sCiAKICAgICAvKioKLSAgICAgKiBAcmV0dXJuIHtu dW1iZXJ9CisgICAgICogQHBhcmFtIHshV2ViSW5zcGVjdG9yLkRhdGFHcmlkTm9kZX0gbm9kZQor ICAgICAqIEByZXR1cm4geyFXZWJJbnNwZWN0b3IuRGF0YUdyaWROb2RlfQogICAgICAqLwotICAg IF9zZWxlY3RlZERyYXdDYWxsR3JvdXBJbmRleDogZnVuY3Rpb24oKQorICAgIF9wZWVrTGFzdFJl Y3Vyc2l2ZWx5OiBmdW5jdGlvbihub2RlKQogICAgIHsKLSAgICAgICAgZm9yICh2YXIgbm9kZSA9 IHRoaXMuX2xvZ0dyaWQuc2VsZWN0ZWROb2RlOyBub2RlOyBub2RlID0gbm9kZS5jaGlsZHJlbi5w ZWVrTGFzdCgpKSB7Ci0gICAgICAgICAgICBpZiAodHlwZW9mIG5vZGUuZHJhd0NhbGxHcm91cElu ZGV4ID09PSAibnVtYmVyIikKLSAgICAgICAgICAgICAgICByZXR1cm4gbm9kZS5kcmF3Q2FsbEdy b3VwSW5kZXg7Ci0gICAgICAgIH0KLSAgICAgICAgZm9yICh2YXIgbm9kZSA9IHRoaXMuX2xvZ0dy aWQuc2VsZWN0ZWROb2RlOyBub2RlOyBub2RlID0gbm9kZS5wYXJlbnQpIHsKLSAgICAgICAgICAg IGlmICh0eXBlb2Ygbm9kZS5kcmF3Q2FsbEdyb3VwSW5kZXggPT09ICJudW1iZXIiKQotICAgICAg ICAgICAgICAgIHJldHVybiBub2RlLmRyYXdDYWxsR3JvdXBJbmRleDsKLSAgICAgICAgfQotICAg ICAgICByZXR1cm4gLTE7CisgICAgICAgIHZhciBsYXN0Q2hpbGQ7CisgICAgICAgIHdoaWxlICgo bGFzdENoaWxkID0gbm9kZS5jaGlsZHJlbi5wZWVrTGFzdCgpKSkKKyAgICAgICAgICAgIG5vZGUg PSAvKiogQHR5cGUgeyFXZWJJbnNwZWN0b3IuRGF0YUdyaWROb2RlfSAqLyAobGFzdENoaWxkKTsK KyAgICAgICAgcmV0dXJuIG5vZGU7CiAgICAgfSwKIAogICAgIC8qKgotICAgICAqIEBwYXJhbSB7 IVdlYkluc3BlY3Rvci5EYXRhR3JpZE5vZGV9IGdyaWROb2RlCisgICAgICogQHBhcmFtIHshQXJy YXkuPCFXZWJJbnNwZWN0b3IuRGF0YUdyaWROb2RlPn0gY2FsbE5vZGVzCiAgICAgICovCi0gICAg X2FwcGVuZENhbGxOb2RlOiBmdW5jdGlvbihncmlkTm9kZSkKKyAgICBfYXBwZW5kQ2FsbE5vZGVz OiBmdW5jdGlvbihjYWxsTm9kZXMpCiAgICAgewotICAgICAgICB2YXIgZHJhd0NhbGxHcm91cCA9 IHRoaXMuX2RyYXdDYWxsR3JvdXBzLnBlZWtMYXN0KCk7Ci0gICAgICAgIGlmIChkcmF3Q2FsbEdy b3VwKSB7Ci0gICAgICAgICAgICB2YXIgbGFzdE5vZGUgPSBkcmF3Q2FsbEdyb3VwLmNoaWxkcmVu LnBlZWtMYXN0KCk7Ci0gICAgICAgICAgICBpZiAobGFzdE5vZGUgJiYgKGxhc3ROb2RlLmNhbGwu aXNEcmF3aW5nQ2FsbCB8fCBsYXN0Tm9kZS5jYWxsLmlzRnJhbWVFbmRDYWxsKSkKLSAgICAgICAg ICAgICAgICBkcmF3Q2FsbEdyb3VwID0gbnVsbDsKLSAgICAgICAgfQotICAgICAgICBpZiAoIWRy YXdDYWxsR3JvdXApIHsKLSAgICAgICAgICAgIHZhciBpbmRleCA9IHRoaXMuX2RyYXdDYWxsR3Jv dXBzLmxlbmd0aDsKLSAgICAgICAgICAgIHZhciBkYXRhID0ge307Ci0gICAgICAgICAgICBkYXRh WzBdID0gIiI7Ci0gICAgICAgICAgICBkYXRhWzFdID0gIkRyYXcgY2FsbCBncm91cCAjIiArIChp bmRleCArIDEpOwotICAgICAgICAgICAgZGF0YVsyXSA9ICIiOwotICAgICAgICAgICAgZHJhd0Nh bGxHcm91cCA9IG5ldyBXZWJJbnNwZWN0b3IuRGF0YUdyaWROb2RlKGRhdGEpOwotICAgICAgICAg ICAgZHJhd0NhbGxHcm91cC5zZWxlY3RhYmxlID0gdHJ1ZTsKLSAgICAgICAgICAgIGRyYXdDYWxs R3JvdXAuZHJhd0NhbGxHcm91cEluZGV4ID0gaW5kZXg7Ci0gICAgICAgICAgICB0aGlzLl9kcmF3 Q2FsbEdyb3Vwcy5wdXNoKGRyYXdDYWxsR3JvdXApOwotICAgICAgICAgICAgdGhpcy5fYXBwZW5k RHJhd0NhbGxHcm91cChkcmF3Q2FsbEdyb3VwKTsKKyAgICAgICAgdmFyIHJvb3ROb2RlID0gdGhp cy5fbG9nR3JpZC5yb290Tm9kZSgpOworICAgICAgICB2YXIgZnJhbWVOb2RlID0gLyoqIEB0eXBl IHtXZWJJbnNwZWN0b3IuRGF0YUdyaWROb2RlfSAqLyAocm9vdE5vZGUuY2hpbGRyZW4ucGVla0xh c3QoKSk7CisgICAgICAgIGlmIChmcmFtZU5vZGUgJiYgdGhpcy5fcGVla0xhc3RSZWN1cnNpdmVs eShmcmFtZU5vZGUpLmNhbGwuaXNGcmFtZUVuZENhbGwpCisgICAgICAgICAgICBmcmFtZU5vZGUg PSBudWxsOworICAgICAgICBmb3IgKHZhciBpID0gMCwgbiA9IGNhbGxOb2Rlcy5sZW5ndGg7IGkg PCBuOyArK2kpIHsKKyAgICAgICAgICAgIGlmICghZnJhbWVOb2RlKSB7CisgICAgICAgICAgICAg ICAgdmFyIGluZGV4ID0gcm9vdE5vZGUuY2hpbGRyZW4ubGVuZ3RoOworICAgICAgICAgICAgICAg IHZhciBkYXRhID0ge307CisgICAgICAgICAgICAgICAgZGF0YVswXSA9ICIiOworICAgICAgICAg ICAgICAgIGRhdGFbMV0gPSAiRnJhbWUgIyIgKyAoaW5kZXggKyAxKTsKKyAgICAgICAgICAgICAg ICBkYXRhWzJdID0gIiI7CisgICAgICAgICAgICAgICAgZnJhbWVOb2RlID0gbmV3IFdlYkluc3Bl Y3Rvci5EYXRhR3JpZE5vZGUoZGF0YSk7CisgICAgICAgICAgICAgICAgZnJhbWVOb2RlLnNlbGVj dGFibGUgPSB0cnVlOworICAgICAgICAgICAgICAgIHJvb3ROb2RlLmFwcGVuZENoaWxkKGZyYW1l Tm9kZSk7CisgICAgICAgICAgICB9CisgICAgICAgICAgICB2YXIgbmV4dEZyYW1lQ2FsbEluZGV4 ID0gaSArIDE7CisgICAgICAgICAgICB3aGlsZSAobmV4dEZyYW1lQ2FsbEluZGV4IDwgbiAmJiAh Y2FsbE5vZGVzW25leHRGcmFtZUNhbGxJbmRleCAtIDFdLmNhbGwuaXNGcmFtZUVuZENhbGwpCisg ICAgICAgICAgICAgICAgKytuZXh0RnJhbWVDYWxsSW5kZXg7CisgICAgICAgICAgICB0aGlzLl9h cHBlbmRDYWxsTm9kZXNUb0ZyYW1lTm9kZShmcmFtZU5vZGUsIGNhbGxOb2RlcywgaSwgbmV4dEZy YW1lQ2FsbEluZGV4KTsKKyAgICAgICAgICAgIGkgPSBuZXh0RnJhbWVDYWxsSW5kZXggLSAxOwor ICAgICAgICAgICAgZnJhbWVOb2RlID0gbnVsbDsKICAgICAgICAgfQotICAgICAgICBkcmF3Q2Fs bEdyb3VwLmFwcGVuZENoaWxkKGdyaWROb2RlKTsKLSAgICAgICAgaWYgKGdyaWROb2RlLmNhbGwu aXNGcmFtZUVuZENhbGwpCi0gICAgICAgICAgICB0aGlzLl9tYXliZU1lcmdlTGFzdERyYXdDYWxs R3JvdXBzKCk7CiAgICAgfSwKIAogICAgIC8qKgotICAgICAqIEBwYXJhbSB7IVdlYkluc3BlY3Rv ci5EYXRhR3JpZE5vZGV9IGRyYXdDYWxsR3JvdXAKKyAgICAgKiBAcGFyYW0geyFXZWJJbnNwZWN0 b3IuRGF0YUdyaWROb2RlfSBmcmFtZU5vZGUKKyAgICAgKiBAcGFyYW0geyFBcnJheS48IVdlYklu c3BlY3Rvci5EYXRhR3JpZE5vZGU+fSBjYWxsTm9kZXMKKyAgICAgKiBAcGFyYW0ge251bWJlcn0g ZnJvbUluZGV4CisgICAgICogQHBhcmFtIHtudW1iZXJ9IHRvSW5kZXggbm90IGluY2x1c2l2ZQog ICAgICAqLwotICAgIF9hcHBlbmREcmF3Q2FsbEdyb3VwOiBmdW5jdGlvbihkcmF3Q2FsbEdyb3Vw KQorICAgIF9hcHBlbmRDYWxsTm9kZXNUb0ZyYW1lTm9kZTogZnVuY3Rpb24oZnJhbWVOb2RlLCBj YWxsTm9kZXMsIGZyb21JbmRleCwgdG9JbmRleCkKICAgICB7Ci0gICAgICAgIHZhciBmcmFtZUdy b3VwID0gdGhpcy5fZnJhbWVHcm91cHMucGVla0xhc3QoKTsKLSAgICAgICAgaWYgKGZyYW1lR3Jv dXApIHsKLSAgICAgICAgICAgIHZhciBsYXN0RHJhd0NhbGxHcm91cCA9IGZyYW1lR3JvdXAuY2hp bGRyZW4ucGVla0xhc3QoKTsKLSAgICAgICAgICAgIHZhciBsYXN0Tm9kZSA9IGxhc3REcmF3Q2Fs bEdyb3VwICYmIGxhc3REcmF3Q2FsbEdyb3VwLmNoaWxkcmVuLnBlZWtMYXN0KCk7Ci0gICAgICAg ICAgICBpZiAobGFzdE5vZGUgJiYgbGFzdE5vZGUuY2FsbC5pc0ZyYW1lRW5kQ2FsbCkKLSAgICAg ICAgICAgICAgICBmcmFtZUdyb3VwID0gbnVsbDsKLSAgICAgICAgfQotICAgICAgICBpZiAoIWZy YW1lR3JvdXApIHsKLSAgICAgICAgICAgIHZhciBpbmRleCA9IHRoaXMuX2ZyYW1lR3JvdXBzLmxl bmd0aDsKKyAgICAgICAgZnVuY3Rpb24gYXBwZW5kRHJhd0NhbGxHcm91cCgpCisgICAgICAgIHsK KyAgICAgICAgICAgIHZhciBpbmRleCA9IHRoaXMuX2RyYXdDYWxsR3JvdXBzQ291bnQgfHwgMDsK ICAgICAgICAgICAgIHZhciBkYXRhID0ge307CiAgICAgICAgICAgICBkYXRhWzBdID0gIiI7Ci0g ICAgICAgICAgICBkYXRhWzFdID0gIkZyYW1lICMiICsgKGluZGV4ICsgMSk7CisgICAgICAgICAg ICBkYXRhWzFdID0gIkRyYXcgY2FsbCBncm91cCAjIiArIChpbmRleCArIDEpOwogICAgICAgICAg ICAgZGF0YVsyXSA9ICIiOwotICAgICAgICAgICAgZnJhbWVHcm91cCA9IG5ldyBXZWJJbnNwZWN0 b3IuRGF0YUdyaWROb2RlKGRhdGEpOwotICAgICAgICAgICAgZnJhbWVHcm91cC5zZWxlY3RhYmxl ID0gdHJ1ZTsKLSAgICAgICAgICAgIGZyYW1lR3JvdXAuZnJhbWVHcm91cEluZGV4ID0gaW5kZXg7 Ci0gICAgICAgICAgICB0aGlzLl9mcmFtZUdyb3Vwcy5wdXNoKGZyYW1lR3JvdXApOwotICAgICAg ICAgICAgdGhpcy5fbG9nR3JpZC5yb290Tm9kZSgpLmFwcGVuZENoaWxkKGZyYW1lR3JvdXApOwor ICAgICAgICAgICAgdmFyIG5vZGUgPSBuZXcgV2ViSW5zcGVjdG9yLkRhdGFHcmlkTm9kZShkYXRh KTsKKyAgICAgICAgICAgIG5vZGUuc2VsZWN0YWJsZSA9IHRydWU7CisgICAgICAgICAgICB0aGlz Ll9kcmF3Q2FsbEdyb3Vwc0NvdW50ID0gaW5kZXggKyAxOworICAgICAgICAgICAgZnJhbWVOb2Rl LmFwcGVuZENoaWxkKG5vZGUpOworICAgICAgICAgICAgcmV0dXJuIG5vZGU7CiAgICAgICAgIH0K LSAgICAgICAgZnJhbWVHcm91cC5hcHBlbmRDaGlsZChkcmF3Q2FsbEdyb3VwKTsKLSAgICB9LAog Ci0gICAgX21heWJlTWVyZ2VMYXN0RHJhd0NhbGxHcm91cHM6IGZ1bmN0aW9uKCkKLSAgICB7Ci0g ICAgICAgIHZhciBmcmFtZUdyb3VwID0gdGhpcy5fZnJhbWVHcm91cHMucGVla0xhc3QoKTsKLSAg ICAgICAgaWYgKCFmcmFtZUdyb3VwKQotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICB2YXIg Z3JvdXBzID0gZnJhbWVHcm91cC5jaGlsZHJlbi5sZW5ndGg7Ci0gICAgICAgIGlmIChncm91cHMg PCAyKQotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICB2YXIgc3JjID0gZnJhbWVHcm91cC5j aGlsZHJlbltncm91cHMgLSAxXQotICAgICAgICBmb3IgKHZhciBpID0gMCwgbiA9IHNyYy5jaGls ZHJlbi5sZW5ndGg7IGkgPCBuOyArK2kpIHsKLSAgICAgICAgICAgIGlmIChzcmMuY2hpbGRyZW5b aV0uY2FsbC5pc0RyYXdpbmdDYWxsKQotICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAg ZnVuY3Rpb24gc3BsaXREcmF3Q2FsbEdyb3VwKGRyYXdDYWxsR3JvdXApCisgICAgICAgIHsKKyAg ICAgICAgICAgIHZhciBzcGxpdEluZGV4ID0gMDsKKyAgICAgICAgICAgIHZhciBzcGxpdE5vZGU7 CisgICAgICAgICAgICB3aGlsZSAoKHNwbGl0Tm9kZSA9IGRyYXdDYWxsR3JvdXAuY2hpbGRyZW5b c3BsaXRJbmRleF0pKSB7CisgICAgICAgICAgICAgICAgaWYgKHNwbGl0Tm9kZS5jYWxsLmlzRHJh d2luZ0NhbGwpCisgICAgICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgICAgICsr c3BsaXRJbmRleDsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIHZhciBuZXdEcmF3Q2FsbEdy b3VwID0gYXBwZW5kRHJhd0NhbGxHcm91cCgpOworICAgICAgICAgICAgdmFyIGxhc3ROb2RlOwor ICAgICAgICAgICAgd2hpbGUgKChsYXN0Tm9kZSA9IGRyYXdDYWxsR3JvdXAuY2hpbGRyZW5bc3Bs aXRJbmRleCArIDFdKSkKKyAgICAgICAgICAgICAgICBuZXdEcmF3Q2FsbEdyb3VwLmFwcGVuZENo aWxkKGxhc3ROb2RlKTsKKyAgICAgICAgICAgIHJldHVybiBuZXdEcmF3Q2FsbEdyb3VwOworICAg ICAgICB9CisKKyAgICAgICAgdmFyIGRyYXdDYWxsR3JvdXAgPSBmcmFtZU5vZGUuY2hpbGRyZW4u cGVla0xhc3QoKTsKKyAgICAgICAgdmFyIGdyb3VwSGFzRHJhd0NhbGwgPSBmYWxzZTsKKyAgICAg ICAgaWYgKGRyYXdDYWxsR3JvdXApIHsKKyAgICAgICAgICAgIGZvciAodmFyIGkgPSAwLCBuID0g ZHJhd0NhbGxHcm91cC5jaGlsZHJlbi5sZW5ndGg7IGkgPCBuOyArK2kpIHsKKyAgICAgICAgICAg ICAgICBpZiAoZHJhd0NhbGxHcm91cC5jaGlsZHJlbltpXS5jYWxsLmlzRHJhd2luZ0NhbGwpIHsK KyAgICAgICAgICAgICAgICAgICAgZ3JvdXBIYXNEcmF3Q2FsbCA9IHRydWU7CisgICAgICAgICAg ICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIH0KKyAgICAg ICAgfSBlbHNlCisgICAgICAgICAgICBkcmF3Q2FsbEdyb3VwID0gYXBwZW5kRHJhd0NhbGxHcm91 cCgpOworCisgICAgICAgIGZvciAodmFyIGkgPSBmcm9tSW5kZXg7IGkgPCB0b0luZGV4OyArK2kp IHsKKyAgICAgICAgICAgIHZhciBub2RlID0gY2FsbE5vZGVzW2ldOworICAgICAgICAgICAgZHJh d0NhbGxHcm91cC5hcHBlbmRDaGlsZChub2RlKTsKKyAgICAgICAgICAgIGlmIChub2RlLmNhbGwu aXNEcmF3aW5nQ2FsbCkgeworICAgICAgICAgICAgICAgIGlmIChncm91cEhhc0RyYXdDYWxsKQor ICAgICAgICAgICAgICAgICAgICBkcmF3Q2FsbEdyb3VwID0gc3BsaXREcmF3Q2FsbEdyb3VwKGRy YXdDYWxsR3JvdXApOworICAgICAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICAgICAg Z3JvdXBIYXNEcmF3Q2FsbCA9IHRydWU7CisgICAgICAgICAgICB9CiAgICAgICAgIH0KLSAgICAg ICAgdmFyIGRzdCA9IGZyYW1lR3JvdXAuY2hpbGRyZW5bZ3JvdXBzIC0gMl07Ci0gICAgICAgIHdo aWxlIChzcmMuY2hpbGRyZW4ubGVuZ3RoKQotICAgICAgICAgICAgZHN0LmFwcGVuZENoaWxkKHNy Yy5jaGlsZHJlblswXSk7Ci0gICAgICAgIGZyYW1lR3JvdXAucmVtb3ZlQ2hpbGQoc3JjKTsKLSAg ICAgICAgdGhpcy5fZHJhd0NhbGxHcm91cHMucG9wKCk7CiAgICAgfSwKIAogICAgIC8qKgpAQCAt NDY0LDcgKzQ2Niw2IEBAIFdlYkluc3BlY3Rvci5DYW52YXNQcm9maWxlVmlldy5wcm90b3R5cGUg PSB7CiAgICAgICAgIG5vZGUuaW5kZXggPSBpbmRleDsKICAgICAgICAgbm9kZS5zZWxlY3RhYmxl ID0gdHJ1ZTsKICAgICAgICAgbm9kZS5jYWxsID0gY2FsbDsKLSAgICAgICAgdGhpcy5fbG9nR3Jp ZE5vZGVzW2luZGV4XSA9IG5vZGU7CiAgICAgICAgIHJldHVybiBub2RlOwogICAgIH0sCiAK