134009 2014-06-17 17:25:57 -0700 [iOS][WK2] Re-sync didCommitLoadForMainFrame with its corresponding tile update 2014-06-18 14:38:33 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 benjamin benjamin berto bunhere cgarcia cmarcelo commit-queue gustavo luiz mrobinson noam sam sergio simon.fraser thorton zeno oldest_to_newest 1016328 0 benjamin 2014-06-17 17:25:57 -0700 [iOS][WK2] Re-sync didCommitLoadForMainFrame with its corresponding tile update 1016329 1 233274 benjamin 2014-06-17 17:29:08 -0700 Created attachment 233274 Patch 1016332 2 benjamin 2014-06-17 17:29:40 -0700 <rdar://problem/17352039> 1016333 3 commit-queue 2014-06-17 17:30:30 -0700 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 1016336 4 233274 thorton 2014-06-17 17:45:37 -0700 Comment on attachment 233274 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=233274&action=review > Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm:705 > +- (void)_didCommitLoadForMainFrameWithNextDrawingTransactionID:(uint64_t)nextDrawingTransactionID The transaction IDs are for the whole commit, which includes layer tree updates, scrolling updates, render tree size, scale factors, etc. Maybe just "TransactionID", instead of Drawing-? > Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp:281 > +void PageClientImpl::didCommitLoadForMainFrame(const String& /* mimeType */, bool /* useCustomContentProvider */, uint64_t /* nextDrawingTransactionID */) I really don't think we should propagate this RemoteLayerTreeDrawingArea-specific thing through everywhere, but I'm not sure how else to do this. 1016364 5 233284 benjamin 2014-06-17 21:39:18 -0700 Created attachment 233284 Patch 1016365 6 233284 thorton 2014-06-17 21:46:42 -0700 Comment on attachment 233284 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=233284&action=review > Source/WebKit2/ChangeLog:8 > + WKWebView assumed the first _didCommitLayerTree: after _didCommitLoadForMainFrame extra space between 'assumed' and 'the' > Source/WebKit2/ChangeLog:11 > + This is not always true. Sometimes, a set of tile can be rendered in the CoreAnimation thread tile*s*, and it's not the CoreAnimation thread, it's our own layer flush thread (com.apple.WebKit.WebContent.RemoteLayerTreeDrawingArea.CommitQueue). > Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm:708 > + _firstPaintAfterCommitLoadTransactionID = static_cast<WebKit::RemoteLayerTreeDrawingAreaProxy*>(_page->drawingArea())->nextLayerTreeIdTransactionID(); Don't we have toRemoteLayerTreeDrawingAreaProxy()? If not, maybe add the macros so we do? > Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h:52 > + uint64_t nextLayerTreeIdTransactionID() const { return m_lastWillCommitLayerTreeTransactionID + 1; } what's with the Id in the middle of this name? should just be nextLayerTreeTransactionID I think. > Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h:96 > + uint64_t m_lastWillCommitLayerTreeTransactionID; maybe this is m_pendingLayerTreeTransactionID? 1016539 7 benjamin 2014-06-18 14:38:33 -0700 Committed r170115: <http://trac.webkit.org/changeset/170115> 233274 2014-06-17 17:29:08 -0700 2014-06-17 21:39:12 -0700 Patch bug-134009-20140617172814.patch text/plain 22353 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogMTcwMDM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZTkzMjFkMWY5NGQxMDE5 NjRmNTViYjc1YWI0NmJhYzUyNzU5ZmM1Yi4uNzRmZmZkYTI4MDliMzAzZmNmMTBiZDhmZTVlZGU2 Njc0ZTcwZDdiZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDU0IEBACisyMDE0LTA2LTE3ICBCZW5q YW1pbiBQb3VsYWluICA8YnBvdWxhaW5AYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdW1dLMl0g UmUtc3luYyBkaWRDb21taXRMb2FkRm9yTWFpbkZyYW1lIHdpdGggaXRzIGNvcnJlc3BvbmRpbmcg dGlsZSB1cGRhdGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTEzNDAwOQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTczNTIwMzk+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV0tXZWJWaWV3IGFzc3VtZWQg IHRoZSBmaXJzdCBfZGlkQ29tbWl0TGF5ZXJUcmVlOiBhZnRlciBfZGlkQ29tbWl0TG9hZEZvck1h aW5GcmFtZQorICAgICAgICBoYWQgdGhlIHN0YXRlIG9mIHRoZSBwYWdlIGJlaW5nIGxvYWRlZC4K KworICAgICAgICBUaGlzIGlzIG5vdCBhbHdheXMgdHJ1ZS4gU29tZXRpbWVzLCBhIHNldCBvZiB0 aWxlIGNhbiBiZSByZW5kZXJlZCBpbiB0aGUgQ29yZUFuaW1hdGlvbiB0aHJlYWQKKyAgICAgICAg d2hpbGUgdGhlIG5leHQgcGFnZSBpcyBsb2FkZWQuIFdoZW4gdGhlIHRpbGVzIGFyZSBzdWJtaXR0 ZWQgdG8gdGhlIFVJUHJvY2VzcywgaXQgaXMgc3RpbGwKKyAgICAgICAgc2hvd2luZyB0aGUgcHJl dmlvdXMgcGFnZSBhbmQgd2UgY2Fubm90IHJlc2V0IHRoZSB2aWV3IHN0YXRlcyB5ZXQuCisKKyAg ICAgICAgVGltIGludHJvZHVjZWQgYSB0cmFuc2FjdGlvbklEIHdpdGggZWFjaCBsYXllciB0cmVl IHVwZGF0ZS4gVGhpcyBwYXRjaCB1c2VzIHRoYXQgdG8gc3luY2hyb25pemUKKyAgICAgICAgV0tX ZWJWaWV3IHdpdGggdGhlIHJpZ2h0IHNldCBvZiB0aWxlcy4KKworICAgICAgICAqIFVJUHJvY2Vz cy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tOgorICAgICAgICAoLVtXS1dlYlZpZXcgX2RpZENvbW1p dExvYWRGb3JNYWluRnJhbWVXaXRoTmV4dERyYXdpbmdUcmFuc2FjdGlvbklEOl0pOgorICAgICAg ICAoLVtXS1dlYlZpZXcgX2RpZENvbW1pdExheWVyVHJlZTpXZWJLaXQ6Ol0pOgorICAgICAgICAo LVtXS1dlYlZpZXcgX3VwZGF0ZVZpc2libGVDb250ZW50UmVjdHNdKToKKyAgICAgICAgKC1bV0tX ZWJWaWV3IF9kaWRDb21taXRMb2FkRm9yTWFpbkZyYW1lXSk6IERlbGV0ZWQuCisgICAgICAgICog VUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdJbnRlcm5hbC5oOgorICAgICAgICAqIFVJUHJv Y2Vzcy9BUEkvZ3RrL1BhZ2VDbGllbnRJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UGFnZUNs aWVudEltcGw6OmRpZENvbW1pdExvYWRGb3JNYWluRnJhbWUpOgorICAgICAgICAqIFVJUHJvY2Vz cy9BUEkvZ3RrL1BhZ2VDbGllbnRJbXBsLmg6CisgICAgICAgICogVUlQcm9jZXNzL0Nvb3JkaW5h dGVkR3JhcGhpY3MvV2ViVmlldy5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXc6OmRpZENv bW1pdExvYWRGb3JNYWluRnJhbWUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9Db29yZGluYXRlZEdy YXBoaWNzL1dlYlZpZXcuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvUGFnZUNsaWVudC5oOgorICAg ICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQ YWdlUHJveHk6OmRpZENvbW1pdExvYWRGb3JGcmFtZSk6CisgICAgICAgICogVUlQcm9jZXNzL1dl YlBhZ2VQcm94eS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkubWVzc2FnZXMu aW46CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9QYWdlQ2xpZW50SW1wbElPUy5oOgorICAgICAg ICAqIFVJUHJvY2Vzcy9pb3MvUGFnZUNsaWVudEltcGxJT1MubW06CisgICAgICAgIChXZWJLaXQ6 OlBhZ2VDbGllbnRJbXBsOjpkaWRDb21taXRMb2FkRm9yTWFpbkZyYW1lKToKKyAgICAgICAgKiBV SVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXcubW06CisgICAgICAgICgtW1dLQ29udGVudFZpZXcg X2RpZENvbW1pdExvYWRGb3JNYWluRnJhbWVdKToKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1Bh Z2VDbGllbnRJbXBsLmg6CisgICAgICAgICogVUlQcm9jZXNzL21hYy9QYWdlQ2xpZW50SW1wbC5t bToKKyAgICAgICAgKFdlYktpdDo6UGFnZUNsaWVudEltcGw6OmRpZENvbW1pdExvYWRGb3JNYWlu RnJhbWUpOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2Fk ZXJDbGllbnQuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlz cGF0Y2hEaWRDb21taXRMb2FkKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvRHJhd2lu Z0FyZWEuaDoKKyAgICAgICAgKFdlYktpdDo6RHJhd2luZ0FyZWE6Om5leHRUcmFuc2FjdGlvbklE KToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1JlbW90ZUxheWVyVHJlZURyYXdp bmdBcmVhLmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9SZW1vdGVMYXllclRy ZWVEcmF3aW5nQXJlYS5tbToKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlTGF5ZXJUcmVlRHJhd2lu Z0FyZWE6Om5leHRUcmFuc2FjdGlvbklEKToKKwogMjAxNC0wNi0xNiAgSmFlaHVuIExpbSAgPGxq YWVodW4ubGltQHNhbXN1bmcuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQgYnVpbGQgZml4IGFm dGVyIHIxNzAwMjkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29j b2EvV0tXZWJWaWV3Lm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dl YlZpZXcubW0KaW5kZXggZTViOTFiMmYzZWE5NjZlY2NmYTIyNGVhYzcwOGU2MjUwODczNzUzMi4u N2MzNmUwYmY0OGY1ODliN2ZjYjNjNDUyMTA0NGIxYzhjODg5ZmI4MiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KKysrIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KQEAgLTE2MSw2ICsxNjEs NyBAQCBXS1dlYlZpZXcqIGZyb21XZWJQYWdlUHJveHkoV2ViS2l0OjpXZWJQYWdlUHJveHkmIHBh Z2UpCiAgICAgQk9PTCBfb3ZlcnJpZGVzSW50ZXJmYWNlT3JpZW50YXRpb247CiAKICAgICBCT09M IF9uZWVkc1Jlc2V0Vmlld1N0YXRlQWZ0ZXJDb21taXRMb2FkRm9yTWFpbkZyYW1lOworICAgIHVp bnQ2NF90IF9maXJzdFBhaW50QWZ0ZXJDb21taXRMb2FkVHJhbnNhY3Rpb25JRDsKICAgICBCT09M IF9pc0FuaW1hdGluZ1Jlc2l6ZTsKICAgICBDQVRyYW5zZm9ybTNEIF9yZXNpemVBbmltYXRpb25U cmFuc2Zvcm1BZGp1c3RtZW50czsKICAgICBSZXRhaW5QdHI8VUlWaWV3PiBfcmVzaXplQW5pbWF0 aW9uVmlldzsKQEAgLTcwMSw5ICs3MDIsMTAgQEAgc3RhdGljIENHRmxvYXQgY29udGVudFpvb21T Y2FsZShXS1dlYlZpZXcqIHdlYlZpZXcpCiAgICAgX2hhZERlbGF5ZWRVcGRhdGVWaXNpYmxlQ29u dGVudFJlY3RzID0gTk87CiB9CiAKLS0gKHZvaWQpX2RpZENvbW1pdExvYWRGb3JNYWluRnJhbWUK Ky0gKHZvaWQpX2RpZENvbW1pdExvYWRGb3JNYWluRnJhbWVXaXRoTmV4dERyYXdpbmdUcmFuc2Fj dGlvbklEOih1aW50NjRfdCluZXh0RHJhd2luZ1RyYW5zYWN0aW9uSUQKIHsKICAgICBfbmVlZHNS ZXNldFZpZXdTdGF0ZUFmdGVyQ29tbWl0TG9hZEZvck1haW5GcmFtZSA9IFlFUzsKKyAgICBfZmly c3RQYWludEFmdGVyQ29tbWl0TG9hZFRyYW5zYWN0aW9uSUQgPSBuZXh0RHJhd2luZ1RyYW5zYWN0 aW9uSUQ7CiAgICAgX3VzZXNNaW5pbWFsVUkgPSBOTzsKIH0KIApAQCAtNzM3LDkgKzczOSwxMCBA QCBzdGF0aWMgQ0dGbG9hdCBjb250ZW50Wm9vbVNjYWxlKFdLV2ViVmlldyogd2ViVmlldykKICAg ICAgICAgICAgIFtzdGF0aWNfY2FzdDxpZCA8V0tVSURlbGVnYXRlUHJpdmF0ZT4+KGRlbGVnYXRl LmdldCgpKSBfd2ViVmlldzpzZWxmIHVzZXNNaW5pbWFsVUk6X3VzZXNNaW5pbWFsVUldOwogICAg IH0KIAotICAgIGlmIChfbmVlZHNSZXNldFZpZXdTdGF0ZUFmdGVyQ29tbWl0TG9hZEZvck1haW5G cmFtZSkgeworICAgIGlmIChfbmVlZHNSZXNldFZpZXdTdGF0ZUFmdGVyQ29tbWl0TG9hZEZvck1h aW5GcmFtZSAmJiBsYXllclRyZWVUcmFuc2FjdGlvbi50cmFuc2FjdGlvbklEKCkgPj0gX2ZpcnN0 UGFpbnRBZnRlckNvbW1pdExvYWRUcmFuc2FjdGlvbklEKSB7CiAgICAgICAgIF9uZWVkc1Jlc2V0 Vmlld1N0YXRlQWZ0ZXJDb21taXRMb2FkRm9yTWFpbkZyYW1lID0gTk87CiAgICAgICAgIFtfc2Ny b2xsVmlldyBzZXRDb250ZW50T2Zmc2V0OkNHUG9pbnRNYWtlKC1fb2JzY3VyZWRJbnNldHMubGVm dCwgLV9vYnNjdXJlZEluc2V0cy50b3ApXTsKKyAgICAgICAgW3NlbGYgX3VwZGF0ZVZpc2libGVD b250ZW50UmVjdHNdOwogICAgIH0KIH0KIApAQCAtMTE3OSw2ICsxMTgyLDkgQEAgc3RhdGljIFdl YkNvcmU6OkZsb2F0UG9pbnQgY29uc3RyYWluQ29udGVudE9mZnNldChXZWJDb3JlOjpGbG9hdFBv aW50IGNvbnRlbnRPZmYKICAgICBpZiAoX2lzQW5pbWF0aW5nUmVzaXplKQogICAgICAgICByZXR1 cm47CiAKKyAgICBpZiAoX25lZWRzUmVzZXRWaWV3U3RhdGVBZnRlckNvbW1pdExvYWRGb3JNYWlu RnJhbWUpCisgICAgICAgIHJldHVybjsKKwogICAgIENHUmVjdCBmdWxsVmlld1JlY3QgPSBzZWxm LmJvdW5kczsKICAgICBDR1JlY3QgdmlzaWJsZVJlY3RJbkNvbnRlbnRDb29yZGluYXRlcyA9IFtz ZWxmIGNvbnZlcnRSZWN0OmZ1bGxWaWV3UmVjdCB0b1ZpZXc6X2NvbnRlbnRWaWV3LmdldCgpXTsK IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZp ZXdJbnRlcm5hbC5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZp ZXdJbnRlcm5hbC5oCmluZGV4IDc4ZWM3ZTMyZDZjMjFmNTRiZTlhZTQ2ZTdlZmYzOTU5NzQ5ZjQx MTguLjlhY2I3MTE3MGJjOTI2YTFkMGZhNDNkY2U0ZDFhYmI0MWY2ODdiOWEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3SW50ZXJuYWwuaAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld0ludGVybmFs LmgKQEAgLTY3LDcgKzY3LDcgQEAgc3RydWN0IFZpZXdTbmFwc2hvdDsKIAogLSAodm9pZClfcHJv Y2Vzc0RpZEV4aXQ7CiAKLS0gKHZvaWQpX2RpZENvbW1pdExvYWRGb3JNYWluRnJhbWU7CistICh2 b2lkKV9kaWRDb21taXRMb2FkRm9yTWFpbkZyYW1lV2l0aE5leHREcmF3aW5nVHJhbnNhY3Rpb25J RDoodWludDY0X3QpbmV4dERyYXdpbmdUcmFuc2FjdGlvbklEOwogLSAodm9pZClfZGlkQ29tbWl0 TGF5ZXJUcmVlOihjb25zdCBXZWJLaXQ6OlJlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uJilsYXll clRyZWVUcmFuc2FjdGlvbjsKIAogLSAodm9pZClfZHluYW1pY1ZpZXdwb3J0VXBkYXRlQ2hhbmdl ZFRhcmdldFRvU2NhbGU6KGRvdWJsZSluZXdTY2FsZSBwb3NpdGlvbjooQ0dQb2ludCluZXdTY3Jv bGxQb3NpdGlvbjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3Rr L1BhZ2VDbGllbnRJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1Bh Z2VDbGllbnRJbXBsLmNwcAppbmRleCBjNmZjNjEwZGQ3MGMwMTAyOGIxZjhiZDIxNDYxOTNiMTU2 NGQ3YTNkLi40ZTNhNzdmMGFkYmJhNjdiNGE2NWFlYjI1NGY0ODdhNWE2MWRhYjlkIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9QYWdlQ2xpZW50SW1wbC5jcHAK KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvUGFnZUNsaWVudEltcGwuY3Bw CkBAIC0yNzgsNyArMjc4LDcgQEAgdm9pZCBQYWdlQ2xpZW50SW1wbDo6aGFuZGxlRG93bmxvYWRS ZXF1ZXN0KERvd25sb2FkUHJveHkqIGRvd25sb2FkKQogICAgIHdlYmtpdFdlYlZpZXdCYXNlSGFu ZGxlRG93bmxvYWRSZXF1ZXN0KFdFQktJVF9XRUJfVklFV19CQVNFKG1fdmlld1dpZGdldCksIGRv d25sb2FkKTsKIH0KIAotdm9pZCBQYWdlQ2xpZW50SW1wbDo6ZGlkQ29tbWl0TG9hZEZvck1haW5G cmFtZShjb25zdCBTdHJpbmcmIC8qIG1pbWVUeXBlICovLCBib29sIC8qIHVzZUN1c3RvbUNvbnRl bnRQcm92aWRlciAqLyApCit2b2lkIFBhZ2VDbGllbnRJbXBsOjpkaWRDb21taXRMb2FkRm9yTWFp bkZyYW1lKGNvbnN0IFN0cmluZyYgLyogbWltZVR5cGUgKi8sIGJvb2wgLyogdXNlQ3VzdG9tQ29u dGVudFByb3ZpZGVyICovLCB1aW50NjRfdCAvKiBuZXh0RHJhd2luZ1RyYW5zYWN0aW9uSUQgKi8p CiB7CiAgICAgd2Via2l0V2ViVmlld0Jhc2VSZXNldENsaWNrQ291bnRlcihXRUJLSVRfV0VCX1ZJ RVdfQkFTRShtX3ZpZXdXaWRnZXQpKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZ3RrL1BhZ2VDbGllbnRJbXBsLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL2d0ay9QYWdlQ2xpZW50SW1wbC5oCmluZGV4IGE0MTQyZmFiNDVhNDdlZGYxZmIxMzZm NjFlNWU2N2NlYjRiZjhjYWYuLjQ4MTQ3NDJiZjIxNjVhYTBhYWNkMTE5NjRjMTAwNGMyZjhmMjZl NTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1BhZ2VDbGll bnRJbXBsLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvUGFnZUNsaWVu dEltcGwuaApAQCAtMTAzLDcgKzEwMyw3IEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCB2b2lkIHVw ZGF0ZUFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKGNvbnN0IExheWVyVHJlZUNvbnRleHQmKSBv dmVycmlkZTsKIAogICAgIHZpcnR1YWwgdm9pZCBoYW5kbGVEb3dubG9hZFJlcXVlc3QoRG93bmxv YWRQcm94eSopIG92ZXJyaWRlOwotICAgIHZpcnR1YWwgdm9pZCBkaWRDb21taXRMb2FkRm9yTWFp bkZyYW1lKGNvbnN0IFN0cmluZyYgbWltZVR5cGUsIGJvb2wgdXNlQ3VzdG9tQ29udGVudFByb3Zp ZGVyKSBvdmVycmlkZTsKKyAgICB2aXJ0dWFsIHZvaWQgZGlkQ29tbWl0TG9hZEZvck1haW5GcmFt ZShjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBib29sIHVzZUN1c3RvbUNvbnRlbnRQcm92aWRlciwg dWludDY0X3QgbmV4dERyYXdpbmdUcmFuc2FjdGlvbklEKSBvdmVycmlkZTsKIAogICAgIC8vIEF1 eGlsaWFyeSBDbGllbnQgQ3JlYXRpb24KICNpZiBFTkFCTEUoRlVMTFNDUkVFTl9BUEkpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29vcmRpbmF0ZWRHcmFwaGljcy9XZWJW aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db29yZGluYXRlZEdyYXBoaWNzL1dl YlZpZXcuY3BwCmluZGV4IGQyM2U0OTZmYjU5NWY5NzhlZDc3YjNkZjdkMDgyYWFkNDNkYjRjNTYu LmQxZjk5OWZmZjhhNzE4OTUwMDM0NTUxYTgxOTU3YTVhZTdkNDg0ZDggMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db29yZGluYXRlZEdyYXBoaWNzL1dlYlZpZXcuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db29yZGluYXRlZEdyYXBoaWNzL1dlYlZpZXcu Y3BwCkBAIC0zNzAsNyArMzcwLDcgQEAgdm9pZCBXZWJWaWV3Ojp0b29sVGlwQ2hhbmdlZChjb25z dCBTdHJpbmcmLCBjb25zdCBTdHJpbmcmIG5ld1Rvb2xUaXApCiAgICAgbV9jbGllbnQuZGlkQ2hh bmdlVG9vbHRpcCh0aGlzLCBuZXdUb29sVGlwKTsKIH0KIAotdm9pZCBXZWJWaWV3OjpkaWRDb21t aXRMb2FkRm9yTWFpbkZyYW1lKGNvbnN0IFN0cmluZyYsIGJvb2wpCit2b2lkIFdlYlZpZXc6OmRp ZENvbW1pdExvYWRGb3JNYWluRnJhbWUoY29uc3QgU3RyaW5nJiwgYm9vbCwgdWludDY0X3QpCiB7 CiAgICAgc2V0Q29udGVudFBvc2l0aW9uKFdlYkNvcmU6OkZsb2F0UG9pbnQoKSk7CiAgICAgbV9j b250ZW50c1NpemUgPSBJbnRTaXplKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQ29vcmRpbmF0ZWRHcmFwaGljcy9XZWJWaWV3LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQ29vcmRpbmF0ZWRHcmFwaGljcy9XZWJWaWV3LmgKaW5kZXggNzU0ZmEyYWRjMTExZDI4 ZjhkNzM0OTgzZTE5MmRkMjg2MmYyNmI3ZS4uZGMwYzkyOTVkMWZhNTA1NzZmY2IxN2M1NWQwNzUy ODdjNDdjZjUxYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0Nvb3JkaW5h dGVkR3JhcGhpY3MvV2ViVmlldy5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db29y ZGluYXRlZEdyYXBoaWNzL1dlYlZpZXcuaApAQCAtMTQ4LDcgKzE0OCw3IEBAIHByb3RlY3RlZDoK IAogICAgIHZpcnR1YWwgdm9pZCB0b29sVGlwQ2hhbmdlZChjb25zdCBTdHJpbmcmLCBjb25zdCBT dHJpbmcmKSBvdmVycmlkZTsKIAotICAgIHZpcnR1YWwgdm9pZCBkaWRDb21taXRMb2FkRm9yTWFp bkZyYW1lKGNvbnN0IFN0cmluZyYgbWltZVR5cGUsIGJvb2wgdXNlQ3VzdG9tQ29udGVudFByb3Zp ZGVyKSBvdmVycmlkZTsKKyAgICB2aXJ0dWFsIHZvaWQgZGlkQ29tbWl0TG9hZEZvck1haW5GcmFt ZShjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBib29sIHVzZUN1c3RvbUNvbnRlbnRQcm92aWRlciwg dWludDY0X3QgbmV4dERyYXdpbmdUcmFuc2FjdGlvbklEKSBvdmVycmlkZTsKIAogICAgIHZpcnR1 YWwgdm9pZCBwYWdlRGlkUmVxdWVzdFNjcm9sbChjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYpIG92 ZXJyaWRlOwogICAgIHZpcnR1YWwgdm9pZCBkaWRSZW5kZXJGcmFtZShjb25zdCBXZWJDb3JlOjpJ bnRTaXplJiBjb250ZW50c1NpemUsIGNvbnN0IFdlYkNvcmU6OkludFJlY3QmIGNvdmVyZWRSZWN0 KSBvdmVycmlkZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QYWdlQ2xp ZW50LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZUNsaWVudC5oCmluZGV4IDI1MTYw MGVjMjUyZjZhNTQzZjUwMzAyNDU5OTA2YWM0OTUyMDhhZTEuLjRlNDNjOTY3YmJkNWI0Y2UzMDcx OGFjMGZiOWQxMGE0YmFjMzc4NjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9QYWdlQ2xpZW50LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BhZ2VDbGllbnQu aApAQCAtMTM0LDcgKzEzNCw3IEBAIHB1YmxpYzoKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAg IH0KIAotICAgIHZpcnR1YWwgdm9pZCBkaWRDb21taXRMb2FkRm9yTWFpbkZyYW1lKGNvbnN0IFN0 cmluZyYgbWltZVR5cGUsIGJvb2wgdXNlQ3VzdG9tQ29udGVudFByb3ZpZGVyKSA9IDA7CisgICAg dmlydHVhbCB2b2lkIGRpZENvbW1pdExvYWRGb3JNYWluRnJhbWUoY29uc3QgU3RyaW5nJiBtaW1l VHlwZSwgYm9vbCB1c2VDdXN0b21Db250ZW50UHJvdmlkZXIsIHVpbnQ2NF90IG5leHREcmF3aW5n VHJhbnNhY3Rpb25JRCkgPSAwOwogCiAjaWYgVVNFKFRJTEVEX0JBQ0tJTkdfU1RPUkUpCiAgICAg dmlydHVhbCB2b2lkIHBhZ2VEaWRSZXF1ZXN0U2Nyb2xsKGNvbnN0IFdlYkNvcmU6OkludFBvaW50 JikgPSAwOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94 eS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAppbmRleCBh NjY4MTExMzczYzE0NmYwZTlkYTFkYTg0M2Y0ZDJhNDNlZDAyMmE0Li40OTBhZjMyNjU4NGQ0ODg0 NTNiNGQzYjlmZTI2NTJjOTViMmFiMjFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvV2ViUGFnZVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi UGFnZVByb3h5LmNwcApAQCAtMjUwNSw3ICsyNTA1LDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmNs ZWFyTG9hZERlcGVuZGVudENhbGxiYWNrcygpCiAgICAgfQogfQogCi12b2lkIFdlYlBhZ2VQcm94 eTo6ZGlkQ29tbWl0TG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmln YXRpb25JRCwgY29uc3QgU3RyaW5nJiBtaW1lVHlwZSwgYm9vbCBmcmFtZUhhc0N1c3RvbUNvbnRl bnRQcm92aWRlciwgdWludDMyX3Qgb3BhcXVlRnJhbWVMb2FkVHlwZSwgY29uc3QgV2ViQ29yZTo6 Q2VydGlmaWNhdGVJbmZvJiBjZXJ0aWZpY2F0ZUluZm8sIElQQzo6TWVzc2FnZURlY29kZXImIGRl Y29kZXIpCit2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkQ29tbWl0TG9hZEZvckZyYW1lKHVpbnQ2NF90 IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgY29uc3QgU3RyaW5nJiBtaW1lVHlwZSwg Ym9vbCBmcmFtZUhhc0N1c3RvbUNvbnRlbnRQcm92aWRlciwgdWludDMyX3Qgb3BhcXVlRnJhbWVM b2FkVHlwZSwgY29uc3QgV2ViQ29yZTo6Q2VydGlmaWNhdGVJbmZvJiBjZXJ0aWZpY2F0ZUluZm8s IHVpbnQ2NF90IG5leHREcmF3aW5nVHJhbnNhY3Rpb25JRCwgSVBDOjpNZXNzYWdlRGVjb2RlciYg ZGVjb2RlcikKIHsKICAgICBSZWZQdHI8QVBJOjpPYmplY3Q+IHVzZXJEYXRhOwogICAgIFdlYkNv bnRleHRVc2VyTWVzc2FnZURlY29kZXIgbWVzc2FnZURlY29kZXIodXNlckRhdGEsIHByb2Nlc3Mo KSk7CkBAIC0yNTQ1LDcgKzI1NDUsNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkQ29tbWl0TG9h ZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRAogCiAgICAg ICAgICAgICBtX3VpQ2xpZW50LT5waW5uZWRTdGF0ZURpZENoYW5nZSgqdGhpcyk7CiAgICAgICAg IH0KLSAgICAgICAgbV9wYWdlQ2xpZW50LmRpZENvbW1pdExvYWRGb3JNYWluRnJhbWUobWltZVR5 cGUsIGZyYW1lSGFzQ3VzdG9tQ29udGVudFByb3ZpZGVyKTsKKyAgICAgICAgbV9wYWdlQ2xpZW50 LmRpZENvbW1pdExvYWRGb3JNYWluRnJhbWUobWltZVR5cGUsIGZyYW1lSGFzQ3VzdG9tQ29udGVu dFByb3ZpZGVyLCBuZXh0RHJhd2luZ1RyYW5zYWN0aW9uSUQpOwogICAgIH0KIAogICAgIC8vIEV2 ZW4gaWYgV2ViUGFnZSBoYXMgdGhlIGRlZmF1bHQgcGFnZVNjYWxlRmFjdG9yIChhbmQgdGhlcmVm b3JlIGRvZXNuJ3QgcmVzZXQgaXQpLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1dlYlBhZ2VQcm94eS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94 eS5oCmluZGV4IDdiNjc1YjgxNDNmNGM3MWMwMDJkOGQzNjFmMjZhYTI5ODgzNzRjOTMuLjg1YjYy MmMxOTcwMDhjNzkxMDQ5ODc5M2Q5YjE5Y2Q2NTU2NTk3NzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvV2ViUGFnZVByb3h5LmgKQEAgLTkzNiw3ICs5MzYsNyBAQCBwcml2YXRlOgogICAgIHZv aWQgZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50 NjRfdCBuYXZpZ2F0aW9uSUQsIGNvbnN0IFN0cmluZyYgdXJsLCBjb25zdCBTdHJpbmcmIHVucmVh Y2hhYmxlVVJMLCBJUEM6Ok1lc3NhZ2VEZWNvZGVyJik7CiAgICAgdm9pZCBkaWRSZWNlaXZlU2Vy dmVyUmVkaXJlY3RGb3JQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1 aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGNvbnN0IFN0cmluZyYsIElQQzo6TWVzc2FnZURlY29kZXIm KTsKICAgICB2b2lkIGRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFt ZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlRXJyb3Im LCBJUEM6Ok1lc3NhZ2VEZWNvZGVyJik7Ci0gICAgdm9pZCBkaWRDb21taXRMb2FkRm9yRnJhbWUo dWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBjb25zdCBTdHJpbmcmIG1p bWVUeXBlLCBib29sIGZyYW1lSGFzQ3VzdG9tQ29udGVudFByb3ZpZGVyLCB1aW50MzJfdCBmcmFt ZUxvYWRUeXBlLCBjb25zdCBXZWJDb3JlOjpDZXJ0aWZpY2F0ZUluZm8mLCBJUEM6Ok1lc3NhZ2VE ZWNvZGVyJik7CisgICAgdm9pZCBkaWRDb21taXRMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJ RCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBib29sIGZy YW1lSGFzQ3VzdG9tQ29udGVudFByb3ZpZGVyLCB1aW50MzJfdCBmcmFtZUxvYWRUeXBlLCBjb25z dCBXZWJDb3JlOjpDZXJ0aWZpY2F0ZUluZm8mLCB1aW50NjRfdCBuZXh0RHJhd2luZ1RyYW5zYWN0 aW9uSUQsIElQQzo6TWVzc2FnZURlY29kZXImKTsKICAgICB2b2lkIGRpZEZpbmlzaERvY3VtZW50 TG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgSVBD OjpNZXNzYWdlRGVjb2RlciYpOwogICAgIHZvaWQgZGlkRmluaXNoTG9hZEZvckZyYW1lKHVpbnQ2 NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgSVBDOjpNZXNzYWdlRGVjb2RlciYp OwogICAgIHZvaWQgZGlkRmFpbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRf dCBuYXZpZ2F0aW9uSUQsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlRXJyb3ImLCBJUEM6Ok1lc3Nh Z2VEZWNvZGVyJik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFn ZVByb3h5Lm1lc3NhZ2VzLmluIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94 eS5tZXNzYWdlcy5pbgppbmRleCBmNTI2ZjBhYmU0NmNhNDc1NjVhZDczZTY0ODk4MTk4ZmI2MDVi OWI4Li4yZDAxNWM5MzllMWEyNTRkMmFkOTcwZTZjZmZmODQwYWU4ODk0ZmNmIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluCisrKyBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW4KQEAgLTEy Nyw3ICsxMjcsNyBAQCBtZXNzYWdlcyAtPiBXZWJQYWdlUHJveHkgewogICAgIERpZFN0YXJ0UHJv dmlzaW9uYWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlv bklELCBTdHJpbmcgdXJsLCBTdHJpbmcgdW5yZWFjaGFibGVVUkwsIFdlYktpdDo6SW5qZWN0ZWRC dW5kbGVVc2VyTWVzc2FnZUVuY29kZXIgdXNlckRhdGEpIFZhcmlhZGljCiAgICAgRGlkUmVjZWl2 ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJ RCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBTdHJpbmcgdXJsLCBXZWJLaXQ6OkluamVjdGVkQnVu ZGxlVXNlck1lc3NhZ2VFbmNvZGVyIHVzZXJEYXRhKSBWYXJpYWRpYwogICAgIERpZEZhaWxQcm92 aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9u SUQsIFdlYkNvcmU6OlJlc291cmNlRXJyb3IgZXJyb3IsIFdlYktpdDo6SW5qZWN0ZWRCdW5kbGVV c2VyTWVzc2FnZUVuY29kZXIgdXNlckRhdGEpIFZhcmlhZGljCi0gICAgRGlkQ29tbWl0TG9hZEZv ckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgU3RyaW5nIG1p bWVUeXBlLCBib29sIGhhc0N1c3RvbUNvbnRlbnRQcm92aWRlciwgdWludDMyX3QgbG9hZFR5cGUs IFdlYkNvcmU6OkNlcnRpZmljYXRlSW5mbyBjZXJ0aWZpY2F0ZUluZm8sIFdlYktpdDo6SW5qZWN0 ZWRCdW5kbGVVc2VyTWVzc2FnZUVuY29kZXIgdXNlckRhdGEpIFZhcmlhZGljCisgICAgRGlkQ29t bWl0TG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwg U3RyaW5nIG1pbWVUeXBlLCBib29sIGhhc0N1c3RvbUNvbnRlbnRQcm92aWRlciwgdWludDMyX3Qg bG9hZFR5cGUsIFdlYkNvcmU6OkNlcnRpZmljYXRlSW5mbyBjZXJ0aWZpY2F0ZUluZm8sIHVpbnQ2 NF90IG5leHREcmF3aW5nVHJhbnNhY3Rpb25JRCwgIFdlYktpdDo6SW5qZWN0ZWRCdW5kbGVVc2Vy TWVzc2FnZUVuY29kZXIgdXNlckRhdGEpIFZhcmlhZGljCiAgICAgRGlkRmFpbExvYWRGb3JGcmFt ZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIFdlYkNvcmU6OlJlc291 cmNlRXJyb3IgZXJyb3IsIFdlYktpdDo6SW5qZWN0ZWRCdW5kbGVVc2VyTWVzc2FnZUVuY29kZXIg dXNlckRhdGEpIFZhcmlhZGljCiAgICAgRGlkRmluaXNoRG9jdW1lbnRMb2FkRm9yRnJhbWUodWlu dDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBXZWJLaXQ6OkluamVjdGVkQnVu ZGxlVXNlck1lc3NhZ2VFbmNvZGVyIHVzZXJEYXRhKSBWYXJpYWRpYwogICAgIERpZEZpbmlzaExv YWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIFdlYktp dDo6SW5qZWN0ZWRCdW5kbGVVc2VyTWVzc2FnZUVuY29kZXIgdXNlckRhdGEpIFZhcmlhZGljCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1BhZ2VDbGllbnRJbXBsSU9T LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1BhZ2VDbGllbnRJbXBsSU9TLmgKaW5k ZXggNzhhMzg3NzMwYTZmZDExMjc2ODAwMDM5NDRlMDQ3NTVmMzc1ZjRmMi4uMDJlOTk5NjdhN2E5 NmU3NGJjODNmNjIyYjAyOTZlMGFhMDQ2MTYxMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL2lvcy9QYWdlQ2xpZW50SW1wbElPUy5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9pb3MvUGFnZUNsaWVudEltcGxJT1MuaApAQCAtNjcsNyArNjcsNyBAQCBwcml2YXRl OgogICAgIHZpcnR1YWwgdm9pZCBwcmVmZXJlbmNlc0RpZENoYW5nZSgpIG92ZXJyaWRlOwogICAg IHZpcnR1YWwgdm9pZCB0b29sVGlwQ2hhbmdlZChjb25zdCBTdHJpbmcmLCBjb25zdCBTdHJpbmcm KSBvdmVycmlkZTsKICAgICB2aXJ0dWFsIGJvb2wgZGVjaWRlUG9saWN5Rm9yR2VvbG9jYXRpb25Q ZXJtaXNzaW9uUmVxdWVzdChXZWJGcmFtZVByb3h5JiwgV2ViU2VjdXJpdHlPcmlnaW4mLCBHZW9s b2NhdGlvblBlcm1pc3Npb25SZXF1ZXN0UHJveHkmKSBvdmVycmlkZTsKLSAgICB2aXJ0dWFsIHZv aWQgZGlkQ29tbWl0TG9hZEZvck1haW5GcmFtZShjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBib29s IHVzZUN1c3RvbUNvbnRlbnRQcm92aWRlcikgb3ZlcnJpZGU7CisgICAgdmlydHVhbCB2b2lkIGRp ZENvbW1pdExvYWRGb3JNYWluRnJhbWUoY29uc3QgU3RyaW5nJiBtaW1lVHlwZSwgYm9vbCB1c2VD dXN0b21Db250ZW50UHJvdmlkZXIsIHVpbnQ2NF90IG5leHREcmF3aW5nVHJhbnNhY3Rpb25JRCkg b3ZlcnJpZGU7CiAgICAgdmlydHVhbCB2b2lkIGhhbmRsZURvd25sb2FkUmVxdWVzdChEb3dubG9h ZFByb3h5Kikgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCB2b2lkIHNldEN1cnNvcihjb25zdCBXZWJD b3JlOjpDdXJzb3ImKSBvdmVycmlkZTsKICAgICB2aXJ0dWFsIHZvaWQgc2V0Q3Vyc29ySGlkZGVu VW50aWxNb3VzZU1vdmVzKGJvb2wpIG92ZXJyaWRlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL2lvcy9QYWdlQ2xpZW50SW1wbElPUy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9pb3MvUGFnZUNsaWVudEltcGxJT1MubW0KaW5kZXggZGRlZjBjY2E3OGRmNTk0ZWE4 ZTcwM2ZjMDUyNDdhZWQ3Y2I1ZjM4Mi4uMWU5YjhkNjdjZTA1NTE0YTgwMTM2YmNkMmNhMjFmMGVl YjFjNjRmMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9QYWdlQ2xp ZW50SW1wbElPUy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1BhZ2VDbGll bnRJbXBsSU9TLm1tCkBAIC0xNzksMTAgKzE3OSwxMSBAQCBib29sIFBhZ2VDbGllbnRJbXBsOjpk ZWNpZGVQb2xpY3lGb3JHZW9sb2NhdGlvblBlcm1pc3Npb25SZXF1ZXN0KFdlYkZyYW1lUHJveHkm CiAgICAgcmV0dXJuIHRydWU7CiB9CiAKLXZvaWQgUGFnZUNsaWVudEltcGw6OmRpZENvbW1pdExv YWRGb3JNYWluRnJhbWUoY29uc3QgU3RyaW5nJiBtaW1lVHlwZSwgYm9vbCB1c2VDdXN0b21Db250 ZW50UHJvdmlkZXIpCit2b2lkIFBhZ2VDbGllbnRJbXBsOjpkaWRDb21taXRMb2FkRm9yTWFpbkZy YW1lKGNvbnN0IFN0cmluZyYgbWltZVR5cGUsIGJvb2wgdXNlQ3VzdG9tQ29udGVudFByb3ZpZGVy LCB1aW50NjRfdCBuZXh0RHJhd2luZ1RyYW5zYWN0aW9uSUQpCiB7CiAgICAgW21fd2ViVmlldyBf c2V0SGFzQ3VzdG9tQ29udGVudFZpZXc6dXNlQ3VzdG9tQ29udGVudFByb3ZpZGVyIGxvYWRlZE1J TUVUeXBlOm1pbWVUeXBlXTsKICAgICBbbV9jb250ZW50VmlldyBfZGlkQ29tbWl0TG9hZEZvck1h aW5GcmFtZV07CisgICAgW21fd2ViVmlldyBfZGlkQ29tbWl0TG9hZEZvck1haW5GcmFtZVdpdGhO ZXh0RHJhd2luZ1RyYW5zYWN0aW9uSUQ6bmV4dERyYXdpbmdUcmFuc2FjdGlvbklEXTsKIH0KIAog dm9pZCBQYWdlQ2xpZW50SW1wbDo6aGFuZGxlRG93bmxvYWRSZXF1ZXN0KERvd25sb2FkUHJveHkq IGRvd25sb2FkKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS0Nv bnRlbnRWaWV3Lm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3 Lm1tCmluZGV4IDM1NTE4MGMyNDc0NTUxYjdlZjZmNGYxZWM0MTRlMjkwNzY4NmNkZDYuLjFkNTk2 ZGJiODZkMGY4Yzk5NDgwZTExZDVkNTYzMWQ1MTM4NjY5ZGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXcubW0KQEAgLTM5MCw3ICszOTAsNiBAQCBwcml2 YXRlOgogLSAodm9pZClfZGlkQ29tbWl0TG9hZEZvck1haW5GcmFtZQogewogICAgIFtzZWxmIF9z dG9wQXNzaXN0aW5nTm9kZV07Ci0gICAgW193ZWJWaWV3IF9kaWRDb21taXRMb2FkRm9yTWFpbkZy YW1lXTsKIH0KIAogLSAodm9pZClfZGlkQ29tbWl0TGF5ZXJUcmVlOihjb25zdCBXZWJLaXQ6OlJl bW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uJilsYXllclRyZWVUcmFuc2FjdGlvbgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9QYWdlQ2xpZW50SW1wbC5oIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL21hYy9QYWdlQ2xpZW50SW1wbC5oCmluZGV4IDBkYWU4N2M0NWRl ZjAxYjYwMzNhNjQyOTZkNDAxZGFkYmQ3ZjI4YmMuLjQ1OTFiYjBiNjExMTIwNmM3N2IyZTA4NjA4 NTI0MDdjYmUzZTczZDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMv UGFnZUNsaWVudEltcGwuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1BhZ2VD bGllbnRJbXBsLmgKQEAgLTgxLDcgKzgxLDcgQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIHZvaWQg ZGlkUmVsYXVuY2hQcm9jZXNzKCk7CiAgICAgdmlydHVhbCB2b2lkIHByZWZlcmVuY2VzRGlkQ2hh bmdlKCkgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCB2b2lkIHRvb2xUaXBDaGFuZ2VkKGNvbnN0IFN0 cmluZyYgb2xkVG9vbFRpcCwgY29uc3QgU3RyaW5nJiBuZXdUb29sVGlwKTsKLSAgICB2aXJ0dWFs IHZvaWQgZGlkQ29tbWl0TG9hZEZvck1haW5GcmFtZShjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBi b29sIHVzZUN1c3RvbUNvbnRlbnRQcm92aWRlcikgb3ZlcnJpZGU7CisgICAgdmlydHVhbCB2b2lk IGRpZENvbW1pdExvYWRGb3JNYWluRnJhbWUoY29uc3QgU3RyaW5nJiBtaW1lVHlwZSwgYm9vbCB1 c2VDdXN0b21Db250ZW50UHJvdmlkZXIsIHVpbnQ2NF90IG5leHREcmF3aW5nVHJhbnNhY3Rpb25J RCkgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCB2b2lkIGRpZEZpbmlzaExvYWRpbmdEYXRhRm9yQ3Vz dG9tQ29udGVudFByb3ZpZGVyKGNvbnN0IFN0cmluZyYgc3VnZ2VzdGVkRmlsZW5hbWUsIGNvbnN0 IElQQzo6RGF0YVJlZmVyZW5jZSYpIG92ZXJyaWRlOwogICAgIHZpcnR1YWwgdm9pZCBoYW5kbGVE b3dubG9hZFJlcXVlc3QoRG93bmxvYWRQcm94eSopIG92ZXJyaWRlOwogICAgIHZpcnR1YWwgdm9p ZCBzZXRDdXJzb3IoY29uc3QgV2ViQ29yZTo6Q3Vyc29yJik7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1BhZ2VDbGllbnRJbXBsLm1tIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL21hYy9QYWdlQ2xpZW50SW1wbC5tbQppbmRleCBhODRmOTRiNGUzMDBiODJlMmJh YjM2YjY4OWEzOGIxNzU0MmViM2E5Li45NTY2MjMyZjEwMDEyNjMyZjQ0NzY4ZjczYTliNTRlYzAz MjQ4YzdkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1BhZ2VDbGll bnRJbXBsLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvUGFnZUNsaWVudElt cGwubW0KQEAgLTI5Nyw3ICsyOTcsNyBAQCB2b2lkIFBhZ2VDbGllbnRJbXBsOjp0b29sVGlwQ2hh bmdlZChjb25zdCBTdHJpbmcmIG9sZFRvb2xUaXAsIGNvbnN0IFN0cmluZyYgbmV3VAogICAgIFtt X3drVmlldyBfdG9vbFRpcENoYW5nZWRGcm9tOm5zU3RyaW5nRnJvbVdlYkNvcmVTdHJpbmcob2xk VG9vbFRpcCkgdG86bnNTdHJpbmdGcm9tV2ViQ29yZVN0cmluZyhuZXdUb29sVGlwKV07CiB9CiAK LXZvaWQgUGFnZUNsaWVudEltcGw6OmRpZENvbW1pdExvYWRGb3JNYWluRnJhbWUoY29uc3QgU3Ry aW5nJiBtaW1lVHlwZSwgYm9vbCB1c2VDdXN0b21Db250ZW50UHJvdmlkZXIpCit2b2lkIFBhZ2VD bGllbnRJbXBsOjpkaWRDb21taXRMb2FkRm9yTWFpbkZyYW1lKGNvbnN0IFN0cmluZyYgbWltZVR5 cGUsIGJvb2wgdXNlQ3VzdG9tQ29udGVudFByb3ZpZGVyLCB1aW50NjRfdCkKIHsKIH0KIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFt ZUxvYWRlckNsaWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBw b3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcAppbmRleCA3ZmU0OWRjNDQ5ODcwZWRhZWI5Nzgy NzY5NDgwN2I4ZDI0YTQ1ZTQ4Li5iNmJmZjdmZmM0ODc2Nzk2NWVjZTRiODM2YTA1ZTZiMGZhYmI2 NjI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0 L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcApAQCAtNDQ3LDcgKzQ0Nyw4 IEBAIHZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlkQ29tbWl0TG9hZCgpCiAK ICAgICAvLyBOb3RpZnkgdGhlIFVJUHJvY2Vzcy4KIAotICAgIHdlYlBhZ2UtPnNlbmQoTWVzc2Fn ZXM6OldlYlBhZ2VQcm94eTo6RGlkQ29tbWl0TG9hZEZvckZyYW1lKG1fZnJhbWUtPmZyYW1lSUQo KSwgZG9jdW1lbnRMb2FkZXIubmF2aWdhdGlvbklEKCksIGRvY3VtZW50TG9hZGVyLnJlc3BvbnNl KCkubWltZVR5cGUoKSwgbV9mcmFtZUhhc0N1c3RvbUNvbnRlbnRQcm92aWRlciwgbV9mcmFtZS0+ Y29yZUZyYW1lKCktPmxvYWRlcigpLmxvYWRUeXBlKCksIENlcnRpZmljYXRlSW5mbyhkb2N1bWVu dExvYWRlci5yZXNwb25zZSgpKSwgSW5qZWN0ZWRCdW5kbGVVc2VyTWVzc2FnZUVuY29kZXIodXNl ckRhdGEuZ2V0KCkpKSk7CisgICAgdWludDY0X3QgbmV4dERyYXdpbmdUcmFuc2FjdGlvbklEID0g d2ViUGFnZS0+ZHJhd2luZ0FyZWEoKS0+bmV4dFRyYW5zYWN0aW9uSUQoKTsKKyAgICB3ZWJQYWdl LT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZENvbW1pdExvYWRGb3JGcmFtZShtX2Zy YW1lLT5mcmFtZUlEKCksIGRvY3VtZW50TG9hZGVyLm5hdmlnYXRpb25JRCgpLCBkb2N1bWVudExv YWRlci5yZXNwb25zZSgpLm1pbWVUeXBlKCksIG1fZnJhbWVIYXNDdXN0b21Db250ZW50UHJvdmlk ZXIsIG1fZnJhbWUtPmNvcmVGcmFtZSgpLT5sb2FkZXIoKS5sb2FkVHlwZSgpLCBDZXJ0aWZpY2F0 ZUluZm8oZG9jdW1lbnRMb2FkZXIucmVzcG9uc2UoKSksIG5leHREcmF3aW5nVHJhbnNhY3Rpb25J RCwgSW5qZWN0ZWRCdW5kbGVVc2VyTWVzc2FnZUVuY29kZXIodXNlckRhdGEuZ2V0KCkpKSk7CiAg ICAgd2ViUGFnZS0+ZGlkQ29tbWl0TG9hZChtX2ZyYW1lKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhLmggYi9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRHJhd2luZ0FyZWEuaAppbmRleCA4ZDBkZDEzN2VmM2Nl NGI2YTdhYjBmMWJlMGFjZTM5MWMxMTVkZWQ0Li5jMDAwOWNlOWMyZjk3ZmYzNDZjYWRjN2IxNGUx Mzg1OGE3ZjEyZjMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvRHJhd2luZ0FyZWEuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2Uv RHJhd2luZ0FyZWEuaApAQCAtMTE3LDYgKzExNyw4IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZv aWQgdmlld1N0YXRlRGlkQ2hhbmdlKFdlYkNvcmU6OlZpZXdTdGF0ZTo6RmxhZ3MpIHsgfQogICAg IHZpcnR1YWwgdm9pZCBzZXRMYXllckhvc3RpbmdNb2RlKExheWVySG9zdGluZ01vZGUpIHsgfQog CisgICAgdmlydHVhbCB1aW50NjRfdCBuZXh0VHJhbnNhY3Rpb25JRCgpIGNvbnN0IHsgcmV0dXJu IDA7IH0KKwogcHJvdGVjdGVkOgogICAgIERyYXdpbmdBcmVhKERyYXdpbmdBcmVhVHlwZSwgV2Vi UGFnZSopOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2Uv bWFjL1JlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhLmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL1dlYlBhZ2UvbWFjL1JlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhLmgKaW5kZXggMjA2OTc5 N2E1NzFkNTNiYTBhYTUyMjQ2OTdjN2QyMzgzYmVhNzc5NC4uYmVlZTAxZTQ4MmM0OWQ5NmEzZTFk Y2YwYTc1MjE2OWJmODM3MTY5MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJQYWdlL21hYy9SZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYS5oCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWEu aApAQCAtMTA4LDYgKzEwOCw3IEBAIHByaXZhdGU6CiAgICAgV2ViQ29yZTo6VGlsZWRCYWNraW5n KiBtYWluRnJhbWVUaWxlZEJhY2tpbmcoKSBjb25zdDsKIAogICAgIHVpbnQ2NF90IHRha2VOZXh0 VHJhbnNhY3Rpb25JRCgpIHsgcmV0dXJuICsrbV9jdXJyZW50VHJhbnNhY3Rpb25JRDsgfQorICAg IHZpcnR1YWwgdWludDY0X3QgbmV4dFRyYW5zYWN0aW9uSUQoKSBjb25zdCBvdmVycmlkZTsKIAog ICAgIGNsYXNzIEJhY2tpbmdTdG9yZUZsdXNoZXIgOiBwdWJsaWMgVGhyZWFkU2FmZVJlZkNvdW50 ZWQ8QmFja2luZ1N0b3JlRmx1c2hlcj4gewogICAgIHB1YmxpYzoKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0Fy ZWEubW0gYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1JlbW90ZUxheWVy VHJlZURyYXdpbmdBcmVhLm1tCmluZGV4IGRlNDUzZmQyYTg1ZTFkMGNlODZmNWRkNWFmY2I2YTJm N2UxZjdhZTQuLjc5ZmU2MzE1NmMwYjg5NDA2M2YyM2EwZWI1ZmJjN2E3ZTQ2MTM0ZmQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvUmVtb3RlTGF5ZXJU cmVlRHJhd2luZ0FyZWEubW0KKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdl L21hYy9SZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYS5tbQpAQCAtMjMzLDYgKzIzMywxMSBAQCBU aWxlZEJhY2tpbmcqIFJlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhOjptYWluRnJhbWVUaWxlZEJh Y2tpbmcoKSBjb25zdAogICAgIHJldHVybiBmcmFtZVZpZXcgPyBmcmFtZVZpZXctPnRpbGVkQmFj a2luZygpIDogMDsKIH0KIAordWludDY0X3QgUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWE6Om5l eHRUcmFuc2FjdGlvbklEKCkgY29uc3QKK3sKKyAgICByZXR1cm4gbV9jdXJyZW50VHJhbnNhY3Rp b25JRCArIDE7Cit9CisKIHZvaWQgUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWE6OnNjaGVkdWxl Q29tcG9zaXRpbmdMYXllckZsdXNoKCkKIHsKICAgICBpZiAobV9sYXllckZsdXNoVGltZXIuaXNB Y3RpdmUoKSkK 233284 2014-06-17 21:39:18 -0700 2014-06-17 21:46:42 -0700 Patch bug-134009-20140617213823.patch text/plain 9447 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogMTcwMDM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZTkzMjFkMWY5NGQxMDE5 NjRmNTViYjc1YWI0NmJhYzUyNzU5ZmM1Yi4uMjljNWFkNTVlNzYxMjA5Yjc5ZjgxNzg5ZGI1NmFh Zjg3YzAxNTU5MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDE0LTA2LTE3ICBCZW5q YW1pbiBQb3VsYWluICA8YnBvdWxhaW5AYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdW1dLMl0g UmUtc3luYyBkaWRDb21taXRMb2FkRm9yTWFpbkZyYW1lIHdpdGggaXRzIGNvcnJlc3BvbmRpbmcg dGlsZSB1cGRhdGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTEzNDAwOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFdLV2ViVmlldyBhc3N1bWVkICB0aGUgZmlyc3QgX2RpZENvbW1pdExheWVyVHJlZTogYWZ0 ZXIgX2RpZENvbW1pdExvYWRGb3JNYWluRnJhbWUKKyAgICAgICAgaGFkIHRoZSBzdGF0ZSBvZiB0 aGUgcGFnZSBiZWluZyBsb2FkZWQuCisKKyAgICAgICAgVGhpcyBpcyBub3QgYWx3YXlzIHRydWUu IFNvbWV0aW1lcywgYSBzZXQgb2YgdGlsZSBjYW4gYmUgcmVuZGVyZWQgaW4gdGhlIENvcmVBbmlt YXRpb24gdGhyZWFkCisgICAgICAgIHdoaWxlIHRoZSBuZXh0IHBhZ2UgaXMgbG9hZGVkLiBXaGVu IHRoZSB0aWxlcyBhcmUgc3VibWl0dGVkIHRvIHRoZSBVSVByb2Nlc3MsIGl0IGlzIHN0aWxsCisg ICAgICAgIHNob3dpbmcgdGhlIHByZXZpb3VzIHBhZ2UgYW5kIHdlIGNhbm5vdCByZXNldCB0aGUg dmlldyBzdGF0ZXMgeWV0LgorCisgICAgICAgIFRpbSBpbnRyb2R1Y2VkIGEgdHJhbnNhY3Rpb25J RCB3aXRoIGVhY2ggbGF5ZXIgdHJlZSB1cGRhdGUuIFRoaXMgcGF0Y2ggdXNlcyB0aGF0IHRvIHN5 bmNocm9uaXplCisgICAgICAgIFdLV2ViVmlldyB3aXRoIHRoZSByaWdodCBzZXQgb2YgdGlsZXMu CisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbToKKyAgICAgICAg KC1bV0tXZWJWaWV3IF9kaWRDb21taXRMb2FkRm9yTWFpbkZyYW1lXSk6CisgICAgICAgICgtW1dL V2ViVmlldyBfZGlkQ29tbWl0TGF5ZXJUcmVlOldlYktpdDo6XSk6CisgICAgICAgICgtW1dLV2Vi VmlldyBfdXBkYXRlVmlzaWJsZUNvbnRlbnRSZWN0c10pOgorICAgICAgICAqIFVJUHJvY2Vzcy9X ZWJQYWdlUHJveHkuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1JlbW90ZUxheWVyVHJlZURy YXdpbmdBcmVhUHJveHkuaDoKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlTGF5ZXJUcmVlRHJhd2lu Z0FyZWFQcm94eTo6bmV4dExheWVyVHJlZUlkVHJhbnNhY3Rpb25JRCk6CisgICAgICAgICogVUlQ cm9jZXNzL21hYy9SZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYVByb3h5Lm1lc3NhZ2VzLmluOgor ICAgICAgICAqIFVJUHJvY2Vzcy9tYWMvUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94eS5t bToKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94eTo6UmVt b3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94eSk6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZUxh eWVyVHJlZURyYXdpbmdBcmVhUHJveHk6OndpbGxDb21taXRMYXllclRyZWUpOgorICAgICAgICAq IFdlYlByb2Nlc3MvV2ViUGFnZS9tYWMvUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWEubW06Cisg ICAgICAgIChXZWJLaXQ6OlJlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhOjpmbHVzaExheWVycyk6 CisKIDIwMTQtMDYtMTYgIEphZWh1biBMaW0gIDxsamFlaHVuLmxpbUBzYW1zdW5nLmNvbT4KIAog ICAgICAgICBVbnJldmlld2VkIGJ1aWxkIGZpeCBhZnRlciByMTcwMDI5CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbSBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCmluZGV4IGU1YjkxYjJmM2Vh OTY2ZWNjZmEyMjRlYWM3MDhlNjI1MDg3Mzc1MzIuLmExMWFmYWUxNDE5ZjgzZDMyMzg2NDQ3ZWU5 MTkwMmY1N2E2ZGFhZDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv Q29jb2EvV0tXZWJWaWV3Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29j b2EvV0tXZWJWaWV3Lm1tCkBAIC03OSw2ICs3OSw3IEBACiAjaW1wb3J0ICJfV0tXZWJWaWV3UHJp bnRGb3JtYXR0ZXIuaCIKICNpbXBvcnQgIlByaW50SW5mby5oIgogI2ltcG9ydCAiUHJvY2Vzc1Ro cm90dGxlci5oIgorI2ltcG9ydCAiUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94eS5oIgog I2ltcG9ydCAiV0tQREZWaWV3LmgiCiAjaW1wb3J0ICJXS1Njcm9sbFZpZXcuaCIKICNpbXBvcnQg IldLV2ViVmlld0NvbnRlbnRQcm92aWRlclJlZ2lzdHJ5LmgiCkBAIC0xNjEsNiArMTYyLDcgQEAg V0tXZWJWaWV3KiBmcm9tV2ViUGFnZVByb3h5KFdlYktpdDo6V2ViUGFnZVByb3h5JiBwYWdlKQog ICAgIEJPT0wgX292ZXJyaWRlc0ludGVyZmFjZU9yaWVudGF0aW9uOwogCiAgICAgQk9PTCBfbmVl ZHNSZXNldFZpZXdTdGF0ZUFmdGVyQ29tbWl0TG9hZEZvck1haW5GcmFtZTsKKyAgICB1aW50NjRf dCBfZmlyc3RQYWludEFmdGVyQ29tbWl0TG9hZFRyYW5zYWN0aW9uSUQ7CiAgICAgQk9PTCBfaXNB bmltYXRpbmdSZXNpemU7CiAgICAgQ0FUcmFuc2Zvcm0zRCBfcmVzaXplQW5pbWF0aW9uVHJhbnNm b3JtQWRqdXN0bWVudHM7CiAgICAgUmV0YWluUHRyPFVJVmlldz4gX3Jlc2l6ZUFuaW1hdGlvblZp ZXc7CkBAIC03MDMsNiArNzA1LDggQEAgc3RhdGljIENHRmxvYXQgY29udGVudFpvb21TY2FsZShX S1dlYlZpZXcqIHdlYlZpZXcpCiAKIC0gKHZvaWQpX2RpZENvbW1pdExvYWRGb3JNYWluRnJhbWUK IHsKKyAgICBfZmlyc3RQYWludEFmdGVyQ29tbWl0TG9hZFRyYW5zYWN0aW9uSUQgPSBzdGF0aWNf Y2FzdDxXZWJLaXQ6OlJlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhUHJveHkqPihfcGFnZS0+ZHJh d2luZ0FyZWEoKSktPm5leHRMYXllclRyZWVJZFRyYW5zYWN0aW9uSUQoKTsKKwogICAgIF9uZWVk c1Jlc2V0Vmlld1N0YXRlQWZ0ZXJDb21taXRMb2FkRm9yTWFpbkZyYW1lID0gWUVTOwogICAgIF91 c2VzTWluaW1hbFVJID0gTk87CiB9CkBAIC03MzcsOSArNzQxLDEwIEBAIHN0YXRpYyBDR0Zsb2F0 IGNvbnRlbnRab29tU2NhbGUoV0tXZWJWaWV3KiB3ZWJWaWV3KQogICAgICAgICAgICAgW3N0YXRp Y19jYXN0PGlkIDxXS1VJRGVsZWdhdGVQcml2YXRlPj4oZGVsZWdhdGUuZ2V0KCkpIF93ZWJWaWV3 OnNlbGYgdXNlc01pbmltYWxVSTpfdXNlc01pbmltYWxVSV07CiAgICAgfQogCi0gICAgaWYgKF9u ZWVkc1Jlc2V0Vmlld1N0YXRlQWZ0ZXJDb21taXRMb2FkRm9yTWFpbkZyYW1lKSB7CisgICAgaWYg KF9uZWVkc1Jlc2V0Vmlld1N0YXRlQWZ0ZXJDb21taXRMb2FkRm9yTWFpbkZyYW1lICYmIGxheWVy VHJlZVRyYW5zYWN0aW9uLnRyYW5zYWN0aW9uSUQoKSA+PSBfZmlyc3RQYWludEFmdGVyQ29tbWl0 TG9hZFRyYW5zYWN0aW9uSUQpIHsKICAgICAgICAgX25lZWRzUmVzZXRWaWV3U3RhdGVBZnRlckNv bW1pdExvYWRGb3JNYWluRnJhbWUgPSBOTzsKICAgICAgICAgW19zY3JvbGxWaWV3IHNldENvbnRl bnRPZmZzZXQ6Q0dQb2ludE1ha2UoLV9vYnNjdXJlZEluc2V0cy5sZWZ0LCAtX29ic2N1cmVkSW5z ZXRzLnRvcCldOworICAgICAgICBbc2VsZiBfdXBkYXRlVmlzaWJsZUNvbnRlbnRSZWN0c107CiAg ICAgfQogfQogCkBAIC0xMTc5LDYgKzExODQsOSBAQCBzdGF0aWMgV2ViQ29yZTo6RmxvYXRQb2lu dCBjb25zdHJhaW5Db250ZW50T2Zmc2V0KFdlYkNvcmU6OkZsb2F0UG9pbnQgY29udGVudE9mZgog ICAgIGlmIChfaXNBbmltYXRpbmdSZXNpemUpCiAgICAgICAgIHJldHVybjsKIAorICAgIGlmIChf bmVlZHNSZXNldFZpZXdTdGF0ZUFmdGVyQ29tbWl0TG9hZEZvck1haW5GcmFtZSkKKyAgICAgICAg cmV0dXJuOworCiAgICAgQ0dSZWN0IGZ1bGxWaWV3UmVjdCA9IHNlbGYuYm91bmRzOwogICAgIENH UmVjdCB2aXNpYmxlUmVjdEluQ29udGVudENvb3JkaW5hdGVzID0gW3NlbGYgY29udmVydFJlY3Q6 ZnVsbFZpZXdSZWN0IHRvVmlldzpfY29udGVudFZpZXcuZ2V0KCldOwogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKaW5kZXggN2I2NzViODE0M2Y0YzcxYzAwMmQ4ZDM2MWYy NmFhMjk4ODM3NGM5My4uYmZmOTQ5MjhkZGZmYzBiNWQ1OTEyNWZkMTE5Nzg4OTYyM2RmNDU1OCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCisrKyBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaApAQCAtMzk1LDYgKzM5NSw3 IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldE1heGltdW1Vbm9ic2N1cmVkU2l6ZShjb25zdCBXZWJD b3JlOjpGbG9hdFNpemUmKTsKICAgICB2b2lkIHNldERldmljZU9yaWVudGF0aW9uKGludDMyX3Qp OwogICAgIGludDMyX3QgZGV2aWNlT3JpZW50YXRpb24oKSBjb25zdCB7IHJldHVybiBtX2Rldmlj ZU9yaWVudGF0aW9uOyB9CisgICAgdm9pZCB3aWxsQ29tbWl0TGF5ZXJUcmVlKHVpbnQ2NF90IHRy YW5zYWN0aW9uSUQpOwogICAgIHZvaWQgZGlkQ29tbWl0TGF5ZXJUcmVlKGNvbnN0IFdlYktpdDo6 UmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb24mKTsKIAogICAgIHZvaWQgc2VsZWN0V2l0aEdlc3R1 cmUoY29uc3QgV2ViQ29yZTo6SW50UG9pbnQsIFdlYkNvcmU6OlRleHRHcmFudWxhcml0eSwgdWlu dDMyX3QgZ2VzdHVyZVR5cGUsIHVpbnQzMl90IGdlc3R1cmVTdGF0ZSwgc3RkOjpmdW5jdGlvbjx2 b2lkIChjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYsIHVpbnQzMl90LCB1aW50MzJfdCwgdWludDMy X3QsIENhbGxiYWNrQmFzZTo6RXJyb3IpPik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvbWFjL1JlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhUHJveHkuaCBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9tYWMvUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94eS5oCmlu ZGV4IDJmMmY4N2VlZjhkYmRlM2UxYWY2NjgzMjM5ZTkyMTNlZWZhYjczNGYuLjZiNzU2MTM0MzJi YTRhNTE3YTE1MTNmY2E3NDYyZjQxZDFhMjJmMzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9tYWMvUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94eS5oCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94 eS5oCkBAIC00OSw2ICs0OSw4IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgY29yZUFuaW1hdGlvbkRp ZENvbW1pdExheWVycygpOwogCisgICAgdWludDY0X3QgbmV4dExheWVyVHJlZUlkVHJhbnNhY3Rp b25JRCgpIGNvbnN0IHsgcmV0dXJuIG1fbGFzdFdpbGxDb21taXRMYXllclRyZWVUcmFuc2FjdGlv bklEICsgMTsgfQorCiBwcml2YXRlOgogICAgIHZpcnR1YWwgdm9pZCBzaXplRGlkQ2hhbmdlKCkg b3ZlcnJpZGU7CiAgICAgdmlydHVhbCB2b2lkIGRldmljZVNjYWxlRmFjdG9yRGlkQ2hhbmdlKCkg b3ZlcnJpZGU7CkBAIC03Miw2ICs3NCw3IEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCB2b2lkIGRp ZFJlY2VpdmVNZXNzYWdlKElQQzo6Q29ubmVjdGlvbiosIElQQzo6TWVzc2FnZURlY29kZXImKSBv dmVycmlkZTsKIAogICAgIC8vIE1lc3NhZ2UgaGFuZGxlcnMKKyAgICB2b2lkIHdpbGxDb21taXRM YXllclRyZWUodWludDY0X3QgdHJhbnNhY3Rpb25JRCk7CiAgICAgdm9pZCBjb21taXRMYXllclRy ZWUoY29uc3QgUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb24mLCBjb25zdCBSZW1vdGVTY3JvbGxp bmdDb29yZGluYXRvclRyYW5zYWN0aW9uJik7CiAgICAgCiAgICAgdm9pZCBzZW5kVXBkYXRlR2Vv bWV0cnkoKTsKQEAgLTkwLDYgKzkzLDcgQEAgcHJpdmF0ZToKIAogICAgIHN0ZDo6dW5pcXVlX3B0 cjxXZWJDb3JlOjpSdW5Mb29wT2JzZXJ2ZXI+IG1fbGF5ZXJDb21taXRPYnNlcnZlcjsKIAorICAg IHVpbnQ2NF90IG1fbGFzdFdpbGxDb21taXRMYXllclRyZWVUcmFuc2FjdGlvbklEOwogICAgIHVp bnQ2NF90IG1fbGFzdFZpc2libGVUcmFuc2FjdGlvbklEOwogICAgIHVpbnQ2NF90IG1fdHJhbnNh Y3Rpb25JREZvclBlbmRpbmdDQUNvbW1pdDsKIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvbWFjL1JlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhUHJveHkubWVzc2FnZXMu aW4gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1JlbW90ZUxheWVyVHJlZURyYXdpbmdB cmVhUHJveHkubWVzc2FnZXMuaW4KaW5kZXggODVlZGY5NTkwMDk5MWRhY2ZjYjExOWZiN2IwNzlh YjhjM2IzN2I1Ni4uZGY2ZjVhYTkwOTM5Njk5YjA0NDMwMjFmYjg0Y2E2NTI2NDdhNjhjZiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9SZW1vdGVMYXllclRyZWVEcmF3 aW5nQXJlYVByb3h5Lm1lc3NhZ2VzLmluCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9t YWMvUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94eS5tZXNzYWdlcy5pbgpAQCAtMjEsNSAr MjEsNiBAQAogIyBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJ QklMSVRZIE9GIFNVQ0ggREFNQUdFLgogCiBtZXNzYWdlcyAtPiBSZW1vdGVMYXllclRyZWVEcmF3 aW5nQXJlYVByb3h5IDogRHJhd2luZ0FyZWFQcm94eSB7CisgICAgdm9pZCBXaWxsQ29tbWl0TGF5 ZXJUcmVlKHVpbnQ2NF90IHRyYW5zYWN0aW9uSUQpCiAgICAgdm9pZCBDb21taXRMYXllclRyZWUo V2ViS2l0OjpSZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbiBsYXllclRyZWVUcmFuc2FjdGlvbiwg V2ViS2l0OjpSZW1vdGVTY3JvbGxpbmdDb29yZGluYXRvclRyYW5zYWN0aW9uIHNjcm9sbGluZ1Ry ZWVUcmFuc2FjdGlvbikKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9t YWMvUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94eS5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9tYWMvUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94eS5tbQppbmRleCBiMzk0 YzI4ODc0ZDRhNTRhN2Y3ZDE2MTIxNThjZjRlOWM2MzRmYTU1Li5kYjUxNjQzOGY0NWIzMTczZGE0 NDZmNDBkNDA3YTQ2ZDk0NjkwNWU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvbWFjL1JlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhUHJveHkubW0KKysrIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL21hYy9SZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYVByb3h5Lm1tCkBA IC00Nyw2ICs0Nyw3IEBAIFJlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhUHJveHk6OlJlbW90ZUxh eWVyVHJlZURyYXdpbmdBcmVhUHJveHkoV2ViUGFnZVByb3h5KiB3CiAgICAgOiBEcmF3aW5nQXJl YVByb3h5KERyYXdpbmdBcmVhVHlwZVJlbW90ZUxheWVyVHJlZSwgd2ViUGFnZVByb3h5KQogICAg ICwgbV9yZW1vdGVMYXllclRyZWVIb3N0KCp0aGlzKQogICAgICwgbV9pc1dhaXRpbmdGb3JEaWRV cGRhdGVHZW9tZXRyeShmYWxzZSkKKyAgICAsIG1fbGFzdFdpbGxDb21taXRMYXllclRyZWVUcmFu c2FjdGlvbklEKDApCiAgICAgLCBtX2xhc3RWaXNpYmxlVHJhbnNhY3Rpb25JRCgwKQogewogI2lm IFVTRShJT1NVUkZBQ0UpCkBAIC0xMTUsNiArMTE2LDExIEBAIHZvaWQgUmVtb3RlTGF5ZXJUcmVl RHJhd2luZ0FyZWFQcm94eTo6c2VuZFVwZGF0ZUdlb21ldHJ5KCkKICAgICBtX2lzV2FpdGluZ0Zv ckRpZFVwZGF0ZUdlb21ldHJ5ID0gdHJ1ZTsKIH0KIAordm9pZCBSZW1vdGVMYXllclRyZWVEcmF3 aW5nQXJlYVByb3h5Ojp3aWxsQ29tbWl0TGF5ZXJUcmVlKHVpbnQ2NF90IHRyYW5zYWN0aW9uSUQp Cit7CisgICAgbV9sYXN0V2lsbENvbW1pdExheWVyVHJlZVRyYW5zYWN0aW9uSUQgPSB0cmFuc2Fj dGlvbklEOworfQorCiB2b2lkIFJlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhUHJveHk6OmNvbW1p dExheWVyVHJlZShjb25zdCBSZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbiYgbGF5ZXJUcmVlVHJh bnNhY3Rpb24sIGNvbnN0IFJlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yVHJhbnNhY3Rpb24mIHNj cm9sbGluZ1RyZWVUcmFuc2FjdGlvbikKIHsKICAgICBMT0coUmVtb3RlTGF5ZXJUcmVlLCAiJXMi LCBsYXllclRyZWVUcmFuc2FjdGlvbi5kZXNjcmlwdGlvbigpLmRhdGEoKSk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1JlbW90ZUxheWVyVHJlZURy YXdpbmdBcmVhLm1tIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9SZW1v dGVMYXllclRyZWVEcmF3aW5nQXJlYS5tbQppbmRleCBkZTQ1M2ZkMmE4NWUxZDBjZTg2ZjVkZDVh ZmNiNmEyZjdlMWY3YWU0Li41NzYwN2NiYjMyMjVjYzEwOTM4NTcwNTY2YzVlMDhmNmM1ZmZkMGY3 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1JlbW90 ZUxheWVyVHJlZURyYXdpbmdBcmVhLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViUGFnZS9tYWMvUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWEubW0KQEAgLTI4OSw2ICsyODks OCBAQCB2b2lkIFJlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhOjpmbHVzaExheWVycygpCiAKICAg ICBtX3dhaXRpbmdGb3JCYWNraW5nU3RvcmVTd2FwID0gdHJ1ZTsKIAorICAgIG1fd2ViUGFnZS0+ c2VuZChNZXNzYWdlczo6UmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94eTo6V2lsbENvbW1p dExheWVyVHJlZShsYXllclRyYW5zYWN0aW9uLnRyYW5zYWN0aW9uSUQoKSkpOworCiAgICAgTWVz c2FnZXM6OlJlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhUHJveHk6OkNvbW1pdExheWVyVHJlZSBt ZXNzYWdlKGxheWVyVHJhbnNhY3Rpb24sIHNjcm9sbGluZ1RyYW5zYWN0aW9uKTsKICAgICBhdXRv IGNvbW1pdEVuY29kZXIgPSBzdGQ6Om1ha2VfdW5pcXVlPElQQzo6TWVzc2FnZUVuY29kZXI+KE1l c3NhZ2VzOjpSZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYVByb3h5OjpDb21taXRMYXllclRyZWU6 OnJlY2VpdmVyTmFtZSgpLCBNZXNzYWdlczo6UmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94 eTo6Q29tbWl0TGF5ZXJUcmVlOjpuYW1lKCksIG1fd2ViUGFnZS0+cGFnZUlEKCkpOwogICAgIGNv bW1pdEVuY29kZXItPmVuY29kZShtZXNzYWdlLmFyZ3VtZW50cygpKTsK