108434 2013-01-30 23:32:37 -0800 Rename WheelEvent::Granularity to WheelEvent::DeltaMode 2013-01-31 03:12:22 -0800 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 haraken haraken abarth buildbot ojan.autocc philn rniwa sam webkit-ews webkit.review.bot xan.lopez oldest_to_newest 821127 0 haraken 2013-01-30 23:32:37 -0800 Spec: https://dvcs.w3.org/hg/d4e/raw-file/tip/source_respec.htm#constructor-wheelevent In a follow-up patch I will implement a 'deltaMode' attribute. 821133 1 185685 haraken 2013-01-30 23:36:14 -0800 Created attachment 185685 Patch 821174 2 185685 webkit-ews 2013-01-31 00:16:53 -0800 Comment on attachment 185685 Patch Attachment 185685 did not pass qt-ews (qt): Output: http://queues.webkit.org/results/16283030 821178 3 185685 buildbot 2013-01-31 00:18:41 -0800 Comment on attachment 185685 Patch Attachment 185685 did not pass mac-wk2-ews (mac-wk2): Output: http://queues.webkit.org/results/16271063 821186 4 185685 rniwa 2013-01-31 00:22:41 -0800 Comment on attachment 185685 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=185685&action=review rs=me but please fix the build before you land it. > Source/WebCore/dom/WheelEvent.cpp:56 > + DeltaMode deltaMode, PassRefPtr<AbstractView> view, > + const IntPoint& screenLocation, const IntPoint& pageLocation, > + bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, > + bool directionInvertedFromDevice) It seems like we can fit all of this in two lines if not one? 821191 5 185704 haraken 2013-01-31 00:26:44 -0800 Created attachment 185704 patch for landing 821195 6 haraken 2013-01-31 00:27:27 -0800 (In reply to comment #4) > (From update of attachment 185685 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=185685&action=review > > rs=me but please fix the build before you land it. Thanks! Will do. > It seems like we can fit all of this in two lines if not one? Done. 821316 7 185704 webkit.review.bot 2013-01-31 03:12:17 -0800 Comment on attachment 185704 patch for landing Clearing flags on attachment: 185704 Committed r141394: <http://trac.webkit.org/changeset/141394> 821317 8 webkit.review.bot 2013-01-31 03:12:22 -0800 All reviewed patches have been landed. Closing bug. 185685 2013-01-30 23:36:14 -0800 2013-01-31 00:26:41 -0800 Patch bug-108434-20130131163257.patch text/plain 15866 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTQxMzc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzgwOGVjMDkzZjFkYWUy Nzk4NGQ1ZDU4MDE5Y2VlM2MzZWMxYTYxOS4uMTNjNzEzMDM2NjA1MzY1NjMxZWQwMmQ1NjJhMjI5 OTNjOWIyZjE0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDEzLTAxLTMwICBLZW50 YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZW5hbWUgV2hlZWxF dmVudDo6R3JhbnVsYXJpdHkgdG8gV2hlZWxFdmVudDo6RGVsdGFNb2RlCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDg0MzQKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQZXIgdGhlIHNwZWMsIFdoZWVsRXZl bnQ6OkdyYW51bGFyaXR5IHNob3VsZCBiZSByZW5hbWVkIHRvIFdoZWVsRXZlbnQ6OkRlbHRhTW9k ZS4KKworICAgICAgICBTcGVjOiBodHRwOi8vd3d3LnczLm9yZy9UUi9ET00tTGV2ZWwtMy1FdmVu dHMvI2V2ZW50cy1XaGVlbEV2ZW50CisgICAgICAgIGh0dHBzOi8vZHZjcy53My5vcmcvaGcvZDRl L3Jhdy1maWxlL3RpcC9zb3VyY2VfcmVzcGVjLmh0bSNjb25zdHJ1Y3Rvci13aGVlbGV2ZW50CisK KyAgICAgICAgTm8gdGVzdHMuIE5vIGNoYW5nZSBpbiBiZWhhdmlvci4KKworICAgICAgICAqIGRv bS9XaGVlbEV2ZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OldoZWVsRXZlbnQ6OldoZWVsRXZl bnQpOgorICAgICAgICAoV2ViQ29yZTo6V2hlZWxFdmVudDo6aW5pdFdoZWVsRXZlbnQpOgorICAg ICAgICAoV2ViQ29yZTo6ZGVsdGFNb2RlKToKKyAgICAgICAgKFdlYkNvcmU6OldoZWVsRXZlbnRE aXNwYXRjaE1lZGlhdG9yOjpXaGVlbEV2ZW50RGlzcGF0Y2hNZWRpYXRvcik6CisgICAgICAgICog ZG9tL1doZWVsRXZlbnQuaDoKKyAgICAgICAgKFdlYkNvcmU6OldoZWVsRXZlbnQ6OmNyZWF0ZSk6 CisgICAgICAgIChXZWJDb3JlOjpXaGVlbEV2ZW50OjpkZWx0YU1vZGUpOgorICAgICAgICAoV2hl ZWxFdmVudCk6CisgICAgICAgICogcGFnZS9FdmVudEhhbmRsZXIuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6d2hlZWxHcmFudWxhcml0eVRvU2Nyb2xsR3JhbnVsYXJpdHkpOgorICAgICAgICAoV2Vi Q29yZTo6RXZlbnRIYW5kbGVyOjpkZWZhdWx0V2hlZWxFdmVudEhhbmRsZXIpOgorICAgICAgICAq IHBsYXRmb3JtL1BsYXRmb3JtV2hlZWxFdmVudC5oOgorICAgICAgICAoV2ViQ29yZTo6UGxhdGZv cm1XaGVlbEV2ZW50OjpQbGF0Zm9ybVdoZWVsRXZlbnQpOgorICAgICAgICAoV2ViQ29yZTo6UGxh dGZvcm1XaGVlbEV2ZW50OjpkZWx0YU1vZGUpOgorICAgICAgICAoUGxhdGZvcm1XaGVlbEV2ZW50 KToKKyAgICAgICAgKiBwbGF0Zm9ybS9TY3JvbGxBbmltYXRvci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpTY3JvbGxBbmltYXRvcjo6aGFuZGxlV2hlZWxFdmVudCk6CisKIDIwMTMtMDEtMzAgIFBh dHJpY2sgR2Fuc3RlcmVyICA8cGFyb2dhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUG9ydCBEcmFn SW1hZ2VXaW4uY3BwIHRvIFdpbkNFCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IGQ1ODM3 NWVkMzMzNjg1OTg2YTRiNjQ0YzQyMjQyMmYwYTI3OWU4YWIuLjNjNDRiMDYzYWU4ZDU3ZTBkNzA4 MzE2M2IyY2NlOGRjYzI4YTZlNzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMjEgQEAKKzIwMTMtMDEtMzAgIEtlbnRhcm8gSGFyYSAgPGhhcmFrZW5AY2hyb21pdW0ub3Jn PgorCisgICAgICAgIFJlbmFtZSBXaGVlbEV2ZW50OjpHcmFudWxhcml0eSB0byBXaGVlbEV2ZW50 OjpEZWx0YU1vZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTEwODQzNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFBlciB0aGUgc3BlYywgV2hlZWxFdmVudDo6R3JhbnVsYXJpdHkgc2hvdWxkIGJlIHJlbmFt ZWQgdG8gV2hlZWxFdmVudDo6RGVsdGFNb2RlLgorCisgICAgICAgIFNwZWM6IGh0dHA6Ly93d3cu dzMub3JnL1RSL0RPTS1MZXZlbC0zLUV2ZW50cy8jZXZlbnRzLVdoZWVsRXZlbnQKKyAgICAgICAg aHR0cHM6Ly9kdmNzLnczLm9yZy9oZy9kNGUvcmF3LWZpbGUvdGlwL3NvdXJjZV9yZXNwZWMuaHRt I2NvbnN0cnVjdG9yLXdoZWVsZXZlbnQKKworICAgICAgICBObyB0ZXN0cy4gTm8gY2hhbmdlIGlu IGJlaGF2aW9yLgorCisgICAgICAgICogc3JjL1dlYklucHV0RXZlbnRDb252ZXJzaW9uLmNwcDoK KyAgICAgICAgKFdlYktpdDo6UGxhdGZvcm1XaGVlbEV2ZW50QnVpbGRlcjo6UGxhdGZvcm1XaGVl bEV2ZW50QnVpbGRlcik6CisgICAgICAgIChXZWJLaXQ6OldlYk1vdXNlV2hlZWxFdmVudEJ1aWxk ZXI6OldlYk1vdXNlV2hlZWxFdmVudEJ1aWxkZXIpOgorCiAyMDEzLTAxLTMwICBTaGVyaWZmIEJv dCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCBy b2xsaW5nIG91dCByMTQxMzU4LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL1doZWVs RXZlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL1doZWVsRXZlbnQuY3BwCmluZGV4IDMzOGJh MjYxZjQwZWZmYjkzNDFiNzU5MGU0ZTdmYjg1ZDNmMzJiMmEuLmYwYWUzODhmNmIwOGE1OGI3NTJl YWE3YzRkMmVhYzY0NDk0NGQ2MjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9XaGVl bEV2ZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vV2hlZWxFdmVudC5jcHAKQEAgLTM4 LDcgKzM4LDcgQEAgV2hlZWxFdmVudEluaXQ6OldoZWVsRXZlbnRJbml0KCkKIH0KIAogV2hlZWxF dmVudDo6V2hlZWxFdmVudCgpCi0gICAgOiBtX2dyYW51bGFyaXR5KFBpeGVsKQorICAgIDogbV9k ZWx0YU1vZGUoRE9NRGVsdGFQaXhlbCkKICAgICAsIG1fZGlyZWN0aW9uSW52ZXJ0ZWRGcm9tRGV2 aWNlKGZhbHNlKQogewogfQpAQCAtNTAsMTAgKzUwLDEwIEBAIFdoZWVsRXZlbnQ6OldoZWVsRXZl bnQoY29uc3QgQXRvbWljU3RyaW5nJiB0eXBlLCBjb25zdCBXaGVlbEV2ZW50SW5pdCYgaW5pdGlh bGl6CiB9CiAKIFdoZWVsRXZlbnQ6OldoZWVsRXZlbnQoY29uc3QgRmxvYXRQb2ludCYgd2hlZWxU aWNrcywgY29uc3QgRmxvYXRQb2ludCYgcmF3RGVsdGEsCi0gICAgICAgICAgICAgICAgICAgICAg IEdyYW51bGFyaXR5IGdyYW51bGFyaXR5LCBQYXNzUmVmUHRyPEFic3RyYWN0Vmlldz4gdmlldywK LSAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgSW50UG9pbnQmIHNjcmVlbkxvY2F0aW9uLCBj b25zdCBJbnRQb2ludCYgcGFnZUxvY2F0aW9uLAotICAgICAgICAgICAgICAgICAgICAgICBib29s IGN0cmxLZXksIGJvb2wgYWx0S2V5LCBib29sIHNoaWZ0S2V5LCBib29sIG1ldGFLZXksCi0gICAg ICAgICAgICAgICAgICAgICAgIGJvb2wgZGlyZWN0aW9uSW52ZXJ0ZWRGcm9tRGV2aWNlKQorICAg IERlbHRhTW9kZSBkZWx0YU1vZGUsIFBhc3NSZWZQdHI8QWJzdHJhY3RWaWV3PiB2aWV3LAorICAg IGNvbnN0IEludFBvaW50JiBzY3JlZW5Mb2NhdGlvbiwgY29uc3QgSW50UG9pbnQmIHBhZ2VMb2Nh dGlvbiwKKyAgICBib29sIGN0cmxLZXksIGJvb2wgYWx0S2V5LCBib29sIHNoaWZ0S2V5LCBib29s IG1ldGFLZXksCisgICAgYm9vbCBkaXJlY3Rpb25JbnZlcnRlZEZyb21EZXZpY2UpCiAgICAgOiBN b3VzZUV2ZW50KGV2ZW50TmFtZXMoKS5tb3VzZXdoZWVsRXZlbnQsCiAgICAgICAgICAgICAgICAg IHRydWUsIHRydWUsIHZpZXcsIDAsIHNjcmVlbkxvY2F0aW9uLngoKSwgc2NyZWVuTG9jYXRpb24u eSgpLAogICAgICAgICAgICAgICAgICBwYWdlTG9jYXRpb24ueCgpLCBwYWdlTG9jYXRpb24ueSgp LApAQCAtNjMsNyArNjMsNyBAQCBXaGVlbEV2ZW50OjpXaGVlbEV2ZW50KGNvbnN0IEZsb2F0UG9p bnQmIHdoZWVsVGlja3MsIGNvbnN0IEZsb2F0UG9pbnQmIHJhd0RlbHRhLAogICAgICAgICAgICAg ICAgICBjdHJsS2V5LCBhbHRLZXksIHNoaWZ0S2V5LCBtZXRhS2V5LCAwLCAwLCAwLCBmYWxzZSkK ICAgICAsIG1fd2hlZWxEZWx0YShJbnRQb2ludChzdGF0aWNfY2FzdDxpbnQ+KHdoZWVsVGlja3Mu eCgpICogVGlja011bHRpcGxpZXIpLCBzdGF0aWNfY2FzdDxpbnQ+KHdoZWVsVGlja3MueSgpICog VGlja011bHRpcGxpZXIpKSkKICAgICAsIG1fcmF3RGVsdGEocm91bmRlZEludFBvaW50KHJhd0Rl bHRhKSkKLSAgICAsIG1fZ3JhbnVsYXJpdHkoZ3JhbnVsYXJpdHkpCisgICAgLCBtX2RlbHRhTW9k ZShkZWx0YU1vZGUpCiAgICAgLCBtX2RpcmVjdGlvbkludmVydGVkRnJvbURldmljZShkaXJlY3Rp b25JbnZlcnRlZEZyb21EZXZpY2UpCiB7CiB9CkBAIC04Nyw3ICs4Nyw3IEBAIHZvaWQgV2hlZWxF dmVudDo6aW5pdFdoZWVsRXZlbnQoaW50IHJhd0RlbHRhWCwgaW50IHJhd0RlbHRhWSwgUGFzc1Jl ZlB0cjxBYnN0cmFjCiAgICAgbV93aGVlbERlbHRhID0gSW50UG9pbnQocmF3RGVsdGFYICogVGlj a011bHRpcGxpZXIsIHJhd0RlbHRhWSAqIFRpY2tNdWx0aXBsaWVyKTsKICAgICAKICAgICBtX3Jh d0RlbHRhID0gSW50UG9pbnQocmF3RGVsdGFYLCByYXdEZWx0YVkpOwotICAgIG1fZ3JhbnVsYXJp dHkgPSBQaXhlbDsKKyAgICBtX2RlbHRhTW9kZSA9IERPTURlbHRhUGl4ZWw7CiAgICAgbV9kaXJl Y3Rpb25JbnZlcnRlZEZyb21EZXZpY2UgPSBmYWxzZTsKIAogICAgIGluaXRDb29yZGluYXRlcyhJ bnRQb2ludChwYWdlWCwgcGFnZVkpKTsKQEAgLTExMSw5ICsxMTEsOSBAQCBib29sIFdoZWVsRXZl bnQ6OmlzTW91c2VFdmVudCgpIGNvbnN0CiAgICAgcmV0dXJuIGZhbHNlOwogfQogCi1pbmxpbmUg c3RhdGljIFdoZWVsRXZlbnQ6OkdyYW51bGFyaXR5IGdyYW51bGFyaXR5KGNvbnN0IFBsYXRmb3Jt V2hlZWxFdmVudCYgZXZlbnQpCitpbmxpbmUgc3RhdGljIFdoZWVsRXZlbnQ6OkRlbHRhTW9kZSBk ZWx0YU1vZGUoY29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50JiBldmVudCkKIHsKLSAgICByZXR1cm4g ZXZlbnQuZ3JhbnVsYXJpdHkoKSA9PSBTY3JvbGxCeVBhZ2VXaGVlbEV2ZW50ID8gV2hlZWxFdmVu dDo6UGFnZSA6IFdoZWVsRXZlbnQ6OlBpeGVsOworICAgIHJldHVybiBldmVudC5kZWx0YU1vZGUo KSA9PSBTY3JvbGxCeVBhZ2VXaGVlbEV2ZW50ID8gV2hlZWxFdmVudDo6RE9NRGVsdGFQYWdlIDog V2hlZWxFdmVudDo6RE9NRGVsdGFQaXhlbDsKIH0KIAogUGFzc1JlZlB0cjxXaGVlbEV2ZW50RGlz cGF0Y2hNZWRpYXRvcj4gV2hlZWxFdmVudERpc3BhdGNoTWVkaWF0b3I6OmNyZWF0ZShjb25zdCBQ bGF0Zm9ybVdoZWVsRXZlbnQmIGV2ZW50LCBQYXNzUmVmUHRyPEFic3RyYWN0Vmlldz4gdmlldykK QEAgLTEyNyw4ICsxMjcsOCBAQCBXaGVlbEV2ZW50RGlzcGF0Y2hNZWRpYXRvcjo6V2hlZWxFdmVu dERpc3BhdGNoTWVkaWF0b3IoY29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50JgogICAgICAgICByZXR1 cm47CiAKICAgICBzZXRFdmVudChXaGVlbEV2ZW50OjpjcmVhdGUoRmxvYXRQb2ludChldmVudC53 aGVlbFRpY2tzWCgpLCBldmVudC53aGVlbFRpY2tzWSgpKSwgRmxvYXRQb2ludChldmVudC5kZWx0 YVgoKSwgZXZlbnQuZGVsdGFZKCkpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBn cmFudWxhcml0eShldmVudCksIHZpZXcsIGV2ZW50Lmdsb2JhbFBvc2l0aW9uKCksIGV2ZW50LnBv c2l0aW9uKCksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGV2ZW50LmN0cmxLZXko KSwgZXZlbnQuYWx0S2V5KCksIGV2ZW50LnNoaWZ0S2V5KCksIGV2ZW50Lm1ldGFLZXkoKSwgZXZl bnQuZGlyZWN0aW9uSW52ZXJ0ZWRGcm9tRGV2aWNlKCkpKTsKKyAgICAgICAgZGVsdGFNb2RlKGV2 ZW50KSwgdmlldywgZXZlbnQuZ2xvYmFsUG9zaXRpb24oKSwgZXZlbnQucG9zaXRpb24oKSwKKyAg ICAgICAgZXZlbnQuY3RybEtleSgpLCBldmVudC5hbHRLZXkoKSwgZXZlbnQuc2hpZnRLZXkoKSwg ZXZlbnQubWV0YUtleSgpLCBldmVudC5kaXJlY3Rpb25JbnZlcnRlZEZyb21EZXZpY2UoKSkpOwog fQogCiBXaGVlbEV2ZW50KiBXaGVlbEV2ZW50RGlzcGF0Y2hNZWRpYXRvcjo6ZXZlbnQoKSBjb25z dApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL1doZWVsRXZlbnQuaCBiL1NvdXJjZS9X ZWJDb3JlL2RvbS9XaGVlbEV2ZW50LmgKaW5kZXggMzNhNDNjYmI2N2JhOGQ4OWU3NzFlYjQyNzRj NDM4OWUwMDE4NDY2OC4uYzAyZjU2NmJmNjdkMGU4NTc5ZDliN2Q2NjQxOTJiODI4NDdmMjQwZCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL1doZWVsRXZlbnQuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9kb20vV2hlZWxFdmVudC5oCkBAIC00MSw3ICs0MSw3IEBAIGNsYXNzIFdoZWVsRXZl bnQgOiBwdWJsaWMgTW91c2VFdmVudCB7CiBwdWJsaWM6CiAgICAgZW51bSB7IFRpY2tNdWx0aXBs aWVyID0gMTIwIH07CiAKLSAgICBlbnVtIEdyYW51bGFyaXR5IHsgUGl4ZWwsIExpbmUsIFBhZ2Ug fTsKKyAgICBlbnVtIERlbHRhTW9kZSB7IERPTURlbHRhUGl4ZWwsIERPTURlbHRhTGluZSwgRE9N RGVsdGFQYWdlIH07CiAKICAgICBzdGF0aWMgUGFzc1JlZlB0cjxXaGVlbEV2ZW50PiBjcmVhdGUo KQogICAgIHsKQEAgLTU0LDExICs1NCwxMSBAQCBwdWJsaWM6CiAgICAgfQogCiAgICAgc3RhdGlj IFBhc3NSZWZQdHI8V2hlZWxFdmVudD4gY3JlYXRlKGNvbnN0IEZsb2F0UG9pbnQmIHdoZWVsVGlj a3MsCi0gICAgICAgIGNvbnN0IEZsb2F0UG9pbnQmIHJhd0RlbHRhLCBHcmFudWxhcml0eSBncmFu dWxhcml0eSwgUGFzc1JlZlB0cjxBYnN0cmFjdFZpZXc+IHZpZXcsCisgICAgICAgIGNvbnN0IEZs b2F0UG9pbnQmIHJhd0RlbHRhLCBEZWx0YU1vZGUgZGVsdGFNb2RlLCBQYXNzUmVmUHRyPEFic3Ry YWN0Vmlldz4gdmlldywKICAgICAgICAgY29uc3QgSW50UG9pbnQmIHNjcmVlbkxvY2F0aW9uLCBj b25zdCBJbnRQb2ludCYgcGFnZUxvY2F0aW9uLAogICAgICAgICBib29sIGN0cmxLZXksIGJvb2wg YWx0S2V5LCBib29sIHNoaWZ0S2V5LCBib29sIG1ldGFLZXksIGJvb2wgZGlyZWN0aW9uSW52ZXJ0 ZWRGcm9tRGV2aWNlKQogICAgIHsKLSAgICAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBXaGVlbEV2 ZW50KHdoZWVsVGlja3MsIHJhd0RlbHRhLCBncmFudWxhcml0eSwgdmlldywKKyAgICAgICAgcmV0 dXJuIGFkb3B0UmVmKG5ldyBXaGVlbEV2ZW50KHdoZWVsVGlja3MsIHJhd0RlbHRhLCBkZWx0YU1v ZGUsIHZpZXcsCiAgICAgICAgIHNjcmVlbkxvY2F0aW9uLCBwYWdlTG9jYXRpb24sIGN0cmxLZXks IGFsdEtleSwgc2hpZnRLZXksIG1ldGFLZXksIGRpcmVjdGlvbkludmVydGVkRnJvbURldmljZSkp OwogICAgIH0KIApAQCAtNzUsNyArNzUsNyBAQCBwdWJsaWM6CiAgICAgaW50IHdoZWVsRGVsdGFZ KCkgY29uc3QgeyByZXR1cm4gbV93aGVlbERlbHRhLnkoKTsgfQogICAgIGludCByYXdEZWx0YVgo KSBjb25zdCB7IHJldHVybiBtX3Jhd0RlbHRhLngoKTsgfQogICAgIGludCByYXdEZWx0YVkoKSBj b25zdCB7IHJldHVybiBtX3Jhd0RlbHRhLnkoKTsgfQotICAgIEdyYW51bGFyaXR5IGdyYW51bGFy aXR5KCkgY29uc3QgeyByZXR1cm4gbV9ncmFudWxhcml0eTsgfQorICAgIERlbHRhTW9kZSBkZWx0 YU1vZGUoKSBjb25zdCB7IHJldHVybiBtX2RlbHRhTW9kZTsgfQogCiAgICAgYm9vbCB3ZWJraXRE aXJlY3Rpb25JbnZlcnRlZEZyb21EZXZpY2UoKSBjb25zdCB7IHJldHVybiBtX2RpcmVjdGlvbklu dmVydGVkRnJvbURldmljZTsgfQogICAgIC8vIE5lZWRlZCBmb3IgT2JqZWN0aXZlLUMgbGVnYWN5 IHN1cHBvcnQKQEAgLTg4LDEzICs4OCwxMyBAQCBwcml2YXRlOgogICAgIFdoZWVsRXZlbnQoKTsK ICAgICBXaGVlbEV2ZW50KGNvbnN0IEF0b21pY1N0cmluZyYsIGNvbnN0IFdoZWVsRXZlbnRJbml0 Jik7CiAgICAgV2hlZWxFdmVudChjb25zdCBGbG9hdFBvaW50JiB3aGVlbFRpY2tzLCBjb25zdCBG bG9hdFBvaW50JiByYXdEZWx0YSwKLSAgICAgICAgR3JhbnVsYXJpdHksIFBhc3NSZWZQdHI8QWJz dHJhY3RWaWV3PiwKKyAgICAgICAgRGVsdGFNb2RlLCBQYXNzUmVmUHRyPEFic3RyYWN0Vmlldz4s CiAgICAgICAgIGNvbnN0IEludFBvaW50JiBzY3JlZW5Mb2NhdGlvbiwgY29uc3QgSW50UG9pbnQm IHBhZ2VMb2NhdGlvbiwKICAgICAgICAgYm9vbCBjdHJsS2V5LCBib29sIGFsdEtleSwgYm9vbCBz aGlmdEtleSwgYm9vbCBtZXRhS2V5LCBib29sIGRpcmVjdGlvbkludmVydGVkRnJvbURldmljZSk7 CiAKICAgICBJbnRQb2ludCBtX3doZWVsRGVsdGE7CiAgICAgSW50UG9pbnQgbV9yYXdEZWx0YTsK LSAgICBHcmFudWxhcml0eSBtX2dyYW51bGFyaXR5OworICAgIERlbHRhTW9kZSBtX2RlbHRhTW9k ZTsKICAgICBib29sIG1fZGlyZWN0aW9uSW52ZXJ0ZWRGcm9tRGV2aWNlOwogfTsKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwIGIvU291cmNlL1dlYkNv cmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwCmluZGV4IDFlMTIxNGFhMGEwYWEyYjYwOWMxNjQ2MWRm ZDY4YjZlMmYwZWUwZDIuLjU0ZmQ1ZTJkNjVkOTg0NDk5YWRkNDUyZmVmMmFjZmMxNTdhYWUzNDcg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAKQEAgLTI1MSwxNCArMjUxLDE0IEBA IHB1YmxpYzoKIH07CiAjZW5kaWYKIAotc3RhdGljIGlubGluZSBTY3JvbGxHcmFudWxhcml0eSB3 aGVlbEdyYW51bGFyaXR5VG9TY3JvbGxHcmFudWxhcml0eShXaGVlbEV2ZW50OjpHcmFudWxhcml0 eSBncmFudWxhcml0eSkKK3N0YXRpYyBpbmxpbmUgU2Nyb2xsR3JhbnVsYXJpdHkgd2hlZWxHcmFu dWxhcml0eVRvU2Nyb2xsR3JhbnVsYXJpdHkoV2hlZWxFdmVudDo6RGVsdGFNb2RlIGRlbHRhTW9k ZSkKIHsKLSAgICBzd2l0Y2ggKGdyYW51bGFyaXR5KSB7Ci0gICAgY2FzZSBXaGVlbEV2ZW50OjpQ YWdlOgorICAgIHN3aXRjaCAoZGVsdGFNb2RlKSB7CisgICAgY2FzZSBXaGVlbEV2ZW50OjpET01E ZWx0YVBhZ2U6CiAgICAgICAgIHJldHVybiBTY3JvbGxCeVBhZ2U7Ci0gICAgY2FzZSBXaGVlbEV2 ZW50OjpMaW5lOgorICAgIGNhc2UgV2hlZWxFdmVudDo6RE9NRGVsdGFMaW5lOgogICAgICAgICBy ZXR1cm4gU2Nyb2xsQnlMaW5lOwotICAgIGNhc2UgV2hlZWxFdmVudDo6UGl4ZWw6CisgICAgY2Fz ZSBXaGVlbEV2ZW50OjpET01EZWx0YVBpeGVsOgogICAgICAgICByZXR1cm4gU2Nyb2xsQnlQaXhl bDsKICAgICB9CiAgICAgcmV0dXJuIFNjcm9sbEJ5UGl4ZWw7CkBAIC0yMzg5LDcgKzIzODksNyBA QCB2b2lkIEV2ZW50SGFuZGxlcjo6ZGVmYXVsdFdoZWVsRXZlbnRIYW5kbGVyKE5vZGUqIHN0YXJ0 Tm9kZSwgV2hlZWxFdmVudCogd2hlZWxFdgogICAgICAgICByZXR1cm47CiAgICAgCiAgICAgTm9k ZSogc3RvcE5vZGUgPSBtX3ByZXZpb3VzV2hlZWxTY3JvbGxlZE5vZGUuZ2V0KCk7Ci0gICAgU2Ny b2xsR3JhbnVsYXJpdHkgZ3JhbnVsYXJpdHkgPSB3aGVlbEdyYW51bGFyaXR5VG9TY3JvbGxHcmFu dWxhcml0eSh3aGVlbEV2ZW50LT5ncmFudWxhcml0eSgpKTsKKyAgICBTY3JvbGxHcmFudWxhcml0 eSBncmFudWxhcml0eSA9IHdoZWVsR3JhbnVsYXJpdHlUb1Njcm9sbEdyYW51bGFyaXR5KHdoZWVs RXZlbnQtPmRlbHRhTW9kZSgpKTsKICAgICAKICAgICAvLyBCcmVhayB1cCBpbnRvIHR3byBzY3Jv bGxzIGlmIHdlIG5lZWQgdG8uICBEaWFnb25hbCBtb3ZlbWVudCBvbiAKICAgICAvLyBhIE1hY0Jv b2sgcHJvIGlzIGFuIGV4YW1wbGUgb2YgYSAyLWRpbWVuc2lvbmFsIG1vdXNlIHdoZWVsIGV2ZW50 ICh3aGVyZSBib3RoIGRlbHRhWCBhbmQgZGVsdGFZIGNhbiBiZSBzZXQpLgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vUGxhdGZvcm1XaGVlbEV2ZW50LmggYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9QbGF0Zm9ybVdoZWVsRXZlbnQuaAppbmRleCA4YzAzMDJjNWVhNWQ1YmZl OGEzMGIyYzQ1OTE1ZjMxODI0NjliZjE5Li5kYWU1YjA4YzhiYjkxNWU2ZTk2NTdjMTJjM2E2YjQw YTRlNDViNDNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9QbGF0Zm9ybVdo ZWVsRXZlbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9QbGF0Zm9ybVdoZWVsRXZl bnQuaApAQCAtNTUsNyArNTUsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgLy8gYW5kIHN5 bnRoZXNpemVkIGluIG90aGVyIGNhc2VzIHdoZXJlIHBsYXRmb3JtcyBnZW5lcmF0ZSBsaW5lLWJ5 LWxpbmUgc2Nyb2xsaW5nIGV2ZW50cy4KICAgICAvLyBUaGUgU2Nyb2xsQnlQYWdlV2hlZWxFdmVu dCBpbmRpY2F0ZXMgdGhhdCB0aGUgd2hlZWwgZXZlbnQgc2hvdWxkIHNjcm9sbCBhbiBlbnRpcmUg cGFnZS4gIEluIHRoaXMgY2FzZSBXZWJDb3JlJ3MgYnVpbHQgaW4gcGFnaW5nIGJlaGF2aW9yIGlz IHVzZWQgdG8gcGFnZQogICAgIC8vIHVwIGFuZCBkb3duICh5b3UgZ2V0IHRoZSBzYW1lIGJlaGF2 aW9yIGFzIGlmIHRoZSB1c2VyIHdhcyBjbGlja2luZyBpbiBhIHNjcm9sbGJhciB0cmFjayB0byBw YWdlIHVwIG9yIHBhZ2UgZG93bikuCi0gICAgZW51bSBQbGF0Zm9ybVdoZWVsRXZlbnRHcmFudWxh cml0eSB7CisgICAgZW51bSBQbGF0Zm9ybVdoZWVsRXZlbnREZWx0YU1vZGUgewogICAgICAgICBT Y3JvbGxCeVBhZ2VXaGVlbEV2ZW50LAogICAgICAgICBTY3JvbGxCeVBpeGVsV2hlZWxFdmVudCwK ICAgICB9OwpAQCAtODAsNyArODAsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgICAg ICAsIG1fZGVsdGFZKDApCiAgICAgICAgICAgICAsIG1fd2hlZWxUaWNrc1goMCkKICAgICAgICAg ICAgICwgbV93aGVlbFRpY2tzWSgwKQotICAgICAgICAgICAgLCBtX2dyYW51bGFyaXR5KFNjcm9s bEJ5UGl4ZWxXaGVlbEV2ZW50KQorICAgICAgICAgICAgLCBtX2RlbHRhTW9kZShTY3JvbGxCeVBp eGVsV2hlZWxFdmVudCkKICAgICAgICAgICAgICwgbV9kaXJlY3Rpb25JbnZlcnRlZEZyb21EZXZp Y2UoZmFsc2UpCiAgICAgICAgICAgICAsIG1fdXNlTGF0Y2hlZEV2ZW50Tm9kZShmYWxzZSkKICNp ZiBQTEFURk9STShNQUMpIHx8IFBMQVRGT1JNKENIUk9NSVVNKQpAQCAtOTYsNyArOTYsNyBAQCBu YW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHsKICAgICAgICAgfQogCi0gICAgICAgIFBsYXRm b3JtV2hlZWxFdmVudChJbnRQb2ludCBwb3NpdGlvbiwgSW50UG9pbnQgZ2xvYmFsUG9zaXRpb24s IGZsb2F0IGRlbHRhWCwgZmxvYXQgZGVsdGFZLCBmbG9hdCB3aGVlbFRpY2tzWCwgZmxvYXQgd2hl ZWxUaWNrc1ksIFBsYXRmb3JtV2hlZWxFdmVudEdyYW51bGFyaXR5IGdyYW51bGFyaXR5LCBib29s IHNoaWZ0S2V5LCBib29sIGN0cmxLZXksIGJvb2wgYWx0S2V5LCBib29sIG1ldGFLZXkpCisgICAg ICAgIFBsYXRmb3JtV2hlZWxFdmVudChJbnRQb2ludCBwb3NpdGlvbiwgSW50UG9pbnQgZ2xvYmFs UG9zaXRpb24sIGZsb2F0IGRlbHRhWCwgZmxvYXQgZGVsdGFZLCBmbG9hdCB3aGVlbFRpY2tzWCwg ZmxvYXQgd2hlZWxUaWNrc1ksIFBsYXRmb3JtV2hlZWxFdmVudERlbHRhTW9kZSBkZWx0YU1vZGUs IGJvb2wgc2hpZnRLZXksIGJvb2wgY3RybEtleSwgYm9vbCBhbHRLZXksIGJvb2wgbWV0YUtleSkK ICAgICAgICAgICAgIDogUGxhdGZvcm1FdmVudChQbGF0Zm9ybUV2ZW50OjpXaGVlbCwgc2hpZnRL ZXksIGN0cmxLZXksIGFsdEtleSwgbWV0YUtleSwgMCkKICAgICAgICAgICAgICwgbV9wb3NpdGlv bihwb3NpdGlvbikKICAgICAgICAgICAgICwgbV9nbG9iYWxQb3NpdGlvbihnbG9iYWxQb3NpdGlv bikKQEAgLTEwNCw3ICsxMDQsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgICAgICAs IG1fZGVsdGFZKGRlbHRhWSkKICAgICAgICAgICAgICwgbV93aGVlbFRpY2tzWCh3aGVlbFRpY2tz WCkKICAgICAgICAgICAgICwgbV93aGVlbFRpY2tzWSh3aGVlbFRpY2tzWSkKLSAgICAgICAgICAg ICwgbV9ncmFudWxhcml0eShncmFudWxhcml0eSkKKyAgICAgICAgICAgICwgbV9kZWx0YU1vZGUo ZGVsdGFNb2RlKQogICAgICAgICAgICAgLCBtX2RpcmVjdGlvbkludmVydGVkRnJvbURldmljZShm YWxzZSkKICAgICAgICAgICAgICwgbV91c2VMYXRjaGVkRXZlbnROb2RlKGZhbHNlKQogI2lmIFBM QVRGT1JNKE1BQykgfHwgUExBVEZPUk0oQ0hST01JVU0pCkBAIC0xNDEsNyArMTQxLDcgQEAgbmFt ZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBmbG9hdCB3aGVlbFRpY2tzWCgpIGNvbnN0IHsgcmV0 dXJuIG1fd2hlZWxUaWNrc1g7IH0KICAgICAgICAgZmxvYXQgd2hlZWxUaWNrc1koKSBjb25zdCB7 IHJldHVybiBtX3doZWVsVGlja3NZOyB9CiAKLSAgICAgICAgUGxhdGZvcm1XaGVlbEV2ZW50R3Jh bnVsYXJpdHkgZ3JhbnVsYXJpdHkoKSBjb25zdCB7IHJldHVybiBtX2dyYW51bGFyaXR5OyB9Cisg ICAgICAgIFBsYXRmb3JtV2hlZWxFdmVudERlbHRhTW9kZSBkZWx0YU1vZGUoKSBjb25zdCB7IHJl dHVybiBtX2RlbHRhTW9kZTsgfQogCiAgICAgICAgIGJvb2wgZGlyZWN0aW9uSW52ZXJ0ZWRGcm9t RGV2aWNlKCkgY29uc3QgeyByZXR1cm4gbV9kaXJlY3Rpb25JbnZlcnRlZEZyb21EZXZpY2U7IH0K IApAQCAtMTg1LDcgKzE4NSw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgZmxvYXQg bV9kZWx0YVk7CiAgICAgICAgIGZsb2F0IG1fd2hlZWxUaWNrc1g7CiAgICAgICAgIGZsb2F0IG1f d2hlZWxUaWNrc1k7Ci0gICAgICAgIFBsYXRmb3JtV2hlZWxFdmVudEdyYW51bGFyaXR5IG1fZ3Jh bnVsYXJpdHk7CisgICAgICAgIFBsYXRmb3JtV2hlZWxFdmVudERlbHRhTW9kZSBtX2RlbHRhTW9k ZTsKICAgICAgICAgYm9vbCBtX2RpcmVjdGlvbkludmVydGVkRnJvbURldmljZTsKICAgICAgICAg Ym9vbCBtX3VzZUxhdGNoZWRFdmVudE5vZGU7CiAjaWYgUExBVEZPUk0oTUFDKSB8fCBQTEFURk9S TShDSFJPTUlVTSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbEFu aW1hdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbEFuaW1hdG9yLmNwcApp bmRleCA5Nzg2M2M0ZDE4ZWUxYzQ2MWViY2JjYjZiZGUyNGM1YjM2NDBmMGFhLi4xM2UzZDdhZmU2 Yzc2OGU4YzE4ZjkwZThmZWQ1MjQ5MDdjNjY2ZjcxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9TY3JvbGxBbmltYXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vU2Nyb2xsQW5pbWF0b3IuY3BwCkBAIC0xMDYsNyArMTA2LDcgQEAgYm9vbCBTY3JvbGxBbmlt YXRvcjo6aGFuZGxlV2hlZWxFdmVudChjb25zdCBQbGF0Zm9ybVdoZWVsRXZlbnQmIGUpCiAgICAg ICAgIGhhbmRsZWQgPSB0cnVlOwogCiAgICAgICAgIGlmIChkZWx0YVkpIHsKLSAgICAgICAgICAg IGlmIChlLmdyYW51bGFyaXR5KCkgPT0gU2Nyb2xsQnlQYWdlV2hlZWxFdmVudCkgeworICAgICAg ICAgICAgaWYgKGUuZGVsdGFNb2RlKCkgPT0gU2Nyb2xsQnlQYWdlV2hlZWxFdmVudCkgewogICAg ICAgICAgICAgICAgIGJvb2wgbmVnYXRpdmUgPSBkZWx0YVkgPCAwOwogICAgICAgICAgICAgICAg IGRlbHRhWSA9IG1heChtYXgoc3RhdGljX2Nhc3Q8ZmxvYXQ+KG1fc2Nyb2xsYWJsZUFyZWEtPnZp c2libGVIZWlnaHQoKSkgKiBTY3JvbGxiYXI6Om1pbkZyYWN0aW9uVG9TdGVwV2hlblBhZ2luZygp LCBzdGF0aWNfY2FzdDxmbG9hdD4obV9zY3JvbGxhYmxlQXJlYS0+dmlzaWJsZUhlaWdodCgpIC0g U2Nyb2xsYmFyOjptYXhPdmVybGFwQmV0d2VlblBhZ2VzKCkpKSwgMS4wZik7CiAgICAgICAgICAg ICAgICAgaWYgKG5lZ2F0aXZlKQpAQCAtMTE2LDcgKzExNiw3IEBAIGJvb2wgU2Nyb2xsQW5pbWF0 b3I6OmhhbmRsZVdoZWVsRXZlbnQoY29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50JiBlKQogICAgICAg ICB9CiAKICAgICAgICAgaWYgKGRlbHRhWCkgewotICAgICAgICAgICAgaWYgKGUuZ3JhbnVsYXJp dHkoKSA9PSBTY3JvbGxCeVBhZ2VXaGVlbEV2ZW50KSB7CisgICAgICAgICAgICBpZiAoZS5kZWx0 YU1vZGUoKSA9PSBTY3JvbGxCeVBhZ2VXaGVlbEV2ZW50KSB7CiAgICAgICAgICAgICAgICAgYm9v bCBuZWdhdGl2ZSA9IGRlbHRhWCA8IDA7CiAgICAgICAgICAgICAgICAgZGVsdGFYID0gbWF4KG1h eChzdGF0aWNfY2FzdDxmbG9hdD4obV9zY3JvbGxhYmxlQXJlYS0+dmlzaWJsZVdpZHRoKCkpICog U2Nyb2xsYmFyOjptaW5GcmFjdGlvblRvU3RlcFdoZW5QYWdpbmcoKSwgc3RhdGljX2Nhc3Q8Zmxv YXQ+KG1fc2Nyb2xsYWJsZUFyZWEtPnZpc2libGVXaWR0aCgpIC0gU2Nyb2xsYmFyOjptYXhPdmVy bGFwQmV0d2VlblBhZ2VzKCkpKSwgMS4wZik7CiAgICAgICAgICAgICAgICAgaWYgKG5lZ2F0aXZl KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViSW5wdXRFdmVudENv bnZlcnNpb24uY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViSW5wdXRFdmVudENv bnZlcnNpb24uY3BwCmluZGV4IDU2NjVkNzM4MGMwZmMxMjZjNjEyMjQ5NjMyOTYwNGY2ZWZkNTdm NTguLjljODllZmU4MWM1OWM5YzIwNTMzYTFjNzUxODQ3MWM5YTFmMjE3MmUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYklucHV0RXZlbnRDb252ZXJzaW9uLmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJJbnB1dEV2ZW50Q29udmVyc2lvbi5j cHAKQEAgLTExMCw3ICsxMTAsNyBAQCBQbGF0Zm9ybVdoZWVsRXZlbnRCdWlsZGVyOjpQbGF0Zm9y bVdoZWVsRXZlbnRCdWlsZGVyKFdpZGdldCogd2lkZ2V0LCBjb25zdCBXZWJNbwogICAgIG1fZGVs dGFZID0gZS5kZWx0YVk7CiAgICAgbV93aGVlbFRpY2tzWCA9IGUud2hlZWxUaWNrc1g7CiAgICAg bV93aGVlbFRpY2tzWSA9IGUud2hlZWxUaWNrc1k7Ci0gICAgbV9ncmFudWxhcml0eSA9IGUuc2Ny b2xsQnlQYWdlID8KKyAgICBtX2RlbHRhTW9kZSA9IGUuc2Nyb2xsQnlQYWdlID8KICAgICAgICAg U2Nyb2xsQnlQYWdlV2hlZWxFdmVudCA6IFNjcm9sbEJ5UGl4ZWxXaGVlbEV2ZW50OwogICAgIAog ICAgIG1fdHlwZSA9IFBsYXRmb3JtRXZlbnQ6OldoZWVsOwpAQCAtNTE3LDcgKzUxNyw3IEBAIFdl Yk1vdXNlV2hlZWxFdmVudEJ1aWxkZXI6OldlYk1vdXNlV2hlZWxFdmVudEJ1aWxkZXIoY29uc3Qg V2lkZ2V0KiB3aWRnZXQsIGNvbnN0CiAgICAgLy8gVGhlIDEyMCBpcyBmcm9tIFdoZWVsRXZlbnQ6 OmluaXRXaGVlbEV2ZW50KCkuCiAgICAgd2hlZWxUaWNrc1ggPSBzdGF0aWNfY2FzdDxmbG9hdD4o ZXZlbnQud2hlZWxEZWx0YVgoKSkgLyAxMjA7CiAgICAgd2hlZWxUaWNrc1kgPSBzdGF0aWNfY2Fz dDxmbG9hdD4oZXZlbnQud2hlZWxEZWx0YVkoKSkgLyAxMjA7Ci0gICAgc2Nyb2xsQnlQYWdlID0g ZXZlbnQuZ3JhbnVsYXJpdHkoKSA9PSBXaGVlbEV2ZW50OjpQYWdlOworICAgIHNjcm9sbEJ5UGFn ZSA9IGV2ZW50LmRlbHRhTW9kZSgpID09IFdoZWVsRXZlbnQ6OkRPTURlbHRhUGFnZTsKIH0KIAog V2ViS2V5Ym9hcmRFdmVudEJ1aWxkZXI6OldlYktleWJvYXJkRXZlbnRCdWlsZGVyKGNvbnN0IEtl eWJvYXJkRXZlbnQmIGV2ZW50KQo= 185704 2013-01-31 00:26:44 -0800 2013-01-31 03:12:17 -0800 patch for landing bug-108434-20130131172328.patch text/plain 10768 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTQxMzc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzgwOGVjMDkzZjFkYWUy Nzk4NGQ1ZDU4MDE5Y2VlM2MzZWMxYTYxOS4uMzAyOTIyZTk5ZmQ2OTk5YTZjOTUyOTc4YzEwYWNh OTNiMmU1Y2I5NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDEzLTAxLTMwICBLZW50 YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZW5hbWUgV2hlZWxF dmVudDo6R3JhbnVsYXJpdHkgdG8gV2hlZWxFdmVudDo6RGVsdGFNb2RlCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDg0MzQKKworICAgICAgICBSZXZp ZXdlZCBieSBSeW9zdWtlIE5pd2EuCisKKyAgICAgICAgUGVyIHRoZSBzcGVjLCBXaGVlbEV2ZW50 OjpHcmFudWxhcml0eSBzaG91bGQgYmUgcmVuYW1lZCB0byBXaGVlbEV2ZW50OjpEZWx0YU1vZGUu CisKKyAgICAgICAgU3BlYzogaHR0cDovL3d3dy53My5vcmcvVFIvRE9NLUxldmVsLTMtRXZlbnRz LyNldmVudHMtV2hlZWxFdmVudAorICAgICAgICBodHRwczovL2R2Y3MudzMub3JnL2hnL2Q0ZS9y YXctZmlsZS90aXAvc291cmNlX3Jlc3BlYy5odG0jY29uc3RydWN0b3Itd2hlZWxldmVudAorCisg ICAgICAgIE5vIHRlc3RzLiBObyBjaGFuZ2UgaW4gYmVoYXZpb3IuCisKKyAgICAgICAgKiBkb20v V2hlZWxFdmVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXaGVlbEV2ZW50OjpXaGVlbEV2ZW50 KToKKyAgICAgICAgKFdlYkNvcmU6OldoZWVsRXZlbnQ6OmluaXRXaGVlbEV2ZW50KToKKyAgICAg ICAgKFdlYkNvcmU6OmRlbHRhTW9kZSk6CisgICAgICAgIChXZWJDb3JlOjpXaGVlbEV2ZW50RGlz cGF0Y2hNZWRpYXRvcjo6V2hlZWxFdmVudERpc3BhdGNoTWVkaWF0b3IpOgorICAgICAgICAqIGRv bS9XaGVlbEV2ZW50Lmg6CisgICAgICAgIChXZWJDb3JlOjpXaGVlbEV2ZW50OjpjcmVhdGUpOgor ICAgICAgICAoV2ViQ29yZTo6V2hlZWxFdmVudDo6ZGVsdGFNb2RlKToKKyAgICAgICAgKFdoZWVs RXZlbnQpOgorICAgICAgICAqIHBhZ2UvRXZlbnRIYW5kbGVyLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OndoZWVsR3JhbnVsYXJpdHlUb1Njcm9sbEdyYW51bGFyaXR5KToKKyAgICAgICAgKFdlYkNv cmU6OkV2ZW50SGFuZGxlcjo6ZGVmYXVsdFdoZWVsRXZlbnRIYW5kbGVyKToKKwogMjAxMy0wMS0z MCAgUGF0cmljayBHYW5zdGVyZXIgIDxwYXJvZ2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBQb3J0 IERyYWdJbWFnZVdpbi5jcHAgdG8gV2luQ0UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXgg ZDU4Mzc1ZWQzMzM2ODU5ODZhNGI2NDRjNDIyNDIyZjBhMjc5ZThhYi4uYTkzNDU1YzhjODVlZWI2 MTBjYTA0YTU3NjFjZjg2MWJiMGI5ZjI1MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAg LTEsMyArMSwyMSBAQAorMjAxMy0wMS0zMCAgS2VudGFybyBIYXJhICA8aGFyYWtlbkBjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgUmVuYW1lIFdoZWVsRXZlbnQ6OkdyYW51bGFyaXR5IHRvIFdoZWVs RXZlbnQ6OkRlbHRhTW9kZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTA4NDM0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgUnlvc3VrZSBOaXdhLgorCisg ICAgICAgIFBlciB0aGUgc3BlYywgV2hlZWxFdmVudDo6R3JhbnVsYXJpdHkgc2hvdWxkIGJlIHJl bmFtZWQgdG8gV2hlZWxFdmVudDo6RGVsdGFNb2RlLgorCisgICAgICAgIFNwZWM6IGh0dHA6Ly93 d3cudzMub3JnL1RSL0RPTS1MZXZlbC0zLUV2ZW50cy8jZXZlbnRzLVdoZWVsRXZlbnQKKyAgICAg ICAgaHR0cHM6Ly9kdmNzLnczLm9yZy9oZy9kNGUvcmF3LWZpbGUvdGlwL3NvdXJjZV9yZXNwZWMu aHRtI2NvbnN0cnVjdG9yLXdoZWVsZXZlbnQKKworICAgICAgICBObyB0ZXN0cy4gTm8gY2hhbmdl IGluIGJlaGF2aW9yLgorCisgICAgICAgICogc3JjL1dlYklucHV0RXZlbnRDb252ZXJzaW9uLmNw cDoKKyAgICAgICAgKFdlYktpdDo6UGxhdGZvcm1XaGVlbEV2ZW50QnVpbGRlcjo6UGxhdGZvcm1X aGVlbEV2ZW50QnVpbGRlcik6CisgICAgICAgIChXZWJLaXQ6OldlYk1vdXNlV2hlZWxFdmVudEJ1 aWxkZXI6OldlYk1vdXNlV2hlZWxFdmVudEJ1aWxkZXIpOgorCiAyMDEzLTAxLTMwICBTaGVyaWZm IEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJldmlld2Vk LCByb2xsaW5nIG91dCByMTQxMzU4LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL1do ZWVsRXZlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL1doZWVsRXZlbnQuY3BwCmluZGV4IDMz OGJhMjYxZjQwZWZmYjkzNDFiNzU5MGU0ZTdmYjg1ZDNmMzJiMmEuLmE1NzYxNGQ2MmI3ZmM3NGFk ZDk1MTU1Y2QyNmQ1MmI3ZDVhM2U4ODggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9X aGVlbEV2ZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vV2hlZWxFdmVudC5jcHAKQEAg LTM4LDcgKzM4LDcgQEAgV2hlZWxFdmVudEluaXQ6OldoZWVsRXZlbnRJbml0KCkKIH0KIAogV2hl ZWxFdmVudDo6V2hlZWxFdmVudCgpCi0gICAgOiBtX2dyYW51bGFyaXR5KFBpeGVsKQorICAgIDog bV9kZWx0YU1vZGUoRE9NRGVsdGFQaXhlbCkKICAgICAsIG1fZGlyZWN0aW9uSW52ZXJ0ZWRGcm9t RGV2aWNlKGZhbHNlKQogewogfQpAQCAtNDksMTEgKzQ5LDkgQEAgV2hlZWxFdmVudDo6V2hlZWxF dmVudChjb25zdCBBdG9taWNTdHJpbmcmIHR5cGUsIGNvbnN0IFdoZWVsRXZlbnRJbml0JiBpbml0 aWFsaXoKIHsKIH0KIAotV2hlZWxFdmVudDo6V2hlZWxFdmVudChjb25zdCBGbG9hdFBvaW50JiB3 aGVlbFRpY2tzLCBjb25zdCBGbG9hdFBvaW50JiByYXdEZWx0YSwKLSAgICAgICAgICAgICAgICAg ICAgICAgR3JhbnVsYXJpdHkgZ3JhbnVsYXJpdHksIFBhc3NSZWZQdHI8QWJzdHJhY3RWaWV3PiB2 aWV3LAotICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBJbnRQb2ludCYgc2NyZWVuTG9jYXRp b24sIGNvbnN0IEludFBvaW50JiBwYWdlTG9jYXRpb24sCi0gICAgICAgICAgICAgICAgICAgICAg IGJvb2wgY3RybEtleSwgYm9vbCBhbHRLZXksIGJvb2wgc2hpZnRLZXksIGJvb2wgbWV0YUtleSwK LSAgICAgICAgICAgICAgICAgICAgICAgYm9vbCBkaXJlY3Rpb25JbnZlcnRlZEZyb21EZXZpY2Up CitXaGVlbEV2ZW50OjpXaGVlbEV2ZW50KGNvbnN0IEZsb2F0UG9pbnQmIHdoZWVsVGlja3MsIGNv bnN0IEZsb2F0UG9pbnQmIHJhd0RlbHRhLCBEZWx0YU1vZGUgZGVsdGFNb2RlLAorICAgIFBhc3NS ZWZQdHI8QWJzdHJhY3RWaWV3PiB2aWV3LCBjb25zdCBJbnRQb2ludCYgc2NyZWVuTG9jYXRpb24s IGNvbnN0IEludFBvaW50JiBwYWdlTG9jYXRpb24sCisgICAgYm9vbCBjdHJsS2V5LCBib29sIGFs dEtleSwgYm9vbCBzaGlmdEtleSwgYm9vbCBtZXRhS2V5LCBib29sIGRpcmVjdGlvbkludmVydGVk RnJvbURldmljZSkKICAgICA6IE1vdXNlRXZlbnQoZXZlbnROYW1lcygpLm1vdXNld2hlZWxFdmVu dCwKICAgICAgICAgICAgICAgICAgdHJ1ZSwgdHJ1ZSwgdmlldywgMCwgc2NyZWVuTG9jYXRpb24u eCgpLCBzY3JlZW5Mb2NhdGlvbi55KCksCiAgICAgICAgICAgICAgICAgIHBhZ2VMb2NhdGlvbi54 KCksIHBhZ2VMb2NhdGlvbi55KCksCkBAIC02Myw3ICs2MSw3IEBAIFdoZWVsRXZlbnQ6OldoZWVs RXZlbnQoY29uc3QgRmxvYXRQb2ludCYgd2hlZWxUaWNrcywgY29uc3QgRmxvYXRQb2ludCYgcmF3 RGVsdGEsCiAgICAgICAgICAgICAgICAgIGN0cmxLZXksIGFsdEtleSwgc2hpZnRLZXksIG1ldGFL ZXksIDAsIDAsIDAsIGZhbHNlKQogICAgICwgbV93aGVlbERlbHRhKEludFBvaW50KHN0YXRpY19j YXN0PGludD4od2hlZWxUaWNrcy54KCkgKiBUaWNrTXVsdGlwbGllciksIHN0YXRpY19jYXN0PGlu dD4od2hlZWxUaWNrcy55KCkgKiBUaWNrTXVsdGlwbGllcikpKQogICAgICwgbV9yYXdEZWx0YShy b3VuZGVkSW50UG9pbnQocmF3RGVsdGEpKQotICAgICwgbV9ncmFudWxhcml0eShncmFudWxhcml0 eSkKKyAgICAsIG1fZGVsdGFNb2RlKGRlbHRhTW9kZSkKICAgICAsIG1fZGlyZWN0aW9uSW52ZXJ0 ZWRGcm9tRGV2aWNlKGRpcmVjdGlvbkludmVydGVkRnJvbURldmljZSkKIHsKIH0KQEAgLTg3LDcg Kzg1LDcgQEAgdm9pZCBXaGVlbEV2ZW50Ojppbml0V2hlZWxFdmVudChpbnQgcmF3RGVsdGFYLCBp bnQgcmF3RGVsdGFZLCBQYXNzUmVmUHRyPEFic3RyYWMKICAgICBtX3doZWVsRGVsdGEgPSBJbnRQ b2ludChyYXdEZWx0YVggKiBUaWNrTXVsdGlwbGllciwgcmF3RGVsdGFZICogVGlja011bHRpcGxp ZXIpOwogICAgIAogICAgIG1fcmF3RGVsdGEgPSBJbnRQb2ludChyYXdEZWx0YVgsIHJhd0RlbHRh WSk7Ci0gICAgbV9ncmFudWxhcml0eSA9IFBpeGVsOworICAgIG1fZGVsdGFNb2RlID0gRE9NRGVs dGFQaXhlbDsKICAgICBtX2RpcmVjdGlvbkludmVydGVkRnJvbURldmljZSA9IGZhbHNlOwogCiAg ICAgaW5pdENvb3JkaW5hdGVzKEludFBvaW50KHBhZ2VYLCBwYWdlWSkpOwpAQCAtMTExLDkgKzEw OSw5IEBAIGJvb2wgV2hlZWxFdmVudDo6aXNNb3VzZUV2ZW50KCkgY29uc3QKICAgICByZXR1cm4g ZmFsc2U7CiB9CiAKLWlubGluZSBzdGF0aWMgV2hlZWxFdmVudDo6R3JhbnVsYXJpdHkgZ3JhbnVs YXJpdHkoY29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50JiBldmVudCkKK2lubGluZSBzdGF0aWMgV2hl ZWxFdmVudDo6RGVsdGFNb2RlIGRlbHRhTW9kZShjb25zdCBQbGF0Zm9ybVdoZWVsRXZlbnQmIGV2 ZW50KQogewotICAgIHJldHVybiBldmVudC5ncmFudWxhcml0eSgpID09IFNjcm9sbEJ5UGFnZVdo ZWVsRXZlbnQgPyBXaGVlbEV2ZW50OjpQYWdlIDogV2hlZWxFdmVudDo6UGl4ZWw7CisgICAgcmV0 dXJuIGV2ZW50LmdyYW51bGFyaXR5KCkgPT0gU2Nyb2xsQnlQYWdlV2hlZWxFdmVudCA/IFdoZWVs RXZlbnQ6OkRPTURlbHRhUGFnZSA6IFdoZWVsRXZlbnQ6OkRPTURlbHRhUGl4ZWw7CiB9CiAKIFBh c3NSZWZQdHI8V2hlZWxFdmVudERpc3BhdGNoTWVkaWF0b3I+IFdoZWVsRXZlbnREaXNwYXRjaE1l ZGlhdG9yOjpjcmVhdGUoY29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50JiBldmVudCwgUGFzc1JlZlB0 cjxBYnN0cmFjdFZpZXc+IHZpZXcpCkBAIC0xMjcsOCArMTI1LDggQEAgV2hlZWxFdmVudERpc3Bh dGNoTWVkaWF0b3I6OldoZWVsRXZlbnREaXNwYXRjaE1lZGlhdG9yKGNvbnN0IFBsYXRmb3JtV2hl ZWxFdmVudCYKICAgICAgICAgcmV0dXJuOwogCiAgICAgc2V0RXZlbnQoV2hlZWxFdmVudDo6Y3Jl YXRlKEZsb2F0UG9pbnQoZXZlbnQud2hlZWxUaWNrc1goKSwgZXZlbnQud2hlZWxUaWNrc1koKSks IEZsb2F0UG9pbnQoZXZlbnQuZGVsdGFYKCksIGV2ZW50LmRlbHRhWSgpKSwKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgZ3JhbnVsYXJpdHkoZXZlbnQpLCB2aWV3LCBldmVudC5nbG9i YWxQb3NpdGlvbigpLCBldmVudC5wb3NpdGlvbigpLAotICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBldmVudC5jdHJsS2V5KCksIGV2ZW50LmFsdEtleSgpLCBldmVudC5zaGlmdEtleSgp LCBldmVudC5tZXRhS2V5KCksIGV2ZW50LmRpcmVjdGlvbkludmVydGVkRnJvbURldmljZSgpKSk7 CisgICAgICAgIGRlbHRhTW9kZShldmVudCksIHZpZXcsIGV2ZW50Lmdsb2JhbFBvc2l0aW9uKCks IGV2ZW50LnBvc2l0aW9uKCksCisgICAgICAgIGV2ZW50LmN0cmxLZXkoKSwgZXZlbnQuYWx0S2V5 KCksIGV2ZW50LnNoaWZ0S2V5KCksIGV2ZW50Lm1ldGFLZXkoKSwgZXZlbnQuZGlyZWN0aW9uSW52 ZXJ0ZWRGcm9tRGV2aWNlKCkpKTsKIH0KIAogV2hlZWxFdmVudCogV2hlZWxFdmVudERpc3BhdGNo TWVkaWF0b3I6OmV2ZW50KCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9X aGVlbEV2ZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9kb20vV2hlZWxFdmVudC5oCmluZGV4IDMzYTQz Y2JiNjdiYThkODllNzcxZWI0Mjc0YzQzODllMDAxODQ2NjguLmMwMmY1NjZiZjY3ZDBlODU3OWQ5 YjdkNjY0MTkyYjgyODQ3ZjI0MGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9XaGVl bEV2ZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL1doZWVsRXZlbnQuaApAQCAtNDEsNyAr NDEsNyBAQCBjbGFzcyBXaGVlbEV2ZW50IDogcHVibGljIE1vdXNlRXZlbnQgewogcHVibGljOgog ICAgIGVudW0geyBUaWNrTXVsdGlwbGllciA9IDEyMCB9OwogCi0gICAgZW51bSBHcmFudWxhcml0 eSB7IFBpeGVsLCBMaW5lLCBQYWdlIH07CisgICAgZW51bSBEZWx0YU1vZGUgeyBET01EZWx0YVBp eGVsLCBET01EZWx0YUxpbmUsIERPTURlbHRhUGFnZSB9OwogCiAgICAgc3RhdGljIFBhc3NSZWZQ dHI8V2hlZWxFdmVudD4gY3JlYXRlKCkKICAgICB7CkBAIC01NCwxMSArNTQsMTEgQEAgcHVibGlj OgogICAgIH0KIAogICAgIHN0YXRpYyBQYXNzUmVmUHRyPFdoZWVsRXZlbnQ+IGNyZWF0ZShjb25z dCBGbG9hdFBvaW50JiB3aGVlbFRpY2tzLAotICAgICAgICBjb25zdCBGbG9hdFBvaW50JiByYXdE ZWx0YSwgR3JhbnVsYXJpdHkgZ3JhbnVsYXJpdHksIFBhc3NSZWZQdHI8QWJzdHJhY3RWaWV3PiB2 aWV3LAorICAgICAgICBjb25zdCBGbG9hdFBvaW50JiByYXdEZWx0YSwgRGVsdGFNb2RlIGRlbHRh TW9kZSwgUGFzc1JlZlB0cjxBYnN0cmFjdFZpZXc+IHZpZXcsCiAgICAgICAgIGNvbnN0IEludFBv aW50JiBzY3JlZW5Mb2NhdGlvbiwgY29uc3QgSW50UG9pbnQmIHBhZ2VMb2NhdGlvbiwKICAgICAg ICAgYm9vbCBjdHJsS2V5LCBib29sIGFsdEtleSwgYm9vbCBzaGlmdEtleSwgYm9vbCBtZXRhS2V5 LCBib29sIGRpcmVjdGlvbkludmVydGVkRnJvbURldmljZSkKICAgICB7Ci0gICAgICAgIHJldHVy biBhZG9wdFJlZihuZXcgV2hlZWxFdmVudCh3aGVlbFRpY2tzLCByYXdEZWx0YSwgZ3JhbnVsYXJp dHksIHZpZXcsCisgICAgICAgIHJldHVybiBhZG9wdFJlZihuZXcgV2hlZWxFdmVudCh3aGVlbFRp Y2tzLCByYXdEZWx0YSwgZGVsdGFNb2RlLCB2aWV3LAogICAgICAgICBzY3JlZW5Mb2NhdGlvbiwg cGFnZUxvY2F0aW9uLCBjdHJsS2V5LCBhbHRLZXksIHNoaWZ0S2V5LCBtZXRhS2V5LCBkaXJlY3Rp b25JbnZlcnRlZEZyb21EZXZpY2UpKTsKICAgICB9CiAKQEAgLTc1LDcgKzc1LDcgQEAgcHVibGlj OgogICAgIGludCB3aGVlbERlbHRhWSgpIGNvbnN0IHsgcmV0dXJuIG1fd2hlZWxEZWx0YS55KCk7 IH0KICAgICBpbnQgcmF3RGVsdGFYKCkgY29uc3QgeyByZXR1cm4gbV9yYXdEZWx0YS54KCk7IH0K ICAgICBpbnQgcmF3RGVsdGFZKCkgY29uc3QgeyByZXR1cm4gbV9yYXdEZWx0YS55KCk7IH0KLSAg ICBHcmFudWxhcml0eSBncmFudWxhcml0eSgpIGNvbnN0IHsgcmV0dXJuIG1fZ3JhbnVsYXJpdHk7 IH0KKyAgICBEZWx0YU1vZGUgZGVsdGFNb2RlKCkgY29uc3QgeyByZXR1cm4gbV9kZWx0YU1vZGU7 IH0KIAogICAgIGJvb2wgd2Via2l0RGlyZWN0aW9uSW52ZXJ0ZWRGcm9tRGV2aWNlKCkgY29uc3Qg eyByZXR1cm4gbV9kaXJlY3Rpb25JbnZlcnRlZEZyb21EZXZpY2U7IH0KICAgICAvLyBOZWVkZWQg Zm9yIE9iamVjdGl2ZS1DIGxlZ2FjeSBzdXBwb3J0CkBAIC04OCwxMyArODgsMTMgQEAgcHJpdmF0 ZToKICAgICBXaGVlbEV2ZW50KCk7CiAgICAgV2hlZWxFdmVudChjb25zdCBBdG9taWNTdHJpbmcm LCBjb25zdCBXaGVlbEV2ZW50SW5pdCYpOwogICAgIFdoZWVsRXZlbnQoY29uc3QgRmxvYXRQb2lu dCYgd2hlZWxUaWNrcywgY29uc3QgRmxvYXRQb2ludCYgcmF3RGVsdGEsCi0gICAgICAgIEdyYW51 bGFyaXR5LCBQYXNzUmVmUHRyPEFic3RyYWN0Vmlldz4sCisgICAgICAgIERlbHRhTW9kZSwgUGFz c1JlZlB0cjxBYnN0cmFjdFZpZXc+LAogICAgICAgICBjb25zdCBJbnRQb2ludCYgc2NyZWVuTG9j YXRpb24sIGNvbnN0IEludFBvaW50JiBwYWdlTG9jYXRpb24sCiAgICAgICAgIGJvb2wgY3RybEtl eSwgYm9vbCBhbHRLZXksIGJvb2wgc2hpZnRLZXksIGJvb2wgbWV0YUtleSwgYm9vbCBkaXJlY3Rp b25JbnZlcnRlZEZyb21EZXZpY2UpOwogCiAgICAgSW50UG9pbnQgbV93aGVlbERlbHRhOwogICAg IEludFBvaW50IG1fcmF3RGVsdGE7Ci0gICAgR3JhbnVsYXJpdHkgbV9ncmFudWxhcml0eTsKKyAg ICBEZWx0YU1vZGUgbV9kZWx0YU1vZGU7CiAgICAgYm9vbCBtX2RpcmVjdGlvbkludmVydGVkRnJv bURldmljZTsKIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5k bGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcAppbmRleCAxZTEy MTRhYTBhMGFhMmI2MDljMTY0NjFkZmQ2OGI2ZTJmMGVlMGQyLi41NGZkNWUyZDY1ZDk4NDQ5OWFk ZDQ1MmZlZjJhY2ZjMTU3YWFlMzQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0V2 ZW50SGFuZGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3Bw CkBAIC0yNTEsMTQgKzI1MSwxNCBAQCBwdWJsaWM6CiB9OwogI2VuZGlmCiAKLXN0YXRpYyBpbmxp bmUgU2Nyb2xsR3JhbnVsYXJpdHkgd2hlZWxHcmFudWxhcml0eVRvU2Nyb2xsR3JhbnVsYXJpdHko V2hlZWxFdmVudDo6R3JhbnVsYXJpdHkgZ3JhbnVsYXJpdHkpCitzdGF0aWMgaW5saW5lIFNjcm9s bEdyYW51bGFyaXR5IHdoZWVsR3JhbnVsYXJpdHlUb1Njcm9sbEdyYW51bGFyaXR5KFdoZWVsRXZl bnQ6OkRlbHRhTW9kZSBkZWx0YU1vZGUpCiB7Ci0gICAgc3dpdGNoIChncmFudWxhcml0eSkgewot ICAgIGNhc2UgV2hlZWxFdmVudDo6UGFnZToKKyAgICBzd2l0Y2ggKGRlbHRhTW9kZSkgeworICAg IGNhc2UgV2hlZWxFdmVudDo6RE9NRGVsdGFQYWdlOgogICAgICAgICByZXR1cm4gU2Nyb2xsQnlQ YWdlOwotICAgIGNhc2UgV2hlZWxFdmVudDo6TGluZToKKyAgICBjYXNlIFdoZWVsRXZlbnQ6OkRP TURlbHRhTGluZToKICAgICAgICAgcmV0dXJuIFNjcm9sbEJ5TGluZTsKLSAgICBjYXNlIFdoZWVs RXZlbnQ6OlBpeGVsOgorICAgIGNhc2UgV2hlZWxFdmVudDo6RE9NRGVsdGFQaXhlbDoKICAgICAg ICAgcmV0dXJuIFNjcm9sbEJ5UGl4ZWw7CiAgICAgfQogICAgIHJldHVybiBTY3JvbGxCeVBpeGVs OwpAQCAtMjM4OSw3ICsyMzg5LDcgQEAgdm9pZCBFdmVudEhhbmRsZXI6OmRlZmF1bHRXaGVlbEV2 ZW50SGFuZGxlcihOb2RlKiBzdGFydE5vZGUsIFdoZWVsRXZlbnQqIHdoZWVsRXYKICAgICAgICAg cmV0dXJuOwogICAgIAogICAgIE5vZGUqIHN0b3BOb2RlID0gbV9wcmV2aW91c1doZWVsU2Nyb2xs ZWROb2RlLmdldCgpOwotICAgIFNjcm9sbEdyYW51bGFyaXR5IGdyYW51bGFyaXR5ID0gd2hlZWxH cmFudWxhcml0eVRvU2Nyb2xsR3JhbnVsYXJpdHkod2hlZWxFdmVudC0+Z3JhbnVsYXJpdHkoKSk7 CisgICAgU2Nyb2xsR3JhbnVsYXJpdHkgZ3JhbnVsYXJpdHkgPSB3aGVlbEdyYW51bGFyaXR5VG9T Y3JvbGxHcmFudWxhcml0eSh3aGVlbEV2ZW50LT5kZWx0YU1vZGUoKSk7CiAgICAgCiAgICAgLy8g QnJlYWsgdXAgaW50byB0d28gc2Nyb2xscyBpZiB3ZSBuZWVkIHRvLiAgRGlhZ29uYWwgbW92ZW1l bnQgb24gCiAgICAgLy8gYSBNYWNCb29rIHBybyBpcyBhbiBleGFtcGxlIG9mIGEgMi1kaW1lbnNp b25hbCBtb3VzZSB3aGVlbCBldmVudCAod2hlcmUgYm90aCBkZWx0YVggYW5kIGRlbHRhWSBjYW4g YmUgc2V0KS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYklucHV0 RXZlbnRDb252ZXJzaW9uLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYklucHV0 RXZlbnRDb252ZXJzaW9uLmNwcAppbmRleCA1NjY1ZDczODBjMGZjMTI2YzYxMjI0OTYzMjk2MDRm NmVmZDU3ZjU4Li42N2YwYjU2MDcxNWI4MjE0OGUzNjI1MjZhOGQzYTVhNjExNjQzNWQ0IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJJbnB1dEV2ZW50Q29udmVyc2lv bi5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViSW5wdXRFdmVudENvbnZl cnNpb24uY3BwCkBAIC01MTcsNyArNTE3LDcgQEAgV2ViTW91c2VXaGVlbEV2ZW50QnVpbGRlcjo6 V2ViTW91c2VXaGVlbEV2ZW50QnVpbGRlcihjb25zdCBXaWRnZXQqIHdpZGdldCwgY29uc3QKICAg ICAvLyBUaGUgMTIwIGlzIGZyb20gV2hlZWxFdmVudDo6aW5pdFdoZWVsRXZlbnQoKS4KICAgICB3 aGVlbFRpY2tzWCA9IHN0YXRpY19jYXN0PGZsb2F0PihldmVudC53aGVlbERlbHRhWCgpKSAvIDEy MDsKICAgICB3aGVlbFRpY2tzWSA9IHN0YXRpY19jYXN0PGZsb2F0PihldmVudC53aGVlbERlbHRh WSgpKSAvIDEyMDsKLSAgICBzY3JvbGxCeVBhZ2UgPSBldmVudC5ncmFudWxhcml0eSgpID09IFdo ZWVsRXZlbnQ6OlBhZ2U7CisgICAgc2Nyb2xsQnlQYWdlID0gZXZlbnQuZGVsdGFNb2RlKCkgPT0g V2hlZWxFdmVudDo6RE9NRGVsdGFQYWdlOwogfQogCiBXZWJLZXlib2FyZEV2ZW50QnVpbGRlcjo6 V2ViS2V5Ym9hcmRFdmVudEJ1aWxkZXIoY29uc3QgS2V5Ym9hcmRFdmVudCYgZXZlbnQpCg==