69328 2011-10-04 02:22:00 -0700 Web Inspector: move abstract panel search logic into the only view that is using it. 2011-10-04 03:04:55 -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 477504 0 pfeldman 2011-10-04 02:22:00 -0700 We might need to come up with a better "common" implementation of search in panel, but current one simply does not work for all the panels. 477505 1 109598 pfeldman 2011-10-04 02:25:12 -0700 Created attachment 109598 Patch 477513 2 pfeldman 2011-10-04 03:04:55 -0700 Committed r96580: <http://trac.webkit.org/changeset/96580> 109598 2011-10-04 02:25:12 -0700 2011-10-04 03:00:23 -0700 Patch bug-69328-20111004132510.patch text/plain 14294 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogOTY1NzcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBkMjIzZDc1YmZlZTEzMWMx NzYyYjEyZmM4ODk1MDY5NmQyMDgxZWM4Li5mMGVlNGY5NjU5ZDIzNjE4MmJiYTFjMGQzMGQ3MzFl MmU3Njg4MzdlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjggQEAKIDIwMTEtMTAtMDQgIFBhdmVs IEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgogCisgICAgICAgIFdlYiBJbnNwZWN0b3I6 IG1vdmUgYWJzdHJhY3QgcGFuZWwgc2VhcmNoIGxvZ2ljIGludG8gdGhlIG9ubHkgdmlldyB0aGF0 IGlzIHVzaW5nIGl0LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NjkzMjgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuUGFuZWwucHJvdG90eXBlLnNlYXJjaENhbmNlbGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5QYW5lbC5wcm90b3R5cGUucGVyZm9ybVNlYXJjaCk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu UGFuZWwucHJvdG90eXBlLmp1bXBUb05leHRTZWFyY2hSZXN1bHQpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlBhbmVsLnByb3RvdHlwZS5qdW1wVG9QcmV2aW91c1NlYXJjaFJlc3VsdCk6CisgICAg ICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9maWxlc1BhbmVsLmpzOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLlByb2ZpbGVzUGFuZWwucHJvdG90eXBlLnBlcmZvcm1TZWFyY2gudXBkYXRlTWF0 Y2hlc0NvdW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Qcm9maWxlc1BhbmVsLnByb3RvdHlw ZS5wZXJmb3JtU2VhcmNoLnVwZGF0ZU1hdGNoZXNDb3VudFNvb24pOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlByb2ZpbGVzUGFuZWwucHJvdG90eXBlLnBlcmZvcm1TZWFyY2guZmluaXNoZWRDYWxs YmFjayk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUHJvZmlsZXNQYW5lbC5wcm90b3R5cGUucGVy Zm9ybVNlYXJjaC5wcm9jZXNzQ2h1bmspOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlByb2ZpbGVz UGFuZWwucHJvdG90eXBlLnBlcmZvcm1TZWFyY2gpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlBy b2ZpbGVzUGFuZWwucHJvdG90eXBlLmp1bXBUb05leHRTZWFyY2hSZXN1bHQpOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlByb2ZpbGVzUGFuZWwucHJvdG90eXBlLmp1bXBUb1ByZXZpb3VzU2VhcmNo UmVzdWx0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Qcm9maWxlc1BhbmVsLnByb3RvdHlwZS5f c2VhcmNoYWJsZVZpZXdzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Qcm9maWxlc1BhbmVsLnBy b3RvdHlwZS5zZWFyY2hDYW5jZWxlZCk6CisKKzIwMTEtMTAtMDQgIFBhdmVsIEZlbGRtYW4gIDxw ZmVsZG1hbkBnb29nbGUuY29tPgorCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IHJlbW92ZSBkZXBl bmRlbmN5IGZyb20gR29Ub0xpbmUgZGlhbG9nIGZyb20gUGFuZWwuCiAgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02OTMyNwogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1BhbmVsLmpzIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9QYW5lbC5qcwppbmRleCBmMzBjZmY1MTFlYWNmOTc0YjBhZGQ3 OTEyMWNlMGNkZGQzOGM1OWJiLi42ZWVlZGU1NjA5OTA2YTk3ZDg2Yzc4Y2Y0MmQ5YjRhYTVhZmQz NDFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1BhbmVs LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUGFuZWwuanMKQEAg LTEwOCwxNzEgKzEwOCwyMSBAQCBXZWJJbnNwZWN0b3IuUGFuZWwucHJvdG90eXBlID0gewogCiAg ICAgc2VhcmNoQ2FuY2VsZWQ6IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIGlmICh0aGlzLl9z ZWFyY2hSZXN1bHRzKSB7Ci0gICAgICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHRoaXMuX3Nl YXJjaFJlc3VsdHMubGVuZ3RoOyArK2kpIHsKLSAgICAgICAgICAgICAgICB2YXIgdmlldyA9IHRo aXMuX3NlYXJjaFJlc3VsdHNbaV07Ci0gICAgICAgICAgICAgICAgaWYgKHZpZXcuc2VhcmNoQ2Fu Y2VsZWQpCi0gICAgICAgICAgICAgICAgICAgIHZpZXcuc2VhcmNoQ2FuY2VsZWQoKTsKLSAgICAg ICAgICAgICAgICBkZWxldGUgdmlldy5jdXJyZW50UXVlcnk7Ci0gICAgICAgICAgICB9Ci0gICAg ICAgIH0KLQogICAgICAgICBXZWJJbnNwZWN0b3Iuc2VhcmNoQ29udHJvbGxlci51cGRhdGVTZWFy Y2hNYXRjaGVzQ291bnQoMCwgdGhpcyk7Ci0KLSAgICAgICAgaWYgKHRoaXMuX2N1cnJlbnRTZWFy Y2hDaHVua0ludGVydmFsSWRlbnRpZmllcikgewotICAgICAgICAgICAgY2xlYXJJbnRlcnZhbCh0 aGlzLl9jdXJyZW50U2VhcmNoQ2h1bmtJbnRlcnZhbElkZW50aWZpZXIpOwotICAgICAgICAgICAg ZGVsZXRlIHRoaXMuX2N1cnJlbnRTZWFyY2hDaHVua0ludGVydmFsSWRlbnRpZmllcjsKLSAgICAg ICAgfQotCi0gICAgICAgIHRoaXMuX3RvdGFsU2VhcmNoTWF0Y2hlcyA9IDA7Ci0gICAgICAgIHRo aXMuX2N1cnJlbnRTZWFyY2hSZXN1bHRJbmRleCA9IDA7Ci0gICAgICAgIHRoaXMuX3NlYXJjaFJl c3VsdHMgPSBbXTsKICAgICB9LAogCiAgICAgcGVyZm9ybVNlYXJjaDogZnVuY3Rpb24ocXVlcnkp CiAgICAgewogICAgICAgICAvLyBDYWxsIHNlYXJjaENhbmNlbGVkIHNpbmNlIGl0IHdpbGwgcmVz ZXQgZXZlcnl0aGluZyB3ZSBuZWVkIGJlZm9yZSBkb2luZyBhIG5ldyBzZWFyY2guCi0gICAgICAg IHRoaXMuc2VhcmNoQ2FuY2VsZWQodHJ1ZSk7Ci0KLSAgICAgICAgdmFyIHNlYXJjaGFibGVWaWV3 cyA9IHRoaXMuc2VhcmNoYWJsZVZpZXdzOwotICAgICAgICBpZiAoIXNlYXJjaGFibGVWaWV3cyB8 fCAhc2VhcmNoYWJsZVZpZXdzLmxlbmd0aCkKLSAgICAgICAgICAgIHJldHVybjsKLQotICAgICAg ICB2YXIgcGFyZW50RWxlbWVudCA9IHRoaXMudmlld3NDb250YWluZXJFbGVtZW50OwotICAgICAg ICB2YXIgdmlzaWJsZVZpZXcgPSB0aGlzLnZpc2libGVWaWV3OwotICAgICAgICB2YXIgc29ydEZ1 Y3Rpb24gPSB0aGlzLnNlYXJjaFJlc3VsdHNTb3J0RnVuY3Rpb247Ci0KLSAgICAgICAgdmFyIG1h dGNoZXNDb3VudFVwZGF0ZVRpbWVvdXQgPSBudWxsOwotCi0gICAgICAgIGZ1bmN0aW9uIHVwZGF0 ZU1hdGNoZXNDb3VudCgpCi0gICAgICAgIHsKLSAgICAgICAgICAgIFdlYkluc3BlY3Rvci5zZWFy Y2hDb250cm9sbGVyLnVwZGF0ZVNlYXJjaE1hdGNoZXNDb3VudCh0aGlzLl90b3RhbFNlYXJjaE1h dGNoZXMsIHRoaXMpOwotICAgICAgICAgICAgbWF0Y2hlc0NvdW50VXBkYXRlVGltZW91dCA9IG51 bGw7Ci0gICAgICAgIH0KLQotICAgICAgICBmdW5jdGlvbiB1cGRhdGVNYXRjaGVzQ291bnRTb29u KCkKLSAgICAgICAgewotICAgICAgICAgICAgaWYgKG1hdGNoZXNDb3VudFVwZGF0ZVRpbWVvdXQp Ci0gICAgICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICAgICAgLy8gVXBkYXRlIHRoZSBtYXRj aGVzIGNvdW50IGV2ZXJ5IGhhbGYtc2Vjb25kIHNvIGl0IGRvZXNuJ3QgZmVlbCB0d2l0Y2h5Lgot ICAgICAgICAgICAgbWF0Y2hlc0NvdW50VXBkYXRlVGltZW91dCA9IHNldFRpbWVvdXQodXBkYXRl TWF0Y2hlc0NvdW50LmJpbmQodGhpcyksIDUwMCk7Ci0gICAgICAgIH0KLQotICAgICAgICBmdW5j dGlvbiBmaW5pc2hlZENhbGxiYWNrKHZpZXcsIHNlYXJjaE1hdGNoZXMpCi0gICAgICAgIHsKLSAg ICAgICAgICAgIGlmICghc2VhcmNoTWF0Y2hlcykKLSAgICAgICAgICAgICAgICByZXR1cm47Ci0K LSAgICAgICAgICAgIHRoaXMuX3RvdGFsU2VhcmNoTWF0Y2hlcyArPSBzZWFyY2hNYXRjaGVzOwot ICAgICAgICAgICAgdGhpcy5fc2VhcmNoUmVzdWx0cy5wdXNoKHZpZXcpOwotCi0gICAgICAgICAg ICBpZiAoc29ydEZ1Y3Rpb24pCi0gICAgICAgICAgICAgICAgdGhpcy5fc2VhcmNoUmVzdWx0cy5z b3J0KHNvcnRGdWN0aW9uKTsKLQotICAgICAgICAgICAgaWYgKHRoaXMuc2VhcmNoTWF0Y2hGb3Vu ZCkKLSAgICAgICAgICAgICAgICB0aGlzLnNlYXJjaE1hdGNoRm91bmQodmlldywgc2VhcmNoTWF0 Y2hlcyk7Ci0KLSAgICAgICAgICAgIHVwZGF0ZU1hdGNoZXNDb3VudFNvb24uY2FsbCh0aGlzKTsK LQotICAgICAgICAgICAgaWYgKHZpZXcgPT09IHZpc2libGVWaWV3KQotICAgICAgICAgICAgICAg IHZpZXcuanVtcFRvRmlyc3RTZWFyY2hSZXN1bHQoKTsKLSAgICAgICAgfQotCi0gICAgICAgIHZh ciBpID0gMDsKLSAgICAgICAgdmFyIHBhbmVsID0gdGhpczsKLSAgICAgICAgdmFyIGJvdW5kRmlu aXNoZWRDYWxsYmFjayA9IGZpbmlzaGVkQ2FsbGJhY2suYmluZCh0aGlzKTsKLSAgICAgICAgdmFy IGNodW5rSW50ZXJ2YWxJZGVudGlmaWVyID0gbnVsbDsKLQotICAgICAgICAvLyBTcGxpdCB1cCB0 aGUgd29yayBpbnRvIGNodW5rcyBzbyB3ZSBkb24ndCBibG9jayB0aGUKLSAgICAgICAgLy8gVUkg dGhyZWFkIHdoaWxlIHByb2Nlc3NpbmcuCi0KLSAgICAgICAgZnVuY3Rpb24gcHJvY2Vzc0NodW5r KCkKLSAgICAgICAgewotICAgICAgICAgICAgdmFyIHZpZXcgPSBzZWFyY2hhYmxlVmlld3NbaV07 Ci0KLSAgICAgICAgICAgIGlmICgrK2kgPj0gc2VhcmNoYWJsZVZpZXdzLmxlbmd0aCkgewotICAg ICAgICAgICAgICAgIGlmIChwYW5lbC5fY3VycmVudFNlYXJjaENodW5rSW50ZXJ2YWxJZGVudGlm aWVyID09PSBjaHVua0ludGVydmFsSWRlbnRpZmllcikKLSAgICAgICAgICAgICAgICAgICAgZGVs ZXRlIHBhbmVsLl9jdXJyZW50U2VhcmNoQ2h1bmtJbnRlcnZhbElkZW50aWZpZXI7Ci0gICAgICAg ICAgICAgICAgY2xlYXJJbnRlcnZhbChjaHVua0ludGVydmFsSWRlbnRpZmllcik7Ci0gICAgICAg ICAgICB9Ci0KLSAgICAgICAgICAgIGlmICghdmlldykKLSAgICAgICAgICAgICAgICByZXR1cm47 Ci0KLSAgICAgICAgICAgIHZpZXcuY3VycmVudFF1ZXJ5ID0gcXVlcnk7Ci0gICAgICAgICAgICB2 aWV3LnBlcmZvcm1TZWFyY2gocXVlcnksIGJvdW5kRmluaXNoZWRDYWxsYmFjayk7Ci0gICAgICAg IH0KLQotICAgICAgICBwcm9jZXNzQ2h1bmsoKTsKLQotICAgICAgICBjaHVua0ludGVydmFsSWRl bnRpZmllciA9IHNldEludGVydmFsKHByb2Nlc3NDaHVuaywgMjUpOwotICAgICAgICB0aGlzLl9j dXJyZW50U2VhcmNoQ2h1bmtJbnRlcnZhbElkZW50aWZpZXIgPSBjaHVua0ludGVydmFsSWRlbnRp ZmllcjsKKyAgICAgICAgdGhpcy5zZWFyY2hDYW5jZWxlZCgpOwogICAgIH0sCiAKICAgICBqdW1w VG9OZXh0U2VhcmNoUmVzdWx0OiBmdW5jdGlvbigpCiAgICAgewotICAgICAgICBpZiAoIXRoaXMu c2hvd1ZpZXcgfHwgIXRoaXMuX3NlYXJjaFJlc3VsdHMgfHwgIXRoaXMuX3NlYXJjaFJlc3VsdHMu bGVuZ3RoKQotICAgICAgICAgICAgcmV0dXJuOwotCi0gICAgICAgIHZhciBzaG93Rmlyc3RSZXN1 bHQgPSBmYWxzZTsKLQotICAgICAgICB0aGlzLl9jdXJyZW50U2VhcmNoUmVzdWx0SW5kZXggPSB0 aGlzLl9zZWFyY2hSZXN1bHRzLmluZGV4T2YodGhpcy52aXNpYmxlVmlldyk7Ci0gICAgICAgIGlm ICh0aGlzLl9jdXJyZW50U2VhcmNoUmVzdWx0SW5kZXggPT09IC0xKSB7Ci0gICAgICAgICAgICB0 aGlzLl9jdXJyZW50U2VhcmNoUmVzdWx0SW5kZXggPSAwOwotICAgICAgICAgICAgc2hvd0ZpcnN0 UmVzdWx0ID0gdHJ1ZTsKLSAgICAgICAgfQotCi0gICAgICAgIHZhciBjdXJyZW50VmlldyA9IHRo aXMuX3NlYXJjaFJlc3VsdHNbdGhpcy5fY3VycmVudFNlYXJjaFJlc3VsdEluZGV4XTsKLQotICAg ICAgICBpZiAoY3VycmVudFZpZXcuc2hvd2luZ0xhc3RTZWFyY2hSZXN1bHQoKSkgewotICAgICAg ICAgICAgaWYgKCsrdGhpcy5fY3VycmVudFNlYXJjaFJlc3VsdEluZGV4ID49IHRoaXMuX3NlYXJj aFJlc3VsdHMubGVuZ3RoKQotICAgICAgICAgICAgICAgIHRoaXMuX2N1cnJlbnRTZWFyY2hSZXN1 bHRJbmRleCA9IDA7Ci0gICAgICAgICAgICBjdXJyZW50VmlldyA9IHRoaXMuX3NlYXJjaFJlc3Vs dHNbdGhpcy5fY3VycmVudFNlYXJjaFJlc3VsdEluZGV4XTsKLSAgICAgICAgICAgIHNob3dGaXJz dFJlc3VsdCA9IHRydWU7Ci0gICAgICAgIH0KLQotICAgICAgICBpZiAoY3VycmVudFZpZXcgIT09 IHRoaXMudmlzaWJsZVZpZXcpIHsKLSAgICAgICAgICAgIHRoaXMuc2hvd1ZpZXcoY3VycmVudFZp ZXcpOwotICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnNlYXJjaENvbnRyb2xsZXIuZm9jdXNTZWFy Y2hGaWVsZCgpOwotICAgICAgICB9Ci0KLSAgICAgICAgaWYgKHNob3dGaXJzdFJlc3VsdCkKLSAg ICAgICAgICAgIGN1cnJlbnRWaWV3Lmp1bXBUb0ZpcnN0U2VhcmNoUmVzdWx0KCk7Ci0gICAgICAg IGVsc2UKLSAgICAgICAgICAgIGN1cnJlbnRWaWV3Lmp1bXBUb05leHRTZWFyY2hSZXN1bHQoKTsK ICAgICB9LAogCiAgICAganVtcFRvUHJldmlvdXNTZWFyY2hSZXN1bHQ6IGZ1bmN0aW9uKCkKICAg ICB7Ci0gICAgICAgIGlmICghdGhpcy5zaG93VmlldyB8fCAhdGhpcy5fc2VhcmNoUmVzdWx0cyB8 fCAhdGhpcy5fc2VhcmNoUmVzdWx0cy5sZW5ndGgpCi0gICAgICAgICAgICByZXR1cm47Ci0KLSAg ICAgICAgdmFyIHNob3dMYXN0UmVzdWx0ID0gZmFsc2U7Ci0KLSAgICAgICAgdGhpcy5fY3VycmVu dFNlYXJjaFJlc3VsdEluZGV4ID0gdGhpcy5fc2VhcmNoUmVzdWx0cy5pbmRleE9mKHRoaXMudmlz aWJsZVZpZXcpOwotICAgICAgICBpZiAodGhpcy5fY3VycmVudFNlYXJjaFJlc3VsdEluZGV4ID09 PSAtMSkgewotICAgICAgICAgICAgdGhpcy5fY3VycmVudFNlYXJjaFJlc3VsdEluZGV4ID0gMDsK LSAgICAgICAgICAgIHNob3dMYXN0UmVzdWx0ID0gdHJ1ZTsKLSAgICAgICAgfQotCi0gICAgICAg IHZhciBjdXJyZW50VmlldyA9IHRoaXMuX3NlYXJjaFJlc3VsdHNbdGhpcy5fY3VycmVudFNlYXJj aFJlc3VsdEluZGV4XTsKLQotICAgICAgICBpZiAoY3VycmVudFZpZXcuc2hvd2luZ0ZpcnN0U2Vh cmNoUmVzdWx0KCkpIHsKLSAgICAgICAgICAgIGlmICgtLXRoaXMuX2N1cnJlbnRTZWFyY2hSZXN1 bHRJbmRleCA8IDApCi0gICAgICAgICAgICAgICAgdGhpcy5fY3VycmVudFNlYXJjaFJlc3VsdElu ZGV4ID0gKHRoaXMuX3NlYXJjaFJlc3VsdHMubGVuZ3RoIC0gMSk7Ci0gICAgICAgICAgICBjdXJy ZW50VmlldyA9IHRoaXMuX3NlYXJjaFJlc3VsdHNbdGhpcy5fY3VycmVudFNlYXJjaFJlc3VsdElu ZGV4XTsKLSAgICAgICAgICAgIHNob3dMYXN0UmVzdWx0ID0gdHJ1ZTsKLSAgICAgICAgfQotCi0g ICAgICAgIGlmIChjdXJyZW50VmlldyAhPT0gdGhpcy52aXNpYmxlVmlldykgewotICAgICAgICAg ICAgdGhpcy5zaG93VmlldyhjdXJyZW50Vmlldyk7Ci0gICAgICAgICAgICBXZWJJbnNwZWN0b3Iu c2VhcmNoQ29udHJvbGxlci5mb2N1c1NlYXJjaEZpZWxkKCk7Ci0gICAgICAgIH0KLQotICAgICAg ICBpZiAoc2hvd0xhc3RSZXN1bHQpCi0gICAgICAgICAgICBjdXJyZW50Vmlldy5qdW1wVG9MYXN0 U2VhcmNoUmVzdWx0KCk7Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIGN1cnJlbnRWaWV3Lmp1 bXBUb1ByZXZpb3VzU2VhcmNoUmVzdWx0KCk7CiAgICAgfSwKIAogICAgIGNyZWF0ZVNpZGViYXI6 IGZ1bmN0aW9uKHBhcmVudEVsZW1lbnQsIHJlc2l6ZXJQYXJlbnRFbGVtZW50KQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9maWxlc1BhbmVsLmpzIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9maWxlc1BhbmVsLmpzCmluZGV4 IDEyYmEwZWQzMWU5NDg3ZWJlZGU3M2U2YmE3ODEwMmVkODY3YmJjNjYuLjJhMWFiNzQ2MWZlYzBj MGE4YmUwMDg5NmRlZmY0OWI3NjgwYTZmNGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvUHJvZmlsZXNQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1Byb2ZpbGVzUGFuZWwuanMKQEAgLTUzOCw3ICs1MzgsMTUyIEBA IFdlYkluc3BlY3Rvci5Qcm9maWxlc1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJu IHRpdGxlOwogICAgIH0sCiAKLSAgICBnZXQgc2VhcmNoYWJsZVZpZXdzKCkKKyAgICBwZXJmb3Jt U2VhcmNoOiBmdW5jdGlvbihxdWVyeSkKKyAgICB7CisgICAgICAgIHRoaXMuc2VhcmNoQ2FuY2Vs ZWQoKTsKKworICAgICAgICB2YXIgc2VhcmNoYWJsZVZpZXdzID0gdGhpcy5fc2VhcmNoYWJsZVZp ZXdzKCk7CisgICAgICAgIGlmICghc2VhcmNoYWJsZVZpZXdzIHx8ICFzZWFyY2hhYmxlVmlld3Mu bGVuZ3RoKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIHZhciBwYXJlbnRFbGVtZW50 ID0gdGhpcy52aWV3c0NvbnRhaW5lckVsZW1lbnQ7CisgICAgICAgIHZhciB2aXNpYmxlVmlldyA9 IHRoaXMudmlzaWJsZVZpZXc7CisgICAgICAgIHZhciBzb3J0RnVjdGlvbiA9IHRoaXMuc2VhcmNo UmVzdWx0c1NvcnRGdW5jdGlvbjsKKworICAgICAgICB2YXIgbWF0Y2hlc0NvdW50VXBkYXRlVGlt ZW91dCA9IG51bGw7CisKKyAgICAgICAgZnVuY3Rpb24gdXBkYXRlTWF0Y2hlc0NvdW50KCkKKyAg ICAgICAgeworICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnNlYXJjaENvbnRyb2xsZXIudXBkYXRl U2VhcmNoTWF0Y2hlc0NvdW50KHRoaXMuX3RvdGFsU2VhcmNoTWF0Y2hlcywgdGhpcyk7CisgICAg ICAgICAgICBtYXRjaGVzQ291bnRVcGRhdGVUaW1lb3V0ID0gbnVsbDsKKyAgICAgICAgfQorCisg ICAgICAgIGZ1bmN0aW9uIHVwZGF0ZU1hdGNoZXNDb3VudFNvb24oKQorICAgICAgICB7CisgICAg ICAgICAgICBpZiAobWF0Y2hlc0NvdW50VXBkYXRlVGltZW91dCkKKyAgICAgICAgICAgICAgICBy ZXR1cm47CisgICAgICAgICAgICAvLyBVcGRhdGUgdGhlIG1hdGNoZXMgY291bnQgZXZlcnkgaGFs Zi1zZWNvbmQgc28gaXQgZG9lc24ndCBmZWVsIHR3aXRjaHkuCisgICAgICAgICAgICBtYXRjaGVz Q291bnRVcGRhdGVUaW1lb3V0ID0gc2V0VGltZW91dCh1cGRhdGVNYXRjaGVzQ291bnQuYmluZCh0 aGlzKSwgNTAwKTsKKyAgICAgICAgfQorCisgICAgICAgIGZ1bmN0aW9uIGZpbmlzaGVkQ2FsbGJh Y2sodmlldywgc2VhcmNoTWF0Y2hlcykKKyAgICAgICAgeworICAgICAgICAgICAgaWYgKCFzZWFy Y2hNYXRjaGVzKQorICAgICAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICAgICAgdGhpcy5f dG90YWxTZWFyY2hNYXRjaGVzICs9IHNlYXJjaE1hdGNoZXM7CisgICAgICAgICAgICB0aGlzLl9z ZWFyY2hSZXN1bHRzLnB1c2godmlldyk7CisKKyAgICAgICAgICAgIGlmIChzb3J0RnVjdGlvbikK KyAgICAgICAgICAgICAgICB0aGlzLl9zZWFyY2hSZXN1bHRzLnNvcnQoc29ydEZ1Y3Rpb24pOwor CisgICAgICAgICAgICBpZiAodGhpcy5zZWFyY2hNYXRjaEZvdW5kKQorICAgICAgICAgICAgICAg IHRoaXMuc2VhcmNoTWF0Y2hGb3VuZCh2aWV3LCBzZWFyY2hNYXRjaGVzKTsKKworICAgICAgICAg ICAgdXBkYXRlTWF0Y2hlc0NvdW50U29vbi5jYWxsKHRoaXMpOworCisgICAgICAgICAgICBpZiAo dmlldyA9PT0gdmlzaWJsZVZpZXcpCisgICAgICAgICAgICAgICAgdmlldy5qdW1wVG9GaXJzdFNl YXJjaFJlc3VsdCgpOworICAgICAgICB9CisKKyAgICAgICAgdmFyIGkgPSAwOworICAgICAgICB2 YXIgcGFuZWwgPSB0aGlzOworICAgICAgICB2YXIgYm91bmRGaW5pc2hlZENhbGxiYWNrID0gZmlu aXNoZWRDYWxsYmFjay5iaW5kKHRoaXMpOworICAgICAgICB2YXIgY2h1bmtJbnRlcnZhbElkZW50 aWZpZXIgPSBudWxsOworCisgICAgICAgIC8vIFNwbGl0IHVwIHRoZSB3b3JrIGludG8gY2h1bmtz IHNvIHdlIGRvbid0IGJsb2NrIHRoZQorICAgICAgICAvLyBVSSB0aHJlYWQgd2hpbGUgcHJvY2Vz c2luZy4KKworICAgICAgICBmdW5jdGlvbiBwcm9jZXNzQ2h1bmsoKQorICAgICAgICB7CisgICAg ICAgICAgICB2YXIgdmlldyA9IHNlYXJjaGFibGVWaWV3c1tpXTsKKworICAgICAgICAgICAgaWYg KCsraSA+PSBzZWFyY2hhYmxlVmlld3MubGVuZ3RoKSB7CisgICAgICAgICAgICAgICAgaWYgKHBh bmVsLl9jdXJyZW50U2VhcmNoQ2h1bmtJbnRlcnZhbElkZW50aWZpZXIgPT09IGNodW5rSW50ZXJ2 YWxJZGVudGlmaWVyKQorICAgICAgICAgICAgICAgICAgICBkZWxldGUgcGFuZWwuX2N1cnJlbnRT ZWFyY2hDaHVua0ludGVydmFsSWRlbnRpZmllcjsKKyAgICAgICAgICAgICAgICBjbGVhckludGVy dmFsKGNodW5rSW50ZXJ2YWxJZGVudGlmaWVyKTsKKyAgICAgICAgICAgIH0KKworICAgICAgICAg ICAgaWYgKCF2aWV3KQorICAgICAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICAgICAgdmll dy5jdXJyZW50UXVlcnkgPSBxdWVyeTsKKyAgICAgICAgICAgIHZpZXcucGVyZm9ybVNlYXJjaChx dWVyeSwgYm91bmRGaW5pc2hlZENhbGxiYWNrKTsKKyAgICAgICAgfQorCisgICAgICAgIHByb2Nl c3NDaHVuaygpOworCisgICAgICAgIGNodW5rSW50ZXJ2YWxJZGVudGlmaWVyID0gc2V0SW50ZXJ2 YWwocHJvY2Vzc0NodW5rLCAyNSk7CisgICAgICAgIHRoaXMuX2N1cnJlbnRTZWFyY2hDaHVua0lu dGVydmFsSWRlbnRpZmllciA9IGNodW5rSW50ZXJ2YWxJZGVudGlmaWVyOworICAgIH0sCisKKyAg ICBqdW1wVG9OZXh0U2VhcmNoUmVzdWx0OiBmdW5jdGlvbigpCisgICAgeworICAgICAgICBpZiAo IXRoaXMuc2hvd1ZpZXcgfHwgIXRoaXMuX3NlYXJjaFJlc3VsdHMgfHwgIXRoaXMuX3NlYXJjaFJl c3VsdHMubGVuZ3RoKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIHZhciBzaG93Rmly c3RSZXN1bHQgPSBmYWxzZTsKKworICAgICAgICB0aGlzLl9jdXJyZW50U2VhcmNoUmVzdWx0SW5k ZXggPSB0aGlzLl9zZWFyY2hSZXN1bHRzLmluZGV4T2YodGhpcy52aXNpYmxlVmlldyk7CisgICAg ICAgIGlmICh0aGlzLl9jdXJyZW50U2VhcmNoUmVzdWx0SW5kZXggPT09IC0xKSB7CisgICAgICAg ICAgICB0aGlzLl9jdXJyZW50U2VhcmNoUmVzdWx0SW5kZXggPSAwOworICAgICAgICAgICAgc2hv d0ZpcnN0UmVzdWx0ID0gdHJ1ZTsKKyAgICAgICAgfQorCisgICAgICAgIHZhciBjdXJyZW50Vmll dyA9IHRoaXMuX3NlYXJjaFJlc3VsdHNbdGhpcy5fY3VycmVudFNlYXJjaFJlc3VsdEluZGV4XTsK KworICAgICAgICBpZiAoY3VycmVudFZpZXcuc2hvd2luZ0xhc3RTZWFyY2hSZXN1bHQoKSkgewor ICAgICAgICAgICAgaWYgKCsrdGhpcy5fY3VycmVudFNlYXJjaFJlc3VsdEluZGV4ID49IHRoaXMu X3NlYXJjaFJlc3VsdHMubGVuZ3RoKQorICAgICAgICAgICAgICAgIHRoaXMuX2N1cnJlbnRTZWFy Y2hSZXN1bHRJbmRleCA9IDA7CisgICAgICAgICAgICBjdXJyZW50VmlldyA9IHRoaXMuX3NlYXJj aFJlc3VsdHNbdGhpcy5fY3VycmVudFNlYXJjaFJlc3VsdEluZGV4XTsKKyAgICAgICAgICAgIHNo b3dGaXJzdFJlc3VsdCA9IHRydWU7CisgICAgICAgIH0KKworICAgICAgICBpZiAoY3VycmVudFZp ZXcgIT09IHRoaXMudmlzaWJsZVZpZXcpIHsKKyAgICAgICAgICAgIHRoaXMuc2hvd1ZpZXcoY3Vy cmVudFZpZXcpOworICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnNlYXJjaENvbnRyb2xsZXIuZm9j dXNTZWFyY2hGaWVsZCgpOworICAgICAgICB9CisKKyAgICAgICAgaWYgKHNob3dGaXJzdFJlc3Vs dCkKKyAgICAgICAgICAgIGN1cnJlbnRWaWV3Lmp1bXBUb0ZpcnN0U2VhcmNoUmVzdWx0KCk7Cisg ICAgICAgIGVsc2UKKyAgICAgICAgICAgIGN1cnJlbnRWaWV3Lmp1bXBUb05leHRTZWFyY2hSZXN1 bHQoKTsKKyAgICB9LAorCisgICAganVtcFRvUHJldmlvdXNTZWFyY2hSZXN1bHQ6IGZ1bmN0aW9u KCkKKyAgICB7CisgICAgICAgIGlmICghdGhpcy5zaG93VmlldyB8fCAhdGhpcy5fc2VhcmNoUmVz dWx0cyB8fCAhdGhpcy5fc2VhcmNoUmVzdWx0cy5sZW5ndGgpCisgICAgICAgICAgICByZXR1cm47 CisKKyAgICAgICAgdmFyIHNob3dMYXN0UmVzdWx0ID0gZmFsc2U7CisKKyAgICAgICAgdGhpcy5f Y3VycmVudFNlYXJjaFJlc3VsdEluZGV4ID0gdGhpcy5fc2VhcmNoUmVzdWx0cy5pbmRleE9mKHRo aXMudmlzaWJsZVZpZXcpOworICAgICAgICBpZiAodGhpcy5fY3VycmVudFNlYXJjaFJlc3VsdElu ZGV4ID09PSAtMSkgeworICAgICAgICAgICAgdGhpcy5fY3VycmVudFNlYXJjaFJlc3VsdEluZGV4 ID0gMDsKKyAgICAgICAgICAgIHNob3dMYXN0UmVzdWx0ID0gdHJ1ZTsKKyAgICAgICAgfQorCisg ICAgICAgIHZhciBjdXJyZW50VmlldyA9IHRoaXMuX3NlYXJjaFJlc3VsdHNbdGhpcy5fY3VycmVu dFNlYXJjaFJlc3VsdEluZGV4XTsKKworICAgICAgICBpZiAoY3VycmVudFZpZXcuc2hvd2luZ0Zp cnN0U2VhcmNoUmVzdWx0KCkpIHsKKyAgICAgICAgICAgIGlmICgtLXRoaXMuX2N1cnJlbnRTZWFy Y2hSZXN1bHRJbmRleCA8IDApCisgICAgICAgICAgICAgICAgdGhpcy5fY3VycmVudFNlYXJjaFJl c3VsdEluZGV4ID0gKHRoaXMuX3NlYXJjaFJlc3VsdHMubGVuZ3RoIC0gMSk7CisgICAgICAgICAg ICBjdXJyZW50VmlldyA9IHRoaXMuX3NlYXJjaFJlc3VsdHNbdGhpcy5fY3VycmVudFNlYXJjaFJl c3VsdEluZGV4XTsKKyAgICAgICAgICAgIHNob3dMYXN0UmVzdWx0ID0gdHJ1ZTsKKyAgICAgICAg fQorCisgICAgICAgIGlmIChjdXJyZW50VmlldyAhPT0gdGhpcy52aXNpYmxlVmlldykgeworICAg ICAgICAgICAgdGhpcy5zaG93VmlldyhjdXJyZW50Vmlldyk7CisgICAgICAgICAgICBXZWJJbnNw ZWN0b3Iuc2VhcmNoQ29udHJvbGxlci5mb2N1c1NlYXJjaEZpZWxkKCk7CisgICAgICAgIH0KKwor ICAgICAgICBpZiAoc2hvd0xhc3RSZXN1bHQpCisgICAgICAgICAgICBjdXJyZW50Vmlldy5qdW1w VG9MYXN0U2VhcmNoUmVzdWx0KCk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIGN1cnJlbnRW aWV3Lmp1bXBUb1ByZXZpb3VzU2VhcmNoUmVzdWx0KCk7CisgICAgfSwKKworICAgIF9zZWFyY2hh YmxlVmlld3M6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIHZhciB2aWV3cyA9IFtdOwogCkBA IC01NjMsOSArNzA4LDI3IEBAIFdlYkluc3BlY3Rvci5Qcm9maWxlc1BhbmVsLnByb3RvdHlwZSA9 IHsKICAgICAgICAgdmlldy5wcm9maWxlLl9wcm9maWxlc1RyZWVFbGVtZW50LnNlYXJjaE1hdGNo ZXMgPSBtYXRjaGVzOwogICAgIH0sCiAKLSAgICBzZWFyY2hDYW5jZWxlZDogZnVuY3Rpb24oc3Rh cnRpbmdOZXdTZWFyY2gpCisgICAgc2VhcmNoQ2FuY2VsZWQ6IGZ1bmN0aW9uKCkKICAgICB7Ci0g ICAgICAgIFdlYkluc3BlY3Rvci5QYW5lbC5wcm90b3R5cGUuc2VhcmNoQ2FuY2VsZWQuY2FsbCh0 aGlzLCBzdGFydGluZ05ld1NlYXJjaCk7CisgICAgICAgIGlmICh0aGlzLl9zZWFyY2hSZXN1bHRz KSB7CisgICAgICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHRoaXMuX3NlYXJjaFJlc3VsdHMu bGVuZ3RoOyArK2kpIHsKKyAgICAgICAgICAgICAgICB2YXIgdmlldyA9IHRoaXMuX3NlYXJjaFJl c3VsdHNbaV07CisgICAgICAgICAgICAgICAgaWYgKHZpZXcuc2VhcmNoQ2FuY2VsZWQpCisgICAg ICAgICAgICAgICAgICAgIHZpZXcuc2VhcmNoQ2FuY2VsZWQoKTsKKyAgICAgICAgICAgICAgICBk ZWxldGUgdmlldy5jdXJyZW50UXVlcnk7CisgICAgICAgICAgICB9CisgICAgICAgIH0KKworICAg ICAgICBXZWJJbnNwZWN0b3IuUGFuZWwucHJvdG90eXBlLnNlYXJjaENhbmNlbGVkLmNhbGwodGhp cyk7CisKKyAgICAgICAgaWYgKHRoaXMuX2N1cnJlbnRTZWFyY2hDaHVua0ludGVydmFsSWRlbnRp ZmllcikgeworICAgICAgICAgICAgY2xlYXJJbnRlcnZhbCh0aGlzLl9jdXJyZW50U2VhcmNoQ2h1 bmtJbnRlcnZhbElkZW50aWZpZXIpOworICAgICAgICAgICAgZGVsZXRlIHRoaXMuX2N1cnJlbnRT ZWFyY2hDaHVua0ludGVydmFsSWRlbnRpZmllcjsKKyAgICAgICAgfQorCisgICAgICAgIHRoaXMu X3RvdGFsU2VhcmNoTWF0Y2hlcyA9IDA7CisgICAgICAgIHRoaXMuX2N1cnJlbnRTZWFyY2hSZXN1 bHRJbmRleCA9IDA7CisgICAgICAgIHRoaXMuX3NlYXJjaFJlc3VsdHMgPSBbXTsKIAogICAgICAg ICBpZiAoIXRoaXMuX3Byb2ZpbGVzKQogICAgICAgICAgICAgcmV0dXJuOwo=