20919 2008-09-18 10:35:45 -0700 Constrain the number of messages the inspector shows 2009-12-20 04:41:28 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED InRadar P3 Normal --- 1 kmccullough pfeldman mpcomplete ojan pfeldman timothy yurys oldest_to_newest 91650 0 kmccullough 2008-09-18 10:35:45 -0700 Related to 20904. One solution to too many console messages is to have a cap on how many total messages we show and let it be changeable by the user. <rdar://problem/6229516> 91660 1 ojan 2008-09-18 12:35:40 -0700 Just to be clear, the cap is on how many messages we store as the primary goal here is to cap memory usage. 173346 2 mpcomplete 2009-12-18 15:18:31 -0800 This affects chromium extensions significantly, because they are essentially web pages that run for the lifetime of the browser. I'm going to take a crack at a patch. 173350 3 ojan 2009-12-18 15:26:48 -0800 This might be more complexity than it's worth, but we could have both date and time caps (e.g. message more than 2 days old get dropped). I like the idea of saving as much memory as we can here. Of course, if we do either of these, the value needs to be configurable via a preference that is exposed in the inspector UI in some way. 173561 4 45242 pfeldman 2009-12-19 11:22:06 -0800 Created attachment 45242 [PATCH] Proposed fix 173565 5 45242 darin 2009-12-19 11:29:47 -0800 Comment on attachment 45242 [PATCH] Proposed fix > + m_expiredConsoleMessageCount += 100; > + for (size_t i = 0; i < 100; ++i) > + delete m_consoleMessages[i]; > + m_consoleMessages.remove(0, 100); Should use a named constant for 100 instead of repeating it 3 times. In fact, I think it would be good to put that constant up at the top of the file along with maximumConsoleMessages. > +void InspectorFrontend::updateConsoleMessageExpiredCount(const int count) The const here should be left out. All it does is prevent the function from modifying its local copy of the argument internally. This is not something we should do in WebKit code. > + void updateConsoleMessageExpiredCount(const int count); Ditto. review- so you can fix these minor quibbles 173566 6 45242 darin 2009-12-19 11:30:00 -0800 Comment on attachment 45242 [PATCH] Proposed fix Also seems the argument should be unsigned rather than int. 173570 7 45243 pfeldman 2009-12-19 11:50:28 -0800 Created attachment 45243 [PATCH] Review comments addressed 173715 8 pfeldman 2009-12-20 04:41:28 -0800 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/English.lproj/localizedStrings.js M WebCore/inspector/InspectorController.cpp M WebCore/inspector/InspectorController.h M WebCore/inspector/InspectorFrontend.cpp M WebCore/inspector/InspectorFrontend.h M WebCore/inspector/front-end/inspector.js Committed r52415 45242 2009-12-19 11:22:06 -0800 2009-12-19 11:50:28 -0800 [PATCH] Proposed fix console_limit text/plain 6287 pfeldman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZTIyNWQyZS4uNDVkMWMyYyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNCBAQAorMjAwOS0xMi0xOSAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBDb25zdHJhaW4gdGhlIG51bWJlciBv ZiBtZXNzYWdlcyB0aGUgaW5zcGVjdG9yIHNob3dzLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDkxOQorCisgICAgICAgICogRW5nbGlzaC5scHJv ai9sb2NhbGl6ZWRTdHJpbmdzLmpzOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JDb250 cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXI6Okluc3Bl Y3RvckNvbnRyb2xsZXIpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6 YWRkQ29uc29sZU1lc3NhZ2UpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxl cjo6Y2xlYXJDb25zb2xlTWVzc2FnZXMpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29u dHJvbGxlcjo6cG9wdWxhdGVTY3JpcHRPYmplY3RzKToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5z cGVjdG9yQ29udHJvbGxlci5oOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVu ZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JGcm9udGVuZDo6dXBkYXRlQ29uc29s ZU1lc3NhZ2VFeHBpcmVkQ291bnQpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JGcm9u dGVuZC5oOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLnVwZGF0ZUNvbnNvbGVNZXNzYWdlRXhwaXJlZENvdW50KToKKwog MjAwOS0xMi0xNyAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KIAogICAg ICAgICBSZXZpZXdlZCBieSBUaW1vdGh5IEhhdGNoZXIuCmRpZmYgLS1naXQgYS9XZWJDb3JlL0Vu Z2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcyBiL1dlYkNvcmUvRW5nbGlzaC5scHJvai9s b2NhbGl6ZWRTdHJpbmdzLmpzCmluZGV4IGEzNzJiMTguLmRlYThiMDUgMTAwNjQ0CkJpbmFyeSBm aWxlcyBhL1dlYkNvcmUvRW5nbGlzaC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzIGFuZCBiL1dl YkNvcmUvRW5nbGlzaC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzIGRpZmZlcgpkaWZmIC0tZ2l0 IGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAgYi9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcAppbmRleCA0OGRmYjhkLi5hYzhkNTc1IDEw MDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcAorKysg Yi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcApAQCAtMTE5LDYgKzEx OSw3IEBAIHN0YXRpYyBjb25zdCBjaGFyKiBjb25zdCBsYXN0QWN0aXZlUGFuZWxTZXR0aW5nTmFt ZSA9ICJsYXN0QWN0aXZlUGFuZWwiOwogc3RhdGljIGNvbnN0IHVuc2lnbmVkIGRlZmF1bHRBdHRh Y2hlZEhlaWdodCA9IDMwMDsKIHN0YXRpYyBjb25zdCBmbG9hdCBtaW5pbXVtQXR0YWNoZWRIZWln aHQgPSAyNTAuMGY7CiBzdGF0aWMgY29uc3QgZmxvYXQgbWF4aW11bUF0dGFjaGVkSGVpZ2h0UmF0 aW8gPSAwLjc1ZjsKK3N0YXRpYyBjb25zdCB1bnNpZ25lZCBtYXhpbXVtQ29uc29sZU1lc3NhZ2Vz ID0gMTAwMDsKIAogc3RhdGljIHVuc2lnbmVkIHNfaW5zcGVjdG9yQ29udHJvbGxlckNvdW50Owog CkBAIC0xMjYsNiArMTI3LDcgQEAgSW5zcGVjdG9yQ29udHJvbGxlcjo6SW5zcGVjdG9yQ29udHJv bGxlcihQYWdlKiBwYWdlLCBJbnNwZWN0b3JDbGllbnQqIGNsaWVudCkKICAgICA6IG1faW5zcGVj dGVkUGFnZShwYWdlKQogICAgICwgbV9jbGllbnQoY2xpZW50KQogICAgICwgbV9wYWdlKDApCisg ICAgLCBtX2V4cGlyZWRDb25zb2xlTWVzc2FnZUNvdW50KDApCiAgICAgLCBtX3NjcmlwdFN0YXRl KDApCiAgICAgLCBtX3dpbmRvd1Zpc2libGUoZmFsc2UpCiAgICAgLCBtX3Nob3dBZnRlclZpc2li bGUoQ3VycmVudFBhbmVsKQpAQCAtMzUzLDEyICszNTUsMjAgQEAgdm9pZCBJbnNwZWN0b3JDb250 cm9sbGVyOjphZGRDb25zb2xlTWVzc2FnZShTY3JpcHRTdGF0ZSogc2NyaXB0U3RhdGUsIENvbnNv bGVNZXMKICAgICAgICAgaWYgKHdpbmRvd1Zpc2libGUoKSkKICAgICAgICAgICAgIG1fcHJldmlv dXNNZXNzYWdlLT5hZGRUb0NvbnNvbGUobV9mcm9udGVuZC5nZXQoKSk7CiAgICAgfQorCisgICAg aWYgKCF3aW5kb3dWaXNpYmxlKCkgJiYgbV9jb25zb2xlTWVzc2FnZXMuc2l6ZSgpID49IG1heGlt dW1Db25zb2xlTWVzc2FnZXMpIHsKKyAgICAgICAgbV9leHBpcmVkQ29uc29sZU1lc3NhZ2VDb3Vu dCArPSAxMDA7CisgICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgMTAwOyArK2kpCisgICAg ICAgICAgICBkZWxldGUgbV9jb25zb2xlTWVzc2FnZXNbaV07CisgICAgICAgIG1fY29uc29sZU1l c3NhZ2VzLnJlbW92ZSgwLCAxMDApOworICAgIH0KIH0KIAogdm9pZCBJbnNwZWN0b3JDb250cm9s bGVyOjpjbGVhckNvbnNvbGVNZXNzYWdlcyhib29sIGNsZWFyVUkpCiB7CiAgICAgZGVsZXRlQWxs VmFsdWVzKG1fY29uc29sZU1lc3NhZ2VzKTsKICAgICBtX2NvbnNvbGVNZXNzYWdlcy5jbGVhcigp OworICAgIG1fZXhwaXJlZENvbnNvbGVNZXNzYWdlQ291bnQgPSAwOwogICAgIG1fcHJldmlvdXNN ZXNzYWdlID0gMDsKICAgICBtX2dyb3VwTGV2ZWwgPSAwOwogICAgIHJlbGVhc2VXcmFwcGVyT2Jq ZWN0R3JvdXAoImNvbnNvbGUiKTsKQEAgLTY1MCw2ICs2NjAsOCBAQCB2b2lkIEluc3BlY3RvckNv bnRyb2xsZXI6OnBvcHVsYXRlU2NyaXB0T2JqZWN0cygpCiAgICAgZm9yIChSZXNvdXJjZXNNYXA6 Oml0ZXJhdG9yIGl0ID0gbV9yZXNvdXJjZXMuYmVnaW4oKTsgaXQgIT0gcmVzb3VyY2VzRW5kOyAr K2l0KQogICAgICAgICBpdC0+c2Vjb25kLT51cGRhdGVTY3JpcHRPYmplY3QobV9mcm9udGVuZC5n ZXQoKSk7CiAKKyAgICBpZiAobV9leHBpcmVkQ29uc29sZU1lc3NhZ2VDb3VudCkKKyAgICAgICAg bV9mcm9udGVuZC0+dXBkYXRlQ29uc29sZU1lc3NhZ2VFeHBpcmVkQ291bnQobV9leHBpcmVkQ29u c29sZU1lc3NhZ2VDb3VudCk7CiAgICAgdW5zaWduZWQgbWVzc2FnZUNvdW50ID0gbV9jb25zb2xl TWVzc2FnZXMuc2l6ZSgpOwogICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBtZXNzYWdlQ291 bnQ7ICsraSkKICAgICAgICAgbV9jb25zb2xlTWVzc2FnZXNbaV0tPmFkZFRvQ29uc29sZShtX2Zy b250ZW5kLmdldCgpKTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNv bnRyb2xsZXIuaCBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuaAppbmRl eCBiYjRlMWYzLi5hNmEzYTk5IDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JDb250cm9sbGVyLmgKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxl ci5oCkBAIC0zMjEsNiArMzIxLDcgQEAgcHJpdmF0ZToKICAgICBIYXNoU2V0PFN0cmluZz4gbV9r bm93blJlc291cmNlczsKICAgICBGcmFtZVJlc291cmNlc01hcCBtX2ZyYW1lUmVzb3VyY2VzOwog ICAgIFZlY3RvcjxDb25zb2xlTWVzc2FnZSo+IG1fY29uc29sZU1lc3NhZ2VzOworICAgIHVuc2ln bmVkIG1fZXhwaXJlZENvbnNvbGVNZXNzYWdlQ291bnQ7CiAgICAgSGFzaE1hcDxTdHJpbmcsIGRv dWJsZT4gbV90aW1lczsKICAgICBIYXNoTWFwPFN0cmluZywgdW5zaWduZWQ+IG1fY291bnRzOwog I2lmIEVOQUJMRShEQVRBQkFTRSkKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3RvckZyb250ZW5kLmNwcCBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kLmNw cAppbmRleCAzNWY2YWIyLi5jYTdhN2UzIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JGcm9udGVuZC5jcHAKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRnJv bnRlbmQuY3BwCkBAIC03Nyw2ICs3NywxNCBAQCB2b2lkIEluc3BlY3RvckZyb250ZW5kOjpkaWRD b21taXRMb2FkKCkKICAgICBjYWxsU2ltcGxlRnVuY3Rpb24oImRpZENvbW1pdExvYWQiKTsKIH0K IAordm9pZCBJbnNwZWN0b3JGcm9udGVuZDo6dXBkYXRlQ29uc29sZU1lc3NhZ2VFeHBpcmVkQ291 bnQoY29uc3QgaW50IGNvdW50KQoreworICAgIFNjcmlwdEZ1bmN0aW9uQ2FsbCBmdW5jdGlvbiht X3NjcmlwdFN0YXRlLCBtX3dlYkluc3BlY3RvciwgImRpc3BhdGNoIik7IAorICAgIGZ1bmN0aW9u LmFwcGVuZEFyZ3VtZW50KCJ1cGRhdGVDb25zb2xlTWVzc2FnZUV4cGlyZWRDb3VudCIpOworICAg IGZ1bmN0aW9uLmFwcGVuZEFyZ3VtZW50KGNvdW50KTsKKyAgICBmdW5jdGlvbi5jYWxsKCk7Cit9 CisKIHZvaWQgSW5zcGVjdG9yRnJvbnRlbmQ6OmFkZENvbnNvbGVNZXNzYWdlKGNvbnN0IFNjcmlw dE9iamVjdCYgbWVzc2FnZU9iaiwgY29uc3QgVmVjdG9yPFNjcmlwdFN0cmluZz4mIGZyYW1lcywg Y29uc3QgVmVjdG9yPFNjcmlwdFZhbHVlPiB3cmFwcGVkQXJndW1lbnRzLCBjb25zdCBTdHJpbmcm IG1lc3NhZ2UpCiB7CiAgICAgU2NyaXB0RnVuY3Rpb25DYWxsIGZ1bmN0aW9uKG1fc2NyaXB0U3Rh dGUsIG1fd2ViSW5zcGVjdG9yLCAiZGlzcGF0Y2giKTsgCmRpZmYgLS1naXQgYS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZC5oIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y RnJvbnRlbmQuaAppbmRleCBhY2U3MDc3Li45MDI4YmY4IDEwMDY0NAotLS0gYS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZC5oCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3RvckZyb250ZW5kLmgKQEAgLTYzLDYgKzYzLDggQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAg ICAgICBTY3JpcHRPYmplY3QgbmV3U2NyaXB0T2JqZWN0KCk7CiAKICAgICAgICAgdm9pZCBkaWRD b21taXRMb2FkKCk7CisKKyAgICAgICAgdm9pZCB1cGRhdGVDb25zb2xlTWVzc2FnZUV4cGlyZWRD b3VudChjb25zdCBpbnQgY291bnQpOwogICAgICAgICB2b2lkIGFkZENvbnNvbGVNZXNzYWdlKGNv bnN0IFNjcmlwdE9iamVjdCYgbWVzc2FnZU9iaiwgY29uc3QgVmVjdG9yPFNjcmlwdFN0cmluZz4m IGZyYW1lcywgY29uc3QgVmVjdG9yPFNjcmlwdFZhbHVlPiB3cmFwcGVkQXJndW1lbnRzLCBjb25z dCBTdHJpbmcmIG1lc3NhZ2UpOwogICAgICAgICB2b2lkIHVwZGF0ZUNvbnNvbGVNZXNzYWdlUmVw ZWF0Q291bnQoY29uc3QgaW50IGNvdW50KTsKICAgICAgICAgdm9pZCBjbGVhckNvbnNvbGVNZXNz YWdlcygpOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rv ci5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKaW5kZXggMmMw NGVkNi4uNGJiYWMzZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2lu c3BlY3Rvci5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpz CkBAIC0xMjI5LDYgKzEyMjksMTIgQEAgV2ViSW5zcGVjdG9yLmRpZENvbW1pdExvYWQgPSBmdW5j dGlvbigpCiAgICAgV2ViSW5zcGVjdG9yLnNldERvY3VtZW50KG51bGwpOwogfQogCitXZWJJbnNw ZWN0b3IudXBkYXRlQ29uc29sZU1lc3NhZ2VFeHBpcmVkQ291bnQgPSBmdW5jdGlvbihjb3VudCkK K3sKKyAgICB2YXIgbWVzc2FnZSA9IFN0cmluZy5zcHJpbnRmKFdlYkluc3BlY3Rvci5VSVN0cmlu ZygiJWQgY29uc29sZSBtZXNzYWdlcyBhcmUgbm90IHNob3duLiIpLCBjb3VudCk7CisgICAgV2Vi SW5zcGVjdG9yLmNvbnNvbGUuYWRkTWVzc2FnZShuZXcgV2ViSW5zcGVjdG9yLkNvbnNvbGVUZXh0 TWVzc2FnZShtZXNzYWdlLCBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZUxldmVs Lldhcm5pbmcpKTsKK30KKwogV2ViSW5zcGVjdG9yLmFkZENvbnNvbGVNZXNzYWdlID0gZnVuY3Rp b24ocGF5bG9hZCkKIHsKICAgICB2YXIgY29uc29sZU1lc3NhZ2UgPSBuZXcgV2ViSW5zcGVjdG9y LkNvbnNvbGVNZXNzYWdlKAo= 45243 2009-12-19 11:50:28 -0800 2009-12-19 17:55:38 -0800 [PATCH] Review comments addressed console_limit text/plain 7399 pfeldman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZTIyNWQyZS4uNDVkMWMyYyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNCBAQAorMjAwOS0xMi0xOSAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBDb25zdHJhaW4gdGhlIG51bWJlciBv ZiBtZXNzYWdlcyB0aGUgaW5zcGVjdG9yIHNob3dzLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDkxOQorCisgICAgICAgICogRW5nbGlzaC5scHJv ai9sb2NhbGl6ZWRTdHJpbmdzLmpzOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JDb250 cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXI6Okluc3Bl Y3RvckNvbnRyb2xsZXIpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6 YWRkQ29uc29sZU1lc3NhZ2UpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxl cjo6Y2xlYXJDb25zb2xlTWVzc2FnZXMpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29u dHJvbGxlcjo6cG9wdWxhdGVTY3JpcHRPYmplY3RzKToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5z cGVjdG9yQ29udHJvbGxlci5oOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVu ZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JGcm9udGVuZDo6dXBkYXRlQ29uc29s ZU1lc3NhZ2VFeHBpcmVkQ291bnQpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JGcm9u dGVuZC5oOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLnVwZGF0ZUNvbnNvbGVNZXNzYWdlRXhwaXJlZENvdW50KToKKwog MjAwOS0xMi0xNyAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KIAogICAg ICAgICBSZXZpZXdlZCBieSBUaW1vdGh5IEhhdGNoZXIuCmRpZmYgLS1naXQgYS9XZWJDb3JlL0Vu Z2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcyBiL1dlYkNvcmUvRW5nbGlzaC5scHJvai9s b2NhbGl6ZWRTdHJpbmdzLmpzCmluZGV4IGEzNzJiMTguLmRlYThiMDUgMTAwNjQ0CkJpbmFyeSBm aWxlcyBhL1dlYkNvcmUvRW5nbGlzaC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzIGFuZCBiL1dl YkNvcmUvRW5nbGlzaC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzIGRpZmZlcgpkaWZmIC0tZ2l0 IGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAgYi9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcAppbmRleCA0OGRmYjhkLi41NTg4ZTliIDEw MDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcAorKysg Yi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcApAQCAtMTE5LDYgKzEx OSw4IEBAIHN0YXRpYyBjb25zdCBjaGFyKiBjb25zdCBsYXN0QWN0aXZlUGFuZWxTZXR0aW5nTmFt ZSA9ICJsYXN0QWN0aXZlUGFuZWwiOwogc3RhdGljIGNvbnN0IHVuc2lnbmVkIGRlZmF1bHRBdHRh Y2hlZEhlaWdodCA9IDMwMDsKIHN0YXRpYyBjb25zdCBmbG9hdCBtaW5pbXVtQXR0YWNoZWRIZWln aHQgPSAyNTAuMGY7CiBzdGF0aWMgY29uc3QgZmxvYXQgbWF4aW11bUF0dGFjaGVkSGVpZ2h0UmF0 aW8gPSAwLjc1ZjsKK3N0YXRpYyBjb25zdCB1bnNpZ25lZCBtYXhpbXVtQ29uc29sZU1lc3NhZ2Vz ID0gMTAwMDsKK3N0YXRpYyBjb25zdCB1bnNpZ25lZCBleHBpcmVDb25zb2xlTWVzc2FnZXNTdGVw ID0gMTAwOwogCiBzdGF0aWMgdW5zaWduZWQgc19pbnNwZWN0b3JDb250cm9sbGVyQ291bnQ7CiAK QEAgLTEyNiw2ICsxMjgsNyBAQCBJbnNwZWN0b3JDb250cm9sbGVyOjpJbnNwZWN0b3JDb250cm9s bGVyKFBhZ2UqIHBhZ2UsIEluc3BlY3RvckNsaWVudCogY2xpZW50KQogICAgIDogbV9pbnNwZWN0 ZWRQYWdlKHBhZ2UpCiAgICAgLCBtX2NsaWVudChjbGllbnQpCiAgICAgLCBtX3BhZ2UoMCkKKyAg ICAsIG1fZXhwaXJlZENvbnNvbGVNZXNzYWdlQ291bnQoMCkKICAgICAsIG1fc2NyaXB0U3RhdGUo MCkKICAgICAsIG1fd2luZG93VmlzaWJsZShmYWxzZSkKICAgICAsIG1fc2hvd0FmdGVyVmlzaWJs ZShDdXJyZW50UGFuZWwpCkBAIC0zNTMsMTIgKzM1NiwyMCBAQCB2b2lkIEluc3BlY3RvckNvbnRy b2xsZXI6OmFkZENvbnNvbGVNZXNzYWdlKFNjcmlwdFN0YXRlKiBzY3JpcHRTdGF0ZSwgQ29uc29s ZU1lcwogICAgICAgICBpZiAod2luZG93VmlzaWJsZSgpKQogICAgICAgICAgICAgbV9wcmV2aW91 c01lc3NhZ2UtPmFkZFRvQ29uc29sZShtX2Zyb250ZW5kLmdldCgpKTsKICAgICB9CisKKyAgICBp ZiAoIXdpbmRvd1Zpc2libGUoKSAmJiBtX2NvbnNvbGVNZXNzYWdlcy5zaXplKCkgPj0gbWF4aW11 bUNvbnNvbGVNZXNzYWdlcykgeworICAgICAgICBtX2V4cGlyZWRDb25zb2xlTWVzc2FnZUNvdW50 ICs9IGV4cGlyZUNvbnNvbGVNZXNzYWdlc1N0ZXA7CisgICAgICAgIGZvciAoc2l6ZV90IGkgPSAw OyBpIDwgZXhwaXJlQ29uc29sZU1lc3NhZ2VzU3RlcDsgKytpKQorICAgICAgICAgICAgZGVsZXRl IG1fY29uc29sZU1lc3NhZ2VzW2ldOworICAgICAgICBtX2NvbnNvbGVNZXNzYWdlcy5yZW1vdmUo MCwgZXhwaXJlQ29uc29sZU1lc3NhZ2VzU3RlcCk7CisgICAgfQogfQogCiB2b2lkIEluc3BlY3Rv ckNvbnRyb2xsZXI6OmNsZWFyQ29uc29sZU1lc3NhZ2VzKGJvb2wgY2xlYXJVSSkKIHsKICAgICBk ZWxldGVBbGxWYWx1ZXMobV9jb25zb2xlTWVzc2FnZXMpOwogICAgIG1fY29uc29sZU1lc3NhZ2Vz LmNsZWFyKCk7CisgICAgbV9leHBpcmVkQ29uc29sZU1lc3NhZ2VDb3VudCA9IDA7CiAgICAgbV9w cmV2aW91c01lc3NhZ2UgPSAwOwogICAgIG1fZ3JvdXBMZXZlbCA9IDA7CiAgICAgcmVsZWFzZVdy YXBwZXJPYmplY3RHcm91cCgiY29uc29sZSIpOwpAQCAtNjUwLDYgKzY2MSw4IEBAIHZvaWQgSW5z cGVjdG9yQ29udHJvbGxlcjo6cG9wdWxhdGVTY3JpcHRPYmplY3RzKCkKICAgICBmb3IgKFJlc291 cmNlc01hcDo6aXRlcmF0b3IgaXQgPSBtX3Jlc291cmNlcy5iZWdpbigpOyBpdCAhPSByZXNvdXJj ZXNFbmQ7ICsraXQpCiAgICAgICAgIGl0LT5zZWNvbmQtPnVwZGF0ZVNjcmlwdE9iamVjdChtX2Zy b250ZW5kLmdldCgpKTsKIAorICAgIGlmIChtX2V4cGlyZWRDb25zb2xlTWVzc2FnZUNvdW50KQor ICAgICAgICBtX2Zyb250ZW5kLT51cGRhdGVDb25zb2xlTWVzc2FnZUV4cGlyZWRDb3VudChtX2V4 cGlyZWRDb25zb2xlTWVzc2FnZUNvdW50KTsKICAgICB1bnNpZ25lZCBtZXNzYWdlQ291bnQgPSBt X2NvbnNvbGVNZXNzYWdlcy5zaXplKCk7CiAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IG1l c3NhZ2VDb3VudDsgKytpKQogICAgICAgICBtX2NvbnNvbGVNZXNzYWdlc1tpXS0+YWRkVG9Db25z b2xlKG1fZnJvbnRlbmQuZ2V0KCkpOwpAQCAtMTAzOSw3ICsxMDUyLDcgQEAgdm9pZCBJbnNwZWN0 b3JDb250cm9sbGVyOjpzY3JpcHRJbXBvcnRlZCh1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGNv bnN0IFN0cmluZyYKICAgICAvLyBGSVhNRTogaW1wb3J0ZWQgc2NyaXB0IGFuZCBYSFIgcmVzcG9u c2UgYXJlIGN1cnJlbnRseSB2aWV3ZWQgYXMgdGhlIHNhbWUKICAgICAvLyB0aGluZyBieSB0aGUg SW5zcGVjdG9yLiBUaGV5IHNob3VsZCBiZSBtYWRlIGludG8gZGlzdGluY3QgdHlwZXMuCiAgICAg cmVzb3VyY2UtPnNldFhNTEh0dHBSZXNwb25zZVRleHQoU2NyaXB0U3RyaW5nKHNvdXJjZVN0cmlu ZykpOwotICAgIAorCiAgICAgaWYgKHdpbmRvd1Zpc2libGUoKSkKICAgICAgICAgcmVzb3VyY2Ut PnVwZGF0ZVNjcmlwdE9iamVjdChtX2Zyb250ZW5kLmdldCgpKTsKIH0KZGlmZiAtLWdpdCBhL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuaCBiL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3RvckNvbnRyb2xsZXIuaAppbmRleCBiYjRlMWYzLi5hNmEzYTk5IDEwMDY0NAotLS0g YS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmgKKysrIGIvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5oCkBAIC0zMjEsNiArMzIxLDcgQEAgcHJpdmF0 ZToKICAgICBIYXNoU2V0PFN0cmluZz4gbV9rbm93blJlc291cmNlczsKICAgICBGcmFtZVJlc291 cmNlc01hcCBtX2ZyYW1lUmVzb3VyY2VzOwogICAgIFZlY3RvcjxDb25zb2xlTWVzc2FnZSo+IG1f Y29uc29sZU1lc3NhZ2VzOworICAgIHVuc2lnbmVkIG1fZXhwaXJlZENvbnNvbGVNZXNzYWdlQ291 bnQ7CiAgICAgSGFzaE1hcDxTdHJpbmcsIGRvdWJsZT4gbV90aW1lczsKICAgICBIYXNoTWFwPFN0 cmluZywgdW5zaWduZWQ+IG1fY291bnRzOwogI2lmIEVOQUJMRShEQVRBQkFTRSkKZGlmZiAtLWdp dCBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kLmNwcCBiL1dlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3RvckZyb250ZW5kLmNwcAppbmRleCAzNWY2YWIyLi42YTJjNjI5IDEwMDY0 NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZC5jcHAKKysrIGIvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmQuY3BwCkBAIC03Nyw2ICs3NywxNCBAQCB2 b2lkIEluc3BlY3RvckZyb250ZW5kOjpkaWRDb21taXRMb2FkKCkKICAgICBjYWxsU2ltcGxlRnVu Y3Rpb24oImRpZENvbW1pdExvYWQiKTsKIH0KIAordm9pZCBJbnNwZWN0b3JGcm9udGVuZDo6dXBk YXRlQ29uc29sZU1lc3NhZ2VFeHBpcmVkQ291bnQodW5zaWduZWQgY291bnQpCit7CisgICAgU2Ny aXB0RnVuY3Rpb25DYWxsIGZ1bmN0aW9uKG1fc2NyaXB0U3RhdGUsIG1fd2ViSW5zcGVjdG9yLCAi ZGlzcGF0Y2giKTsgCisgICAgZnVuY3Rpb24uYXBwZW5kQXJndW1lbnQoInVwZGF0ZUNvbnNvbGVN ZXNzYWdlRXhwaXJlZENvdW50Iik7CisgICAgZnVuY3Rpb24uYXBwZW5kQXJndW1lbnQoY291bnQp OworICAgIGZ1bmN0aW9uLmNhbGwoKTsKK30KKwogdm9pZCBJbnNwZWN0b3JGcm9udGVuZDo6YWRk Q29uc29sZU1lc3NhZ2UoY29uc3QgU2NyaXB0T2JqZWN0JiBtZXNzYWdlT2JqLCBjb25zdCBWZWN0 b3I8U2NyaXB0U3RyaW5nPiYgZnJhbWVzLCBjb25zdCBWZWN0b3I8U2NyaXB0VmFsdWU+IHdyYXBw ZWRBcmd1bWVudHMsIGNvbnN0IFN0cmluZyYgbWVzc2FnZSkKIHsKICAgICBTY3JpcHRGdW5jdGlv bkNhbGwgZnVuY3Rpb24obV9zY3JpcHRTdGF0ZSwgbV93ZWJJbnNwZWN0b3IsICJkaXNwYXRjaCIp OyAKQEAgLTkzLDcgKzEwMSw3IEBAIHZvaWQgSW5zcGVjdG9yRnJvbnRlbmQ6OmFkZENvbnNvbGVN ZXNzYWdlKGNvbnN0IFNjcmlwdE9iamVjdCYgbWVzc2FnZU9iaiwgY29uc3QKICAgICBmdW5jdGlv bi5jYWxsKCk7CiB9CiAKLXZvaWQgSW5zcGVjdG9yRnJvbnRlbmQ6OnVwZGF0ZUNvbnNvbGVNZXNz YWdlUmVwZWF0Q291bnQoY29uc3QgaW50IGNvdW50KQordm9pZCBJbnNwZWN0b3JGcm9udGVuZDo6 dXBkYXRlQ29uc29sZU1lc3NhZ2VSZXBlYXRDb3VudCh1bnNpZ25lZCBjb3VudCkKIHsKICAgICBT Y3JpcHRGdW5jdGlvbkNhbGwgZnVuY3Rpb24obV9zY3JpcHRTdGF0ZSwgbV93ZWJJbnNwZWN0b3Is ICJkaXNwYXRjaCIpOyAKICAgICBmdW5jdGlvbi5hcHBlbmRBcmd1bWVudCgidXBkYXRlQ29uc29s ZU1lc3NhZ2VSZXBlYXRDb3VudCIpOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yRnJvbnRlbmQuaCBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kLmgK aW5kZXggYWNlNzA3Ny4uNzE2MGY1MCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yRnJvbnRlbmQuaAorKysgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVu ZC5oCkBAIC02Myw4ICs2MywxMCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIFNjcmlw dE9iamVjdCBuZXdTY3JpcHRPYmplY3QoKTsKIAogICAgICAgICB2b2lkIGRpZENvbW1pdExvYWQo KTsKKworICAgICAgICB2b2lkIHVwZGF0ZUNvbnNvbGVNZXNzYWdlRXhwaXJlZENvdW50KHVuc2ln bmVkIGNvdW50KTsKICAgICAgICAgdm9pZCBhZGRDb25zb2xlTWVzc2FnZShjb25zdCBTY3JpcHRP YmplY3QmIG1lc3NhZ2VPYmosIGNvbnN0IFZlY3RvcjxTY3JpcHRTdHJpbmc+JiBmcmFtZXMsIGNv bnN0IFZlY3RvcjxTY3JpcHRWYWx1ZT4gd3JhcHBlZEFyZ3VtZW50cywgY29uc3QgU3RyaW5nJiBt ZXNzYWdlKTsKLSAgICAgICAgdm9pZCB1cGRhdGVDb25zb2xlTWVzc2FnZVJlcGVhdENvdW50KGNv bnN0IGludCBjb3VudCk7CisgICAgICAgIHZvaWQgdXBkYXRlQ29uc29sZU1lc3NhZ2VSZXBlYXRD b3VudCh1bnNpZ25lZCBjb3VudCk7CiAgICAgICAgIHZvaWQgY2xlYXJDb25zb2xlTWVzc2FnZXMo KTsKIAogICAgICAgICBib29sIHVwZGF0ZVJlc291cmNlKHVuc2lnbmVkIGxvbmcgaWRlbnRpZmll ciwgY29uc3QgU2NyaXB0T2JqZWN0JiByZXNvdXJjZU9iaik7CmRpZmYgLS1naXQgYS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL2luc3BlY3Rvci5qcwppbmRleCAyYzA0ZWQ2Li40YmJhYzNkIDEwMDY0NAotLS0gYS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCisrKyBiL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKQEAgLTEyMjksNiArMTIyOSwxMiBAQCBXZWJJ bnNwZWN0b3IuZGlkQ29tbWl0TG9hZCA9IGZ1bmN0aW9uKCkKICAgICBXZWJJbnNwZWN0b3Iuc2V0 RG9jdW1lbnQobnVsbCk7CiB9CiAKK1dlYkluc3BlY3Rvci51cGRhdGVDb25zb2xlTWVzc2FnZUV4 cGlyZWRDb3VudCA9IGZ1bmN0aW9uKGNvdW50KQoreworICAgIHZhciBtZXNzYWdlID0gU3RyaW5n LnNwcmludGYoV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCIlZCBjb25zb2xlIG1lc3NhZ2VzIGFyZSBu b3Qgc2hvd24uIiksIGNvdW50KTsKKyAgICBXZWJJbnNwZWN0b3IuY29uc29sZS5hZGRNZXNzYWdl KG5ldyBXZWJJbnNwZWN0b3IuQ29uc29sZVRleHRNZXNzYWdlKG1lc3NhZ2UsIFdlYkluc3BlY3Rv ci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlTGV2ZWwuV2FybmluZykpOworfQorCiBXZWJJbnNwZWN0 b3IuYWRkQ29uc29sZU1lc3NhZ2UgPSBmdW5jdGlvbihwYXlsb2FkKQogewogICAgIHZhciBjb25z b2xlTWVzc2FnZSA9IG5ldyBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UoCg==