122483 2013-10-07 20:53:45 -0700 EventDispatchBehavior is unnecessary 2013-10-08 00:08:23 -0700 1 1 1 Unclassified WebKit Evangelism 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 rniwa rniwa andersca benjamin commit-queue esprehn+autocc kangil.han kling koivisto oldest_to_newest 937354 0 rniwa 2013-10-07 20:53:45 -0700 EventDispatchBehavior is unnecessary 937355 1 213648 rniwa 2013-10-07 20:54:43 -0700 Created attachment 213648 Cleanup 937356 2 213648 kling 2013-10-07 21:05:44 -0700 Comment on attachment 213648 Cleanup View in context: https://bugs.webkit.org/attachment.cgi?id=213648&action=review r=me. > Source/WebCore/dom/EventRetargeter.cpp:38 > +static inline bool shouldEventCrossShadowBoundary(Event* event, ShadowRoot* shadowRoot, EventTarget* target) All three parameters should be references. > Source/WebCore/dom/EventRetargeter.cpp:48 > + if (element->isMediaElement() && shadowRoot && shadowRoot->hostElement() == element) 'shadowRoot' is already null-checked by the caller. > Source/WebCore/dom/EventRetargeter.cpp:58 > + bool tagetIsInShadowRoot = targetNode && targetNode->treeScope().rootNode() == shadowRoot; Typo, taget -> target. 937360 3 213650 rniwa 2013-10-07 21:14:17 -0700 Created attachment 213650 Patch for landing 937362 4 213650 commit-queue 2013-10-07 21:42:46 -0700 Comment on attachment 213650 Patch for landing Clearing flags on attachment: 213650 Committed r157085: <http://trac.webkit.org/changeset/157085> 937363 5 commit-queue 2013-10-07 21:42:48 -0700 All reviewed patches have been landed. Closing bug. 213648 2013-10-07 20:54:43 -0700 2013-10-07 21:14:14 -0700 Cleanup bug-122483-20131007205442.patch text/plain 4871 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1NzA4NCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDEzLTEwLTA3ICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIEV2ZW50RGlzcGF0Y2hCZWhhdmlv ciBpcyB1bm5lY2Vzc2FyeQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTIyNDgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgUmVtb3ZlZCBFdmVudERpc3BhdGNoQmVoYXZpb3IgYW5kIGNoYW5nZWQgdGhlIHJl dHVybiB0eXBlIG9mIGRldGVybWluZURpc3BhdGNoQmVoYXZpb3IgdG8gYm9vbC4KKyAgICAgICAg QWxzbyByZW5hbWVkIGl0IHRvIHNob3VsZEV2ZW50Q3Jvc3NTaGFkb3dCb3VuZGFyeSB0byByZWZs ZWN0IHRoZSBzZW1hbnRpY3MgbW9yZSBjbGVhci4KKworICAgICAgICAqIGRvbS9FdmVudFJldGFy Z2V0ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6c2hvdWxkRXZlbnRDcm9zc1NoYWRvd0JvdW5k YXJ5KToKKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50UmV0YXJnZXRlcjo6Y2FsY3VsYXRlRXZlbnRQ YXRoKToKKyAgICAgICAgKiBkb20vRXZlbnRSZXRhcmdldGVyLmg6CisKIDIwMTMtMTAtMDcgIFJ5 b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgTWFrZSBidWlsZFJlbGF0 ZWROb2RlTWFwIGFuZCBmaW5kUmVsYXRlZE5vZGUgc3RhdGljIHRvIEV2ZW50UmV0YXJnZXRlci5j cHAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9FdmVudFJldGFyZ2V0ZXIuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2RvbS9FdmVudFJldGFyZ2V0ZXIuY3BwCShyZXZpc2lvbiAx NTcwODMpCisrKyBTb3VyY2UvV2ViQ29yZS9kb20vRXZlbnRSZXRhcmdldGVyLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMzUsMzIgKzM1LDI5IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotc3Rh dGljIGlubGluZSBib29sIGluVGhlU2FtZVNjb3BlKFNoYWRvd1Jvb3QqIHNoYWRvd1Jvb3QsIEV2 ZW50VGFyZ2V0KiB0YXJnZXQpCi17Ci0gICAgcmV0dXJuIHRhcmdldC0+dG9Ob2RlKCkgJiYgdGFy Z2V0LT50b05vZGUoKS0+dHJlZVNjb3BlKCkucm9vdE5vZGUoKSA9PSBzaGFkb3dSb290OwotfQot Ci1zdGF0aWMgaW5saW5lIEV2ZW50RGlzcGF0Y2hCZWhhdmlvciBkZXRlcm1pbmVEaXNwYXRjaEJl aGF2aW9yKEV2ZW50KiBldmVudCwgU2hhZG93Um9vdCogc2hhZG93Um9vdCwgRXZlbnRUYXJnZXQq IHRhcmdldCkKK3N0YXRpYyBpbmxpbmUgYm9vbCBzaG91bGRFdmVudENyb3NzU2hhZG93Qm91bmRh cnkoRXZlbnQqIGV2ZW50LCBTaGFkb3dSb290KiBzaGFkb3dSb290LCBFdmVudFRhcmdldCogdGFy Z2V0KQogeworICAgIE5vZGUqIHRhcmdldE5vZGUgPSB0YXJnZXQtPnRvTm9kZSgpOwogI2lmIEVO QUJMRShGVUxMU0NSRUVOX0FQSSkgJiYgRU5BQkxFKFZJREVPKQogICAgIC8vIFZpZGVvLW9ubHkg ZnVsbCBzY3JlZW4gaXMgYSBtb2RlIHdoZXJlIHdlIHVzZSB0aGUgc2hhZG93IERPTSBhcyBhbiBp bXBsZW1lbnRhdGlvbgogICAgIC8vIGRldGFpbCB0aGF0IHNob3VsZCBub3QgYmUgZGV0ZWN0YWJs ZSBieSB0aGUgd2ViIGNvbnRlbnQuCi0gICAgaWYgKEVsZW1lbnQqIGVsZW1lbnQgPSB0YXJnZXQt PnRvTm9kZSgpLT5kb2N1bWVudCgpLndlYmtpdEN1cnJlbnRGdWxsU2NyZWVuRWxlbWVudCgpKSB7 Ci0gICAgICAgIC8vIEZJWE1FOiBXZSBhc3N1bWUgdGhhdCBpZiB0aGUgZnVsbCBzY3JlZW4gZWxl bWVudCBpcyBhIG1lZGlhIGVsZW1lbnQgdGhhdCBpdCdzCi0gICAgICAgIC8vIHRoZSB2aWRlby1v bmx5IGZ1bGwgc2NyZWVuLiBCb3RoIGhlcmUgYW5kIGVsc2V3aGVyZS4gQnV0IHRoYXQgaXMgcHJv YmFibHkgd3JvbmcuCi0gICAgICAgIGlmIChlbGVtZW50LT5pc01lZGlhRWxlbWVudCgpICYmIHNo YWRvd1Jvb3QgJiYgc2hhZG93Um9vdC0+aG9zdEVsZW1lbnQoKSA9PSBlbGVtZW50KQotICAgICAg ICAgICAgcmV0dXJuIFN0YXlJbnNpZGVTaGFkb3dET007CisgICAgaWYgKHRhcmdldE5vZGUpIHsK KyAgICAgICAgaWYgKEVsZW1lbnQqIGVsZW1lbnQgPSB0YXJnZXROb2RlLT5kb2N1bWVudCgpLndl YmtpdEN1cnJlbnRGdWxsU2NyZWVuRWxlbWVudCgpKSB7CisgICAgICAgICAgICAvLyBGSVhNRTog V2UgYXNzdW1lIHRoYXQgaWYgdGhlIGZ1bGwgc2NyZWVuIGVsZW1lbnQgaXMgYSBtZWRpYSBlbGVt ZW50IHRoYXQgaXQncworICAgICAgICAgICAgLy8gdGhlIHZpZGVvLW9ubHkgZnVsbCBzY3JlZW4u IEJvdGggaGVyZSBhbmQgZWxzZXdoZXJlLiBCdXQgdGhhdCBpcyBwcm9iYWJseSB3cm9uZy4KKyAg ICAgICAgICAgIGlmIChlbGVtZW50LT5pc01lZGlhRWxlbWVudCgpICYmIHNoYWRvd1Jvb3QgJiYg c2hhZG93Um9vdC0+aG9zdEVsZW1lbnQoKSA9PSBlbGVtZW50KQorICAgICAgICAgICAgICAgIHJl dHVybiBmYWxzZTsKKyAgICAgICAgfQogICAgIH0KLSNlbHNlCi0gICAgVU5VU0VEX1BBUkFNKHNo YWRvd1Jvb3QpOwogI2VuZGlmCiAKICAgICAvLyBXZWJLaXQgbmV2ZXIgYWxsb3dlZCBzZWxlY3Rz dGFydCBldmVudCB0byBjcm9zcyB0aGUgdGhlIHNoYWRvdyBET00gYm91bmRhcnkuCiAgICAgLy8g Q2hhbmdpbmcgdGhpcyBicmVha3MgZXhpc3Rpbmcgc2l0ZXMuCiAgICAgLy8gU2VlIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MjE5NSBmb3IgZGV0YWlscy4KLSAgICBj b25zdCBBdG9taWNTdHJpbmcgZXZlbnRUeXBlID0gZXZlbnQtPnR5cGUoKTsKLSAgICBpZiAoaW5U aGVTYW1lU2NvcGUoc2hhZG93Um9vdCwgdGFyZ2V0KQotICAgICAgICAmJiAoZXZlbnRUeXBlID09 IGV2ZW50TmFtZXMoKS5hYm9ydEV2ZW50CisgICAgY29uc3QgQXRvbWljU3RyaW5nJiBldmVudFR5 cGUgPSBldmVudC0+dHlwZSgpOworICAgIGJvb2wgdGFnZXRJc0luU2hhZG93Um9vdCA9IHRhcmdl dE5vZGUgJiYgdGFyZ2V0Tm9kZS0+dHJlZVNjb3BlKCkucm9vdE5vZGUoKSA9PSBzaGFkb3dSb290 OworICAgIHJldHVybiAhdGFnZXRJc0luU2hhZG93Um9vdAorICAgICAgICB8fCAhKGV2ZW50VHlw ZSA9PSBldmVudE5hbWVzKCkuYWJvcnRFdmVudAogICAgICAgICAgICAgfHwgZXZlbnRUeXBlID09 IGV2ZW50TmFtZXMoKS5jaGFuZ2VFdmVudAogICAgICAgICAgICAgfHwgZXZlbnRUeXBlID09IGV2 ZW50TmFtZXMoKS5lcnJvckV2ZW50CiAgICAgICAgICAgICB8fCBldmVudFR5cGUgPT0gZXZlbnRO YW1lcygpLmxvYWRFdmVudApAQCAtNjgsMTAgKzY1LDcgQEAgc3RhdGljIGlubGluZSBFdmVudERp c3BhdGNoQmVoYXZpb3IgZGV0ZQogICAgICAgICAgICAgfHwgZXZlbnRUeXBlID09IGV2ZW50TmFt ZXMoKS5yZXNpemVFdmVudAogICAgICAgICAgICAgfHwgZXZlbnRUeXBlID09IGV2ZW50TmFtZXMo KS5zY3JvbGxFdmVudAogICAgICAgICAgICAgfHwgZXZlbnRUeXBlID09IGV2ZW50TmFtZXMoKS5z ZWxlY3RFdmVudAotICAgICAgICAgICAgfHwgZXZlbnRUeXBlID09IGV2ZW50TmFtZXMoKS5zZWxl Y3RzdGFydEV2ZW50KSkKLSAgICAgICAgcmV0dXJuIFN0YXlJbnNpZGVTaGFkb3dET007Ci0KLSAg ICByZXR1cm4gUmV0YXJnZXRFdmVudDsKKyAgICAgICAgICAgIHx8IGV2ZW50VHlwZSA9PSBldmVu dE5hbWVzKCkuc2VsZWN0c3RhcnRFdmVudCk7CiB9CiAKIHN0YXRpYyBOb2RlKiBub2RlT3JIb3N0 SWZQc2V1ZG9FbGVtZW50KE5vZGUqIG5vZGUpCkBAIC0xMDQsNyArOTgsNyBAQCB2b2lkIEV2ZW50 UmV0YXJnZXRlcjo6Y2FsY3VsYXRlRXZlbnRQYXRoCiAgICAgICAgICAgICByZXR1cm47CiAgICAg ICAgIGlmICghbm9kZS0+aXNTaGFkb3dSb290KCkpCiAgICAgICAgICAgICBjb250aW51ZTsKLSAg ICAgICAgaWYgKGRldGVybWluZURpc3BhdGNoQmVoYXZpb3IoZXZlbnQsIHRvU2hhZG93Um9vdChu b2RlKSwgdGFyZ2V0U3RhY2subGFzdCgpKSA9PSBTdGF5SW5zaWRlU2hhZG93RE9NKQorICAgICAg ICBpZiAoIXNob3VsZEV2ZW50Q3Jvc3NTaGFkb3dCb3VuZGFyeShldmVudCwgdG9TaGFkb3dSb290 KG5vZGUpLCB0YXJnZXRTdGFjay5sYXN0KCkpKQogICAgICAgICAgICAgcmV0dXJuOwogICAgICAg ICBpZiAoIWlzU1ZHRWxlbWVudCkgewogICAgICAgICAgICAgQVNTRVJUKCF0YXJnZXRTdGFjay5p c0VtcHR5KCkpOwpJbmRleDogU291cmNlL1dlYkNvcmUvZG9tL0V2ZW50UmV0YXJnZXRlci5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2RvbS9FdmVudFJldGFyZ2V0ZXIuaAkocmV2aXNp b24gMTU3MDgzKQorKysgU291cmNlL1dlYkNvcmUvZG9tL0V2ZW50UmV0YXJnZXRlci5oCSh3b3Jr aW5nIGNvcHkpCkBAIC00NSwxMSArNDUsNiBAQCBjbGFzcyBUb3VjaEV2ZW50OwogI2VuZGlmCiBj bGFzcyBUcmVlU2NvcGU7CiAKLWVudW0gRXZlbnREaXNwYXRjaEJlaGF2aW9yIHsKLSAgICBSZXRh cmdldEV2ZW50LAotICAgIFN0YXlJbnNpZGVTaGFkb3dET00KLX07Ci0KIGNsYXNzIEV2ZW50UmV0 YXJnZXRlciB7CiBwdWJsaWM6CiAgICAgc3RhdGljIHZvaWQgY2FsY3VsYXRlRXZlbnRQYXRoKE5v ZGUqLCBFdmVudCosIEV2ZW50UGF0aCYpOwo= 213650 2013-10-07 21:14:17 -0700 2013-10-07 21:42:46 -0700 Patch for landing bug-122483-20131007211416.patch text/plain 5262 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1NzA4NCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDEzLTEwLTA3ICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIEV2ZW50RGlzcGF0Y2hCZWhhdmlv ciBpcyB1bm5lY2Vzc2FyeQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTIyNDgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQW5kcmVhcyBLbGluZy4KKwor ICAgICAgICBSZW1vdmVkIEV2ZW50RGlzcGF0Y2hCZWhhdmlvciBhbmQgY2hhbmdlZCB0aGUgcmV0 dXJuIHR5cGUgb2YgZGV0ZXJtaW5lRGlzcGF0Y2hCZWhhdmlvciB0byBib29sLgorICAgICAgICBB bHNvIHJlbmFtZWQgaXQgdG8gc2hvdWxkRXZlbnRDcm9zc1NoYWRvd0JvdW5kYXJ5IHRvIHJlZmxl Y3QgdGhlIHNlbWFudGljcyBtb3JlIGNsZWFyLgorCisgICAgICAgICogZG9tL0V2ZW50UmV0YXJn ZXRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpzaG91bGRFdmVudENyb3NzU2hhZG93Qm91bmRh cnkpOgorICAgICAgICAoV2ViQ29yZTo6RXZlbnRSZXRhcmdldGVyOjpjYWxjdWxhdGVFdmVudFBh dGgpOgorICAgICAgICAqIGRvbS9FdmVudFJldGFyZ2V0ZXIuaDoKKwogMjAxMy0xMC0wNyAgUnlv c3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBNYWtlIGJ1aWxkUmVsYXRl ZE5vZGVNYXAgYW5kIGZpbmRSZWxhdGVkTm9kZSBzdGF0aWMgdG8gRXZlbnRSZXRhcmdldGVyLmNw cApJbmRleDogU291cmNlL1dlYkNvcmUvZG9tL0V2ZW50UmV0YXJnZXRlci5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvZG9tL0V2ZW50UmV0YXJnZXRlci5jcHAJKHJldmlzaW9uIDE1 NzA4MykKKysrIFNvdXJjZS9XZWJDb3JlL2RvbS9FdmVudFJldGFyZ2V0ZXIuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0zNSwzMiArMzUsMjkgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1zdGF0 aWMgaW5saW5lIGJvb2wgaW5UaGVTYW1lU2NvcGUoU2hhZG93Um9vdCogc2hhZG93Um9vdCwgRXZl bnRUYXJnZXQqIHRhcmdldCkKLXsKLSAgICByZXR1cm4gdGFyZ2V0LT50b05vZGUoKSAmJiB0YXJn ZXQtPnRvTm9kZSgpLT50cmVlU2NvcGUoKS5yb290Tm9kZSgpID09IHNoYWRvd1Jvb3Q7Ci19Ci0K LXN0YXRpYyBpbmxpbmUgRXZlbnREaXNwYXRjaEJlaGF2aW9yIGRldGVybWluZURpc3BhdGNoQmVo YXZpb3IoRXZlbnQqIGV2ZW50LCBTaGFkb3dSb290KiBzaGFkb3dSb290LCBFdmVudFRhcmdldCog dGFyZ2V0KQorc3RhdGljIGlubGluZSBib29sIHNob3VsZEV2ZW50Q3Jvc3NTaGFkb3dCb3VuZGFy eShFdmVudCYgZXZlbnQsIFNoYWRvd1Jvb3QmIHNoYWRvd1Jvb3QsIEV2ZW50VGFyZ2V0JiB0YXJn ZXQpCiB7CisgICAgTm9kZSogdGFyZ2V0Tm9kZSA9IHRhcmdldC50b05vZGUoKTsKICNpZiBFTkFC TEUoRlVMTFNDUkVFTl9BUEkpICYmIEVOQUJMRShWSURFTykKICAgICAvLyBWaWRlby1vbmx5IGZ1 bGwgc2NyZWVuIGlzIGEgbW9kZSB3aGVyZSB3ZSB1c2UgdGhlIHNoYWRvdyBET00gYXMgYW4gaW1w bGVtZW50YXRpb24KICAgICAvLyBkZXRhaWwgdGhhdCBzaG91bGQgbm90IGJlIGRldGVjdGFibGUg YnkgdGhlIHdlYiBjb250ZW50LgotICAgIGlmIChFbGVtZW50KiBlbGVtZW50ID0gdGFyZ2V0LT50 b05vZGUoKS0+ZG9jdW1lbnQoKS53ZWJraXRDdXJyZW50RnVsbFNjcmVlbkVsZW1lbnQoKSkgewot ICAgICAgICAvLyBGSVhNRTogV2UgYXNzdW1lIHRoYXQgaWYgdGhlIGZ1bGwgc2NyZWVuIGVsZW1l bnQgaXMgYSBtZWRpYSBlbGVtZW50IHRoYXQgaXQncwotICAgICAgICAvLyB0aGUgdmlkZW8tb25s eSBmdWxsIHNjcmVlbi4gQm90aCBoZXJlIGFuZCBlbHNld2hlcmUuIEJ1dCB0aGF0IGlzIHByb2Jh Ymx5IHdyb25nLgotICAgICAgICBpZiAoZWxlbWVudC0+aXNNZWRpYUVsZW1lbnQoKSAmJiBzaGFk b3dSb290ICYmIHNoYWRvd1Jvb3QtPmhvc3RFbGVtZW50KCkgPT0gZWxlbWVudCkKLSAgICAgICAg ICAgIHJldHVybiBTdGF5SW5zaWRlU2hhZG93RE9NOworICAgIGlmICh0YXJnZXROb2RlKSB7Cisg ICAgICAgIGlmIChFbGVtZW50KiBlbGVtZW50ID0gdGFyZ2V0Tm9kZS0+ZG9jdW1lbnQoKS53ZWJr aXRDdXJyZW50RnVsbFNjcmVlbkVsZW1lbnQoKSkgeworICAgICAgICAgICAgLy8gRklYTUU6IFdl IGFzc3VtZSB0aGF0IGlmIHRoZSBmdWxsIHNjcmVlbiBlbGVtZW50IGlzIGEgbWVkaWEgZWxlbWVu dCB0aGF0IGl0J3MKKyAgICAgICAgICAgIC8vIHRoZSB2aWRlby1vbmx5IGZ1bGwgc2NyZWVuLiBC b3RoIGhlcmUgYW5kIGVsc2V3aGVyZS4gQnV0IHRoYXQgaXMgcHJvYmFibHkgd3JvbmcuCisgICAg ICAgICAgICBpZiAoZWxlbWVudC0+aXNNZWRpYUVsZW1lbnQoKSAmJiBzaGFkb3dSb290Lmhvc3RF bGVtZW50KCkgPT0gZWxlbWVudCkKKyAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAg ICAgIH0KICAgICB9Ci0jZWxzZQotICAgIFVOVVNFRF9QQVJBTShzaGFkb3dSb290KTsKICNlbmRp ZgogCiAgICAgLy8gV2ViS2l0IG5ldmVyIGFsbG93ZWQgc2VsZWN0c3RhcnQgZXZlbnQgdG8gY3Jv c3MgdGhlIHRoZSBzaGFkb3cgRE9NIGJvdW5kYXJ5LgogICAgIC8vIENoYW5naW5nIHRoaXMgYnJl YWtzIGV4aXN0aW5nIHNpdGVzLgogICAgIC8vIFNlZSBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NTIxOTUgZm9yIGRldGFpbHMuCi0gICAgY29uc3QgQXRvbWljU3RyaW5n IGV2ZW50VHlwZSA9IGV2ZW50LT50eXBlKCk7Ci0gICAgaWYgKGluVGhlU2FtZVNjb3BlKHNoYWRv d1Jvb3QsIHRhcmdldCkKLSAgICAgICAgJiYgKGV2ZW50VHlwZSA9PSBldmVudE5hbWVzKCkuYWJv cnRFdmVudAorICAgIGNvbnN0IEF0b21pY1N0cmluZyYgZXZlbnRUeXBlID0gZXZlbnQudHlwZSgp OworICAgIGJvb2wgdGFyZ2V0SXNJblNoYWRvd1Jvb3QgPSB0YXJnZXROb2RlICYmIHRhcmdldE5v ZGUtPnRyZWVTY29wZSgpLnJvb3ROb2RlKCkgPT0gJnNoYWRvd1Jvb3Q7CisgICAgcmV0dXJuICF0 YXJnZXRJc0luU2hhZG93Um9vdAorICAgICAgICB8fCAhKGV2ZW50VHlwZSA9PSBldmVudE5hbWVz KCkuYWJvcnRFdmVudAogICAgICAgICAgICAgfHwgZXZlbnRUeXBlID09IGV2ZW50TmFtZXMoKS5j aGFuZ2VFdmVudAogICAgICAgICAgICAgfHwgZXZlbnRUeXBlID09IGV2ZW50TmFtZXMoKS5lcnJv ckV2ZW50CiAgICAgICAgICAgICB8fCBldmVudFR5cGUgPT0gZXZlbnROYW1lcygpLmxvYWRFdmVu dApAQCAtNjgsMTAgKzY1LDcgQEAgc3RhdGljIGlubGluZSBFdmVudERpc3BhdGNoQmVoYXZpb3Ig ZGV0ZQogICAgICAgICAgICAgfHwgZXZlbnRUeXBlID09IGV2ZW50TmFtZXMoKS5yZXNpemVFdmVu dAogICAgICAgICAgICAgfHwgZXZlbnRUeXBlID09IGV2ZW50TmFtZXMoKS5zY3JvbGxFdmVudAog ICAgICAgICAgICAgfHwgZXZlbnRUeXBlID09IGV2ZW50TmFtZXMoKS5zZWxlY3RFdmVudAotICAg ICAgICAgICAgfHwgZXZlbnRUeXBlID09IGV2ZW50TmFtZXMoKS5zZWxlY3RzdGFydEV2ZW50KSkK LSAgICAgICAgcmV0dXJuIFN0YXlJbnNpZGVTaGFkb3dET007Ci0KLSAgICByZXR1cm4gUmV0YXJn ZXRFdmVudDsKKyAgICAgICAgICAgIHx8IGV2ZW50VHlwZSA9PSBldmVudE5hbWVzKCkuc2VsZWN0 c3RhcnRFdmVudCk7CiB9CiAKIHN0YXRpYyBOb2RlKiBub2RlT3JIb3N0SWZQc2V1ZG9FbGVtZW50 KE5vZGUqIG5vZGUpCkBAIC04MSw2ICs3NSw3IEBAIHN0YXRpYyBOb2RlKiBub2RlT3JIb3N0SWZQ c2V1ZG9FbGVtZW50KE4KIAogdm9pZCBFdmVudFJldGFyZ2V0ZXI6OmNhbGN1bGF0ZUV2ZW50UGF0 aChOb2RlKiB0YXJnZXROb2RlLCBFdmVudCogZXZlbnQsIEV2ZW50UGF0aCYgZXZlbnRQYXRoKQog eworICAgIEFTU0VSVChldmVudCk7CiAgICAgYm9vbCBpbkRvY3VtZW50ID0gdGFyZ2V0Tm9kZS0+ aW5Eb2N1bWVudCgpOwogICAgIGJvb2wgaXNTVkdFbGVtZW50ID0gdGFyZ2V0Tm9kZS0+aXNTVkdF bGVtZW50KCk7CiAgICAgYm9vbCBpc01vdXNlT3JGb2N1c0V2ZW50ID0gZXZlbnQtPmlzTW91c2VF dmVudCgpIHx8IGV2ZW50LT5pc0ZvY3VzRXZlbnQoKTsKQEAgLTEwNCw3ICs5OSw4IEBAIHZvaWQg RXZlbnRSZXRhcmdldGVyOjpjYWxjdWxhdGVFdmVudFBhdGgKICAgICAgICAgICAgIHJldHVybjsK ICAgICAgICAgaWYgKCFub2RlLT5pc1NoYWRvd1Jvb3QoKSkKICAgICAgICAgICAgIGNvbnRpbnVl OwotICAgICAgICBpZiAoZGV0ZXJtaW5lRGlzcGF0Y2hCZWhhdmlvcihldmVudCwgdG9TaGFkb3dS b290KG5vZGUpLCB0YXJnZXRTdGFjay5sYXN0KCkpID09IFN0YXlJbnNpZGVTaGFkb3dET00pCisg ICAgICAgIEFTU0VSVCghdGFyZ2V0U3RhY2suaXNFbXB0eSgpKTsKKyAgICAgICAgaWYgKCFzaG91 bGRFdmVudENyb3NzU2hhZG93Qm91bmRhcnkoKmV2ZW50LCAqdG9TaGFkb3dSb290KG5vZGUpLCAq dGFyZ2V0U3RhY2subGFzdCgpKSkKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgaWYgKCFp c1NWR0VsZW1lbnQpIHsKICAgICAgICAgICAgIEFTU0VSVCghdGFyZ2V0U3RhY2suaXNFbXB0eSgp KTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9FdmVudFJldGFyZ2V0ZXIuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9kb20vRXZlbnRSZXRhcmdldGVyLmgJKHJldmlzaW9uIDE1NzA4 MykKKysrIFNvdXJjZS9XZWJDb3JlL2RvbS9FdmVudFJldGFyZ2V0ZXIuaAkod29ya2luZyBjb3B5 KQpAQCAtNDUsMTEgKzQ1LDYgQEAgY2xhc3MgVG91Y2hFdmVudDsKICNlbmRpZgogY2xhc3MgVHJl ZVNjb3BlOwogCi1lbnVtIEV2ZW50RGlzcGF0Y2hCZWhhdmlvciB7Ci0gICAgUmV0YXJnZXRFdmVu dCwKLSAgICBTdGF5SW5zaWRlU2hhZG93RE9NCi19OwotCiBjbGFzcyBFdmVudFJldGFyZ2V0ZXIg ewogcHVibGljOgogICAgIHN0YXRpYyB2b2lkIGNhbGN1bGF0ZUV2ZW50UGF0aChOb2RlKiwgRXZl bnQqLCBFdmVudFBhdGgmKTsK