65510 2011-08-01 22:50:07 -0700 Web Inspector: [Timeline] Hover on paint events and see rect outline around that area. 2011-08-03 09:11:39 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 445107 0 pfeldman 2011-08-01 22:50:07 -0700 <user feedback> 445784 1 102760 pfeldman 2011-08-03 03:07:38 -0700 Created attachment 102760 Patch 445793 2 102760 webkit.review.bot 2011-08-03 03:19:36 -0700 Comment on attachment 102760 Patch Attachment 102760 did not pass mac-ews (mac): Output: http://queues.webkit.org/results/9300207 445882 3 102760 yurys 2011-08-03 08:30:42 -0700 Comment on attachment 102760 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=102760&action=review > Source/WebCore/inspector/DOMNodeHighlighter.cpp:303 > +void drawRectHighlight(GraphicsContext& context, Document* document, IntRect* rect) Can we have a test for this functionality? > Source/WebCore/inspector/DOMNodeHighlighter.cpp:314 > + static const Color fillColor(255, 0, 0, 20); DEFINE_STATIC_LOCAL ? > Source/WebCore/inspector/DOMNodeHighlighter.cpp:316 > + FloatRect floatRect = *rect; Inline this? > Source/WebCore/inspector/Inspector.json:1013 > + { "name": "x", "type": "integer", "description": "X coordinate" }, Please describe what is the origin for these coordinates. > Source/WebCore/inspector/Inspector.json:1029 > + "name": "hideHighlight", Remove trailing comma or add a new description. > Source/WebKit/mac/ChangeLog:3 > + clean Remove this. 445889 4 pfeldman 2011-08-03 08:46:13 -0700 (In reply to comment #3) > (From update of attachment 102760 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=102760&action=review > > > Source/WebCore/inspector/DOMNodeHighlighter.cpp:303 > > +void drawRectHighlight(GraphicsContext& context, Document* document, IntRect* rect) > > Can we have a test for this functionality? > Not really. It is way too platform specific with no feedback to the front-end. > > Source/WebCore/inspector/DOMNodeHighlighter.cpp:314 > > + static const Color fillColor(255, 0, 0, 20); > > DEFINE_STATIC_LOCAL ? > Done. > > Source/WebCore/inspector/DOMNodeHighlighter.cpp:316 > > + FloatRect floatRect = *rect; > > Inline this? > Done. > > Source/WebCore/inspector/Inspector.json:1013 > > + { "name": "x", "type": "integer", "description": "X coordinate" }, > > Please describe what is the origin for these coordinates. > Done. > > Source/WebCore/inspector/Inspector.json:1029 > > + "name": "hideHighlight", > > Remove trailing comma or add a new description. > Done. > > Source/WebKit/mac/ChangeLog:3 > > + clean > > Remove this. Done. 445892 5 102788 pfeldman 2011-08-03 08:52:02 -0700 Created attachment 102788 Review comments addressed, to find out proper Mac symbol. 445895 6 102788 webkit.review.bot 2011-08-03 09:08:34 -0700 Comment on attachment 102788 Review comments addressed, to find out proper Mac symbol. Attachment 102788 did not pass mac-ews (mac): Output: http://queues.webkit.org/results/9309008 445897 7 pfeldman 2011-08-03 09:11:39 -0700 Committed r92284: <http://trac.webkit.org/changeset/92284> 102760 2011-08-03 03:07:38 -0700 2011-08-03 08:51:54 -0700 Patch bug-65510-20110803140736.patch text/plain 25294 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogOTIyNjUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA2ZDcyNzkxODczNDA3MDcx ODk3MmJiNGQxMDU1ZjZmM2Y1MDgwNjMxLi5lN2NjYmZhY2ZlNDlmNDdjOTIyYTY2N2ZjY2M5NmQ1 NGRiMjI5YjM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzYgQEAKKzIwMTEtMDgtMDMgIFBhdmVs IEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6 IFtUaW1lbGluZV0gSG92ZXIgb24gcGFpbnQgZXZlbnRzIGFuZCBzZWUgcmVjdCBvdXRsaW5lIGFy b3VuZCB0aGF0IGFyZWEuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD02NTUxMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogV2ViQ29yZS5leHAuaW46CisgICAgICAgICogV2ViQ29yZS5vcmRlcjoKKyAgICAg ICAgKiBpbnNwZWN0b3IvRE9NTm9kZUhpZ2hsaWdodGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkRPTU5vZGVIaWdobGlnaHRlcjo6ZHJhd1JlY3RIaWdobGlnaHQpOgorICAgICAgICAqIGluc3Bl Y3Rvci9ET01Ob2RlSGlnaGxpZ2h0ZXIuaDoKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9y Lmpzb246CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6ZHJhd0hpZ2hsaWdodCk6CisgICAg ICAgICogaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuaDoKKyAgICAgICAgKiBpbnNwZWN0 b3IvSW5zcGVjdG9yRE9NQWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRE9N QWdlbnQ6OmhpZ2hsaWdodFJlY3QpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRE9NQWdl bnQ6OmhpZGVIaWdobGlnaHQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRE9NQWdlbnQ6 OmRyYXdIaWdobGlnaHQpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5o OgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanM6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuRnJhbWVUcmVlRWxlbWVudC5wcm90b3R5cGUub25zZWxlY3QpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkZyYW1lVHJlZUVsZW1lbnQucHJvdG90eXBlLnNldCBob3Zl cmVkKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUGFuZWwuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbCk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuVGltZWxpbmVQYW5lbC5wcm90b3R5cGUuX21vdXNlT3V0KToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5UaW1lbGluZVBhbmVsLnByb3RvdHlwZS5fbW91c2VNb3ZlKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5UaW1lbGluZVBhbmVsLnByb3RvdHlwZS5faGlnaGxpZ2h0UmVjdCk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5wcm90b3R5cGUuX2hpZGVSZWN0SGlnaGxpZ2h0 KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qczoKKyAgICAgICAg KFdlYkluc3BlY3Rvci5oaWdobGlnaHRET01Ob2RlKToKKwogMjAxMS0wOC0wMyAgUGF2ZWwgRmVs ZG1hbiAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBy ZW1vdmUgTm9kZSBwYXJhbWV0ZXIgZnJvbSB0aGUgSW5zcGVjdG9yQ2xpZW50OjpoaWdobGlnaHQK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluIGIvU291cmNlL1dlYkNv cmUvV2ViQ29yZS5leHAuaW4KaW5kZXggN2Y1Yjk1NmU0OGRlZWE1YTNjOTJhOGQwYmFhNDAxYjUw YjkxOTE0My4uMTlhNTE1MjgzNTA4Yjk4MDgwZGFmMGMwMzk2NDQxZWIzZDIxNzllYSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KKysrIGIvU291cmNlL1dlYkNvcmUv V2ViQ29yZS5leHAuaW4KQEAgLTE2MTYsNyArMTYxNiw3IEBAIF9fWk43V2ViQ29yZTI4SW5zcGVj dG9yRnJvbnRlbmRDbGllbnRMb2NhbDI3cmVzdG9yZUF0dGFjaGVkV2luZG93SGVpZ2h0RXYKIF9f Wk43V2ViQ29yZTI4SW5zcGVjdG9yRnJvbnRlbmRDbGllbnRMb2NhbDMxY29uc3RyYWluZWRBdHRh Y2hlZFdpbmRvd0hlaWdodEVqagogX19aTjdXZWJDb3JlMjhJbnNwZWN0b3JGcm9udGVuZENsaWVu dExvY2FsQzJFUE5TXzE5SW5zcGVjdG9yQ29udHJvbGxlckVQTlNfNFBhZ2VFTjNXVEYxMFBhc3NP d25QdHJJTlMwXzhTZXR0aW5nc0VFRQogX19aTjdXZWJDb3JlMjhJbnNwZWN0b3JGcm9udGVuZENs aWVudExvY2FsRDJFdgotX19aTks3V2ViQ29yZTE5SW5zcGVjdG9yQ29udHJvbGxlcjE3ZHJhd05v ZGVIaWdobGlnaHRFUk5TXzE1R3JhcGhpY3NDb250ZXh0RQorX19aTks3V2ViQ29yZTE5SW5zcGVj dG9yQ29udHJvbGxlcjE3ZHJhd0hpZ2hsaWdodEVSTlNfMTVHcmFwaGljc0NvbnRleHRFCiBfX1pO SzdXZWJDb3JlMTlJbnNwZWN0b3JDb250cm9sbGVyMzFpc1JlY29yZGluZ1VzZXJJbml0aWF0ZWRQ cm9maWxlRXYKICNlbmRpZgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLm9y ZGVyIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5vcmRlcgppbmRleCA4ZGZhNGQ2ZTgzZmRlMzU3 ODcyYTMzZjkzZWFjZGNiODc0MjJhYjdiLi5mNGZkOGE0NDE3ZDkwMjg5Nzk0ZGYwNGYxNDllNmJi YzZiM2UzMDE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLm9yZGVyCisrKyBi L1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUub3JkZXIKQEAgLTI3NzI0LDggKzI3NzI0LDggQEAgX19a Tks3V2ViQ29yZTExU2NyaXB0VmFsdWU2aXNOdWxsRXYKIF9fWk43V2ViQ29yZTI2SW5zcGVjdG9y QmFja2VuZERpc3BhdGNoZXIxN0RPTV9oaWdobGlnaHROb2RlRWxQTlNfMTVJbnNwZWN0b3JPYmpl Y3RFCiBfX1pON1dlYkNvcmUxN0luc3BlY3RvckRPTUFnZW50MTNoaWdobGlnaHROb2RlRVBOM1dU RjZTdHJpbmdFaVMzXwogX19aTjdXZWJDb3JlMTdJbnNwZWN0b3JET01BZ2VudDloaWdobGlnaHRF UE4zV1RGNlN0cmluZ0VQTlNfNE5vZGVFUktTMl8KLV9fWk5LN1dlYkNvcmUxOUluc3BlY3RvckNv bnRyb2xsZXIxN2RyYXdOb2RlSGlnaGxpZ2h0RVJOU18xNUdyYXBoaWNzQ29udGV4dEUKLV9fWk5L N1dlYkNvcmUxN0luc3BlY3RvckRPTUFnZW50MTdkcmF3Tm9kZUhpZ2hsaWdodEVSTlNfMTVHcmFw aGljc0NvbnRleHRFCitfX1pOSzdXZWJDb3JlMTlJbnNwZWN0b3JDb250cm9sbGVyMTdkcmF3SGln aGxpZ2h0RVJOU18xNUdyYXBoaWNzQ29udGV4dEUKK19fWk5LN1dlYkNvcmUxN0luc3BlY3RvckRP TUFnZW50MTdkcmF3SGlnaGxpZ2h0RVJOU18xNUdyYXBoaWNzQ29udGV4dEUKIF9fWk43V2ViQ29y ZTE4RE9NTm9kZUhpZ2hsaWdodGVyMTdEcmF3Tm9kZUhpZ2hsaWdodEVSTlNfMTVHcmFwaGljc0Nv bnRleHRFUE5TXzROb2RlRU5TMF8xM0hpZ2hsaWdodE1vZGVFCiBfX1pON1dlYkNvcmUxMl9HTE9C QUxfX05fMTI0ZHJhd091dGxpbmVkUXVhZFdpdGhDbGlwRVJOU18xNUdyYXBoaWNzQ29udGV4dEVS S05TXzlGbG9hdFF1YWRFUzVfUktOU181Q29sb3JFCiBfX1pON1dlYkNvcmUxMl9HTE9CQUxfX05f MTE2ZHJhd091dGxpbmVkUXVhZEVSTlNfMTVHcmFwaGljc0NvbnRleHRFUktOU185RmxvYXRRdWFk RVJLTlNfNUNvbG9yRQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0RPTU5v ZGVIaWdobGlnaHRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvRE9NTm9kZUhpZ2hs aWdodGVyLmNwcAppbmRleCA3ZmM0NjQwYTAxNGVhNWJmOTQ5NDI4OGNmNjVjNDg3MWNjZjc1OThi Li4wNmM3MjAyOWY0OWNjYzEwZjYzZGY2MjJiNTllY2RhNjNiZGQ2NTUzIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvRE9NTm9kZUhpZ2hsaWdodGVyLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvRE9NTm9kZUhpZ2hsaWdodGVyLmNwcApAQCAtMzAwLDYgKzMw MCw0MCBAQCB2b2lkIGRyYXdOb2RlSGlnaGxpZ2h0KEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCwg Tm9kZSogbm9kZSwgSGlnaGxpZ2h0TW9kZSBtb2RlKQogICAgICAgICBkcmF3RWxlbWVudFRpdGxl KGNvbnRleHQsIG5vZGUsIGJvdW5kaW5nQm94LCB0aXRsZUFuY2hvckJveCwgb3ZlcmxheVJlY3Qs IHNldHRpbmdzKTsKIH0KIAordm9pZCBkcmF3UmVjdEhpZ2hsaWdodChHcmFwaGljc0NvbnRleHQm IGNvbnRleHQsIERvY3VtZW50KiBkb2N1bWVudCwgSW50UmVjdCogcmVjdCkKK3sKKyAgICBpZiAo IWRvY3VtZW50KQorICAgICAgICByZXR1cm47CisgICAgRnJhbWVWaWV3KiB2aWV3ID0gZG9jdW1l bnQtPmZyYW1lKCktPnZpZXcoKTsKKworICAgIEZsb2F0UmVjdCBvdmVybGF5UmVjdCA9IHZpZXct PnZpc2libGVDb250ZW50UmVjdCgpOworICAgIGNvbnRleHQudHJhbnNsYXRlKC1vdmVybGF5UmVj dC54KCksIC1vdmVybGF5UmVjdC55KCkpOworCisgICAgc3RhdGljIGNvbnN0IGludCBvdXRsaW5l VGhpY2tuZXNzID0gMjsKKyAgICBzdGF0aWMgY29uc3QgQ29sb3Igb3V0bGluZUNvbG9yKDI1NSwg MCwgMCwgMjI4KTsKKyAgICBzdGF0aWMgY29uc3QgQ29sb3IgZmlsbENvbG9yKDI1NSwgMCwgMCwg MjApOworCisgICAgRmxvYXRSZWN0IGZsb2F0UmVjdCA9ICpyZWN0OworICAgIFBhdGggcXVhZFBh dGggPSBxdWFkVG9QYXRoKGZsb2F0UmVjdCk7CisKKyAgICAvLyBDbGlwIG91dCB0aGUgcXVhZCwg dGhlbiBkcmF3IHdpdGggYSAycHggc3Ryb2tlIHRvIGdldCBhIHBpeGVsCisgICAgLy8gb2Ygb3V0 bGluZSAoYmVjYXVzZSBpbmZsYXRpbmcgYSBxdWFkIGlzIGhhcmQpCisgICAgeworICAgICAgICBj b250ZXh0LnNhdmUoKTsKKyAgICAgICAgY29udGV4dC5jbGlwT3V0KHF1YWRQYXRoKTsKKworICAg ICAgICBjb250ZXh0LnNldFN0cm9rZVRoaWNrbmVzcyhvdXRsaW5lVGhpY2tuZXNzKTsKKyAgICAg ICAgY29udGV4dC5zZXRTdHJva2VDb2xvcihvdXRsaW5lQ29sb3IsIENvbG9yU3BhY2VEZXZpY2VS R0IpOworICAgICAgICBjb250ZXh0LnN0cm9rZVBhdGgocXVhZFBhdGgpOworCisgICAgICAgIGNv bnRleHQucmVzdG9yZSgpOworICAgIH0KKworICAgIC8vIE5vdyBkbyB0aGUgZmlsbAorICAgIGNv bnRleHQuc2V0RmlsbENvbG9yKGZpbGxDb2xvciwgQ29sb3JTcGFjZURldmljZVJHQik7CisgICAg Y29udGV4dC5maWxsUGF0aChxdWFkUGF0aCk7Cit9CisKIH0gLy8gbmFtZXNwYWNlIERPTU5vZGVI aWdobGlnaHRlcgogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvRE9NTm9kZUhpZ2hsaWdodGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvRE9NTm9kZUhpZ2hsaWdodGVyLmgKaW5kZXggMmVkZTU3M2U0NDI1ZWNjMTRlYzY3 MTgwMzlhNzQ0YzkwYzBiYThlYi4uMzBkNzc2MDA0YWYyZWQ5N2JlZDcyNjA3ZmFjODA5ZjI1ODVm MTI4YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0RPTU5vZGVIaWdobGln aHRlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9ET01Ob2RlSGlnaGxpZ2h0ZXIu aApAQCAtMzEsNyArMzEsOSBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKK2NsYXNzIERvY3Vt ZW50OwogY2xhc3MgR3JhcGhpY3NDb250ZXh0OworY2xhc3MgSW50UmVjdDsKIGNsYXNzIE5vZGU7 CiAKIG5hbWVzcGFjZSBET01Ob2RlSGlnaGxpZ2h0ZXIgewpAQCAtNDYsNiArNDgsOCBAQCBlbnVt IEhpZ2hsaWdodE1vZGUgewogCiB2b2lkIGRyYXdOb2RlSGlnaGxpZ2h0KEdyYXBoaWNzQ29udGV4 dCYsIE5vZGUqLCBIaWdobGlnaHRNb2RlKTsKIAordm9pZCBkcmF3UmVjdEhpZ2hsaWdodChHcmFw aGljc0NvbnRleHQmLCBEb2N1bWVudCosIEludFJlY3QqKTsKKwogfSAvLyBuYW1lc3BhY2UgRE9N Tm9kZUhpZ2hsaWdodGVyCiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbiBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3IuanNvbgppbmRleCAwMGNkMTU0YTcxMGNhY2UxNGJjYTA3YTk5OGU4 MzdhZWQ0NjE0MDUxLi43YzRjODgyYTI2NWVhZWE1Zjk5YTVlNGZmZTBkNWFmODFmMDI5NjgxIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24KKysrIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uCkBAIC0xMDA4LDYgKzEwMDgs MTYgQEAKICAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiRW50ZXJzIHRoZSAnaW5zcGVj dCcgbW9kZS4gSW4gdGhpcyBtb2RlLCBlbGVtZW50cyB0aGF0IHVzZXIgaXMgaG92ZXJpbmcgb3Zl ciBhcmUgaGlnaGxpZ2h0ZWQuIEJhY2tlbmQgdGhlbiBnZW5lcmF0ZXMgJ2luc3BlY3QnIGNvbW1h bmQgdXBvbiBlbGVtZW50IHNlbGVjdGlvbi4iCiAgICAgICAgICAgICB9LAogICAgICAgICAgICAg eworICAgICAgICAgICAgICAgICJuYW1lIjogImhpZ2hsaWdodFJlY3QiLAorICAgICAgICAgICAg ICAgICJwYXJhbWV0ZXJzIjogWworICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogIngiLCAi dHlwZSI6ICJpbnRlZ2VyIiwgImRlc2NyaXB0aW9uIjogIlggY29vcmRpbmF0ZSIgfSwKKyAgICAg ICAgICAgICAgICAgICAgeyAibmFtZSI6ICJ5IiwgInR5cGUiOiAiaW50ZWdlciIsICJkZXNjcmlw dGlvbiI6ICJZIGNvb3JkaW5hdGUiIH0sCisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAi d2lkdGgiLCAidHlwZSI6ICJpbnRlZ2VyIiwgImRlc2NyaXB0aW9uIjogIlJlY3RhbmdsZSB3aWR0 aCIgfSwKKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJoZWlnaHQiLCAidHlwZSI6ICJp bnRlZ2VyIiwgImRlc2NyaXB0aW9uIjogIlJlY3RhbmdsZSBoZWlnaHQiIH0KKyAgICAgICAgICAg ICAgICBdLAorICAgICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJIaWdobGlnaHRzIGdpdmVu IHJlY3RhbmdsZS4iCisgICAgICAgICAgICB9LAorICAgICAgICAgICAgewogICAgICAgICAgICAg ICAgICJuYW1lIjogImhpZ2hsaWdodE5vZGUiLAogICAgICAgICAgICAgICAgICJwYXJhbWV0ZXJz IjogWwogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogIm5vZGVJZCIsICJ0eXBlIjogImlu dGVnZXIiLCAiZGVzY3JpcHRpb24iOiAiSWRlbnRpZmllciBvZiB0aGUgbm9kZSB0byBoaWdobGln aHQiIH0sCkBAIC0xMDE2LDggKzEwMjYsNyBAQAogICAgICAgICAgICAgICAgICJkZXNjcmlwdGlv biI6ICJIaWdobGlnaHRzIERPTSBub2RlIHdpdGggZ2l2ZW4gaWQuIgogICAgICAgICAgICAgfSwK ICAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICAibmFtZSI6ICJoaWRlTm9kZUhpZ2hsaWdo dCIsCi0gICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIkhpZGVzIERPTSBub2RlIGhpZ2hs aWdodC4iCisgICAgICAgICAgICAgICAgIm5hbWUiOiAiaGlkZUhpZ2hsaWdodCIsCiAgICAgICAg ICAgICB9LAogICAgICAgICAgICAgewogICAgICAgICAgICAgICAgICJuYW1lIjogImhpZ2hsaWdo dEZyYW1lIiwKQEAgLTEwMjcsMTAgKzEwMzYsNiBAQAogICAgICAgICAgICAgICAgICJkZXNjcmlw dGlvbiI6ICJIaWdobGlnaHRzIG93bmVyIGVsZW1lbnQgb2YgdGhlIGZyYW1lIHdpdGggZ2l2ZW4g aWQuIgogICAgICAgICAgICAgfSwKICAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICAibmFt ZSI6ICJoaWRlRnJhbWVIaWdobGlnaHQiLAotICAgICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6 ICJIaWRlcyBmcmFtZSBvd25lciBoaWdobGlnaHQuIgotICAgICAgICAgICAgfSwKLSAgICAgICAg ICAgIHsKICAgICAgICAgICAgICAgICAibmFtZSI6ICJwdXNoTm9kZUJ5UGF0aFRvRnJvbnRlbmQi LAogICAgICAgICAgICAgICAgICJwYXJhbWV0ZXJzIjogWwogICAgICAgICAgICAgICAgICAgICB7 ICJuYW1lIjogInBhdGgiLCAidHlwZSI6ICJzdHJpbmciLCAiZGVzY3JpcHRpb24iOiAiUGF0aCB0 byBub2RlIGluIHRoZSBwcm9wcmlldGFyeSBmb3JtYXQuIiB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAKaW5kZXggY2M1MWIwNDcwNDRkMTQw YTkxMDI2M2Q2OTI5NWRiNjYwZDNiYjQxMS4uNjI5MWEzM2NiZTU3YzNkYWQwNjc5Y2FlODg1ZDQ3 OTg4YjExMTg2YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv ckNvbnRyb2xsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JD b250cm9sbGVyLmNwcApAQCAtMzc0LDkgKzM3NCw5IEBAIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxl cjo6ZXZhbHVhdGVGb3JUZXN0SW5Gcm9udGVuZChsb25nIGNhbGxJZCwgY29uc3QgU3RyaW5nJiBz CiAgICAgbV9pbnNwZWN0b3JBZ2VudC0+ZXZhbHVhdGVGb3JUZXN0SW5Gcm9udGVuZChjYWxsSWQs IHNjcmlwdCk7CiB9CiAKLXZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6ZHJhd05vZGVIaWdobGln aHQoR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0KSBjb25zdAordm9pZCBJbnNwZWN0b3JDb250cm9s bGVyOjpkcmF3SGlnaGxpZ2h0KEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCkgY29uc3QKIHsKLSAg ICBtX2RvbUFnZW50LT5kcmF3Tm9kZUhpZ2hsaWdodChjb250ZXh0KTsKKyAgICBtX2RvbUFnZW50 LT5kcmF3SGlnaGxpZ2h0KGNvbnRleHQpOwogfQogCiB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6 OnNob3dDb25zb2xlKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3JDb250cm9sbGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29u dHJvbGxlci5oCmluZGV4IDVhNDliYmQxMmY4Njc3NDE0MDk0MjBlYzE2M2Y0OTQ4MDY3MGZlYzEu LjlkNzY4MzVjZTgzMGE0NDhlZGRhMzk2NzE2NmYwMmVlNDgwZDA3NjEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmgKKysrIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuaApAQCAtOTcsNyArOTcsNyBA QCBwdWJsaWM6CiAKICAgICB2b2lkIHNob3dDb25zb2xlKCk7CiAgICAgdm9pZCBpbnNwZWN0KE5v ZGUqKTsKLSAgICB2b2lkIGRyYXdOb2RlSGlnaGxpZ2h0KEdyYXBoaWNzQ29udGV4dCYpIGNvbnN0 OworICAgIHZvaWQgZHJhd0hpZ2hsaWdodChHcmFwaGljc0NvbnRleHQmKSBjb25zdDsKICAgICB2 b2lkIGhpZGVIaWdobGlnaHQoKTsKICAgICBOb2RlKiBoaWdobGlnaHRlZE5vZGUoKSBjb25zdDsK IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50 LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5jcHAKaW5k ZXggZDM0OTczNDQxOTViZWQ4MTBhZjM5YzQxMTBhMmE2NTJkMmU0NjY5ZC4uYzAwMzQ3MTA0NDhm YzVkN2YyYmZmZGVlNmExMzEwYWI5MzA4OTkxYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuY3BwCkBAIC02Nyw2ICs2Nyw3IEBACiAjaW5jbHVkZSAi SW5zcGVjdG9yUGFnZUFnZW50LmgiCiAjaW5jbHVkZSAiSW5zcGVjdG9yU3RhdGUuaCIKICNpbmNs dWRlICJJbnN0cnVtZW50aW5nQWdlbnRzLmgiCisjaW5jbHVkZSAiSW50UmVjdC5oIgogI2luY2x1 ZGUgIk11dGF0aW9uRXZlbnQuaCIKICNpbmNsdWRlICJOb2RlLmgiCiAjaW5jbHVkZSAiTm9kZUxp c3QuaCIKQEAgLTEwMTIsNiArMTAxMywxMiBAQCB2b2lkIEluc3BlY3RvckRPTUFnZW50OjpoaWdo bGlnaHQoRXJyb3JTdHJpbmcqLCBOb2RlKiBub2RlLCBjb25zdCBTdHJpbmcmIG1vZGUpCiAgICAg bV9jbGllbnQtPmhpZ2hsaWdodCgpOwogfQogCit2b2lkIEluc3BlY3RvckRPTUFnZW50OjpoaWdo bGlnaHRSZWN0KEVycm9yU3RyaW5nKiwgaW50IHgsIGludCB5LCBpbnQgd2lkdGgsIGludCBoZWln aHQpCit7CisgICAgbV9oaWdobGlnaHRlZFJlY3QgPSBhZG9wdFB0cihuZXcgSW50UmVjdCh4LCB5 LCB3aWR0aCwgaGVpZ2h0KSk7CisgICAgbV9jbGllbnQtPmhpZ2hsaWdodCgpOworfQorCiB2b2lk IEluc3BlY3RvckRPTUFnZW50OjpoaWdobGlnaHROb2RlKEVycm9yU3RyaW5nKiBlcnJvciwgaW50 IG5vZGVJZCwgU3RyaW5nKiBtb2RlKQogewogICAgIGlmIChOb2RlKiBub2RlID0gbm9kZUZvcklk KG5vZGVJZCkpCkBAIC0xMDI4LDYgKzEwMzUsNyBAQCB2b2lkIEluc3BlY3RvckRPTUFnZW50Ojpo aWdobGlnaHRGcmFtZShFcnJvclN0cmluZyogZXJyb3IsIGNvbnN0IFN0cmluZyYgZnJhbWVJZAog dm9pZCBJbnNwZWN0b3JET01BZ2VudDo6aGlkZUhpZ2hsaWdodChFcnJvclN0cmluZyopCiB7CiAg ICAgbV9oaWdobGlnaHRlZE5vZGUgPSAwOworICAgIG1faGlnaGxpZ2h0ZWRSZWN0LmNsZWFyKCk7 CiAgICAgbV9jbGllbnQtPmhpZGVIaWdobGlnaHQoKTsKIH0KIApAQCAtMTUwOSw4ICsxNTE3LDEz IEBAIFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBJbnNwZWN0b3JET01BZ2VudDo6cmVzb2x2 ZU5vZGUoTm9kZSogbm9kZSwgY29uc3QgU3RyCiAgICAgcmV0dXJuIGluamVjdGVkU2NyaXB0Lndy YXBOb2RlKG5vZGUsIG9iamVjdEdyb3VwKTsKIH0KIAotdm9pZCBJbnNwZWN0b3JET01BZ2VudDo6 ZHJhd05vZGVIaWdobGlnaHQoR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0KSBjb25zdAordm9pZCBJ bnNwZWN0b3JET01BZ2VudDo6ZHJhd0hpZ2hsaWdodChHcmFwaGljc0NvbnRleHQmIGNvbnRleHQp IGNvbnN0CiB7CisgICAgaWYgKG1faGlnaGxpZ2h0ZWRSZWN0KSB7CisgICAgICAgIERPTU5vZGVI aWdobGlnaHRlcjo6ZHJhd1JlY3RIaWdobGlnaHQoY29udGV4dCwgbV9kb2N1bWVudC5nZXQoKSwg bV9oaWdobGlnaHRlZFJlY3QuZ2V0KCkpOworICAgICAgICByZXR1cm47CisgICAgfQorCiAgICAg aWYgKCFtX2hpZ2hsaWdodGVkTm9kZSkKICAgICAgICAgcmV0dXJuOwogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuaCBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5oCmluZGV4IDRjMThiZTkxOGQ5NTMyZDFj ZmMzYjkyYTU2MzM3MGZiMTAzNTkxOWUuLjBjOTMyNzY0NjMwNTBlYzdjZjdkMjViNzdhNDljODEz MDRkZjI0YjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JE T01BZ2VudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01BZ2Vu dC5oCkBAIC01OCw2ICs1OCw3IEBAIGNsYXNzIEluc3BlY3RvckNsaWVudDsKIGNsYXNzIEluc3Bl Y3RvckRPTUFnZW50OwogY2xhc3MgSW5zcGVjdG9yRnJvbnRlbmQ7CiBjbGFzcyBJbnNwZWN0b3JQ YWdlQWdlbnQ7CitjbGFzcyBJbnRSZWN0OwogY2xhc3MgSGl0VGVzdFJlc3VsdDsKIGNsYXNzIE1h dGNoSm9iOwogY2xhc3MgSFRNTEVsZW1lbnQ7CkBAIC0xMzIsMTAgKzEzMyw5IEBAIHB1YmxpYzoK ICAgICB2b2lkIHB1c2hOb2RlVG9Gcm9udGVuZChFcnJvclN0cmluZyosIGNvbnN0IFN0cmluZyYg b2JqZWN0SWQsIGludCogbm9kZUlkKTsKICAgICB2b2lkIHB1c2hOb2RlQnlQYXRoVG9Gcm9udGVu ZChFcnJvclN0cmluZyosIGNvbnN0IFN0cmluZyYgcGF0aCwgaW50KiBub2RlSWQpOwogICAgIHZv aWQgaGlkZUhpZ2hsaWdodChFcnJvclN0cmluZyopOworICAgIHZvaWQgaGlnaGxpZ2h0UmVjdChF cnJvclN0cmluZyosIGludCB4LCBpbnQgeSwgaW50IHdpZHRoLCBpbnQgaGVpZ2h0KTsKICAgICB2 b2lkIGhpZ2hsaWdodE5vZGUoRXJyb3JTdHJpbmcqLCBpbnQgbm9kZUlkLCBTdHJpbmcqIG1vZGUp OwotICAgIHZvaWQgaGlkZU5vZGVIaWdobGlnaHQoRXJyb3JTdHJpbmcqIGVycm9yKSB7IGhpZGVI aWdobGlnaHQoZXJyb3IpOyB9CiAgICAgdm9pZCBoaWdobGlnaHRGcmFtZShFcnJvclN0cmluZyos IGNvbnN0IFN0cmluZyYgZnJhbWVJZCk7Ci0gICAgdm9pZCBoaWRlRnJhbWVIaWdobGlnaHQoRXJy b3JTdHJpbmcqIGVycm9yKSB7IGhpZGVIaWdobGlnaHQoZXJyb3IpOyB9CiAgICAgdm9pZCBtb3Zl VG8oRXJyb3JTdHJpbmcqLCBpbnQgbm9kZUlkLCBpbnQgdGFyZ2V0Tm9kZUlkLCBjb25zdCBpbnQq IGNvbnN0IGFuY2hvck5vZGVJZCwgaW50KiBuZXdOb2RlSWQpOwogCiAgICAgTm9kZSogaGlnaGxp Z2h0ZWROb2RlKCkgY29uc3QgeyByZXR1cm4gbV9oaWdobGlnaHRlZE5vZGUuZ2V0KCk7IH0KQEAg LTE2OCw3ICsxNjgsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBpbnNwZWN0KE5vZGUqKTsKICAgICB2 b2lkIGZvY3VzTm9kZSgpOwogCi0gICAgdm9pZCBkcmF3Tm9kZUhpZ2hsaWdodChHcmFwaGljc0Nv bnRleHQmKSBjb25zdDsKKyAgICB2b2lkIGRyYXdIaWdobGlnaHQoR3JhcGhpY3NDb250ZXh0Jikg Y29uc3Q7CiAKICAgICAvLyBXZSByZXByZXNlbnQgZW1iZWRkZWQgZG9tcyBhcyBhIHBhcnQgb2Yg dGhlIHNhbWUgaGllcmFyY2h5LiBIZW5jZSB3ZSB0cmVhdCBjaGlsZHJlbiBvZiBmcmFtZSBvd25l cnMgZGlmZmVyZW50bHkuCiAgICAgLy8gV2UgYWxzbyBza2lwIHdoaXRlc3BhY2UgdGV4dCBub2Rl cyBjb25kaXRpb25hbGx5LiBGb2xsb3dpbmcgbWV0aG9kcyBlbmNhcHN1bGF0ZSB0aGVzZSBzcGVj aWZpY3MuCkBAIC0yMzIsNiArMjMyLDcgQEAgcHJpdmF0ZToKICAgICBIYXNoU2V0PFJlZlB0cjxO b2RlPiA+IG1fc2VhcmNoUmVzdWx0czsKICAgICBPd25QdHI8UmV2YWxpZGF0ZVN0eWxlQXR0cmli dXRlVGFzaz4gbV9yZXZhbGlkYXRlU3R5bGVBdHRyVGFzazsKICAgICBSZWZQdHI8Tm9kZT4gbV9o aWdobGlnaHRlZE5vZGU7CisgICAgT3duUHRyPEludFJlY3Q+IG1faGlnaGxpZ2h0ZWRSZWN0Owog ICAgIFN0cmluZyBtX2hpZ2hsaWdodE1vZGU7CiAgICAgUmVmUHRyPE5vZGU+IG1fbm9kZVRvRm9j dXM7CiAgICAgYm9vbCBtX3NlYXJjaGluZ0Zvck5vZGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qcwppbmRleCAyMjIyZjVhYTQz OTZlOTAzZmRlMDlhYTE3NzM4ZmQwOGU5NmI0N2VlLi41YmMwMGQwNGYyZmE2M2VkYWNkMGFhODMz ZGE0NmIyMzFiZDMwZDllIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanMKQEAgLTEwNzMsNyArMTA3Myw3IEBAIFdlYkluc3Bl Y3Rvci5GcmFtZVRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5fc3RvcmFn ZVBhbmVsLnNob3dDYXRlZ29yeVZpZXcodGhpcy5fZGlzcGxheU5hbWUpOwogCiAgICAgICAgIHRo aXMubGlzdEl0ZW1FbGVtZW50LnJlbW92ZVN0eWxlQ2xhc3MoImhvdmVyZWQiKTsKLSAgICAgICAg RE9NQWdlbnQuaGlkZUZyYW1lSGlnaGxpZ2h0KCk7CisgICAgICAgIERPTUFnZW50LmhpZGVIaWdo bGlnaHQoKTsKICAgICB9LAogCiAgICAgZ2V0IGRpc3BsYXlOYW1lKCkKQEAgLTExMDgsNyArMTEw OCw3IEBAIFdlYkluc3BlY3Rvci5GcmFtZVRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAgICAg ICAgICAgIERPTUFnZW50LmhpZ2hsaWdodEZyYW1lKHRoaXMuX2ZyYW1lSWQpOwogICAgICAgICB9 IGVsc2UgewogICAgICAgICAgICAgdGhpcy5saXN0SXRlbUVsZW1lbnQucmVtb3ZlU3R5bGVDbGFz cygiaG92ZXJlZCIpOwotICAgICAgICAgICAgRE9NQWdlbnQuaGlkZUZyYW1lSGlnaGxpZ2h0KCk7 CisgICAgICAgICAgICBET01BZ2VudC5oaWRlSGlnaGxpZ2h0KCk7CiAgICAgICAgIH0KICAgICB9 LAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVs aW5lUGFuZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5l UGFuZWwuanMKaW5kZXggZGIyODQ3M2QxN2Y5NGUyN2ZmOWViNzIxZjJkYzBlZjc2OGQzYjYwZS4u ZjVjNGNmN2RkYjBiNjFkNzJjYWExYWIwZDU5YmQ2Y2NjMjYwNTY1YSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVBhbmVsLmpzCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVQYW5lbC5qcwpAQCAtOTQs NiArOTQsOCBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbCA9IGZ1bmN0aW9uKCkKICAgICB0 aGlzLl9zY3JvbGxUb3AgPSAwOwogCiAgICAgdGhpcy5fcG9wb3ZlckhlbHBlciA9IG5ldyBXZWJJ bnNwZWN0b3IuUG9wb3ZlckhlbHBlcih0aGlzLl9jb250YWluZXJFbGVtZW50LCB0aGlzLl9nZXRQ b3BvdmVyQW5jaG9yLmJpbmQodGhpcyksIHRoaXMuX3Nob3dQb3BvdmVyLmJpbmQodGhpcyksIHRy dWUpOworICAgIHRoaXMuX2NvbnRhaW5lckVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigibW91c2Vt b3ZlIiwgdGhpcy5fbW91c2VNb3ZlLmJpbmQodGhpcyksIGZhbHNlKTsKKyAgICB0aGlzLl9jb250 YWluZXJFbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNlb3V0IiwgdGhpcy5fbW91c2VPdXQu YmluZCh0aGlzKSwgZmFsc2UpOwogCiAgICAgLy8gRGlzYWJsZSBzaG9ydCBldmVudHMgZmlsdGVy IGJ5IGRlZmF1bHQuCiAgICAgdGhpcy50b2dnbGVGaWx0ZXJCdXR0b24udG9nZ2xlZCA9IHRydWU7 CkBAIC03MTIsNiArNzE0LDM3IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLnByb3RvdHlw ZSA9IHsKICAgICAgICAgcmV0dXJuIGVsZW1lbnQuZW5jbG9zaW5nTm9kZU9yU2VsZldpdGhDbGFz cygidGltZWxpbmUtZ3JhcGgtYmFyIikgfHwgZWxlbWVudC5lbmNsb3NpbmdOb2RlT3JTZWxmV2l0 aENsYXNzKCJ0aW1lbGluZS10cmVlLWl0ZW0iKTsKICAgICB9LAogCisgICAgX21vdXNlT3V0OiBm dW5jdGlvbihlKQorICAgIHsKKyAgICAgICAgdGhpcy5faGlkZVJlY3RIaWdobGlnaHQoKTsKKyAg ICB9LAorCisgICAgX21vdXNlTW92ZTogZnVuY3Rpb24oZSkKKyAgICB7CisgICAgICAgIHZhciBh bmNob3IgPSB0aGlzLl9nZXRQb3BvdmVyQW5jaG9yKGUudGFyZ2V0KTsKKworICAgICAgICBpZiAo YW5jaG9yICYmIGFuY2hvci5yb3cuX3JlY29yZC50eXBlID09PSAiUGFpbnQiKQorICAgICAgICAg ICAgdGhpcy5faGlnaGxpZ2h0UmVjdChhbmNob3Iucm93Ll9yZWNvcmQpOworICAgICAgICBlbHNl CisgICAgICAgICAgICB0aGlzLl9oaWRlUmVjdEhpZ2hsaWdodCgpOworICAgIH0sCisKKyAgICBf aGlnaGxpZ2h0UmVjdDogZnVuY3Rpb24ocmVjb3JkKQorICAgIHsKKyAgICAgICAgaWYgKHRoaXMu X2hpZ2hsaWdodGVkUmVjdCA9PT0gcmVjb3JkLmRhdGEpCisgICAgICAgICAgICByZXR1cm47Cisg ICAgICAgIHRoaXMuX2hpZ2hsaWdodGVkUmVjdCA9IHJlY29yZC5kYXRhOworICAgICAgICBET01B Z2VudC5oaWdobGlnaHRSZWN0KHRoaXMuX2hpZ2hsaWdodGVkUmVjdC54LCB0aGlzLl9oaWdobGln aHRlZFJlY3QueSwgdGhpcy5faGlnaGxpZ2h0ZWRSZWN0LndpZHRoLCB0aGlzLl9oaWdobGlnaHRl ZFJlY3QuaGVpZ2h0KTsKKyAgICB9LAorCisgICAgX2hpZGVSZWN0SGlnaGxpZ2h0OiBmdW5jdGlv bigpCisgICAgeworICAgICAgICBpZiAodGhpcy5faGlnaGxpZ2h0ZWRSZWN0KSB7CisgICAgICAg ICAgICBkZWxldGUgdGhpcy5faGlnaGxpZ2h0ZWRSZWN0OworICAgICAgICAgICAgRE9NQWdlbnQu aGlkZUhpZ2hsaWdodCgpOworICAgICAgICB9CisgICAgfSwKKwogICAgIF9zaG93UG9wb3Zlcjog ZnVuY3Rpb24oYW5jaG9yKQogICAgIHsKICAgICAgICAgdmFyIHJlY29yZCA9IGFuY2hvci5yb3cu X3JlY29yZDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv aW5zcGVjdG9yLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0 b3IuanMKaW5kZXggYmQ1OTA5ZjM1MTc5ZmM0OGE2MzkyZDY3MWMyNTMwMTUzNjQ1N2NhZC4uZTEz YWVmNjllZjBlMWM5ZTg0MjQ4ZDUzNmVjYjEzOGI5NjZlNTc1NyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKKysrIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKQEAgLTM5MSw3ICszOTEsNyBA QCB2YXIgV2ViSW5zcGVjdG9yID0gewogICAgICAgICBpZiAobm9kZUlkKQogICAgICAgICAgICAg RE9NQWdlbnQuaGlnaGxpZ2h0Tm9kZShub2RlSWQsIG1vZGUgfHwgImFsbCIpOwogICAgICAgICBl bHNlCi0gICAgICAgICAgICBET01BZ2VudC5oaWRlTm9kZUhpZ2hsaWdodCgpOworICAgICAgICAg ICAgRE9NQWdlbnQuaGlkZUhpZ2hsaWdodCgpOwogICAgIH0sCiAKICAgICBoaWdobGlnaHRET01O b2RlRm9yVHdvU2Vjb25kczogZnVuY3Rpb24obm9kZUlkKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxv ZwppbmRleCAyYjkzOTVlODgwMmFjODJiYjNmMGQzZjU4MWQxMjAwMDZiNzkzMzdiLi5iYTRhNGQ2 YzNkNWE0MGY4MzAwODA4YzlmMGM0NTNiZGM0MmEwM2Y2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDExLTA4LTAzICBQYXZlbCBGZWxkbWFuICA8cGZlbGRt YW5AZ29vZ2xlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBbVGltZWxpbmVdIEhvdmVy IG9uIHBhaW50IGV2ZW50cyBhbmQgc2VlIHJlY3Qgb3V0bGluZSBhcm91bmQgdGhhdCBhcmVhLgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjU1MTAKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHNyYy9XZWJE ZXZUb29sc0FnZW50SW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkRldlRvb2xzQWdlbnRJ bXBsOjpwYWludFBhZ2VPdmVybGF5KToKKwogMjAxMS0wOC0wMyAgUGF2ZWwgRmVsZG1hbiAgPHBm ZWxkbWFuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiByZW1vdmUgTm9k ZSBwYXJhbWV0ZXIgZnJvbSB0aGUgSW5zcGVjdG9yQ2xpZW50OjpoaWdobGlnaHQKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkRldlRvb2xzQWdlbnRJbXBsLmNwcCBi L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkRldlRvb2xzQWdlbnRJbXBsLmNwcAppbmRl eCA1NzQxOWI3YzgyNWZjZWI5Y2FiN2Y2OWZhMmZiNjk0ZTM4NDhjZDI3Li44NmM2MGIwNDI3YzYz MDMxYTZlM2I1MmE3MGJlZjY4N2JmNjIyZjM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3NyYy9XZWJEZXZUb29sc0FnZW50SW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS9zcmMvV2ViRGV2VG9vbHNBZ2VudEltcGwuY3BwCkBAIC0yNzksNyArMjc5LDcgQEAg dm9pZCBXZWJEZXZUb29sc0FnZW50SW1wbDo6cGFpbnRQYWdlT3ZlcmxheShHcmFwaGljc0NvbnRl eHQmIGdjKQogewogICAgIEluc3BlY3RvckNvbnRyb2xsZXIqIGljID0gaW5zcGVjdG9yQ29udHJv bGxlcigpOwogICAgIGlmIChpYykKLSAgICAgICAgaWMtPmRyYXdOb2RlSGlnaGxpZ2h0KGdjKTsK KyAgICAgICAgaWMtPmRyYXdIaWdobGlnaHQoZ2MpOwogfQogCiB2b2lkIFdlYkRldlRvb2xzQWdl bnRJbXBsOjpoaWdobGlnaHQoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdl TG9nIGIvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nCmluZGV4IGU3NjI4NWRhYTQzM2JkODEx YzBiYzAxZjkxODEzYmYzYTk2ZmEyZTkuLjlkZDdmMWM3MzAxZGY4ZDJkNzI5NWNjMTViMzQ5YWFj MzU2NTYzNmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZworKysgYi9T b3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxMS0wOC0wMyAg UGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGdvb2dsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3Bl Y3RvcjogW1RpbWVsaW5lXSBIb3ZlciBvbiBwYWludCBldmVudHMgYW5kIHNlZSByZWN0IG91dGxp bmUgYXJvdW5kIHRoYXQgYXJlYS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTY1NTEwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiB3ZWJraXQvd2Via2l0d2Vidmlldy5jcHA6CisgICAgICAgIChwYWludFdl YlZpZXcpOgorCiAyMDExLTA4LTAzICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0u b3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IHJlbW92ZSBOb2RlIHBhcmFtZXRlciBmcm9t IHRoZSBJbnNwZWN0b3JDbGllbnQ6OmhpZ2hsaWdodApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwIGIvU291cmNlL1dlYktpdC9ndGsvd2Via2l0 L3dlYmtpdHdlYnZpZXcuY3BwCmluZGV4IDkyZDU3MzFlMDdlZDdiMDU0YzUwNDc2ODU2ZDM4NTY4 Yjk0OTMyNWQuLjEyZmNiOTUxYzE3ZmQxMzVmMmRhZjEyZmM1MWE4N2EzMjY5ZTM2MGMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmNwcAorKysgYi9T b3VyY2UvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAKQEAgLTY2NSw3ICs2NjUs NyBAQCBzdGF0aWMgdm9pZCBwYWludFdlYlZpZXcoRnJhbWUqIGZyYW1lLCBnYm9vbGVhbiB0cmFu c3BhcmVudCwgR3JhcGhpY3NDb250ZXh0JiBjbwogCiAgICAgY29udGV4dC5zYXZlKCk7CiAgICAg Y29udGV4dC5jbGlwKGNsaXBSZWN0KTsKLSAgICBmcmFtZS0+cGFnZSgpLT5pbnNwZWN0b3JDb250 cm9sbGVyKCktPmRyYXdOb2RlSGlnaGxpZ2h0KGNvbnRleHQpOworICAgIGZyYW1lLT5wYWdlKCkt Pmluc3BlY3RvckNvbnRyb2xsZXIoKS0+ZHJhd0hpZ2hsaWdodChjb250ZXh0KTsKICAgICBjb250 ZXh0LnJlc3RvcmUoKTsKIH0KICNpZmRlZiBHVEtfQVBJX1ZFUlNJT05fMgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9n CmluZGV4IDhhODBhODQ5MWI1ZDllYmU5YjdmNGM2MTAyNzJjY2Q5ZWJiODIzYzcuLmU4NDI2NTA3 NzBkNDg1OGRkY2E2ZDU1OGFmNGFjZDU0YzQzZmI2M2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvbWFjL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNSBAQAorMjAxMS0wOC0wMyAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGdvb2dsZS5j b20+CisKKyAgICAgICAgY2xlYW4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBbVGltZWxpbmVd IEhvdmVyIG9uIHBhaW50IGV2ZW50cyBhbmQgc2VlIHJlY3Qgb3V0bGluZSBhcm91bmQgdGhhdCBh cmVhLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjU1 MTAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdl Ykluc3BlY3Rvci9XZWJOb2RlSGlnaGxpZ2h0Vmlldy5tbToKKyAgICAgICAgKC1bV2ViTm9kZUhp Z2hsaWdodFZpZXcgZHJhd1JlY3Q6XSk6CisKIDIwMTEtMDgtMDMgIFBhdmVsIEZlbGRtYW4gIDxw ZmVsZG1hbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogcmVtb3ZlIE5v ZGUgcGFyYW1ldGVyIGZyb20gdGhlIEluc3BlY3RvckNsaWVudDo6aGlnaGxpZ2h0CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJJbnNwZWN0b3IvV2ViTm9kZUhpZ2hsaWdodFZpZXcu bW0gYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJJbnNwZWN0b3IvV2ViTm9kZUhpZ2hsaWdodFZpZXcu bW0KaW5kZXggN2ZjM2NmNDIzNzA1OWVjN2EwZjI2YzQ5ZjY3OTU0N2M2ZDI4ZjY0YS4uZGQzNjNj NmI2ODk1YjQ3MWRlNTRkYzFkMjQyY2UzNzJiN2ViY2NmOSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9tYWMvV2ViSW5zcGVjdG9yL1dlYk5vZGVIaWdobGlnaHRWaWV3Lm1tCisrKyBiL1NvdXJj ZS9XZWJLaXQvbWFjL1dlYkluc3BlY3Rvci9XZWJOb2RlSGlnaGxpZ2h0Vmlldy5tbQpAQCAtNzMs NyArNzMsNyBAQCB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKICAgICAgICAgQVNTRVJUKFtbTlNH cmFwaGljc0NvbnRleHQgY3VycmVudENvbnRleHRdIGlzRmxpcHBlZF0pOwogCiAgICAgICAgIEdy YXBoaWNzQ29udGV4dCBjb250ZXh0KChQbGF0Zm9ybUdyYXBoaWNzQ29udGV4dCopW1tOU0dyYXBo aWNzQ29udGV4dCBjdXJyZW50Q29udGV4dF0gZ3JhcGhpY3NQb3J0XSk7Ci0gICAgICAgIFtfd2Vi Tm9kZUhpZ2hsaWdodCBpbnNwZWN0b3JDb250cm9sbGVyXS0+ZHJhd05vZGVIaWdobGlnaHQoY29u dGV4dCk7CisgICAgICAgIFtfd2ViTm9kZUhpZ2hsaWdodCBpbnNwZWN0b3JDb250cm9sbGVyXS0+ ZHJhd0hpZ2hsaWdodChjb250ZXh0KTsKICAgICAgICAgW05TR3JhcGhpY3NDb250ZXh0IHJlc3Rv cmVHcmFwaGljc1N0YXRlXTsKICAgICB9CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0 L0FwaS9xd2ViZnJhbWUuY3BwIGIvU291cmNlL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmNwcApp bmRleCBmNWU2OGJlMmU3MTNjN2MwMTQ2ODY5MTVjMzBhYTYwNmU0YmZiYTQxLi5hMGEyZjNlOWQx NGQyYTUzM2ZlM2ZlOWQxY2FhYzhjYmU5YTEyNmFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L3F0L0FwaS9xd2ViZnJhbWUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFt ZS5jcHAKQEAgLTM5Nyw3ICszOTcsNyBAQCB2b2lkIFFXZWJGcmFtZVByaXZhdGU6OnJlbmRlclJl bGF0aXZlQ29vcmRzKEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgUUZsYWdzPFFXZQogI2lmIEVO QUJMRShJTlNQRUNUT1IpCiAgICAgaWYgKGZyYW1lLT5wYWdlKCktPmluc3BlY3RvckNvbnRyb2xs ZXIoKS0+aGlnaGxpZ2h0ZWROb2RlKCkpIHsKICAgICAgICAgY29udGV4dC0+c2F2ZSgpOwotICAg ICAgICBmcmFtZS0+cGFnZSgpLT5pbnNwZWN0b3JDb250cm9sbGVyKCktPmRyYXdOb2RlSGlnaGxp Z2h0KCpjb250ZXh0KTsKKyAgICAgICAgZnJhbWUtPnBhZ2UoKS0+aW5zcGVjdG9yQ29udHJvbGxl cigpLT5kcmF3SGlnaGxpZ2h0KCpjb250ZXh0KTsKICAgICAgICAgY29udGV4dC0+cmVzdG9yZSgp OwogICAgIH0KICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cg Yi9Tb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxvZwppbmRleCAxMDc1NWQ5YWI5MmZjYWE4NDVhNDFk NGIwOGMwYzEyZTNlZjE2MDAzLi43M2UxNTcxY2EzYTVlYWQ4MDliZGIxMTk4MGYxMDI2MjI5ZWU3 MGVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxvZworKysgYi9Tb3VyY2Uv V2ViS2l0L3F0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDExLTA4LTAzICBQYXZlbCBG ZWxkbWFuICA8cGZlbGRtYW5AZ29vZ2xlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBb VGltZWxpbmVdIEhvdmVyIG9uIHBhaW50IGV2ZW50cyBhbmQgc2VlIHJlY3Qgb3V0bGluZSBhcm91 bmQgdGhhdCBhcmVhLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NjU1MTAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIEFwaS9xd2ViZnJhbWUuY3BwOgorICAgICAgICAoUVdlYkZyYW1lUHJpdmF0ZTo6cmVu ZGVyUmVsYXRpdmVDb29yZHMpOgorCiAyMDExLTA4LTAzICBQYXZlbCBGZWxkbWFuICA8cGZlbGRt YW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IHJlbW92ZSBOb2RlIHBh cmFtZXRlciBmcm9tIHRoZSBJbnNwZWN0b3JDbGllbnQ6OmhpZ2hsaWdodApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC93aW4vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC93aW4vQ2hhbmdlTG9n CmluZGV4IDA0NmE1NDU2YzExZGNlYjBiOTA5ZjYyYzBmMjVhOTU5MzdkZDlhMjkuLmI3MjFjZDg1 ZmZhMTE3ODlhMjNmNzRmMTQ4MzhlODgwNTMyNmMwNjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvd2luL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L3dpbi9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxMyBAQAorMjAxMS0wOC0wMyAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGdvb2dsZS5j b20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogW1RpbWVsaW5lXSBIb3ZlciBvbiBwYWludCBl dmVudHMgYW5kIHNlZSByZWN0IG91dGxpbmUgYXJvdW5kIHRoYXQgYXJlYS4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY1NTEwCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJOb2RlSGlnaGxpZ2h0LmNw cDoKKyAgICAgICAgKFdlYk5vZGVIaWdobGlnaHQ6OnVwZGF0ZSk6CisKIDIwMTEtMDgtMDMgIFBh dmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3Bl Y3RvcjogcmVtb3ZlIE5vZGUgcGFyYW1ldGVyIGZyb20gdGhlIEluc3BlY3RvckNsaWVudDo6aGln aGxpZ2h0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJOb2RlSGlnaGxpZ2h0LmNw cCBiL1NvdXJjZS9XZWJLaXQvd2luL1dlYk5vZGVIaWdobGlnaHQuY3BwCmluZGV4IDI4ZDUwZTFk MjdjZGYxYjU0ODJlMDAxNjllZTk2M2MzMGJhZTU2ZTIuLjU5NTI3MjNjZmJlODUzN2U3ZDk4MjEz NDcxOGM3OTI4ZGVhMjIxMGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvd2luL1dlYk5vZGVI aWdobGlnaHQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvd2luL1dlYk5vZGVIaWdobGlnaHQuY3Bw CkBAIC0xNTgsNyArMTU4LDcgQEAgdm9pZCBXZWJOb2RlSGlnaGxpZ2h0Ojp1cGRhdGUoKQogCiAg ICAgR3JhcGhpY3NDb250ZXh0IGNvbnRleHQoaGRjKTsKIAotICAgIG1faW5zcGVjdGVkV2ViVmll dy0+cGFnZSgpLT5pbnNwZWN0b3JDb250cm9sbGVyKCktPmRyYXdOb2RlSGlnaGxpZ2h0KGNvbnRl eHQpOworICAgIG1faW5zcGVjdGVkV2ViVmlldy0+cGFnZSgpLT5pbnNwZWN0b3JDb250cm9sbGVy KCktPmRyYXdIaWdobGlnaHQoY29udGV4dCk7CiAKICAgICBCTEVOREZVTkNUSU9OIGJmOwogICAg IGJmLkJsZW5kT3AgPSBBQ19TUkNfT1ZFUjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCBlZDczYjY3N2IzM2U5NDg4 YTg1NjJlOWMyOGE0YTUwYjQ1MzhjN2U0Li43ZTI5M2FlZWNjMDRlMTk5YTVhYzdjNTUxMDdkNjky MDkyMDU1MzYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDgtMDMgIFBhdmVs IEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6 IFtUaW1lbGluZV0gSG92ZXIgb24gcGFpbnQgZXZlbnRzIGFuZCBzZWUgcmVjdCBvdXRsaW5lIGFy b3VuZCB0aGF0IGFyZWEuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD02NTUxMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0b3JDbGllbnQuY3Bw OgorICAgICAgICAoV2ViS2l0OjpXZWJJbnNwZWN0b3JDbGllbnQ6OmRyYXdSZWN0KToKKwogMjAx MS0wOC0wMyAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KIAogICAgICAg ICBXZWIgSW5zcGVjdG9yOiByZW1vdmUgTm9kZSBwYXJhbWV0ZXIgZnJvbSB0aGUgSW5zcGVjdG9y Q2xpZW50OjpoaWdobGlnaHQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViQ29yZVN1cHBvcnQvV2ViSW5zcGVjdG9yQ2xpZW50LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViSW5zcGVjdG9yQ2xpZW50LmNwcAppbmRleCAyZjY0 NDg1ZjY1MjliYWU1MzQyYmQ1MDkzYmFlYWY0YTMxMmUyYmRkLi4zYWY5YWVmYjM0NjQ4Nzk1ZmQz MTlkZDI1MWYyNzk2NmFlN2MyNzBlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkluc3BlY3RvckNsaWVudC5jcHAKKysrIGIvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0b3JDbGllbnQuY3BwCkBA IC0xMDEsNyArMTAxLDcgQEAgdm9pZCBXZWJJbnNwZWN0b3JDbGllbnQ6OmRpZE1vdmVUb1dlYlBh Z2UoUGFnZU92ZXJsYXkqLCBXZWJQYWdlKikKIAogdm9pZCBXZWJJbnNwZWN0b3JDbGllbnQ6OmRy YXdSZWN0KFBhZ2VPdmVybGF5KiBvdmVybGF5LCBXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQmIGNv bnRleHQsIGNvbnN0IFdlYkNvcmU6OkludFJlY3QmIGRpcnR5UmVjdCkKIHsKLSAgICBtX3BhZ2Ut PmNvcmVQYWdlKCktPmluc3BlY3RvckNvbnRyb2xsZXIoKS0+ZHJhd05vZGVIaWdobGlnaHQoY29u dGV4dCk7CisgICAgbV9wYWdlLT5jb3JlUGFnZSgpLT5pbnNwZWN0b3JDb250cm9sbGVyKCktPmRy YXdIaWdobGlnaHQoY29udGV4dCk7CiB9CiAKIGJvb2wgV2ViSW5zcGVjdG9yQ2xpZW50Ojptb3Vz ZUV2ZW50KFBhZ2VPdmVybGF5KiwgY29uc3QgV2ViTW91c2VFdmVudCYpCg== 102788 2011-08-03 08:52:02 -0700 2011-08-03 09:08:34 -0700 Review comments addressed, to find out proper Mac symbol. bug-65510-20110803195200.patch text/plain 27549 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogOTIyODIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBkYTcwYWI3ZTliNWFlZTdh MzBhMzg4NDE0YjA3YTFjNDBmOWYzOGY1Li40MmNmYWFmMTc2YmFiNWJjOTY2ODdjYTBlMDM2MWY2 Y2Y5MzVhYmViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzggQEAKIDIwMTEtMDgtMDMgIFBhdmVs IEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgogCisgICAgICAgIFdlYiBJbnNwZWN0b3I6 IFtUaW1lbGluZV0gSG92ZXIgb24gcGFpbnQgZXZlbnRzIGFuZCBzZWUgcmVjdCBvdXRsaW5lIGFy b3VuZCB0aGF0IGFyZWEuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD02NTUxMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogV2ViQ29yZS5leHAuaW46CisgICAgICAgICogV2ViQ29yZS5vcmRlcjoKKyAgICAg ICAgKiBpbnNwZWN0b3IvRE9NTm9kZUhpZ2hsaWdodGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkRPTU5vZGVIaWdobGlnaHRlcjo6ZHJhd1JlY3RIaWdobGlnaHQpOgorICAgICAgICAqIGluc3Bl Y3Rvci9ET01Ob2RlSGlnaGxpZ2h0ZXIuaDoKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9y Lmpzb246CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6ZHJhd0hpZ2hsaWdodCk6CisgICAg ICAgICogaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuaDoKKyAgICAgICAgKiBpbnNwZWN0 b3IvSW5zcGVjdG9yRE9NQWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRE9N QWdlbnQ6OmhpZ2hsaWdodFJlY3QpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRE9NQWdl bnQ6OmhpZGVIaWdobGlnaHQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRE9NQWdlbnQ6 OmRyYXdIaWdobGlnaHQpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5o OgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanM6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuRnJhbWVUcmVlRWxlbWVudC5wcm90b3R5cGUub25zZWxlY3QpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkZyYW1lVHJlZUVsZW1lbnQucHJvdG90eXBlLnNldCBob3Zl cmVkKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUGFuZWwuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbCk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuVGltZWxpbmVQYW5lbC5wcm90b3R5cGUuX21vdXNlT3V0KToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5UaW1lbGluZVBhbmVsLnByb3RvdHlwZS5fbW91c2VNb3ZlKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5UaW1lbGluZVBhbmVsLnByb3RvdHlwZS5faGlnaGxpZ2h0UmVjdCk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5wcm90b3R5cGUuX2hpZGVSZWN0SGlnaGxpZ2h0 KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qczoKKyAgICAgICAg KFdlYkluc3BlY3Rvci5oaWdobGlnaHRET01Ob2RlKToKKworMjAxMS0wOC0wMyAgUGF2ZWwgRmVs ZG1hbiAgPHBmZWxkbWFuQGdvb2dsZS5jb20+CisKICAgICAgICAgV2ViIEluc3BlY3RvcjogbWFr ZSB0ZXh0IGluIHBvcG92ZXIgc2VsZWN0YWJsZSArIG1ha2UgcG9wb3ZlciByZS1hcHBlYXIgZmFz dGVyLgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjU2 MDMKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4gYi9Tb3VyY2Uv V2ViQ29yZS9XZWJDb3JlLmV4cC5pbgppbmRleCA3ZjViOTU2ZTQ4ZGVlYTVhM2M5MmE4ZDBiYWE0 MDFiNTBiOTE5MTQzLi45ZDYwYzA2MGQxMGFjOTYxYjMzM2E4MmFiMmJiMGNkMjhlNzM4NDg1IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgorKysgYi9Tb3VyY2UvV2Vi Q29yZS9XZWJDb3JlLmV4cC5pbgpAQCAtMTYxNiw3ICsxNjE2LDYgQEAgX19aTjdXZWJDb3JlMjhJ bnNwZWN0b3JGcm9udGVuZENsaWVudExvY2FsMjdyZXN0b3JlQXR0YWNoZWRXaW5kb3dIZWlnaHRF dgogX19aTjdXZWJDb3JlMjhJbnNwZWN0b3JGcm9udGVuZENsaWVudExvY2FsMzFjb25zdHJhaW5l ZEF0dGFjaGVkV2luZG93SGVpZ2h0RWpqCiBfX1pON1dlYkNvcmUyOEluc3BlY3RvckZyb250ZW5k Q2xpZW50TG9jYWxDMkVQTlNfMTlJbnNwZWN0b3JDb250cm9sbGVyRVBOU180UGFnZUVOM1dURjEw UGFzc093blB0cklOUzBfOFNldHRpbmdzRUVFCiBfX1pON1dlYkNvcmUyOEluc3BlY3RvckZyb250 ZW5kQ2xpZW50TG9jYWxEMkV2Ci1fX1pOSzdXZWJDb3JlMTlJbnNwZWN0b3JDb250cm9sbGVyMTdk cmF3Tm9kZUhpZ2hsaWdodEVSTlNfMTVHcmFwaGljc0NvbnRleHRFCiBfX1pOSzdXZWJDb3JlMTlJ bnNwZWN0b3JDb250cm9sbGVyMzFpc1JlY29yZGluZ1VzZXJJbml0aWF0ZWRQcm9maWxlRXYKICNl bmRpZgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLm9yZGVyIGIvU291cmNl L1dlYkNvcmUvV2ViQ29yZS5vcmRlcgppbmRleCA4ZGZhNGQ2ZTgzZmRlMzU3ODcyYTMzZjkzZWFj ZGNiODc0MjJhYjdiLi5mNGZkOGE0NDE3ZDkwMjg5Nzk0ZGYwNGYxNDllNmJiYzZiM2UzMDE1IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLm9yZGVyCisrKyBiL1NvdXJjZS9XZWJD b3JlL1dlYkNvcmUub3JkZXIKQEAgLTI3NzI0LDggKzI3NzI0LDggQEAgX19aTks3V2ViQ29yZTEx U2NyaXB0VmFsdWU2aXNOdWxsRXYKIF9fWk43V2ViQ29yZTI2SW5zcGVjdG9yQmFja2VuZERpc3Bh dGNoZXIxN0RPTV9oaWdobGlnaHROb2RlRWxQTlNfMTVJbnNwZWN0b3JPYmplY3RFCiBfX1pON1dl YkNvcmUxN0luc3BlY3RvckRPTUFnZW50MTNoaWdobGlnaHROb2RlRVBOM1dURjZTdHJpbmdFaVMz XwogX19aTjdXZWJDb3JlMTdJbnNwZWN0b3JET01BZ2VudDloaWdobGlnaHRFUE4zV1RGNlN0cmlu Z0VQTlNfNE5vZGVFUktTMl8KLV9fWk5LN1dlYkNvcmUxOUluc3BlY3RvckNvbnRyb2xsZXIxN2Ry YXdOb2RlSGlnaGxpZ2h0RVJOU18xNUdyYXBoaWNzQ29udGV4dEUKLV9fWk5LN1dlYkNvcmUxN0lu c3BlY3RvckRPTUFnZW50MTdkcmF3Tm9kZUhpZ2hsaWdodEVSTlNfMTVHcmFwaGljc0NvbnRleHRF CitfX1pOSzdXZWJDb3JlMTlJbnNwZWN0b3JDb250cm9sbGVyMTdkcmF3SGlnaGxpZ2h0RVJOU18x NUdyYXBoaWNzQ29udGV4dEUKK19fWk5LN1dlYkNvcmUxN0luc3BlY3RvckRPTUFnZW50MTdkcmF3 SGlnaGxpZ2h0RVJOU18xNUdyYXBoaWNzQ29udGV4dEUKIF9fWk43V2ViQ29yZTE4RE9NTm9kZUhp Z2hsaWdodGVyMTdEcmF3Tm9kZUhpZ2hsaWdodEVSTlNfMTVHcmFwaGljc0NvbnRleHRFUE5TXzRO b2RlRU5TMF8xM0hpZ2hsaWdodE1vZGVFCiBfX1pON1dlYkNvcmUxMl9HTE9CQUxfX05fMTI0ZHJh d091dGxpbmVkUXVhZFdpdGhDbGlwRVJOU18xNUdyYXBoaWNzQ29udGV4dEVSS05TXzlGbG9hdFF1 YWRFUzVfUktOU181Q29sb3JFCiBfX1pON1dlYkNvcmUxMl9HTE9CQUxfX05fMTE2ZHJhd091dGxp bmVkUXVhZEVSTlNfMTVHcmFwaGljc0NvbnRleHRFUktOU185RmxvYXRRdWFkRVJLTlNfNUNvbG9y RQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0RPTU5vZGVIaWdobGlnaHRl ci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvRE9NTm9kZUhpZ2hsaWdodGVyLmNwcApp bmRleCA3ZmM0NjQwYTAxNGVhNWJmOTQ5NDI4OGNmNjVjNDg3MWNjZjc1OThiLi4zOWJhODllZDhh YTFjNzY3YTVlYTlmOTczMTJiZTk0OTNlODk4MGZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvRE9NTm9kZUhpZ2hsaWdodGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvRE9NTm9kZUhpZ2hsaWdodGVyLmNwcApAQCAtMTM3LDkgKzEzNyw5IEBAIHZvaWQg ZHJhd0VsZW1lbnRUaXRsZShHcmFwaGljc0NvbnRleHQmIGNvbnRleHQsIE5vZGUqIG5vZGUsIGNv bnN0IEludFJlY3QmIGJvdW5kCiAgICAgc3RhdGljIGNvbnN0IGludCByZWN0SW5mbGF0ZVB4ID0g NDsKICAgICBzdGF0aWMgY29uc3QgaW50IGZvbnRIZWlnaHRQeCA9IDEyOwogICAgIHN0YXRpYyBj b25zdCBpbnQgYm9yZGVyV2lkdGhQeCA9IDE7Ci0gICAgc3RhdGljIGNvbnN0IENvbG9yIHRvb2x0 aXBCYWNrZ3JvdW5kQ29sb3IoMjU1LCAyNTUsIDE5NCwgMjU1KTsKLSAgICBzdGF0aWMgY29uc3Qg Q29sb3IgdG9vbHRpcEJvcmRlckNvbG9yKENvbG9yOjpibGFjayk7Ci0gICAgc3RhdGljIGNvbnN0 IENvbG9yIHRvb2x0aXBGb250Q29sb3IoQ29sb3I6OmJsYWNrKTsKKyAgICBERUZJTkVfU1RBVElD X0xPQ0FMKENvbG9yLCB0b29sdGlwQmFja2dyb3VuZENvbG9yLCAoMjU1LCAyNTUsIDE5NCwgMjU1 KSk7CisgICAgREVGSU5FX1NUQVRJQ19MT0NBTChDb2xvciwgdG9vbHRpcEJvcmRlckNvbG9yLCAo Q29sb3I6OmJsYWNrKSk7CisgICAgREVGSU5FX1NUQVRJQ19MT0NBTChDb2xvciwgdG9vbHRpcEZv bnRDb2xvciwgKENvbG9yOjpibGFjaykpOwogICAgIEZvbnRDYWNoZVB1cmdlUHJldmVudGVyIGZv bnRDYWNoZVB1cmdlUHJldmVudGVyOwogCiAgICAgRWxlbWVudCogZWxlbWVudCA9IHN0YXRpY19j YXN0PEVsZW1lbnQqPihub2RlKTsKQEAgLTMwMCw2ICszMDAsMzkgQEAgdm9pZCBkcmF3Tm9kZUhp Z2hsaWdodChHcmFwaGljc0NvbnRleHQmIGNvbnRleHQsIE5vZGUqIG5vZGUsIEhpZ2hsaWdodE1v ZGUgbW9kZSkKICAgICAgICAgZHJhd0VsZW1lbnRUaXRsZShjb250ZXh0LCBub2RlLCBib3VuZGlu Z0JveCwgdGl0bGVBbmNob3JCb3gsIG92ZXJsYXlSZWN0LCBzZXR0aW5ncyk7CiB9CiAKK3ZvaWQg ZHJhd1JlY3RIaWdobGlnaHQoR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0LCBEb2N1bWVudCogZG9j dW1lbnQsIEludFJlY3QqIHJlY3QpCit7CisgICAgaWYgKCFkb2N1bWVudCkKKyAgICAgICAgcmV0 dXJuOworICAgIEZyYW1lVmlldyogdmlldyA9IGRvY3VtZW50LT5mcmFtZSgpLT52aWV3KCk7CisK KyAgICBGbG9hdFJlY3Qgb3ZlcmxheVJlY3QgPSB2aWV3LT52aXNpYmxlQ29udGVudFJlY3QoKTsK KyAgICBjb250ZXh0LnRyYW5zbGF0ZSgtb3ZlcmxheVJlY3QueCgpLCAtb3ZlcmxheVJlY3QueSgp KTsKKworICAgIHN0YXRpYyBjb25zdCBpbnQgb3V0bGluZVRoaWNrbmVzcyA9IDI7CisgICAgREVG SU5FX1NUQVRJQ19MT0NBTChDb2xvciwgb3V0bGluZUNvbG9yLCAoMjU1LCAwLCAwLCAyMjgpKTsK KyAgICBERUZJTkVfU1RBVElDX0xPQ0FMKENvbG9yLCBmaWxsQ29sb3IsICgyNTUsIDAsIDAsIDIw KSk7CisKKyAgICBQYXRoIHF1YWRQYXRoID0gcXVhZFRvUGF0aChGbG9hdFJlY3QoKnJlY3QpKTsK KworICAgIC8vIENsaXAgb3V0IHRoZSBxdWFkLCB0aGVuIGRyYXcgd2l0aCBhIDJweCBzdHJva2Ug dG8gZ2V0IGEgcGl4ZWwKKyAgICAvLyBvZiBvdXRsaW5lIChiZWNhdXNlIGluZmxhdGluZyBhIHF1 YWQgaXMgaGFyZCkKKyAgICB7CisgICAgICAgIGNvbnRleHQuc2F2ZSgpOworICAgICAgICBjb250 ZXh0LmNsaXBPdXQocXVhZFBhdGgpOworCisgICAgICAgIGNvbnRleHQuc2V0U3Ryb2tlVGhpY2tu ZXNzKG91dGxpbmVUaGlja25lc3MpOworICAgICAgICBjb250ZXh0LnNldFN0cm9rZUNvbG9yKG91 dGxpbmVDb2xvciwgQ29sb3JTcGFjZURldmljZVJHQik7CisgICAgICAgIGNvbnRleHQuc3Ryb2tl UGF0aChxdWFkUGF0aCk7CisKKyAgICAgICAgY29udGV4dC5yZXN0b3JlKCk7CisgICAgfQorCisg ICAgLy8gTm93IGRvIHRoZSBmaWxsCisgICAgY29udGV4dC5zZXRGaWxsQ29sb3IoZmlsbENvbG9y LCBDb2xvclNwYWNlRGV2aWNlUkdCKTsKKyAgICBjb250ZXh0LmZpbGxQYXRoKHF1YWRQYXRoKTsK K30KKwogfSAvLyBuYW1lc3BhY2UgRE9NTm9kZUhpZ2hsaWdodGVyCiAKIH0gLy8gbmFtZXNwYWNl IFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9ET01Ob2RlSGln aGxpZ2h0ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9ET01Ob2RlSGlnaGxpZ2h0ZXIu aAppbmRleCAyZWRlNTczZTQ0MjVlY2MxNGVjNjcxODAzOWE3NDRjOTBjMGJhOGViLi4zMGQ3NzYw MDRhZjJlZDk3YmVkNzI2MDdmYWM4MDlmMjU4NWYxMjhjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvRE9NTm9kZUhpZ2hsaWdodGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0RPTU5vZGVIaWdobGlnaHRlci5oCkBAIC0zMSw3ICszMSw5IEBACiAKIG5hbWVz cGFjZSBXZWJDb3JlIHsKIAorY2xhc3MgRG9jdW1lbnQ7CiBjbGFzcyBHcmFwaGljc0NvbnRleHQ7 CitjbGFzcyBJbnRSZWN0OwogY2xhc3MgTm9kZTsKIAogbmFtZXNwYWNlIERPTU5vZGVIaWdobGln aHRlciB7CkBAIC00Niw2ICs0OCw4IEBAIGVudW0gSGlnaGxpZ2h0TW9kZSB7CiAKIHZvaWQgZHJh d05vZGVIaWdobGlnaHQoR3JhcGhpY3NDb250ZXh0JiwgTm9kZSosIEhpZ2hsaWdodE1vZGUpOwog Cit2b2lkIGRyYXdSZWN0SGlnaGxpZ2h0KEdyYXBoaWNzQ29udGV4dCYsIERvY3VtZW50KiwgSW50 UmVjdCopOworCiB9IC8vIG5hbWVzcGFjZSBET01Ob2RlSGlnaGxpZ2h0ZXIKIAogfSAvLyBuYW1l c3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3Rvci5qc29uIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uCmluZGV4 IDAwY2QxNTRhNzEwY2FjZTE0YmNhMDdhOTk4ZTgzN2FlZDQ2MTQwNTEuLjg5ZDVlZGU0YWEyYTAy YjhlNGZhYTRjMTRkNGUyOGVjMGFkZmM0NzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3IuanNvbgorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yLmpzb24KQEAgLTEwMDgsNiArMTAwOCwxNiBAQAogICAgICAgICAgICAgICAgICJkZXNj cmlwdGlvbiI6ICJFbnRlcnMgdGhlICdpbnNwZWN0JyBtb2RlLiBJbiB0aGlzIG1vZGUsIGVsZW1l bnRzIHRoYXQgdXNlciBpcyBob3ZlcmluZyBvdmVyIGFyZSBoaWdobGlnaHRlZC4gQmFja2VuZCB0 aGVuIGdlbmVyYXRlcyAnaW5zcGVjdCcgY29tbWFuZCB1cG9uIGVsZW1lbnQgc2VsZWN0aW9uLiIK ICAgICAgICAgICAgIH0sCiAgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgIm5hbWUiOiAi aGlnaGxpZ2h0UmVjdCIsCisgICAgICAgICAgICAgICAgInBhcmFtZXRlcnMiOiBbCisgICAgICAg ICAgICAgICAgICAgIHsgIm5hbWUiOiAieCIsICJ0eXBlIjogImludGVnZXIiLCAiZGVzY3JpcHRp b24iOiAiWCBjb29yZGluYXRlIiB9LAorICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInki LCAidHlwZSI6ICJpbnRlZ2VyIiwgImRlc2NyaXB0aW9uIjogIlkgY29vcmRpbmF0ZSIgfSwKKyAg ICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJ3aWR0aCIsICJ0eXBlIjogImludGVnZXIiLCAi ZGVzY3JpcHRpb24iOiAiUmVjdGFuZ2xlIHdpZHRoIiB9LAorICAgICAgICAgICAgICAgICAgICB7 ICJuYW1lIjogImhlaWdodCIsICJ0eXBlIjogImludGVnZXIiLCAiZGVzY3JpcHRpb24iOiAiUmVj dGFuZ2xlIGhlaWdodCIgfQorICAgICAgICAgICAgICAgIF0sCisgICAgICAgICAgICAgICAgImRl c2NyaXB0aW9uIjogIkhpZ2hsaWdodHMgZ2l2ZW4gcmVjdGFuZ2xlLiBDb29yZGluYXRlcyBhcmUg YWJzb2x1dGUgd2l0aCByZXNwZWN0IHRvIHRoZSBtYWluIGZyYW1lIHZpZXdwb3J0LiIKKyAgICAg ICAgICAgIH0sCisgICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAgIm5hbWUiOiAiaGlnaGxp Z2h0Tm9kZSIsCiAgICAgICAgICAgICAgICAgInBhcmFtZXRlcnMiOiBbCiAgICAgICAgICAgICAg ICAgICAgIHsgIm5hbWUiOiAibm9kZUlkIiwgInR5cGUiOiAiaW50ZWdlciIsICJkZXNjcmlwdGlv biI6ICJJZGVudGlmaWVyIG9mIHRoZSBub2RlIHRvIGhpZ2hsaWdodCIgfSwKQEAgLTEwMTYsNyAr MTAyNiw3IEBACiAgICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIkhpZ2hsaWdodHMgRE9N IG5vZGUgd2l0aCBnaXZlbiBpZC4iCiAgICAgICAgICAgICB9LAogICAgICAgICAgICAgewotICAg ICAgICAgICAgICAgICJuYW1lIjogImhpZGVOb2RlSGlnaGxpZ2h0IiwKKyAgICAgICAgICAgICAg ICAibmFtZSI6ICJoaWRlSGlnaGxpZ2h0IiwKICAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24i OiAiSGlkZXMgRE9NIG5vZGUgaGlnaGxpZ2h0LiIKICAgICAgICAgICAgIH0sCiAgICAgICAgICAg ICB7CkBAIC0xMDI3LDEwICsxMDM3LDYgQEAKICAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24i OiAiSGlnaGxpZ2h0cyBvd25lciBlbGVtZW50IG9mIHRoZSBmcmFtZSB3aXRoIGdpdmVuIGlkLiIK ICAgICAgICAgICAgIH0sCiAgICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgIm5hbWUiOiAi aGlkZUZyYW1lSGlnaGxpZ2h0IiwKLSAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiSGlk ZXMgZnJhbWUgb3duZXIgaGlnaGxpZ2h0LiIKLSAgICAgICAgICAgIH0sCi0gICAgICAgICAgICB7 CiAgICAgICAgICAgICAgICAgIm5hbWUiOiAicHVzaE5vZGVCeVBhdGhUb0Zyb250ZW5kIiwKICAg ICAgICAgICAgICAgICAicGFyYW1ldGVycyI6IFsKICAgICAgICAgICAgICAgICAgICAgeyAibmFt ZSI6ICJwYXRoIiwgInR5cGUiOiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIlBhdGggdG8gbm9k ZSBpbiB0aGUgcHJvcHJpZXRhcnkgZm9ybWF0LiIgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwCmluZGV4IGNjNTFiMDQ3MDQ0ZDE0MGE5MTAy NjNkNjkyOTVkYjY2MGQzYmI0MTEuLjYyOTFhMzNjYmU1N2MzZGFkMDY3OWNhZTg4NWQ0Nzk4OGIx MTE4NmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250 cm9sbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJv bGxlci5jcHAKQEAgLTM3NCw5ICszNzQsOSBAQCB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OmV2 YWx1YXRlRm9yVGVzdEluRnJvbnRlbmQobG9uZyBjYWxsSWQsIGNvbnN0IFN0cmluZyYgcwogICAg IG1faW5zcGVjdG9yQWdlbnQtPmV2YWx1YXRlRm9yVGVzdEluRnJvbnRlbmQoY2FsbElkLCBzY3Jp cHQpOwogfQogCi12b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OmRyYXdOb2RlSGlnaGxpZ2h0KEdy YXBoaWNzQ29udGV4dCYgY29udGV4dCkgY29uc3QKK3ZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6 ZHJhd0hpZ2hsaWdodChHcmFwaGljc0NvbnRleHQmIGNvbnRleHQpIGNvbnN0CiB7Ci0gICAgbV9k b21BZ2VudC0+ZHJhd05vZGVIaWdobGlnaHQoY29udGV4dCk7CisgICAgbV9kb21BZ2VudC0+ZHJh d0hpZ2hsaWdodChjb250ZXh0KTsKIH0KIAogdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpzaG93 Q29uc29sZSgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y Q29udHJvbGxlci5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xs ZXIuaAppbmRleCA1YTQ5YmJkMTJmODY3NzQxNDA5NDIwZWMxNjNmNDk0ODA2NzBmZWMxLi45ZDc2 ODM1Y2U4MzBhNDQ4ZWRkYTM5NjcxNjZmMDJlZTQ4MGQwNzYxIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmgKQEAgLTk3LDcgKzk3LDcgQEAgcHVi bGljOgogCiAgICAgdm9pZCBzaG93Q29uc29sZSgpOwogICAgIHZvaWQgaW5zcGVjdChOb2RlKik7 Ci0gICAgdm9pZCBkcmF3Tm9kZUhpZ2hsaWdodChHcmFwaGljc0NvbnRleHQmKSBjb25zdDsKKyAg ICB2b2lkIGRyYXdIaWdobGlnaHQoR3JhcGhpY3NDb250ZXh0JikgY29uc3Q7CiAgICAgdm9pZCBo aWRlSGlnaGxpZ2h0KCk7CiAgICAgTm9kZSogaGlnaGxpZ2h0ZWROb2RlKCkgY29uc3Q7CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuY3BwCmluZGV4IGQz NDk3MzQ0MTk1YmVkODEwYWYzOWM0MTEwYTJhNjUyZDJlNDY2OWQuLmMwMDM0NzEwNDQ4ZmM1ZDdm MmJmZmRlZTZhMTMxMGFiOTMwODk5MWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9JbnNwZWN0b3JET01BZ2VudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3RvckRPTUFnZW50LmNwcApAQCAtNjcsNiArNjcsNyBAQAogI2luY2x1ZGUgIkluc3Bl Y3RvclBhZ2VBZ2VudC5oIgogI2luY2x1ZGUgIkluc3BlY3RvclN0YXRlLmgiCiAjaW5jbHVkZSAi SW5zdHJ1bWVudGluZ0FnZW50cy5oIgorI2luY2x1ZGUgIkludFJlY3QuaCIKICNpbmNsdWRlICJN dXRhdGlvbkV2ZW50LmgiCiAjaW5jbHVkZSAiTm9kZS5oIgogI2luY2x1ZGUgIk5vZGVMaXN0Lmgi CkBAIC0xMDEyLDYgKzEwMTMsMTIgQEAgdm9pZCBJbnNwZWN0b3JET01BZ2VudDo6aGlnaGxpZ2h0 KEVycm9yU3RyaW5nKiwgTm9kZSogbm9kZSwgY29uc3QgU3RyaW5nJiBtb2RlKQogICAgIG1fY2xp ZW50LT5oaWdobGlnaHQoKTsKIH0KIAordm9pZCBJbnNwZWN0b3JET01BZ2VudDo6aGlnaGxpZ2h0 UmVjdChFcnJvclN0cmluZyosIGludCB4LCBpbnQgeSwgaW50IHdpZHRoLCBpbnQgaGVpZ2h0KQor eworICAgIG1faGlnaGxpZ2h0ZWRSZWN0ID0gYWRvcHRQdHIobmV3IEludFJlY3QoeCwgeSwgd2lk dGgsIGhlaWdodCkpOworICAgIG1fY2xpZW50LT5oaWdobGlnaHQoKTsKK30KKwogdm9pZCBJbnNw ZWN0b3JET01BZ2VudDo6aGlnaGxpZ2h0Tm9kZShFcnJvclN0cmluZyogZXJyb3IsIGludCBub2Rl SWQsIFN0cmluZyogbW9kZSkKIHsKICAgICBpZiAoTm9kZSogbm9kZSA9IG5vZGVGb3JJZChub2Rl SWQpKQpAQCAtMTAyOCw2ICsxMDM1LDcgQEAgdm9pZCBJbnNwZWN0b3JET01BZ2VudDo6aGlnaGxp Z2h0RnJhbWUoRXJyb3JTdHJpbmcqIGVycm9yLCBjb25zdCBTdHJpbmcmIGZyYW1lSWQKIHZvaWQg SW5zcGVjdG9yRE9NQWdlbnQ6OmhpZGVIaWdobGlnaHQoRXJyb3JTdHJpbmcqKQogewogICAgIG1f aGlnaGxpZ2h0ZWROb2RlID0gMDsKKyAgICBtX2hpZ2hsaWdodGVkUmVjdC5jbGVhcigpOwogICAg IG1fY2xpZW50LT5oaWRlSGlnaGxpZ2h0KCk7CiB9CiAKQEAgLTE1MDksOCArMTUxNywxMyBAQCBQ YXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gSW5zcGVjdG9yRE9NQWdlbnQ6OnJlc29sdmVOb2Rl KE5vZGUqIG5vZGUsIGNvbnN0IFN0cgogICAgIHJldHVybiBpbmplY3RlZFNjcmlwdC53cmFwTm9k ZShub2RlLCBvYmplY3RHcm91cCk7CiB9CiAKLXZvaWQgSW5zcGVjdG9yRE9NQWdlbnQ6OmRyYXdO b2RlSGlnaGxpZ2h0KEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCkgY29uc3QKK3ZvaWQgSW5zcGVj dG9yRE9NQWdlbnQ6OmRyYXdIaWdobGlnaHQoR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0KSBjb25z dAogeworICAgIGlmIChtX2hpZ2hsaWdodGVkUmVjdCkgeworICAgICAgICBET01Ob2RlSGlnaGxp Z2h0ZXI6OmRyYXdSZWN0SGlnaGxpZ2h0KGNvbnRleHQsIG1fZG9jdW1lbnQuZ2V0KCksIG1faGln aGxpZ2h0ZWRSZWN0LmdldCgpKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKwogICAgIGlmICgh bV9oaWdobGlnaHRlZE5vZGUpCiAgICAgICAgIHJldHVybjsKIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuaAppbmRleCA0YzE4YmU5MThkOTUzMmQxY2ZjM2I5 MmE1NjMzNzBmYjEwMzU5MTllLi4wYzkzMjc2NDYzMDUwZWM3Y2Y3ZDI1Yjc3YTQ5YzgxMzA0ZGYy NGIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdl bnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuaApA QCAtNTgsNiArNTgsNyBAQCBjbGFzcyBJbnNwZWN0b3JDbGllbnQ7CiBjbGFzcyBJbnNwZWN0b3JE T01BZ2VudDsKIGNsYXNzIEluc3BlY3RvckZyb250ZW5kOwogY2xhc3MgSW5zcGVjdG9yUGFnZUFn ZW50OworY2xhc3MgSW50UmVjdDsKIGNsYXNzIEhpdFRlc3RSZXN1bHQ7CiBjbGFzcyBNYXRjaEpv YjsKIGNsYXNzIEhUTUxFbGVtZW50OwpAQCAtMTMyLDEwICsxMzMsOSBAQCBwdWJsaWM6CiAgICAg dm9pZCBwdXNoTm9kZVRvRnJvbnRlbmQoRXJyb3JTdHJpbmcqLCBjb25zdCBTdHJpbmcmIG9iamVj dElkLCBpbnQqIG5vZGVJZCk7CiAgICAgdm9pZCBwdXNoTm9kZUJ5UGF0aFRvRnJvbnRlbmQoRXJy b3JTdHJpbmcqLCBjb25zdCBTdHJpbmcmIHBhdGgsIGludCogbm9kZUlkKTsKICAgICB2b2lkIGhp ZGVIaWdobGlnaHQoRXJyb3JTdHJpbmcqKTsKKyAgICB2b2lkIGhpZ2hsaWdodFJlY3QoRXJyb3JT dHJpbmcqLCBpbnQgeCwgaW50IHksIGludCB3aWR0aCwgaW50IGhlaWdodCk7CiAgICAgdm9pZCBo aWdobGlnaHROb2RlKEVycm9yU3RyaW5nKiwgaW50IG5vZGVJZCwgU3RyaW5nKiBtb2RlKTsKLSAg ICB2b2lkIGhpZGVOb2RlSGlnaGxpZ2h0KEVycm9yU3RyaW5nKiBlcnJvcikgeyBoaWRlSGlnaGxp Z2h0KGVycm9yKTsgfQogICAgIHZvaWQgaGlnaGxpZ2h0RnJhbWUoRXJyb3JTdHJpbmcqLCBjb25z dCBTdHJpbmcmIGZyYW1lSWQpOwotICAgIHZvaWQgaGlkZUZyYW1lSGlnaGxpZ2h0KEVycm9yU3Ry aW5nKiBlcnJvcikgeyBoaWRlSGlnaGxpZ2h0KGVycm9yKTsgfQogICAgIHZvaWQgbW92ZVRvKEVy cm9yU3RyaW5nKiwgaW50IG5vZGVJZCwgaW50IHRhcmdldE5vZGVJZCwgY29uc3QgaW50KiBjb25z dCBhbmNob3JOb2RlSWQsIGludCogbmV3Tm9kZUlkKTsKIAogICAgIE5vZGUqIGhpZ2hsaWdodGVk Tm9kZSgpIGNvbnN0IHsgcmV0dXJuIG1faGlnaGxpZ2h0ZWROb2RlLmdldCgpOyB9CkBAIC0xNjgs NyArMTY4LDcgQEAgcHVibGljOgogICAgIHZvaWQgaW5zcGVjdChOb2RlKik7CiAgICAgdm9pZCBm b2N1c05vZGUoKTsKIAotICAgIHZvaWQgZHJhd05vZGVIaWdobGlnaHQoR3JhcGhpY3NDb250ZXh0 JikgY29uc3Q7CisgICAgdm9pZCBkcmF3SGlnaGxpZ2h0KEdyYXBoaWNzQ29udGV4dCYpIGNvbnN0 OwogCiAgICAgLy8gV2UgcmVwcmVzZW50IGVtYmVkZGVkIGRvbXMgYXMgYSBwYXJ0IG9mIHRoZSBz YW1lIGhpZXJhcmNoeS4gSGVuY2Ugd2UgdHJlYXQgY2hpbGRyZW4gb2YgZnJhbWUgb3duZXJzIGRp ZmZlcmVudGx5LgogICAgIC8vIFdlIGFsc28gc2tpcCB3aGl0ZXNwYWNlIHRleHQgbm9kZXMgY29u ZGl0aW9uYWxseS4gRm9sbG93aW5nIG1ldGhvZHMgZW5jYXBzdWxhdGUgdGhlc2Ugc3BlY2lmaWNz LgpAQCAtMjMyLDYgKzIzMiw3IEBAIHByaXZhdGU6CiAgICAgSGFzaFNldDxSZWZQdHI8Tm9kZT4g PiBtX3NlYXJjaFJlc3VsdHM7CiAgICAgT3duUHRyPFJldmFsaWRhdGVTdHlsZUF0dHJpYnV0ZVRh c2s+IG1fcmV2YWxpZGF0ZVN0eWxlQXR0clRhc2s7CiAgICAgUmVmUHRyPE5vZGU+IG1faGlnaGxp Z2h0ZWROb2RlOworICAgIE93blB0cjxJbnRSZWN0PiBtX2hpZ2hsaWdodGVkUmVjdDsKICAgICBT dHJpbmcgbV9oaWdobGlnaHRNb2RlOwogICAgIFJlZlB0cjxOb2RlPiBtX25vZGVUb0ZvY3VzOwog ICAgIGJvb2wgbV9zZWFyY2hpbmdGb3JOb2RlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9Qb3BvdmVyLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9Qb3BvdmVyLmpzCmluZGV4IDRiMDMxYzA1OGQxNDgwNmUzZDU4Y2RmZjg3NGQw NGUxODU1MDdhMjguLmY1YTczZTMwMDE5NTMwZDhiZDI4NDNiY2Q0YTU5OTE4MmViMTc3ZWYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUG9wb3Zlci5qcwor KysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1BvcG92ZXIuanMKQEAgLTE4 Niw3ICsxODYsNyBAQCBXZWJJbnNwZWN0b3IuUG9wb3ZlckhlbHBlci5wcm90b3R5cGUgPSB7CiAg ICAgICAgIGlmICh0aGlzLl9ob3ZlckVsZW1lbnQgPT09IGV2ZW50LnRhcmdldCB8fCAodGhpcy5f aG92ZXJFbGVtZW50ICYmIHRoaXMuX2hvdmVyRWxlbWVudC5pc0FuY2VzdG9yKGV2ZW50LnRhcmdl dCkpKQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIC8vIFVzZXIgaGFzIDI1MG1zICh0 aGlzLl90aW1lb3V0IC8gNCkgdG8gcmVhY2ggdGhlIHBvcHVwLgorICAgICAgICAvLyBVc2VyIGhh cyA1MDBtcyAodGhpcy5fdGltZW91dCAvIDIpIHRvIHJlYWNoIHRoZSBwb3B1cC4KICAgICAgICAg aWYgKHRoaXMuX3BvcHVwICYmICF0aGlzLl9oaWRlUG9wdXBUaW1lcikgewogICAgICAgICAgICAg dmFyIHNlbGYgPSB0aGlzOwogICAgICAgICAgICAgZnVuY3Rpb24gZG9IaWRlKCkKQEAgLTE5NCw3 ICsxOTQsNyBAQCBXZWJJbnNwZWN0b3IuUG9wb3ZlckhlbHBlci5wcm90b3R5cGUgPSB7CiAgICAg ICAgICAgICAgICAgc2VsZi5faGlkZVBvcHVwKCk7CiAgICAgICAgICAgICAgICAgZGVsZXRlIHNl bGYuX2hpZGVQb3B1cFRpbWVyOwogICAgICAgICAgICAgfQotICAgICAgICAgICAgdGhpcy5faGlk ZVBvcHVwVGltZXIgPSBzZXRUaW1lb3V0KGRvSGlkZSwgdGhpcy5fdGltZW91dCAvIDQpOworICAg ICAgICAgICAgdGhpcy5faGlkZVBvcHVwVGltZXIgPSBzZXRUaW1lb3V0KGRvSGlkZSwgdGhpcy5f dGltZW91dCAvIDIpOwogICAgICAgICB9CiAKICAgICAgICAgdGhpcy5faGFuZGxlTW91c2VBY3Rp b24oZXZlbnQpOwpAQCAtMjA4LDcgKzIwOCw3IEBAIFdlYkluc3BlY3Rvci5Qb3BvdmVySGVscGVy LnByb3RvdHlwZSA9IHsKICAgICAgICAgaWYgKCF0aGlzLl9ob3ZlckVsZW1lbnQpCiAgICAgICAg ICAgICByZXR1cm47CiAKLSAgICAgICAgY29uc3QgdG9vbFRpcERlbGF5ID0gaXNNb3VzZURvd24g PyAwIDogKHRoaXMuX3BvcHVwID8gdGhpcy5fdGltZW91dCAqIDAuMyA6IHRoaXMuX3RpbWVvdXQp OworICAgICAgICBjb25zdCB0b29sVGlwRGVsYXkgPSBpc01vdXNlRG93biA/IDAgOiAodGhpcy5f cG9wdXAgPyB0aGlzLl90aW1lb3V0ICogMC42IDogdGhpcy5fdGltZW91dCk7CiAgICAgICAgIHRo aXMuX2hvdmVyVGltZXIgPSBzZXRUaW1lb3V0KHRoaXMuX21vdXNlSG92ZXIuYmluZCh0aGlzLCB0 aGlzLl9ob3ZlckVsZW1lbnQpLCB0b29sVGlwRGVsYXkpOwogICAgIH0sCiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanMgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzCmluZGV4 IDIyMjJmNWFhNDM5NmU5MDNmZGUwOWFhMTc3MzhmZDA4ZTk2YjQ3ZWUuLjViYzAwZDA0ZjJmYTYz ZWRhY2QwYWE4MzNkYTQ2YjIzMWJkMzBkOWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qcwpAQCAtMTA3Myw3ICsxMDczLDcg QEAgV2ViSW5zcGVjdG9yLkZyYW1lVHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogICAgICAgICB0 aGlzLl9zdG9yYWdlUGFuZWwuc2hvd0NhdGVnb3J5Vmlldyh0aGlzLl9kaXNwbGF5TmFtZSk7CiAK ICAgICAgICAgdGhpcy5saXN0SXRlbUVsZW1lbnQucmVtb3ZlU3R5bGVDbGFzcygiaG92ZXJlZCIp OwotICAgICAgICBET01BZ2VudC5oaWRlRnJhbWVIaWdobGlnaHQoKTsKKyAgICAgICAgRE9NQWdl bnQuaGlkZUhpZ2hsaWdodCgpOwogICAgIH0sCiAKICAgICBnZXQgZGlzcGxheU5hbWUoKQpAQCAt MTEwOCw3ICsxMTA4LDcgQEAgV2ViSW5zcGVjdG9yLkZyYW1lVHJlZUVsZW1lbnQucHJvdG90eXBl ID0gewogICAgICAgICAgICAgRE9NQWdlbnQuaGlnaGxpZ2h0RnJhbWUodGhpcy5fZnJhbWVJZCk7 CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICB0aGlzLmxpc3RJdGVtRWxlbWVudC5yZW1v dmVTdHlsZUNsYXNzKCJob3ZlcmVkIik7Ci0gICAgICAgICAgICBET01BZ2VudC5oaWRlRnJhbWVI aWdobGlnaHQoKTsKKyAgICAgICAgICAgIERPTUFnZW50LmhpZGVIaWdobGlnaHQoKTsKICAgICAg ICAgfQogICAgIH0sCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvVGltZWxpbmVQYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvVGltZWxpbmVQYW5lbC5qcwppbmRleCBkYjI4NDczZDE3Zjk0ZTI3ZmY5ZWI3MjFmMmRjMGVm NzY4ZDNiNjBlLi5mNWM0Y2Y3ZGRiMGI2MWQ3MmNhYTFhYjBkNTliZDZjY2MyNjA1NjVhIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUGFuZWwu anMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVBhbmVs LmpzCkBAIC05NCw2ICs5NCw4IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsID0gZnVuY3Rp b24oKQogICAgIHRoaXMuX3Njcm9sbFRvcCA9IDA7CiAKICAgICB0aGlzLl9wb3BvdmVySGVscGVy ID0gbmV3IFdlYkluc3BlY3Rvci5Qb3BvdmVySGVscGVyKHRoaXMuX2NvbnRhaW5lckVsZW1lbnQs IHRoaXMuX2dldFBvcG92ZXJBbmNob3IuYmluZCh0aGlzKSwgdGhpcy5fc2hvd1BvcG92ZXIuYmlu ZCh0aGlzKSwgdHJ1ZSk7CisgICAgdGhpcy5fY29udGFpbmVyRWxlbWVudC5hZGRFdmVudExpc3Rl bmVyKCJtb3VzZW1vdmUiLCB0aGlzLl9tb3VzZU1vdmUuYmluZCh0aGlzKSwgZmFsc2UpOworICAg IHRoaXMuX2NvbnRhaW5lckVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigibW91c2VvdXQiLCB0aGlz Ll9tb3VzZU91dC5iaW5kKHRoaXMpLCBmYWxzZSk7CiAKICAgICAvLyBEaXNhYmxlIHNob3J0IGV2 ZW50cyBmaWx0ZXIgYnkgZGVmYXVsdC4KICAgICB0aGlzLnRvZ2dsZUZpbHRlckJ1dHRvbi50b2dn bGVkID0gdHJ1ZTsKQEAgLTcxMiw2ICs3MTQsMzcgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFu ZWwucHJvdG90eXBlID0gewogICAgICAgICByZXR1cm4gZWxlbWVudC5lbmNsb3NpbmdOb2RlT3JT ZWxmV2l0aENsYXNzKCJ0aW1lbGluZS1ncmFwaC1iYXIiKSB8fCBlbGVtZW50LmVuY2xvc2luZ05v ZGVPclNlbGZXaXRoQ2xhc3MoInRpbWVsaW5lLXRyZWUtaXRlbSIpOwogICAgIH0sCiAKKyAgICBf bW91c2VPdXQ6IGZ1bmN0aW9uKGUpCisgICAgeworICAgICAgICB0aGlzLl9oaWRlUmVjdEhpZ2hs aWdodCgpOworICAgIH0sCisKKyAgICBfbW91c2VNb3ZlOiBmdW5jdGlvbihlKQorICAgIHsKKyAg ICAgICAgdmFyIGFuY2hvciA9IHRoaXMuX2dldFBvcG92ZXJBbmNob3IoZS50YXJnZXQpOworCisg ICAgICAgIGlmIChhbmNob3IgJiYgYW5jaG9yLnJvdy5fcmVjb3JkLnR5cGUgPT09ICJQYWludCIp CisgICAgICAgICAgICB0aGlzLl9oaWdobGlnaHRSZWN0KGFuY2hvci5yb3cuX3JlY29yZCk7Cisg ICAgICAgIGVsc2UKKyAgICAgICAgICAgIHRoaXMuX2hpZGVSZWN0SGlnaGxpZ2h0KCk7CisgICAg fSwKKworICAgIF9oaWdobGlnaHRSZWN0OiBmdW5jdGlvbihyZWNvcmQpCisgICAgeworICAgICAg ICBpZiAodGhpcy5faGlnaGxpZ2h0ZWRSZWN0ID09PSByZWNvcmQuZGF0YSkKKyAgICAgICAgICAg IHJldHVybjsKKyAgICAgICAgdGhpcy5faGlnaGxpZ2h0ZWRSZWN0ID0gcmVjb3JkLmRhdGE7Cisg ICAgICAgIERPTUFnZW50LmhpZ2hsaWdodFJlY3QodGhpcy5faGlnaGxpZ2h0ZWRSZWN0LngsIHRo aXMuX2hpZ2hsaWdodGVkUmVjdC55LCB0aGlzLl9oaWdobGlnaHRlZFJlY3Qud2lkdGgsIHRoaXMu X2hpZ2hsaWdodGVkUmVjdC5oZWlnaHQpOworICAgIH0sCisKKyAgICBfaGlkZVJlY3RIaWdobGln aHQ6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIGlmICh0aGlzLl9oaWdobGlnaHRlZFJlY3Qp IHsKKyAgICAgICAgICAgIGRlbGV0ZSB0aGlzLl9oaWdobGlnaHRlZFJlY3Q7CisgICAgICAgICAg ICBET01BZ2VudC5oaWRlSGlnaGxpZ2h0KCk7CisgICAgICAgIH0KKyAgICB9LAorCiAgICAgX3No b3dQb3BvdmVyOiBmdW5jdGlvbihhbmNob3IpCiAgICAgewogICAgICAgICB2YXIgcmVjb3JkID0g YW5jaG9yLnJvdy5fcmVjb3JkOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9pbnNwZWN0b3IuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL2luc3BlY3Rvci5qcwppbmRleCBiZDU5MDlmMzUxNzlmYzQ4YTYzOTJkNjcxYzI1MzAxNTM2 NDU3Y2FkLi5lMTNhZWY2OWVmMGUxYzllODQyNDhkNTM2ZWNiMTM4Yjk2NmU1NzU3IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcworKysg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcwpAQCAtMzkx LDcgKzM5MSw3IEBAIHZhciBXZWJJbnNwZWN0b3IgPSB7CiAgICAgICAgIGlmIChub2RlSWQpCiAg ICAgICAgICAgICBET01BZ2VudC5oaWdobGlnaHROb2RlKG5vZGVJZCwgbW9kZSB8fCAiYWxsIik7 CiAgICAgICAgIGVsc2UKLSAgICAgICAgICAgIERPTUFnZW50LmhpZGVOb2RlSGlnaGxpZ2h0KCk7 CisgICAgICAgICAgICBET01BZ2VudC5oaWRlSGlnaGxpZ2h0KCk7CiAgICAgfSwKIAogICAgIGhp Z2hsaWdodERPTU5vZGVGb3JUd29TZWNvbmRzOiBmdW5jdGlvbihub2RlSWQpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vQ2hhbmdlTG9nCmluZGV4IDE5ZjIxZWMwNzM4YTNhNzIxMDhkNzJmNWFjN2VkZWQ5OTNlNjU2 YmIuLjgzNjU0ODk1ZDVjYTk1NWVmOWU3MjI1YTNmMTA4ODUxZmZiYjg3NzAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDgtMDMgIFBhdmVsIEZlbGRt YW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFtUaW1l bGluZV0gSG92ZXIgb24gcGFpbnQgZXZlbnRzIGFuZCBzZWUgcmVjdCBvdXRsaW5lIGFyb3VuZCB0 aGF0IGFyZWEuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD02NTUxMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogc3JjL1dlYkRldlRvb2xzQWdlbnRJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRGV2 VG9vbHNBZ2VudEltcGw6OnBhaW50UGFnZU92ZXJsYXkpOgorCiAyMDExLTA4LTAzICBKZXJlbXkg TW9za292aWNoICA8amVyZW15QGNocm9taXVtLm9yZz4KIAogICAgICAgICBbQ2hyb21pdW1dIEZp eCBPT1AgZm9udCBsb2FkaW5nIHRvIHdvcmsgb24gMTAuNi42IGFuZCBhYm92ZS4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkRldlRvb2xzQWdlbnRJbXBsLmNwcCBi L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkRldlRvb2xzQWdlbnRJbXBsLmNwcAppbmRl eCA1NzQxOWI3YzgyNWZjZWI5Y2FiN2Y2OWZhMmZiNjk0ZTM4NDhjZDI3Li44NmM2MGIwNDI3YzYz MDMxYTZlM2I1MmE3MGJlZjY4N2JmNjIyZjM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3NyYy9XZWJEZXZUb29sc0FnZW50SW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS9zcmMvV2ViRGV2VG9vbHNBZ2VudEltcGwuY3BwCkBAIC0yNzksNyArMjc5LDcgQEAg dm9pZCBXZWJEZXZUb29sc0FnZW50SW1wbDo6cGFpbnRQYWdlT3ZlcmxheShHcmFwaGljc0NvbnRl eHQmIGdjKQogewogICAgIEluc3BlY3RvckNvbnRyb2xsZXIqIGljID0gaW5zcGVjdG9yQ29udHJv bGxlcigpOwogICAgIGlmIChpYykKLSAgICAgICAgaWMtPmRyYXdOb2RlSGlnaGxpZ2h0KGdjKTsK KyAgICAgICAgaWMtPmRyYXdIaWdobGlnaHQoZ2MpOwogfQogCiB2b2lkIFdlYkRldlRvb2xzQWdl bnRJbXBsOjpoaWdobGlnaHQoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdl TG9nIGIvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nCmluZGV4IGU3NjI4NWRhYTQzM2JkODEx YzBiYzAxZjkxODEzYmYzYTk2ZmEyZTkuLjlkZDdmMWM3MzAxZGY4ZDJkNzI5NWNjMTViMzQ5YWFj MzU2NTYzNmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZworKysgYi9T b3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxMS0wOC0wMyAg UGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGdvb2dsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3Bl Y3RvcjogW1RpbWVsaW5lXSBIb3ZlciBvbiBwYWludCBldmVudHMgYW5kIHNlZSByZWN0IG91dGxp bmUgYXJvdW5kIHRoYXQgYXJlYS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTY1NTEwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiB3ZWJraXQvd2Via2l0d2Vidmlldy5jcHA6CisgICAgICAgIChwYWludFdl YlZpZXcpOgorCiAyMDExLTA4LTAzICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0u b3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IHJlbW92ZSBOb2RlIHBhcmFtZXRlciBmcm9t IHRoZSBJbnNwZWN0b3JDbGllbnQ6OmhpZ2hsaWdodApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwIGIvU291cmNlL1dlYktpdC9ndGsvd2Via2l0 L3dlYmtpdHdlYnZpZXcuY3BwCmluZGV4IDkyZDU3MzFlMDdlZDdiMDU0YzUwNDc2ODU2ZDM4NTY4 Yjk0OTMyNWQuLjEyZmNiOTUxYzE3ZmQxMzVmMmRhZjEyZmM1MWE4N2EzMjY5ZTM2MGMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmNwcAorKysgYi9T b3VyY2UvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAKQEAgLTY2NSw3ICs2NjUs NyBAQCBzdGF0aWMgdm9pZCBwYWludFdlYlZpZXcoRnJhbWUqIGZyYW1lLCBnYm9vbGVhbiB0cmFu c3BhcmVudCwgR3JhcGhpY3NDb250ZXh0JiBjbwogCiAgICAgY29udGV4dC5zYXZlKCk7CiAgICAg Y29udGV4dC5jbGlwKGNsaXBSZWN0KTsKLSAgICBmcmFtZS0+cGFnZSgpLT5pbnNwZWN0b3JDb250 cm9sbGVyKCktPmRyYXdOb2RlSGlnaGxpZ2h0KGNvbnRleHQpOworICAgIGZyYW1lLT5wYWdlKCkt Pmluc3BlY3RvckNvbnRyb2xsZXIoKS0+ZHJhd0hpZ2hsaWdodChjb250ZXh0KTsKICAgICBjb250 ZXh0LnJlc3RvcmUoKTsKIH0KICNpZmRlZiBHVEtfQVBJX1ZFUlNJT05fMgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9n CmluZGV4IDhhODBhODQ5MWI1ZDllYmU5YjdmNGM2MTAyNzJjY2Q5ZWJiODIzYzcuLmMwNTM4MGZl ZjVmYTcwNmI0M2YyOTRlZTJhYTgzY2VmMzdhMjg3OTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvbWFjL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxMyBAQAorMjAxMS0wOC0wMyAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGdvb2dsZS5j b20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogW1RpbWVsaW5lXSBIb3ZlciBvbiBwYWludCBl dmVudHMgYW5kIHNlZSByZWN0IG91dGxpbmUgYXJvdW5kIHRoYXQgYXJlYS4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY1NTEwCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJJbnNwZWN0b3IvV2ViTm9k ZUhpZ2hsaWdodFZpZXcubW06CisgICAgICAgICgtW1dlYk5vZGVIaWdobGlnaHRWaWV3IGRyYXdS ZWN0Ol0pOgorCiAyMDExLTA4LTAzICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0u b3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IHJlbW92ZSBOb2RlIHBhcmFtZXRlciBmcm9t IHRoZSBJbnNwZWN0b3JDbGllbnQ6OmhpZ2hsaWdodApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9tYWMvV2ViSW5zcGVjdG9yL1dlYk5vZGVIaWdobGlnaHRWaWV3Lm1tIGIvU291cmNlL1dlYktp dC9tYWMvV2ViSW5zcGVjdG9yL1dlYk5vZGVIaWdobGlnaHRWaWV3Lm1tCmluZGV4IDdmYzNjZjQy MzcwNTllYzdhMGYyNmM0OWY2Nzk1NDdjNmQyOGY2NGEuLmRkMzYzYzZiNjg5NWI0NzFkZTU0ZGMx ZDI0MmNlMzcyYjdlYmNjZjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYkluc3Bl Y3Rvci9XZWJOb2RlSGlnaGxpZ2h0Vmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJJ bnNwZWN0b3IvV2ViTm9kZUhpZ2hsaWdodFZpZXcubW0KQEAgLTczLDcgKzczLDcgQEAgdXNpbmcg bmFtZXNwYWNlIFdlYkNvcmU7CiAgICAgICAgIEFTU0VSVChbW05TR3JhcGhpY3NDb250ZXh0IGN1 cnJlbnRDb250ZXh0XSBpc0ZsaXBwZWRdKTsKIAogICAgICAgICBHcmFwaGljc0NvbnRleHQgY29u dGV4dCgoUGxhdGZvcm1HcmFwaGljc0NvbnRleHQqKVtbTlNHcmFwaGljc0NvbnRleHQgY3VycmVu dENvbnRleHRdIGdyYXBoaWNzUG9ydF0pOwotICAgICAgICBbX3dlYk5vZGVIaWdobGlnaHQgaW5z cGVjdG9yQ29udHJvbGxlcl0tPmRyYXdOb2RlSGlnaGxpZ2h0KGNvbnRleHQpOworICAgICAgICBb X3dlYk5vZGVIaWdobGlnaHQgaW5zcGVjdG9yQ29udHJvbGxlcl0tPmRyYXdIaWdobGlnaHQoY29u dGV4dCk7CiAgICAgICAgIFtOU0dyYXBoaWNzQ29udGV4dCByZXN0b3JlR3JhcGhpY3NTdGF0ZV07 CiAgICAgfQogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmNw cCBiL1NvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5jcHAKaW5kZXggZjVlNjhiZTJlNzEz YzdjMDE0Njg2OTE1YzMwYWE2MDZlNGJmYmE0MS4uYTBhMmYzZTlkMTRkMmE1MzNmZTNmZTlkMWNh YWM4Y2JlOWExMjZhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1l LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUuY3BwCkBAIC0zOTcsNyAr Mzk3LDcgQEAgdm9pZCBRV2ViRnJhbWVQcml2YXRlOjpyZW5kZXJSZWxhdGl2ZUNvb3JkcyhHcmFw aGljc0NvbnRleHQqIGNvbnRleHQsIFFGbGFnczxRV2UKICNpZiBFTkFCTEUoSU5TUEVDVE9SKQog ICAgIGlmIChmcmFtZS0+cGFnZSgpLT5pbnNwZWN0b3JDb250cm9sbGVyKCktPmhpZ2hsaWdodGVk Tm9kZSgpKSB7CiAgICAgICAgIGNvbnRleHQtPnNhdmUoKTsKLSAgICAgICAgZnJhbWUtPnBhZ2Uo KS0+aW5zcGVjdG9yQ29udHJvbGxlcigpLT5kcmF3Tm9kZUhpZ2hsaWdodCgqY29udGV4dCk7Cisg ICAgICAgIGZyYW1lLT5wYWdlKCktPmluc3BlY3RvckNvbnRyb2xsZXIoKS0+ZHJhd0hpZ2hsaWdo dCgqY29udGV4dCk7CiAgICAgICAgIGNvbnRleHQtPnJlc3RvcmUoKTsKICAgICB9CiAjZW5kaWYK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9x dC9DaGFuZ2VMb2cKaW5kZXggMTA3NTVkOWFiOTJmY2FhODQ1YTQxZDRiMDhjMGMxMmUzZWYxNjAw My4uNzNlMTU3MWNhM2E1ZWFkODA5YmRiMTE5ODBmMTAyNjIyOWVlNzBlZSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxMyBAQAorMjAxMS0wOC0wMyAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFu QGdvb2dsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogW1RpbWVsaW5lXSBIb3ZlciBv biBwYWludCBldmVudHMgYW5kIHNlZSByZWN0IG91dGxpbmUgYXJvdW5kIHRoYXQgYXJlYS4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY1NTEwCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBBcGkvcXdlYmZy YW1lLmNwcDoKKyAgICAgICAgKFFXZWJGcmFtZVByaXZhdGU6OnJlbmRlclJlbGF0aXZlQ29vcmRz KToKKwogMjAxMS0wOC0wMyAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4K IAogICAgICAgICBXZWIgSW5zcGVjdG9yOiByZW1vdmUgTm9kZSBwYXJhbWV0ZXIgZnJvbSB0aGUg SW5zcGVjdG9yQ2xpZW50OjpoaWdobGlnaHQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvd2lu L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZwppbmRleCAwNDZhNTQ1NmMx MWRjZWIwYjkwOWY2MmMwZjI1YTk1OTM3ZGQ5YTI5Li5iNzIxY2Q4NWZmYTExNzg5YTIzZjc0ZjE0 ODM4ZTg4MDUzMjZjMDY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3dpbi9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dlYktpdC93aW4vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEt MDgtMDMgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgorCisgICAgICAgIFdl YiBJbnNwZWN0b3I6IFtUaW1lbGluZV0gSG92ZXIgb24gcGFpbnQgZXZlbnRzIGFuZCBzZWUgcmVj dCBvdXRsaW5lIGFyb3VuZCB0aGF0IGFyZWEuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD02NTUxMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogV2ViTm9kZUhpZ2hsaWdodC5jcHA6CisgICAgICAgIChXZWJO b2RlSGlnaGxpZ2h0Ojp1cGRhdGUpOgorCiAyMDExLTA4LTAzICBQYXZlbCBGZWxkbWFuICA8cGZl bGRtYW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IHJlbW92ZSBOb2Rl IHBhcmFtZXRlciBmcm9tIHRoZSBJbnNwZWN0b3JDbGllbnQ6OmhpZ2hsaWdodApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC93aW4vV2ViTm9kZUhpZ2hsaWdodC5jcHAgYi9Tb3VyY2UvV2ViS2l0 L3dpbi9XZWJOb2RlSGlnaGxpZ2h0LmNwcAppbmRleCAyOGQ1MGUxZDI3Y2RmMWI1NDgyZTAwMTY5 ZWU5NjNjMzBiYWU1NmUyLi41OTUyNzIzY2ZiZTg1MzdlN2Q5ODIxMzQ3MThjNzkyOGRlYTIyMTBh IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJOb2RlSGlnaGxpZ2h0LmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJOb2RlSGlnaGxpZ2h0LmNwcApAQCAtMTU4LDcgKzE1OCw3 IEBAIHZvaWQgV2ViTm9kZUhpZ2hsaWdodDo6dXBkYXRlKCkKIAogICAgIEdyYXBoaWNzQ29udGV4 dCBjb250ZXh0KGhkYyk7CiAKLSAgICBtX2luc3BlY3RlZFdlYlZpZXctPnBhZ2UoKS0+aW5zcGVj dG9yQ29udHJvbGxlcigpLT5kcmF3Tm9kZUhpZ2hsaWdodChjb250ZXh0KTsKKyAgICBtX2luc3Bl Y3RlZFdlYlZpZXctPnBhZ2UoKS0+aW5zcGVjdG9yQ29udHJvbGxlcigpLT5kcmF3SGlnaGxpZ2h0 KGNvbnRleHQpOwogCiAgICAgQkxFTkRGVU5DVElPTiBiZjsKICAgICBiZi5CbGVuZE9wID0gQUNf U1JDX09WRVI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2Uv V2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggODVhZDYyMGZjMjc3NGI4NGQwNGM2MThmNzFlYTAxMmYx NzQyNTY0Yy4uNDgxMGRhYzVkY2M5OWRhOGNmNmI4NTI1ZTRiNzQ4MGQyYTI3NTM3ZiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDExLTA4LTAzICBQYXZlbCBGZWxkbWFuICA8cGZlbGRt YW5AZ29vZ2xlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBbVGltZWxpbmVdIEhvdmVy IG9uIHBhaW50IGV2ZW50cyBhbmQgc2VlIHJlY3Qgb3V0bGluZSBhcm91bmQgdGhhdCBhcmVhLgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjU1MTAKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlByb2Nl c3MvV2ViQ29yZVN1cHBvcnQvV2ViSW5zcGVjdG9yQ2xpZW50LmNwcDoKKyAgICAgICAgKFdlYktp dDo6V2ViSW5zcGVjdG9yQ2xpZW50OjpkcmF3UmVjdCk6CisKIDIwMTEtMDgtMDIgIENhaW8gTWFy Y2VsbyBkZSBPbGl2ZWlyYSBGaWxobyAgPGNhaW8ub2xpdmVpcmFAb3BlbmJvc3NhLm9yZz4KIAog ICAgICAgICBbUXRdIFtXSzJdIEV4cG9zZSB3ZWIgdmlldyBjbGFzc2VzIHRvIFFNTApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0 b3JDbGllbnQuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9X ZWJJbnNwZWN0b3JDbGllbnQuY3BwCmluZGV4IDJmNjQ0ODVmNjUyOWJhZTUzNDJiZDUwOTNiYWVh ZjRhMzEyZTJiZGQuLjNhZjlhZWZiMzQ2NDg3OTVmZDMxOWRkMjUxZjI3OTY2YWU3YzI3MGUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViSW5z cGVjdG9yQ2xpZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVT dXBwb3J0L1dlYkluc3BlY3RvckNsaWVudC5jcHAKQEAgLTEwMSw3ICsxMDEsNyBAQCB2b2lkIFdl Ykluc3BlY3RvckNsaWVudDo6ZGlkTW92ZVRvV2ViUGFnZShQYWdlT3ZlcmxheSosIFdlYlBhZ2Uq KQogCiB2b2lkIFdlYkluc3BlY3RvckNsaWVudDo6ZHJhd1JlY3QoUGFnZU92ZXJsYXkqIG92ZXJs YXksIFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dCYgY29udGV4dCwgY29uc3QgV2ViQ29yZTo6SW50 UmVjdCYgZGlydHlSZWN0KQogewotICAgIG1fcGFnZS0+Y29yZVBhZ2UoKS0+aW5zcGVjdG9yQ29u dHJvbGxlcigpLT5kcmF3Tm9kZUhpZ2hsaWdodChjb250ZXh0KTsKKyAgICBtX3BhZ2UtPmNvcmVQ YWdlKCktPmluc3BlY3RvckNvbnRyb2xsZXIoKS0+ZHJhd0hpZ2hsaWdodChjb250ZXh0KTsKIH0K IAogYm9vbCBXZWJJbnNwZWN0b3JDbGllbnQ6Om1vdXNlRXZlbnQoUGFnZU92ZXJsYXkqLCBjb25z dCBXZWJNb3VzZUV2ZW50JikK