48628 2010-10-29 06:09:23 -0700 Web Inspector: add close button to network view, make tests pass for resource manager on all ports. 2010-10-29 08:26:17 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 301708 0 pfeldman 2010-10-29 06:09:23 -0700 Patch to follow. 301730 1 72329 pfeldman 2010-10-29 06:48:09 -0700 Created attachment 72329 [PATCH] Proposed change. 301771 2 pfeldman 2010-10-29 08:26:17 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M LayoutTests/ChangeLog M LayoutTests/inspector/audits-panel-functional.html M WebCore/ChangeLog M WebCore/inspector/InspectorController.cpp M WebCore/inspector/front-end/NetworkPanel.js M WebCore/inspector/front-end/ResourceManager.js M WebCore/inspector/front-end/StoragePanel.js M WebCore/inspector/front-end/inspector.js M WebCore/inspector/front-end/networkPanel.css M WebKit/chromium/ChangeLog M WebKit/chromium/src/js/Tests.js Committed r70879 72329 2010-10-29 06:48:09 -0700 2010-10-29 07:51:37 -0700 [PATCH] Proposed change. final_bits text/plain 20415 pfeldman ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA4M2FjNTg3Li5hYTQ2YmJiIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTAtMTAt MjkgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogYWRkIGNs b3NlIGJ1dHRvbiB0byBuZXR3b3JrIHZpZXcsIG1ha2UgdGVzdHMgcGFzcworICAgICAgICBmb3Ig cmVzb3VyY2UgbWFuYWdlciBvbiBhbGwgcG9ydHMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD00ODYyOAorCisgICAgICAgICogaW5zcGVjdG9yL2F1ZGl0 cy1wYW5lbC1mdW5jdGlvbmFsLmh0bWw6CisKIDIwMTAtMTAtMjkgIE1paGFpIFBhcnBhcml0YSAg PG1paGFpcEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4K ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9hdWRpdHMtcGFuZWwtZnVuY3Rpb25h bC5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2F1ZGl0cy1wYW5lbC1mdW5jdGlvbmFsLmh0 bWwKaW5kZXggMmMyNzQ0MS4uZTAyMDg1NSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVj dG9yL2F1ZGl0cy1wYW5lbC1mdW5jdGlvbmFsLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVj dG9yL2F1ZGl0cy1wYW5lbC1mdW5jdGlvbmFsLmh0bWwKQEAgLTU5LDExICs1OSwxNCBAQCBmdW5j dGlvbiBmcm9udGVuZF9ydW5BdWRpdHModGVzdENvbnRyb2xsZXIpCiAgICAgICAgICAgICAvLyBB dWRpdHMgYXJlIGRvbmUsIGNoZWNrIHJlc3VsdHMuCiAgICAgICAgICAgICB2YXIgb3V0cHV0ID0g ZnJvbnRlbmRfY29sbGVjdEF1ZGl0UmVzdWx0cygpOwogICAgICAgICAgICAgLy8gQXZvaWQgaW5m bHVlbmNpbmcgdGVzdHMgdGhhdCByZXF1aXJlIHJlc291cmNlIHRyYWNraW5nIHRvIGJlIGRpc2Fi bGVkLgotICAgICAgICAgICAgaWYgKCFQcmVmZXJlbmNlcy5uZXR3b3JrUGFuZWxFbmFibGVkKQot ICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5wYW5lbHMucmVzb3VyY2VzLnRvZ2dsZVJlc291 cmNlVHJhY2tpbmcoKTsKLSAgICAgICAgICAgIHRlc3RDb250cm9sbGVyLnJ1bkFmdGVyUGVuZGlu Z0Rpc3BhdGNoZXMoZnVuY3Rpb24oKSB7CisgICAgICAgICAgICBpZiAoUHJlZmVyZW5jZXMubmV0 d29ya1BhbmVsRW5hYmxlZCkgewogICAgICAgICAgICAgICAgIHRlc3RDb250cm9sbGVyLm5vdGlm eURvbmUob3V0cHV0LmpvaW4oIlxuIikpOwotICAgICAgICAgICAgfSk7CisgICAgICAgICAgICB9 IGVsc2UgeworICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5wYW5lbHMucmVzb3VyY2VzLnRv Z2dsZVJlc291cmNlVHJhY2tpbmcoKTsKKyAgICAgICAgICAgICAgICB0ZXN0Q29udHJvbGxlci5y dW5BZnRlclBlbmRpbmdEaXNwYXRjaGVzKGZ1bmN0aW9uKCkgeworICAgICAgICAgICAgICAgICAg ICB0ZXN0Q29udHJvbGxlci5ub3RpZnlEb25lKG91dHB1dC5qb2luKCJcbiIpKTsKKyAgICAgICAg ICAgICAgICB9KTsKKyAgICAgICAgICAgIH0KICAgICAgICAgfSk7CiAgICAgfSBjYXRjaChlKSB7 CiAgICAgICAgIHRlc3RDb250cm9sbGVyLm5vdGlmeURvbmUoIkV4Y2VwdGlvbjogIiArIGUudG9T dHJpbmcoKSk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdl TG9nCmluZGV4IDdmY2VlMWMuLjhiYWZhZmIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9n CisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsNDEgQEAKIDIwMTAtMTAtMjkgIFBh dmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogYWRkIGNsb3NlIGJ1 dHRvbiB0byBuZXR3b3JrIHZpZXcsIG1ha2UgdGVzdHMgcGFzcyBmb3IKKyAgICAgICAgcmVzb3Vy Y2UgbWFuYWdlciBvbiBhbGwgcG9ydHMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD00ODYyOAorCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckNv bnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6ZGlk Q29tbWl0TG9hZCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb250cm9sbGVyOjpmcmFt ZURldGFjaGVkRnJvbVBhcmVudCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb250cm9s bGVyOjpkaWRMb2FkUmVzb3VyY2VGcm9tTWVtb3J5Q2FjaGUpOgorICAgICAgICAoV2ViQ29yZTo6 SW5zcGVjdG9yQ29udHJvbGxlcjo6aWRlbnRpZmllckZvckluaXRpYWxSZXF1ZXN0KToKKyAgICAg ICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXI6OndpbGxTZW5kUmVxdWVzdCk6CisgICAg ICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb250cm9sbGVyOjptYXJrUmVzb3VyY2VBc0NhY2hlZCk6 CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb250cm9sbGVyOjpkaWRSZWNlaXZlUmVzcG9u c2UpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6ZGlkUmVjZWl2ZUNv bnRlbnRMZW5ndGgpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6ZGlk RmluaXNoTG9hZGluZyk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb250cm9sbGVyOjpk aWRGYWlsTG9hZGluZyk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb250cm9sbGVyOjpy ZXNvdXJjZVJldHJpZXZlZEJ5WE1MSHR0cFJlcXVlc3QpOgorICAgICAgICAoV2ViQ29yZTo6SW5z cGVjdG9yQ29udHJvbGxlcjo6c2NyaXB0SW1wb3J0ZWQpOgorICAgICAgICAoV2ViQ29yZTo6SW5z cGVjdG9yQ29udHJvbGxlcjo6ZGlkQ3JlYXRlV2ViU29ja2V0KToKKyAgICAgICAgKFdlYkNvcmU6 Okluc3BlY3RvckNvbnRyb2xsZXI6OndpbGxTZW5kV2ViU29ja2V0SGFuZHNoYWtlUmVxdWVzdCk6 CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb250cm9sbGVyOjpkaWRSZWNlaXZlV2ViU29j a2V0SGFuZHNoYWtlUmVzcG9uc2UpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJv bGxlcjo6ZGlkQ2xvc2VXZWJTb2NrZXQpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQv TmV0d29ya1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtQYW5lbCk6Cisg ICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZU1hbmFnZXIuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlTW9kZWwucHJvdG90eXBlLmRpZENvbW1pdExvYWRG b3JGcmFtZSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TdG9yYWdlUGFuZWwuanM6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuU3RvcmFnZVBhbmVsLnByb3RvdHlwZS5hZGRSZXNvdXJj ZVRvRnJhbWUpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLl9jcmVhdGVQYW5lbHMpOgorICAgICAgICAqIGluc3BlY3Rv ci9mcm9udC1lbmQvbmV0d29ya1BhbmVsLmNzczoKKyAgICAgICAgKC5uZXR3b3JrLWNsb3NlLWJ1 dHRvbik6CisKKzIwMTAtMTAtMjkgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBjaHJvbWl1bS5v cmc+CisKICAgICAgICAgUmV2aWV3ZWQgYnkgVGltb3RoeSBIYXRjaGVyLgogCiAgICAgICAgIFdl YiBJbnNwZWN0b3I6IG1ha2UgbGVnYWN5IHJlc291cmNlIHRyYWNraW5nIG9wdGlvbmFsIGluIHRo ZSBuYXRpdmUgY29kZSwKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNv bnRyb2xsZXIuY3BwIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAK aW5kZXggZTA4ZjMyNC4uNjFlYmY3MiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yQ29udHJvbGxlci5jcHAKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29u dHJvbGxlci5jcHAKQEAgLTc1NCw3ICs3NTQsOCBAQCB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6 OmRpZENvbW1pdExvYWQoRG9jdW1lbnRMb2FkZXIqIGxvYWRlcikKICAgICAgICAgcmV0dXJuOwog CiAjaWYgIUxFR0FDWV9SRVNPVVJDRV9UUkFDS0lOR19FTkFCTEVECi0gICAgbV9yZXNvdXJjZUFn ZW50LT5kaWRDb21taXRMb2FkKGxvYWRlcik7CisgICAgaWYgKG1fcmVzb3VyY2VBZ2VudCkKKyAg ICAgICAgbV9yZXNvdXJjZUFnZW50LT5kaWRDb21taXRMb2FkKGxvYWRlcik7CiAjZW5kaWYKICAg ICAKICAgICBBU1NFUlQobV9pbnNwZWN0ZWRQYWdlKTsKQEAgLTg0MSw3ICs4NDIsOCBAQCB2b2lk IEluc3BlY3RvckNvbnRyb2xsZXI6OmZyYW1lRGV0YWNoZWRGcm9tUGFyZW50KEZyYW1lKiByb290 RnJhbWUpCiAgICAgICAgIGlmIChSZXNvdXJjZXNNYXAqIHJlc291cmNlTWFwID0gbV9mcmFtZVJl c291cmNlcy5nZXQoZnJhbWUpKQogICAgICAgICAgICAgcmVtb3ZlQWxsUmVzb3VyY2VzKHJlc291 cmNlTWFwKTsKICNlbHNlCi0gICAgbV9yZXNvdXJjZUFnZW50LT5mcmFtZURldGFjaGVkRnJvbVBh cmVudChyb290RnJhbWUpOworICAgIGlmIChtX3Jlc291cmNlQWdlbnQpCisgICAgICAgIG1fcmVz b3VyY2VBZ2VudC0+ZnJhbWVEZXRhY2hlZEZyb21QYXJlbnQocm9vdEZyYW1lKTsKICNlbmRpZgog fQogCkBAIC05MzEsNyArOTMzLDggQEAgdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpkaWRMb2Fk UmVzb3VyY2VGcm9tTWVtb3J5Q2FjaGUoRG9jdW1lbnRMb2FkZXIqIGxvYWRlciwKICAgICBpZiAo bV9mcm9udGVuZCkKICAgICAgICAgcmVzb3VyY2UtPnVwZGF0ZVNjcmlwdE9iamVjdChtX2Zyb250 ZW5kLmdldCgpKTsKICNlbHNlCi0gICAgbV9yZXNvdXJjZUFnZW50LT5kaWRMb2FkUmVzb3VyY2VG cm9tTWVtb3J5Q2FjaGUobG9hZGVyLCBjYWNoZWRSZXNvdXJjZSk7CisgICAgaWYgKG1fcmVzb3Vy Y2VBZ2VudCkKKyAgICAgICAgbV9yZXNvdXJjZUFnZW50LT5kaWRMb2FkUmVzb3VyY2VGcm9tTWVt b3J5Q2FjaGUobG9hZGVyLCBjYWNoZWRSZXNvdXJjZSk7CiAjZW5kaWYKIH0KIApAQCAtOTYzLDcg Kzk2Niw4IEBAIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6aWRlbnRpZmllckZvckluaXRpYWxS ZXF1ZXN0KHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwKICAgICBpZiAobV9mcm9udGVuZCAmJiBs b2FkZXItPmZyYW1lTG9hZGVyKCktPmlzTG9hZGluZ0Zyb21DYWNoZWRQYWdlKCkgJiYgcmVzb3Vy Y2UgPT0gbV9tYWluUmVzb3VyY2UpCiAgICAgICAgIHJlc291cmNlLT51cGRhdGVTY3JpcHRPYmpl Y3QobV9mcm9udGVuZC5nZXQoKSk7CiAjZWxzZQotICAgIG1fcmVzb3VyY2VBZ2VudC0+aWRlbnRp ZmllckZvckluaXRpYWxSZXF1ZXN0KGlkZW50aWZpZXIsIHJlcXVlc3QudXJsKCksIGxvYWRlcik7 CisgICAgaWYgKG1fcmVzb3VyY2VBZ2VudCkKKyAgICAgICAgbV9yZXNvdXJjZUFnZW50LT5pZGVu dGlmaWVyRm9ySW5pdGlhbFJlcXVlc3QoaWRlbnRpZmllciwgcmVxdWVzdC51cmwoKSwgbG9hZGVy KTsKICNlbmRpZgogfQogCkBAIC0xMDQzLDcgKzEwNDcsOCBAQCB2b2lkIEluc3BlY3RvckNvbnRy b2xsZXI6OndpbGxTZW5kUmVxdWVzdCh1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIFJlc291cmNl UmVxdQogICAgIGlmIChyZXNvdXJjZSAhPSBtX21haW5SZXNvdXJjZSAmJiBtX2Zyb250ZW5kKQog ICAgICAgICByZXNvdXJjZS0+dXBkYXRlU2NyaXB0T2JqZWN0KG1fZnJvbnRlbmQuZ2V0KCkpOwog I2Vsc2UKLSAgICBtX3Jlc291cmNlQWdlbnQtPndpbGxTZW5kUmVxdWVzdChpZGVudGlmaWVyLCBy ZXF1ZXN0LCByZWRpcmVjdFJlc3BvbnNlKTsKKyAgICBpZiAobV9yZXNvdXJjZUFnZW50KQorICAg ICAgICBtX3Jlc291cmNlQWdlbnQtPndpbGxTZW5kUmVxdWVzdChpZGVudGlmaWVyLCByZXF1ZXN0 LCByZWRpcmVjdFJlc3BvbnNlKTsKICNlbmRpZgogfQogCkBAIC0xMDU2LDcgKzEwNjEsOCBAQCB2 b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6Om1hcmtSZXNvdXJjZUFzQ2FjaGVkKHVuc2lnbmVkIGxv bmcgaWRlbnRpZmllcikKICAgICBpZiAoUmVmUHRyPEluc3BlY3RvclJlc291cmNlPiByZXNvdXJj ZSA9IGdldFRyYWNrZWRSZXNvdXJjZShpZGVudGlmaWVyKSkKICAgICAgICAgcmVzb3VyY2UtPm1h cmtBc0NhY2hlZCgpOwogI2Vsc2UKLSAgICBtX3Jlc291cmNlQWdlbnQtPm1hcmtSZXNvdXJjZUFz Q2FjaGVkKGlkZW50aWZpZXIpOworICAgIGlmIChtX3Jlc291cmNlQWdlbnQpCisgICAgICAgIG1f cmVzb3VyY2VBZ2VudC0+bWFya1Jlc291cmNlQXNDYWNoZWQoaWRlbnRpZmllcik7CiAjZW5kaWYK IH0KIApAQCAtMTA3NCw3ICsxMDgwLDggQEAgdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpkaWRS ZWNlaXZlUmVzcG9uc2UodW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBEb2N1bWVudEwKICAgICB9 CiAgICAgVU5VU0VEX1BBUkFNKGxvYWRlcik7CiAjZWxzZQotICAgIG1fcmVzb3VyY2VBZ2VudC0+ ZGlkUmVjZWl2ZVJlc3BvbnNlKGlkZW50aWZpZXIsIGxvYWRlciwgcmVzcG9uc2UpOworICAgIGlm IChtX3Jlc291cmNlQWdlbnQpCisgICAgICAgIG1fcmVzb3VyY2VBZ2VudC0+ZGlkUmVjZWl2ZVJl c3BvbnNlKGlkZW50aWZpZXIsIGxvYWRlciwgcmVzcG9uc2UpOwogI2VuZGlmCiAKICAgICBpZiAo cmVzcG9uc2UuaHR0cFN0YXR1c0NvZGUoKSA+PSA0MDApIHsKQEAgLTEwOTgsNyArMTEwNSw4IEBA IHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6ZGlkUmVjZWl2ZUNvbnRlbnRMZW5ndGgodW5zaWdu ZWQgbG9uZyBpZGVudGlmaWVyLCBpbnQKICAgICBpZiAocmVzb3VyY2UgIT0gbV9tYWluUmVzb3Vy Y2UgJiYgbV9mcm9udGVuZCkKICAgICAgICAgcmVzb3VyY2UtPnVwZGF0ZVNjcmlwdE9iamVjdCht X2Zyb250ZW5kLmdldCgpKTsKICNlbHNlCi0gICAgbV9yZXNvdXJjZUFnZW50LT5kaWRSZWNlaXZl Q29udGVudExlbmd0aChpZGVudGlmaWVyLCBsZW5ndGhSZWNlaXZlZCk7CisgICAgaWYgKG1fcmVz b3VyY2VBZ2VudCkKKyAgICAgICAgbV9yZXNvdXJjZUFnZW50LT5kaWRSZWNlaXZlQ29udGVudExl bmd0aChpZGVudGlmaWVyLCBsZW5ndGhSZWNlaXZlZCk7CiAjZW5kaWYKIH0KIApAQCAtMTEyMSw3 ICsxMTI5LDggQEAgdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpkaWRGaW5pc2hMb2FkaW5nKHVu c2lnbmVkIGxvbmcgaWRlbnRpZmllciwgZG91YmxlIGZpbmkKICAgICBpZiAobV9mcm9udGVuZCkK ICAgICAgICAgcmVzb3VyY2UtPnVwZGF0ZVNjcmlwdE9iamVjdChtX2Zyb250ZW5kLmdldCgpKTsK ICNlbHNlCi0gICAgbV9yZXNvdXJjZUFnZW50LT5kaWRGaW5pc2hMb2FkaW5nKGlkZW50aWZpZXIs IGZpbmlzaFRpbWUpOworICAgIGlmIChtX3Jlc291cmNlQWdlbnQpCisgICAgICAgIG1fcmVzb3Vy Y2VBZ2VudC0+ZGlkRmluaXNoTG9hZGluZyhpZGVudGlmaWVyLCBmaW5pc2hUaW1lKTsKICNlbmRp ZgogfQogCkBAIC0xMTUwLDcgKzExNTksOCBAQCB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OmRp ZEZhaWxMb2FkaW5nKHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgY29uc3QgUmVzb3VyYwogICAg IGlmIChtX2Zyb250ZW5kKQogICAgICAgICByZXNvdXJjZS0+dXBkYXRlU2NyaXB0T2JqZWN0KG1f ZnJvbnRlbmQuZ2V0KCkpOwogI2Vsc2UKLSAgICBtX3Jlc291cmNlQWdlbnQtPmRpZEZhaWxMb2Fk aW5nKGlkZW50aWZpZXIsIGVycm9yKTsKKyAgICBpZiAobV9yZXNvdXJjZUFnZW50KQorICAgICAg ICBtX3Jlc291cmNlQWdlbnQtPmRpZEZhaWxMb2FkaW5nKGlkZW50aWZpZXIsIGVycm9yKTsKICNl bmRpZgogfQogCkBAIC0xMTc1LDcgKzExODUsOCBAQCB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6 OnJlc291cmNlUmV0cmlldmVkQnlYTUxIdHRwUmVxdWVzdCh1bnNpZ25lZCBsb25nIGlkZW50aQog ICAgIGlmIChtX2Zyb250ZW5kKQogICAgICAgICByZXNvdXJjZS0+dXBkYXRlU2NyaXB0T2JqZWN0 KG1fZnJvbnRlbmQuZ2V0KCkpOwogI2Vsc2UKLSAgICBtX3Jlc291cmNlQWdlbnQtPnNldE92ZXJy aWRlQ29udGVudChpZGVudGlmaWVyLCBzb3VyY2VTdHJpbmcsIEluc3BlY3RvclJlc291cmNlOjpY SFIpOworICAgIGlmIChtX3Jlc291cmNlQWdlbnQpCisgICAgICAgIG1fcmVzb3VyY2VBZ2VudC0+ c2V0T3ZlcnJpZGVDb250ZW50KGlkZW50aWZpZXIsIHNvdXJjZVN0cmluZywgSW5zcGVjdG9yUmVz b3VyY2U6OlhIUik7CiAjZW5kaWYKIH0KIApAQCAtMTE5Nyw3ICsxMjA4LDggQEAgdm9pZCBJbnNw ZWN0b3JDb250cm9sbGVyOjpzY3JpcHRJbXBvcnRlZCh1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIs IGNvbnN0IFN0cmluZyYKICAgICBpZiAobV9mcm9udGVuZCkKICAgICAgICAgcmVzb3VyY2UtPnVw ZGF0ZVNjcmlwdE9iamVjdChtX2Zyb250ZW5kLmdldCgpKTsKICNlbHNlCi0gICAgbV9yZXNvdXJj ZUFnZW50LT5zZXRPdmVycmlkZUNvbnRlbnQoaWRlbnRpZmllciwgc291cmNlU3RyaW5nLCBJbnNw ZWN0b3JSZXNvdXJjZTo6U2NyaXB0KTsKKyAgICBpZiAobV9yZXNvdXJjZUFnZW50KQorICAgICAg ICBtX3Jlc291cmNlQWdlbnQtPnNldE92ZXJyaWRlQ29udGVudChpZGVudGlmaWVyLCBzb3VyY2VT dHJpbmcsIEluc3BlY3RvclJlc291cmNlOjpTY3JpcHQpOwogI2VuZGlmCiB9CiAKQEAgLTE1NjQs NyArMTU3Niw4IEBAIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6ZGlkQ3JlYXRlV2ViU29ja2V0 KHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgY29uc3QgS1VSCiAgICAgaWYgKG1fZnJvbnRlbmQp CiAgICAgICAgIHJlc291cmNlLT51cGRhdGVTY3JpcHRPYmplY3QobV9mcm9udGVuZC5nZXQoKSk7 CiAjZWxzZQotICAgIG1fcmVzb3VyY2VBZ2VudC0+ZGlkQ3JlYXRlV2ViU29ja2V0KGlkZW50aWZp ZXIsIHJlcXVlc3RVUkwpOworICAgIGlmIChtX3Jlc291cmNlQWdlbnQpCisgICAgICAgIG1fcmVz b3VyY2VBZ2VudC0+ZGlkQ3JlYXRlV2ViU29ja2V0KGlkZW50aWZpZXIsIHJlcXVlc3RVUkwpOwog ICAgIFVOVVNFRF9QQVJBTShkb2N1bWVudFVSTCk7CiAjZW5kaWYKIH0KQEAgLTE1ODAsNyArMTU5 Myw4IEBAIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6d2lsbFNlbmRXZWJTb2NrZXRIYW5kc2hh a2VSZXF1ZXN0KHVuc2lnbmVkIGxvbmcgaWRlbnRpCiAgICAgaWYgKG1fZnJvbnRlbmQpCiAgICAg ICAgIHJlc291cmNlLT51cGRhdGVTY3JpcHRPYmplY3QobV9mcm9udGVuZC5nZXQoKSk7CiAjZWxz ZQotICAgIG1fcmVzb3VyY2VBZ2VudC0+d2lsbFNlbmRXZWJTb2NrZXRIYW5kc2hha2VSZXF1ZXN0 KGlkZW50aWZpZXIsIHJlcXVlc3QpOworICAgIGlmIChtX3Jlc291cmNlQWdlbnQpCisgICAgICAg IG1fcmVzb3VyY2VBZ2VudC0+d2lsbFNlbmRXZWJTb2NrZXRIYW5kc2hha2VSZXF1ZXN0KGlkZW50 aWZpZXIsIHJlcXVlc3QpOwogI2VuZGlmCiB9CiAKQEAgLTE1OTcsNyArMTYxMSw4IEBAIHZvaWQg SW5zcGVjdG9yQ29udHJvbGxlcjo6ZGlkUmVjZWl2ZVdlYlNvY2tldEhhbmRzaGFrZVJlc3BvbnNl KHVuc2lnbmVkIGxvbmcgaWRlCiAgICAgaWYgKG1fZnJvbnRlbmQpCiAgICAgICAgIHJlc291cmNl LT51cGRhdGVTY3JpcHRPYmplY3QobV9mcm9udGVuZC5nZXQoKSk7CiAjZWxzZQotICAgIG1fcmVz b3VyY2VBZ2VudC0+ZGlkUmVjZWl2ZVdlYlNvY2tldEhhbmRzaGFrZVJlc3BvbnNlKGlkZW50aWZp ZXIsIHJlc3BvbnNlKTsKKyAgICBpZiAobV9yZXNvdXJjZUFnZW50KQorICAgICAgICBtX3Jlc291 cmNlQWdlbnQtPmRpZFJlY2VpdmVXZWJTb2NrZXRIYW5kc2hha2VSZXNwb25zZShpZGVudGlmaWVy LCByZXNwb25zZSk7CiAjZW5kaWYKIH0KIApAQCAtMTYxMiw3ICsxNjI3LDggQEAgdm9pZCBJbnNw ZWN0b3JDb250cm9sbGVyOjpkaWRDbG9zZVdlYlNvY2tldCh1bnNpZ25lZCBsb25nIGlkZW50aWZp ZXIpCiAgICAgaWYgKG1fZnJvbnRlbmQpCiAgICAgICAgIHJlc291cmNlLT51cGRhdGVTY3JpcHRP YmplY3QobV9mcm9udGVuZC5nZXQoKSk7CiAjZWxzZQotICAgIG1fcmVzb3VyY2VBZ2VudC0+ZGlk Q2xvc2VXZWJTb2NrZXQoaWRlbnRpZmllcik7CisgICAgaWYgKG1fcmVzb3VyY2VBZ2VudCkKKyAg ICAgICAgbV9yZXNvdXJjZUFnZW50LT5kaWRDbG9zZVdlYlNvY2tldChpZGVudGlmaWVyKTsKICNl bmRpZgogfQogI2VuZGlmIC8vIEVOQUJMRShXRUJfU09DS0VUUykKZGlmZiAtLWdpdCBhL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrUGFuZWwuanMgYi9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvTmV0d29ya1BhbmVsLmpzCmluZGV4IDgwNDU2YmEuLmM2NjZlNTQgMTAwNjQ0 Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrUGFuZWwuanMKKysrIGIv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qcwpAQCAtNTMsOSArNTMs MTMgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtQYW5lbCA9IGZ1bmN0aW9uKCkKICAgICB0aGlzLl92 aWV3c0NvbnRhaW5lckVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKICAg ICB0aGlzLl92aWV3c0NvbnRhaW5lckVsZW1lbnQuaWQgPSAibmV0d29yay12aWV3cyI7CiAgICAg dGhpcy5fdmlld3NDb250YWluZXJFbGVtZW50LmNsYXNzTmFtZSA9ICJoaWRkZW4iOwotCiAgICAg dGhpcy5lbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuX3ZpZXdzQ29udGFpbmVyRWxlbWVudCk7CiAK KyAgICB2YXIgY2xvc2VCdXR0b25FbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiYnV0 dG9uIik7CisgICAgY2xvc2VCdXR0b25FbGVtZW50LmNsYXNzTmFtZSA9ICJuZXR3b3JrLWNsb3Nl LWJ1dHRvbiI7CisgICAgY2xvc2VCdXR0b25FbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImNsaWNr IiwgdGhpcy5fdG9nZ2xlR3JpZE1vZGUuYmluZCh0aGlzKSwgZmFsc2UpOworICAgIHRoaXMuX3Zp ZXdzQ29udGFpbmVyRWxlbWVudC5hcHBlbmRDaGlsZChjbG9zZUJ1dHRvbkVsZW1lbnQpOworCiAg ICAgdGhpcy5fY3JlYXRlU29ydGluZ0Z1bmN0aW9ucygpOwogICAgIHRoaXMuX2NyZWF0ZVRhYmxl KCk7CiAgICAgdGhpcy5fY3JlYXRlVGltZWxpbmVHcmlkKCk7CmRpZmYgLS1naXQgYS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VNYW5hZ2VyLmpzIGIvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1Jlc291cmNlTWFuYWdlci5qcwppbmRleCA0M2E2NTVlLi42MjI3M2VlIDEw MDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VNYW5hZ2VyLmpz CisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZU1hbmFnZXIuanMKQEAg LTQ5OCw3ICs0OTgsOCBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlTW9kZWwucHJvdG90eXBl ID0gewogCiAgICAgZGlkQ29tbWl0TG9hZEZvckZyYW1lOiBmdW5jdGlvbihwYXJlbnRGcmFtZUlk LCBsb2FkZXIpCiAgICAgewotICAgICAgICB0aGlzLl9jbGVhckNoaWxkRnJhbWVzQW5kUmVzb3Vy Y2VzKGxvYWRlci5mcmFtZUlkLCBsb2FkZXIubG9hZGVySWQpOworICAgICAgICAvLyBwYXJlbnRG cmFtZUlkID09PSAwIGlzIHdoZW4gbWFpbiBmcmFtZSBuYXZpZ2F0aW9uIGhhcHBlbnMuCisgICAg ICAgIHRoaXMuX2NsZWFyQ2hpbGRGcmFtZXNBbmRSZXNvdXJjZXMocGFyZW50RnJhbWVJZCA/IGxv YWRlci5mcmFtZUlkIDogMCwgbG9hZGVyLmxvYWRlcklkKTsKIAogICAgICAgICB2YXIgdG1wUmVz b3VyY2UgPSBuZXcgV2ViSW5zcGVjdG9yLlJlc291cmNlKG51bGwsIGxvYWRlci51cmwpOwogICAg ICAgICB0aGlzLmFkZE9yVXBkYXRlRnJhbWUocGFyZW50RnJhbWVJZCwgbG9hZGVyLmZyYW1lSWQs IHRtcFJlc291cmNlLmRpc3BsYXlOYW1lKTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9TdG9yYWdlUGFuZWwuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv U3RvcmFnZVBhbmVsLmpzCmluZGV4IGY5MGY0MGUuLjJmYTU0YzIgMTAwNjQ0Ci0tLSBhL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdG9yYWdlUGFuZWwuanMKKysrIGIvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1N0b3JhZ2VQYW5lbC5qcwpAQCAtMTY3LDcgKzE2Nyw4IEBAIFdlYklu c3BlY3Rvci5TdG9yYWdlUGFuZWwucHJvdG90eXBlID0gewogICAgIHsKICAgICAgICAgdmFyIGZy YW1lVHJlZUVsZW1lbnQgPSB0aGlzLl90cmVlRWxlbWVudEZvckZyYW1lSWRbZnJhbWVJZF07CiAg ICAgICAgIGlmICghZnJhbWVUcmVlRWxlbWVudCkgewotICAgICAgICAgICAgY29uc29sZS5lcnJv cigiTm8gZnJhbWUgdG8gYWRkIHJlc291cmNlIHRvIik7CisgICAgICAgICAgICAvLyBUaGlzIGlz IGEgZnJhbWUncyBtYWluIHJlc291cmNlLCBpdCB3aWxsIGJlIHJldGFpbmVkCisgICAgICAgICAg ICAvLyBhbmQgcmUtYWRkZWQgYnkgdGhlIHJlc291cmNlIG1hbmFnZXI7CiAgICAgICAgICAgICBy ZXR1cm47CiAgICAgICAgIH0KIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL2luc3BlY3Rvci5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3Iu anMKaW5kZXggN2U3NzdmMi4uZjViMTJjMSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL2luc3BlY3Rvci5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv aW5zcGVjdG9yLmpzCkBAIC0yMjUsOCArMjI1LDYgQEAgdmFyIFdlYkluc3BlY3RvciA9IHsKICAg ICAgICAgdmFyIGhpZGRlblBhbmVscyA9IChJbnNwZWN0b3JGcm9udGVuZEhvc3QuaGlkZGVuUGFu ZWxzKCkgfHwgIiIpLnNwbGl0KCcsJyk7CiAgICAgICAgIGlmIChoaWRkZW5QYW5lbHMuaW5kZXhP ZigiZWxlbWVudHMiKSA9PT0gLTEpCiAgICAgICAgICAgICB0aGlzLnBhbmVscy5lbGVtZW50cyA9 IG5ldyBXZWJJbnNwZWN0b3IuRWxlbWVudHNQYW5lbCgpOwotICAgICAgICBpZiAoUHJlZmVyZW5j ZXMubmV0d29ya1BhbmVsRW5hYmxlZCAmJiBoaWRkZW5QYW5lbHMuaW5kZXhPZigibmV0d29yayIp ID09PSAtMSkKLSAgICAgICAgICAgIHRoaXMucGFuZWxzLm5ldHdvcmsgPSBuZXcgV2ViSW5zcGVj dG9yLk5ldHdvcmtQYW5lbCgpOwogCiAgICAgICAgIGlmIChQcmVmZXJlbmNlcy5uZXR3b3JrUGFu ZWxFbmFibGVkKSB7CiAgICAgICAgICAgICBpZiAoaGlkZGVuUGFuZWxzLmluZGV4T2YoInN0b3Jh Z2UiKSA9PT0gLTEgJiYgaGlkZGVuUGFuZWxzLmluZGV4T2YoImRhdGFiYXNlcyIpID09PSAtMSkK QEAgLTIzNiw2ICsyMzQsOCBAQCB2YXIgV2ViSW5zcGVjdG9yID0gewogICAgICAgICB9IGVsc2Ug aWYgKGhpZGRlblBhbmVscy5pbmRleE9mKCJyZXNvdXJjZXMiKSA9PT0gLTEpCiAgICAgICAgICAg ICB0aGlzLnBhbmVscy5yZXNvdXJjZXMgPSBuZXcgV2ViSW5zcGVjdG9yLlJlc291cmNlc1BhbmVs KCk7CiAKKyAgICAgICAgaWYgKFByZWZlcmVuY2VzLm5ldHdvcmtQYW5lbEVuYWJsZWQgJiYgaGlk ZGVuUGFuZWxzLmluZGV4T2YoIm5ldHdvcmsiKSA9PT0gLTEpCisgICAgICAgICAgICB0aGlzLnBh bmVscy5uZXR3b3JrID0gbmV3IFdlYkluc3BlY3Rvci5OZXR3b3JrUGFuZWwoKTsKICAgICAgICAg aWYgKGhpZGRlblBhbmVscy5pbmRleE9mKCJzY3JpcHRzIikgPT09IC0xKQogICAgICAgICAgICAg dGhpcy5wYW5lbHMuc2NyaXB0cyA9IG5ldyBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsKCk7CiAg ICAgICAgIGlmIChoaWRkZW5QYW5lbHMuaW5kZXhPZigidGltZWxpbmUiKSA9PT0gLTEpCmRpZmYg LS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvbmV0d29ya1BhbmVsLmNzcyBiL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9uZXR3b3JrUGFuZWwuY3NzCmluZGV4IDBiYjYxN2Yu LjIxNTY4MWYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9uZXR3b3Jr UGFuZWwuY3NzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9uZXR3b3JrUGFuZWwu Y3NzCkBAIC01NDQsNiArNTQ0LDE5IEBACiAgICAgbGVmdDogMDsKIH0KIAorLm5ldHdvcmstY2xv c2UtYnV0dG9uIHsKKyAgICBwb3NpdGlvbjogYWJzb2x1dGU7CisgICAgd2lkdGg6IDE0cHg7Cisg ICAgaGVpZ2h0OiAxNHB4OworICAgIGJhY2tncm91bmQtaW1hZ2U6IHVybChJbWFnZXMvY2xvc2VC dXR0b25zLnBuZyk7CisgICAgYmFja2dyb3VuZC1wb3NpdGlvbjogMCAwOworICAgIGJhY2tncm91 bmQtY29sb3I6IHRyYW5zcGFyZW50OworICAgIGJvcmRlcjogMCBub25lIHRyYW5zcGFyZW50Owor ICAgIHRvcDogNHB4OworICAgIHJpZ2h0OiA1cHg7CisgICAgei1pbmRleDogMTA7Cit9CisKIC5u ZXR3b3JrLnBhbmVsIC5kYXRhLWdyaWQuZnVsbC1ncmlkLW1vZGUgLnZpZXdlci1jb2x1bW4gewog ICAgIGRpc3BsYXk6IG5vbmU7CiB9CmRpZmYgLS1naXQgYS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdl TG9nIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwppbmRleCA4Y2M5NjRmLi5kYTZjOTZiIDEw MDY0NAotLS0gYS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1dlYktpdC9jaHJvbWl1 bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxMC0xMC0yOSAgUGF2ZWwgRmVsZG1hbiAg PHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBhZGQgY2xvc2UgYnV0dG9uIHRvIG5ldHdv cmsgdmlldywgbWFrZSB0ZXN0cyBwYXNzCisgICAgICAgIGZvciByZXNvdXJjZSBtYW5hZ2VyIG9u IGFsbCBwb3J0cy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTQ4NjI4CisKKyAgICAgICAgKiBzcmMvanMvVGVzdHMuanM6CisKIDIwMTAtMTAtMjggIEFk YW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBFcmlj IFNlaWRlbCwgUGV0ZXIgS2FzdGluZywgYW5kIERhcmluIEZpc2hlci4KZGlmZiAtLWdpdCBhL1dl YktpdC9jaHJvbWl1bS9zcmMvanMvVGVzdHMuanMgYi9XZWJLaXQvY2hyb21pdW0vc3JjL2pzL1Rl c3RzLmpzCmluZGV4IDVjZWJiNTIuLjJiMjY0ZWUgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1 bS9zcmMvanMvVGVzdHMuanMKKysrIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9qcy9UZXN0cy5qcwpA QCAtMjQ1LDE0NiArMjQ1LDYgQEAgVGVzdFN1aXRlLnByb3RvdHlwZS50ZXN0RW5hYmxlUmVzb3Vy Y2VzVGFiID0gZnVuY3Rpb24oKQogCiAKIC8qKgotICogVGVzdHMgdGhhdCBjb3JyZWN0IGNvbnRl bnQgbGVuZ3RoIGlzIHJlcG9ydGVkIGZvciByZXNvdXJjZXMuCi0gKi8KLVRlc3RTdWl0ZS5wcm90 b3R5cGUudGVzdFJlc291cmNlQ29udGVudExlbmd0aCA9IGZ1bmN0aW9uKCkKLXsKLSAgICB0aGlz LnNob3dQYW5lbCgicmVzb3VyY2VzIik7Ci0gICAgdmFyIHRlc3QgPSB0aGlzOwotCi0gICAgdmFy IHBuZyA9IGZhbHNlOwotICAgIHZhciBodG1sID0gZmFsc2U7Ci0gICAgdGhpcy5hZGRTbmlmZmVy KFdlYkluc3BlY3RvciwgInVwZGF0ZVJlc291cmNlIiwKLSAgICAgICAgZnVuY3Rpb24ocGF5bG9h ZCkgewotICAgICAgICAgICAgaWYgKCFwYXlsb2FkLmRpZExlbmd0aENoYW5nZSkKLSAgICAgICAg ICAgICAgICByZXR1cm47Ci0gICAgICAgICAgICB2YXIgcmVzb3VyY2UgPSBXZWJJbnNwZWN0b3Iu cmVzb3VyY2VzW3BheWxvYWQuaWRdOwotICAgICAgICAgICAgaWYgKCFyZXNvdXJjZSB8fCAhcmVz b3VyY2UudXJsKQotICAgICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgICAgIGlmIChyZXNv dXJjZS51cmwuc2VhcmNoKCJpbWFnZS5odG1sIikgIT09IC0xKSB7Ci0gICAgICAgICAgICAgIHZh ciBleHBlY3RlZExlbmd0aCA9IDg3OwotICAgICAgICAgICAgICB0ZXN0LmFzc2VydFRydWUoCi0g ICAgICAgICAgICAgICAgICByZXNvdXJjZS5yZXNvdXJjZVNpemUgPD0gZXhwZWN0ZWRMZW5ndGgs Ci0gICAgICAgICAgICAgICAgICAiaW1hZ2UuaHRtbCBjb250ZW50IGxlbmd0aCBpcyBncmVhdGVy IHRoYXRuIGV4cGVjdGVkLiIpOwotICAgICAgICAgICAgICBpZiAoZXhwZWN0ZWRMZW5ndGggPT09 IHJlc291cmNlLnJlc291cmNlU2l6ZSkKLSAgICAgICAgICAgICAgICAgIGh0bWwgPSB0cnVlOwot ICAgICAgICAgICAgfSBlbHNlIGlmIChyZXNvdXJjZS51cmwuc2VhcmNoKCJpbWFnZS5wbmciKSAh PT0gLTEpIHsKLSAgICAgICAgICAgICAgdmFyIGV4cGVjdGVkTGVuZ3RoID0gMjU3Nzk2OwotICAg ICAgICAgICAgICB0ZXN0LmFzc2VydFRydWUoCi0gICAgICAgICAgICAgICAgICByZXNvdXJjZS5y ZXNvdXJjZVNpemUgPD0gZXhwZWN0ZWRMZW5ndGgsCi0gICAgICAgICAgICAgICAgICAiaW1hZ2Uu cG5nIGNvbnRlbnQgbGVuZ3RoIGlzIGdyZWF0ZXIgdGhhbiBleHBlY3RlZC4iKTsKLSAgICAgICAg ICAgICAgaWYgKGV4cGVjdGVkTGVuZ3RoID09PSByZXNvdXJjZS5yZXNvdXJjZVNpemUpCi0gICAg ICAgICAgICAgICAgICBwbmcgPSB0cnVlOwotICAgICAgICAgICAgfQotICAgICAgICAgICAgaWYg KGh0bWwgJiYgcG5nKSB7Ci0gICAgICAgICAgICAgIC8vIFdhaXQgMSBzZWNvbmQgYmVmb3JlIHJl bGVhc2luZyBjb250cm9sIHRvIGNoZWNrIHRoYXQgdGhlIGNvbnRlbnQKLSAgICAgICAgICAgICAg Ly8gbGVuZ3RocyBhcmUgbm90IHVwZGF0ZWQgYW55bW9yZS4KLSAgICAgICAgICAgICAgc2V0VGlt ZW91dChmdW5jdGlvbigpIHsKLSAgICAgICAgICAgICAgICAgIHRlc3QucmVsZWFzZUNvbnRyb2wo KTsKLSAgICAgICAgICAgICAgfSwgMTAwMCk7Ci0gICAgICAgICAgICB9Ci0gICAgICAgIH0sIHRy dWUpOwotCi0gICAgLy8gTWFrZSBzdXJlIHJlc291cmNlIHRyYWNraW5nIGlzIG9uLgotICAgIFdl Ykluc3BlY3Rvci5wYW5lbHMucmVzb3VyY2VzLl9lbmFibGVSZXNvdXJjZVRyYWNraW5nKCk7Ci0g ICAgLy8gUmVsb2FkIGluc3BlY3RlZCBwYWdlIHRvIHVwZGF0ZSBhbGwgcmVzb3VyY2VzLgotICAg IHRlc3QuZXZhbHVhdGVJbkNvbnNvbGVfKAotICAgICAgICAid2luZG93LmxvY2F0aW9uLnJlbG9h ZCh0cnVlKTsiLAotICAgICAgICAgZnVuY3Rpb24ocmVzdWx0VGV4dCkgewotICAgICAgICAgICAg IHRlc3QuYXNzZXJ0RXF1YWxzKCJ1bmRlZmluZWQiLCByZXN1bHRUZXh0LCAiVW5leHBlY3RlZCBy ZXN1bHQgb2YgcmVsb2FkKCkuIik7Ci0gICAgICAgICB9KTsKLQotICAgIC8vIFdlIG5vdyBoYXZl IHNvbWUgdGltZSB0byByZXBvcnQgcmVzdWx0cyB0byBjb250cm9sbGVyLgotICAgIHRoaXMudGFr ZUNvbnRyb2woKTsKLX07Ci0KLQotLyoqCi0gKiBUZXN0cyByZXNvdXJjZSBoZWFkZXJzLgotICov Ci1UZXN0U3VpdGUucHJvdG90eXBlLnRlc3RSZXNvdXJjZUhlYWRlcnMgPSBmdW5jdGlvbigpCi17 Ci0gICAgdGhpcy5zaG93UGFuZWwoInJlc291cmNlcyIpOwotCi0gICAgdmFyIHRlc3QgPSB0aGlz OwotCi0gICAgdmFyIHJlc3BvbnNlT2sgPSBmYWxzZTsKLSAgICB2YXIgdGltaW5nT2sgPSBmYWxz ZTsKLQotICAgIHRoaXMuYWRkU25pZmZlcihXZWJJbnNwZWN0b3IsICJ1cGRhdGVSZXNvdXJjZSIs Ci0gICAgICAgIGZ1bmN0aW9uKHBheWxvYWQpIHsKLSAgICAgICAgICAgIHZhciByZXNvdXJjZSA9 IHRoaXMucmVzb3VyY2VzW3BheWxvYWQuaWRdOwotICAgICAgICAgICAgaWYgKCFyZXNvdXJjZSB8 fCByZXNvdXJjZS5tYWluUmVzb3VyY2UpIHsKLSAgICAgICAgICAgICAgICAvLyBXZSBhcmUgb25s eSBpbnRlcmVzdGVkIGluIHNlY29uZGFyeSByZXNvdXJjZXMgaW4gdGhpcyB0ZXN0LgotICAgICAg ICAgICAgICAgIHJldHVybjsKLSAgICAgICAgICAgIH0KLQotICAgICAgICAgICAgdmFyIHJlcXVl c3RIZWFkZXJzID0gSlNPTi5zdHJpbmdpZnkocmVzb3VyY2UucmVxdWVzdEhlYWRlcnMpOwotICAg ICAgICAgICAgdGVzdC5hc3NlcnRDb250YWlucyhyZXF1ZXN0SGVhZGVycywgIkFjY2VwdCIpOwot Ci0gICAgICAgICAgICBpZiAocGF5bG9hZC5kaWRSZXNwb25zZUNoYW5nZSkgewotICAgICAgICAg ICAgICAgIHZhciByZXNwb25zZUhlYWRlcnMgPSBKU09OLnN0cmluZ2lmeShyZXNvdXJjZS5yZXNw b25zZUhlYWRlcnMpOwotICAgICAgICAgICAgICAgIHRlc3QuYXNzZXJ0Q29udGFpbnMocmVzcG9u c2VIZWFkZXJzLCAiQ29udGVudC10eXBlIik7Ci0gICAgICAgICAgICAgICAgdGVzdC5hc3NlcnRD b250YWlucyhyZXNwb25zZUhlYWRlcnMsICJDb250ZW50LUxlbmd0aCIpOwotICAgICAgICAgICAg ICAgIHRlc3QuYXNzZXJ0VHJ1ZSh0eXBlb2YgcmVzb3VyY2UucmVzcG9uc2VSZWNlaXZlZFRpbWUg IT09ICJ1bmRlZmluZWQiKTsKLSAgICAgICAgICAgICAgICByZXNwb25zZU9rID0gdHJ1ZTsKLSAg ICAgICAgICAgIH0KLQotICAgICAgICAgICAgaWYgKHBheWxvYWQuZGlkVGltaW5nQ2hhbmdlKSB7 Ci0gICAgICAgICAgICAgICAgdGVzdC5hc3NlcnRUcnVlKHR5cGVvZiByZXNvdXJjZS5zdGFydFRp bWUgIT09ICJ1bmRlZmluZWQiKTsKLSAgICAgICAgICAgICAgICB0aW1pbmdPayA9IHRydWU7Ci0g ICAgICAgICAgICB9Ci0KLSAgICAgICAgICAgIGlmIChwYXlsb2FkLmRpZENvbXBsZXRpb25DaGFu Z2UpIHsKLSAgICAgICAgICAgICAgICB0ZXN0LmFzc2VydFRydWUocmVzcG9uc2VPayk7Ci0gICAg ICAgICAgICAgICAgdGVzdC5hc3NlcnRUcnVlKHRpbWluZ09rKTsKLSAgICAgICAgICAgICAgICB0 ZXN0LmFzc2VydFRydWUodHlwZW9mIHJlc291cmNlLmVuZFRpbWUgIT09ICJ1bmRlZmluZWQiKTsK LSAgICAgICAgICAgICAgICB0ZXN0LnJlbGVhc2VDb250cm9sKCk7Ci0gICAgICAgICAgICB9Ci0g ICAgICAgIH0sIHRydWUpOwotCi0gICAgV2ViSW5zcGVjdG9yLnBhbmVscy5yZXNvdXJjZXMuX2Vu YWJsZVJlc291cmNlVHJhY2tpbmcoKTsKLSAgICB0aGlzLnRha2VDb250cm9sKCk7Ci19OwotCi0K LS8qKgotICogVGVzdHMgdGhlIG1pbWUgdHlwZSBvZiBhIGNhY2hlZCAoSFRUUCAzMDQpIHJlc291 cmNlLgotICovCi1UZXN0U3VpdGUucHJvdG90eXBlLnRlc3RDYWNoZWRSZXNvdXJjZU1pbWVUeXBl ID0gZnVuY3Rpb24oKQotewotICAgIHRoaXMuc2hvd1BhbmVsKCJyZXNvdXJjZXMiKTsKLQotICAg IHZhciB0ZXN0ID0gdGhpczsKLSAgICB2YXIgaGFzUmVsb2FkZWQgPSBmYWxzZTsKLQotICAgIHRo aXMuYWRkU25pZmZlcihXZWJJbnNwZWN0b3IsICJ1cGRhdGVSZXNvdXJjZSIsCi0gICAgICAgIGZ1 bmN0aW9uKHBheWxvYWQpIHsKLSAgICAgICAgICAgIHZhciByZXNvdXJjZSA9IHRoaXMucmVzb3Vy Y2VzW3BheWxvYWQuaWRdOwotICAgICAgICAgICAgaWYgKCFyZXNvdXJjZSB8fCByZXNvdXJjZS5t YWluUmVzb3VyY2UpIHsKLSAgICAgICAgICAgICAgICAvLyBXZSBhcmUgb25seSBpbnRlcmVzdGVk IGluIHNlY29uZGFyeSByZXNvdXJjZXMgaW4gdGhpcyB0ZXN0LgotICAgICAgICAgICAgICAgIHJl dHVybjsKLSAgICAgICAgICAgIH0KLQotICAgICAgICAgICAgaWYgKHBheWxvYWQuZGlkUmVzcG9u c2VDaGFuZ2UpIHsKLSAgICAgICAgICAgICAgICAvLyBUZXN0IHNlcnZlciB1c2VzIGEgZGVmYXVs dCBtaW1lIHR5cGUgZm9yIEphdmFTY3JpcHQgZmlsZXMuCi0gICAgICAgICAgICAgICAgdGVzdC5h c3NlcnRFcXVhbHMoInRleHQvaHRtbCIsIHBheWxvYWQubWltZVR5cGUpOwotICAgICAgICAgICAg ICAgIGlmICghaGFzUmVsb2FkZWQpIHsKLSAgICAgICAgICAgICAgICAgICAgaGFzUmVsb2FkZWQg PSB0cnVlOwotICAgICAgICAgICAgICAgICAgICAvLyBSZWxvYWQgaW5zcGVjdGVkIHBhZ2UgdG8g dXBkYXRlIGFsbCByZXNvdXJjZXMuCi0gICAgICAgICAgICAgICAgICAgIHRlc3QuZXZhbHVhdGVJ bkNvbnNvbGVfKCJ3aW5kb3cubG9jYXRpb24ucmVsb2FkKHRydWUpOyIsIGZ1bmN0aW9uKCkge30p OwotICAgICAgICAgICAgICAgIH0gZWxzZQotICAgICAgICAgICAgICAgICAgICB0ZXN0LnJlbGVh c2VDb250cm9sKCk7Ci0gICAgICAgICAgICB9Ci0KLSAgICAgICAgfSwgdHJ1ZSk7Ci0KLSAgICBX ZWJJbnNwZWN0b3IucGFuZWxzLnJlc291cmNlcy5fZW5hYmxlUmVzb3VyY2VUcmFja2luZygpOwot ICAgIHRoaXMudGFrZUNvbnRyb2woKTsKLX07Ci0KLQotLyoqCiAgKiBUZXN0cyB0aGF0IHByb2Zp bGVyIHdvcmtzLgogICovCiBUZXN0U3VpdGUucHJvdG90eXBlLnRlc3RQcm9maWxlclRhYiA9IGZ1 bmN0aW9uKCkK