57562 2011-03-31 10:30:01 -0700 Introduce EventDispatchMediator abstraction, which encapsulate all non-trivial logic around firing a specific type of an event. 2011-04-04 16:23:15 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 55515 57521 57639 1 dglazkov dglazkov abarth darin sam oldest_to_newest 377302 0 dglazkov 2011-03-31 10:30:01 -0700 Introduce EventManager abstraction, which encapsulate all non-trivial logic around firing a specific type of an event. 377303 1 87760 dglazkov 2011-03-31 10:30:46 -0700 Created attachment 87760 EventManager sketch. 377305 2 87760 darin 2011-03-31 10:32:30 -0700 Comment on attachment 87760 EventManager sketch. View in context: https://bugs.webkit.org/attachment.cgi?id=87760&action=review > Source/WebCore/ChangeLog:6 > + Introduce EventManager abstraction, which encapsulate all non-trivial logic around firing a specific type of an event. > + https://bugs.webkit.org/show_bug.cgi?id=57562 I like the idea of factoring like this. I do not like the name “manager”. Having objects that are “managers” is something of a class design anti-pattern. We should think about other names and get a more specific sense of what this class is so we can name it well. 377306 3 dglazkov 2011-03-31 10:32:47 -0700 Event and KeyboardEvent are converted to use the abstraction in this patch. It's not terribly exciting, but it will get more interesting with MouseEventManager, WheelEventManager, and SimulatedClickEventManager. WDYT? 377308 4 dglazkov 2011-03-31 10:33:52 -0700 (In reply to comment #2) > (From update of attachment 87760 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=87760&action=review > > > Source/WebCore/ChangeLog:6 > > + Introduce EventManager abstraction, which encapsulate all non-trivial logic around firing a specific type of an event. > > + https://bugs.webkit.org/show_bug.cgi?id=57562 > > I like the idea of factoring like this. > > I do not like the name “manager”. Having objects that are “managers” is something of a class design anti-pattern. > > We should think about other names and get a more specific sense of what this class is so we can name it well. Mediator? 377311 5 dglazkov 2011-03-31 10:34:17 -0700 (In reply to comment #4) > (In reply to comment #2) > > (From update of attachment 87760 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=87760&action=review > > > > > Source/WebCore/ChangeLog:6 > > > + Introduce EventManager abstraction, which encapsulate all non-trivial logic around firing a specific type of an event. > > > + https://bugs.webkit.org/show_bug.cgi?id=57562 > > > > I like the idea of factoring like this. > > > > I do not like the name “manager”. Having objects that are “managers” is something of a class design anti-pattern. > > > > We should think about other names and get a more specific sense of what this class is so we can name it well. > > Mediator? http://en.wikipedia.org/wiki/Mediator_pattern 377324 6 dglazkov 2011-03-31 10:46:50 -0700 (In reply to comment #5) > (In reply to comment #4) > > (In reply to comment #2) > > > (From update of attachment 87760 [details] [details] [details]) > > > View in context: https://bugs.webkit.org/attachment.cgi?id=87760&action=review > > > > > > > Source/WebCore/ChangeLog:6 > > > > + Introduce EventManager abstraction, which encapsulate all non-trivial logic around firing a specific type of an event. > > > > + https://bugs.webkit.org/show_bug.cgi?id=57562 > > > > > > I like the idea of factoring like this. > > > > > > I do not like the name “manager”. Having objects that are “managers” is something of a class design anti-pattern. > > > > > > We should think about other names and get a more specific sense of what this class is so we can name it well. > > > > Mediator? > > http://en.wikipedia.org/wiki/Mediator_pattern It's an EventDispatchMediator, which is a mouthful. Maybe Sam can shine his moniker-smithing brilliance at us? BTW, I am sorry I forgot to tell Dominic to add the test to wk2/Skipped list! :) 377588 7 87813 dglazkov 2011-03-31 18:33:21 -0700 Created attachment 87813 Patch 379085 8 87813 abarth 2011-04-04 14:37:38 -0700 Comment on attachment 87813 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=87813&action=review > Source/WebCore/dom/Event.h:196 > +class EventDispatchMediator { We usually have one class per file. However, EventDispatchMediator looks pretty trivial, so maybe it makes sense to keep here... > Source/WebCore/dom/Event.h:198 > + EventDispatchMediator(PassRefPtr<Event>); Please add the explicit keyword. The style checker should really complain about that. > Source/WebCore/dom/KeyboardEvent.h:119 > + KeyboardEventDispatchMediator(PassRefPtr<KeyboardEvent>); explicit 379088 9 abarth 2011-04-04 14:39:18 -0700 https://bugs.webkit.org/show_bug.cgi?id=57791 is the check-webkit-style bug. 379187 10 dglazkov 2011-04-04 16:23:15 -0700 Committed r82891: <http://trac.webkit.org/changeset/82891> 87760 2011-03-31 10:30:46 -0700 2011-03-31 18:33:18 -0700 EventManager sketch. bug-57562-20110331103045.patch text/plain 7389 dglazkov U3VidmVyc2lvbiBSZXZpc2lvbjogODI1ODQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAyMWMwZTcyNzE5ZTA0ZTY5 NjkxZGRhNGI2N2IzODE1OGI2NjkxY2M3Li4yNjBhMjJmNGUzZjRkZjdhYTEwMjE4MzQyMDZiNzNl YjczNjgwYjk2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzAgQEAKIDIwMTEtMDMtMzEgIERpbWl0 cmkgR2xhemtvdiAgPGRnbGF6a292QGNocm9taXVtLm9yZz4KIAorICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbnRyb2R1Y2UgRXZlbnRNYW5hZ2VyIGFic3Ry YWN0aW9uLCB3aGljaCBlbmNhcHN1bGF0ZSBhbGwgbm9uLXRyaXZpYWwgbG9naWMgYXJvdW5kIGZp cmluZyBhIHNwZWNpZmljIHR5cGUgb2YgYW4gZXZlbnQuCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NzU2MgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4g KE9PUFMhKQorCisgICAgICAgICogZG9tL0V2ZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkV2 ZW50TWFuYWdlcjo6RXZlbnRNYW5hZ2VyKToKKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50TWFuYWdl cjo6fkV2ZW50TWFuYWdlcik6CisgICAgICAgIChXZWJDb3JlOjpFdmVudE1hbmFnZXI6OmRpc3Bh dGNoRXZlbnQpOgorICAgICAgICAoV2ViQ29yZTo6RXZlbnRNYW5hZ2VyOjpldmVudCk6CisgICAg ICAgICogZG9tL0V2ZW50Lmg6CisgICAgICAgICogZG9tL0V2ZW50RGlzcGF0Y2hlci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpFdmVudERpc3BhdGNoZXI6OmRpc3BhdGNoRXZlbnQpOgorICAgICAg ICAqIGRvbS9FdmVudERpc3BhdGNoZXIuaDoKKyAgICAgICAgKiBkb20vS2V5Ym9hcmRFdmVudC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpLZXlib2FyZEV2ZW50TWFuYWdlcjo6S2V5Ym9hcmRFdmVu dE1hbmFnZXIpOgorICAgICAgICAoV2ViQ29yZTo6S2V5Ym9hcmRFdmVudE1hbmFnZXI6OmRpc3Bh dGNoRXZlbnQpOgorICAgICAgICAqIGRvbS9LZXlib2FyZEV2ZW50Lmg6CisgICAgICAgICogZG9t L05vZGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Tm9kZTo6ZGlzcGF0Y2hLZXlFdmVudCk6CisK KzIwMTEtMDMtMzEgIERpbWl0cmkgR2xhemtvdiAgPGRnbGF6a292QGNocm9taXVtLm9yZz4KKwog ICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KIAogICAgICAgICBNb3ZlIGNvb3JkaW5h dGUtY29tcHV0aW5nIGxvZ2ljIGludG8gTW91c2VSZWxhdGVkRXZlbnQuCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9kb20vRXZlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL0V2ZW50LmNw cAppbmRleCBhMTM1MmRjMTdlMWI0ZTMzOWZjY2IwODE5Yzc0NzdkMjMxNDY5MjQ2Li5mOTY0ZmFm MWYxNGZhNWU5MjJlYzMzNmIxMGI0MTcxNzMxODgzNTUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9kb20vRXZlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FdmVudC5jcHAKQEAg LTI3MSwxMSArMjcxLDYgQEAgdm9pZCBFdmVudDo6c3RvcmVSZXN1bHQoY29uc3QgU3RyaW5nJikK IHsKIH0KIAotYm9vbCBFdmVudDo6ZGlzcGF0Y2goRXZlbnREaXNwYXRjaGVyKiBkaXNwYXRjaGVy KQotewotICAgIHJldHVybiBkaXNwYXRjaGVyLT5kaXNwYXRjaEV2ZW50KHRoaXMpOwotfQotCiB2 b2lkIEV2ZW50OjpzZXRUYXJnZXQoUGFzc1JlZlB0cjxFdmVudFRhcmdldD4gdGFyZ2V0KQogewog ICAgIGlmIChtX3RhcmdldCA9PSB0YXJnZXQpCkBAIC0yOTksNCArMjk0LDIzIEBAIHZvaWQgRXZl bnQ6OnNldFVuZGVybHlpbmdFdmVudChQYXNzUmVmUHRyPEV2ZW50PiB1ZSkKICAgICBtX3VuZGVy bHlpbmdFdmVudCA9IHVlOwogfQogCitFdmVudE1hbmFnZXI6OkV2ZW50TWFuYWdlcihQYXNzUmVm UHRyPEV2ZW50PiBldmVudCkKKyAgICA6IG1fZXZlbnQoZXZlbnQpCit7Cit9CisKK0V2ZW50TWFu YWdlcjo6fkV2ZW50TWFuYWdlcigpCit7Cit9CisKK2Jvb2wgRXZlbnRNYW5hZ2VyOjpkaXNwYXRj aEV2ZW50KEV2ZW50RGlzcGF0Y2hlciogZGlzcGF0Y2hlcikgY29uc3QKK3sKKyAgICByZXR1cm4g ZGlzcGF0Y2hlci0+ZGlzcGF0Y2hFdmVudChtX2V2ZW50LmdldCgpKTsKK30KKworRXZlbnQqIEV2 ZW50TWFuYWdlcjo6ZXZlbnQoKSBjb25zdAoreworICAgIHJldHVybiBtX2V2ZW50LmdldCgpOwor fQorCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9k b20vRXZlbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FdmVudC5oCmluZGV4IGQ0ZDdlMDZjMTlm ZDE4YmQ5NGM5Nzk0MjhiMjEyMmNjNmQ2N2M2NDcuLjI0ZTMzZGNlOTdhYjE0ODJiNzJjZjE2YWFk N2QxZDFiNDIzY2YyMTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9FdmVudC5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FdmVudC5oCkBAIC0xNjYsNyArMTY2LDYgQEAgbmFtZXNw YWNlIFdlYkNvcmUgewogCiAgICAgICAgIHZpcnR1YWwgQ2xpcGJvYXJkKiBjbGlwYm9hcmQoKSBj b25zdCB7IHJldHVybiAwOyB9CiAKLSAgICAgICAgdmlydHVhbCBib29sIGRpc3BhdGNoKEV2ZW50 RGlzcGF0Y2hlciopOwogCiAgICAgcHJvdGVjdGVkOgogICAgICAgICBFdmVudCgpOwpAQCAtMTk0 LDYgKzE5MywxNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIFJlZlB0cjxFdmVudD4g bV91bmRlcmx5aW5nRXZlbnQ7CiAgICAgfTsKIAorY2xhc3MgRXZlbnRNYW5hZ2VyIHsKK3B1Ymxp YzoKKyAgICBFdmVudE1hbmFnZXIoUGFzc1JlZlB0cjxFdmVudD4pOworICAgIHZpcnR1YWwgfkV2 ZW50TWFuYWdlcigpOworCisgICAgdmlydHVhbCBib29sIGRpc3BhdGNoRXZlbnQoRXZlbnREaXNw YXRjaGVyKikgY29uc3Q7CisgICAgRXZlbnQqIGV2ZW50KCkgY29uc3Q7Citwcml2YXRlOgorICAg IFJlZlB0cjxFdmVudD4gbV9ldmVudDsKK307CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKIAog I2VuZGlmIC8vIEV2ZW50X2gKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9FdmVudERp c3BhdGNoZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL0V2ZW50RGlzcGF0Y2hlci5jcHAKaW5k ZXggYzJjZjA5Mjg3ZjcxMWJiNjUzYzIyMjAyY2RlMGJhMDJlOWYyYWExNS4uN2RjMTRjYjU2OTEz ZmVjNWJiYjQyYmQ1YTZhYjI0YjU4ODMzM2Q0NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv ZG9tL0V2ZW50RGlzcGF0Y2hlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0V2ZW50RGlz cGF0Y2hlci5jcHAKQEAgLTUzLDEyICs1MywxMCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIHN0 YXRpYyBIYXNoU2V0PE5vZGUqPiogZ05vZGVzRGlzcGF0Y2hpbmdTaW11bGF0ZWRDbGlja3MgPSAw OwogCi1ib29sIEV2ZW50RGlzcGF0Y2hlcjo6ZGlzcGF0Y2hFdmVudChOb2RlKiBub2RlLCBQYXNz UmVmUHRyPEV2ZW50PiBwcnBFdmVudCkKK2Jvb2wgRXZlbnREaXNwYXRjaGVyOjpkaXNwYXRjaEV2 ZW50KE5vZGUqIG5vZGUsIGNvbnN0IEV2ZW50TWFuYWdlciYgZXZlbnRNYW5hZ2VyKQogewotICAg IFJlZlB0cjxFdmVudD4gZXZlbnQgPSBwcnBFdmVudDsKLQogICAgIEV2ZW50RGlzcGF0Y2hlciBk aXNwYXRjaGVyKG5vZGUpOwotICAgIHJldHVybiBldmVudC0+ZGlzcGF0Y2goJmRpc3BhdGNoZXIp OworICAgIHJldHVybiBldmVudE1hbmFnZXIuZGlzcGF0Y2hFdmVudCgmZGlzcGF0Y2hlcik7CiB9 CiAKIHN0YXRpYyBFdmVudFRhcmdldCogZmluZEVsZW1lbnRJbnN0YW5jZShOb2RlKiByZWZlcmVu Y2VOb2RlKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0V2ZW50RGlzcGF0Y2hlci5o IGIvU291cmNlL1dlYkNvcmUvZG9tL0V2ZW50RGlzcGF0Y2hlci5oCmluZGV4IGQ0MzEyN2YzNjli YmYzMzg2ZWVjNDA0YzRjZmU5M2I1MTI5NjkxYzAuLmI5N2ZjYTc5NTdhNGRlMDdiZTMyZjU1MWM4 MDA4MzA0YzhlYjg5NDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9FdmVudERpc3Bh dGNoZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRXZlbnREaXNwYXRjaGVyLmgKQEAgLTMz LDYgKzMzLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiBjbGFzcyBFdmVudDsKIGNsYXNzIEV2 ZW50Q29udGV4dDsKK2NsYXNzIEV2ZW50TWFuYWdlcjsKIGNsYXNzIEV2ZW50VGFyZ2V0OwogY2xh c3MgRnJhbWVWaWV3OwogY2xhc3MgTm9kZTsKQEAgLTQ3LDcgKzQ4LDcgQEAgZW51bSBFdmVudERp c3BhdGNoQmVoYXZpb3IgewogCiBjbGFzcyBFdmVudERpc3BhdGNoZXIgewogcHVibGljOgotICAg IHN0YXRpYyBib29sIGRpc3BhdGNoRXZlbnQoTm9kZSosIFBhc3NSZWZQdHI8RXZlbnQ+KTsKKyAg ICBzdGF0aWMgYm9vbCBkaXNwYXRjaEV2ZW50KE5vZGUqLCBjb25zdCBFdmVudE1hbmFnZXImKTsK ICAgICBzdGF0aWMgdm9pZCBkaXNwYXRjaFNjb3BlZEV2ZW50KE5vZGUqLCBQYXNzUmVmUHRyPEV2 ZW50Pik7CiAKICAgICBzdGF0aWMgYm9vbCBkaXNwYXRjaE1vdXNlRXZlbnQoTm9kZSosIGNvbnN0 IFBsYXRmb3JtTW91c2VFdmVudCYsIGNvbnN0IEF0b21pY1N0cmluZyYgZXZlbnRUeXBlLCBpbnQg Y2xpY2tDb3VudCA9IDAsIE5vZGUqIHJlbGF0ZWRUYXJnZXQgPSAwKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2RvbS9LZXlib2FyZEV2ZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9L ZXlib2FyZEV2ZW50LmNwcAppbmRleCAxMDkxMzVkZTY3YjA2YzE5MDQ3MzViZjY2NmE1MTFlMDNm Mzk5ODQ1Li4yODA1M2U0YzIxOGFjNmJiNDM4YjhmN2FiZmM2ZDY1YTk2YmE4ZGIxIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vS2V5Ym9hcmRFdmVudC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvZG9tL0tleWJvYXJkRXZlbnQuY3BwCkBAIC0xNjEsMTAgKzE2MSwxNSBAQCBLZXlib2Fy ZEV2ZW50KiBmaW5kS2V5Ym9hcmRFdmVudChFdmVudCogZXZlbnQpCiAgICAgcmV0dXJuIDA7CiB9 CiAKLWJvb2wgS2V5Ym9hcmRFdmVudDo6ZGlzcGF0Y2goRXZlbnREaXNwYXRjaGVyKiBkaXNwYXRj aGVyKQorS2V5Ym9hcmRFdmVudE1hbmFnZXI6OktleWJvYXJkRXZlbnRNYW5hZ2VyKFBhc3NSZWZQ dHI8S2V5Ym9hcmRFdmVudD4gZXZlbnQpCisgICAgOiBFdmVudE1hbmFnZXIoZXZlbnQpCit7Cit9 CisKK2Jvb2wgS2V5Ym9hcmRFdmVudE1hbmFnZXI6OmRpc3BhdGNoRXZlbnQoRXZlbnREaXNwYXRj aGVyKiBkaXNwYXRjaGVyKSBjb25zdAogewogICAgIC8vIE1ha2Ugc3VyZSBub3QgdG8gcmV0dXJu IHRydWUgaWYgd2UgYWxyZWFkeSB0b29rIGRlZmF1bHQgYWN0aW9uIHdoaWxlIGhhbmRsaW5nIHRo ZSBldmVudC4KLSAgICByZXR1cm4gZGlzcGF0Y2hlci0+ZGlzcGF0Y2hFdmVudCh0aGlzKSAmJiAh ZGVmYXVsdEhhbmRsZWQoKTsKKyAgICByZXR1cm4gRXZlbnRNYW5hZ2VyOjpkaXNwYXRjaEV2ZW50 KGRpc3BhdGNoZXIpICYmICFldmVudCgpLT5kZWZhdWx0SGFuZGxlZCgpOwogfQogCiB9IC8vIG5h bWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vS2V5Ym9hcmRF dmVudC5oIGIvU291cmNlL1dlYkNvcmUvZG9tL0tleWJvYXJkRXZlbnQuaAppbmRleCBlYmRiOWM4 MTc2MzU3MjEzMjEzYTJjNjAxN2JkNTkzNGVlZTkwN2MxLi5iOGNjNDdhODc5NTc0MmM1ODU0OGEx M2E3YzU1ZDBjMWE5MTZlMGU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vS2V5Ym9h cmRFdmVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9LZXlib2FyZEV2ZW50LmgKQEAgLTEw MSw3ICsxMDEsNiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIEtleWJvYXJkRXZlbnQo Y29uc3QgQXRvbWljU3RyaW5nJiB0eXBlLCBib29sIGNhbkJ1YmJsZSwgYm9vbCBjYW5jZWxhYmxl LCBBYnN0cmFjdFZpZXcqLAogICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IFN0cmluZyYga2V5 SWRlbnRpZmllciwgdW5zaWduZWQga2V5TG9jYXRpb24sCiAgICAgICAgICAgICAgICAgICAgICAg Ym9vbCBjdHJsS2V5LCBib29sIGFsdEtleSwgYm9vbCBzaGlmdEtleSwgYm9vbCBtZXRhS2V5LCBi b29sIGFsdEdyYXBoS2V5KTsKLSAgICAgICAgdmlydHVhbCBib29sIGRpc3BhdGNoKEV2ZW50RGlz cGF0Y2hlciopOwogCiAgICAgICAgIE93blB0cjxQbGF0Zm9ybUtleWJvYXJkRXZlbnQ+IG1fa2V5 RXZlbnQ7CiAgICAgICAgIFN0cmluZyBtX2tleUlkZW50aWZpZXI7CkBAIC0xMTUsNiArMTE0LDE0 IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogICAgIEtleWJvYXJkRXZlbnQqIGZpbmRLZXlib2Fy ZEV2ZW50KEV2ZW50Kik7CiAKK2NsYXNzIEtleWJvYXJkRXZlbnRNYW5hZ2VyIDogcHVibGljIEV2 ZW50TWFuYWdlciB7CitwdWJsaWM6CisgICAgS2V5Ym9hcmRFdmVudE1hbmFnZXIoUGFzc1JlZlB0 cjxLZXlib2FyZEV2ZW50Pik7CisKK3ByaXZhdGU6CisgICAgdmlydHVhbCBib29sIGRpc3BhdGNo RXZlbnQoRXZlbnREaXNwYXRjaGVyKikgY29uc3Q7Cit9OworCiB9IC8vIG5hbWVzcGFjZSBXZWJD b3JlCiAKICNlbmRpZiAvLyBLZXlib2FyZEV2ZW50X2gKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2RvbS9Ob2RlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmNwcAppbmRleCA5ZWNi Y2NiNWNkN2NlYzhiM2I4OTMxMWIxMTMxNjFkNTIxNDhiNTIwLi42MWViMzBlNmZiMDNjNmE5ODk2 NTc5OGU0ODY2YTZiMTNmODlkYzhkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vTm9k ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL05vZGUuY3BwCkBAIC0yNjM5LDcgKzI2Mzks NyBAQCB2b2lkIE5vZGU6OmRpc3BhdGNoVUlFdmVudChjb25zdCBBdG9taWNTdHJpbmcmIGV2ZW50 VHlwZSwgaW50IGRldGFpbCwgUGFzc1JlZlB0cgogCiBib29sIE5vZGU6OmRpc3BhdGNoS2V5RXZl bnQoY29uc3QgUGxhdGZvcm1LZXlib2FyZEV2ZW50JiBldmVudCkKIHsKLSAgICByZXR1cm4gRXZl bnREaXNwYXRjaGVyOjpkaXNwYXRjaEV2ZW50KHRoaXMsIEtleWJvYXJkRXZlbnQ6OmNyZWF0ZShl dmVudCwgZG9jdW1lbnQoKS0+ZGVmYXVsdFZpZXcoKSkpOworICAgIHJldHVybiBFdmVudERpc3Bh dGNoZXI6OmRpc3BhdGNoRXZlbnQodGhpcywgS2V5Ym9hcmRFdmVudE1hbmFnZXIoS2V5Ym9hcmRF dmVudDo6Y3JlYXRlKGV2ZW50LCBkb2N1bWVudCgpLT5kZWZhdWx0VmlldygpKSkpOwogfQogCiBi b29sIE5vZGU6OmRpc3BhdGNoTW91c2VFdmVudChjb25zdCBQbGF0Zm9ybU1vdXNlRXZlbnQmIGV2 ZW50LCBjb25zdCBBdG9taWNTdHJpbmcmIGV2ZW50VHlwZSwK 87813 2011-03-31 18:33:21 -0700 2011-04-04 14:37:38 -0700 Patch bug-57562-20110331183319.patch text/plain 7854 dglazkov U3VidmVyc2lvbiBSZXZpc2lvbjogODI1ODQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAyMWMwZTcyNzE5ZTA0ZTY5 NjkxZGRhNGI2N2IzODE1OGI2NjkxY2M3Li40YTE2NjFiYzZhN2I5ZDkxNzIzZmRhNzIzYTFmYTEw ZjdlN2MyNjA2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzEgQEAKIDIwMTEtMDMtMzEgIERpbWl0 cmkgR2xhemtvdiAgPGRnbGF6a292QGNocm9taXVtLm9yZz4KIAorICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbnRyb2R1Y2UgRXZlbnREaXNwYXRjaE1lZGlh dG9yIGFic3RyYWN0aW9uLCB3aGljaCBlbmNhcHN1bGF0ZSBhbGwKKyAgICAgICAgbm9uLXRyaXZp YWwgbG9naWMgYXJvdW5kIGZpcmluZyBhIHNwZWNpZmljIHR5cGUgb2YgYW4gZXZlbnQuCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NzU2MgorCisgICAg ICAgIFJlZmFjdG9yaW5nLCBjb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAgICog ZG9tL0V2ZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50RGlzcGF0Y2hNZWRpYXRvcjo6 RXZlbnREaXNwYXRjaE1lZGlhdG9yKTogQWRkZWQuCisgICAgICAgIChXZWJDb3JlOjpFdmVudERp c3BhdGNoTWVkaWF0b3I6On5FdmVudERpc3BhdGNoTWVkaWF0b3IpOiBBZGRlZC4KKyAgICAgICAg KFdlYkNvcmU6OkV2ZW50RGlzcGF0Y2hNZWRpYXRvcjo6ZGlzcGF0Y2hFdmVudCk6IEFkZGVkLgor ICAgICAgICAoV2ViQ29yZTo6RXZlbnREaXNwYXRjaE1lZGlhdG9yOjpldmVudCk6IEFkZGVkLgor ICAgICAgICAqIGRvbS9FdmVudC5oOiBBZGRlZCBkZWNsLgorICAgICAgICAqIGRvbS9FdmVudERp c3BhdGNoZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RXZlbnREaXNwYXRjaGVyOjpkaXNwYXRj aEV2ZW50KTogQ2hhbmdlZCB0byB1c2UgRXZlbnREaXNwYXRjaE1lZGlhdG9yLgorICAgICAgICAq IGRvbS9FdmVudERpc3BhdGNoZXIuaDogVXBkYXRlZCBkZWNscy4KKyAgICAgICAgKiBkb20vS2V5 Ym9hcmRFdmVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpLZXlib2FyZEV2ZW50RGlzcGF0Y2hN ZWRpYXRvcjo6S2V5Ym9hcmRFdmVudERpc3BhdGNoTWVkaWF0b3IpOiBBZGRlZC4KKyAgICAgICAg KFdlYkNvcmU6OktleWJvYXJkRXZlbnREaXNwYXRjaE1lZGlhdG9yOjpkaXNwYXRjaEV2ZW50KTog QWRkZWQuCisgICAgICAgICogZG9tL0tleWJvYXJkRXZlbnQuaDogVXBkYXRlZCBkZWNscworICAg ICAgICAqIGRvbS9Ob2RlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok5vZGU6OmRpc3BhdGNoS2V5 RXZlbnQpOiBDaGFuZ2VkIHRvIHVzZSBLZXlib2FyZEV2ZW50RGlzcGF0Y2hNZWRpYXRvci4KKwor MjAxMS0wMy0zMSAgRGltaXRyaSBHbGF6a292ICA8ZGdsYXprb3ZAY2hyb21pdW0ub3JnPgorCiAg ICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgogCiAgICAgICAgIE1vdmUgY29vcmRpbmF0 ZS1jb21wdXRpbmcgbG9naWMgaW50byBNb3VzZVJlbGF0ZWRFdmVudC4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2RvbS9FdmVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRXZlbnQuY3Bw CmluZGV4IGExMzUyZGMxN2UxYjRlMzM5ZmNjYjA4MTljNzQ3N2QyMzE0NjkyNDYuLjI2Y2RmMTIz ZTk2NDQ3NTc1NTY3Zjc2N2YxODgyOGIzYWU1NDFhMzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2RvbS9FdmVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0V2ZW50LmNwcApAQCAt MjcxLDExICsyNzEsNiBAQCB2b2lkIEV2ZW50OjpzdG9yZVJlc3VsdChjb25zdCBTdHJpbmcmKQog ewogfQogCi1ib29sIEV2ZW50OjpkaXNwYXRjaChFdmVudERpc3BhdGNoZXIqIGRpc3BhdGNoZXIp Ci17Ci0gICAgcmV0dXJuIGRpc3BhdGNoZXItPmRpc3BhdGNoRXZlbnQodGhpcyk7Ci19Ci0KIHZv aWQgRXZlbnQ6OnNldFRhcmdldChQYXNzUmVmUHRyPEV2ZW50VGFyZ2V0PiB0YXJnZXQpCiB7CiAg ICAgaWYgKG1fdGFyZ2V0ID09IHRhcmdldCkKQEAgLTI5OSw0ICsyOTQsMjMgQEAgdm9pZCBFdmVu dDo6c2V0VW5kZXJseWluZ0V2ZW50KFBhc3NSZWZQdHI8RXZlbnQ+IHVlKQogICAgIG1fdW5kZXJs eWluZ0V2ZW50ID0gdWU7CiB9CiAKK0V2ZW50RGlzcGF0Y2hNZWRpYXRvcjo6RXZlbnREaXNwYXRj aE1lZGlhdG9yKFBhc3NSZWZQdHI8RXZlbnQ+IGV2ZW50KQorICAgIDogbV9ldmVudChldmVudCkK K3sKK30KKworRXZlbnREaXNwYXRjaE1lZGlhdG9yOjp+RXZlbnREaXNwYXRjaE1lZGlhdG9yKCkK K3sKK30KKworYm9vbCBFdmVudERpc3BhdGNoTWVkaWF0b3I6OmRpc3BhdGNoRXZlbnQoRXZlbnRE aXNwYXRjaGVyKiBkaXNwYXRjaGVyKSBjb25zdAoreworICAgIHJldHVybiBkaXNwYXRjaGVyLT5k aXNwYXRjaEV2ZW50KG1fZXZlbnQuZ2V0KCkpOworfQorCitFdmVudCogRXZlbnREaXNwYXRjaE1l ZGlhdG9yOjpldmVudCgpIGNvbnN0Cit7CisgICAgcmV0dXJuIG1fZXZlbnQuZ2V0KCk7Cit9CisK IH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9F dmVudC5oIGIvU291cmNlL1dlYkNvcmUvZG9tL0V2ZW50LmgKaW5kZXggZDRkN2UwNmMxOWZkMThi ZDk0Yzk3OTQyOGIyMTIyY2M2ZDY3YzY0Ny4uYmY5N2I5MTVjMjM0YmIxMGZkNDU4ZWY1ZDU5YjJh YjI4NmFiMDQwYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0V2ZW50LmgKKysrIGIv U291cmNlL1dlYkNvcmUvZG9tL0V2ZW50LmgKQEAgLTE2Niw3ICsxNjYsNiBAQCBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAKICAgICAgICAgdmlydHVhbCBDbGlwYm9hcmQqIGNsaXBib2FyZCgpIGNvbnN0 IHsgcmV0dXJuIDA7IH0KIAotICAgICAgICB2aXJ0dWFsIGJvb2wgZGlzcGF0Y2goRXZlbnREaXNw YXRjaGVyKik7CiAKICAgICBwcm90ZWN0ZWQ6CiAgICAgICAgIEV2ZW50KCk7CkBAIC0xOTQsNiAr MTkzLDE3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgUmVmUHRyPEV2ZW50PiBtX3Vu ZGVybHlpbmdFdmVudDsKICAgICB9OwogCitjbGFzcyBFdmVudERpc3BhdGNoTWVkaWF0b3Igewor cHVibGljOgorICAgIEV2ZW50RGlzcGF0Y2hNZWRpYXRvcihQYXNzUmVmUHRyPEV2ZW50Pik7Cisg ICAgdmlydHVhbCB+RXZlbnREaXNwYXRjaE1lZGlhdG9yKCk7CisKKyAgICB2aXJ0dWFsIGJvb2wg ZGlzcGF0Y2hFdmVudChFdmVudERpc3BhdGNoZXIqKSBjb25zdDsKKyAgICBFdmVudCogZXZlbnQo KSBjb25zdDsKK3ByaXZhdGU6CisgICAgUmVmUHRyPEV2ZW50PiBtX2V2ZW50OworfTsKKwogfSAv LyBuYW1lc3BhY2UgV2ViQ29yZQogCiAjZW5kaWYgLy8gRXZlbnRfaApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvZG9tL0V2ZW50RGlzcGF0Y2hlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20v RXZlbnREaXNwYXRjaGVyLmNwcAppbmRleCBjMmNmMDkyODdmNzExYmI2NTNjMjIyMDJjZGUwYmEw MmU5ZjJhYTE1Li41Njg2ODkwN2E1NGFjZWJkYzM0NThiNjgxNTgxYjc3ODdlYzE1NjgwIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRXZlbnREaXNwYXRjaGVyLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9kb20vRXZlbnREaXNwYXRjaGVyLmNwcApAQCAtNTMsMTIgKzUzLDEwIEBAIG5h bWVzcGFjZSBXZWJDb3JlIHsKIAogc3RhdGljIEhhc2hTZXQ8Tm9kZSo+KiBnTm9kZXNEaXNwYXRj aGluZ1NpbXVsYXRlZENsaWNrcyA9IDA7CiAKLWJvb2wgRXZlbnREaXNwYXRjaGVyOjpkaXNwYXRj aEV2ZW50KE5vZGUqIG5vZGUsIFBhc3NSZWZQdHI8RXZlbnQ+IHBycEV2ZW50KQorYm9vbCBFdmVu dERpc3BhdGNoZXI6OmRpc3BhdGNoRXZlbnQoTm9kZSogbm9kZSwgY29uc3QgRXZlbnREaXNwYXRj aE1lZGlhdG9yJiBtZWRpYXRvcikKIHsKLSAgICBSZWZQdHI8RXZlbnQ+IGV2ZW50ID0gcHJwRXZl bnQ7Ci0KICAgICBFdmVudERpc3BhdGNoZXIgZGlzcGF0Y2hlcihub2RlKTsKLSAgICByZXR1cm4g ZXZlbnQtPmRpc3BhdGNoKCZkaXNwYXRjaGVyKTsKKyAgICByZXR1cm4gbWVkaWF0b3IuZGlzcGF0 Y2hFdmVudCgmZGlzcGF0Y2hlcik7CiB9CiAKIHN0YXRpYyBFdmVudFRhcmdldCogZmluZEVsZW1l bnRJbnN0YW5jZShOb2RlKiByZWZlcmVuY2VOb2RlKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvZG9tL0V2ZW50RGlzcGF0Y2hlci5oIGIvU291cmNlL1dlYkNvcmUvZG9tL0V2ZW50RGlzcGF0 Y2hlci5oCmluZGV4IGQ0MzEyN2YzNjliYmYzMzg2ZWVjNDA0YzRjZmU5M2I1MTI5NjkxYzAuLjE0 YjQ0Nzc5ZWE0ZDUwYWZmYjFkZjU4YTA4N2U0ZDJjNGNkNjhkMDggMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2RvbS9FdmVudERpc3BhdGNoZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20v RXZlbnREaXNwYXRjaGVyLmgKQEAgLTMzLDYgKzMzLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewog CiBjbGFzcyBFdmVudDsKIGNsYXNzIEV2ZW50Q29udGV4dDsKK2NsYXNzIEV2ZW50RGlzcGF0Y2hN ZWRpYXRvcjsKIGNsYXNzIEV2ZW50VGFyZ2V0OwogY2xhc3MgRnJhbWVWaWV3OwogY2xhc3MgTm9k ZTsKQEAgLTQ3LDcgKzQ4LDcgQEAgZW51bSBFdmVudERpc3BhdGNoQmVoYXZpb3IgewogCiBjbGFz cyBFdmVudERpc3BhdGNoZXIgewogcHVibGljOgotICAgIHN0YXRpYyBib29sIGRpc3BhdGNoRXZl bnQoTm9kZSosIFBhc3NSZWZQdHI8RXZlbnQ+KTsKKyAgICBzdGF0aWMgYm9vbCBkaXNwYXRjaEV2 ZW50KE5vZGUqLCBjb25zdCBFdmVudERpc3BhdGNoTWVkaWF0b3ImKTsKICAgICBzdGF0aWMgdm9p ZCBkaXNwYXRjaFNjb3BlZEV2ZW50KE5vZGUqLCBQYXNzUmVmUHRyPEV2ZW50Pik7CiAKICAgICBz dGF0aWMgYm9vbCBkaXNwYXRjaE1vdXNlRXZlbnQoTm9kZSosIGNvbnN0IFBsYXRmb3JtTW91c2VF dmVudCYsIGNvbnN0IEF0b21pY1N0cmluZyYgZXZlbnRUeXBlLCBpbnQgY2xpY2tDb3VudCA9IDAs IE5vZGUqIHJlbGF0ZWRUYXJnZXQgPSAwKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Rv bS9LZXlib2FyZEV2ZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9LZXlib2FyZEV2ZW50LmNw cAppbmRleCAxMDkxMzVkZTY3YjA2YzE5MDQ3MzViZjY2NmE1MTFlMDNmMzk5ODQ1Li5lMjQ0ZmQy N2FjZTQ1MjRmNDYxN2I2YmU3MjcwZmQ1ZWFlNTkyNjJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9kb20vS2V5Ym9hcmRFdmVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0tleWJv YXJkRXZlbnQuY3BwCkBAIC0xNjEsMTAgKzE2MSwxNSBAQCBLZXlib2FyZEV2ZW50KiBmaW5kS2V5 Ym9hcmRFdmVudChFdmVudCogZXZlbnQpCiAgICAgcmV0dXJuIDA7CiB9CiAKLWJvb2wgS2V5Ym9h cmRFdmVudDo6ZGlzcGF0Y2goRXZlbnREaXNwYXRjaGVyKiBkaXNwYXRjaGVyKQorS2V5Ym9hcmRF dmVudERpc3BhdGNoTWVkaWF0b3I6OktleWJvYXJkRXZlbnREaXNwYXRjaE1lZGlhdG9yKFBhc3NS ZWZQdHI8S2V5Ym9hcmRFdmVudD4gZXZlbnQpCisgICAgOiBFdmVudERpc3BhdGNoTWVkaWF0b3Io ZXZlbnQpCit7Cit9CisKK2Jvb2wgS2V5Ym9hcmRFdmVudERpc3BhdGNoTWVkaWF0b3I6OmRpc3Bh dGNoRXZlbnQoRXZlbnREaXNwYXRjaGVyKiBkaXNwYXRjaGVyKSBjb25zdAogewogICAgIC8vIE1h a2Ugc3VyZSBub3QgdG8gcmV0dXJuIHRydWUgaWYgd2UgYWxyZWFkeSB0b29rIGRlZmF1bHQgYWN0 aW9uIHdoaWxlIGhhbmRsaW5nIHRoZSBldmVudC4KLSAgICByZXR1cm4gZGlzcGF0Y2hlci0+ZGlz cGF0Y2hFdmVudCh0aGlzKSAmJiAhZGVmYXVsdEhhbmRsZWQoKTsKKyAgICByZXR1cm4gRXZlbnRE aXNwYXRjaE1lZGlhdG9yOjpkaXNwYXRjaEV2ZW50KGRpc3BhdGNoZXIpICYmICFldmVudCgpLT5k ZWZhdWx0SGFuZGxlZCgpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9kb20vS2V5Ym9hcmRFdmVudC5oIGIvU291cmNlL1dlYkNvcmUvZG9t L0tleWJvYXJkRXZlbnQuaAppbmRleCBlYmRiOWM4MTc2MzU3MjEzMjEzYTJjNjAxN2JkNTkzNGVl ZTkwN2MxLi5jNjY1MWMyYjk0OTQ4ZjgzYWMyNmY4NWIxOTUyMDVhOTk2NWNjZGY2IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vS2V5Ym9hcmRFdmVudC5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL2RvbS9LZXlib2FyZEV2ZW50LmgKQEAgLTEwMSw3ICsxMDEsNiBAQCBuYW1lc3BhY2UgV2Vi Q29yZSB7CiAgICAgICAgIEtleWJvYXJkRXZlbnQoY29uc3QgQXRvbWljU3RyaW5nJiB0eXBlLCBi b29sIGNhbkJ1YmJsZSwgYm9vbCBjYW5jZWxhYmxlLCBBYnN0cmFjdFZpZXcqLAogICAgICAgICAg ICAgICAgICAgICAgIGNvbnN0IFN0cmluZyYga2V5SWRlbnRpZmllciwgdW5zaWduZWQga2V5TG9j YXRpb24sCiAgICAgICAgICAgICAgICAgICAgICAgYm9vbCBjdHJsS2V5LCBib29sIGFsdEtleSwg Ym9vbCBzaGlmdEtleSwgYm9vbCBtZXRhS2V5LCBib29sIGFsdEdyYXBoS2V5KTsKLSAgICAgICAg dmlydHVhbCBib29sIGRpc3BhdGNoKEV2ZW50RGlzcGF0Y2hlciopOwogCiAgICAgICAgIE93blB0 cjxQbGF0Zm9ybUtleWJvYXJkRXZlbnQ+IG1fa2V5RXZlbnQ7CiAgICAgICAgIFN0cmluZyBtX2tl eUlkZW50aWZpZXI7CkBAIC0xMTUsNiArMTE0LDE0IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAog ICAgIEtleWJvYXJkRXZlbnQqIGZpbmRLZXlib2FyZEV2ZW50KEV2ZW50Kik7CiAKK2NsYXNzIEtl eWJvYXJkRXZlbnREaXNwYXRjaE1lZGlhdG9yIDogcHVibGljIEV2ZW50RGlzcGF0Y2hNZWRpYXRv ciB7CitwdWJsaWM6CisgICAgS2V5Ym9hcmRFdmVudERpc3BhdGNoTWVkaWF0b3IoUGFzc1JlZlB0 cjxLZXlib2FyZEV2ZW50Pik7CisKK3ByaXZhdGU6CisgICAgdmlydHVhbCBib29sIGRpc3BhdGNo RXZlbnQoRXZlbnREaXNwYXRjaGVyKikgY29uc3Q7Cit9OworCiB9IC8vIG5hbWVzcGFjZSBXZWJD b3JlCiAKICNlbmRpZiAvLyBLZXlib2FyZEV2ZW50X2gKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2RvbS9Ob2RlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmNwcAppbmRleCA5ZWNi Y2NiNWNkN2NlYzhiM2I4OTMxMWIxMTMxNjFkNTIxNDhiNTIwLi40MTVmMTI1MGY3YzQ0OGJiYzQ0 OGIyZDcwNDUwZTQ1OGQxMmJiZDA0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vTm9k ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL05vZGUuY3BwCkBAIC0yNjM5LDcgKzI2Mzks NyBAQCB2b2lkIE5vZGU6OmRpc3BhdGNoVUlFdmVudChjb25zdCBBdG9taWNTdHJpbmcmIGV2ZW50 VHlwZSwgaW50IGRldGFpbCwgUGFzc1JlZlB0cgogCiBib29sIE5vZGU6OmRpc3BhdGNoS2V5RXZl bnQoY29uc3QgUGxhdGZvcm1LZXlib2FyZEV2ZW50JiBldmVudCkKIHsKLSAgICByZXR1cm4gRXZl bnREaXNwYXRjaGVyOjpkaXNwYXRjaEV2ZW50KHRoaXMsIEtleWJvYXJkRXZlbnQ6OmNyZWF0ZShl dmVudCwgZG9jdW1lbnQoKS0+ZGVmYXVsdFZpZXcoKSkpOworICAgIHJldHVybiBFdmVudERpc3Bh dGNoZXI6OmRpc3BhdGNoRXZlbnQodGhpcywgS2V5Ym9hcmRFdmVudERpc3BhdGNoTWVkaWF0b3Io S2V5Ym9hcmRFdmVudDo6Y3JlYXRlKGV2ZW50LCBkb2N1bWVudCgpLT5kZWZhdWx0VmlldygpKSkp OwogfQogCiBib29sIE5vZGU6OmRpc3BhdGNoTW91c2VFdmVudChjb25zdCBQbGF0Zm9ybU1vdXNl RXZlbnQmIGV2ZW50LCBjb25zdCBBdG9taWNTdHJpbmcmIGV2ZW50VHlwZSwK