84522 2012-04-20 22:59:10 -0700 Page::setDefersLoading() should have a call count 2012-05-02 19:55:54 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jhoneycutt jhoneycutt aestes webkit.review.bot oldest_to_newest 607150 0 jhoneycutt 2012-04-20 22:59:10 -0700 Page::setDefersLoading() should have a call count so that making several calls to defer loading must be balanced by an equal number of calls to resume loading. 607152 1 138221 jhoneycutt 2012-04-20 23:19:08 -0700 Created attachment 138221 Patch 607155 2 webkit.review.bot 2012-04-20 23:20:53 -0700 Attachment 138221 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebCore/page/Page.cpp:576: An else if statement should be written as an if statement when the prior "if" concludes with a return, break, continue or goto statement. [readability/control_flow] [4] Total errors found: 1 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 612995 3 138221 aestes 2012-04-30 15:06:58 -0700 Comment on attachment 138221 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=138221&action=review As we discussed on IRC, as it stands this'll cause issues with WebKit nightly builds. > Source/WebCore/page/Page.cpp:575 > + ASSERT(defers || m_deferLoadingCallCount > 0); If you made m_deferLoadingCallCount unsigned you could simplify this expression. >> Source/WebCore/page/Page.cpp:576 >> + if (defers && ++m_deferLoadingCallCount > 1) > > An else if statement should be written as an if statement when the prior "if" concludes with a return, break, continue or goto statement. [readability/control_flow] [4] Like StyleBot says... > Source/WebCore/page/Page.cpp:578 > + else if (!defers && --m_deferLoadingCallCount > 0) If you made m_deferLoadingCallCount unsigned you could simplify this expression. > Source/WebCore/page/Page.h:221 > + bool defersLoading() const { return m_deferLoadingCallCount > 0; } If you made m_deferLoadingCallCount unsigned you could simplify this expression. > Source/WebCore/page/Page.h:391 > + int m_deferLoadingCallCount; m_defersLoadingCallCount seems like a better name given the name of the method. 613811 4 139714 jhoneycutt 2012-05-01 17:21:26 -0700 Created attachment 139714 Patch v2 613858 5 139714 aestes 2012-05-01 18:36:54 -0700 Comment on attachment 139714 Patch v2 View in context: https://bugs.webkit.org/attachment.cgi?id=139714&action=review r=me, although I like this new behavior so much that I find it unfortunate that it's opt-in rather than opt-out. If having the new behavior enabled by default causes bugs in other ports they can always opt out with a setting, or just fix their bug. > Source/WebCore/page/Page.cpp:585 > - if (defers == m_defersLoading) > + if (m_settings->wantsBalancedSetDefersLoadingBehavior()) { > + ASSERT(defers || m_defersLoadingCallCount); > + if (defers && ++m_defersLoadingCallCount > 1) > + return; > + if (!defers && --m_defersLoadingCallCount) > + return; > + } else if (defers == m_defersLoading) I'd assert that m_defersLoadingCallCount is 0 if wantsBalancedSetDefersLoadingBehavior() is false, which catches the case where the setting changes from true to false between deferring and resuming. Your other assert already catches the case where it changes from false to true. 614951 6 jhoneycutt 2012-05-02 19:55:54 -0700 (In reply to comment #5) > (From update of attachment 139714 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=139714&action=review > > r=me, although I like this new behavior so much that I find it unfortunate that it's opt-in rather than opt-out. If having the new behavior enabled by default causes bugs in other ports they can always opt out with a setting, or just fix their bug. OK, I'll file a bug about making this opt-out. > > > Source/WebCore/page/Page.cpp:585 > > - if (defers == m_defersLoading) > > + if (m_settings->wantsBalancedSetDefersLoadingBehavior()) { > > + ASSERT(defers || m_defersLoadingCallCount); > > + if (defers && ++m_defersLoadingCallCount > 1) > > + return; > > + if (!defers && --m_defersLoadingCallCount) > > + return; > > + } else if (defers == m_defersLoading) > > I'd assert that m_defersLoadingCallCount is 0 if wantsBalancedSetDefersLoadingBehavior() is false, which catches the case where the setting changes from true to false between deferring and resuming. Your other assert already catches the case where it changes from false to true. Landed with this change in <http://trac.webkit.org/changeset/115925>. 138221 2012-04-20 23:19:08 -0700 2012-05-01 17:21:26 -0700 Patch 0001-Make-Page-setDefersLoading-have-a-call-count-so-that.patch text/plain 3822 jhoneycutt RnJvbSAzZDRiNWU0MzI4NGVjNjRkM2JjNzVlOTNkYjZkOWE4YjVjZGZkODQ0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb24gSG9uZXljdXR0IDxqaG9uZXljdXR0QGFwcGxlLmNvbT4K RGF0ZTogRnJpLCAxMyBBcHIgMjAxMiAxODoyOTowNSAtMDcwMApTdWJqZWN0OiBbUEFUQ0ggMS8z XSBNYWtlIFBhZ2U6OnNldERlZmVyc0xvYWRpbmcoKSBoYXZlIGEgY2FsbCBjb3VudCBzbyB0aGF0 CiBlYWNoIHRpbWUgbG9hZGluZyBpcyBkZWZlcnJlZCwgaXQgbXVzdCBiZSBiYWxhbmNlZCB3aXRo CiBhIGNhbGwgdG8gcmVzdW1lLgogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTg0NTIyCgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCiogcGFnZS9QYWdlLmNwcDoK KFdlYkNvcmU6OlBhZ2U6OlBhZ2UpOgpJbml0aWFsaXplIG5ldyBjYWxsIGNvdW50IG1lbWJlci4K KFdlYkNvcmU6OlBhZ2U6OnNldERlZmVyc0xvYWRpbmcpOgpJZiB0aGUgY2FsbCBjb3VudCBpcyBu b3QgY2hhbmdpbmcgZnJvbSAwIHRvIDEgb3IgMSB0byAwLCByZXR1cm4gZWFybHkuCk90aGVyd2lz ZSwgZGVmZXIgb3IgcmVzdW1lIGxvYWRpbmcgZm9yIGZyYW1lcyBpbiB0aGlzIHBhZ2UuCgoqIHBh Z2UvUGFnZS5oOgooV2ViQ29yZTo6UGFnZTo6ZGVmZXJzTG9hZGluZyk6ClVwZGF0ZWQgZGVmaW5p dGlvbiBvZiBkZWZlcnNMb2FkaW5nKCkuIEFkZGVkIGEgbWVtYmVyIHRvIGhvbGQgdGhlIGNhbGwK Y291bnQuCi0tLQogU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nICAgICB8ICAgMjAgKysrKysrKysr KysrKysrKysrKysKIFNvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAgfCAgICA4ICsrKysrLS0t CiBTb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuaCAgIHwgICAgNCArKy0tCiAzIGZpbGVzIGNoYW5n ZWQsIDI3IGluc2VydGlvbnMoKyksIDUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDkwZjBj YzcuLjc1MTFhZjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9T b3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMyBAQAorMjAxMi0wNC0xMyAgSm9u IEhvbmV5Y3V0dCAgPGpob25leWN1dHRAYXBwbGUuY29tPgorCisgICAgICAgIE1ha2UgUGFnZTo6 c2V0RGVmZXJzTG9hZGluZygpIGhhdmUgYSBjYWxsIGNvdW50IHNvIHRoYXQgZWFjaCB0aW1lCisg ICAgICAgIGxvYWRpbmcgaXMgZGVmZXJyZWQsIGl0IG11c3QgYmUgYmFsYW5jZWQgd2l0aCBhIGNh bGwgdG8gcmVzdW1lLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9ODQ1MjIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIHBhZ2UvUGFnZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQYWdlOjpQYWdlKToKKyAg ICAgICAgSW5pdGlhbGl6ZSBuZXcgY2FsbCBjb3VudCBtZW1iZXIuCisgICAgICAgIChXZWJDb3Jl OjpQYWdlOjpzZXREZWZlcnNMb2FkaW5nKToKKyAgICAgICAgSWYgdGhlIGNhbGwgY291bnQgaXMg bm90IGNoYW5naW5nIGZyb20gMCB0byAxIG9yIDEgdG8gMCwgcmV0dXJuIGVhcmx5LgorICAgICAg ICBPdGhlcndpc2UsIGRlZmVyIG9yIHJlc3VtZSBsb2FkaW5nIGZvciBmcmFtZXMgaW4gdGhpcyBw YWdlLgorCisgICAgICAgICogcGFnZS9QYWdlLmg6CisgICAgICAgIChXZWJDb3JlOjpQYWdlOjpk ZWZlcnNMb2FkaW5nKToKKyAgICAgICAgVXBkYXRlZCBkZWZpbml0aW9uIG9mIGRlZmVyc0xvYWRp bmcoKS4gQWRkZWQgYSBtZW1iZXIgdG8gaG9sZCB0aGUgY2FsbAorICAgICAgICBjb3VudC4KKwog MjAxMi0wNC0xOSAgTWFyayBQaWxncmltICA8cGlsZ3JpbUBjaHJvbWl1bS5vcmc+CiAKICAgICAg ICAgW0Nocm9taXVtXSBDYWxsIHNpZ25lZFB1YmxpY0tleUFuZENoYWxsZW5nZVN0cmluZyBkaXJl Y3RseQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvUGFnZS5jcHAKaW5kZXggZDE1YjE2Zi4uNmQyZTg3NiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1Bh Z2UuY3BwCkBAIC0xMzIsNyArMTMyLDcgQEAgUGFnZTo6UGFnZShQYWdlQ2xpZW50cyYgcGFnZUNs aWVudHMpCiAgICAgLCBtX2ZyYW1lQ291bnQoMCkKICAgICAsIG1fb3BlbmVkQnlET00oZmFsc2Up CiAgICAgLCBtX3RhYktleUN5Y2xlc1Rocm91Z2hFbGVtZW50cyh0cnVlKQotICAgICwgbV9kZWZl cnNMb2FkaW5nKGZhbHNlKQorICAgICwgbV9kZWZlckxvYWRpbmdDYWxsQ291bnQoMCkKICAgICAs IG1faW5Mb3dRdWFsaXR5SW50ZXJwb2xhdGlvbk1vZGUoZmFsc2UpCiAgICAgLCBtX2Nvb2tpZUVu YWJsZWQodHJ1ZSkKICAgICAsIG1fYXJlTWVtb3J5Q2FjaGVDbGllbnRDYWxsc0VuYWJsZWQodHJ1 ZSkKQEAgLTU3MiwxMCArNTcyLDEyIEBAIHZvaWQgUGFnZTo6c2V0RGVmZXJzTG9hZGluZyhib29s IGRlZmVycykKICAgICBpZiAoIW1fc2V0dGluZ3MtPmxvYWREZWZlcnJpbmdFbmFibGVkKCkpCiAg ICAgICAgIHJldHVybjsKIAotICAgIGlmIChkZWZlcnMgPT0gbV9kZWZlcnNMb2FkaW5nKQorICAg IEFTU0VSVChkZWZlcnMgfHwgbV9kZWZlckxvYWRpbmdDYWxsQ291bnQgPiAwKTsKKyAgICBpZiAo ZGVmZXJzICYmICsrbV9kZWZlckxvYWRpbmdDYWxsQ291bnQgPiAxKQorICAgICAgICByZXR1cm47 CisgICAgZWxzZSBpZiAoIWRlZmVycyAmJiAtLW1fZGVmZXJMb2FkaW5nQ2FsbENvdW50ID4gMCkK ICAgICAgICAgcmV0dXJuOwogCi0gICAgbV9kZWZlcnNMb2FkaW5nID0gZGVmZXJzOwogICAgIGZv ciAoRnJhbWUqIGZyYW1lID0gbWFpbkZyYW1lKCk7IGZyYW1lOyBmcmFtZSA9IGZyYW1lLT50cmVl KCktPnRyYXZlcnNlTmV4dCgpKQogICAgICAgICBmcmFtZS0+bG9hZGVyKCktPnNldERlZmVyc0xv YWRpbmcoZGVmZXJzKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5o IGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmgKaW5kZXggZDk3YzQ1Zi4uMTNjNzM0NiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmgKKysrIGIvU291cmNlL1dlYkNvcmUv cGFnZS9QYWdlLmgKQEAgLTIxOCw3ICsyMTgsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAg ICAgIGNvbnN0IFZpc2libGVTZWxlY3Rpb24mIHNlbGVjdGlvbigpIGNvbnN0OwogCiAgICAgICAg IHZvaWQgc2V0RGVmZXJzTG9hZGluZyhib29sKTsKLSAgICAgICAgYm9vbCBkZWZlcnNMb2FkaW5n KCkgY29uc3QgeyByZXR1cm4gbV9kZWZlcnNMb2FkaW5nOyB9CisgICAgICAgIGJvb2wgZGVmZXJz TG9hZGluZygpIGNvbnN0IHsgcmV0dXJuIG1fZGVmZXJMb2FkaW5nQ2FsbENvdW50ID4gMDsgfQog ICAgICAgICAKICAgICAgICAgdm9pZCBjbGVhclVuZG9SZWRvT3BlcmF0aW9ucygpOwogCkBAIC0z ODgsNyArMzg4LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBib29sIG1fb3BlbmVk QnlET007CiAKICAgICAgICAgYm9vbCBtX3RhYktleUN5Y2xlc1Rocm91Z2hFbGVtZW50czsKLSAg ICAgICAgYm9vbCBtX2RlZmVyc0xvYWRpbmc7CisgICAgICAgIGludCBtX2RlZmVyTG9hZGluZ0Nh bGxDb3VudDsKIAogICAgICAgICBib29sIG1faW5Mb3dRdWFsaXR5SW50ZXJwb2xhdGlvbk1vZGU7 CiAgICAgICAgIGJvb2wgbV9jb29raWVFbmFibGVkOwotLSAKMS43LjkuMiAoQXBwbGUgR2l0LTMw KQoK 139714 2012-05-01 17:21:26 -0700 2012-05-01 18:36:54 -0700 Patch v2 0001-Make-Page-setDefersLoading-have-a-call-count-so-that.patch text/plain 15268 jhoneycutt RnJvbSBkNTI3MDIxNmE1Y2Y3YTFiNzQyMDgxYzA0YWYzNWRkMzE2MGFlYmQ2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb24gSG9uZXljdXR0IDxqaG9uZXljdXR0QGFwcGxlLmNvbT4K RGF0ZTogRnJpLCAxMyBBcHIgMjAxMiAxODoyOTowNSAtMDcwMApTdWJqZWN0OiBbUEFUQ0hdIE1h a2UgUGFnZTo6c2V0RGVmZXJzTG9hZGluZygpIGhhdmUgYSBjYWxsIGNvdW50IHNvIHRoYXQgZWFj aAogdGltZSBsb2FkaW5nIGlzIGRlZmVycmVkLCBpdCBtdXN0IGJlIGJhbGFuY2VkIHdpdGggYSBj YWxsCiB0byByZXN1bWUuIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04 NDUyMgoKUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgpTb3VyY2UvV2ViQ29yZToKCiogcGFn ZS9QYWdlLmNwcDoKKFdlYkNvcmU6OlBhZ2U6OlBhZ2UpOgpJbml0aWFsaXplIG5ldyBjYWxsIGNv dW50IG1lbWJlci4KKFdlYkNvcmU6OlBhZ2U6OnNldERlZmVyc0xvYWRpbmcpOgpDaGVjayB3aGV0 aGVyIHRoZSBjYWxsZXJzIHdhbnRzIGJhbGFuY2VkIGRlZmVyL3Jlc3VtZSBsb2FkaW5nIGJlaGF2 aW9yLgpJZiB0aGUgY2FsbCBjb3VudCBpcyBub3QgY2hhbmdpbmcgZnJvbSAwIHRvIDEgb3IgMSB0 byAwLCByZXR1cm4gZWFybHkuCk90aGVyd2lzZSwgZGVmZXIgb3IgcmVzdW1lIGxvYWRpbmcgZm9y IGZyYW1lcyBpbiB0aGlzIHBhZ2UuCgoqIHBhZ2UvUGFnZS5oOgooV2ViQ29yZTo6UGFnZTo6ZGVm ZXJzTG9hZGluZyk6CkFkZGVkIGEgbWVtYmVyIHRvIGhvbGQgdGhlIGNhbGwgY291bnQuCgoqIHBh Z2UvU2V0dGluZ3MuY3BwOgooV2ViQ29yZTo6U2V0dGluZ3M6OlNldHRpbmdzKToKSW5pdGlhbGl6 ZWQgbmV3IG1lbWJlciBtX3dhbnRzQmFsYW5jZWRTZXREZWZlcnNMb2FkaW5nQmVoYXZpb3IuCgoq IHBhZ2UvU2V0dGluZ3MuaDoKKFNldHRpbmdzKToKQWRkZWQgbmV3IG1lbWJlciBtX3dhbnRzQmFs YW5jZWRTZXREZWZlcnNMb2FkaW5nQmVoYXZpb3IuCihXZWJDb3JlOjpTZXR0aW5nczo6c2V0V2Fu dHNCYWxhbmNlZFNldERlZmVyc0xvYWRpbmdCZWhhdmlvcik6ClNldHRlci4KKFdlYkNvcmU6OlNl dHRpbmdzOjp3YW50c0JhbGFuY2VkU2V0RGVmZXJzTG9hZGluZ0JlaGF2aW9yKToKR2V0dGVyLgoK U291cmNlL1dlYktpdC9tYWM6CgoqIFdlYlZpZXcvV2ViUHJlZmVyZW5jZUtleXNQcml2YXRlLmg6 CkRlY2xhcmUgYSBuZXcga2V5IGZvciB0aGlzIHByZWZlcmVuY2UuCgoqIFdlYlZpZXcvV2ViUHJl ZmVyZW5jZXMubW06CigrW1dlYlByZWZlcmVuY2VzIGluaXRpYWxpemVdKToKSW5pdGlhbGl6ZSBu ZXcgcHJlZmVyZW5jZSB0byBOTy4KKC1bV2ViUHJlZmVyZW5jZXMgc2V0V2FudHNCYWxhbmNlZFNl dERlZmVyc0xvYWRpbmdCZWhhdmlvcjpdKToKU2V0dGVyLgooLVtXZWJQcmVmZXJlbmNlcyB3YW50 c0JhbGFuY2VkU2V0RGVmZXJzTG9hZGluZ0JlaGF2aW9yXSk6CkdldHRlci4KCiogV2ViVmlldy9X ZWJQcmVmZXJlbmNlc1ByaXZhdGUuaDoKRGVjbGFyZSBzZXR0ZXIgYW5kIGdldHRlci4KCiogV2Vi Vmlldy9XZWJWaWV3Lm1tOgooLVtXZWJWaWV3IF9wcmVmZXJlbmNlc0NoYW5nZWQ6XSk6ClNldCB0 aGUgc2V0dGluZyBmcm9tIHRoZSBXZWJQcmVmZXJlbmNlcyBvYmplY3QncyB2YWx1ZS4KClNvdXJj ZS9XZWJLaXQyOgoKKiBTaGFyZWQvV2ViUHJlZmVyZW5jZXNTdG9yZS5oOgpVc2UgdGhlIG1hY3Jv IHRvIGRlY2xhcmUgdGhlIG5ldyBwcmVmZXJlbmNlLgoKKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2Vi UGFnZS5jcHA6CihXZWJLaXQ6OldlYlBhZ2U6OnVwZGF0ZVByZWZlcmVuY2VzKToKU2V0IHRoZSBz ZXR0aW5nIGZyb20gdGhlIFdlYlByZWZlcmVuY2VzU3RvcmUncyB2YWx1ZS4KCm1lcmdlCi0tLQog U291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDMy ICsrKysrKysrKysrKysrKysrKysrCiBTb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwICAgICAg ICAgICAgICAgICAgICAgICB8ICAgIDkgKysrKystCiBTb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2Uu aCAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgIDEgKwogU291cmNlL1dlYkNvcmUvcGFnZS9T ZXR0aW5ncy5jcHAgICAgICAgICAgICAgICAgICAgfCAgICAxICsKIFNvdXJjZS9XZWJDb3JlL3Bh Z2UvU2V0dGluZ3MuaCAgICAgICAgICAgICAgICAgICAgIHwgICAgNCArKysKIFNvdXJjZS9XZWJL aXQvbWFjL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgIHwgICAyNiArKysrKysrKysr KysrKysrCiAuLi4vV2ViS2l0L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2VLZXlzUHJpdmF0ZS5o ICB8ICAgIDEgKwogU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlcy5tbSAg ICAgICAgfCAgIDExICsrKysrKysKIFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViUHJlZmVy ZW5jZXNQcml2YXRlLmggIHwgICAgMyArKwogU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJW aWV3Lm1tICAgICAgICAgICAgICAgfCAgICAxICsKIFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyAg ICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAxNSArKysrKysrKysKIFNvdXJjZS9XZWJLaXQy L1NoYXJlZC9XZWJQcmVmZXJlbmNlc1N0b3JlLmggICAgICAgIHwgICAgMSArCiBTb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAgICAgICB8ICAgIDMgKy0KIDEzIGZp bGVzIGNoYW5nZWQsIDEwNiBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpp bmRleCBjM2M3YzYzLi5kYzExZTQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VM b2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzUgQEAKKzIwMTIt MDQtMTMgIEpvbiBIb25leWN1dHQgIDxqaG9uZXljdXR0QGFwcGxlLmNvbT4KKworICAgICAgICBN YWtlIFBhZ2U6OnNldERlZmVyc0xvYWRpbmcoKSBoYXZlIGEgY2FsbCBjb3VudCBzbyB0aGF0IGVh Y2ggdGltZQorICAgICAgICBsb2FkaW5nIGlzIGRlZmVycmVkLCBpdCBtdXN0IGJlIGJhbGFuY2Vk IHdpdGggYSBjYWxsIHRvIHJlc3VtZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTg0NTIyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBwYWdlL1BhZ2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGFnZTo6 UGFnZSk6CisgICAgICAgIEluaXRpYWxpemUgbmV3IGNhbGwgY291bnQgbWVtYmVyLgorICAgICAg ICAoV2ViQ29yZTo6UGFnZTo6c2V0RGVmZXJzTG9hZGluZyk6CisgICAgICAgIENoZWNrIHdoZXRo ZXIgdGhlIGNhbGxlcnMgd2FudHMgYmFsYW5jZWQgZGVmZXIvcmVzdW1lIGxvYWRpbmcgYmVoYXZp b3IuCisgICAgICAgIElmIHRoZSBjYWxsIGNvdW50IGlzIG5vdCBjaGFuZ2luZyBmcm9tIDAgdG8g MSBvciAxIHRvIDAsIHJldHVybiBlYXJseS4KKyAgICAgICAgT3RoZXJ3aXNlLCBkZWZlciBvciBy ZXN1bWUgbG9hZGluZyBmb3IgZnJhbWVzIGluIHRoaXMgcGFnZS4KKworICAgICAgICAqIHBhZ2Uv UGFnZS5oOgorICAgICAgICAoV2ViQ29yZTo6UGFnZTo6ZGVmZXJzTG9hZGluZyk6CisgICAgICAg IEFkZGVkIGEgbWVtYmVyIHRvIGhvbGQgdGhlIGNhbGwgY291bnQuCisKKyAgICAgICAgKiBwYWdl L1NldHRpbmdzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNldHRpbmdzOjpTZXR0aW5ncyk6Cisg ICAgICAgIEluaXRpYWxpemVkIG5ldyBtZW1iZXIgbV93YW50c0JhbGFuY2VkU2V0RGVmZXJzTG9h ZGluZ0JlaGF2aW9yLgorCisgICAgICAgICogcGFnZS9TZXR0aW5ncy5oOgorICAgICAgICAoU2V0 dGluZ3MpOgorICAgICAgICBBZGRlZCBuZXcgbWVtYmVyIG1fd2FudHNCYWxhbmNlZFNldERlZmVy c0xvYWRpbmdCZWhhdmlvci4KKyAgICAgICAgKFdlYkNvcmU6OlNldHRpbmdzOjpzZXRXYW50c0Jh bGFuY2VkU2V0RGVmZXJzTG9hZGluZ0JlaGF2aW9yKToKKyAgICAgICAgU2V0dGVyLgorICAgICAg ICAoV2ViQ29yZTo6U2V0dGluZ3M6OndhbnRzQmFsYW5jZWRTZXREZWZlcnNMb2FkaW5nQmVoYXZp b3IpOgorICAgICAgICBHZXR0ZXIuCisKIDIwMTItMDQtMzAgIE1pbiBRaW4gIDxxaW5taW5AZ29v Z2xlLmNvbT4KIAogICAgICAgICBFeHBvc2UgYSBmbGFnIHNvIHRoYXQgZnVsbHNjcmVlbiB2aWRl byBvbiBhbmRyb2lkIGNhbiB3b3JrIHdpdGggRlVMTFNDUkVFTl9BUEkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3Bw CmluZGV4IGZkZThiYzAuLjYwNThkOTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv UGFnZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcApAQCAtMTM0LDYgKzEz NCw3IEBAIFBhZ2U6OlBhZ2UoUGFnZUNsaWVudHMmIHBhZ2VDbGllbnRzKQogICAgICwgbV9vcGVu ZWRCeURPTShmYWxzZSkKICAgICAsIG1fdGFiS2V5Q3ljbGVzVGhyb3VnaEVsZW1lbnRzKHRydWUp CiAgICAgLCBtX2RlZmVyc0xvYWRpbmcoZmFsc2UpCisgICAgLCBtX2RlZmVyc0xvYWRpbmdDYWxs Q291bnQoMCkKICAgICAsIG1faW5Mb3dRdWFsaXR5SW50ZXJwb2xhdGlvbk1vZGUoZmFsc2UpCiAg ICAgLCBtX2Nvb2tpZUVuYWJsZWQodHJ1ZSkKICAgICAsIG1fYXJlTWVtb3J5Q2FjaGVDbGllbnRD YWxsc0VuYWJsZWQodHJ1ZSkKQEAgLTU3NSw3ICs1NzYsMTMgQEAgdm9pZCBQYWdlOjpzZXREZWZl cnNMb2FkaW5nKGJvb2wgZGVmZXJzKQogICAgIGlmICghbV9zZXR0aW5ncy0+bG9hZERlZmVycmlu Z0VuYWJsZWQoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgaWYgKGRlZmVycyA9PSBtX2RlZmVy c0xvYWRpbmcpCisgICAgaWYgKG1fc2V0dGluZ3MtPndhbnRzQmFsYW5jZWRTZXREZWZlcnNMb2Fk aW5nQmVoYXZpb3IoKSkgeworICAgICAgICBBU1NFUlQoZGVmZXJzIHx8IG1fZGVmZXJzTG9hZGlu Z0NhbGxDb3VudCk7CisgICAgICAgIGlmIChkZWZlcnMgJiYgKyttX2RlZmVyc0xvYWRpbmdDYWxs Q291bnQgPiAxKQorICAgICAgICAgICAgcmV0dXJuOworICAgICAgICBpZiAoIWRlZmVycyAmJiAt LW1fZGVmZXJzTG9hZGluZ0NhbGxDb3VudCkKKyAgICAgICAgICAgIHJldHVybjsKKyAgICB9IGVs c2UgaWYgKGRlZmVycyA9PSBtX2RlZmVyc0xvYWRpbmcpCiAgICAgICAgIHJldHVybjsKIAogICAg IG1fZGVmZXJzTG9hZGluZyA9IGRlZmVyczsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvUGFnZS5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmgKaW5kZXggZDk3YzQ1Zi4uYmMy ZTRkMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmgKKysrIGIvU291cmNl L1dlYkNvcmUvcGFnZS9QYWdlLmgKQEAgLTM4OSw2ICszODksNyBAQCBuYW1lc3BhY2UgV2ViQ29y ZSB7CiAKICAgICAgICAgYm9vbCBtX3RhYktleUN5Y2xlc1Rocm91Z2hFbGVtZW50czsKICAgICAg ICAgYm9vbCBtX2RlZmVyc0xvYWRpbmc7CisgICAgICAgIHVuc2lnbmVkIG1fZGVmZXJzTG9hZGlu Z0NhbGxDb3VudDsKIAogICAgICAgICBib29sIG1faW5Mb3dRdWFsaXR5SW50ZXJwb2xhdGlvbk1v ZGU7CiAgICAgICAgIGJvb2wgbV9jb29raWVFbmFibGVkOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGFnZS9TZXR0aW5ncy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmNw cAppbmRleCA3YTljY2VmLi5lODg5NDEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdl L1NldHRpbmdzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmNwcApAQCAt MjYzLDYgKzI2Myw3IEBAIFNldHRpbmdzOjpTZXR0aW5ncyhQYWdlKiBwYWdlKQogI2VuZGlmCiAg ICAgLCBtX3RocmVhZGVkQW5pbWF0aW9uRW5hYmxlZChmYWxzZSkKICAgICAsIG1fc2hvdWxkUmVz cGVjdEltYWdlT3JpZW50YXRpb24oZmFsc2UpCisgICAgLCBtX3dhbnRzQmFsYW5jZWRTZXREZWZl cnNMb2FkaW5nQmVoYXZpb3IoZmFsc2UpCiAgICAgLCBtX2xvYWRzSW1hZ2VzQXV0b21hdGljYWxs eVRpbWVyKHRoaXMsICZTZXR0aW5nczo6bG9hZHNJbWFnZXNBdXRvbWF0aWNhbGx5VGltZXJGaXJl ZCkKICAgICAsIG1faW5jcmVtZW50YWxSZW5kZXJpbmdTdXBwcmVzc2lvblRpbWVvdXRJblNlY29u ZHMoZGVmYXVsdEluY3JlbWVudGFsUmVuZGVyaW5nU3VwcHJlc3Npb25UaW1lb3V0SW5TZWNvbmRz KQogewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5oIGIvU291cmNl L1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5oCmluZGV4IDdlYTk5ZTIuLmQ5MmI2ZGYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w YWdlL1NldHRpbmdzLmgKQEAgLTU1MSw2ICs1NTEsOSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAK ICAgICAgICAgdm9pZCBzZXRTaG91bGRSZXNwZWN0SW1hZ2VPcmllbnRhdGlvbihib29sIGVuYWJs ZWQpIHsgbV9zaG91bGRSZXNwZWN0SW1hZ2VPcmllbnRhdGlvbiA9IGVuYWJsZWQ7IH0KICAgICAg ICAgYm9vbCBzaG91bGRSZXNwZWN0SW1hZ2VPcmllbnRhdGlvbigpIGNvbnN0IHsgcmV0dXJuIG1f c2hvdWxkUmVzcGVjdEltYWdlT3JpZW50YXRpb247IH0KKworICAgICAgICB2b2lkIHNldFdhbnRz QmFsYW5jZWRTZXREZWZlcnNMb2FkaW5nQmVoYXZpb3IoYm9vbCBmbGFnKSB7IG1fd2FudHNCYWxh bmNlZFNldERlZmVyc0xvYWRpbmdCZWhhdmlvciA9IGZsYWc7IH0KKyAgICAgICAgYm9vbCB3YW50 c0JhbGFuY2VkU2V0RGVmZXJzTG9hZGluZ0JlaGF2aW9yKCkgY29uc3QgeyByZXR1cm4gbV93YW50 c0JhbGFuY2VkU2V0RGVmZXJzTG9hZGluZ0JlaGF2aW9yOyB9CiAgICAgICAgIAogICAgICAgICB2 b2lkIHNldEluY3JlbWVudGFsUmVuZGVyaW5nU3VwcHJlc3Npb25UaW1lb3V0SW5TZWNvbmRzKGRv dWJsZSB0aW1lb3V0KSB7IG1faW5jcmVtZW50YWxSZW5kZXJpbmdTdXBwcmVzc2lvblRpbWVvdXRJ blNlY29uZHMgPSB0aW1lb3V0OyB9CiAgICAgICAgIGRvdWJsZSBpbmNyZW1lbnRhbFJlbmRlcmlu Z1N1cHByZXNzaW9uVGltZW91dEluU2Vjb25kcygpIGNvbnN0IHsgcmV0dXJuIG1faW5jcmVtZW50 YWxSZW5kZXJpbmdTdXBwcmVzc2lvblRpbWVvdXRJblNlY29uZHM7IH0KQEAgLTcxNyw2ICs3MjAs NyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAjZW5kaWYKICAgICAgICAgYm9vbCBtX3RocmVhZGVk QW5pbWF0aW9uRW5hYmxlZCA6IDE7CiAgICAgICAgIGJvb2wgbV9zaG91bGRSZXNwZWN0SW1hZ2VP cmllbnRhdGlvbiA6IDE7CisgICAgICAgIGJvb2wgbV93YW50c0JhbGFuY2VkU2V0RGVmZXJzTG9h ZGluZ0JlaGF2aW9yIDogMTsKIAogICAgICAgICBUaW1lcjxTZXR0aW5ncz4gbV9sb2Fkc0ltYWdl c0F1dG9tYXRpY2FsbHlUaW1lcjsKICAgICAgICAgdm9pZCBsb2Fkc0ltYWdlc0F1dG9tYXRpY2Fs bHlUaW1lckZpcmVkKFRpbWVyPFNldHRpbmdzPiopOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9tYWMvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCmluZGV4IGMxZjYy YWEuLjk3MDkzNmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZworKysg Yi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOSBAQAorMjAxMi0wNS0w MSAgSm9uIEhvbmV5Y3V0dCAgPGpob25leWN1dHRAYXBwbGUuY29tPgorCisgICAgICAgIE1ha2Ug UGFnZTo6c2V0RGVmZXJzTG9hZGluZygpIGhhdmUgYSBjYWxsIGNvdW50IHNvIHRoYXQgZWFjaCB0 aW1lCisgICAgICAgIGxvYWRpbmcgaXMgZGVmZXJyZWQsIGl0IG11c3QgYmUgYmFsYW5jZWQgd2l0 aCBhIGNhbGwgdG8gcmVzdW1lLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9ODQ1MjIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIFdlYlZpZXcvV2ViUHJlZmVyZW5jZUtleXNQcml2YXRlLmg6CisgICAgICAg IERlY2xhcmUgYSBuZXcga2V5IGZvciB0aGlzIHByZWZlcmVuY2UuCisKKyAgICAgICAgKiBXZWJW aWV3L1dlYlByZWZlcmVuY2VzLm1tOgorICAgICAgICAoK1tXZWJQcmVmZXJlbmNlcyBpbml0aWFs aXplXSk6CisgICAgICAgIEluaXRpYWxpemUgbmV3IHByZWZlcmVuY2UgdG8gTk8uCisgICAgICAg ICgtW1dlYlByZWZlcmVuY2VzIHNldFdhbnRzQmFsYW5jZWRTZXREZWZlcnNMb2FkaW5nQmVoYXZp b3I6XSk6CisgICAgICAgIFNldHRlci4KKyAgICAgICAgKC1bV2ViUHJlZmVyZW5jZXMgd2FudHNC YWxhbmNlZFNldERlZmVyc0xvYWRpbmdCZWhhdmlvcl0pOgorICAgICAgICBHZXR0ZXIuCisKKyAg ICAgICAgKiBXZWJWaWV3L1dlYlByZWZlcmVuY2VzUHJpdmF0ZS5oOgorICAgICAgICBEZWNsYXJl IHNldHRlciBhbmQgZ2V0dGVyLgorCisgICAgICAgICogV2ViVmlldy9XZWJWaWV3Lm1tOgorICAg ICAgICAoLVtXZWJWaWV3IF9wcmVmZXJlbmNlc0NoYW5nZWQ6XSk6CisgICAgICAgIFNldCB0aGUg c2V0dGluZyBmcm9tIHRoZSBXZWJQcmVmZXJlbmNlcyBvYmplY3QncyB2YWx1ZS4KKwogMjAxMi0w NC0yOCAgR2VvZmZyZXkgR2FyZW4gIDxnZ2FyZW5AYXBwbGUuY29tPgogCiAgICAgICAgIENsYXJp ZmllZCBKU0dsb2JhbERhdGEgKEphdmFTY3JpcHQgVk0pIGxpZmV0aW1lCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2VLZXlzUHJpdmF0ZS5oIGIvU291 cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlS2V5c1ByaXZhdGUuaAppbmRleCAz MzM5M2IwLi44ZmI3OWE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dl YlByZWZlcmVuY2VLZXlzUHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcv V2ViUHJlZmVyZW5jZUtleXNQcml2YXRlLmgKQEAgLTEzNyw2ICsxMzcsNyBAQAogI2RlZmluZSBX ZWJLaXRVc2VQcmVIVE1MNVBhcnNlclF1aXJrc0tleSBAIldlYktpdFVzZVByZUhUTUw1UGFyc2Vy UXVpcmtzIgogI2RlZmluZSBXZWJLaXRCYWNrc3BhY2VLZXlOYXZpZ2F0aW9uRW5hYmxlZEtleSBA IldlYktpdEJhY2tzcGFjZUtleU5hdmlnYXRpb25FbmFibGVkIgogI2RlZmluZSBXZWJLaXRJbmNy ZW1lbnRhbFJlbmRlcmluZ1N1cHByZXNzaW9uVGltZW91dEluU2Vjb25kc0tleSBAIldlYktpdElu Y3JlbWVudGFsUmVuZGVyaW5nU3VwcHJlc3Npb25UaW1lb3V0SW5TZWNvbmRzIgorI2RlZmluZSBX ZWJLaXRXYW50c0JhbGFuY2VkU2V0RGVmZXJzTG9hZGluZ0JlaGF2aW9yS2V5IEAiV2ViS2l0V2Fu dHNCYWxhbmNlZFNldERlZmVyc0xvYWRpbmdCZWhhdmlvciIKIAogLy8gQ29yZUdyYXBoaWNzIGRl ZmVycmVkIHVwZGF0ZXMgYXJlIGRpc2FibGVkIGlmIFdlYktpdEVuYWJsZUNvYWxlc2NlZFVwZGF0 ZXNQcmVmZXJlbmNlS2V5IGlzIHNldAogLy8gdG8gTk8sIG9yIGhhcyBubyB2YWx1ZS4gIEZvciBj b21wYXRpYmlsaXR5IHdpdGggTWFjIE9TIFggMTAuNC42LCBkZWZlcnJlZCB1cGRhdGVzIGFyZSBP RkYgYnkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5j ZXMubW0gYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2VzLm1tCmluZGV4 IGMyNjE5NTAuLjhkMWZlZjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcv V2ViUHJlZmVyZW5jZXMubW0KKysrIGIvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJQcmVm ZXJlbmNlcy5tbQpAQCAtMzk3LDYgKzM5Nyw3IEBAICsgKHZvaWQpaW5pdGlhbGl6ZQogICAgICAg ICBbTlNOdW1iZXIgbnVtYmVyV2l0aEJvb2w6Tk9dLCAgIFdlYktpdFNob3VsZERpc3BsYXlUZXh0 RGVzY3JpcHRpb25zUHJlZmVyZW5jZUtleSwKICAgICAgICAgW05TTnVtYmVyIG51bWJlcldpdGhC b29sOllFU10sICBXZWJLaXROb3RpZmljYXRpb25zRW5hYmxlZEtleSwKICAgICAgICAgW05TTnVt YmVyIG51bWJlcldpdGhCb29sOk5PXSwgICBXZWJLaXRTaG91bGRSZXNwZWN0SW1hZ2VPcmllbnRh dGlvbktleSwKKyAgICAgICAgW05TTnVtYmVyIG51bWJlcldpdGhCb29sOk5PXSwgICBXZWJLaXRX YW50c0JhbGFuY2VkU2V0RGVmZXJzTG9hZGluZ0JlaGF2aW9yS2V5LAogCiAgICAgICAgIFtOU051 bWJlciBudW1iZXJXaXRoTG9uZ0xvbmc6QXBwbGljYXRpb25DYWNoZVN0b3JhZ2U6Om5vUXVvdGEo KV0sIFdlYktpdEFwcGxpY2F0aW9uQ2FjaGVUb3RhbFF1b3RhLAogICAgICAgICBbTlNOdW1iZXIg bnVtYmVyV2l0aExvbmdMb25nOkFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlOjpub1F1b3RhKCldLCBX ZWJLaXRBcHBsaWNhdGlvbkNhY2hlRGVmYXVsdE9yaWdpblF1b3RhLApAQCAtMTYxNiw2ICsxNjE3 LDE2IEBAIC0gKEJPT0wpYmFja3NwYWNlS2V5TmF2aWdhdGlvbkVuYWJsZWQKICAgICByZXR1cm4g W3NlbGYgX2Jvb2xWYWx1ZUZvcktleTpXZWJLaXRCYWNrc3BhY2VLZXlOYXZpZ2F0aW9uRW5hYmxl ZEtleV07CiB9CiAKKy0gKHZvaWQpc2V0V2FudHNCYWxhbmNlZFNldERlZmVyc0xvYWRpbmdCZWhh dmlvcjooQk9PTClmbGFnCit7CisgICAgW3NlbGYgX3NldEJvb2xWYWx1ZTpmbGFnIGZvcktleTpX ZWJLaXRXYW50c0JhbGFuY2VkU2V0RGVmZXJzTG9hZGluZ0JlaGF2aW9yS2V5XTsKK30KKworLSAo Qk9PTCl3YW50c0JhbGFuY2VkU2V0RGVmZXJzTG9hZGluZ0JlaGF2aW9yCit7CisgICAgcmV0dXJu IFtzZWxmIF9ib29sVmFsdWVGb3JLZXk6V2ViS2l0V2FudHNCYWxhbmNlZFNldERlZmVyc0xvYWRp bmdCZWhhdmlvcktleV07Cit9CisKIC0gKHZvaWQpc2V0U2hvdWxkRGlzcGxheVN1YnRpdGxlczoo Qk9PTClmbGFnCiB7CiAgICAgW3NlbGYgX3NldEJvb2xWYWx1ZTpmbGFnIGZvcktleTpXZWJLaXRT aG91bGREaXNwbGF5U3VidGl0bGVzUHJlZmVyZW5jZUtleV07CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2VzUHJpdmF0ZS5oIGIvU291cmNlL1dlYktp dC9tYWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlc1ByaXZhdGUuaAppbmRleCBiNDIwYzY0Li5hOThj MTEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2Vz UHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5jZXNQ cml2YXRlLmgKQEAgLTI4MCw2ICsyODAsOSBAQCBleHRlcm4gTlNTdHJpbmcgKldlYlByZWZlcmVu Y2VzQ2hhbmdlZEludGVybmFsTm90aWZpY2F0aW9uOwogLSAodm9pZClzZXRCYWNrc3BhY2VLZXlO YXZpZ2F0aW9uRW5hYmxlZDooQk9PTClmbGFnOwogLSAoQk9PTCliYWNrc3BhY2VLZXlOYXZpZ2F0 aW9uRW5hYmxlZDsKIAorLSAodm9pZClzZXRXYW50c0JhbGFuY2VkU2V0RGVmZXJzTG9hZGluZ0Jl aGF2aW9yOihCT09MKWZsYWc7CistIChCT09MKXdhbnRzQmFsYW5jZWRTZXREZWZlcnNMb2FkaW5n QmVoYXZpb3I7CisKIC0gKHZvaWQpc2V0U2hvdWxkRGlzcGxheVN1YnRpdGxlczooQk9PTClmbGFn OwogLSAoQk9PTClzaG91bGREaXNwbGF5U3VidGl0bGVzOwogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3 L1dlYlZpZXcubW0KaW5kZXggMDQ3Zjg5Yi4uZGM0ZmQ5YyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZp ZXcvV2ViVmlldy5tbQpAQCAtMTUxOSw2ICsxNTE5LDcgQEAgLSAodm9pZClfcHJlZmVyZW5jZXND aGFuZ2VkOihXZWJQcmVmZXJlbmNlcyAqKXByZWZlcmVuY2VzCiAgICAgc2V0dGluZ3MtPnNldFN1 cHByZXNzZXNJbmNyZW1lbnRhbFJlbmRlcmluZyhbcHJlZmVyZW5jZXMgc3VwcHJlc3Nlc0luY3Jl bWVudGFsUmVuZGVyaW5nXSk7CiAgICAgc2V0dGluZ3MtPnNldFJlZ2lvbkJhc2VkQ29sdW1uc0Vu YWJsZWQoW3ByZWZlcmVuY2VzIHJlZ2lvbkJhc2VkQ29sdW1uc0VuYWJsZWRdKTsKICAgICBzZXR0 aW5ncy0+c2V0QmFja3NwYWNlS2V5TmF2aWdhdGlvbkVuYWJsZWQoW3ByZWZlcmVuY2VzIGJhY2tz cGFjZUtleU5hdmlnYXRpb25FbmFibGVkXSk7CisgICAgc2V0dGluZ3MtPnNldFdhbnRzQmFsYW5j ZWRTZXREZWZlcnNMb2FkaW5nQmVoYXZpb3IoW3ByZWZlcmVuY2VzIHdhbnRzQmFsYW5jZWRTZXRE ZWZlcnNMb2FkaW5nQmVoYXZpb3JdKTsKICAgICBzZXR0aW5ncy0+c2V0TW9ja1Njcm9sbGJhcnNF bmFibGVkKFtwcmVmZXJlbmNlcyBtb2NrU2Nyb2xsYmFyc0VuYWJsZWRdKTsKIAogI2lmIEVOQUJM RShWSURFT19UUkFDSykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCAwMDIwNzgwLi5hYmE1ZDc2IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMTggQEAKKzIwMTItMDUtMDEgIEpvbiBIb25leWN1dHQgIDxqaG9uZXljdXR0 QGFwcGxlLmNvbT4KKworICAgICAgICBNYWtlIFBhZ2U6OnNldERlZmVyc0xvYWRpbmcoKSBoYXZl IGEgY2FsbCBjb3VudCBzbyB0aGF0IGVhY2ggdGltZQorICAgICAgICBsb2FkaW5nIGlzIGRlZmVy cmVkLCBpdCBtdXN0IGJlIGJhbGFuY2VkIHdpdGggYSBjYWxsIHRvIHJlc3VtZS4KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg0NTIyCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTaGFyZWQvV2ViUHJlZmVy ZW5jZXNTdG9yZS5oOgorICAgICAgICBVc2UgdGhlIG1hY3JvIHRvIGRlY2xhcmUgdGhlIG5ldyBw cmVmZXJlbmNlLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgor ICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjp1cGRhdGVQcmVmZXJlbmNlcyk6CisgICAgICAgIFNl dCB0aGUgc2V0dGluZyBmcm9tIHRoZSBXZWJQcmVmZXJlbmNlc1N0b3JlJ3MgdmFsdWUuCisKIDIw MTItMDQtMzAgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBhcHBsZS5jb20+CiAKICAgICAgICAg VmFsaWRhdGUga2V5cHJlc3MgY29tbWFuZCBuYW1lcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvU2hhcmVkL1dlYlByZWZlcmVuY2VzU3RvcmUuaCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9X ZWJQcmVmZXJlbmNlc1N0b3JlLmgKaW5kZXggNjRmN2I2NS4uZjI4NjI4NyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlByZWZlcmVuY2VzU3RvcmUuaAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9TaGFyZWQvV2ViUHJlZmVyZW5jZXNTdG9yZS5oCkBAIC0xMTAsNiArMTEwLDcgQEAg bmFtZXNwYWNlIFdlYktpdCB7CiAgICAgbWFjcm8oU2hvdWxkRGlzcGxheVRleHREZXNjcmlwdGlv bnMsIHNob3VsZERpc3BsYXlUZXh0RGVzY3JpcHRpb25zLCBCb29sLCBib29sLCBmYWxzZSkgXAog ICAgIG1hY3JvKE5vdGlmaWNhdGlvbnNFbmFibGVkLCBub3RpZmljYXRpb25zRW5hYmxlZCwgQm9v bCwgYm9vbCwgdHJ1ZSkgXAogICAgIG1hY3JvKFNob3VsZFJlc3BlY3RJbWFnZU9yaWVudGF0aW9u LCBzaG91bGRSZXNwZWN0SW1hZ2VPcmllbnRhdGlvbiwgQm9vbCwgYm9vbCwgZmFsc2UpIFwKKyAg ICBtYWNybyhXYW50c0JhbGFuY2VkU2V0RGVmZXJzTG9hZGluZ0JlaGF2aW9yLCB3YW50c0JhbGFu Y2VkU2V0RGVmZXJzTG9hZGluZ0JlaGF2aW9yLCBCb29sLCBib29sLCBmYWxzZSkgXAogICAgIFwK IAogI2RlZmluZSBGT1JfRUFDSF9XRUJLSVRfRE9VQkxFX1BSRUZFUkVOQ0UobWFjcm8pIFwKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcCBi L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAppbmRleCBmNDFj N2UwLi5lYTVmZDFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvV2ViUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dl YlBhZ2UuY3BwCkBAIC0yMDAwLDkgKzIwMDAsMTAgQEAgdm9pZCBXZWJQYWdlOjp1cGRhdGVQcmVm ZXJlbmNlcyhjb25zdCBXZWJQcmVmZXJlbmNlc1N0b3JlJiBzdG9yZSkKICAgICBzZXR0aW5ncy0+ c2V0V2ViQXVkaW9FbmFibGVkKHN0b3JlLmdldEJvb2xWYWx1ZUZvcktleShXZWJQcmVmZXJlbmNl c0tleTo6d2ViQXVkaW9FbmFibGVkS2V5KCkpKTsKICNlbmRpZgogCi0gICAgc2V0dGluZ3MtPnNl dEFwcGxpY2F0aW9uQ2hyb21lTW9kZShzdG9yZS5nZXRCb29sVmFsdWVGb3JLZXkoV2ViUHJlZmVy ZW5jZXNLZXk6OmFwcGxpY2F0aW9uQ2hyb21lTW9kZUtleSgpKSk7ICAgIAorICAgIHNldHRpbmdz LT5zZXRBcHBsaWNhdGlvbkNocm9tZU1vZGUoc3RvcmUuZ2V0Qm9vbFZhbHVlRm9yS2V5KFdlYlBy ZWZlcmVuY2VzS2V5OjphcHBsaWNhdGlvbkNocm9tZU1vZGVLZXkoKSkpOwogICAgIHNldHRpbmdz LT5zZXRTdXBwcmVzc2VzSW5jcmVtZW50YWxSZW5kZXJpbmcoc3RvcmUuZ2V0Qm9vbFZhbHVlRm9y S2V5KFdlYlByZWZlcmVuY2VzS2V5OjpzdXBwcmVzc2VzSW5jcmVtZW50YWxSZW5kZXJpbmdLZXko KSkpOwogICAgIHNldHRpbmdzLT5zZXRCYWNrc3BhY2VLZXlOYXZpZ2F0aW9uRW5hYmxlZChzdG9y ZS5nZXRCb29sVmFsdWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNLZXk6OmJhY2tzcGFjZUtleU5hdmln YXRpb25FbmFibGVkS2V5KCkpKTsKKyAgICBzZXR0aW5ncy0+c2V0V2FudHNCYWxhbmNlZFNldERl ZmVyc0xvYWRpbmdCZWhhdmlvcihzdG9yZS5nZXRCb29sVmFsdWVGb3JLZXkoV2ViUHJlZmVyZW5j ZXNLZXk6OndhbnRzQmFsYW5jZWRTZXREZWZlcnNMb2FkaW5nQmVoYXZpb3JLZXkoKSkpOwogICAg IHNldHRpbmdzLT5zZXRDYXJldEJyb3dzaW5nRW5hYmxlZChzdG9yZS5nZXRCb29sVmFsdWVGb3JL ZXkoV2ViUHJlZmVyZW5jZXNLZXk6OmNhcmV0QnJvd3NpbmdFbmFibGVkS2V5KCkpKTsKIAogI2lm IEVOQUJMRShWSURFT19UUkFDSykKLS0gCjEuNy45LjYgKEFwcGxlIEdpdC0zMSkKCg==