52377 2011-01-13 10:22:57 -0800 Web Inspector: provide script column offset to frontend 2011-01-14 07:50:06 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 podivilov podivilov apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 333769 0 podivilov 2011-01-13 10:22:57 -0800 Web Inspector: provide script column offset to frontend. This is needed for script beautification and live edit in HTML. 333771 1 78825 podivilov 2011-01-13 10:24:33 -0800 Created attachment 78825 Patch. 334226 2 78825 yurys 2011-01-14 03:02:40 -0800 Comment on attachment 78825 Patch. View in context: https://bugs.webkit.org/attachment.cgi?id=78825&action=review > Source/JavaScriptCore/parser/SourceCode.h:33 > +#include <wtf/text/TextPosition.h> Mind alphabetical order. > Source/JavaScriptCore/parser/SourceCode.h:54 > + , m_columnOffset(0) Why not pass column as additional parameter? > Source/JavaScriptCore/parser/SourceCode.h:63 > + , m_columnOffset(0) Why not pass column as additional parameter? > Source/JavaScriptCore/parser/SourceCode.h:88 > + int lineOffset() const { return m_lineOffset; } There should be only one of firstLine/lineOffset. Also offset is already used as a linear position in the source string and using the same term for line/column might confuse people. 334249 3 78928 podivilov 2011-01-14 05:11:09 -0800 Created attachment 78928 Comments addressed. 334277 4 78928 yurys 2011-01-14 06:23:18 -0800 Comment on attachment 78928 Comments addressed. View in context: https://bugs.webkit.org/attachment.cgi?id=78928&action=review > Source/WebCore/inspector/front-end/Script.js:31 > + this.lineOffset = lineOffset; Consider using the same names as in SourceCode.h for consistency. > Source/WebCore/inspector/front-end/Script.js:36 > + this.startingLine = lineOffset + 1; Please remove this field and use only lineOffset, clients should add 1 when needed. 334302 5 podivilov 2011-01-14 07:50:06 -0800 Committed r75794: <http://trac.webkit.org/changeset/75794> 78825 2011-01-13 10:24:33 -0800 2011-01-14 05:11:09 -0800 Patch. patch text/plain 13479 podivilov ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDg3MWJjYjMuLjEyYzA4OTMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDExLTAxLTEzICBQYXZlbCBQb2Rpdmls b3YgIDxwb2Rpdmlsb3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IHByb3ZpZGUgc2NyaXB0IGNvbHVt biBvZmZzZXQgdG8gZnJvbnRlbmQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD01MjM3NworCisgICAgICAgICogcGFyc2VyL1NvdXJjZUNvZGUuaDoKKyAg ICAgICAgKEpTQzo6U291cmNlQ29kZTo6U291cmNlQ29kZSk6CisgICAgICAgIChKU0M6OlNvdXJj ZUNvZGU6OmZpcnN0TGluZSk6CisgICAgICAgIChKU0M6OlNvdXJjZUNvZGU6OmxpbmVPZmZzZXQp OgorICAgICAgICAoSlNDOjpTb3VyY2VDb2RlOjpjb2x1bW5PZmZzZXQpOgorCiAyMDExLTAxLTEy ICBYYW4gTG9wZXogIDx4bG9wZXpAaWdhbGlhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBN YXJ0aW4gUm9iaW5zb24uCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcGFyc2Vy L1NvdXJjZUNvZGUuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIvU291cmNlQ29kZS5o CmluZGV4IDliYTRkYTMuLjMwYTQwY2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9wYXJzZXIvU291cmNlQ29kZS5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIv U291cmNlQ29kZS5oCkBAIC0zMCw2ICszMCw3IEBACiAjZGVmaW5lIFNvdXJjZUNvZGVfaAogCiAj aW5jbHVkZSAiU291cmNlUHJvdmlkZXIuaCIKKyNpbmNsdWRlIDx3dGYvdGV4dC9UZXh0UG9zaXRp b24uaD4KICNpbmNsdWRlIDx3dGYvUmVmUHRyLmg+CiAKIG5hbWVzcGFjZSBKU0MgewpAQCAtNDAs NyArNDEsOCBAQCBuYW1lc3BhY2UgSlNDIHsKICAgICAgICAgICAgIDogbV9wcm92aWRlcigwKQog ICAgICAgICAgICAgLCBtX3N0YXJ0Q2hhcigwKQogICAgICAgICAgICAgLCBtX2VuZENoYXIoMCkK LSAgICAgICAgICAgICwgbV9maXJzdExpbmUoMCkKKyAgICAgICAgICAgICwgbV9saW5lT2Zmc2V0 KDApCisgICAgICAgICAgICAsIG1fY29sdW1uT2Zmc2V0KDApCiAgICAgICAgIHsKICAgICAgICAg fQogCkBAIC00OCw3ICs1MCw4IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICAgICAgOiBtX3By b3ZpZGVyKHByb3ZpZGVyKQogICAgICAgICAgICAgLCBtX3N0YXJ0Q2hhcigwKQogICAgICAgICAg ICAgLCBtX2VuZENoYXIobV9wcm92aWRlci0+bGVuZ3RoKCkpCi0gICAgICAgICAgICAsIG1fZmly c3RMaW5lKHN0ZDo6bWF4KGZpcnN0TGluZSwgMSkpCisgICAgICAgICAgICAsIG1fbGluZU9mZnNl dChzdGQ6Om1heChmaXJzdExpbmUgLSAxLCAwKSkKKyAgICAgICAgICAgICwgbV9jb2x1bW5PZmZz ZXQoMCkKICAgICAgICAgewogICAgICAgICB9CiAKQEAgLTU2LDcgKzU5LDE3IEBAIG5hbWVzcGFj ZSBKU0MgewogICAgICAgICAgICAgOiBtX3Byb3ZpZGVyKHByb3ZpZGVyKQogICAgICAgICAgICAg LCBtX3N0YXJ0Q2hhcihzdGFydCkKICAgICAgICAgICAgICwgbV9lbmRDaGFyKGVuZCkKLSAgICAg ICAgICAgICwgbV9maXJzdExpbmUoc3RkOjptYXgoZmlyc3RMaW5lLCAxKSkKKyAgICAgICAgICAg ICwgbV9saW5lT2Zmc2V0KHN0ZDo6bWF4KGZpcnN0TGluZSAtIDEsIDApKQorICAgICAgICAgICAg LCBtX2NvbHVtbk9mZnNldCgwKQorICAgICAgICB7CisgICAgICAgIH0KKworICAgICAgICBTb3Vy Y2VDb2RlKFBhc3NSZWZQdHI8U291cmNlUHJvdmlkZXI+IHByb3ZpZGVyLCBjb25zdCBUZXh0UG9z aXRpb24xJiBzdGFydFBvc2l0aW9uKQorICAgICAgICAgICAgOiBtX3Byb3ZpZGVyKHByb3ZpZGVy KQorICAgICAgICAgICAgLCBtX3N0YXJ0Q2hhcigwKQorICAgICAgICAgICAgLCBtX2VuZENoYXIo bV9wcm92aWRlci0+bGVuZ3RoKCkpCisgICAgICAgICAgICAsIG1fbGluZU9mZnNldChzdGFydFBv c2l0aW9uLm1fbGluZS5jb252ZXJ0QXNaZXJvQmFzZWRJbnQoKSkKKyAgICAgICAgICAgICwgbV9j b2x1bW5PZmZzZXQoc3RhcnRQb3NpdGlvbi5tX2NvbHVtbi5jb252ZXJ0QXNaZXJvQmFzZWRJbnQo KSkKICAgICAgICAgewogICAgICAgICB9CiAKQEAgLTY5LDkgKzgyLDExIEBAIG5hbWVzcGFjZSBK U0MgewogICAgICAgICAKICAgICAgICAgYm9vbCBpc051bGwoKSBjb25zdCB7IHJldHVybiAhbV9w cm92aWRlcjsgfQogICAgICAgICBTb3VyY2VQcm92aWRlciogcHJvdmlkZXIoKSBjb25zdCB7IHJl dHVybiBtX3Byb3ZpZGVyLmdldCgpOyB9Ci0gICAgICAgIGludCBmaXJzdExpbmUoKSBjb25zdCB7 IHJldHVybiBtX2ZpcnN0TGluZTsgfQorICAgICAgICBpbnQgZmlyc3RMaW5lKCkgY29uc3QgeyBy ZXR1cm4gbV9saW5lT2Zmc2V0ICsgMTsgfQogICAgICAgICBpbnQgc3RhcnRPZmZzZXQoKSBjb25z dCB7IHJldHVybiBtX3N0YXJ0Q2hhcjsgfQogICAgICAgICBpbnQgZW5kT2Zmc2V0KCkgY29uc3Qg eyByZXR1cm4gbV9lbmRDaGFyOyB9CisgICAgICAgIGludCBsaW5lT2Zmc2V0KCkgY29uc3QgeyBy ZXR1cm4gbV9saW5lT2Zmc2V0OyB9CisgICAgICAgIGludCBjb2x1bW5PZmZzZXQoKSBjb25zdCB7 IHJldHVybiBtX2NvbHVtbk9mZnNldDsgfQogICAgICAgICBjb25zdCBVQ2hhciogZGF0YSgpIGNv bnN0IHsgcmV0dXJuIG1fcHJvdmlkZXItPmRhdGEoKSArIG1fc3RhcnRDaGFyOyB9CiAgICAgICAg IGludCBsZW5ndGgoKSBjb25zdCB7IHJldHVybiBtX2VuZENoYXIgLSBtX3N0YXJ0Q2hhcjsgfQog CkBAIC03OSw3ICs5NCw4IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICBSZWZQdHI8U291cmNl UHJvdmlkZXI+IG1fcHJvdmlkZXI7CiAgICAgICAgIGludCBtX3N0YXJ0Q2hhcjsKICAgICAgICAg aW50IG1fZW5kQ2hhcjsKLSAgICAgICAgaW50IG1fZmlyc3RMaW5lOworICAgICAgICBpbnQgbV9s aW5lT2Zmc2V0OworICAgICAgICBpbnQgbV9jb2x1bW5PZmZzZXQ7CiAgICAgfTsKIAogICAgIGlu bGluZSBTb3VyY2VDb2RlIG1ha2VTb3VyY2UoY29uc3QgVVN0cmluZyYgc291cmNlLCBjb25zdCBV U3RyaW5nJiB1cmwgPSBVU3RyaW5nKCksIGludCBmaXJzdExpbmUgPSAxKQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4 IGM5MTVhYzcuLjNkNDZkMzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwor KysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOCBAQAorMjAxMS0wMS0x MyAgUGF2ZWwgUG9kaXZpbG92ICA8cG9kaXZpbG92QGNocm9taXVtLm9yZz4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBwcm92 aWRlIHNjcmlwdCBjb2x1bW4gb2Zmc2V0IHRvIGZyb250ZW5kLgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTIzNzcKKworICAgICAgICAqIGJpbmRpbmdz L2pzL1NjcmlwdERlYnVnU2VydmVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcmlwdERlYnVn U2VydmVyOjpkaXNwYXRjaERpZFBhcnNlU291cmNlKToKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9T Y3JpcHRTb3VyY2VDb2RlLmg6CisgICAgICAgIChXZWJDb3JlOjpTY3JpcHRTb3VyY2VDb2RlOjpT Y3JpcHRTb3VyY2VDb2RlKToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9EZWJ1Z2dlclNjcmlwdC5q czoKKyAgICAgICAgKCk6CisgICAgICAgICogYmluZGluZ3MvdjgvU2NyaXB0RGVidWdTZXJ2ZXIu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6U2NyaXB0RGVidWdTZXJ2ZXI6OmRpc3BhdGNoRGlkUGFy c2VTb3VyY2UpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3IuaWRsOgorICAgICAgICAq IGluc3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 Okluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OmRpZFBhcnNlU291cmNlKToKKyAgICAgICAgKiBpbnNw ZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5oOgorICAgICAgICAqIGluc3BlY3Rvci9TY3Jp cHREZWJ1Z0xpc3RlbmVyLmg6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dl ck1vZGVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTW9kZWwucHJvdG90eXBl LnBhcnNlZFNjcmlwdFNvdXJjZSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TY3Jp cHQuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0KToKKwogMjAxMS0wMS0xMiAgUnlv c3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBFcmlj IFNlaWRlbC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdERl YnVnU2VydmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdERlYnVnU2Vy dmVyLmNwcAppbmRleCAxMGRmMjIzLi4zM2RkOTViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9iaW5kaW5ncy9qcy9TY3JpcHREZWJ1Z1NlcnZlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv YmluZGluZ3MvanMvU2NyaXB0RGVidWdTZXJ2ZXIuY3BwCkBAIC0yODcsMTIgKzI4NywxMSBAQCB2 b2lkIFNjcmlwdERlYnVnU2VydmVyOjpkaXNwYXRjaERpZFBhcnNlU291cmNlKGNvbnN0IExpc3Rl bmVyU2V0JiBsaXN0ZW5lcnMsIGNvbgogICAgIFN0cmluZyBzb3VyY2VJRCA9IHVzdHJpbmdUb1N0 cmluZyhKU0M6OlVTdHJpbmc6Om51bWJlcihzb3VyY2UucHJvdmlkZXIoKS0+YXNJRCgpKSk7CiAg ICAgU3RyaW5nIHVybCA9IHVzdHJpbmdUb1N0cmluZyhzb3VyY2UucHJvdmlkZXIoKS0+dXJsKCkp OwogICAgIFN0cmluZyBkYXRhID0gdXN0cmluZ1RvU3RyaW5nKEpTQzo6VVN0cmluZyhzb3VyY2Uu ZGF0YSgpLCBzb3VyY2UubGVuZ3RoKCkpKTsKLSAgICBpbnQgZmlyc3RMaW5lID0gc291cmNlLmZp cnN0TGluZSgpOwogCiAgICAgVmVjdG9yPFNjcmlwdERlYnVnTGlzdGVuZXIqPiBjb3B5OwogICAg IGNvcHlUb1ZlY3RvcihsaXN0ZW5lcnMsIGNvcHkpOwogICAgIGZvciAoc2l6ZV90IGkgPSAwOyBp IDwgY29weS5zaXplKCk7ICsraSkKLSAgICAgICAgY29weVtpXS0+ZGlkUGFyc2VTb3VyY2Uoc291 cmNlSUQsIHVybCwgZGF0YSwgZmlyc3RMaW5lLCB3b3JsZFR5cGUpOworICAgICAgICBjb3B5W2ld LT5kaWRQYXJzZVNvdXJjZShzb3VyY2VJRCwgdXJsLCBkYXRhLCBzb3VyY2UubGluZU9mZnNldCgp LCBzb3VyY2UuY29sdW1uT2Zmc2V0KCksIHdvcmxkVHlwZSk7CiB9CiAKIHZvaWQgU2NyaXB0RGVi dWdTZXJ2ZXI6OmRpc3BhdGNoRmFpbGVkVG9QYXJzZVNvdXJjZShjb25zdCBMaXN0ZW5lclNldCYg bGlzdGVuZXJzLCBjb25zdCBTb3VyY2VDb2RlJiBzb3VyY2UsIGludCBlcnJvckxpbmUsIGNvbnN0 IFN0cmluZyYgZXJyb3JNZXNzYWdlKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGlu Z3MvanMvU2NyaXB0U291cmNlQ29kZS5oIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvU2Ny aXB0U291cmNlQ29kZS5oCmluZGV4IDA5MmVlYjguLjZjZjM5ODcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdFNvdXJjZUNvZGUuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy9qcy9TY3JpcHRTb3VyY2VDb2RlLmgKQEAgLTQ0LDcgKzQ0LDcgQEAgY2xh c3MgU2NyaXB0U291cmNlQ29kZSB7CiBwdWJsaWM6CiAgICAgU2NyaXB0U291cmNlQ29kZShjb25z dCBTdHJpbmcmIHNvdXJjZSwgY29uc3QgS1VSTCYgdXJsID0gS1VSTCgpLCBjb25zdCBUZXh0UG9z aXRpb24xJiBzdGFydFBvc2l0aW9uID0gVGV4dFBvc2l0aW9uMTo6bWluaW11bVBvc2l0aW9uKCkp CiAgICAgICAgIDogbV9wcm92aWRlcihTdHJpbmdTb3VyY2VQcm92aWRlcjo6Y3JlYXRlKHNvdXJj ZSwgdXJsLmlzTnVsbCgpID8gU3RyaW5nKCkgOiB1cmwuc3RyaW5nKCkpKQotICAgICAgICAsIG1f Y29kZShtX3Byb3ZpZGVyLCBzdGFydFBvc2l0aW9uLm1fbGluZS5vbmVCYXNlZEludCgpKQorICAg ICAgICAsIG1fY29kZShtX3Byb3ZpZGVyLCBzdGFydFBvc2l0aW9uKQogICAgICAgICAsIG1fdXJs KHVybCkKICAgICB7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv djgvRGVidWdnZXJTY3JpcHQuanMgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9EZWJ1Z2dl clNjcmlwdC5qcwppbmRleCA1MGY3OTFkLi44YzlkOThlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy92OC9EZWJ1Z2dlclNjcmlwdC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy92OC9EZWJ1Z2dlclNjcmlwdC5qcwpAQCAtODMsOCArODMsOCBAQCBEZWJ1Z2dlclNj cmlwdC5fZm9ybWF0U2NyaXB0ID0gZnVuY3Rpb24oc2NyaXB0KQogICAgICAgICBpZDogc2NyaXB0 LmlkLAogICAgICAgICBuYW1lOiBzY3JpcHQubmFtZU9yU291cmNlVVJMKCksCiAgICAgICAgIHNv dXJjZTogc2NyaXB0LnNvdXJjZSwKLSAgICAgICAgbGluZU9mZnNldDogRGVidWdnZXJTY3JpcHQu X3Y4VG9XZWJraXRMaW5lTnVtYmVyKHNjcmlwdC5saW5lX29mZnNldCksCi0gICAgICAgIGxpbmVD b3VudDogc2NyaXB0LmxpbmVDb3VudCgpLAorICAgICAgICBsaW5lT2Zmc2V0OiBzY3JpcHQubGlu ZV9vZmZzZXQsCisgICAgICAgIGNvbHVtbk9mZnNldDogc2NyaXB0LmNvbHVtbl9vZmZzZXQsCiAg ICAgICAgIHNjcmlwdFdvcmxkVHlwZTogc2NyaXB0V29ybGRUeXBlCiAgICAgfTsKIH0KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdERlYnVnU2VydmVyLmNwcCBi L1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdERlYnVnU2VydmVyLmNwcAppbmRleCA0 YjQ2MTFhLi4xYzcwYTBlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9T Y3JpcHREZWJ1Z1NlcnZlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvU2Ny aXB0RGVidWdTZXJ2ZXIuY3BwCkBAIC00NDcsNiArNDQ3LDcgQEAgdm9pZCBTY3JpcHREZWJ1Z1Nl cnZlcjo6ZGlzcGF0Y2hEaWRQYXJzZVNvdXJjZShTY3JpcHREZWJ1Z0xpc3RlbmVyKiBsaXN0ZW5l ciwgdjgKICAgICAgICAgdG9XZWJDb3JlU3RyaW5nV2l0aE51bGxPclVuZGVmaW5lZENoZWNrKG9i amVjdC0+R2V0KHY4OjpTdHJpbmc6Ok5ldygibmFtZSIpKSksCiAgICAgICAgIHRvV2ViQ29yZVN0 cmluZ1dpdGhOdWxsT3JVbmRlZmluZWRDaGVjayhvYmplY3QtPkdldCh2ODo6U3RyaW5nOjpOZXco InNvdXJjZSIpKSksCiAgICAgICAgIG9iamVjdC0+R2V0KHY4OjpTdHJpbmc6Ok5ldygibGluZU9m ZnNldCIpKS0+VG9JbnRlZ2VyKCktPlZhbHVlKCksCisgICAgICAgIG9iamVjdC0+R2V0KHY4OjpT dHJpbmc6Ok5ldygiY29sdW1uT2Zmc2V0IikpLT5Ub0ludGVnZXIoKS0+VmFsdWUoKSwKICAgICAg ICAgc3RhdGljX2Nhc3Q8U2NyaXB0V29ybGRUeXBlPihvYmplY3QtPkdldCh2ODo6U3RyaW5nOjpO ZXcoInNjcmlwdFdvcmxkVHlwZSIpKS0+SW50MzJWYWx1ZSgpKSk7CiB9CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuaWRsIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3Rvci5pZGwKaW5kZXggZWQwMGNjNy4uOGJlNmI2MiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5pZGwKKysrIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5pZGwKQEAgLTIyOSw3ICsyMjksNyBAQCBtb2R1bGUg Y29yZSB7CiAKICAgICAgICAgW25vdGlmeSwgZG9tYWluPURlYnVnZ2VyXSB2b2lkIGF0dGFjaERl YnVnZ2VyV2hlblNob3duKCk7IC8vIEZJWE1FOiBkbyBzb21ldGhpbmcgd2l0aCB0aGlzIGV2ZW50 dWFsbHkuCiAKLSAgICAgICAgW25vdGlmeSwgZG9tYWluPURlYnVnZ2VyXSB2b2lkIHBhcnNlZFNj cmlwdFNvdXJjZShvdXQgU3RyaW5nIHNvdXJjZUlELCBvdXQgU3RyaW5nIHVybCwgb3V0IFN0cmlu ZyBkYXRhLCBvdXQgaW50IGZpcnN0TGluZSwgb3V0IGludCBzY3JpcHRXb3JsZFR5cGUpOworICAg ICAgICBbbm90aWZ5LCBkb21haW49RGVidWdnZXJdIHZvaWQgcGFyc2VkU2NyaXB0U291cmNlKG91 dCBTdHJpbmcgc291cmNlSUQsIG91dCBTdHJpbmcgdXJsLCBvdXQgaW50IGxpbmVPZmZzZXQsIG91 dCBpbnQgY29sdW1uT2Zmc2V0LCBvdXQgaW50IHNjcmlwdFdvcmxkVHlwZSk7CiAgICAgICAgIFtu b3RpZnksIGRvbWFpbj1EZWJ1Z2dlcl0gdm9pZCBmYWlsZWRUb1BhcnNlU2NyaXB0U291cmNlKG91 dCBTdHJpbmcgdXJsLCBvdXQgU3RyaW5nIGRhdGEsIG91dCBpbnQgZmlyc3RMaW5lLCBvdXQgaW50 IGVycm9yTGluZSwgb3V0IFN0cmluZyBlcnJvck1lc3NhZ2UpOwogCiAgICAgICAgIFtkb21haW49 RGVidWdnZXJdIHZvaWQgYWN0aXZhdGVCcmVha3BvaW50cygpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuY3BwIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuY3BwCmluZGV4IGU5OTljNzUu LjgyYzI1MGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JE ZWJ1Z2dlckFnZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y RGVidWdnZXJBZ2VudC5jcHAKQEAgLTE5OSwxMCArMTk5LDEwIEBAIFBhc3NSZWZQdHI8SW5zcGVj dG9yVmFsdWU+IEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OmN1cnJlbnRDYWxsRnJhbWVzKCkKIAog Ly8gSmF2YVNjcmlwdERlYnVnTGlzdGVuZXIgZnVuY3Rpb25zCiAKLXZvaWQgSW5zcGVjdG9yRGVi dWdnZXJBZ2VudDo6ZGlkUGFyc2VTb3VyY2UoY29uc3QgU3RyaW5nJiBzb3VyY2VJRCwgY29uc3Qg U3RyaW5nJiB1cmwsIGNvbnN0IFN0cmluZyYgZGF0YSwgaW50IGZpcnN0TGluZSwgU2NyaXB0V29y bGRUeXBlIHdvcmxkVHlwZSkKK3ZvaWQgSW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6ZGlkUGFyc2VT b3VyY2UoY29uc3QgU3RyaW5nJiBzb3VyY2VJRCwgY29uc3QgU3RyaW5nJiB1cmwsIGNvbnN0IFN0 cmluZyYgZGF0YSwgaW50IGxpbmVPZmZzZXQsIGludCBjb2x1bW5PZmZzZXQsIFNjcmlwdFdvcmxk VHlwZSB3b3JsZFR5cGUpCiB7CiAgICAgLy8gRG9uJ3Qgc2VuZCBzY3JpcHQgY29udGVudCB0byB0 aGUgZnJvbnQgZW5kIHVudGlsIGl0J3MgcmVhbGx5IG5lZWRlZC4KLSAgICBtX2Zyb250ZW5kLT5w YXJzZWRTY3JpcHRTb3VyY2Uoc291cmNlSUQsIHVybCwgIiIsIGZpcnN0TGluZSwgd29ybGRUeXBl KTsKKyAgICBtX2Zyb250ZW5kLT5wYXJzZWRTY3JpcHRTb3VyY2Uoc291cmNlSUQsIHVybCwgbGlu ZU9mZnNldCwgY29sdW1uT2Zmc2V0LCB3b3JsZFR5cGUpOwogCiAgICAgbV9zY3JpcHRJRFRvQ29u dGVudC5zZXQoc291cmNlSUQsIGRhdGEpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuaAppbmRleCBkZTUzMGQyLi4wN2QyYWI5IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmgK QEAgLTg3LDcgKzg3LDcgQEAgcHJpdmF0ZToKIAogICAgIFBhc3NSZWZQdHI8SW5zcGVjdG9yVmFs dWU+IGN1cnJlbnRDYWxsRnJhbWVzKCk7CiAKLSAgICB2aXJ0dWFsIHZvaWQgZGlkUGFyc2VTb3Vy Y2UoY29uc3QgU3RyaW5nJiBzb3VyY2VJRCwgY29uc3QgU3RyaW5nJiB1cmwsIGNvbnN0IFN0cmlu ZyYgZGF0YSwgaW50IGZpcnN0TGluZSwgU2NyaXB0V29ybGRUeXBlKTsKKyAgICB2aXJ0dWFsIHZv aWQgZGlkUGFyc2VTb3VyY2UoY29uc3QgU3RyaW5nJiBzb3VyY2VJRCwgY29uc3QgU3RyaW5nJiB1 cmwsIGNvbnN0IFN0cmluZyYgZGF0YSwgaW50IGxpbmVPZmZzZXQsIGludCBjb2x1bW5PZmZzZXQs IFNjcmlwdFdvcmxkVHlwZSk7CiAgICAgdmlydHVhbCB2b2lkIGZhaWxlZFRvUGFyc2VTb3VyY2Uo Y29uc3QgU3RyaW5nJiB1cmwsIGNvbnN0IFN0cmluZyYgZGF0YSwgaW50IGZpcnN0TGluZSwgaW50 IGVycm9yTGluZSwgY29uc3QgU3RyaW5nJiBlcnJvck1lc3NhZ2UpOwogICAgIHZpcnR1YWwgdm9p ZCBkaWRQYXVzZShTY3JpcHRTdGF0ZSopOwogICAgIHZpcnR1YWwgdm9pZCBkaWRDb250aW51ZSgp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL1NjcmlwdERlYnVnTGlzdGVu ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9TY3JpcHREZWJ1Z0xpc3RlbmVyLmgKaW5k ZXggNTk3MzQwMi4uYTI4Y2FiYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L1NjcmlwdERlYnVnTGlzdGVuZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvU2Ny aXB0RGVidWdMaXN0ZW5lci5oCkBAIC00Niw3ICs0Niw3IEBAIGNsYXNzIFNjcmlwdERlYnVnTGlz dGVuZXIgewogcHVibGljOgogICAgIHZpcnR1YWwgflNjcmlwdERlYnVnTGlzdGVuZXIoKSB7IH0K IAotICAgIHZpcnR1YWwgdm9pZCBkaWRQYXJzZVNvdXJjZShjb25zdCBTdHJpbmcmICBzb3VyY2VJ RCwgY29uc3QgU3RyaW5nJiB1cmwsIGNvbnN0IFN0cmluZyYgZGF0YSwgaW50IGZpcnN0TGluZSwg U2NyaXB0V29ybGRUeXBlKSA9IDA7CisgICAgdmlydHVhbCB2b2lkIGRpZFBhcnNlU291cmNlKGNv bnN0IFN0cmluZyYgIHNvdXJjZUlELCBjb25zdCBTdHJpbmcmIHVybCwgY29uc3QgU3RyaW5nJiBk YXRhLCBpbnQgbGluZU9mZnNldCwgaW50IGNvbHVtbk9mZnNldCwgU2NyaXB0V29ybGRUeXBlKSA9 IDA7CiAgICAgdmlydHVhbCB2b2lkIGZhaWxlZFRvUGFyc2VTb3VyY2UoY29uc3QgU3RyaW5nJiB1 cmwsIGNvbnN0IFN0cmluZyYgZGF0YSwgaW50IGZpcnN0TGluZSwgaW50IGVycm9yTGluZSwgY29u c3QgU3RyaW5nJiBlcnJvck1lc3NhZ2UpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgZGlkUGF1c2Uo U2NyaXB0U3RhdGUqKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIGRpZENvbnRpbnVlKCkgPSAwOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlck1v ZGVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlck1vZGVs LmpzCmluZGV4IDVhYjBlMmQuLjE1ZDRmNTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJNb2RlbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyTW9kZWwuanMKQEAgLTIwOCw5ICsyMDgsOSBAQCBX ZWJJbnNwZWN0b3IuRGVidWdnZXJNb2RlbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIFdlYkluc3Bl Y3Rvci5wYW5lbHMuc2NyaXB0cy5kZWJ1Z2dlcldhc0Rpc2FibGVkKCk7CiAgICAgfSwKIAotICAg IHBhcnNlZFNjcmlwdFNvdXJjZTogZnVuY3Rpb24oc291cmNlSUQsIHNvdXJjZVVSTCwgc291cmNl LCBzdGFydGluZ0xpbmUsIHNjcmlwdFdvcmxkVHlwZSkKKyAgICBwYXJzZWRTY3JpcHRTb3VyY2U6 IGZ1bmN0aW9uKHNvdXJjZUlELCBzb3VyY2VVUkwsIGxpbmVPZmZzZXQsIGNvbHVtbk9mZnNldCwg c2NyaXB0V29ybGRUeXBlKQogICAgIHsKLSAgICAgICAgdmFyIHNjcmlwdCA9IG5ldyBXZWJJbnNw ZWN0b3IuU2NyaXB0KHNvdXJjZUlELCBzb3VyY2VVUkwsIHNvdXJjZSwgc3RhcnRpbmdMaW5lLCB1 bmRlZmluZWQsIHVuZGVmaW5lZCwgc2NyaXB0V29ybGRUeXBlKTsKKyAgICAgICAgdmFyIHNjcmlw dCA9IG5ldyBXZWJJbnNwZWN0b3IuU2NyaXB0KHNvdXJjZUlELCBzb3VyY2VVUkwsICIiLCBsaW5l T2Zmc2V0LCBjb2x1bW5PZmZzZXQsIHVuZGVmaW5lZCwgdW5kZWZpbmVkLCBzY3JpcHRXb3JsZFR5 cGUpOwogICAgICAgICB0aGlzLl9zY3JpcHRzW3NvdXJjZUlEXSA9IHNjcmlwdDsKICAgICAgICAg dGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTW9kZWwu RXZlbnRzLlBhcnNlZFNjcmlwdFNvdXJjZSwgc291cmNlSUQpOwogICAgIH0sCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdC5qcyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0LmpzCmluZGV4IDUyN2RkOWQuLmM4ZTI0 YTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0 LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0LmpzCkBA IC0yMywxNSArMjMsMTcgQEAKICAqIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBP RiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAgKi8KIAotV2ViSW5zcGVjdG9yLlNj cmlwdCA9IGZ1bmN0aW9uKHNvdXJjZUlELCBzb3VyY2VVUkwsIHNvdXJjZSwgc3RhcnRpbmdMaW5l LCBlcnJvckxpbmUsIGVycm9yTWVzc2FnZSwgd29ybGRUeXBlKQorV2ViSW5zcGVjdG9yLlNjcmlw dCA9IGZ1bmN0aW9uKHNvdXJjZUlELCBzb3VyY2VVUkwsIHNvdXJjZSwgbGluZU9mZnNldCwgY29s dW1uT2Zmc2V0LCBlcnJvckxpbmUsIGVycm9yTWVzc2FnZSwgd29ybGRUeXBlKQogewogICAgIHRo aXMuc291cmNlSUQgPSBzb3VyY2VJRDsKICAgICB0aGlzLnNvdXJjZVVSTCA9IHNvdXJjZVVSTDsK ICAgICB0aGlzLl9zb3VyY2UgPSBzb3VyY2U7Ci0gICAgdGhpcy5zdGFydGluZ0xpbmUgPSBzdGFy dGluZ0xpbmU7CisgICAgdGhpcy5saW5lT2Zmc2V0ID0gbGluZU9mZnNldDsKKyAgICB0aGlzLmNv bHVtbk9mZnNldCA9IGNvbHVtbk9mZnNldDsKICAgICB0aGlzLmVycm9yTGluZSA9IGVycm9yTGlu ZTsKICAgICB0aGlzLmVycm9yTWVzc2FnZSA9IGVycm9yTWVzc2FnZTsKICAgICB0aGlzLndvcmxk VHlwZSA9IHdvcmxkVHlwZTsKKyAgICB0aGlzLnN0YXJ0aW5nTGluZSA9IGxpbmVPZmZzZXQgKyAx OwogCiAgICAgLy8gaWYgbm8gVVJMLCBsb29rIGZvciAiLy9AIHNvdXJjZVVSTD0iIGRlY29yYXRv cgogICAgIC8vIG5vdGUgdGhhdCB0aGlzIHNvdXJjZVVSTCBjb21tZW50IGRlY29yYXRvciBpcyBi ZWhhdmlvciB0aGF0IEZpcmVCdWcgYWRkZWQK 78928 2011-01-14 05:11:09 -0800 2011-01-14 06:23:18 -0800 Comments addressed. patch text/plain 13270 podivilov ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDJlMDMxNzEuLmFmMTY1YzUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDExLTAxLTE0ICBQYXZlbCBQb2Rpdmls b3YgIDxwb2Rpdmlsb3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IHByb3ZpZGUgc2NyaXB0IGNvbHVt biBvZmZzZXQgdG8gZnJvbnRlbmQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD01MjM3NworCisgICAgICAgICogcGFyc2VyL1NvdXJjZUNvZGUuaDoKKyAg ICAgICAgKEpTQzo6U291cmNlQ29kZTo6U291cmNlQ29kZSk6CisgICAgICAgIChKU0M6OlNvdXJj ZUNvZGU6OmZpcnN0Q29sdW1uKToKKwogMjAxMS0wMS0xMyAgRGFyaW4gQWRsZXIgIDxkYXJpbkBh cHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgR2VvZmYgR2FyZW4uCmRpZmYgLS1naXQg YS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcGFyc2VyL1NvdXJjZUNvZGUuaCBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9wYXJzZXIvU291cmNlQ29kZS5oCmluZGV4IDliYTRkYTMuLmEzY2U3NTkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIvU291cmNlQ29kZS5oCisrKyBi L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIvU291cmNlQ29kZS5oCkBAIC0zMSw2ICszMSw3 IEBACiAKICNpbmNsdWRlICJTb3VyY2VQcm92aWRlci5oIgogI2luY2x1ZGUgPHd0Zi9SZWZQdHIu aD4KKyNpbmNsdWRlIDx3dGYvdGV4dC9UZXh0UG9zaXRpb24uaD4KIAogbmFtZXNwYWNlIEpTQyB7 CiAKQEAgLTQxLDIyICs0MiwzNCBAQCBuYW1lc3BhY2UgSlNDIHsKICAgICAgICAgICAgICwgbV9z dGFydENoYXIoMCkKICAgICAgICAgICAgICwgbV9lbmRDaGFyKDApCiAgICAgICAgICAgICAsIG1f Zmlyc3RMaW5lKDApCisgICAgICAgICAgICAsIG1fZmlyc3RDb2x1bW4oMCkKICAgICAgICAgewog ICAgICAgICB9CiAKLSAgICAgICAgU291cmNlQ29kZShQYXNzUmVmUHRyPFNvdXJjZVByb3ZpZGVy PiBwcm92aWRlciwgaW50IGZpcnN0TGluZSA9IDEpCisgICAgICAgIFNvdXJjZUNvZGUoUGFzc1Jl ZlB0cjxTb3VyY2VQcm92aWRlcj4gcHJvdmlkZXIsIGludCBmaXJzdExpbmUgPSAxLCBpbnQgZmly c3RDb2x1bW4gPSAxKQogICAgICAgICAgICAgOiBtX3Byb3ZpZGVyKHByb3ZpZGVyKQogICAgICAg ICAgICAgLCBtX3N0YXJ0Q2hhcigwKQogICAgICAgICAgICAgLCBtX2VuZENoYXIobV9wcm92aWRl ci0+bGVuZ3RoKCkpCiAgICAgICAgICAgICAsIG1fZmlyc3RMaW5lKHN0ZDo6bWF4KGZpcnN0TGlu ZSwgMSkpCisgICAgICAgICAgICAsIG1fZmlyc3RDb2x1bW4oc3RkOjptYXgoZmlyc3RDb2x1bW4s IDEpKQogICAgICAgICB7CiAgICAgICAgIH0KIAotICAgICAgICBTb3VyY2VDb2RlKFBhc3NSZWZQ dHI8U291cmNlUHJvdmlkZXI+IHByb3ZpZGVyLCBpbnQgc3RhcnQsIGludCBlbmQsIGludCBmaXJz dExpbmUpCisgICAgICAgIFNvdXJjZUNvZGUoUGFzc1JlZlB0cjxTb3VyY2VQcm92aWRlcj4gcHJv dmlkZXIsIGludCBzdGFydCwgaW50IGVuZCwgaW50IGZpcnN0TGluZSwgaW50IGZpcnN0Q29sdW1u ID0gMSkKICAgICAgICAgICAgIDogbV9wcm92aWRlcihwcm92aWRlcikKICAgICAgICAgICAgICwg bV9zdGFydENoYXIoc3RhcnQpCiAgICAgICAgICAgICAsIG1fZW5kQ2hhcihlbmQpCiAgICAgICAg ICAgICAsIG1fZmlyc3RMaW5lKHN0ZDo6bWF4KGZpcnN0TGluZSwgMSkpCisgICAgICAgICAgICAs IG1fZmlyc3RDb2x1bW4oc3RkOjptYXgoZmlyc3RDb2x1bW4sIDEpKQorICAgICAgICB7CisgICAg ICAgIH0KKworICAgICAgICBTb3VyY2VDb2RlKFBhc3NSZWZQdHI8U291cmNlUHJvdmlkZXI+IHBy b3ZpZGVyLCBjb25zdCBUZXh0UG9zaXRpb24xJiBzdGFydFBvc2l0aW9uKQorICAgICAgICAgICAg OiBtX3Byb3ZpZGVyKHByb3ZpZGVyKQorICAgICAgICAgICAgLCBtX3N0YXJ0Q2hhcigwKQorICAg ICAgICAgICAgLCBtX2VuZENoYXIobV9wcm92aWRlci0+bGVuZ3RoKCkpCisgICAgICAgICAgICAs IG1fZmlyc3RMaW5lKHN0YXJ0UG9zaXRpb24ubV9saW5lLm9uZUJhc2VkSW50KCkpCisgICAgICAg ICAgICAsIG1fZmlyc3RDb2x1bW4oc3RhcnRQb3NpdGlvbi5tX2NvbHVtbi5vbmVCYXNlZEludCgp KQogICAgICAgICB7CiAgICAgICAgIH0KIApAQCAtNzAsNiArODMsNyBAQCBuYW1lc3BhY2UgSlND IHsKICAgICAgICAgYm9vbCBpc051bGwoKSBjb25zdCB7IHJldHVybiAhbV9wcm92aWRlcjsgfQog ICAgICAgICBTb3VyY2VQcm92aWRlciogcHJvdmlkZXIoKSBjb25zdCB7IHJldHVybiBtX3Byb3Zp ZGVyLmdldCgpOyB9CiAgICAgICAgIGludCBmaXJzdExpbmUoKSBjb25zdCB7IHJldHVybiBtX2Zp cnN0TGluZTsgfQorICAgICAgICBpbnQgZmlyc3RDb2x1bW4oKSBjb25zdCB7IHJldHVybiBtX2Zp cnN0Q29sdW1uOyB9CiAgICAgICAgIGludCBzdGFydE9mZnNldCgpIGNvbnN0IHsgcmV0dXJuIG1f c3RhcnRDaGFyOyB9CiAgICAgICAgIGludCBlbmRPZmZzZXQoKSBjb25zdCB7IHJldHVybiBtX2Vu ZENoYXI7IH0KICAgICAgICAgY29uc3QgVUNoYXIqIGRhdGEoKSBjb25zdCB7IHJldHVybiBtX3By b3ZpZGVyLT5kYXRhKCkgKyBtX3N0YXJ0Q2hhcjsgfQpAQCAtODAsNiArOTQsNyBAQCBuYW1lc3Bh Y2UgSlNDIHsKICAgICAgICAgaW50IG1fc3RhcnRDaGFyOwogICAgICAgICBpbnQgbV9lbmRDaGFy OwogICAgICAgICBpbnQgbV9maXJzdExpbmU7CisgICAgICAgIGludCBtX2ZpcnN0Q29sdW1uOwog ICAgIH07CiAKICAgICBpbmxpbmUgU291cmNlQ29kZSBtYWtlU291cmNlKGNvbnN0IFVTdHJpbmcm IHNvdXJjZSwgY29uc3QgVVN0cmluZyYgdXJsID0gVVN0cmluZygpLCBpbnQgZmlyc3RMaW5lID0g MSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3Jl L0NoYW5nZUxvZwppbmRleCA5NjRjNTNjLi4xM2ZmMmFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MjggQEAKKzIwMTEtMDEtMTQgIFBhdmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5v cmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2Vi IEluc3BlY3RvcjogcHJvdmlkZSBzY3JpcHQgY29sdW1uIG9mZnNldCB0byBmcm9udGVuZC4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUyMzc3CisKKyAg ICAgICAgKiBiaW5kaW5ncy9qcy9TY3JpcHREZWJ1Z1NlcnZlci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpTY3JpcHREZWJ1Z1NlcnZlcjo6ZGlzcGF0Y2hEaWRQYXJzZVNvdXJjZSk6CisgICAgICAg ICogYmluZGluZ3MvanMvU2NyaXB0U291cmNlQ29kZS5oOgorICAgICAgICAoV2ViQ29yZTo6U2Ny aXB0U291cmNlQ29kZTo6U2NyaXB0U291cmNlQ29kZSk6CisgICAgICAgICogYmluZGluZ3Mvdjgv RGVidWdnZXJTY3JpcHQuanM6CisgICAgICAgICgpOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L1Nj cmlwdERlYnVnU2VydmVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcmlwdERlYnVnU2VydmVy OjpkaXNwYXRjaERpZFBhcnNlU291cmNlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9y LmlkbDoKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjpkaWRQYXJzZVNvdXJjZSk6 CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuaDoKKyAgICAgICAg KiBpbnNwZWN0b3IvU2NyaXB0RGVidWdMaXN0ZW5lci5oOgorICAgICAgICAqIGluc3BlY3Rvci9m cm9udC1lbmQvRGVidWdnZXJNb2RlbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dl ck1vZGVsLnByb3RvdHlwZS5wYXJzZWRTY3JpcHRTb3VyY2UpOgorICAgICAgICAqIGluc3BlY3Rv ci9mcm9udC1lbmQvU2NyaXB0LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdCk6CisK IDIwMTEtMDEtMTMgIERhbiBCZXJuc3RlaW4gIDxtaXR6QGFwcGxlLmNvbT4KIAogICAgICAgICBS ZXZpZXdlZCBieSBNYXJrIFJvd2UuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy9qcy9TY3JpcHREZWJ1Z1NlcnZlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9T Y3JpcHREZWJ1Z1NlcnZlci5jcHAKaW5kZXggMTBkZjIyMy4uOTg0NTI3NyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvU2NyaXB0RGVidWdTZXJ2ZXIuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdERlYnVnU2VydmVyLmNwcApAQCAtMjg3LDEy ICsyODcsMTEgQEAgdm9pZCBTY3JpcHREZWJ1Z1NlcnZlcjo6ZGlzcGF0Y2hEaWRQYXJzZVNvdXJj ZShjb25zdCBMaXN0ZW5lclNldCYgbGlzdGVuZXJzLCBjb24KICAgICBTdHJpbmcgc291cmNlSUQg PSB1c3RyaW5nVG9TdHJpbmcoSlNDOjpVU3RyaW5nOjpudW1iZXIoc291cmNlLnByb3ZpZGVyKCkt PmFzSUQoKSkpOwogICAgIFN0cmluZyB1cmwgPSB1c3RyaW5nVG9TdHJpbmcoc291cmNlLnByb3Zp ZGVyKCktPnVybCgpKTsKICAgICBTdHJpbmcgZGF0YSA9IHVzdHJpbmdUb1N0cmluZyhKU0M6OlVT dHJpbmcoc291cmNlLmRhdGEoKSwgc291cmNlLmxlbmd0aCgpKSk7Ci0gICAgaW50IGZpcnN0TGlu ZSA9IHNvdXJjZS5maXJzdExpbmUoKTsKIAogICAgIFZlY3RvcjxTY3JpcHREZWJ1Z0xpc3RlbmVy Kj4gY29weTsKICAgICBjb3B5VG9WZWN0b3IobGlzdGVuZXJzLCBjb3B5KTsKICAgICBmb3IgKHNp emVfdCBpID0gMDsgaSA8IGNvcHkuc2l6ZSgpOyArK2kpCi0gICAgICAgIGNvcHlbaV0tPmRpZFBh cnNlU291cmNlKHNvdXJjZUlELCB1cmwsIGRhdGEsIGZpcnN0TGluZSwgd29ybGRUeXBlKTsKKyAg ICAgICAgY29weVtpXS0+ZGlkUGFyc2VTb3VyY2Uoc291cmNlSUQsIHVybCwgZGF0YSwgc291cmNl LmZpcnN0TGluZSgpIC0gMSwgc291cmNlLmZpcnN0Q29sdW1uKCkgLSAxLCB3b3JsZFR5cGUpOwog fQogCiB2b2lkIFNjcmlwdERlYnVnU2VydmVyOjpkaXNwYXRjaEZhaWxlZFRvUGFyc2VTb3VyY2Uo Y29uc3QgTGlzdGVuZXJTZXQmIGxpc3RlbmVycywgY29uc3QgU291cmNlQ29kZSYgc291cmNlLCBp bnQgZXJyb3JMaW5lLCBjb25zdCBTdHJpbmcmIGVycm9yTWVzc2FnZSkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdFNvdXJjZUNvZGUuaCBiL1NvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL2pzL1NjcmlwdFNvdXJjZUNvZGUuaAppbmRleCAwOTJlZWI4Li42Y2YzOTg3 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9TY3JpcHRTb3VyY2VDb2Rl LmgKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvU2NyaXB0U291cmNlQ29kZS5oCkBA IC00NCw3ICs0NCw3IEBAIGNsYXNzIFNjcmlwdFNvdXJjZUNvZGUgewogcHVibGljOgogICAgIFNj cmlwdFNvdXJjZUNvZGUoY29uc3QgU3RyaW5nJiBzb3VyY2UsIGNvbnN0IEtVUkwmIHVybCA9IEtV UkwoKSwgY29uc3QgVGV4dFBvc2l0aW9uMSYgc3RhcnRQb3NpdGlvbiA9IFRleHRQb3NpdGlvbjE6 Om1pbmltdW1Qb3NpdGlvbigpKQogICAgICAgICA6IG1fcHJvdmlkZXIoU3RyaW5nU291cmNlUHJv dmlkZXI6OmNyZWF0ZShzb3VyY2UsIHVybC5pc051bGwoKSA/IFN0cmluZygpIDogdXJsLnN0cmlu ZygpKSkKLSAgICAgICAgLCBtX2NvZGUobV9wcm92aWRlciwgc3RhcnRQb3NpdGlvbi5tX2xpbmUu b25lQmFzZWRJbnQoKSkKKyAgICAgICAgLCBtX2NvZGUobV9wcm92aWRlciwgc3RhcnRQb3NpdGlv bikKICAgICAgICAgLCBtX3VybCh1cmwpCiAgICAgewogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L0RlYnVnZ2VyU2NyaXB0LmpzIGIvU291cmNlL1dlYkNvcmUv YmluZGluZ3MvdjgvRGVidWdnZXJTY3JpcHQuanMKaW5kZXggNTBmNzkxZC4uOGM5ZDk4ZSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvRGVidWdnZXJTY3JpcHQuanMKKysr IGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvRGVidWdnZXJTY3JpcHQuanMKQEAgLTgzLDgg KzgzLDggQEAgRGVidWdnZXJTY3JpcHQuX2Zvcm1hdFNjcmlwdCA9IGZ1bmN0aW9uKHNjcmlwdCkK ICAgICAgICAgaWQ6IHNjcmlwdC5pZCwKICAgICAgICAgbmFtZTogc2NyaXB0Lm5hbWVPclNvdXJj ZVVSTCgpLAogICAgICAgICBzb3VyY2U6IHNjcmlwdC5zb3VyY2UsCi0gICAgICAgIGxpbmVPZmZz ZXQ6IERlYnVnZ2VyU2NyaXB0Ll92OFRvV2Via2l0TGluZU51bWJlcihzY3JpcHQubGluZV9vZmZz ZXQpLAotICAgICAgICBsaW5lQ291bnQ6IHNjcmlwdC5saW5lQ291bnQoKSwKKyAgICAgICAgbGlu ZU9mZnNldDogc2NyaXB0LmxpbmVfb2Zmc2V0LAorICAgICAgICBjb2x1bW5PZmZzZXQ6IHNjcmlw dC5jb2x1bW5fb2Zmc2V0LAogICAgICAgICBzY3JpcHRXb3JsZFR5cGU6IHNjcmlwdFdvcmxkVHlw ZQogICAgIH07CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9TY3Jp cHREZWJ1Z1NlcnZlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9TY3JpcHREZWJ1 Z1NlcnZlci5jcHAKaW5kZXggNGI0NjExYS4uMWM3MGEwZSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0RGVidWdTZXJ2ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL3Y4L1NjcmlwdERlYnVnU2VydmVyLmNwcApAQCAtNDQ3LDYgKzQ0Nyw3IEBA IHZvaWQgU2NyaXB0RGVidWdTZXJ2ZXI6OmRpc3BhdGNoRGlkUGFyc2VTb3VyY2UoU2NyaXB0RGVi dWdMaXN0ZW5lciogbGlzdGVuZXIsIHY4CiAgICAgICAgIHRvV2ViQ29yZVN0cmluZ1dpdGhOdWxs T3JVbmRlZmluZWRDaGVjayhvYmplY3QtPkdldCh2ODo6U3RyaW5nOjpOZXcoIm5hbWUiKSkpLAog ICAgICAgICB0b1dlYkNvcmVTdHJpbmdXaXRoTnVsbE9yVW5kZWZpbmVkQ2hlY2sob2JqZWN0LT5H ZXQodjg6OlN0cmluZzo6TmV3KCJzb3VyY2UiKSkpLAogICAgICAgICBvYmplY3QtPkdldCh2ODo6 U3RyaW5nOjpOZXcoImxpbmVPZmZzZXQiKSktPlRvSW50ZWdlcigpLT5WYWx1ZSgpLAorICAgICAg ICBvYmplY3QtPkdldCh2ODo6U3RyaW5nOjpOZXcoImNvbHVtbk9mZnNldCIpKS0+VG9JbnRlZ2Vy KCktPlZhbHVlKCksCiAgICAgICAgIHN0YXRpY19jYXN0PFNjcmlwdFdvcmxkVHlwZT4ob2JqZWN0 LT5HZXQodjg6OlN0cmluZzo6TmV3KCJzY3JpcHRXb3JsZFR5cGUiKSktPkludDMyVmFsdWUoKSkp OwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmlk bCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuaWRsCmluZGV4IDg3YjM4YzIu LjM4NGIxZDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3Iu aWRsCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuaWRsCkBAIC0yMjgs NyArMjI4LDcgQEAgbW9kdWxlIGNvcmUgewogCiAgICAgICAgIFtub3RpZnksIGRvbWFpbj1EZWJ1 Z2dlcl0gdm9pZCBhdHRhY2hEZWJ1Z2dlcldoZW5TaG93bigpOyAvLyBGSVhNRTogZG8gc29tZXRo aW5nIHdpdGggdGhpcyBldmVudHVhbGx5LgogCi0gICAgICAgIFtub3RpZnksIGRvbWFpbj1EZWJ1 Z2dlcl0gdm9pZCBwYXJzZWRTY3JpcHRTb3VyY2Uob3V0IFN0cmluZyBzb3VyY2VJRCwgb3V0IFN0 cmluZyB1cmwsIG91dCBTdHJpbmcgZGF0YSwgb3V0IGludCBmaXJzdExpbmUsIG91dCBpbnQgc2Ny aXB0V29ybGRUeXBlKTsKKyAgICAgICAgW25vdGlmeSwgZG9tYWluPURlYnVnZ2VyXSB2b2lkIHBh cnNlZFNjcmlwdFNvdXJjZShvdXQgU3RyaW5nIHNvdXJjZUlELCBvdXQgU3RyaW5nIHVybCwgb3V0 IGludCBsaW5lT2Zmc2V0LCBvdXQgaW50IGNvbHVtbk9mZnNldCwgb3V0IGludCBzY3JpcHRXb3Js ZFR5cGUpOwogICAgICAgICBbbm90aWZ5LCBkb21haW49RGVidWdnZXJdIHZvaWQgZmFpbGVkVG9Q YXJzZVNjcmlwdFNvdXJjZShvdXQgU3RyaW5nIHVybCwgb3V0IFN0cmluZyBkYXRhLCBvdXQgaW50 IGZpcnN0TGluZSwgb3V0IGludCBlcnJvckxpbmUsIG91dCBTdHJpbmcgZXJyb3JNZXNzYWdlKTsK IAogICAgICAgICBbZG9tYWluPURlYnVnZ2VyXSB2b2lkIGFjdGl2YXRlQnJlYWtwb2ludHMoKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFn ZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50 LmNwcAppbmRleCBlOTk5Yzc1Li44MmMyNTBhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuY3BwCkBAIC0xOTksMTAgKzE5OSwxMCBA QCBQYXNzUmVmUHRyPEluc3BlY3RvclZhbHVlPiBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjpjdXJy ZW50Q2FsbEZyYW1lcygpCiAKIC8vIEphdmFTY3JpcHREZWJ1Z0xpc3RlbmVyIGZ1bmN0aW9ucwog Ci12b2lkIEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OmRpZFBhcnNlU291cmNlKGNvbnN0IFN0cmlu ZyYgc291cmNlSUQsIGNvbnN0IFN0cmluZyYgdXJsLCBjb25zdCBTdHJpbmcmIGRhdGEsIGludCBm aXJzdExpbmUsIFNjcmlwdFdvcmxkVHlwZSB3b3JsZFR5cGUpCit2b2lkIEluc3BlY3RvckRlYnVn Z2VyQWdlbnQ6OmRpZFBhcnNlU291cmNlKGNvbnN0IFN0cmluZyYgc291cmNlSUQsIGNvbnN0IFN0 cmluZyYgdXJsLCBjb25zdCBTdHJpbmcmIGRhdGEsIGludCBsaW5lT2Zmc2V0LCBpbnQgY29sdW1u T2Zmc2V0LCBTY3JpcHRXb3JsZFR5cGUgd29ybGRUeXBlKQogewogICAgIC8vIERvbid0IHNlbmQg c2NyaXB0IGNvbnRlbnQgdG8gdGhlIGZyb250IGVuZCB1bnRpbCBpdCdzIHJlYWxseSBuZWVkZWQu Ci0gICAgbV9mcm9udGVuZC0+cGFyc2VkU2NyaXB0U291cmNlKHNvdXJjZUlELCB1cmwsICIiLCBm aXJzdExpbmUsIHdvcmxkVHlwZSk7CisgICAgbV9mcm9udGVuZC0+cGFyc2VkU2NyaXB0U291cmNl KHNvdXJjZUlELCB1cmwsIGxpbmVPZmZzZXQsIGNvbHVtbk9mZnNldCwgd29ybGRUeXBlKTsKIAog ICAgIG1fc2NyaXB0SURUb0NvbnRlbnQuc2V0KHNvdXJjZUlELCBkYXRhKTsKIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuaCBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmgKaW5kZXggZGU1 MzBkMi4uMDdkMmFiOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3RvckRlYnVnZ2VyQWdlbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yRGVidWdnZXJBZ2VudC5oCkBAIC04Nyw3ICs4Nyw3IEBAIHByaXZhdGU6CiAKICAgICBQYXNz UmVmUHRyPEluc3BlY3RvclZhbHVlPiBjdXJyZW50Q2FsbEZyYW1lcygpOwogCi0gICAgdmlydHVh bCB2b2lkIGRpZFBhcnNlU291cmNlKGNvbnN0IFN0cmluZyYgc291cmNlSUQsIGNvbnN0IFN0cmlu ZyYgdXJsLCBjb25zdCBTdHJpbmcmIGRhdGEsIGludCBmaXJzdExpbmUsIFNjcmlwdFdvcmxkVHlw ZSk7CisgICAgdmlydHVhbCB2b2lkIGRpZFBhcnNlU291cmNlKGNvbnN0IFN0cmluZyYgc291cmNl SUQsIGNvbnN0IFN0cmluZyYgdXJsLCBjb25zdCBTdHJpbmcmIGRhdGEsIGludCBsaW5lT2Zmc2V0 LCBpbnQgY29sdW1uT2Zmc2V0LCBTY3JpcHRXb3JsZFR5cGUpOwogICAgIHZpcnR1YWwgdm9pZCBm YWlsZWRUb1BhcnNlU291cmNlKGNvbnN0IFN0cmluZyYgdXJsLCBjb25zdCBTdHJpbmcmIGRhdGEs IGludCBmaXJzdExpbmUsIGludCBlcnJvckxpbmUsIGNvbnN0IFN0cmluZyYgZXJyb3JNZXNzYWdl KTsKICAgICB2aXJ0dWFsIHZvaWQgZGlkUGF1c2UoU2NyaXB0U3RhdGUqKTsKICAgICB2aXJ0dWFs IHZvaWQgZGlkQ29udGludWUoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9TY3JpcHREZWJ1Z0xpc3RlbmVyLmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvU2NyaXB0 RGVidWdMaXN0ZW5lci5oCmluZGV4IDU5NzM0MDIuLmEyOGNhYmIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9TY3JpcHREZWJ1Z0xpc3RlbmVyLmgKKysrIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL1NjcmlwdERlYnVnTGlzdGVuZXIuaApAQCAtNDYsNyArNDYsNyBAQCBj bGFzcyBTY3JpcHREZWJ1Z0xpc3RlbmVyIHsKIHB1YmxpYzoKICAgICB2aXJ0dWFsIH5TY3JpcHRE ZWJ1Z0xpc3RlbmVyKCkgeyB9CiAKLSAgICB2aXJ0dWFsIHZvaWQgZGlkUGFyc2VTb3VyY2UoY29u c3QgU3RyaW5nJiAgc291cmNlSUQsIGNvbnN0IFN0cmluZyYgdXJsLCBjb25zdCBTdHJpbmcmIGRh dGEsIGludCBmaXJzdExpbmUsIFNjcmlwdFdvcmxkVHlwZSkgPSAwOworICAgIHZpcnR1YWwgdm9p ZCBkaWRQYXJzZVNvdXJjZShjb25zdCBTdHJpbmcmICBzb3VyY2VJRCwgY29uc3QgU3RyaW5nJiB1 cmwsIGNvbnN0IFN0cmluZyYgZGF0YSwgaW50IGxpbmVPZmZzZXQsIGludCBjb2x1bW5PZmZzZXQs IFNjcmlwdFdvcmxkVHlwZSkgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBmYWlsZWRUb1BhcnNlU291 cmNlKGNvbnN0IFN0cmluZyYgdXJsLCBjb25zdCBTdHJpbmcmIGRhdGEsIGludCBmaXJzdExpbmUs IGludCBlcnJvckxpbmUsIGNvbnN0IFN0cmluZyYgZXJyb3JNZXNzYWdlKSA9IDA7CiAgICAgdmly dHVhbCB2b2lkIGRpZFBhdXNlKFNjcmlwdFN0YXRlKikgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBk aWRDb250aW51ZSgpID0gMDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvRGVidWdnZXJNb2RlbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvRGVidWdnZXJNb2RlbC5qcwppbmRleCA1YWIwZTJkLi4xNWQ0ZjUwIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyTW9kZWwuanMKKysr IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlck1vZGVsLmpzCkBA IC0yMDgsOSArMjA4LDkgQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTW9kZWwucHJvdG90eXBlID0g ewogICAgICAgICBXZWJJbnNwZWN0b3IucGFuZWxzLnNjcmlwdHMuZGVidWdnZXJXYXNEaXNhYmxl ZCgpOwogICAgIH0sCiAKLSAgICBwYXJzZWRTY3JpcHRTb3VyY2U6IGZ1bmN0aW9uKHNvdXJjZUlE LCBzb3VyY2VVUkwsIHNvdXJjZSwgc3RhcnRpbmdMaW5lLCBzY3JpcHRXb3JsZFR5cGUpCisgICAg cGFyc2VkU2NyaXB0U291cmNlOiBmdW5jdGlvbihzb3VyY2VJRCwgc291cmNlVVJMLCBsaW5lT2Zm c2V0LCBjb2x1bW5PZmZzZXQsIHNjcmlwdFdvcmxkVHlwZSkKICAgICB7Ci0gICAgICAgIHZhciBz Y3JpcHQgPSBuZXcgV2ViSW5zcGVjdG9yLlNjcmlwdChzb3VyY2VJRCwgc291cmNlVVJMLCBzb3Vy Y2UsIHN0YXJ0aW5nTGluZSwgdW5kZWZpbmVkLCB1bmRlZmluZWQsIHNjcmlwdFdvcmxkVHlwZSk7 CisgICAgICAgIHZhciBzY3JpcHQgPSBuZXcgV2ViSW5zcGVjdG9yLlNjcmlwdChzb3VyY2VJRCwg c291cmNlVVJMLCAiIiwgbGluZU9mZnNldCwgY29sdW1uT2Zmc2V0LCB1bmRlZmluZWQsIHVuZGVm aW5lZCwgc2NyaXB0V29ybGRUeXBlKTsKICAgICAgICAgdGhpcy5fc2NyaXB0c1tzb3VyY2VJRF0g PSBzY3JpcHQ7CiAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3Bl Y3Rvci5EZWJ1Z2dlck1vZGVsLkV2ZW50cy5QYXJzZWRTY3JpcHRTb3VyY2UsIHNvdXJjZUlEKTsK ICAgICB9LApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9T Y3JpcHQuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdC5qcwpp bmRleCA1MjdkZDlkLi5jOGUyNGE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1NjcmlwdC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1NjcmlwdC5qcwpAQCAtMjMsMTUgKzIzLDE3IEBACiAgKiBPRiBUSElTIFNPRlRXQVJF LCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogICov CiAKLVdlYkluc3BlY3Rvci5TY3JpcHQgPSBmdW5jdGlvbihzb3VyY2VJRCwgc291cmNlVVJMLCBz b3VyY2UsIHN0YXJ0aW5nTGluZSwgZXJyb3JMaW5lLCBlcnJvck1lc3NhZ2UsIHdvcmxkVHlwZSkK K1dlYkluc3BlY3Rvci5TY3JpcHQgPSBmdW5jdGlvbihzb3VyY2VJRCwgc291cmNlVVJMLCBzb3Vy Y2UsIGxpbmVPZmZzZXQsIGNvbHVtbk9mZnNldCwgZXJyb3JMaW5lLCBlcnJvck1lc3NhZ2UsIHdv cmxkVHlwZSkKIHsKICAgICB0aGlzLnNvdXJjZUlEID0gc291cmNlSUQ7CiAgICAgdGhpcy5zb3Vy Y2VVUkwgPSBzb3VyY2VVUkw7CiAgICAgdGhpcy5fc291cmNlID0gc291cmNlOwotICAgIHRoaXMu c3RhcnRpbmdMaW5lID0gc3RhcnRpbmdMaW5lOworICAgIHRoaXMubGluZU9mZnNldCA9IGxpbmVP ZmZzZXQ7CisgICAgdGhpcy5jb2x1bW5PZmZzZXQgPSBjb2x1bW5PZmZzZXQ7CiAgICAgdGhpcy5l cnJvckxpbmUgPSBlcnJvckxpbmU7CiAgICAgdGhpcy5lcnJvck1lc3NhZ2UgPSBlcnJvck1lc3Nh Z2U7CiAgICAgdGhpcy53b3JsZFR5cGUgPSB3b3JsZFR5cGU7CisgICAgdGhpcy5zdGFydGluZ0xp bmUgPSBsaW5lT2Zmc2V0ICsgMTsKIAogICAgIC8vIGlmIG5vIFVSTCwgbG9vayBmb3IgIi8vQCBz b3VyY2VVUkw9IiBkZWNvcmF0b3IKICAgICAvLyBub3RlIHRoYXQgdGhpcyBzb3VyY2VVUkwgY29t bWVudCBkZWNvcmF0b3IgaXMgYmVoYXZpb3IgdGhhdCBGaXJlQnVnIGFkZGVkCg==