41068 2010-06-23 07:01:25 -0700 Web Inspector: do not reset profiles panel on navigation. 2010-06-23 09:17:26 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman webkit-unassigned bweinstein joepeck keishi mnaganov pfeldman pmuellr rik timothy yurys oldest_to_newest 241833 0 pfeldman 2010-06-23 07:01:25 -0700 There is a bug filed against Profiler that requires it to survive navigation. This is a front-end part support for this request. 241835 1 59511 pfeldman 2010-06-23 07:02:48 -0700 Created attachment 59511 [PATCH] Proposed change. 241871 2 59511 yurys 2010-06-23 09:03:22 -0700 Comment on attachment 59511 [PATCH] Proposed change. WebCore/inspector/front-end/inspector.js:1401 + WebInspector.panels.profiles.reset(); this should be _reset() 241875 3 59519 pfeldman 2010-06-23 09:05:49 -0700 Created attachment 59519 [PATCH] Proposed fix. 241882 4 pfeldman 2010-06-23 09:17:26 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/inspector/InspectorController.cpp M WebCore/inspector/InspectorFrontend.cpp M WebCore/inspector/InspectorFrontend.h M WebCore/inspector/front-end/ProfilesPanel.js M WebCore/inspector/front-end/inspector.js Committed r61691 59511 2010-06-23 07:02:48 -0700 2010-06-23 09:05:49 -0700 [PATCH] Proposed change. profiles_panel text/plain 4591 pfeldman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NmEwM2YwNC4uMWUxZDY3MyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNSBAQAorMjAxMC0wNi0yMyAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBkbyBub3QgcmVzZXQgcHJvZmlsZXMg cGFuZWwgb24gbmF2aWdhdGlvbi4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NDEwNjgKKworICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JDb250 cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXI6OmRpZENv bW1pdExvYWQpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JGcm9udGVuZDo6cmVzZXRQcm9maWxlc1BhbmVsKToK KyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmQuaDoKKyAgICAgICAgKiBpbnNw ZWN0b3IvZnJvbnQtZW5kL1Byb2ZpbGVzUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu UHJvZmlsZXNQYW5lbCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUHJvZmlsZXNQYW5lbC5wcm90 b3R5cGUucG9wdWxhdGVJbnRlcmZhY2UpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlByb2ZpbGVz UGFuZWwucHJvdG90eXBlLnByb2ZpbGVyV2FzRGlzYWJsZWQpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlByb2ZpbGVzUGFuZWwucHJvdG90eXBlLl9yZXNldCk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuUHJvZmlsZXNQYW5lbC5wcm90b3R5cGUuX2NsZWFyUHJvZmlsZXMpOgorICAgICAgICAqIGlu c3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLnJl c2V0UHJvZmlsZXNQYW5lbCk6CisKIDIwMTAtMDYtMjIgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJr aXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFkYW0gQmFydGguCmRpZmYgLS1naXQgYS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcCBiL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwCmluZGV4IDVlYWM5MzYuLjM4NTQxYjkgMTAwNjQ0 Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwCisrKyBiL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwCkBAIC03MjMsNiArNzIzLDgg QEAgdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpkaWRDb21taXRMb2FkKERvY3VtZW50TG9hZGVy KiBsb2FkZXIpCiAgICAgICAgIG1fcHJvZmlsZXMuY2xlYXIoKTsKICAgICAgICAgbV9jdXJyZW50 VXNlckluaXRpYXRlZFByb2ZpbGVOdW1iZXIgPSAxOwogICAgICAgICBtX25leHRVc2VySW5pdGlh dGVkUHJvZmlsZU51bWJlciA9IDE7CisgICAgICAgIGlmIChtX2Zyb250ZW5kKQorICAgICAgICAg ICAgbV9mcm9udGVuZC0+cmVzZXRQcm9maWxlc1BhbmVsKCk7CiAjZW5kaWYKICAgICAgICAgLy8g dW5iaW5kQWxsUmVzb3VyY2VzIHNob3VsZCBiZSBjYWxsZWQgYmVmb3JlIGRhdGFiYXNlIGFuZCBE T00gc3RvcmFnZQogICAgICAgICAvLyByZXNvdXJjZXMgYXJlIGNsZWFyZWQgc28gdGhhdCBpdCBo YXMgYSBjaGFuY2UgdG8gdW5iaW5kIHRoZW0uCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JGcm9udGVuZC5jcHAgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9u dGVuZC5jcHAKaW5kZXggMmYzNTQzNi4uMTk1YzUyNiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmQuY3BwCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3RvckZyb250ZW5kLmNwcApAQCAtMjM5LDYgKzIzOSwxMSBAQCB2b2lkIEluc3BlY3RvckZyb250 ZW5kOjpyZXNldCgpCiAgICAgY2FsbFNpbXBsZUZ1bmN0aW9uKCJyZXNldCIpOwogfQogCit2b2lk IEluc3BlY3RvckZyb250ZW5kOjpyZXNldFByb2ZpbGVzUGFuZWwoKQoreworICAgIGNhbGxTaW1w bGVGdW5jdGlvbigicmVzZXRQcm9maWxlc1BhbmVsIik7Cit9CisKIHZvaWQgSW5zcGVjdG9yRnJv bnRlbmQ6OmJyaW5nVG9Gcm9udCgpCiB7CiAgICAgY2FsbFNpbXBsZUZ1bmN0aW9uKCJicmluZ1Rv RnJvbnQiKTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5k LmggYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZC5oCmluZGV4IDYwOWQxNWQu LjUwMWU5MmUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5k LmgKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmQuaApAQCAtODEsNiAr ODEsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHZvaWQgc2hvd1BhbmVsKGludCBw YW5lbCk7CiAgICAgICAgIHZvaWQgcG9wdWxhdGVJbnRlcmZhY2UoKTsKICAgICAgICAgdm9pZCBy ZXNldCgpOworICAgICAgICB2b2lkIHJlc2V0UHJvZmlsZXNQYW5lbCgpOwogCiAgICAgICAgIHZv aWQgYnJpbmdUb0Zyb250KCk7CiAgICAgICAgIHZvaWQgaW5zcGVjdGVkVVJMQ2hhbmdlZChjb25z dCBTdHJpbmcmKTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9m aWxlc1BhbmVsLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Byb2ZpbGVzUGFuZWwu anMKaW5kZXggMTk4MGZhNS4uN2UzNDMwZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1Byb2ZpbGVzUGFuZWwuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1Byb2ZpbGVzUGFuZWwuanMKQEAgLTEyNCw3ICsxMjQsNyBAQCBXZWJJbnNwZWN0b3IuUHJv ZmlsZXNQYW5lbCA9IGZ1bmN0aW9uKCkKIAogICAgIHRoaXMuX3Byb2ZpbGVzID0gW107CiAgICAg dGhpcy5fcHJvZmlsZXJFbmFibGVkID0gUHJlZmVyZW5jZXMucHJvZmlsZXJBbHdheXNFbmFibGVk OwotICAgIHRoaXMucmVzZXQoKTsKKyAgICB0aGlzLl9yZXNldCgpOwogfQogCiBXZWJJbnNwZWN0 b3IuUHJvZmlsZXNQYW5lbC5wcm90b3R5cGUgPSB7CkBAIC0xNjcsNyArMTY3LDcgQEAgV2ViSW5z cGVjdG9yLlByb2ZpbGVzUGFuZWwucHJvdG90eXBlID0gewogCiAgICAgcG9wdWxhdGVJbnRlcmZh Y2U6IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIHRoaXMucmVzZXQoKTsKKyAgICAgICAgdGhp cy5fcmVzZXQoKTsKICAgICAgICAgaWYgKHRoaXMudmlzaWJsZSkKICAgICAgICAgICAgIHRoaXMu X3BvcHVsYXRlUHJvZmlsZXMoKTsKICAgICAgICAgZWxzZQpAQCAtMTg5LDEwICsxODksMTAgQEAg V2ViSW5zcGVjdG9yLlByb2ZpbGVzUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICAgICAgcmV0 dXJuOwogCiAgICAgICAgIHRoaXMuX3Byb2ZpbGVyRW5hYmxlZCA9IGZhbHNlOwotICAgICAgICB0 aGlzLnJlc2V0KCk7CisgICAgICAgIHRoaXMuX3Jlc2V0KCk7CiAgICAgfSwKIAotICAgIHJlc2V0 OiBmdW5jdGlvbigpCisgICAgX3Jlc2V0OiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICBmb3Ig KHZhciBpID0gMDsgaSA8IHRoaXMuX3Byb2ZpbGVzLmxlbmd0aDsgKytpKQogICAgICAgICAgICAg ZGVsZXRlIHRoaXMuX3Byb2ZpbGVzW2ldLl9wcm9maWxlVmlldzsKQEAgLTIyMiw3ICsyMjIsNyBA QCBXZWJJbnNwZWN0b3IuUHJvZmlsZXNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgX2NsZWFyUHJv ZmlsZXM6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIEluc3BlY3RvckJhY2tlbmQuY2xlYXJQ cm9maWxlcygpOwotICAgICAgICB0aGlzLnJlc2V0KCk7CisgICAgICAgIHRoaXMuX3Jlc2V0KCk7 CiAgICAgfSwKIAogICAgIHJlZ2lzdGVyUHJvZmlsZVR5cGU6IGZ1bmN0aW9uKHByb2ZpbGVUeXBl KQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcyBi L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKaW5kZXggOWY1MDI0Mi4u YWNmNDk2MyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rv ci5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCkBAIC0x Mzk1LDYgKzEzOTUsMTIgQEAgV2ViSW5zcGVjdG9yLnJlc2V0ID0gZnVuY3Rpb24oKQogICAgIHRo aXMuY29uc29sZS5jbGVhck1lc3NhZ2VzKCk7CiB9CiAKK1dlYkluc3BlY3Rvci5yZXNldFByb2Zp bGVzUGFuZWwgPSBmdW5jdGlvbigpCit7CisgICAgaWYgKFdlYkluc3BlY3Rvci5wYW5lbHMucHJv ZmlsZXMpCisgICAgICAgIFdlYkluc3BlY3Rvci5wYW5lbHMucHJvZmlsZXMucmVzZXQoKTsKK30K KwogV2ViSW5zcGVjdG9yLmJyaW5nVG9Gcm9udCA9IGZ1bmN0aW9uKCkKIHsKICAgICBJbnNwZWN0 b3JGcm9udGVuZEhvc3QuYnJpbmdUb0Zyb250KCk7Cg== 59519 2010-06-23 09:05:49 -0700 2010-06-23 09:06:25 -0700 [PATCH] Proposed fix. profiles_panel text/plain 4690 pfeldman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ODgzNzQwNC4uMzA0MGJkZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNSBAQAorMjAxMC0wNi0yMyAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBZdXJ5IFNl bWlraGF0c2t5LgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IGRvIG5vdCByZXNldCBwcm9maWxl cyBwYW5lbCBvbiBuYXZpZ2F0aW9uLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD00MTA2OAorCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckNv bnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6ZGlk Q29tbWl0TG9hZCk6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckZyb250ZW5kOjpyZXNldFByb2ZpbGVzUGFuZWwp OgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZC5oOgorICAgICAgICAqIGlu c3BlY3Rvci9mcm9udC1lbmQvUHJvZmlsZXNQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5Qcm9maWxlc1BhbmVsKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Qcm9maWxlc1BhbmVsLnBy b3RvdHlwZS5wb3B1bGF0ZUludGVyZmFjZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUHJvZmls ZXNQYW5lbC5wcm90b3R5cGUucHJvZmlsZXJXYXNEaXNhYmxlZCk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuUHJvZmlsZXNQYW5lbC5wcm90b3R5cGUuX3Jlc2V0KToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5Qcm9maWxlc1BhbmVsLnByb3RvdHlwZS5fY2xlYXJQcm9maWxlcyk6CisgICAgICAgICog aW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu cmVzZXRQcm9maWxlc1BhbmVsKToKKwogMjAxMC0wNi0yMyAgUGF2ZWwgUG9kaXZpbG92ICA8cG9k aXZpbG92QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBZdXJ5IFNlbWlraGF0 c2t5LgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5j cHAgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcAppbmRleCBmODQy NjA3Li5kY2Y5ZWQ2IDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250 cm9sbGVyLmNwcAorKysgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNw cApAQCAtNzIzLDYgKzcyMyw4IEBAIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6ZGlkQ29tbWl0 TG9hZChEb2N1bWVudExvYWRlciogbG9hZGVyKQogICAgICAgICBtX3Byb2ZpbGVzLmNsZWFyKCk7 CiAgICAgICAgIG1fY3VycmVudFVzZXJJbml0aWF0ZWRQcm9maWxlTnVtYmVyID0gMTsKICAgICAg ICAgbV9uZXh0VXNlckluaXRpYXRlZFByb2ZpbGVOdW1iZXIgPSAxOworICAgICAgICBpZiAobV9m cm9udGVuZCkKKyAgICAgICAgICAgIG1fZnJvbnRlbmQtPnJlc2V0UHJvZmlsZXNQYW5lbCgpOwog I2VuZGlmCiAgICAgICAgIC8vIHVuYmluZEFsbFJlc291cmNlcyBzaG91bGQgYmUgY2FsbGVkIGJl Zm9yZSBkYXRhYmFzZSBhbmQgRE9NIHN0b3JhZ2UKICAgICAgICAgLy8gcmVzb3VyY2VzIGFyZSBj bGVhcmVkIHNvIHRoYXQgaXQgaGFzIGEgY2hhbmNlIHRvIHVuYmluZCB0aGVtLgpkaWZmIC0tZ2l0 IGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmQuY3BwIGIvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmQuY3BwCmluZGV4IDJmMzU0MzYuLjE5NWM1MjYgMTAwNjQ0 Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kLmNwcAorKysgYi9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZC5jcHAKQEAgLTIzOSw2ICsyMzksMTEgQEAg dm9pZCBJbnNwZWN0b3JGcm9udGVuZDo6cmVzZXQoKQogICAgIGNhbGxTaW1wbGVGdW5jdGlvbigi cmVzZXQiKTsKIH0KIAordm9pZCBJbnNwZWN0b3JGcm9udGVuZDo6cmVzZXRQcm9maWxlc1BhbmVs KCkKK3sKKyAgICBjYWxsU2ltcGxlRnVuY3Rpb24oInJlc2V0UHJvZmlsZXNQYW5lbCIpOworfQor CiB2b2lkIEluc3BlY3RvckZyb250ZW5kOjpicmluZ1RvRnJvbnQoKQogewogICAgIGNhbGxTaW1w bGVGdW5jdGlvbigiYnJpbmdUb0Zyb250Iik7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JGcm9udGVuZC5oIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRl bmQuaAppbmRleCA2MDlkMTVkLi41MDFlOTJlIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JGcm9udGVuZC5oCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZy b250ZW5kLmgKQEAgLTgxLDYgKzgxLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICB2 b2lkIHNob3dQYW5lbChpbnQgcGFuZWwpOwogICAgICAgICB2b2lkIHBvcHVsYXRlSW50ZXJmYWNl KCk7CiAgICAgICAgIHZvaWQgcmVzZXQoKTsKKyAgICAgICAgdm9pZCByZXNldFByb2ZpbGVzUGFu ZWwoKTsKIAogICAgICAgICB2b2lkIGJyaW5nVG9Gcm9udCgpOwogICAgICAgICB2b2lkIGluc3Bl Y3RlZFVSTENoYW5nZWQoY29uc3QgU3RyaW5nJik7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvUHJvZmlsZXNQYW5lbC5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9Qcm9maWxlc1BhbmVsLmpzCmluZGV4IDQ1NGUwOTMuLmI1MTIyYWYgMTAwNjQ0Ci0tLSBh L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9maWxlc1BhbmVsLmpzCisrKyBiL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9maWxlc1BhbmVsLmpzCkBAIC0xMjQsNyArMTI0LDcg QEAgV2ViSW5zcGVjdG9yLlByb2ZpbGVzUGFuZWwgPSBmdW5jdGlvbigpCiAKICAgICB0aGlzLl9w cm9maWxlcyA9IFtdOwogICAgIHRoaXMuX3Byb2ZpbGVyRW5hYmxlZCA9IFByZWZlcmVuY2VzLnBy b2ZpbGVyQWx3YXlzRW5hYmxlZDsKLSAgICB0aGlzLnJlc2V0KCk7CisgICAgdGhpcy5fcmVzZXQo KTsKIH0KIAogV2ViSW5zcGVjdG9yLlByb2ZpbGVzUGFuZWwucHJvdG90eXBlID0gewpAQCAtMTY3 LDcgKzE2Nyw3IEBAIFdlYkluc3BlY3Rvci5Qcm9maWxlc1BhbmVsLnByb3RvdHlwZSA9IHsKIAog ICAgIHBvcHVsYXRlSW50ZXJmYWNlOiBmdW5jdGlvbigpCiAgICAgewotICAgICAgICB0aGlzLnJl c2V0KCk7CisgICAgICAgIHRoaXMuX3Jlc2V0KCk7CiAgICAgICAgIGlmICh0aGlzLnZpc2libGUp CiAgICAgICAgICAgICB0aGlzLl9wb3B1bGF0ZVByb2ZpbGVzKCk7CiAgICAgICAgIGVsc2UKQEAg LTE4OSwxMCArMTg5LDE1IEBAIFdlYkluc3BlY3Rvci5Qcm9maWxlc1BhbmVsLnByb3RvdHlwZSA9 IHsKICAgICAgICAgICAgIHJldHVybjsKIAogICAgICAgICB0aGlzLl9wcm9maWxlckVuYWJsZWQg PSBmYWxzZTsKLSAgICAgICAgdGhpcy5yZXNldCgpOworICAgICAgICB0aGlzLl9yZXNldCgpOwog ICAgIH0sCiAKLSAgICByZXNldDogZnVuY3Rpb24oKQorICAgIHJlc2V0UHJvZmlsZXM6IGZ1bmN0 aW9uKCkKKyAgICB7CisgICAgICAgIHRoaXMuX3Jlc2V0KCk7CisgICAgfSwKKworICAgIF9yZXNl dDogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCB0aGlzLl9w cm9maWxlcy5sZW5ndGg7ICsraSkKICAgICAgICAgICAgIGRlbGV0ZSB0aGlzLl9wcm9maWxlc1tp XS5fcHJvZmlsZVZpZXc7CkBAIC0yMjIsNyArMjI3LDcgQEAgV2ViSW5zcGVjdG9yLlByb2ZpbGVz UGFuZWwucHJvdG90eXBlID0gewogICAgIF9jbGVhclByb2ZpbGVzOiBmdW5jdGlvbigpCiAgICAg ewogICAgICAgICBJbnNwZWN0b3JCYWNrZW5kLmNsZWFyUHJvZmlsZXMoKTsKLSAgICAgICAgdGhp cy5yZXNldCgpOworICAgICAgICB0aGlzLl9yZXNldCgpOwogICAgIH0sCiAKICAgICByZWdpc3Rl clByb2ZpbGVUeXBlOiBmdW5jdGlvbihwcm9maWxlVHlwZSkKZGlmZiAtLWdpdCBhL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvaW5zcGVjdG9yLmpzCmluZGV4IDlmNTAyNDIuLjNiYjQxODAgMTAwNjQ0Ci0tLSBhL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKKysrIGIvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcwpAQCAtMTM5NSw2ICsxMzk1LDEyIEBAIFdlYklu c3BlY3Rvci5yZXNldCA9IGZ1bmN0aW9uKCkKICAgICB0aGlzLmNvbnNvbGUuY2xlYXJNZXNzYWdl cygpOwogfQogCitXZWJJbnNwZWN0b3IucmVzZXRQcm9maWxlc1BhbmVsID0gZnVuY3Rpb24oKQor eworICAgIGlmIChXZWJJbnNwZWN0b3IucGFuZWxzLnByb2ZpbGVzKQorICAgICAgICBXZWJJbnNw ZWN0b3IucGFuZWxzLnByb2ZpbGVzLnJlc2V0UHJvZmlsZXMoKTsKK30KKwogV2ViSW5zcGVjdG9y LmJyaW5nVG9Gcm9udCA9IGZ1bmN0aW9uKCkKIHsKICAgICBJbnNwZWN0b3JGcm9udGVuZEhvc3Qu YnJpbmdUb0Zyb250KCk7Cg==