57285 2011-03-28 16:46:54 -0700 Remove specialization of EventDispatcher with inversion of control. 2011-03-29 10:58:07 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 55515 1 dglazkov dglazkov abarth darin eric webkit.review.bot oldest_to_newest 374893 0 dglazkov 2011-03-28 16:46:54 -0700 Remove specialization of EventDispatcher with inversion of control. 374895 1 87237 dglazkov 2011-03-28 16:50:45 -0700 Created attachment 87237 Patch 374897 2 webkit.review.bot 2011-03-28 16:54:51 -0700 Attachment 87237 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/dom/KeyboardEvent.h:32: Code inside a namespace should not be indented. [whitespace/indent] [4] Total errors found: 1 in 8 files If any of these errors are false positives, please file a bug against check-webkit-style. 374938 3 dglazkov 2011-03-28 18:32:36 -0700 (In reply to comment #2) > Attachment 87237 [details] 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/dom/KeyboardEvent.h:32: Code inside a namespace should not be indented. [whitespace/indent] [4] > Total errors found: 1 in 8 files > > > If any of these errors are false positives, please file a bug against check-webkit-style. Don't be sad, style elf. This file is old, and I am just adding one line to it. 374984 4 87237 eric 2011-03-28 21:29:10 -0700 Comment on attachment 87237 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=87237&action=review > Source/WebCore/dom/EventDispatcher.cpp:61 > bool EventDispatcher::dispatchEvent(Node* node, PassRefPtr<Event> event) > { > EventDispatcher dispatcher(node); > - return dispatcher.dispatchEvent(event); > + RefPtr<Event> dispatchedEvent = event; > + return dispatchedEvent->dispatch(&dispatcher); > } So this will eventually go away? 374985 5 87237 dglazkov 2011-03-28 21:30:11 -0700 Comment on attachment 87237 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=87237&action=review >> Source/WebCore/dom/EventDispatcher.cpp:61 >> } > > So this will eventually go away? No, that's the only thing that'll stay. 374988 6 87237 eric 2011-03-28 21:36:32 -0700 Comment on attachment 87237 Patch OK. I'm not 100% convinced of the direction, but I trust you, and would like to let you paint your picture so we can all see it! 375416 7 dglazkov 2011-03-29 09:21:13 -0700 Committed r82264: <http://trac.webkit.org/changeset/82264> 375532 8 webkit.review.bot 2011-03-29 10:58:07 -0700 http://trac.webkit.org/changeset/82264 might have broken GTK Linux 32-bit Release The following tests are not passing: fast/loader/onload-willSendRequest-null-for-frame.html 87237 2011-03-28 16:50:45 -0700 2011-03-28 21:36:32 -0700 Patch bug-57285-20110328165044.patch text/plain 8098 dglazkov U3VidmVyc2lvbiBSZXZpc2lvbjogODIxNjMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA0NDA2M2FlMzUxM2RiMjIz MjdkYjg4MjViYzY2ZWM1Y2QxNWVmMTU5Li4zNzMxNDVlOTdkNzQ5NTJiN2Y4MTdmMWQxMmQyYTE0 YzU5MTEwY2I4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAKKzIwMTEtMDMtMjggIERpbWl0 cmkgR2xhemtvdiAgPGRnbGF6a292QGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmUgc3BlY2lhbGl6YXRpb24gb2YgRXZl bnREaXNwYXRjaGVyIHdpdGggaW52ZXJzaW9uIG9mIGNvbnRyb2wuCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NzI4NQorCisgICAgICAgIFNpbmNlIHNv bWUgZXZlbnRzIGhhdmUgZXh0cmEgbG9naWMgYXJvdW5kIHRoZWlyIGRpc3BhdGNoLCBhbGxvdyB0 aGVtCisgICAgICAgIHRvIGRpc3BhdGNoIHRoZW1zZWx2ZXMgYW5kIHNwZWNpYWxpemUgdGhlIGxv Z2ljLiBUaGlzIGNoYW5nZSBvbmx5CisgICAgICAgIGNvbnZlcnRzIEtleWJvYXJkRXZlbnQgdG8g dGhpcyBtb2RlbC4KKworICAgICAgICBObyBmdW5jdGlvbmFsIGNoYW5nZSwgY292ZXJlZCBieSBl eGlzdGluZyB0ZXN0cy4KKworICAgICAgICAqIGRvbS9FdmVudC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpFdmVudDo6ZGlzcGF0Y2gpOiBBZGRlZC4KKyAgICAgICAgKiBkb20vRXZlbnQuaDogVXBk YXRlZCBkZWNscy4KKyAgICAgICAgKiBkb20vRXZlbnREaXNwYXRjaGVyLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkV2ZW50RGlzcGF0Y2hlcjo6ZGlzcGF0Y2hFdmVudCk6IENoYW5nZWQgdG8gYXNr IGV2ZW50IHRvIGRpc3BhdGNoCisgICAgICAgICAgICBpdHNlbGYuCisgICAgICAgICogZG9tL0V2 ZW50RGlzcGF0Y2hlci5oOiBVcGRhdGVkIGRlY2xzLgorICAgICAgICAqIGRvbS9LZXlib2FyZEV2 ZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OktleWJvYXJkRXZlbnQ6OmRpc3BhdGNoKTogQWRk ZWQsIG1vdmluZyBjb2RlIGZyb20gRXZlbnREaXNwYXRjaGVyLgorICAgICAgICAqIGRvbS9LZXli b2FyZEV2ZW50Lmg6IFVwZGF0ZWQgZGVjbHMuCisgICAgICAgICogZG9tL05vZGUuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6Tm9kZTo6ZGlzcGF0Y2hLZXlFdmVudCk6IENoYW5nZWQgdG8gdXNlIHRo ZSBuZXcgd2F5cy4KKwogMjAxMS0wMy0yOCAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBw bGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNhbSBXZWluaWcuCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9kb20vRXZlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL0V2ZW50LmNw cAppbmRleCA3OTVkYWNlMzRlY2EwNzQzNDU1ZjJiYThjMmZmYzI3N2I4YzMyYTY1Li41M2M0M2Y2 MWFjNTkzMmUyZTdjOTM0ODc5MDRmN2ZhOGZhNDk0OWY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9kb20vRXZlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FdmVudC5jcHAKQEAg LTIyLDYgKzIyLDcgQEAKIAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIkV2ZW50Lmgi CisjaW5jbHVkZSAiRXZlbnREaXNwYXRjaGVyLmgiCiAjaW5jbHVkZSAiRXZlbnRUYXJnZXQuaCIK IAogI2luY2x1ZGUgIlVzZXJHZXN0dXJlSW5kaWNhdG9yLmgiCkBAIC0yNzAsNiArMjcxLDExIEBA IHZvaWQgRXZlbnQ6OnN0b3JlUmVzdWx0KGNvbnN0IFN0cmluZyYpCiB7CiB9CiAKK2Jvb2wgRXZl bnQ6OmRpc3BhdGNoKEV2ZW50RGlzcGF0Y2hlciogZGlzcGF0Y2hlcikKK3sKKyAgICByZXR1cm4g ZGlzcGF0Y2hlci0+ZGlzcGF0Y2hFdmVudCh0aGlzKTsKK30KKwogdm9pZCBFdmVudDo6c2V0VGFy Z2V0KFBhc3NSZWZQdHI8RXZlbnRUYXJnZXQ+IHRhcmdldCkKIHsKICAgICBtX3RhcmdldCA9IHRh cmdldDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9FdmVudC5oIGIvU291cmNlL1dl YkNvcmUvZG9tL0V2ZW50LmgKaW5kZXggYmE5NTc2YjU0M2YzZGY5YjZkOTdkM2ViNzM4ZDgyZDAx NjlmN2FmNS4uZDRkN2UwNmMxOWZkMThiZDk0Yzk3OTQyOGIyMTIyY2M2ZDY3YzY0NyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0V2ZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvZG9t L0V2ZW50LmgKQEAgLTMyLDYgKzMyLDcgQEAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogICAgIGNs YXNzIEV2ZW50VGFyZ2V0OworICAgIGNsYXNzIEV2ZW50RGlzcGF0Y2hlcjsKIAogICAgIGNsYXNz IEV2ZW50IDogcHVibGljIFJlZkNvdW50ZWQ8RXZlbnQ+IHsKICAgICBwdWJsaWM6CkBAIC0xNjUs NiArMTY2LDggQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiAgICAgICAgIHZpcnR1YWwgQ2xpcGJv YXJkKiBjbGlwYm9hcmQoKSBjb25zdCB7IHJldHVybiAwOyB9CiAKKyAgICAgICAgdmlydHVhbCBi b29sIGRpc3BhdGNoKEV2ZW50RGlzcGF0Y2hlciopOworCiAgICAgcHJvdGVjdGVkOgogICAgICAg ICBFdmVudCgpOwogICAgICAgICBFdmVudChjb25zdCBBdG9taWNTdHJpbmcmIHR5cGUsIGJvb2wg Y2FuQnViYmxlLCBib29sIGNhbmNlbGFibGUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv ZG9tL0V2ZW50RGlzcGF0Y2hlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRXZlbnREaXNwYXRj aGVyLmNwcAppbmRleCAzNGUxNmY1YThjMDYxMmViNWI1YTU3NjlmNWQ5YjQyOTY3MjJmMDMwLi5h Y2I0MjBmY2E4Yzk1N2NhNjE1NzAzYzEyZWQ1ODlkZDhjNzFjMzdiIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9kb20vRXZlbnREaXNwYXRjaGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9k b20vRXZlbnREaXNwYXRjaGVyLmNwcApAQCAtMzEsNyArMzEsNiBAQAogI2luY2x1ZGUgIkV2ZW50 VGFyZ2V0LmgiCiAjaW5jbHVkZSAiRnJhbWVWaWV3LmgiCiAjaW5jbHVkZSAiSW5zcGVjdG9ySW5z dHJ1bWVudGF0aW9uLmgiCi0jaW5jbHVkZSAiS2V5Ym9hcmRFdmVudC5oIgogI2luY2x1ZGUgIk1v dXNlRXZlbnQuaCIKICNpbmNsdWRlICJOb2RlLmgiCiAjaW5jbHVkZSAiUGxhdGZvcm1XaGVlbEV2 ZW50LmgiCkBAIC01Nyw3ICs1Niw4IEBAIHN0YXRpYyBIYXNoU2V0PE5vZGUqPiogZ05vZGVzRGlz cGF0Y2hpbmdTaW11bGF0ZWRDbGlja3MgPSAwOwogYm9vbCBFdmVudERpc3BhdGNoZXI6OmRpc3Bh dGNoRXZlbnQoTm9kZSogbm9kZSwgUGFzc1JlZlB0cjxFdmVudD4gZXZlbnQpCiB7CiAgICAgRXZl bnREaXNwYXRjaGVyIGRpc3BhdGNoZXIobm9kZSk7Ci0gICAgcmV0dXJuIGRpc3BhdGNoZXIuZGlz cGF0Y2hFdmVudChldmVudCk7CisgICAgUmVmUHRyPEV2ZW50PiBkaXNwYXRjaGVkRXZlbnQgPSBl dmVudDsKKyAgICByZXR1cm4gZGlzcGF0Y2hlZEV2ZW50LT5kaXNwYXRjaCgmZGlzcGF0Y2hlcik7 CiB9CiAKIHN0YXRpYyBFdmVudFRhcmdldCogZmluZEVsZW1lbnRJbnN0YW5jZShOb2RlKiByZWZl cmVuY2VOb2RlKQpAQCAtOTgsMTUgKzk4LDYgQEAgdm9pZCBFdmVudERpc3BhdGNoZXI6OmRpc3Bh dGNoU2NvcGVkRXZlbnQoTm9kZSogbm9kZSwgUGFzc1JlZlB0cjxFdmVudD4gZXZlbnQpCiAgICAg U2NvcGVkRXZlbnRRdWV1ZTo6aW5zdGFuY2UoKS0+ZW5xdWV1ZUV2ZW50KGV2ZW50KTsKIH0KIAot Ym9vbCBFdmVudERpc3BhdGNoZXI6OmRpc3BhdGNoS2V5Ym9hcmRFdmVudChOb2RlKiBub2RlLCBj b25zdCBQbGF0Zm9ybUtleWJvYXJkRXZlbnQmIGV2ZW50KQotewotICAgIEV2ZW50RGlzcGF0Y2hl ciBkaXNwYXRjaGVyKG5vZGUpOwotCi0gICAgUmVmUHRyPEtleWJvYXJkRXZlbnQ+IGtleWJvYXJk RXZlbnQgPSBLZXlib2FyZEV2ZW50OjpjcmVhdGUoZXZlbnQsIG5vZGUtPmRvY3VtZW50KCktPmRl ZmF1bHRWaWV3KCkpOwotICAgIC8vIE1ha2Ugc3VyZSBub3QgdG8gcmV0dXJuIHRydWUgaWYgd2Ug YWxyZWFkeSB0b29rIGRlZmF1bHQgYWN0aW9uIHdoaWxlIGhhbmRsaW5nIHRoZSBldmVudC4KLSAg ICByZXR1cm4gZGlzcGF0Y2hlci5kaXNwYXRjaEV2ZW50KGtleWJvYXJkRXZlbnQpICYmICFrZXli b2FyZEV2ZW50LT5kZWZhdWx0SGFuZGxlZCgpOwotfQotCiBib29sIEV2ZW50RGlzcGF0Y2hlcjo6 ZGlzcGF0Y2hNb3VzZUV2ZW50KE5vZGUqIG5vZGUsIGNvbnN0IFBsYXRmb3JtTW91c2VFdmVudCYg ZXZlbnQsIGNvbnN0IEF0b21pY1N0cmluZyYgZXZlbnRUeXBlLAogICAgIGludCBkZXRhaWwsIE5v ZGUqIHJlbGF0ZWRUYXJnZXQpCiB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRXZl bnREaXNwYXRjaGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9kb20vRXZlbnREaXNwYXRjaGVyLmgKaW5k ZXggMjNmZDM5Mjk4Njg4NmQzMzM1ZGIzNDE1MTYxYjdlYmVkNzgwMzdiNi4uMzcyYzY3OGViMmMw NWI3NmQ0MzBmZWJlMzJhODkwZWU3MDA2YjlhNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv ZG9tL0V2ZW50RGlzcGF0Y2hlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FdmVudERpc3Bh dGNoZXIuaApAQCAtNDUsMTcgKzQ1LDE2IEBAIGVudW0gRXZlbnREaXNwYXRjaEJlaGF2aW9yIHsK ICAgICBTdGF5SW5zaWRlU2hhZG93RE9NCiB9OwogCi0KIGNsYXNzIEV2ZW50RGlzcGF0Y2hlciB7 CiBwdWJsaWM6CiAgICAgc3RhdGljIGJvb2wgZGlzcGF0Y2hFdmVudChOb2RlKiwgUGFzc1JlZlB0 cjxFdmVudD4pOwogICAgIHN0YXRpYyB2b2lkIGRpc3BhdGNoU2NvcGVkRXZlbnQoTm9kZSosIFBh c3NSZWZQdHI8RXZlbnQ+KTsKIAotICAgIHN0YXRpYyBib29sIGRpc3BhdGNoS2V5Ym9hcmRFdmVu dChOb2RlKiwgY29uc3QgUGxhdGZvcm1LZXlib2FyZEV2ZW50Jik7CiAgICAgc3RhdGljIGJvb2wg ZGlzcGF0Y2hNb3VzZUV2ZW50KE5vZGUqLCBjb25zdCBQbGF0Zm9ybU1vdXNlRXZlbnQmLCBjb25z dCBBdG9taWNTdHJpbmcmIGV2ZW50VHlwZSwgaW50IGNsaWNrQ291bnQgPSAwLCBOb2RlKiByZWxh dGVkVGFyZ2V0ID0gMCk7CiAgICAgc3RhdGljIHZvaWQgZGlzcGF0Y2hTaW11bGF0ZWRDbGljayhO b2RlKiwgUGFzc1JlZlB0cjxFdmVudD4gdW5kZXJseWluZ0V2ZW50LCBib29sIHNlbmRNb3VzZUV2 ZW50cyA9IGZhbHNlLCBib29sIHNob3dQcmVzc2VkTG9vayA9IHRydWUpOwogICAgIHN0YXRpYyB2 b2lkIGRpc3BhdGNoV2hlZWxFdmVudChOb2RlKiwgUGxhdGZvcm1XaGVlbEV2ZW50Jik7CiAKKyAg ICBib29sIGRpc3BhdGNoRXZlbnQoUGFzc1JlZlB0cjxFdmVudD4pOwogcHJpdmF0ZToKICAgICBF dmVudERpc3BhdGNoZXIoTm9kZSopOwogCkBAIC02NCw3ICs2Myw2IEBAIHByaXZhdGU6CiAgICAg Y29uc3QgRXZlbnRDb250ZXh0KiB0b3BFdmVudENvbnRleHQoKTsKICAgICBib29sIGFuY2VzdG9y c0luaXRpYWxpemVkKCkgY29uc3Q7CiAKLSAgICBib29sIGRpc3BhdGNoRXZlbnQoUGFzc1JlZlB0 cjxFdmVudD4pOwogICAgIGJvb2wgZGlzcGF0Y2hNb3VzZUV2ZW50KGNvbnN0IEF0b21pY1N0cmlu ZyYgZXZlbnRUeXBlLCBpbnQgYnV0dG9uLCBpbnQgZGV0YWlsLAogICAgICAgICBpbnQgcGFnZVgs IGludCBwYWdlWSwgaW50IHNjcmVlblgsIGludCBzY3JlZW5ZLCBib29sIGN0cmxLZXksIGJvb2wg YWx0S2V5LCBib29sIHNoaWZ0S2V5LCBib29sIG1ldGFLZXksCiAgICAgICAgIGJvb2wgaXNTaW11 bGF0ZWQsIE5vZGUqIHJlbGF0ZWRUYXJnZXRBcmcsIFBhc3NSZWZQdHI8RXZlbnQ+IHVuZGVybHlp bmdFdmVudCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vS2V5Ym9hcmRFdmVudC5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vS2V5Ym9hcmRFdmVudC5jcHAKaW5kZXggN2IwZjNhZjVm MjI1ODAyYWVjNmMzMzgxMmNlMDRiNjQ4ZTQxYTFlNy4uYzk3ZThjYzUwOWFmMDI4ODBiOTdjNmYx YWM5ODhiYjBhMDlhZTNlMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0tleWJvYXJk RXZlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9LZXlib2FyZEV2ZW50LmNwcApAQCAt MjUsNiArMjUsNyBAQAogCiAjaW5jbHVkZSAiRG9jdW1lbnQuaCIKICNpbmNsdWRlICJET01XaW5k b3cuaCIKKyNpbmNsdWRlICJFdmVudERpc3BhdGNoZXIuaCIKICNpbmNsdWRlICJFdmVudE5hbWVz LmgiCiAjaW5jbHVkZSAiRXZlbnRIYW5kbGVyLmgiCiAjaW5jbHVkZSAiRnJhbWUuaCIKQEAgLTE2 MCw0ICsxNjEsMTAgQEAgS2V5Ym9hcmRFdmVudCogZmluZEtleWJvYXJkRXZlbnQoRXZlbnQqIGV2 ZW50KQogICAgIHJldHVybiAwOwogfQogCitib29sIEtleWJvYXJkRXZlbnQ6OmRpc3BhdGNoKEV2 ZW50RGlzcGF0Y2hlciogZGlzcGF0Y2hlcikKK3sKKyAgICAvLyBNYWtlIHN1cmUgbm90IHRvIHJl dHVybiB0cnVlIGlmIHdlIGFscmVhZHkgdG9vayBkZWZhdWx0IGFjdGlvbiB3aGlsZSBoYW5kbGlu ZyB0aGUgZXZlbnQuCisgICAgcmV0dXJuIGRpc3BhdGNoZXItPmRpc3BhdGNoRXZlbnQodGhpcykg JiYgIXRoaXMtPmRlZmF1bHRIYW5kbGVkKCk7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9LZXlib2FyZEV2ZW50LmggYi9Tb3VyY2Uv V2ViQ29yZS9kb20vS2V5Ym9hcmRFdmVudC5oCmluZGV4IGVlYWVmODA1NTQ4NWFmY2Y5YTcwZmEw OGI2ZDU1M2YxZmJmYjUwYjMuLjJhNzUyNjhlMzczYTE1MTMzMzZjMzE5ZDBmNjU1YjJhNTk2N2Nk ZWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9LZXlib2FyZEV2ZW50LmgKKysrIGIv U291cmNlL1dlYkNvcmUvZG9tL0tleWJvYXJkRXZlbnQuaApAQCAtMjksNiArMjksOCBAQAogCiBu YW1lc3BhY2UgV2ViQ29yZSB7CiAKKyAgICBjbGFzcyBFdmVudERpc3BhdGNoZXI7CisgICAgY2xh c3MgTm9kZTsKICAgICBjbGFzcyBQbGF0Zm9ybUtleWJvYXJkRXZlbnQ7CiAKICNpZiBQTEFURk9S TShNQUMpCkBAIC05Myw2ICs5NSw4IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgVmVj dG9yPEtleXByZXNzQ29tbWFuZD4mIGtleXByZXNzQ29tbWFuZHMoKSB7IHJldHVybiBtX2tleXBy ZXNzQ29tbWFuZHM7IH0KICNlbmRpZgogCisgICAgICAgIHZpcnR1YWwgYm9vbCBkaXNwYXRjaChF dmVudERpc3BhdGNoZXIqKTsKKwogICAgIHByaXZhdGU6CiAgICAgICAgIEtleWJvYXJkRXZlbnQo KTsKICAgICAgICAgS2V5Ym9hcmRFdmVudChjb25zdCBQbGF0Zm9ybUtleWJvYXJkRXZlbnQmLCBB YnN0cmFjdFZpZXcqKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmNwcCBi L1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmNwcAppbmRleCA2YjA1ZTY0ODI2YTVjYmQ1YjYwYzAz ZGZmNGM0Y2I4MDAxNGZhYWE5Li45ZWNiY2NiNWNkN2NlYzhiM2I4OTMxMWIxMTMxNjFkNTIxNDhi NTIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vTm9kZS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvZG9tL05vZGUuY3BwCkBAIC0yNjM3LDkgKzI2MzcsOSBAQCB2b2lkIE5vZGU6OmRp c3BhdGNoVUlFdmVudChjb25zdCBBdG9taWNTdHJpbmcmIGV2ZW50VHlwZSwgaW50IGRldGFpbCwg UGFzc1JlZlB0cgogICAgIGRpc3BhdGNoU2NvcGVkRXZlbnQoZXZlbnQucmVsZWFzZSgpKTsKIH0K IAotYm9vbCBOb2RlOjpkaXNwYXRjaEtleUV2ZW50KGNvbnN0IFBsYXRmb3JtS2V5Ym9hcmRFdmVu dCYga2V5KQorYm9vbCBOb2RlOjpkaXNwYXRjaEtleUV2ZW50KGNvbnN0IFBsYXRmb3JtS2V5Ym9h cmRFdmVudCYgZXZlbnQpCiB7Ci0gICAgcmV0dXJuIEV2ZW50RGlzcGF0Y2hlcjo6ZGlzcGF0Y2hL ZXlib2FyZEV2ZW50KHRoaXMsIGtleSk7CisgICAgcmV0dXJuIEV2ZW50RGlzcGF0Y2hlcjo6ZGlz cGF0Y2hFdmVudCh0aGlzLCBLZXlib2FyZEV2ZW50OjpjcmVhdGUoZXZlbnQsIGRvY3VtZW50KCkt PmRlZmF1bHRWaWV3KCkpKTsKIH0KIAogYm9vbCBOb2RlOjpkaXNwYXRjaE1vdXNlRXZlbnQoY29u c3QgUGxhdGZvcm1Nb3VzZUV2ZW50JiBldmVudCwgY29uc3QgQXRvbWljU3RyaW5nJiBldmVudFR5 cGUsCg==