59451 2011-04-26 06:07:17 -0700 Web Inspector: New Style is not working (UI glitch) 2011-04-26 08:12:03 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman abarth apavlov bweinstein eric joepeck keishi loislo ossy pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 392416 0 pfeldman 2011-04-26 06:07:17 -0700 Patch to follow. 392422 1 91096 pfeldman 2011-04-26 06:42:51 -0700 Created attachment 91096 Patch 392427 2 91098 pfeldman 2011-04-26 07:02:34 -0700 Created attachment 91098 Patch 392433 3 91098 yurys 2011-04-26 07:22:18 -0700 Comment on attachment 91098 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=91098&action=review > Source/WebCore/inspector/front-end/CSSStyleModel.js:185 > + var documentElement = node && node.ownerDocumentElement(); is it possible that ownerDocumentElement is undefined? if not prefer early return 392435 4 pfeldman 2011-04-26 07:24:20 -0700 Committed r84909: <http://trac.webkit.org/changeset/84909> 392462 5 webkit.review.bot 2011-04-26 07:57:08 -0700 http://trac.webkit.org/changeset/84909 might have broken SnowLeopard Intel Release (Tests) 392468 6 ossy 2011-04-26 08:12:03 -0700 (In reply to comment #5) > http://trac.webkit.org/changeset/84909 might have broken SnowLeopard Intel Release (Tests) And Qt and I think other bots too. --- /Volumes/Data/WebKit-BuildSlave/snowleopard-intel-release-tests/build/layout-test-results/http/tests/inspector-enabled/dom-storage-open-expected.txt 2011-04-26 07:46:48.000000000 -0700 +++ /Volumes/Data/WebKit-BuildSlave/snowleopard-intel-release-tests/build/layout-test-results/http/tests/inspector-enabled/dom-storage-open-actual.txt 2011-04-26 07:46:48.000000000 -0700 @@ -1,5 +1 @@ Tests that Web Inspector gets populated with DOM storages that were opened before inspector is shown. - -Domain: 127.0.0.1 -IsLocalStorage: false - 91096 2011-04-26 06:42:51 -0700 2011-04-26 07:02:26 -0700 Patch bug-59451-20110426174249.patch text/plain 11070 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogODQ5MDUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAzYzRkZTU0ZDQ2ZTU0MWY5 YzFkMjM2YWMyODI3MGE0NzExNDcyN2U0Li4wZmRlZmM3ZmNkNGIxZWQ5NWY5OGY5ZTE1ZTMyZTVm Mjg1OTM2YTliIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzQgQEAKIDIwMTEtMDQtMjYgIFBhdmVs IEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IE5ldyBTdHlsZSBpcyBub3Qg d29ya2luZyAoVUkgZ2xpdGNoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NTk0NTEKKworICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JET01TdG9y YWdlQWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRE9NU3RvcmFnZUFnZW50 OjpzZXRGcm9udGVuZCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9BdWRpdFJ1bGVz LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkF1ZGl0UnVsZXMuSW1hZ2VEaW1lbnNpb25zUnVs ZS5wcm90b3R5cGUuZG9SdW4uZ2V0U3R5bGVzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5BdWRp dFJ1bGVzLkNzc0luSGVhZFJ1bGUucHJvdG90eXBlLmRvUnVuLmV4dGVybmFsU3R5bGVzaGVldHNS ZWNlaXZlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQXVkaXRSdWxlcy5Dc3NJbkhlYWRSdWxl LnByb3RvdHlwZS5kb1J1bi5pbmxpbmVTdHlsZXNSZWNlaXZlZCk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuQXVkaXRSdWxlcy5TdHlsZXNTY3JpcHRzT3JkZXJSdWxlLnByb3RvdHlwZS5kb1J1bi5j c3NCZWZvcmVJbmxpbmVSZWNlaXZlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQXVkaXRSdWxl cy5TdHlsZXNTY3JpcHRzT3JkZXJSdWxlLnByb3RvdHlwZS5kb1J1bi5sYXRlU3R5bGVzUmVjZWl2 ZWQpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvQ1NTU3R5bGVNb2RlbC5qczoKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5DU1NTdHlsZU1vZGVsLnByb3RvdHlwZS5zZXRSdWxlU2VsZWN0 b3IpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNTU1N0eWxlTW9kZWwucHJvdG90eXBlLnNldFJ1 bGVTZWxlY3Rvci5jYWxsYmFjayk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ1NTU3R5bGVNb2Rl bC5wcm90b3R5cGUuYWRkUnVsZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ1NTU3R5bGVNb2Rl bC5wcm90b3R5cGUuYWRkUnVsZS5jYWxsYmFjayk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ1NT U3R5bGVNb2RlbC5wcm90b3R5cGUuX2RvY3VtZW50RWxlbWVudElkKToKKyAgICAgICAgKiBpbnNw ZWN0b3IvZnJvbnQtZW5kL0RPTUFnZW50LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTU5v ZGUucHJvdG90eXBlLl9hZGRBdHRyaWJ1dGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTU5v ZGUucHJvdG90eXBlLmRvY3VtZW50RWxlbWVudCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250 LWVuZC9SZXNvdXJjZVRyZWVNb2RlbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5QYWdlRGlz cGF0Y2hlci5wcm90b3R5cGUuZnJhbWVEZXRhY2hlZCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TdHls ZXNTaWRlYmFyUGFuZS5wcm90b3R5cGUuX2NyZWF0ZU5ld1J1bGUpOgorCisyMDExLTA0LTI2ICBQ YXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AZ29vZ2xlLmNvbT4KKwogICAgICAgICBSZXZpZXdlZCBi eSBZdXJ5IFNlbWlraGF0c2t5LgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IGludHJvZHVjZSBE T01TdG9yYWdlOjplbmFibGUgYW5kIGRpc2FibGUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NU3RvcmFnZUFnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9JbnNwZWN0b3JET01TdG9yYWdlQWdlbnQuY3BwCmluZGV4IDlhNTNlN2Y5MTJk NWNkYzkyMTVlMDkyNjUwODkyNzVhYzNhZjk1MjYuLjc0N2NkZjBhYWEyM2M2ZTE0MjU3YTQxMzdj MjA4MjAwMmE2YjNiMWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3JET01TdG9yYWdlQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JET01TdG9yYWdlQWdlbnQuY3BwCkBAIC03Myw5ICs3Myw2IEBAIEluc3BlY3RvckRP TVN0b3JhZ2VBZ2VudDo6fkluc3BlY3RvckRPTVN0b3JhZ2VBZ2VudCgpCiB2b2lkIEluc3BlY3Rv ckRPTVN0b3JhZ2VBZ2VudDo6c2V0RnJvbnRlbmQoSW5zcGVjdG9yRnJvbnRlbmQqIGZyb250ZW5k KQogewogICAgIG1fZnJvbnRlbmQgPSBmcm9udGVuZDsKLSAgICBET01TdG9yYWdlUmVzb3VyY2Vz TWFwOjppdGVyYXRvciByZXNvdXJjZXNFbmQgPSBtX3Jlc291cmNlcy5lbmQoKTsKLSAgICBmb3Ig KERPTVN0b3JhZ2VSZXNvdXJjZXNNYXA6Oml0ZXJhdG9yIGl0ID0gbV9yZXNvdXJjZXMuYmVnaW4o KTsgaXQgIT0gcmVzb3VyY2VzRW5kOyArK2l0KQotICAgICAgICBpdC0+c2Vjb25kLT5iaW5kKG1f ZnJvbnRlbmQpOwogfQogCiB2b2lkIEluc3BlY3RvckRPTVN0b3JhZ2VBZ2VudDo6Y2xlYXJGcm9u dGVuZCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0F1 ZGl0UnVsZXMuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0F1ZGl0UnVs ZXMuanMKaW5kZXggMTlhMmMyNDQ4YTdmN2RlNmRhMjU1OWJjNDQ3M2NlYzAyOGFhZTVkOC4uOWFl NWRmOGY0MGVmOTU1MzA3ZjVkYTk4ZTdkYjIwYTU5YzQ4NWFjMyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9BdWRpdFJ1bGVzLmpzCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQXVkaXRSdWxlcy5qcwpAQCAtNzExLDExICs3MTEs NyBAQCBXZWJJbnNwZWN0b3IuQXVkaXRSdWxlcy5JbWFnZURpbWVuc2lvbnNSdWxlLnByb3RvdHlw ZSA9IHsKIAogICAgICAgICBmdW5jdGlvbiBnZXRTdHlsZXMobm9kZUlkcykKICAgICAgICAgewot ICAgICAgICAgICAgaWYgKCFub2RlSWRzKSB7Ci0gICAgICAgICAgICAgICAgY29uc29sZS5lcnJv cigiRmFpbGVkIHRvIGdldCBzdHlsZXMiKTsKLSAgICAgICAgICAgICAgICByZXR1cm47Ci0gICAg ICAgICAgICB9Ci0gICAgICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IG5vZGVJZHMubGVuZ3Ro OyArK2kpCisgICAgICAgICAgICBmb3IgKHZhciBpID0gMDsgbm9kZUlkcyAmJiBpIDwgbm9kZUlk cy5sZW5ndGg7ICsraSkKICAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3IuY3NzTW9kZWwuZ2V0 U3R5bGVzQXN5bmMobm9kZUlkc1tpXSwgaW1hZ2VTdHlsZXNSZWFkeS5iaW5kKHRoaXMsIG5vZGVJ ZHNbaV0sIGkgPT09IG5vZGVJZHMubGVuZ3RoIC0gMSkpOwogICAgICAgICB9CiAKQEAgLTc2Myw2 ICs3NTksOCBAQCBXZWJJbnNwZWN0b3IuQXVkaXRSdWxlcy5Dc3NJbkhlYWRSdWxlLnByb3RvdHlw ZSA9IHsKIAogICAgICAgICBmdW5jdGlvbiBleHRlcm5hbFN0eWxlc2hlZXRzUmVjZWl2ZWQocm9v dCwgaW5saW5lU3R5bGVOb2RlSWRzLCBub2RlSWRzKQogICAgICAgICB7CisgICAgICAgICAgICBp ZiAoIW5vZGVJZHMpCisgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgdmFyIGV4 dGVybmFsU3R5bGVzaGVldE5vZGVJZHMgPSBub2RlSWRzOwogICAgICAgICAgICAgdmFyIHJlc3Vs dCA9IG51bGw7CiAgICAgICAgICAgICBpZiAoaW5saW5lU3R5bGVOb2RlSWRzLmxlbmd0aCB8fCBl eHRlcm5hbFN0eWxlc2hlZXROb2RlSWRzLmxlbmd0aCkgewpAQCAtNzgxLDYgKzc3OSw4IEBAIFdl Ykluc3BlY3Rvci5BdWRpdFJ1bGVzLkNzc0luSGVhZFJ1bGUucHJvdG90eXBlID0gewogCiAgICAg ICAgIGZ1bmN0aW9uIGlubGluZVN0eWxlc1JlY2VpdmVkKHJvb3QsIG5vZGVJZHMpCiAgICAgICAg IHsKKyAgICAgICAgICAgIGlmICghbm9kZUlkcykKKyAgICAgICAgICAgICAgICByZXR1cm47CiAg ICAgICAgICAgICBXZWJJbnNwZWN0b3IuZG9tQWdlbnQucXVlcnlTZWxlY3RvckFsbChyb290Lmlk LCAiYm9keSBsaW5rW3JlbH49J3N0eWxlc2hlZXQnXVtocmVmXSIsIGV4dGVybmFsU3R5bGVzaGVl dHNSZWNlaXZlZC5iaW5kKG51bGwsIHJvb3QsIG5vZGVJZHMpKTsKICAgICAgICAgfQogCkBAIC04 MjUsNiArODI1LDkgQEAgV2ViSW5zcGVjdG9yLkF1ZGl0UnVsZXMuU3R5bGVzU2NyaXB0c09yZGVy UnVsZS5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgZnVuY3Rpb24gY3NzQmVmb3JlSW5saW5lUmVj ZWl2ZWQobGF0ZVN0eWxlSWRzLCBub2RlSWRzKQogICAgICAgICB7CisgICAgICAgICAgICBpZiAo IW5vZGVJZHMpCisgICAgICAgICAgICAgICAgcmV0dXJuOworCiAgICAgICAgICAgICB2YXIgY3Nz QmVmb3JlSW5saW5lQ291bnQgPSBub2RlSWRzLmxlbmd0aDsKICAgICAgICAgICAgIHZhciByZXN1 bHQgPSBudWxsOwogICAgICAgICAgICAgaWYgKGxhdGVTdHlsZUlkcy5sZW5ndGggfHwgY3NzQmVm b3JlSW5saW5lQ291bnQpIHsKQEAgLTg0Miw2ICs4NDUsOSBAQCBXZWJJbnNwZWN0b3IuQXVkaXRS dWxlcy5TdHlsZXNTY3JpcHRzT3JkZXJSdWxlLnByb3RvdHlwZSA9IHsKIAogICAgICAgICBmdW5j dGlvbiBsYXRlU3R5bGVzUmVjZWl2ZWQocm9vdCwgbm9kZUlkcykKICAgICAgICAgeworICAgICAg ICAgICAgaWYgKCFub2RlSWRzKQorICAgICAgICAgICAgICAgIHJldHVybjsKKwogICAgICAgICAg ICAgV2ViSW5zcGVjdG9yLmRvbUFnZW50LnF1ZXJ5U2VsZWN0b3JBbGwocm9vdC5pZCwgImhlYWQg bGlua1tyZWx+PSdzdHlsZXNoZWV0J11baHJlZl0gfiBzY3JpcHQ6bm90KFtzcmNdKSIsIGNzc0Jl Zm9yZUlubGluZVJlY2VpdmVkLmJpbmQobnVsbCwgbm9kZUlkcykpOwogICAgICAgICB9CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ1NTU3R5bGVNb2Rl bC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ1NTU3R5bGVNb2RlbC5q cwppbmRleCAxMTBhNzIwYjQ5MzYzNzMyMWRjZDdkNmJkZTRjNDAzMzRiOTUxYmQwLi5kNjE0Zjlm OTBlOGYwMzllNjI3ZTFmNDFkODdkMWY1ZmNiYmZhYWRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NTU1N0eWxlTW9kZWwuanMKKysrIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9DU1NTdHlsZU1vZGVsLmpzCkBAIC0xMjIsOSArMTIy LDkgQEAgV2ViSW5zcGVjdG9yLkNTU1N0eWxlTW9kZWwucHJvdG90eXBlID0gewogCiAgICAgc2V0 UnVsZVNlbGVjdG9yOiBmdW5jdGlvbihydWxlSWQsIG5vZGVJZCwgbmV3U2VsZWN0b3IsIHN1Y2Nl c3NDYWxsYmFjaywgZmFpbHVyZUNhbGxiYWNrKQogICAgIHsKLSAgICAgICAgZnVuY3Rpb24gY2hl Y2tBZmZlY3RzQ2FsbGJhY2sobm9kZUlkLCBzdWNjZXNzQ2FsbGJhY2ssIHJ1bGVQYXlsb2FkLCBl cnJvciwgc2VsZWN0ZWROb2RlSWRzKQorICAgICAgICBmdW5jdGlvbiBjaGVja0FmZmVjdHNDYWxs YmFjayhub2RlSWQsIHN1Y2Nlc3NDYWxsYmFjaywgcnVsZVBheWxvYWQsIHNlbGVjdGVkTm9kZUlk cykKICAgICAgICAgewotICAgICAgICAgICAgaWYgKGVycm9yKQorICAgICAgICAgICAgaWYgKCFz ZWxlY3RlZE5vZGVJZHMpCiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgdmFy IGRvZXNBZmZlY3RTZWxlY3RlZE5vZGUgPSAoc2VsZWN0ZWROb2RlSWRzLmluZGV4T2Yobm9kZUlk KSA+PSAwKTsKICAgICAgICAgICAgIHZhciBydWxlID0gV2ViSW5zcGVjdG9yLkNTU1J1bGUucGFy c2VQYXlsb2FkKHJ1bGVQYXlsb2FkKTsKQEAgLTEzNyw4ICsxMzcsMTMgQEAgV2ViSW5zcGVjdG9y LkNTU1N0eWxlTW9kZWwucHJvdG90eXBlID0gewogICAgICAgICAgICAgLy8gRklYTUU6IGxvb2tz IGxpa2UgcnVsZVBheWxvYWQgaXMgYWx3YXlzIG51bGwuCiAgICAgICAgICAgICBpZiAoZXJyb3Ip CiAgICAgICAgICAgICAgICAgZmFpbHVyZUNhbGxiYWNrKCk7Ci0gICAgICAgICAgICBlbHNlCi0g ICAgICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmRvbUFnZW50LnF1ZXJ5U2VsZWN0b3JBbGwobm9k ZUlkLCBuZXdTZWxlY3RvciwgY2hlY2tBZmZlY3RzQ2FsbGJhY2suYmluZCh0aGlzLCBub2RlSWQs IHN1Y2Nlc3NDYWxsYmFjaywgcnVsZVBheWxvYWQpKTsKKyAgICAgICAgICAgIGVsc2UgeworICAg ICAgICAgICAgICAgIHZhciBkb2N1bWVudEVsZW1lbnRJZCA9IHRoaXMuX2RvY3VtZW50RWxlbWVu dElkKG5vZGVJZCk7CisgICAgICAgICAgICAgICAgaWYgKGRvY3VtZW50RWxlbWVudElkKQorICAg ICAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3IuZG9tQWdlbnQucXVlcnlTZWxlY3RvckFsbChk b2N1bWVudEVsZW1lbnRJZCwgbmV3U2VsZWN0b3IsIGNoZWNrQWZmZWN0c0NhbGxiYWNrLmJpbmQo dGhpcywgbm9kZUlkLCBzdWNjZXNzQ2FsbGJhY2ssIHJ1bGVQYXlsb2FkKSk7CisgICAgICAgICAg ICAgICAgZWxzZQorICAgICAgICAgICAgICAgICAgICBmYWlsdXJlQ2FsbGJhY2soKTsKKyAgICAg ICAgICAgIH0KICAgICAgICAgfQogCiAgICAgICAgIENTU0FnZW50LnNldFJ1bGVTZWxlY3Rvcihy dWxlSWQsIG5ld1NlbGVjdG9yLCBjYWxsYmFjay5iaW5kKHRoaXMsIG5vZGVJZCwgc3VjY2Vzc0Nh bGxiYWNrLCBmYWlsdXJlQ2FsbGJhY2ssIG5ld1NlbGVjdG9yKSk7CkBAIC0xNDYsOCArMTUxLDEx IEBAIFdlYkluc3BlY3Rvci5DU1NTdHlsZU1vZGVsLnByb3RvdHlwZSA9IHsKIAogICAgIGFkZFJ1 bGU6IGZ1bmN0aW9uKG5vZGVJZCwgc2VsZWN0b3IsIHN1Y2Nlc3NDYWxsYmFjaywgZmFpbHVyZUNh bGxiYWNrKQogICAgIHsKLSAgICAgICAgZnVuY3Rpb24gY2hlY2tBZmZlY3RzQ2FsbGJhY2sobm9k ZUlkLCBzdWNjZXNzQ2FsbGJhY2ssIHJ1bGVQYXlsb2FkLCBlcnJvciwgc2VsZWN0ZWROb2RlSWRz KQorICAgICAgICBmdW5jdGlvbiBjaGVja0FmZmVjdHNDYWxsYmFjayhub2RlSWQsIHN1Y2Nlc3ND YWxsYmFjaywgcnVsZVBheWxvYWQsIHNlbGVjdGVkTm9kZUlkcykKICAgICAgICAgeworICAgICAg ICAgICAgaWYgKCFzZWxlY3RlZE5vZGVJZHMpCisgICAgICAgICAgICAgICAgcmV0dXJuOworCiAg ICAgICAgICAgICB2YXIgZG9lc0FmZmVjdFNlbGVjdGVkTm9kZSA9IChzZWxlY3RlZE5vZGVJZHMu aW5kZXhPZihub2RlSWQpID49IDApOwogICAgICAgICAgICAgdmFyIHJ1bGUgPSBXZWJJbnNwZWN0 b3IuQ1NTUnVsZS5wYXJzZVBheWxvYWQocnVsZVBheWxvYWQpOwogICAgICAgICAgICAgc3VjY2Vz c0NhbGxiYWNrKHJ1bGUsIGRvZXNBZmZlY3RTZWxlY3RlZE5vZGUpOwpAQCAtMTU5LDEzICsxNjcs MjUgQEAgV2ViSW5zcGVjdG9yLkNTU1N0eWxlTW9kZWwucHJvdG90eXBlID0gewogICAgICAgICAg ICAgaWYgKGVycm9yKSB7CiAgICAgICAgICAgICAgICAgLy8gSW52YWxpZCBzeW50YXggZm9yIGEg c2VsZWN0b3IKICAgICAgICAgICAgICAgICBmYWlsdXJlQ2FsbGJhY2soKTsKLSAgICAgICAgICAg IH0gZWxzZQotICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5kb21BZ2VudC5xdWVyeVNlbGVj dG9yQWxsKG5vZGVJZCwgc2VsZWN0b3IsIGNoZWNrQWZmZWN0c0NhbGxiYWNrLmJpbmQodGhpcywg bm9kZUlkLCBzdWNjZXNzQ2FsbGJhY2ssIHJ1bGVQYXlsb2FkKSk7CisgICAgICAgICAgICB9IGVs c2UgeworICAgICAgICAgICAgICAgIHZhciBkb2N1bWVudEVsZW1lbnRJZCA9IHRoaXMuX2RvY3Vt ZW50RWxlbWVudElkKG5vZGVJZCk7CisgICAgICAgICAgICAgICAgaWYgKGRvY3VtZW50RWxlbWVu dElkKQorICAgICAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3IuZG9tQWdlbnQucXVlcnlTZWxl Y3RvckFsbChkb2N1bWVudEVsZW1lbnRJZCwgc2VsZWN0b3IsIGNoZWNrQWZmZWN0c0NhbGxiYWNr LmJpbmQodGhpcywgbm9kZUlkLCBzdWNjZXNzQ2FsbGJhY2ssIHJ1bGVQYXlsb2FkKSk7CisgICAg ICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgICAgICBmYWlsdXJlQ2FsbGJhY2soKTsK KyAgICAgICAgICAgIH0KICAgICAgICAgfQogCiAgICAgICAgIENTU0FnZW50LmFkZFJ1bGUobm9k ZUlkLCBzZWxlY3RvciwgY2FsbGJhY2suYmluZCh0aGlzLCBzdWNjZXNzQ2FsbGJhY2ssIGZhaWx1 cmVDYWxsYmFjaywgc2VsZWN0b3IpKTsKICAgICB9LAogCisgICAgX2RvY3VtZW50RWxlbWVudElk OiBmdW5jdGlvbihub2RlSWQpCisgICAgeworICAgICAgICB2YXIgbm9kZSA9IFdlYkluc3BlY3Rv ci5kb21BZ2VudC5ub2RlRm9ySWQobm9kZUlkKTsKKyAgICAgICAgdmFyIGRvY3VtZW50RWxlbWVu dCA9IG5vZGUgJiYgbm9kZS5kb2N1bWVudEVsZW1lbnQoKTsKKyAgICAgICAgcmV0dXJuIGRvY3Vt ZW50RWxlbWVudCAmJiBkb2N1bWVudEVsZW1lbnQuaWQ7CisgICAgfSwKKwogICAgIF9maXJlU3R5 bGVTaGVldENoYW5nZWQ6IGZ1bmN0aW9uKHN0eWxlU2hlZXRJZCwgbWFqb3JDaGFuZ2UsIGNhbGxi YWNrKQogICAgIHsKICAgICAgICAgY2FsbGJhY2sgPSBjYWxsYmFjayB8fCBmdW5jdGlvbigpIHt9 OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9ET01BZ2Vu dC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRE9NQWdlbnQuanMKaW5k ZXggNTg4OTMyMDgyNmRiZjEwMjBhMWJjNWM1MDA1NmQzN2E3ZDYyODc5OC4uYTUxOTIyNjk3ZGY4 M2MzMjk1NGNhNzhiYTgwYzhiYzE4YjI3NzBhMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9ET01BZ2VudC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0RPTUFnZW50LmpzCkBAIC0zMTIsNiArMzEyLDE2IEBAIFdlYkluc3Bl Y3Rvci5ET01Ob2RlLnByb3RvdHlwZSA9IHsKICAgICAgICAgfTsKICAgICAgICAgdGhpcy5fYXR0 cmlidXRlc01hcFtuYW1lXSA9IGF0dHI7CiAgICAgICAgIHRoaXMuX2F0dHJpYnV0ZXMucHVzaChh dHRyKTsKKyAgICB9LAorCisgICAgZG9jdW1lbnRFbGVtZW50OiBmdW5jdGlvbigpCisgICAgewor ICAgICAgICAvLyBkb2N1bWVudCBlbGVtZW50IGlzIHRoZSBjaGlsZCBvZiB0aGUgZG9jdW1lbnQg LyBmcmFtZSBvd25lciBub2RlIHRoYXQgaGFzIGRvY3VtZW50VVJMIHByb3BlcnR5LgorICAgICAg ICAvLyBGSVhNRTogcmV0dXJuIGRvY3VtZW50IG5vZGVzIGFzIGEgcGFydCBvZiB0aGUgRE9NIHRy ZWUgc3RydWN0dXJlLgorICAgICAgICB2YXIgbm9kZSA9IHRoaXM7CisgICAgICAgIHdoaWxlIChu b2RlLnBhcmVudE5vZGUgJiYgIW5vZGUucGFyZW50Tm9kZS5kb2N1bWVudFVSTCkKKyAgICAgICAg ICAgIG5vZGUgPSBub2RlLnBhcmVudE5vZGU7CisgICAgICAgIHJldHVybiBub2RlOwogICAgIH0K IH0KIApAQCAtMzg3LDYgKzM5Nyw4IEBAIFdlYkluc3BlY3Rvci5ET01BZ2VudC5wcm90b3R5cGUg PSB7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIHJldHVybiBmdW5jdGlvbihlcnJvciwg cmVzdWx0KQogICAgICAgICB7CisgICAgICAgICAgICBpZiAoZXJyb3IpCisgICAgICAgICAgICAg ICAgY29uc29sZS5lcnJvcigiRXJyb3IgZHVyaW5nIERPTUFnZW50IG9wZXJhdGlvbjogIiArIGVy cm9yKTsKICAgICAgICAgICAgIGNhbGxiYWNrKGVycm9yID8gbnVsbCA6IHJlc3VsdCk7CiAgICAg ICAgIH0KICAgICB9LApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9SZXNvdXJjZVRyZWVNb2RlbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvUmVzb3VyY2VUcmVlTW9kZWwuanMKaW5kZXggZTI2ZTM4YmQzMjM2ODI1NjIwM2ZlYWJm NDQzYmFmNjU5OWU1YWM2Ni4uMmYwMGRkZGUzZWQzNjQzNDAxYzUxNWQ4YjM3MzMwNzg0NGQ3ZWFk YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJj ZVRyZWVNb2RlbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jl c291cmNlVHJlZU1vZGVsLmpzCkBAIC0zNDcsNiArMzQ3LDYgQEAgV2ViSW5zcGVjdG9yLlBhZ2VE aXNwYXRjaGVyLnByb3RvdHlwZSA9IHsKIAogICAgIGZyYW1lRGV0YWNoZWQ6IGZ1bmN0aW9uKGZy YW1lSWQpCiAgICAgewotICAgICAgICB0aGlzLl9yZXNvdXJjZVRyZWVNb2RlbC5fZnJhbWVEZXRh Y2hlZChsb2FkZXJJZCk7CisgICAgICAgIHRoaXMuX3Jlc291cmNlVHJlZU1vZGVsLl9mcmFtZURl dGFjaGVkKGZyYW1lSWQpOwogICAgIH0KIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzU2lkZWJhclBhbmUuanMgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1NpZGViYXJQYW5lLmpzCmluZGV4IGY1N2VlYTliZGFi ZWNjYzYyYmU2NGZiOTY3YTc0ZGJlZmQ4NjA1YmMuLmYwOWRhMjQ1Y2YzYWIwMWI2NjI0Mzg4ODc2 ZjQ1ZjUxYjYyZjQ5MzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvU3R5bGVzU2lkZWJhclBhbmUuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5qcwpAQCAtNTY3LDYgKzU2Nyw3IEBAIFdlYklu c3BlY3Rvci5TdHlsZXNTaWRlYmFyUGFuZS5wcm90b3R5cGUgPSB7CiAKICAgICBfY3JlYXRlTmV3 UnVsZTogZnVuY3Rpb24oZXZlbnQpCiAgICAgeworICAgICAgICB0aGlzLmV4cGFuZGVkID0gdHJ1 ZTsKICAgICAgICAgdGhpcy5hZGRCbGFua1NlY3Rpb24oKS5zdGFydEVkaXRpbmdTZWxlY3Rvcigp OwogICAgIH0sCiAK 91098 2011-04-26 07:02:34 -0700 2011-04-26 07:22:18 -0700 Patch bug-59451-20110426180232.patch text/plain 12254 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogODQ5MDUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAv dGVzdHMvaW5zcGVjdG9yLWVuYWJsZWQvZG9tLXN0b3JhZ2Utb3Blbi5odG1sIGIvTGF5b3V0VGVz dHMvaHR0cC90ZXN0cy9pbnNwZWN0b3ItZW5hYmxlZC9kb20tc3RvcmFnZS1vcGVuLmh0bWwKaW5k ZXggNzYyMDYwNWRkMTJjOTYwYzI5NGY1ODM1OWRlMDAxOWNjYTVlZDg4OS4uYzQ5NmRiMzEwNTMx NjJkYzc3NzlmNDE4YzY5YmQwMjg5MWRjYTNmZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaHR0 cC90ZXN0cy9pbnNwZWN0b3ItZW5hYmxlZC9kb20tc3RvcmFnZS1vcGVuLmh0bWwKKysrIGIvTGF5 b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3ItZW5hYmxlZC9kb20tc3RvcmFnZS1vcGVuLmh0 bWwKQEAgLTE4LDEyICsxOCwxNiBAQCBmdW5jdGlvbiBvbmxvYWQoKQogCiBmdW5jdGlvbiB0ZXN0 KCkKIHsKLSAgICB2YXIgc3RvcmFnZXMgPSBXZWJJbnNwZWN0b3IucGFuZWxzLnJlc291cmNlcy5f ZG9tU3RvcmFnZTsKLSAgICBmb3IgKHZhciBpID0gMDsgaSA8IHN0b3JhZ2VzLmxlbmd0aDsgKytp KSB7Ci0gICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVzdWx0KCJEb21haW46ICIgKyBzdG9yYWdl c1tpXS5kb21haW4pOwotICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFJlc3VsdCgiSXNMb2NhbFN0 b3JhZ2U6ICIgKyBzdG9yYWdlc1tpXS5pc0xvY2FsU3RvcmFnZSk7CisgICAgZnVuY3Rpb24gY2Fs bGJhY2soKQorICAgIHsKKyAgICAgICAgdmFyIHN0b3JhZ2VzID0gV2ViSW5zcGVjdG9yLnBhbmVs cy5yZXNvdXJjZXMuX2RvbVN0b3JhZ2U7CisgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgc3Rv cmFnZXMubGVuZ3RoOyArK2kpIHsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVzdWx0 KCJEb21haW46ICIgKyBzdG9yYWdlc1tpXS5kb21haW4pOworICAgICAgICAgICAgSW5zcGVjdG9y VGVzdC5hZGRSZXN1bHQoIklzTG9jYWxTdG9yYWdlOiAiICsgc3RvcmFnZXNbaV0uaXNMb2NhbFN0 b3JhZ2UpOworICAgICAgICB9CisgICAgICAgIEluc3BlY3RvclRlc3QuY29tcGxldGVUZXN0KCk7 CiAgICAgfQotICAgIEluc3BlY3RvclRlc3QuY29tcGxldGVUZXN0KCk7CisgICAgSW5zcGVjdG9y QmFja2VuZC5ydW5BZnRlclBlbmRpbmdEaXNwYXRjaGVzKGNhbGxiYWNrKTsKIH0KIAogPC9zY3Jp cHQ+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKaW5kZXggM2M0ZGU1NGQ0NmU1NDFmOWMxZDIzNmFjMjgyNzBhNDcxMTQ3Mjdl NC4uMGZkZWZjN2ZjZDRiMWVkOTVmOThmOWUxNWUzMmU1ZjI4NTkzNmE5YiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpA QCAtMSw1ICsxLDM0IEBACiAyMDExLTA0LTI2ICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AZ29v Z2xlLmNvbT4KIAorICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBXZWIgSW5zcGVjdG9yOiBOZXcgU3R5bGUgaXMgbm90IHdvcmtpbmcgKFVJIGdsaXRjaCkKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU5NDUxCisKKyAg ICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yRE9NU3RvcmFnZUFnZW50LmNwcDoKKyAgICAgICAg KFdlYkNvcmU6Okluc3BlY3RvckRPTVN0b3JhZ2VBZ2VudDo6c2V0RnJvbnRlbmQpOgorICAgICAg ICAqIGluc3BlY3Rvci9mcm9udC1lbmQvQXVkaXRSdWxlcy5qczoKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5BdWRpdFJ1bGVzLkltYWdlRGltZW5zaW9uc1J1bGUucHJvdG90eXBlLmRvUnVuLmdldFN0 eWxlcyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQXVkaXRSdWxlcy5Dc3NJbkhlYWRSdWxlLnBy b3RvdHlwZS5kb1J1bi5leHRlcm5hbFN0eWxlc2hlZXRzUmVjZWl2ZWQpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkF1ZGl0UnVsZXMuQ3NzSW5IZWFkUnVsZS5wcm90b3R5cGUuZG9SdW4uaW5saW5l U3R5bGVzUmVjZWl2ZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkF1ZGl0UnVsZXMuU3R5bGVz U2NyaXB0c09yZGVyUnVsZS5wcm90b3R5cGUuZG9SdW4uY3NzQmVmb3JlSW5saW5lUmVjZWl2ZWQp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLkF1ZGl0UnVsZXMuU3R5bGVzU2NyaXB0c09yZGVyUnVs ZS5wcm90b3R5cGUuZG9SdW4ubGF0ZVN0eWxlc1JlY2VpdmVkKToKKyAgICAgICAgKiBpbnNwZWN0 b3IvZnJvbnQtZW5kL0NTU1N0eWxlTW9kZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ1NT U3R5bGVNb2RlbC5wcm90b3R5cGUuc2V0UnVsZVNlbGVjdG9yKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5DU1NTdHlsZU1vZGVsLnByb3RvdHlwZS5zZXRSdWxlU2VsZWN0b3IuY2FsbGJhY2spOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkNTU1N0eWxlTW9kZWwucHJvdG90eXBlLmFkZFJ1bGUpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkNTU1N0eWxlTW9kZWwucHJvdG90eXBlLmFkZFJ1bGUuY2Fs bGJhY2spOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNTU1N0eWxlTW9kZWwucHJvdG90eXBlLl9k b2N1bWVudEVsZW1lbnRJZCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9ET01BZ2Vu dC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5ET01Ob2RlLnByb3RvdHlwZS5fYWRkQXR0cmli dXRlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5ET01Ob2RlLnByb3RvdHlwZS5kb2N1bWVudEVs ZW1lbnQpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VUcmVlTW9kZWwu anM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUGFnZURpc3BhdGNoZXIucHJvdG90eXBlLmZyYW1l RGV0YWNoZWQpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzU2lkZWJhclBh bmUuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU3R5bGVzU2lkZWJhclBhbmUucHJvdG90eXBl Ll9jcmVhdGVOZXdSdWxlKToKKworMjAxMS0wNC0yNiAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFu QGdvb2dsZS5jb20+CisKICAgICAgICAgUmV2aWV3ZWQgYnkgWXVyeSBTZW1pa2hhdHNreS4KIAog ICAgICAgICBXZWIgSW5zcGVjdG9yOiBpbnRyb2R1Y2UgRE9NU3RvcmFnZTo6ZW5hYmxlIGFuZCBk aXNhYmxlLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRP TVN0b3JhZ2VBZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9N U3RvcmFnZUFnZW50LmNwcAppbmRleCA5YTUzZTdmOTEyZDVjZGM5MjE1ZTA5MjY1MDg5Mjc1YWMz YWY5NTI2Li43NDdjZGYwYWFhMjNjNmUxNDI1N2E0MTM3YzIwODIwMDJhNmIzYjFlIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NU3RvcmFnZUFnZW50LmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NU3RvcmFnZUFnZW50 LmNwcApAQCAtNzMsOSArNzMsNiBAQCBJbnNwZWN0b3JET01TdG9yYWdlQWdlbnQ6On5JbnNwZWN0 b3JET01TdG9yYWdlQWdlbnQoKQogdm9pZCBJbnNwZWN0b3JET01TdG9yYWdlQWdlbnQ6OnNldEZy b250ZW5kKEluc3BlY3RvckZyb250ZW5kKiBmcm9udGVuZCkKIHsKICAgICBtX2Zyb250ZW5kID0g ZnJvbnRlbmQ7Ci0gICAgRE9NU3RvcmFnZVJlc291cmNlc01hcDo6aXRlcmF0b3IgcmVzb3VyY2Vz RW5kID0gbV9yZXNvdXJjZXMuZW5kKCk7Ci0gICAgZm9yIChET01TdG9yYWdlUmVzb3VyY2VzTWFw OjppdGVyYXRvciBpdCA9IG1fcmVzb3VyY2VzLmJlZ2luKCk7IGl0ICE9IHJlc291cmNlc0VuZDsg KytpdCkKLSAgICAgICAgaXQtPnNlY29uZC0+YmluZChtX2Zyb250ZW5kKTsKIH0KIAogdm9pZCBJ bnNwZWN0b3JET01TdG9yYWdlQWdlbnQ6OmNsZWFyRnJvbnRlbmQoKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9BdWRpdFJ1bGVzLmpzIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9BdWRpdFJ1bGVzLmpzCmluZGV4IDE5YTJjMjQ0OGE3 ZjdkZTZkYTI1NTliYzQ0NzNjZWMwMjhhYWU1ZDguLjlhZTVkZjhmNDBlZjk1NTMwN2Y1ZGE5OGU3 ZGIyMGE1OWM0ODVhYzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvQXVkaXRSdWxlcy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0F1ZGl0UnVsZXMuanMKQEAgLTcxMSwxMSArNzExLDcgQEAgV2ViSW5zcGVjdG9yLkF1ZGl0 UnVsZXMuSW1hZ2VEaW1lbnNpb25zUnVsZS5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgZnVuY3Rp b24gZ2V0U3R5bGVzKG5vZGVJZHMpCiAgICAgICAgIHsKLSAgICAgICAgICAgIGlmICghbm9kZUlk cykgewotICAgICAgICAgICAgICAgIGNvbnNvbGUuZXJyb3IoIkZhaWxlZCB0byBnZXQgc3R5bGVz Iik7Ci0gICAgICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICAgICAgfQotICAgICAgICAgICAg Zm9yICh2YXIgaSA9IDA7IGkgPCBub2RlSWRzLmxlbmd0aDsgKytpKQorICAgICAgICAgICAgZm9y ICh2YXIgaSA9IDA7IG5vZGVJZHMgJiYgaSA8IG5vZGVJZHMubGVuZ3RoOyArK2kpCiAgICAgICAg ICAgICAgICAgV2ViSW5zcGVjdG9yLmNzc01vZGVsLmdldFN0eWxlc0FzeW5jKG5vZGVJZHNbaV0s IGltYWdlU3R5bGVzUmVhZHkuYmluZCh0aGlzLCBub2RlSWRzW2ldLCBpID09PSBub2RlSWRzLmxl bmd0aCAtIDEpKTsKICAgICAgICAgfQogCkBAIC03NjMsNiArNzU5LDggQEAgV2ViSW5zcGVjdG9y LkF1ZGl0UnVsZXMuQ3NzSW5IZWFkUnVsZS5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgZnVuY3Rp b24gZXh0ZXJuYWxTdHlsZXNoZWV0c1JlY2VpdmVkKHJvb3QsIGlubGluZVN0eWxlTm9kZUlkcywg bm9kZUlkcykKICAgICAgICAgeworICAgICAgICAgICAgaWYgKCFub2RlSWRzKQorICAgICAgICAg ICAgICAgIHJldHVybjsKICAgICAgICAgICAgIHZhciBleHRlcm5hbFN0eWxlc2hlZXROb2RlSWRz ID0gbm9kZUlkczsKICAgICAgICAgICAgIHZhciByZXN1bHQgPSBudWxsOwogICAgICAgICAgICAg aWYgKGlubGluZVN0eWxlTm9kZUlkcy5sZW5ndGggfHwgZXh0ZXJuYWxTdHlsZXNoZWV0Tm9kZUlk cy5sZW5ndGgpIHsKQEAgLTc4MSw2ICs3NzksOCBAQCBXZWJJbnNwZWN0b3IuQXVkaXRSdWxlcy5D c3NJbkhlYWRSdWxlLnByb3RvdHlwZSA9IHsKIAogICAgICAgICBmdW5jdGlvbiBpbmxpbmVTdHls ZXNSZWNlaXZlZChyb290LCBub2RlSWRzKQogICAgICAgICB7CisgICAgICAgICAgICBpZiAoIW5v ZGVJZHMpCisgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgV2ViSW5zcGVjdG9y LmRvbUFnZW50LnF1ZXJ5U2VsZWN0b3JBbGwocm9vdC5pZCwgImJvZHkgbGlua1tyZWx+PSdzdHls ZXNoZWV0J11baHJlZl0iLCBleHRlcm5hbFN0eWxlc2hlZXRzUmVjZWl2ZWQuYmluZChudWxsLCBy b290LCBub2RlSWRzKSk7CiAgICAgICAgIH0KIApAQCAtODI1LDYgKzgyNSw5IEBAIFdlYkluc3Bl Y3Rvci5BdWRpdFJ1bGVzLlN0eWxlc1NjcmlwdHNPcmRlclJ1bGUucHJvdG90eXBlID0gewogCiAg ICAgICAgIGZ1bmN0aW9uIGNzc0JlZm9yZUlubGluZVJlY2VpdmVkKGxhdGVTdHlsZUlkcywgbm9k ZUlkcykKICAgICAgICAgeworICAgICAgICAgICAgaWYgKCFub2RlSWRzKQorICAgICAgICAgICAg ICAgIHJldHVybjsKKwogICAgICAgICAgICAgdmFyIGNzc0JlZm9yZUlubGluZUNvdW50ID0gbm9k ZUlkcy5sZW5ndGg7CiAgICAgICAgICAgICB2YXIgcmVzdWx0ID0gbnVsbDsKICAgICAgICAgICAg IGlmIChsYXRlU3R5bGVJZHMubGVuZ3RoIHx8IGNzc0JlZm9yZUlubGluZUNvdW50KSB7CkBAIC04 NDIsNiArODQ1LDkgQEAgV2ViSW5zcGVjdG9yLkF1ZGl0UnVsZXMuU3R5bGVzU2NyaXB0c09yZGVy UnVsZS5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgZnVuY3Rpb24gbGF0ZVN0eWxlc1JlY2VpdmVk KHJvb3QsIG5vZGVJZHMpCiAgICAgICAgIHsKKyAgICAgICAgICAgIGlmICghbm9kZUlkcykKKyAg ICAgICAgICAgICAgICByZXR1cm47CisKICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5kb21BZ2Vu dC5xdWVyeVNlbGVjdG9yQWxsKHJvb3QuaWQsICJoZWFkIGxpbmtbcmVsfj0nc3R5bGVzaGVldCdd W2hyZWZdIH4gc2NyaXB0Om5vdChbc3JjXSkiLCBjc3NCZWZvcmVJbmxpbmVSZWNlaXZlZC5iaW5k KG51bGwsIG5vZGVJZHMpKTsKICAgICAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NTU1N0eWxlTW9kZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL0NTU1N0eWxlTW9kZWwuanMKaW5kZXggMTEwYTcyMGI0OTM2Mzcz MjFkY2Q3ZDZiZGU0YzQwMzM0Yjk1MWJkMC4uY2FlZjJjMWVjNDZlM2IxOTEzN2E0ZWRjM2QyNDdi M2JjMjM0ZmU2MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9DU1NTdHlsZU1vZGVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvQ1NTU3R5bGVNb2RlbC5qcwpAQCAtMTIyLDkgKzEyMiw5IEBAIFdlYkluc3BlY3Rvci5DU1NT dHlsZU1vZGVsLnByb3RvdHlwZSA9IHsKIAogICAgIHNldFJ1bGVTZWxlY3RvcjogZnVuY3Rpb24o cnVsZUlkLCBub2RlSWQsIG5ld1NlbGVjdG9yLCBzdWNjZXNzQ2FsbGJhY2ssIGZhaWx1cmVDYWxs YmFjaykKICAgICB7Ci0gICAgICAgIGZ1bmN0aW9uIGNoZWNrQWZmZWN0c0NhbGxiYWNrKG5vZGVJ ZCwgc3VjY2Vzc0NhbGxiYWNrLCBydWxlUGF5bG9hZCwgZXJyb3IsIHNlbGVjdGVkTm9kZUlkcykK KyAgICAgICAgZnVuY3Rpb24gY2hlY2tBZmZlY3RzQ2FsbGJhY2sobm9kZUlkLCBzdWNjZXNzQ2Fs bGJhY2ssIHJ1bGVQYXlsb2FkLCBzZWxlY3RlZE5vZGVJZHMpCiAgICAgICAgIHsKLSAgICAgICAg ICAgIGlmIChlcnJvcikKKyAgICAgICAgICAgIGlmICghc2VsZWN0ZWROb2RlSWRzKQogICAgICAg ICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgIHZhciBkb2VzQWZmZWN0U2VsZWN0ZWROb2Rl ID0gKHNlbGVjdGVkTm9kZUlkcy5pbmRleE9mKG5vZGVJZCkgPj0gMCk7CiAgICAgICAgICAgICB2 YXIgcnVsZSA9IFdlYkluc3BlY3Rvci5DU1NSdWxlLnBhcnNlUGF5bG9hZChydWxlUGF5bG9hZCk7 CkBAIC0xMzcsOCArMTM3LDEzIEBAIFdlYkluc3BlY3Rvci5DU1NTdHlsZU1vZGVsLnByb3RvdHlw ZSA9IHsKICAgICAgICAgICAgIC8vIEZJWE1FOiBsb29rcyBsaWtlIHJ1bGVQYXlsb2FkIGlzIGFs d2F5cyBudWxsLgogICAgICAgICAgICAgaWYgKGVycm9yKQogICAgICAgICAgICAgICAgIGZhaWx1 cmVDYWxsYmFjaygpOwotICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAgIFdlYkluc3Bl Y3Rvci5kb21BZ2VudC5xdWVyeVNlbGVjdG9yQWxsKG5vZGVJZCwgbmV3U2VsZWN0b3IsIGNoZWNr QWZmZWN0c0NhbGxiYWNrLmJpbmQodGhpcywgbm9kZUlkLCBzdWNjZXNzQ2FsbGJhY2ssIHJ1bGVQ YXlsb2FkKSk7CisgICAgICAgICAgICBlbHNlIHsKKyAgICAgICAgICAgICAgICB2YXIgZG9jdW1l bnRFbGVtZW50SWQgPSB0aGlzLl9kb2N1bWVudEVsZW1lbnRJZChub2RlSWQpOworICAgICAgICAg ICAgICAgIGlmIChkb2N1bWVudEVsZW1lbnRJZCkKKyAgICAgICAgICAgICAgICAgICAgV2ViSW5z cGVjdG9yLmRvbUFnZW50LnF1ZXJ5U2VsZWN0b3JBbGwoZG9jdW1lbnRFbGVtZW50SWQsIG5ld1Nl bGVjdG9yLCBjaGVja0FmZmVjdHNDYWxsYmFjay5iaW5kKHRoaXMsIG5vZGVJZCwgc3VjY2Vzc0Nh bGxiYWNrLCBydWxlUGF5bG9hZCkpOworICAgICAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAg ICAgICAgICAgZmFpbHVyZUNhbGxiYWNrKCk7CisgICAgICAgICAgICB9CiAgICAgICAgIH0KIAog ICAgICAgICBDU1NBZ2VudC5zZXRSdWxlU2VsZWN0b3IocnVsZUlkLCBuZXdTZWxlY3RvciwgY2Fs bGJhY2suYmluZCh0aGlzLCBub2RlSWQsIHN1Y2Nlc3NDYWxsYmFjaywgZmFpbHVyZUNhbGxiYWNr LCBuZXdTZWxlY3RvcikpOwpAQCAtMTQ2LDggKzE1MSwxMSBAQCBXZWJJbnNwZWN0b3IuQ1NTU3R5 bGVNb2RlbC5wcm90b3R5cGUgPSB7CiAKICAgICBhZGRSdWxlOiBmdW5jdGlvbihub2RlSWQsIHNl bGVjdG9yLCBzdWNjZXNzQ2FsbGJhY2ssIGZhaWx1cmVDYWxsYmFjaykKICAgICB7Ci0gICAgICAg IGZ1bmN0aW9uIGNoZWNrQWZmZWN0c0NhbGxiYWNrKG5vZGVJZCwgc3VjY2Vzc0NhbGxiYWNrLCBy dWxlUGF5bG9hZCwgZXJyb3IsIHNlbGVjdGVkTm9kZUlkcykKKyAgICAgICAgZnVuY3Rpb24gY2hl Y2tBZmZlY3RzQ2FsbGJhY2sobm9kZUlkLCBzdWNjZXNzQ2FsbGJhY2ssIHJ1bGVQYXlsb2FkLCBz ZWxlY3RlZE5vZGVJZHMpCiAgICAgICAgIHsKKyAgICAgICAgICAgIGlmICghc2VsZWN0ZWROb2Rl SWRzKQorICAgICAgICAgICAgICAgIHJldHVybjsKKwogICAgICAgICAgICAgdmFyIGRvZXNBZmZl Y3RTZWxlY3RlZE5vZGUgPSAoc2VsZWN0ZWROb2RlSWRzLmluZGV4T2Yobm9kZUlkKSA+PSAwKTsK ICAgICAgICAgICAgIHZhciBydWxlID0gV2ViSW5zcGVjdG9yLkNTU1J1bGUucGFyc2VQYXlsb2Fk KHJ1bGVQYXlsb2FkKTsKICAgICAgICAgICAgIHN1Y2Nlc3NDYWxsYmFjayhydWxlLCBkb2VzQWZm ZWN0U2VsZWN0ZWROb2RlKTsKQEAgLTE1OSwxMyArMTY3LDI1IEBAIFdlYkluc3BlY3Rvci5DU1NT dHlsZU1vZGVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIGlmIChlcnJvcikgewogICAgICAg ICAgICAgICAgIC8vIEludmFsaWQgc3ludGF4IGZvciBhIHNlbGVjdG9yCiAgICAgICAgICAgICAg ICAgZmFpbHVyZUNhbGxiYWNrKCk7Ci0gICAgICAgICAgICB9IGVsc2UKLSAgICAgICAgICAgICAg ICBXZWJJbnNwZWN0b3IuZG9tQWdlbnQucXVlcnlTZWxlY3RvckFsbChub2RlSWQsIHNlbGVjdG9y LCBjaGVja0FmZmVjdHNDYWxsYmFjay5iaW5kKHRoaXMsIG5vZGVJZCwgc3VjY2Vzc0NhbGxiYWNr LCBydWxlUGF5bG9hZCkpOworICAgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAgICB2 YXIgZG9jdW1lbnRFbGVtZW50SWQgPSB0aGlzLl9kb2N1bWVudEVsZW1lbnRJZChub2RlSWQpOwor ICAgICAgICAgICAgICAgIGlmIChkb2N1bWVudEVsZW1lbnRJZCkKKyAgICAgICAgICAgICAgICAg ICAgV2ViSW5zcGVjdG9yLmRvbUFnZW50LnF1ZXJ5U2VsZWN0b3JBbGwoZG9jdW1lbnRFbGVtZW50 SWQsIHNlbGVjdG9yLCBjaGVja0FmZmVjdHNDYWxsYmFjay5iaW5kKHRoaXMsIG5vZGVJZCwgc3Vj Y2Vzc0NhbGxiYWNrLCBydWxlUGF5bG9hZCkpOworICAgICAgICAgICAgICAgIGVsc2UKKyAgICAg ICAgICAgICAgICAgICAgZmFpbHVyZUNhbGxiYWNrKCk7CisgICAgICAgICAgICB9CiAgICAgICAg IH0KIAogICAgICAgICBDU1NBZ2VudC5hZGRSdWxlKG5vZGVJZCwgc2VsZWN0b3IsIGNhbGxiYWNr LmJpbmQodGhpcywgc3VjY2Vzc0NhbGxiYWNrLCBmYWlsdXJlQ2FsbGJhY2ssIHNlbGVjdG9yKSk7 CiAgICAgfSwKIAorICAgIF9kb2N1bWVudEVsZW1lbnRJZDogZnVuY3Rpb24obm9kZUlkKQorICAg IHsKKyAgICAgICAgdmFyIG5vZGUgPSBXZWJJbnNwZWN0b3IuZG9tQWdlbnQubm9kZUZvcklkKG5v ZGVJZCk7CisgICAgICAgIHZhciBkb2N1bWVudEVsZW1lbnQgPSBub2RlICYmIG5vZGUub3duZXJE b2N1bWVudEVsZW1lbnQoKTsKKyAgICAgICAgcmV0dXJuIGRvY3VtZW50RWxlbWVudCAmJiBkb2N1 bWVudEVsZW1lbnQuaWQ7CisgICAgfSwKKwogICAgIF9maXJlU3R5bGVTaGVldENoYW5nZWQ6IGZ1 bmN0aW9uKHN0eWxlU2hlZXRJZCwgbWFqb3JDaGFuZ2UsIGNhbGxiYWNrKQogICAgIHsKICAgICAg ICAgY2FsbGJhY2sgPSBjYWxsYmFjayB8fCBmdW5jdGlvbigpIHt9OwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9ET01BZ2VudC5qcyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRE9NQWdlbnQuanMKaW5kZXggNTg4OTMyMDgyNmRiZjEw MjBhMWJjNWM1MDA1NmQzN2E3ZDYyODc5OC4uNDIxMGU0MjBhNGQ5YTUyNzE3ZjA3OTJjYzZlZDRl NGNiYWMyYmI0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9ET01BZ2VudC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RP TUFnZW50LmpzCkBAIC0zMTIsNiArMzEyLDE2IEBAIFdlYkluc3BlY3Rvci5ET01Ob2RlLnByb3Rv dHlwZSA9IHsKICAgICAgICAgfTsKICAgICAgICAgdGhpcy5fYXR0cmlidXRlc01hcFtuYW1lXSA9 IGF0dHI7CiAgICAgICAgIHRoaXMuX2F0dHJpYnV0ZXMucHVzaChhdHRyKTsKKyAgICB9LAorCisg ICAgb3duZXJEb2N1bWVudEVsZW1lbnQ6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIC8vIGRv Y3VtZW50IGVsZW1lbnQgaXMgdGhlIGNoaWxkIG9mIHRoZSBkb2N1bWVudCAvIGZyYW1lIG93bmVy IG5vZGUgdGhhdCBoYXMgZG9jdW1lbnRVUkwgcHJvcGVydHkuCisgICAgICAgIC8vIEZJWE1FOiBy ZXR1cm4gZG9jdW1lbnQgbm9kZXMgYXMgYSBwYXJ0IG9mIHRoZSBET00gdHJlZSBzdHJ1Y3R1cmUu CisgICAgICAgIHZhciBub2RlID0gdGhpczsKKyAgICAgICAgd2hpbGUgKG5vZGUucGFyZW50Tm9k ZSAmJiAhbm9kZS5wYXJlbnROb2RlLmRvY3VtZW50VVJMKQorICAgICAgICAgICAgbm9kZSA9IG5v ZGUucGFyZW50Tm9kZTsKKyAgICAgICAgcmV0dXJuIG5vZGU7CiAgICAgfQogfQogCkBAIC0zODcs NiArMzk3LDggQEAgV2ViSW5zcGVjdG9yLkRPTUFnZW50LnByb3RvdHlwZSA9IHsKICAgICAgICAg ICAgIHJldHVybjsKICAgICAgICAgcmV0dXJuIGZ1bmN0aW9uKGVycm9yLCByZXN1bHQpCiAgICAg ICAgIHsKKyAgICAgICAgICAgIGlmIChlcnJvcikKKyAgICAgICAgICAgICAgICBjb25zb2xlLmVy cm9yKCJFcnJvciBkdXJpbmcgRE9NQWdlbnQgb3BlcmF0aW9uOiAiICsgZXJyb3IpOwogICAgICAg ICAgICAgY2FsbGJhY2soZXJyb3IgPyBudWxsIDogcmVzdWx0KTsKICAgICAgICAgfQogICAgIH0s CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNl VHJlZU1vZGVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJj ZVRyZWVNb2RlbC5qcwppbmRleCBlMjZlMzhiZDMyMzY4MjU2MjAzZmVhYmY0NDNiYWY2NTk5ZTVh YzY2Li4yZjAwZGRkZTNlZDM2NDM0MDFjNTE1ZDhiMzczMzA3ODQ0ZDdlYWRjIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlVHJlZU1vZGVsLmpz CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VUcmVlTW9k ZWwuanMKQEAgLTM0Nyw2ICszNDcsNiBAQCBXZWJJbnNwZWN0b3IuUGFnZURpc3BhdGNoZXIucHJv dG90eXBlID0gewogCiAgICAgZnJhbWVEZXRhY2hlZDogZnVuY3Rpb24oZnJhbWVJZCkKICAgICB7 Ci0gICAgICAgIHRoaXMuX3Jlc291cmNlVHJlZU1vZGVsLl9mcmFtZURldGFjaGVkKGxvYWRlcklk KTsKKyAgICAgICAgdGhpcy5fcmVzb3VyY2VUcmVlTW9kZWwuX2ZyYW1lRGV0YWNoZWQoZnJhbWVJ ZCk7CiAgICAgfQogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvU3R5bGVzU2lkZWJhclBhbmUuanMKaW5kZXggZjU3ZWVhOWJkYWJlY2NjNjJiZTY0ZmI5 NjdhNzRkYmVmZDg2MDViYy4uZjA5ZGEyNDVjZjNhYjAxYjY2MjQzODg4NzZmNDVmNTFiNjJmNDkz NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNT aWRlYmFyUGFuZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0 eWxlc1NpZGViYXJQYW5lLmpzCkBAIC01NjcsNiArNTY3LDcgQEAgV2ViSW5zcGVjdG9yLlN0eWxl c1NpZGViYXJQYW5lLnByb3RvdHlwZSA9IHsKIAogICAgIF9jcmVhdGVOZXdSdWxlOiBmdW5jdGlv bihldmVudCkKICAgICB7CisgICAgICAgIHRoaXMuZXhwYW5kZWQgPSB0cnVlOwogICAgICAgICB0 aGlzLmFkZEJsYW5rU2VjdGlvbigpLnN0YXJ0RWRpdGluZ1NlbGVjdG9yKCk7CiAgICAgfSwKIAo=