122580 2013-10-09 17:05:29 -0700 Remove MouseEventDispatchMediator 2013-10-09 17:27:45 -0700 1 1 1 Unclassified WebKit UI Events 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 rniwa rniwa andersca benjamin cmarcelo commit-queue darin esprehn+autocc kangil.han kling koivisto sam oldest_to_newest 938136 0 rniwa 2013-10-09 17:05:29 -0700 Remove MouseEventDispatchMediator 938137 1 213835 rniwa 2013-10-09 17:06:03 -0700 Created attachment 213835 Cleanup 938138 2 213835 koivisto 2013-10-09 17:10:16 -0700 Comment on attachment 213835 Cleanup View in context: https://bugs.webkit.org/attachment.cgi?id=213835&action=review > Source/WebCore/dom/Element.cpp:255 > + bool didNotShallowEvent = dispatchEvent(mouseEvent) && !mouseEvent->defaultHandled(); i think you mean "swallow". 938144 3 rniwa 2013-10-09 17:27:45 -0700 Committed r157196: <http://trac.webkit.org/changeset/157196> 213835 2013-10-09 17:06:03 -0700 2013-10-09 17:10:15 -0700 Cleanup bug-122580-20131009170603.patch text/plain 8177 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1NzE5NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDEzLTEwLTA5ICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIFJlbW92ZSBNb3VzZUV2ZW50RGlz cGF0Y2hNZWRpYXRvcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTIyNTgwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgUmVtb3ZlZC4gV2lsbCByZW1vdmUgRXZlbnREaXNwYXRjaE1lZGlhdG9yIG5leHQuCisK KyAgICAgICAgKiBkb20vRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFbGVtZW50Ojpk aXNwYXRjaE1vdXNlRXZlbnQpOgorICAgICAgICAqIGRvbS9Nb3VzZUV2ZW50LmNwcDoKKyAgICAg ICAgKiBkb20vTW91c2VFdmVudC5oOgorICAgICAgICAqIGRvbS9Ob2RlLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6Ok5vZGU6OmRpc3BhdGNoRXZlbnQpOgorICAgICAgICAoV2ViQ29yZTo6Tm9kZTo6 ZGlzcGF0Y2hUb3VjaEV2ZW50KToKKwogMjAxMy0xMC0wOSAgUnlvc3VrZSBOaXdhICA8cm5pd2FA d2Via2l0Lm9yZz4KIAogICAgICAgICBSZW1vdmUgYWxsIHN1YmNsYXNzZXMgb2YgRXZlbnREaXNw YXRjaE1lZGlhdG9yIGV4Y2VwdCBNb3VzZUV2ZW50RGlzcGF0Y2hNZWRpYXRvcgpJbmRleDogU291 cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L2RvbS9FbGVtZW50LmNwcAkocmV2aXNpb24gMTU3MTk1KQorKysgU291cmNlL1dlYkNvcmUvZG9t L0VsZW1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNDEsOSArMjQxLDM4IEBAIGJvb2wgRWxl bWVudDo6c2hvdWxkVXNlSW5wdXRNZXRob2QoKQogICAgIHJldHVybiBpc0NvbnRlbnRFZGl0YWJs ZShVc2VyU2VsZWN0QWxsSXNBbHdheXNOb25FZGl0YWJsZSk7CiB9CiAKLWJvb2wgRWxlbWVudDo6 ZGlzcGF0Y2hNb3VzZUV2ZW50KGNvbnN0IFBsYXRmb3JtTW91c2VFdmVudCYgZXZlbnQsIGNvbnN0 IEF0b21pY1N0cmluZyYgZXZlbnRUeXBlLCBpbnQgZGV0YWlsLCBFbGVtZW50KiByZWxhdGVkVGFy Z2V0KQorYm9vbCBFbGVtZW50OjpkaXNwYXRjaE1vdXNlRXZlbnQoY29uc3QgUGxhdGZvcm1Nb3Vz ZUV2ZW50JiBwbGF0Zm9ybUV2ZW50LCBjb25zdCBBdG9taWNTdHJpbmcmIGV2ZW50VHlwZSwgaW50 IGRldGFpbCwgRWxlbWVudCogcmVsYXRlZFRhcmdldCkKIHsKLSAgICByZXR1cm4gRXZlbnREaXNw YXRjaGVyOjpkaXNwYXRjaEV2ZW50KHRoaXMsIE1vdXNlRXZlbnREaXNwYXRjaE1lZGlhdG9yOjpj cmVhdGUoTW91c2VFdmVudDo6Y3JlYXRlKGV2ZW50VHlwZSwgZG9jdW1lbnQoKS5kZWZhdWx0Vmll dygpLCBldmVudCwgZGV0YWlsLCByZWxhdGVkVGFyZ2V0KSkpOworICAgIGlmIChpc0Rpc2FibGVk Rm9ybUNvbnRyb2woKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgUmVmUHRyPE1vdXNl RXZlbnQ+IG1vdXNlRXZlbnQgPSBNb3VzZUV2ZW50OjpjcmVhdGUoZXZlbnRUeXBlLCBkb2N1bWVu dCgpLmRlZmF1bHRWaWV3KCksIHBsYXRmb3JtRXZlbnQsIGRldGFpbCwgcmVsYXRlZFRhcmdldCk7 CisKKyAgICBpZiAobW91c2VFdmVudC0+dHlwZSgpLmlzRW1wdHkoKSkKKyAgICAgICAgcmV0dXJu IHRydWU7IC8vIFNob3VsZG4ndCBoYXBwZW4uCisKKyAgICBBU1NFUlQoIW1vdXNlRXZlbnQtPnRh cmdldCgpIHx8IG1vdXNlRXZlbnQtPnRhcmdldCgpICE9IHJlbGF0ZWRUYXJnZXQpOworICAgIGJv b2wgZGlkTm90U2hhbGxvd0V2ZW50ID0gZGlzcGF0Y2hFdmVudChtb3VzZUV2ZW50KSAmJiAhbW91 c2VFdmVudC0+ZGVmYXVsdEhhbmRsZWQoKTsKKworICAgIGlmIChtb3VzZUV2ZW50LT50eXBlKCkg PT0gZXZlbnROYW1lcygpLmNsaWNrRXZlbnQgJiYgbW91c2VFdmVudC0+ZGV0YWlsKCkgPT0gMikg eworICAgICAgICAvLyBTcGVjaWFsIGNhc2U6IElmIGl0J3MgYSBkb3VibGUgY2xpY2sgZXZlbnQs IHdlIGFsc28gc2VuZCB0aGUgZGJsY2xpY2sgZXZlbnQuIFRoaXMgaXMgbm90IHBhcnQKKyAgICAg ICAgLy8gb2YgdGhlIERPTSBzcGVjcywgYnV0IGlzIHVzZWQgZm9yIGNvbXBhdGliaWxpdHkgd2l0 aCB0aGUgb25kYmxjbGljaz0iIiBhdHRyaWJ1dGUuIFRoaXMgaXMgdHJlYXRlZAorICAgICAgICAv LyBhcyBhIHNlcGFyYXRlIGV2ZW50IGluIG90aGVyIERPTS1jb21wbGlhbnQgYnJvd3NlcnMgbGlr ZSBGaXJlZm94LCBhbmQgc28gd2UgZG8gdGhlIHNhbWUuCisgICAgICAgIFJlZlB0cjxNb3VzZUV2 ZW50PiBkb3VibGVDbGlja0V2ZW50ID0gTW91c2VFdmVudDo6Y3JlYXRlKCk7CisgICAgICAgIGRv dWJsZUNsaWNrRXZlbnQtPmluaXRNb3VzZUV2ZW50KGV2ZW50TmFtZXMoKS5kYmxjbGlja0V2ZW50 LAorICAgICAgICAgICAgbW91c2VFdmVudC0+YnViYmxlcygpLCBtb3VzZUV2ZW50LT5jYW5jZWxh YmxlKCksIG1vdXNlRXZlbnQtPnZpZXcoKSwgbW91c2VFdmVudC0+ZGV0YWlsKCksCisgICAgICAg ICAgICBtb3VzZUV2ZW50LT5zY3JlZW5YKCksIG1vdXNlRXZlbnQtPnNjcmVlblkoKSwgbW91c2VF dmVudC0+Y2xpZW50WCgpLCBtb3VzZUV2ZW50LT5jbGllbnRZKCksCisgICAgICAgICAgICBtb3Vz ZUV2ZW50LT5jdHJsS2V5KCksIG1vdXNlRXZlbnQtPmFsdEtleSgpLCBtb3VzZUV2ZW50LT5zaGlm dEtleSgpLCBtb3VzZUV2ZW50LT5tZXRhS2V5KCksCisgICAgICAgICAgICBtb3VzZUV2ZW50LT5i dXR0b24oKSwgcmVsYXRlZFRhcmdldCk7CisKKyAgICAgICAgaWYgKG1vdXNlRXZlbnQtPmRlZmF1 bHRIYW5kbGVkKCkpCisgICAgICAgICAgICBkb3VibGVDbGlja0V2ZW50LT5zZXREZWZhdWx0SGFu ZGxlZCgpOworCisgICAgICAgIGRpc3BhdGNoRXZlbnQoZG91YmxlQ2xpY2tFdmVudCk7CisgICAg ICAgIGlmIChkb3VibGVDbGlja0V2ZW50LT5kZWZhdWx0SGFuZGxlZCgpIHx8IGRvdWJsZUNsaWNr RXZlbnQtPmRlZmF1bHRQcmV2ZW50ZWQoKSkKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAg ICB9CisgICAgcmV0dXJuIGRpZE5vdFNoYWxsb3dFdmVudDsKIH0KIAogaW5saW5lIHN0YXRpYyB1 bnNpZ25lZCBkZWx0YU1vZGUoY29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50JiBldmVudCkKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL2RvbS9Nb3VzZUV2ZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9kb20vTW91c2VFdmVudC5jcHAJKHJldmlzaW9uIDE1NzE3NykKKysrIFNvdXJjZS9X ZWJDb3JlL2RvbS9Nb3VzZUV2ZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjg1LDU1ICsyODUs NCBAQCBTaW11bGF0ZWRNb3VzZUV2ZW50OjpTaW11bGF0ZWRNb3VzZUV2ZW50CiAgICAgfQogfQog Ci1QYXNzUmVmUHRyPE1vdXNlRXZlbnREaXNwYXRjaE1lZGlhdG9yPiBNb3VzZUV2ZW50RGlzcGF0 Y2hNZWRpYXRvcjo6Y3JlYXRlKFBhc3NSZWZQdHI8TW91c2VFdmVudD4gbW91c2VFdmVudCwgTW91 c2VFdmVudFR5cGUgbW91c2VFdmVudFR5cGUpCi17Ci0gICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBN b3VzZUV2ZW50RGlzcGF0Y2hNZWRpYXRvcihtb3VzZUV2ZW50LCBtb3VzZUV2ZW50VHlwZSkpOwot fQotCi1Nb3VzZUV2ZW50RGlzcGF0Y2hNZWRpYXRvcjo6TW91c2VFdmVudERpc3BhdGNoTWVkaWF0 b3IoUGFzc1JlZlB0cjxNb3VzZUV2ZW50PiBtb3VzZUV2ZW50LCBNb3VzZUV2ZW50VHlwZSBtb3Vz ZUV2ZW50VHlwZSkKLSAgICA6IEV2ZW50RGlzcGF0Y2hNZWRpYXRvcihtb3VzZUV2ZW50KSwgbV9t b3VzZUV2ZW50VHlwZShtb3VzZUV2ZW50VHlwZSkKLXsKLX0KLQotTW91c2VFdmVudCogTW91c2VF dmVudERpc3BhdGNoTWVkaWF0b3I6OmV2ZW50KCkgY29uc3QKLXsKLSAgICByZXR1cm4gc3RhdGlj X2Nhc3Q8TW91c2VFdmVudCo+KEV2ZW50RGlzcGF0Y2hNZWRpYXRvcjo6ZXZlbnQoKSk7Ci19Ci0K LWJvb2wgTW91c2VFdmVudERpc3BhdGNoTWVkaWF0b3I6Om1lZGlhdGVBbmREaXNwYXRjaEV2ZW50 KEV2ZW50RGlzcGF0Y2hlciogZGlzcGF0Y2hlcikgY29uc3QKLXsKLSAgICBpZiAoaXNTeW50aGV0 aWNNb3VzZUV2ZW50KCkpCi0gICAgICAgIHJldHVybiBkaXNwYXRjaGVyLT5kaXNwYXRjaCgpOwot Ci0gICAgaWYgKGlzRGlzYWJsZWRGb3JtQ29udHJvbChkaXNwYXRjaGVyLT5ub2RlKCkpKQotICAg ICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICBpZiAoZXZlbnQoKS0+dHlwZSgpLmlzRW1wdHkoKSkK LSAgICAgICAgcmV0dXJuIHRydWU7IC8vIFNob3VsZG4ndCBoYXBwZW4uCi0KLSAgICBFdmVudFRh cmdldCogcmVsYXRlZFRhcmdldCA9IGV2ZW50KCktPnJlbGF0ZWRUYXJnZXQoKTsKLSAgICBBU1NF UlQoIWV2ZW50KCktPnRhcmdldCgpIHx8IGV2ZW50KCktPnRhcmdldCgpICE9IHJlbGF0ZWRUYXJn ZXQpOwotCi0gICAgZGlzcGF0Y2hlci0+ZGlzcGF0Y2goKTsKLSAgICBib29sIHN3YWxsb3dFdmVu dCA9IGV2ZW50KCktPmRlZmF1bHRIYW5kbGVkKCkgfHwgZXZlbnQoKS0+ZGVmYXVsdFByZXZlbnRl ZCgpOwotCi0gICAgaWYgKGV2ZW50KCktPnR5cGUoKSAhPSBldmVudE5hbWVzKCkuY2xpY2tFdmVu dCB8fCBldmVudCgpLT5kZXRhaWwoKSAhPSAyKQotICAgICAgICByZXR1cm4gIXN3YWxsb3dFdmVu dDsKLQotICAgIC8vIFNwZWNpYWwgY2FzZTogSWYgaXQncyBhIGRvdWJsZSBjbGljayBldmVudCwg d2UgYWxzbyBzZW5kIHRoZSBkYmxjbGljayBldmVudC4gVGhpcyBpcyBub3QgcGFydAotICAgIC8v IG9mIHRoZSBET00gc3BlY3MsIGJ1dCBpcyB1c2VkIGZvciBjb21wYXRpYmlsaXR5IHdpdGggdGhl IG9uZGJsY2xpY2s9IiIgYXR0cmlidXRlLiBUaGlzIGlzIHRyZWF0ZWQKLSAgICAvLyBhcyBhIHNl cGFyYXRlIGV2ZW50IGluIG90aGVyIERPTS1jb21wbGlhbnQgYnJvd3NlcnMgbGlrZSBGaXJlZm94 LCBhbmQgc28gd2UgZG8gdGhlIHNhbWUuCi0gICAgUmVmUHRyPE1vdXNlRXZlbnQ+IGRvdWJsZUNs aWNrRXZlbnQgPSBNb3VzZUV2ZW50OjpjcmVhdGUoKTsKLSAgICBkb3VibGVDbGlja0V2ZW50LT5p bml0TW91c2VFdmVudChldmVudE5hbWVzKCkuZGJsY2xpY2tFdmVudCwgZXZlbnQoKS0+YnViYmxl cygpLCBldmVudCgpLT5jYW5jZWxhYmxlKCksIGV2ZW50KCktPnZpZXcoKSwKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBldmVudCgpLT5kZXRhaWwoKSwgZXZlbnQoKS0+c2Ny ZWVuWCgpLCBldmVudCgpLT5zY3JlZW5ZKCksIGV2ZW50KCktPmNsaWVudFgoKSwgZXZlbnQoKS0+ Y2xpZW50WSgpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGV2ZW50KCkt PmN0cmxLZXkoKSwgZXZlbnQoKS0+YWx0S2V5KCksIGV2ZW50KCktPnNoaWZ0S2V5KCksIGV2ZW50 KCktPm1ldGFLZXkoKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBldmVu dCgpLT5idXR0b24oKSwgcmVsYXRlZFRhcmdldCk7Ci0gICAgaWYgKGV2ZW50KCktPmRlZmF1bHRI YW5kbGVkKCkpCi0gICAgICAgIGRvdWJsZUNsaWNrRXZlbnQtPnNldERlZmF1bHRIYW5kbGVkKCk7 Ci0gICAgRXZlbnREaXNwYXRjaGVyOjpkaXNwYXRjaEV2ZW50KGRpc3BhdGNoZXItPm5vZGUoKSwg TW91c2VFdmVudERpc3BhdGNoTWVkaWF0b3I6OmNyZWF0ZShkb3VibGVDbGlja0V2ZW50KSk7Ci0g ICAgaWYgKGRvdWJsZUNsaWNrRXZlbnQtPmRlZmF1bHRIYW5kbGVkKCkgfHwgZG91YmxlQ2xpY2tF dmVudC0+ZGVmYXVsdFByZXZlbnRlZCgpKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgcmV0 dXJuICFzd2FsbG93RXZlbnQ7Ci19Ci0KIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKSW5kZXg6IFNv dXJjZS9XZWJDb3JlL2RvbS9Nb3VzZUV2ZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvZG9tL01vdXNlRXZlbnQuaAkocmV2aXNpb24gMTU3MTc3KQorKysgU291cmNlL1dlYkNvcmUv ZG9tL01vdXNlRXZlbnQuaAkod29ya2luZyBjb3B5KQpAQCAtMTMzLDIwICsxMzMsNiBAQCBwcml2 YXRlOgogICAgIFNpbXVsYXRlZE1vdXNlRXZlbnQoY29uc3QgQXRvbWljU3RyaW5nJiBldmVudFR5 cGUsIFBhc3NSZWZQdHI8QWJzdHJhY3RWaWV3PiwgUGFzc1JlZlB0cjxFdmVudD4gdW5kZXJseWlu Z0V2ZW50KTsKIH07CiAKLWNsYXNzIE1vdXNlRXZlbnREaXNwYXRjaE1lZGlhdG9yIDogcHVibGlj IEV2ZW50RGlzcGF0Y2hNZWRpYXRvciB7Ci1wdWJsaWM6Ci0gICAgZW51bSBNb3VzZUV2ZW50VHlw ZSB7IFN5bnRoZXRpY01vdXNlRXZlbnQsIE5vblN5bnRoZXRpY01vdXNlRXZlbnR9OwotICAgIHN0 YXRpYyBQYXNzUmVmUHRyPE1vdXNlRXZlbnREaXNwYXRjaE1lZGlhdG9yPiBjcmVhdGUoUGFzc1Jl ZlB0cjxNb3VzZUV2ZW50PiwgTW91c2VFdmVudFR5cGUgPSBOb25TeW50aGV0aWNNb3VzZUV2ZW50 KTsKLQotcHJpdmF0ZToKLSAgICBleHBsaWNpdCBNb3VzZUV2ZW50RGlzcGF0Y2hNZWRpYXRvcihQ YXNzUmVmUHRyPE1vdXNlRXZlbnQ+LCBNb3VzZUV2ZW50VHlwZSk7Ci0gICAgTW91c2VFdmVudCog ZXZlbnQoKSBjb25zdDsKLQotICAgIHZpcnR1YWwgYm9vbCBtZWRpYXRlQW5kRGlzcGF0Y2hFdmVu dChFdmVudERpc3BhdGNoZXIqKSBjb25zdCBPVkVSUklERTsKLSAgICBib29sIGlzU3ludGhldGlj TW91c2VFdmVudCgpIGNvbnN0IHsgcmV0dXJuIG1fbW91c2VFdmVudFR5cGUgPT0gU3ludGhldGlj TW91c2VFdmVudDsgfQotICAgIE1vdXNlRXZlbnRUeXBlIG1fbW91c2VFdmVudFR5cGU7Ci19Owot CiBpbmxpbmUgTW91c2VFdmVudCogdG9Nb3VzZUV2ZW50KEV2ZW50KiBldmVudCkKIHsKICAgICBB U1NFUlQoZXZlbnQgJiYgZXZlbnQtPmlzTW91c2VFdmVudCgpKTsKSW5kZXg6IFNvdXJjZS9XZWJD b3JlL2RvbS9Ob2RlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9kb20vTm9kZS5j cHAJKHJldmlzaW9uIDE1NzE5NSkKKysrIFNvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmNwcAkod29y a2luZyBjb3B5KQpAQCAtMjA3NCw4ICsyMDc0LDYgQEAgdm9pZCBOb2RlOjpkaXNwYXRjaFNjb3Bl ZEV2ZW50KFBhc3NSZWZQdAogCiBib29sIE5vZGU6OmRpc3BhdGNoRXZlbnQoUGFzc1JlZlB0cjxF dmVudD4gZXZlbnQpCiB7Ci0gICAgaWYgKGV2ZW50LT5pc01vdXNlRXZlbnQoKSkKLSAgICAgICAg cmV0dXJuIEV2ZW50RGlzcGF0Y2hlcjo6ZGlzcGF0Y2hFdmVudCh0aGlzLCBNb3VzZUV2ZW50RGlz cGF0Y2hNZWRpYXRvcjo6Y3JlYXRlKGFkb3B0UmVmKHRvTW91c2VFdmVudChldmVudC5sZWFrUmVm KCkpKSwgTW91c2VFdmVudERpc3BhdGNoTWVkaWF0b3I6OlN5bnRoZXRpY01vdXNlRXZlbnQpKTsK ICNpZiBFTkFCTEUoVE9VQ0hfRVZFTlRTKQogICAgIGlmIChldmVudC0+aXNUb3VjaEV2ZW50KCkp CiAgICAgICAgIHJldHVybiBkaXNwYXRjaFRvdWNoRXZlbnQoYWRvcHRSZWYodG9Ub3VjaEV2ZW50 KGV2ZW50LmxlYWtSZWYoKSkpKTsKQEAgLTIxMjUsNyArMjEyMyw3IEBAIGJvb2wgTm9kZTo6ZGlz cGF0Y2hHZXN0dXJlRXZlbnQoY29uc3QgUGwKICNpZiBFTkFCTEUoVE9VQ0hfRVZFTlRTKQogYm9v bCBOb2RlOjpkaXNwYXRjaFRvdWNoRXZlbnQoUGFzc1JlZlB0cjxUb3VjaEV2ZW50PiBldmVudCkK IHsKLSAgICByZXR1cm4gRXZlbnREaXNwYXRjaGVyOjpkaXNwYXRjaEV2ZW50KHRoaXMsIFRvdWNo RXZlbnREaXNwYXRjaE1lZGlhdG9yOjpjcmVhdGUoZXZlbnQpKTsKKyAgICByZXR1cm4gRXZlbnRE aXNwYXRjaGVyOjpkaXNwYXRjaEV2ZW50KHRoaXMsIEV2ZW50RGlzcGF0Y2hNZWRpYXRvcjo6Y3Jl YXRlKGV2ZW50KSk7CiB9CiAjZW5kaWYKIAo=