26604 2009-06-22 04:24:23 -0700 Search doesn't work in Web Inspector Profiler 2009-06-24 18:53:01 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 mnaganov webkit-unassigned kmccullough timothy tolmasky oldest_to_newest 127337 0 mnaganov 2009-06-22 04:24:23 -0700 To reproduce: - create a profiler report; - try to search something existing using the "Search Profiles" input box, e.g. search for a "(program)"; - Inspector will show matches count, but will not allow you to jump to the next result; - now try to search something non-existing, e.g. "not here"; - Inspector will show the same matches count, and also will not jump to the next result. Tested on nightly revision 44932. 127339 1 31644 mnaganov 2009-06-22 04:51:13 -0700 Created attachment 31644 Proposed patch 127775 2 31644 eric 2009-06-23 17:56:47 -0700 Comment on attachment 31644 Proposed patch Tabs in your ChangeLog. Tim is the man to review this I think. 127838 3 31771 mnaganov 2009-06-24 00:14:17 -0700 Created attachment 31771 Proposed patch, replaced tabs with spaces in ChangeLog 128069 4 eric 2009-06-24 18:53:01 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/inspector/front-end/ProfileView.js Committed r45131 http://trac.webkit.org/changeset/45131 31644 2009-06-22 04:51:13 -0700 2009-06-24 00:14:17 -0700 Proposed patch search-patch.txt text/plain 5792 mnaganov SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NDkzMikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjUgQEAKKzIwMDktMDYtMjIgIE1pa2hhaWwgTmFnYW5vdiAgPG1uYWdhbm92QGNo cm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworCUJ1 ZyAyNjYwNDogU2VhcmNoIGRvZXNuJ3Qgd29yayBpbiBXZWIgSW5zcGVjdG9yIFByb2ZpbGVyCisJ aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI2NjA0CisKKwlTZWVtcyBs aWtlIHNlYXJjaCB3YXMgZGFtYWdlZCBpbiByZXZpc2lvbiA0MjgwOC4KKworICAgICAgICAqIGlu c3BlY3Rvci9mcm9udC1lbmQvUHJvZmlsZVZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu UHJvZmlsZVZpZXcucHJvdG90eXBlLnJlZnJlc2gpOgorCUhlcmUgYW5kIGluIG90aGVyIGZ1bmN0 aW9uczogbm9kZXMgd2UncmUgc2VhcmNoaW5nIGluIGFyZSBwcm9maWxlIGRhdGEgZ3JpZAorCW5v ZGVzLCBzbyB0aGVyZSBpcyBubyBtb3JlIG5lZWQgZm9yICdfZGF0YUdyaWROb2RlJyByZWZlcmVu Y2VzLgorICAgICAgICAoV2ViSW5zcGVjdG9yLlByb2ZpbGVWaWV3LnByb3RvdHlwZS5zZWFyY2hD YW5jZWxlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUHJvZmlsZVZpZXcucHJvdG90eXBlLnBl cmZvcm1TZWFyY2gubWF0Y2hlc1F1ZXJ5KToKKwlGaXhlZCBhY2NpZGVudGFsIHNlbWljb2xvbiB0 aGF0IGNhdXNlZCAnbWF0Y2hlc1F1ZXJ5JyBhbHdheXMgcmV0dXJuIHRydWUuCisgICAgICAgIChX ZWJJbnNwZWN0b3IuUHJvZmlsZVZpZXcucHJvdG90eXBlLnBlcmZvcm1TZWFyY2gpOgorCVRvIHBl cmZvcm0gc2VhcmNoIGNvcnJlY3RseSBpbiB0aGUgY2FzZSBvZiBib3R0b20gdXAgdHJlZSwgd2Ug bmVlZCB0byBwb3B1bGF0ZQorCXRoZSB0cmVlLCBiZWNhdXNlIHRoZXJlJ3Mgbm8gMS10by0xIGNv cnJlc3BvbmRlbmNlIGJldHdlZW4gcHJvZmlsZSBub2RlcyBhbmQKKwlkYXRhIGdyaWQgbm9kZXMg aW4gdGhpcyBjYXNlLgorICAgICAgICAoV2ViSW5zcGVjdG9yLlByb2ZpbGVWaWV3LnByb3RvdHlw ZS5fanVtcFRvU2VhcmNoUmVzdWx0KToKKwogMjAwOS0wNi0yMSAgRGFyaW4gQWRsZXIgIDxkYXJp bkBhcHBsZS5jb20+CgogICAgICAgICBSZXZpZXdlZCBieSBTYW0gV2VpbmlnLgpJbmRleDogV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Byb2ZpbGVWaWV3LmpzCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9maWxlVmlldy5qcwkocmV2aXNpb24gNDQ5MzIp CisrKyBXZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUHJvZmlsZVZpZXcuanMJKHdvcmtpbmcg Y29weSkKQEAgLTE2Niw4ICsxNjYsOCBAQCBXZWJJbnNwZWN0b3IuUHJvZmlsZVZpZXcucHJvdG90 eXBlID0gewogICAgICAgICBmb3IgKHZhciBpbmRleCA9IDA7IGluZGV4IDwgY291bnQ7ICsraW5k ZXgpCiAgICAgICAgICAgICB0aGlzLmRhdGFHcmlkLmFwcGVuZENoaWxkKGNoaWxkcmVuW2luZGV4 XSk7CgotICAgICAgICBpZiAoc2VsZWN0ZWRQcm9maWxlTm9kZSAmJiBzZWxlY3RlZFByb2ZpbGVO b2RlLl9kYXRhR3JpZE5vZGUpCi0gICAgICAgICAgICBzZWxlY3RlZFByb2ZpbGVOb2RlLl9kYXRh R3JpZE5vZGUuc2VsZWN0ZWQgPSB0cnVlOworICAgICAgICBpZiAoc2VsZWN0ZWRQcm9maWxlTm9k ZSkKKyAgICAgICAgICAgIHNlbGVjdGVkUHJvZmlsZU5vZGUuc2VsZWN0ZWQgPSB0cnVlOwogICAg IH0sCgogICAgIHJlZnJlc2hWaXNpYmxlRGF0YTogZnVuY3Rpb24oKQpAQCAtMTk2LDggKzE5Niw3 IEBAIFdlYkluc3BlY3Rvci5Qcm9maWxlVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAg ICAgZGVsZXRlIHByb2ZpbGVOb2RlLl9zZWFyY2hNYXRjaGVkQ2FsbHNDb2x1bW47CiAgICAgICAg ICAgICAgICAgZGVsZXRlIHByb2ZpbGVOb2RlLl9zZWFyY2hNYXRjaGVkRnVuY3Rpb25Db2x1bW47 CgotICAgICAgICAgICAgICAgIGlmIChwcm9maWxlTm9kZS5fZGF0YUdyaWROb2RlKQotICAgICAg ICAgICAgICAgICAgICBwcm9maWxlTm9kZS5fZGF0YUdyaWROb2RlLnJlZnJlc2goKTsKKyAgICAg ICAgICAgICAgICBwcm9maWxlTm9kZS5yZWZyZXNoKCk7CiAgICAgICAgICAgICB9CiAgICAgICAg IH0KCkBAIC0zMTMsNyArMzEyLDcgQEAgV2ViSW5zcGVjdG9yLlByb2ZpbGVWaWV3LnByb3RvdHlw ZSA9IHsKICAgICAgICAgICAgICAgICBwcm9maWxlRGF0YUdyaWROb2RlLl9zZWFyY2hNYXRjaGVk VG90YWxDb2x1bW4gfHwKICAgICAgICAgICAgICAgICBwcm9maWxlRGF0YUdyaWROb2RlLl9zZWFy Y2hNYXRjaGVkQXZlcmFnZUNvbHVtbiB8fAogICAgICAgICAgICAgICAgIHByb2ZpbGVEYXRhR3Jp ZE5vZGUuX3NlYXJjaE1hdGNoZWRDYWxsc0NvbHVtbiB8fAotICAgICAgICAgICAgICAgIHByb2Zp bGVEYXRhR3JpZE5vZGUuX3NlYXJjaE1hdGNoZWRGdW5jdGlvbkNvbHVtbik7CisgICAgICAgICAg ICAgICAgcHJvZmlsZURhdGFHcmlkTm9kZS5fc2VhcmNoTWF0Y2hlZEZ1bmN0aW9uQ29sdW1uKQog ICAgICAgICAgICAgewogICAgICAgICAgICAgICAgIHByb2ZpbGVEYXRhR3JpZE5vZGUucmVmcmVz aCgpOwogICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOwpAQCAtMzIyLDQ4ICszMjEsMTQgQEAg V2ViSW5zcGVjdG9yLlByb2ZpbGVWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHJldHVy biBmYWxzZTsKICAgICAgICAgfQoKLSAgICAgICAgdmFyIGN1cnJlbnQgPSB0aGlzLmRhdGFHcmlk OwotICAgICAgICB2YXIgYW5jZXN0b3JzID0gW107Ci0gICAgICAgIHZhciBuZXh0SW5kZXhlcyA9 IFtdOwotICAgICAgICB2YXIgc3RhcnRJbmRleCA9IDA7CisgICAgICAgIHZhciBjdXJyZW50ID0g dGhpcy5wcm9maWxlRGF0YUdyaWRUcmVlLmNoaWxkcmVuWzBdOwoKICAgICAgICAgd2hpbGUgKGN1 cnJlbnQpIHsKLSAgICAgICAgICAgIHZhciBjaGlsZHJlbiA9IGN1cnJlbnQuY2hpbGRyZW47Ci0g ICAgICAgICAgICB2YXIgY2hpbGRyZW5MZW5ndGggPSBjaGlsZHJlbi5sZW5ndGg7Ci0KLSAgICAg ICAgICAgIGlmIChzdGFydEluZGV4ID49IGNoaWxkcmVuTGVuZ3RoKSB7Ci0gICAgICAgICAgICAg ICAgY3VycmVudCA9IGFuY2VzdG9ycy5wb3AoKTsKLSAgICAgICAgICAgICAgICBzdGFydEluZGV4 ID0gbmV4dEluZGV4ZXMucG9wKCk7Ci0gICAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAg ICAgICBpZiAobWF0Y2hlc1F1ZXJ5KGN1cnJlbnQpKSB7CisgICAgICAgICAgICAgICAgdGhpcy5f c2VhcmNoUmVzdWx0cy5wdXNoKHsgcHJvZmlsZU5vZGU6IGN1cnJlbnQgfSk7CiAgICAgICAgICAg ICB9CgotICAgICAgICAgICAgZm9yICh2YXIgaSA9IHN0YXJ0SW5kZXg7IGkgPCBjaGlsZHJlbkxl bmd0aDsgKytpKSB7Ci0gICAgICAgICAgICAgICAgdmFyIGNoaWxkID0gY2hpbGRyZW5baV07Ci0K LSAgICAgICAgICAgICAgICBpZiAobWF0Y2hlc1F1ZXJ5KGNoaWxkKSkgewotICAgICAgICAgICAg ICAgICAgICBpZiAoY2hpbGQuX2RhdGFHcmlkTm9kZSkgewotICAgICAgICAgICAgICAgICAgICAg ICAgLy8gVGhlIGNoaWxkIGhhcyBhIGRhdGEgZ3JpZCBub2RlIGFscmVhZHksIG5vIG5lZWQgdG8g cmVtZW1iZXIgdGhlIGFuY2VzdG9ycy4KLSAgICAgICAgICAgICAgICAgICAgICAgIHRoaXMuX3Nl YXJjaFJlc3VsdHMucHVzaCh7IHByb2ZpbGVOb2RlOiBjaGlsZCB9KTsKLSAgICAgICAgICAgICAg ICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgICAgICAgICAgICAgIHZhciBhbmNlc3RvcnNDb3B5 ID0gW10uY29uY2F0KGFuY2VzdG9ycyk7Ci0gICAgICAgICAgICAgICAgICAgICAgICBhbmNlc3Rv cnNDb3B5LnB1c2goY3VycmVudCk7Ci0gICAgICAgICAgICAgICAgICAgICAgICB0aGlzLl9zZWFy Y2hSZXN1bHRzLnB1c2goeyBwcm9maWxlTm9kZTogY2hpbGQsIGFuY2VzdG9yczogYW5jZXN0b3Jz Q29weSB9KTsKLSAgICAgICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgIH0KLQotICAg ICAgICAgICAgICAgIGlmIChjaGlsZC5jaGlsZHJlbi5sZW5ndGgpIHsKLSAgICAgICAgICAgICAg ICAgICAgYW5jZXN0b3JzLnB1c2goY3VycmVudCk7Ci0gICAgICAgICAgICAgICAgICAgIG5leHRJ bmRleGVzLnB1c2goaSArIDEpOwotICAgICAgICAgICAgICAgICAgICBjdXJyZW50ID0gY2hpbGQ7 Ci0gICAgICAgICAgICAgICAgICAgIHN0YXJ0SW5kZXggPSAwOwotICAgICAgICAgICAgICAgICAg ICBicmVhazsKLSAgICAgICAgICAgICAgICB9Ci0KLSAgICAgICAgICAgICAgICBpZiAoaSA9PT0g KGNoaWxkcmVuTGVuZ3RoIC0gMSkpIHsKLSAgICAgICAgICAgICAgICAgICAgY3VycmVudCA9IGFu Y2VzdG9ycy5wb3AoKTsKLSAgICAgICAgICAgICAgICAgICAgc3RhcnRJbmRleCA9IG5leHRJbmRl eGVzLnBvcCgpOwotICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIH0KKyAgICAgICAgICAg IGN1cnJlbnQgPSBjdXJyZW50LnRyYXZlcnNlTmV4dE5vZGUoZmFsc2UsIG51bGwsIGZhbHNlKTsK ICAgICAgICAgfQoKICAgICAgICAgZmluaXNoZWRDYWxsYmFjayh0aGlzLCB0aGlzLl9zZWFyY2hS ZXN1bHRzLmxlbmd0aCk7CkBAIC00MTksMjYgKzM4NCw5IEBAIFdlYkluc3BlY3Rvci5Qcm9maWxl Vmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgIGlmICghc2VhcmNoUmVzdWx0KQogICAgICAgICAg ICAgcmV0dXJuOwoKLSAgICAgICAgdmFyIHByb2ZpbGVOb2RlID0gdGhpcy5fc2VhcmNoUmVzdWx0 c1tpbmRleF0ucHJvZmlsZU5vZGU7Ci0gICAgICAgIGlmICghcHJvZmlsZU5vZGUuX2RhdGFHcmlk Tm9kZSAmJiBzZWFyY2hSZXN1bHQuYW5jZXN0b3JzKSB7Ci0gICAgICAgICAgICB2YXIgYW5jZXN0 b3JzID0gc2VhcmNoUmVzdWx0LmFuY2VzdG9yczsKLSAgICAgICAgICAgIGZvciAodmFyIGkgPSAw OyBpIDwgYW5jZXN0b3JzLmxlbmd0aDsgKytpKSB7Ci0gICAgICAgICAgICAgICAgdmFyIGFuY2Vz dG9yUHJvZmlsZU5vZGUgPSBhbmNlc3RvcnNbaV07Ci0gICAgICAgICAgICAgICAgdmFyIGdyaWRO b2RlID0gYW5jZXN0b3JQcm9maWxlTm9kZS5fZGF0YUdyaWROb2RlOwotICAgICAgICAgICAgICAg IGlmIChncmlkTm9kZSkKLSAgICAgICAgICAgICAgICAgICAgZ3JpZE5vZGUuZXhwYW5kKCk7Ci0g ICAgICAgICAgICB9Ci0KLSAgICAgICAgICAgIC8vIE5vIG5lZWQgdG8ga2VlcCB0aGUgYW5jZXN0 b3JzIGFyb3VuZC4KLSAgICAgICAgICAgIGRlbGV0ZSBzZWFyY2hSZXN1bHQuYW5jZXN0b3JzOwot ICAgICAgICB9Ci0KLSAgICAgICAgZ3JpZE5vZGUgPSBwcm9maWxlTm9kZS5fZGF0YUdyaWROb2Rl OwotICAgICAgICBpZiAoIWdyaWROb2RlKQotICAgICAgICAgICAgcmV0dXJuOwotCi0gICAgICAg IGdyaWROb2RlLnJldmVhbCgpOwotICAgICAgICBncmlkTm9kZS5zZWxlY3QoKTsKKyAgICAgICAg dmFyIHByb2ZpbGVOb2RlID0gc2VhcmNoUmVzdWx0LnByb2ZpbGVOb2RlOworICAgICAgICBwcm9m aWxlTm9kZS5yZXZlYWwoKTsKKyAgICAgICAgcHJvZmlsZU5vZGUuc2VsZWN0KCk7CiAgICAgfSwK CiAgICAgX2NoYW5nZVZpZXc6IGZ1bmN0aW9uKGV2ZW50KQo= 31771 2009-06-24 00:14:17 -0700 2009-06-24 07:14:58 -0700 Proposed patch, replaced tabs with spaces in ChangeLog search-patch.txt text/plain 5855 mnaganov SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NDkzMikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjUgQEAKKzIwMDktMDYtMjIgIE1pa2hhaWwgTmFnYW5vdiAgPG1uYWdhbm92QGNo cm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBCdWcgMjY2MDQ6IFNlYXJjaCBkb2Vzbid0IHdvcmsgaW4gV2ViIEluc3BlY3RvciBQcm9m aWxlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjY2 MDQKKworICAgICAgICBTZWVtcyBsaWtlIHNlYXJjaCB3YXMgZGFtYWdlZCBpbiByZXZpc2lvbiA0 MjgwOC4KKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUHJvZmlsZVZpZXcuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuUHJvZmlsZVZpZXcucHJvdG90eXBlLnJlZnJlc2gpOgorICAg ICAgICBIZXJlIGFuZCBpbiBvdGhlciBmdW5jdGlvbnM6IG5vZGVzIHdlJ3JlIHNlYXJjaGluZyBp biBhcmUgcHJvZmlsZSBkYXRhIGdyaWQKKyAgICAgICAgbm9kZXMsIHNvIHRoZXJlIGlzIG5vIG1v cmUgbmVlZCBmb3IgJ19kYXRhR3JpZE5vZGUnIHJlZmVyZW5jZXMuCisgICAgICAgIChXZWJJbnNw ZWN0b3IuUHJvZmlsZVZpZXcucHJvdG90eXBlLnNlYXJjaENhbmNlbGVkKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5Qcm9maWxlVmlldy5wcm90b3R5cGUucGVyZm9ybVNlYXJjaC5tYXRjaGVzUXVl cnkpOgorICAgICAgICBGaXhlZCBhY2NpZGVudGFsIHNlbWljb2xvbiB0aGF0IGNhdXNlZCAnbWF0 Y2hlc1F1ZXJ5JyBhbHdheXMgcmV0dXJuIHRydWUuCisgICAgICAgIChXZWJJbnNwZWN0b3IuUHJv ZmlsZVZpZXcucHJvdG90eXBlLnBlcmZvcm1TZWFyY2gpOgorICAgICAgICBUbyBwZXJmb3JtIHNl YXJjaCBjb3JyZWN0bHkgaW4gdGhlIGNhc2Ugb2YgYm90dG9tIHVwIHRyZWUsIHdlIG5lZWQgdG8g cG9wdWxhdGUKKyAgICAgICAgdGhlIHRyZWUsIGJlY2F1c2UgdGhlcmUncyBubyAxLXRvLTEgY29y cmVzcG9uZGVuY2UgYmV0d2VlbiBwcm9maWxlIG5vZGVzIGFuZAorICAgICAgICBkYXRhIGdyaWQg bm9kZXMgaW4gdGhpcyBjYXNlLgorICAgICAgICAoV2ViSW5zcGVjdG9yLlByb2ZpbGVWaWV3LnBy b3RvdHlwZS5fanVtcFRvU2VhcmNoUmVzdWx0KToKKwogMjAwOS0wNi0yMSAgRGFyaW4gQWRsZXIg IDxkYXJpbkBhcHBsZS5jb20+CgogICAgICAgICBSZXZpZXdlZCBieSBTYW0gV2VpbmlnLgpJbmRl eDogV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Byb2ZpbGVWaWV3LmpzCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9maWxlVmlldy5qcwkocmV2aXNpb24g NDQ5MzIpCisrKyBXZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUHJvZmlsZVZpZXcuanMJKHdv cmtpbmcgY29weSkKQEAgLTE2Niw4ICsxNjYsOCBAQCBXZWJJbnNwZWN0b3IuUHJvZmlsZVZpZXcu cHJvdG90eXBlID0gewogICAgICAgICBmb3IgKHZhciBpbmRleCA9IDA7IGluZGV4IDwgY291bnQ7 ICsraW5kZXgpCiAgICAgICAgICAgICB0aGlzLmRhdGFHcmlkLmFwcGVuZENoaWxkKGNoaWxkcmVu W2luZGV4XSk7CgotICAgICAgICBpZiAoc2VsZWN0ZWRQcm9maWxlTm9kZSAmJiBzZWxlY3RlZFBy b2ZpbGVOb2RlLl9kYXRhR3JpZE5vZGUpCi0gICAgICAgICAgICBzZWxlY3RlZFByb2ZpbGVOb2Rl Ll9kYXRhR3JpZE5vZGUuc2VsZWN0ZWQgPSB0cnVlOworICAgICAgICBpZiAoc2VsZWN0ZWRQcm9m aWxlTm9kZSkKKyAgICAgICAgICAgIHNlbGVjdGVkUHJvZmlsZU5vZGUuc2VsZWN0ZWQgPSB0cnVl OwogICAgIH0sCgogICAgIHJlZnJlc2hWaXNpYmxlRGF0YTogZnVuY3Rpb24oKQpAQCAtMTk2LDgg KzE5Niw3IEBAIFdlYkluc3BlY3Rvci5Qcm9maWxlVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAg ICAgICAgICAgZGVsZXRlIHByb2ZpbGVOb2RlLl9zZWFyY2hNYXRjaGVkQ2FsbHNDb2x1bW47CiAg ICAgICAgICAgICAgICAgZGVsZXRlIHByb2ZpbGVOb2RlLl9zZWFyY2hNYXRjaGVkRnVuY3Rpb25D b2x1bW47CgotICAgICAgICAgICAgICAgIGlmIChwcm9maWxlTm9kZS5fZGF0YUdyaWROb2RlKQot ICAgICAgICAgICAgICAgICAgICBwcm9maWxlTm9kZS5fZGF0YUdyaWROb2RlLnJlZnJlc2goKTsK KyAgICAgICAgICAgICAgICBwcm9maWxlTm9kZS5yZWZyZXNoKCk7CiAgICAgICAgICAgICB9CiAg ICAgICAgIH0KCkBAIC0zMTMsNyArMzEyLDcgQEAgV2ViSW5zcGVjdG9yLlByb2ZpbGVWaWV3LnBy b3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICBwcm9maWxlRGF0YUdyaWROb2RlLl9zZWFyY2hN YXRjaGVkVG90YWxDb2x1bW4gfHwKICAgICAgICAgICAgICAgICBwcm9maWxlRGF0YUdyaWROb2Rl Ll9zZWFyY2hNYXRjaGVkQXZlcmFnZUNvbHVtbiB8fAogICAgICAgICAgICAgICAgIHByb2ZpbGVE YXRhR3JpZE5vZGUuX3NlYXJjaE1hdGNoZWRDYWxsc0NvbHVtbiB8fAotICAgICAgICAgICAgICAg IHByb2ZpbGVEYXRhR3JpZE5vZGUuX3NlYXJjaE1hdGNoZWRGdW5jdGlvbkNvbHVtbik7CisgICAg ICAgICAgICAgICAgcHJvZmlsZURhdGFHcmlkTm9kZS5fc2VhcmNoTWF0Y2hlZEZ1bmN0aW9uQ29s dW1uKQogICAgICAgICAgICAgewogICAgICAgICAgICAgICAgIHByb2ZpbGVEYXRhR3JpZE5vZGUu cmVmcmVzaCgpOwogICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOwpAQCAtMzIyLDQ4ICszMjEs MTQgQEAgV2ViSW5zcGVjdG9yLlByb2ZpbGVWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAg IHJldHVybiBmYWxzZTsKICAgICAgICAgfQoKLSAgICAgICAgdmFyIGN1cnJlbnQgPSB0aGlzLmRh dGFHcmlkOwotICAgICAgICB2YXIgYW5jZXN0b3JzID0gW107Ci0gICAgICAgIHZhciBuZXh0SW5k ZXhlcyA9IFtdOwotICAgICAgICB2YXIgc3RhcnRJbmRleCA9IDA7CisgICAgICAgIHZhciBjdXJy ZW50ID0gdGhpcy5wcm9maWxlRGF0YUdyaWRUcmVlLmNoaWxkcmVuWzBdOwoKICAgICAgICAgd2hp bGUgKGN1cnJlbnQpIHsKLSAgICAgICAgICAgIHZhciBjaGlsZHJlbiA9IGN1cnJlbnQuY2hpbGRy ZW47Ci0gICAgICAgICAgICB2YXIgY2hpbGRyZW5MZW5ndGggPSBjaGlsZHJlbi5sZW5ndGg7Ci0K LSAgICAgICAgICAgIGlmIChzdGFydEluZGV4ID49IGNoaWxkcmVuTGVuZ3RoKSB7Ci0gICAgICAg ICAgICAgICAgY3VycmVudCA9IGFuY2VzdG9ycy5wb3AoKTsKLSAgICAgICAgICAgICAgICBzdGFy dEluZGV4ID0gbmV4dEluZGV4ZXMucG9wKCk7Ci0gICAgICAgICAgICAgICAgY29udGludWU7Cisg ICAgICAgICAgICBpZiAobWF0Y2hlc1F1ZXJ5KGN1cnJlbnQpKSB7CisgICAgICAgICAgICAgICAg dGhpcy5fc2VhcmNoUmVzdWx0cy5wdXNoKHsgcHJvZmlsZU5vZGU6IGN1cnJlbnQgfSk7CiAgICAg ICAgICAgICB9CgotICAgICAgICAgICAgZm9yICh2YXIgaSA9IHN0YXJ0SW5kZXg7IGkgPCBjaGls ZHJlbkxlbmd0aDsgKytpKSB7Ci0gICAgICAgICAgICAgICAgdmFyIGNoaWxkID0gY2hpbGRyZW5b aV07Ci0KLSAgICAgICAgICAgICAgICBpZiAobWF0Y2hlc1F1ZXJ5KGNoaWxkKSkgewotICAgICAg ICAgICAgICAgICAgICBpZiAoY2hpbGQuX2RhdGFHcmlkTm9kZSkgewotICAgICAgICAgICAgICAg ICAgICAgICAgLy8gVGhlIGNoaWxkIGhhcyBhIGRhdGEgZ3JpZCBub2RlIGFscmVhZHksIG5vIG5l ZWQgdG8gcmVtZW1iZXIgdGhlIGFuY2VzdG9ycy4KLSAgICAgICAgICAgICAgICAgICAgICAgIHRo aXMuX3NlYXJjaFJlc3VsdHMucHVzaCh7IHByb2ZpbGVOb2RlOiBjaGlsZCB9KTsKLSAgICAgICAg ICAgICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgICAgICAgICAgICAgIHZhciBhbmNlc3Rv cnNDb3B5ID0gW10uY29uY2F0KGFuY2VzdG9ycyk7Ci0gICAgICAgICAgICAgICAgICAgICAgICBh bmNlc3RvcnNDb3B5LnB1c2goY3VycmVudCk7Ci0gICAgICAgICAgICAgICAgICAgICAgICB0aGlz Ll9zZWFyY2hSZXN1bHRzLnB1c2goeyBwcm9maWxlTm9kZTogY2hpbGQsIGFuY2VzdG9yczogYW5j ZXN0b3JzQ29weSB9KTsKLSAgICAgICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgIH0K LQotICAgICAgICAgICAgICAgIGlmIChjaGlsZC5jaGlsZHJlbi5sZW5ndGgpIHsKLSAgICAgICAg ICAgICAgICAgICAgYW5jZXN0b3JzLnB1c2goY3VycmVudCk7Ci0gICAgICAgICAgICAgICAgICAg IG5leHRJbmRleGVzLnB1c2goaSArIDEpOwotICAgICAgICAgICAgICAgICAgICBjdXJyZW50ID0g Y2hpbGQ7Ci0gICAgICAgICAgICAgICAgICAgIHN0YXJ0SW5kZXggPSAwOwotICAgICAgICAgICAg ICAgICAgICBicmVhazsKLSAgICAgICAgICAgICAgICB9Ci0KLSAgICAgICAgICAgICAgICBpZiAo aSA9PT0gKGNoaWxkcmVuTGVuZ3RoIC0gMSkpIHsKLSAgICAgICAgICAgICAgICAgICAgY3VycmVu dCA9IGFuY2VzdG9ycy5wb3AoKTsKLSAgICAgICAgICAgICAgICAgICAgc3RhcnRJbmRleCA9IG5l eHRJbmRleGVzLnBvcCgpOwotICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIH0KKyAgICAg ICAgICAgIGN1cnJlbnQgPSBjdXJyZW50LnRyYXZlcnNlTmV4dE5vZGUoZmFsc2UsIG51bGwsIGZh bHNlKTsKICAgICAgICAgfQoKICAgICAgICAgZmluaXNoZWRDYWxsYmFjayh0aGlzLCB0aGlzLl9z ZWFyY2hSZXN1bHRzLmxlbmd0aCk7CkBAIC00MTksMjYgKzM4NCw5IEBAIFdlYkluc3BlY3Rvci5Q cm9maWxlVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgIGlmICghc2VhcmNoUmVzdWx0KQogICAg ICAgICAgICAgcmV0dXJuOwoKLSAgICAgICAgdmFyIHByb2ZpbGVOb2RlID0gdGhpcy5fc2VhcmNo UmVzdWx0c1tpbmRleF0ucHJvZmlsZU5vZGU7Ci0gICAgICAgIGlmICghcHJvZmlsZU5vZGUuX2Rh dGFHcmlkTm9kZSAmJiBzZWFyY2hSZXN1bHQuYW5jZXN0b3JzKSB7Ci0gICAgICAgICAgICB2YXIg YW5jZXN0b3JzID0gc2VhcmNoUmVzdWx0LmFuY2VzdG9yczsKLSAgICAgICAgICAgIGZvciAodmFy IGkgPSAwOyBpIDwgYW5jZXN0b3JzLmxlbmd0aDsgKytpKSB7Ci0gICAgICAgICAgICAgICAgdmFy IGFuY2VzdG9yUHJvZmlsZU5vZGUgPSBhbmNlc3RvcnNbaV07Ci0gICAgICAgICAgICAgICAgdmFy IGdyaWROb2RlID0gYW5jZXN0b3JQcm9maWxlTm9kZS5fZGF0YUdyaWROb2RlOwotICAgICAgICAg ICAgICAgIGlmIChncmlkTm9kZSkKLSAgICAgICAgICAgICAgICAgICAgZ3JpZE5vZGUuZXhwYW5k KCk7Ci0gICAgICAgICAgICB9Ci0KLSAgICAgICAgICAgIC8vIE5vIG5lZWQgdG8ga2VlcCB0aGUg YW5jZXN0b3JzIGFyb3VuZC4KLSAgICAgICAgICAgIGRlbGV0ZSBzZWFyY2hSZXN1bHQuYW5jZXN0 b3JzOwotICAgICAgICB9Ci0KLSAgICAgICAgZ3JpZE5vZGUgPSBwcm9maWxlTm9kZS5fZGF0YUdy aWROb2RlOwotICAgICAgICBpZiAoIWdyaWROb2RlKQotICAgICAgICAgICAgcmV0dXJuOwotCi0g ICAgICAgIGdyaWROb2RlLnJldmVhbCgpOwotICAgICAgICBncmlkTm9kZS5zZWxlY3QoKTsKKyAg ICAgICAgdmFyIHByb2ZpbGVOb2RlID0gc2VhcmNoUmVzdWx0LnByb2ZpbGVOb2RlOworICAgICAg ICBwcm9maWxlTm9kZS5yZXZlYWwoKTsKKyAgICAgICAgcHJvZmlsZU5vZGUuc2VsZWN0KCk7CiAg ICAgfSwKCiAgICAgX2NoYW5nZVZpZXc6IGZ1bmN0aW9uKGV2ZW50KQo=