134106 2014-06-20 08:35:43 -0700 [Win] Menu list theme is not drawn. 2014-06-25 12:34:05 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) PC Unspecified RESOLVED DUPLICATE 134261 PlatformOnly P2 Normal --- 134261 1 peavo webkit-unassigned achristensen alex.christensen bfulgham commit-queue esprehn+autocc glenn kondapallykalyan oldest_to_newest 1016931 0 peavo 2014-06-20 08:35:43 -0700 Dropdown menus are not rendered on Windows. A virtual drawing method has changed signature, and the override on Windows needs updating. 1016933 1 233429 peavo 2014-06-20 08:42:43 -0700 Created attachment 233429 Patch 1016934 2 233429 achristensen 2014-06-20 08:59:57 -0700 Comment on attachment 233429 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=233429&action=review > Source/WebCore/rendering/RenderThemeWin.cpp:803 > + adjustMenuListButtonStyle(*styleResolver, *style, *e); I think RenderTheme::adjustStyle should be changed to pass references instead of pointers so we don't have to dereference unchecked pointers into references here. 1016970 3 peavo 2014-06-20 11:25:29 -0700 (In reply to comment #2) > (From update of attachment 233429 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=233429&action=review > Thanks for looking into this :) > > Source/WebCore/rendering/RenderThemeWin.cpp:803 > > + adjustMenuListButtonStyle(*styleResolver, *style, *e); > > I think RenderTheme::adjustStyle should be changed to pass references instead of pointers so we don't have to dereference unchecked pointers into references here. I agree, could we perhaps address this in a separate patch, since it's a bigger change, involving all platforms? 1018376 4 achristensen 2014-06-25 11:28:34 -0700 I've incorporated this into https://bugs.webkit.org/show_bug.cgi?id=134261 and given you credit. It will be fixed once that clears all ews bots. *** This bug has been marked as a duplicate of bug 134261 *** 1018387 5 peavo 2014-06-25 12:34:05 -0700 (In reply to comment #4) > I've incorporated this into https://bugs.webkit.org/show_bug.cgi?id=134261 and given you credit. It will be fixed once that clears all ews bots. > Sounds good, thanks :) > *** This bug has been marked as a duplicate of bug 134261 *** 233429 2014-06-20 08:42:43 -0700 2014-06-25 11:27:21 -0700 Patch bug-134106-20140620174217.patch text/plain 14192 peavo SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3MDE4NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMwIEBACisyMDE0LTA2LTIwICBwZWF2b0Bv dXRsb29rLmNvbSAgPHBlYXZvQG91dGxvb2suY29tPgorCisgICAgICAgIFtXaW5dIE1lbnUgbGlz dCB0aGVtZSBpcyBub3QgZHJhd24uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMzQxMDYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBBIGNvdXBsZSBvZiB2aXJ0dWFsIGRyYXdpbmcgbWV0aG9kcyBoYXMgY2hh bmdlZCBzaWduYXR1cmUsIGFuZCB0aGUgb3ZlcnJpZGVzIG9uIFdpbmRvd3MgbmVlZHMgdXBkYXRp bmcuCisgICAgICAgIEFsc28sIHRoZSBvdmVycmlkZSBzcGVjaWZpZXIgaXMgYWRkZWQgdG8gZXZl cnkgdmlydHVhbCBtZXRob2QgaW4gUmVuZGVyVGhlbWVXaW4uCisKKyAgICAgICAgKiByZW5kZXJp bmcvUmVuZGVyVGhlbWVXaW4uY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVXaW46 OnBhaW50VGV4dEZpZWxkKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lV2luOjpwYWlu dE1lbnVMaXN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lV2luOjphZGp1c3RNZW51 TGlzdFN0eWxlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lV2luOjphZGp1c3RNZW51 TGlzdEJ1dHRvblN0eWxlKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGhlbWVXaW4uaDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lV2luOjpwYWludENoZWNrYm94KTogRGVsZXRl ZC4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lV2luOjpwYWludFJhZGlvKTogRGVsZXRl ZC4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lV2luOjpzZXRSYWRpb1NpemUpOiBEZWxl dGVkLgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVXaW46OnBhaW50VGV4dEFyZWEpOiBE ZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVXaW46OnBvcHVwT3B0aW9uU3Vw cG9ydHNUZXh0SW5kZW50KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1l V2luOjpwYWludFNlYXJjaEZpZWxkRGVjb3JhdGlvblBhcnQpOiBEZWxldGVkLgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyVGhlbWVXaW46OmFkanVzdEJ1dHRvblN0eWxlKTogRGVsZXRlZC4KKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lV2luOjphZGp1c3RUZXh0RmllbGRTdHlsZSk6IERl bGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZVdpbjo6YWRqdXN0VGV4dEFyZWFT dHlsZSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZVdpbjo6c2hvdWxk U2hvd1BsYWNlaG9sZGVyV2hlbkZvY3VzZWQpOiBEZWxldGVkLgorCiAyMDE0LTA2LTIwICBDYXJs b3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBE byBub3QgYnVpbGQgcXVvdGEgZmlsZXMgd2hlbiBRVU9UQSBpcyBkaXNhYmxlZApJbmRleDogU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lV2luLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVXaW4uY3BwCShyZXZpc2lvbiAxNzAx ODQpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVXaW4uY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC03NzEsMTMgKzc3MSwxMyBAQCB2b2lkIFJlbmRlclRoZW1lV2luOjpzZXRD aGVja2JveFNpemUoUmVuCiAgICAgICAgIHN0eWxlLT5zZXRIZWlnaHQoTGVuZ3RoKDEzLCBGaXhl ZCkpOwogfQogCi1ib29sIFJlbmRlclRoZW1lV2luOjpwYWludFRleHRGaWVsZChjb25zdCBSZW5k ZXJPYmplY3QmIG8sIGNvbnN0IFBhaW50SW5mbyYgaSwgY29uc3QgSW50UmVjdCYgcikKK2Jvb2wg UmVuZGVyVGhlbWVXaW46OnBhaW50VGV4dEZpZWxkKGNvbnN0IFJlbmRlck9iamVjdCYgbywgY29u c3QgUGFpbnRJbmZvJiBpLCBjb25zdCBGbG9hdFJlY3QmIHIpCiB7Ci0gICAgZHJhd0NvbnRyb2wo aS5jb250ZXh0LCAgbywgdGV4dEZpZWxkVGhlbWUoKSwgZ2V0VGhlbWVEYXRhKG8pLCByKTsKKyAg ICBkcmF3Q29udHJvbChpLmNvbnRleHQsICBvLCB0ZXh0RmllbGRUaGVtZSgpLCBnZXRUaGVtZURh dGEobyksIEludFJlY3QocikpOwogICAgIHJldHVybiBmYWxzZTsKIH0KIAotYm9vbCBSZW5kZXJU aGVtZVdpbjo6cGFpbnRNZW51TGlzdChjb25zdCBSZW5kZXJPYmplY3QmIHJlbmRlcmVyLCBjb25z dCBQYWludEluZm8mIHBhaW50SW5mbywgY29uc3QgSW50UmVjdCYgcmVjdCkKK2Jvb2wgUmVuZGVy VGhlbWVXaW46OnBhaW50TWVudUxpc3QoY29uc3QgUmVuZGVyT2JqZWN0JiByZW5kZXJlciwgY29u c3QgUGFpbnRJbmZvJiBwYWludEluZm8sIGNvbnN0IEZsb2F0UmVjdCYgcmVjdCkKIHsKICAgICBI QU5ETEUgdGhlbWU7CiAgICAgaW50IHBhcnQ7CkBAIC03OTIsNyArNzkyLDcgQEAgYm9vbCBSZW5k ZXJUaGVtZVdpbjo6cGFpbnRNZW51TGlzdChjb25zdAogICAgICAgICBwYXJ0ID0gVEZQX1RFWFRG SUVMRDsKICAgICB9CiAKLSAgICBkcmF3Q29udHJvbChwYWludEluZm8uY29udGV4dCwgcmVuZGVy ZXIsIHRoZW1lLCBUaGVtZURhdGEocGFydCwgZGV0ZXJtaW5lU3RhdGUocmVuZGVyZXIpKSwgcmVj dCk7CisgICAgZHJhd0NvbnRyb2wocGFpbnRJbmZvLmNvbnRleHQsIHJlbmRlcmVyLCB0aGVtZSwg VGhlbWVEYXRhKHBhcnQsIGRldGVybWluZVN0YXRlKHJlbmRlcmVyKSksIEludFJlY3QocmVjdCkp OwogICAgIAogICAgIHJldHVybiBwYWludE1lbnVMaXN0QnV0dG9uRGVjb3JhdGlvbnMocmVuZGVy ZXIsIHBhaW50SW5mbywgRmxvYXRSZWN0KHJlY3QpKTsKIH0KQEAgLTgwMCwzOCArODAwLDM4IEBA IGJvb2wgUmVuZGVyVGhlbWVXaW46OnBhaW50TWVudUxpc3QoY29uc3QKIHZvaWQgUmVuZGVyVGhl bWVXaW46OmFkanVzdE1lbnVMaXN0U3R5bGUoU3R5bGVSZXNvbHZlciogc3R5bGVSZXNvbHZlciwg UmVuZGVyU3R5bGUqIHN0eWxlLCBFbGVtZW50KiBlKSBjb25zdAogewogICAgIHN0eWxlLT5yZXNl dEJvcmRlcigpOwotICAgIGFkanVzdE1lbnVMaXN0QnV0dG9uU3R5bGUoc3R5bGVSZXNvbHZlciwg c3R5bGUsIGUpOworICAgIGFkanVzdE1lbnVMaXN0QnV0dG9uU3R5bGUoKnN0eWxlUmVzb2x2ZXIs ICpzdHlsZSwgKmUpOwogfQogCi12b2lkIFJlbmRlclRoZW1lV2luOjphZGp1c3RNZW51TGlzdEJ1 dHRvblN0eWxlKFN0eWxlUmVzb2x2ZXIqIHN0eWxlUmVzb2x2ZXIsIFJlbmRlclN0eWxlKiBzdHls ZSwgRWxlbWVudCogZSkgY29uc3QKK3ZvaWQgUmVuZGVyVGhlbWVXaW46OmFkanVzdE1lbnVMaXN0 QnV0dG9uU3R5bGUoU3R5bGVSZXNvbHZlciYgc3R5bGVSZXNvbHZlciwgUmVuZGVyU3R5bGUmIHN0 eWxlLCBFbGVtZW50JiBlKSBjb25zdAogewogICAgIC8vIFRoZXNlIGFyZSB0aGUgcGFkZGluZ3Mg bmVlZGVkIHRvIHBsYWNlIHRoZSB0ZXh0IGNvcnJlY3RseSBpbiB0aGUgPHNlbGVjdD4gYm94CiAg ICAgY29uc3QgaW50IGRyb3BEb3duQm94UGFkZGluZ1RvcCAgICA9IDI7Ci0gICAgY29uc3QgaW50 IGRyb3BEb3duQm94UGFkZGluZ1JpZ2h0ICA9IHN0eWxlLT5kaXJlY3Rpb24oKSA9PSBMVFIgPyA0 ICsgZHJvcERvd25CdXR0b25XaWR0aCA6IDQ7CisgICAgY29uc3QgaW50IGRyb3BEb3duQm94UGFk ZGluZ1JpZ2h0ICA9IHN0eWxlLmRpcmVjdGlvbigpID09IExUUiA/IDQgKyBkcm9wRG93bkJ1dHRv bldpZHRoIDogNDsKICAgICBjb25zdCBpbnQgZHJvcERvd25Cb3hQYWRkaW5nQm90dG9tID0gMjsK LSAgICBjb25zdCBpbnQgZHJvcERvd25Cb3hQYWRkaW5nTGVmdCAgID0gc3R5bGUtPmRpcmVjdGlv bigpID09IExUUiA/IDQgOiA0ICsgZHJvcERvd25CdXR0b25XaWR0aDsKKyAgICBjb25zdCBpbnQg ZHJvcERvd25Cb3hQYWRkaW5nTGVmdCAgID0gc3R5bGUuZGlyZWN0aW9uKCkgPT0gTFRSID8gNCA6 IDQgKyBkcm9wRG93bkJ1dHRvbldpZHRoOwogICAgIC8vIFRoZSA8c2VsZWN0PiBib3ggbXVzdCBi ZSBhdCBsZWFzdCAxMnB4IGhpZ2ggZm9yIHRoZSBidXR0b24gdG8gcmVuZGVyIG5pY2VseSBvbiBX aW5kb3dzCiAgICAgY29uc3QgaW50IGRyb3BEb3duQm94TWluSGVpZ2h0ID0gMTI7CiAgICAgCiAg ICAgLy8gUG9zaXRpb24gdGhlIHRleHQgY29ycmVjdGx5IHdpdGhpbiB0aGUgc2VsZWN0IGJveCBh bmQgbWFrZSB0aGUgYm94IHdpZGUgZW5vdWdoIHRvIGZpdCB0aGUgZHJvcGRvd24gYnV0dG9uCi0g ICAgc3R5bGUtPnNldFBhZGRpbmdUb3AoTGVuZ3RoKGRyb3BEb3duQm94UGFkZGluZ1RvcCwgRml4 ZWQpKTsKLSAgICBzdHlsZS0+c2V0UGFkZGluZ1JpZ2h0KExlbmd0aChkcm9wRG93bkJveFBhZGRp bmdSaWdodCwgRml4ZWQpKTsKLSAgICBzdHlsZS0+c2V0UGFkZGluZ0JvdHRvbShMZW5ndGgoZHJv cERvd25Cb3hQYWRkaW5nQm90dG9tLCBGaXhlZCkpOwotICAgIHN0eWxlLT5zZXRQYWRkaW5nTGVm dChMZW5ndGgoZHJvcERvd25Cb3hQYWRkaW5nTGVmdCwgRml4ZWQpKTsKKyAgICBzdHlsZS5zZXRQ YWRkaW5nVG9wKExlbmd0aChkcm9wRG93bkJveFBhZGRpbmdUb3AsIEZpeGVkKSk7CisgICAgc3R5 bGUuc2V0UGFkZGluZ1JpZ2h0KExlbmd0aChkcm9wRG93bkJveFBhZGRpbmdSaWdodCwgRml4ZWQp KTsKKyAgICBzdHlsZS5zZXRQYWRkaW5nQm90dG9tKExlbmd0aChkcm9wRG93bkJveFBhZGRpbmdC b3R0b20sIEZpeGVkKSk7CisgICAgc3R5bGUuc2V0UGFkZGluZ0xlZnQoTGVuZ3RoKGRyb3BEb3du Qm94UGFkZGluZ0xlZnQsIEZpeGVkKSk7CiAKICAgICAvLyBIZWlnaHQgaXMgbG9ja2VkIHRvIGF1 dG8KLSAgICBzdHlsZS0+c2V0SGVpZ2h0KExlbmd0aChBdXRvKSk7CisgICAgc3R5bGUuc2V0SGVp Z2h0KExlbmd0aChBdXRvKSk7CiAKICAgICAvLyBDYWxjdWxhdGUgb3VyIG1pbi1oZWlnaHQKLSAg ICBpbnQgbWluSGVpZ2h0ID0gc3R5bGUtPmZvbnRNZXRyaWNzKCkuaGVpZ2h0KCk7CisgICAgaW50 IG1pbkhlaWdodCA9IHN0eWxlLmZvbnRNZXRyaWNzKCkuaGVpZ2h0KCk7CiAgICAgbWluSGVpZ2h0 ID0gbWF4KG1pbkhlaWdodCwgZHJvcERvd25Cb3hNaW5IZWlnaHQpOwogCi0gICAgc3R5bGUtPnNl dE1pbkhlaWdodChMZW5ndGgobWluSGVpZ2h0LCBGaXhlZCkpOworICAgIHN0eWxlLnNldE1pbkhl aWdodChMZW5ndGgobWluSGVpZ2h0LCBGaXhlZCkpOwogCi0gICAgc3R5bGUtPnNldExpbmVIZWln aHQoUmVuZGVyU3R5bGU6OmluaXRpYWxMaW5lSGVpZ2h0KCkpOworICAgIHN0eWxlLnNldExpbmVI ZWlnaHQoUmVuZGVyU3R5bGU6OmluaXRpYWxMaW5lSGVpZ2h0KCkpOwogICAgIAogICAgIC8vIFdo aXRlLXNwYWNlIGlzIGxvY2tlZCB0byBwcmUKLSAgICBzdHlsZS0+c2V0V2hpdGVTcGFjZShQUkUp OworICAgIHN0eWxlLnNldFdoaXRlU3BhY2UoUFJFKTsKIH0KIAogYm9vbCBSZW5kZXJUaGVtZVdp bjo6cGFpbnRNZW51TGlzdEJ1dHRvbkRlY29yYXRpb25zKGNvbnN0IFJlbmRlck9iamVjdCYgcmVu ZGVyZXIsIGNvbnN0IFBhaW50SW5mbyYgcGFpbnRJbmZvLCBjb25zdCBGbG9hdFJlY3QmIHJlY3Qp CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVXaW4uaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVXaW4uaAkocmV2aXNp b24gMTcwMTg0KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lV2luLmgJ KHdvcmtpbmcgY29weSkKQEAgLTUxLDc4ICs1MSw3OCBAQCBjbGFzcyBSZW5kZXJUaGVtZVdpbiA6 IHB1YmxpYyBSZW5kZXJUaGVtCiBwdWJsaWM6CiAgICAgc3RhdGljIFBhc3NSZWZQdHI8UmVuZGVy VGhlbWU+IGNyZWF0ZSgpOwogCi0gICAgdmlydHVhbCBTdHJpbmcgZXh0cmFEZWZhdWx0U3R5bGVT aGVldCgpOwotICAgIHZpcnR1YWwgU3RyaW5nIGV4dHJhUXVpcmtzU3R5bGVTaGVldCgpOworICAg IHZpcnR1YWwgU3RyaW5nIGV4dHJhRGVmYXVsdFN0eWxlU2hlZXQoKSBvdmVycmlkZTsKKyAgICB2 aXJ0dWFsIFN0cmluZyBleHRyYVF1aXJrc1N0eWxlU2hlZXQoKSBvdmVycmlkZTsKIAogICAgIC8v IEEgbWV0aG9kIGFza2luZyBpZiB0aGUgdGhlbWUncyBjb250cm9scyBhY3R1YWxseSBjYXJlIGFi b3V0IHJlZHJhd2luZyB3aGVuIGhvdmVyZWQuCi0gICAgdmlydHVhbCBib29sIHN1cHBvcnRzSG92 ZXIoY29uc3QgUmVuZGVyU3R5bGUqKSBjb25zdDsKKyAgICB2aXJ0dWFsIGJvb2wgc3VwcG9ydHNI b3Zlcihjb25zdCBSZW5kZXJTdHlsZSopIGNvbnN0IG92ZXJyaWRlOwogCi0gICAgdmlydHVhbCBD b2xvciBwbGF0Zm9ybUFjdGl2ZVNlbGVjdGlvbkJhY2tncm91bmRDb2xvcigpIGNvbnN0OwotICAg IHZpcnR1YWwgQ29sb3IgcGxhdGZvcm1JbmFjdGl2ZVNlbGVjdGlvbkJhY2tncm91bmRDb2xvcigp IGNvbnN0OwotICAgIHZpcnR1YWwgQ29sb3IgcGxhdGZvcm1BY3RpdmVTZWxlY3Rpb25Gb3JlZ3Jv dW5kQ29sb3IoKSBjb25zdDsKLSAgICB2aXJ0dWFsIENvbG9yIHBsYXRmb3JtSW5hY3RpdmVTZWxl Y3Rpb25Gb3JlZ3JvdW5kQ29sb3IoKSBjb25zdDsKKyAgICB2aXJ0dWFsIENvbG9yIHBsYXRmb3Jt QWN0aXZlU2VsZWN0aW9uQmFja2dyb3VuZENvbG9yKCkgY29uc3Qgb3ZlcnJpZGU7CisgICAgdmly dHVhbCBDb2xvciBwbGF0Zm9ybUluYWN0aXZlU2VsZWN0aW9uQmFja2dyb3VuZENvbG9yKCkgY29u c3Qgb3ZlcnJpZGU7CisgICAgdmlydHVhbCBDb2xvciBwbGF0Zm9ybUFjdGl2ZVNlbGVjdGlvbkZv cmVncm91bmRDb2xvcigpIGNvbnN0IG92ZXJyaWRlOworICAgIHZpcnR1YWwgQ29sb3IgcGxhdGZv cm1JbmFjdGl2ZVNlbGVjdGlvbkZvcmVncm91bmRDb2xvcigpIGNvbnN0IG92ZXJyaWRlOwogCiAg ICAgLy8gU3lzdGVtIGZvbnRzLgotICAgIHZpcnR1YWwgdm9pZCBzeXN0ZW1Gb250KENTU1ZhbHVl SUQsIEZvbnREZXNjcmlwdGlvbiYpIGNvbnN0OwotICAgIHZpcnR1YWwgQ29sb3Igc3lzdGVtQ29s b3IoQ1NTVmFsdWVJRCkgY29uc3Q7CisgICAgdmlydHVhbCB2b2lkIHN5c3RlbUZvbnQoQ1NTVmFs dWVJRCwgRm9udERlc2NyaXB0aW9uJikgY29uc3Qgb3ZlcnJpZGU7CisgICAgdmlydHVhbCBDb2xv ciBzeXN0ZW1Db2xvcihDU1NWYWx1ZUlEKSBjb25zdCBvdmVycmlkZTsKIAotICAgIHZpcnR1YWwg Ym9vbCBwYWludENoZWNrYm94KGNvbnN0IFJlbmRlck9iamVjdCYgbywgY29uc3QgUGFpbnRJbmZv JiBpLCBjb25zdCBJbnRSZWN0JiByKQorICAgIHZpcnR1YWwgYm9vbCBwYWludENoZWNrYm94KGNv bnN0IFJlbmRlck9iamVjdCYgbywgY29uc3QgUGFpbnRJbmZvJiBpLCBjb25zdCBJbnRSZWN0JiBy KSBvdmVycmlkZQogICAgIHsgcmV0dXJuIHBhaW50QnV0dG9uKG8sIGksIHIpOyB9Ci0gICAgdmly dHVhbCB2b2lkIHNldENoZWNrYm94U2l6ZShSZW5kZXJTdHlsZSopIGNvbnN0OworICAgIHZpcnR1 YWwgdm9pZCBzZXRDaGVja2JveFNpemUoUmVuZGVyU3R5bGUqKSBjb25zdCBvdmVycmlkZTsKIAot ICAgIHZpcnR1YWwgYm9vbCBwYWludFJhZGlvKGNvbnN0IFJlbmRlck9iamVjdCYgbywgY29uc3Qg UGFpbnRJbmZvJiBpLCBjb25zdCBJbnRSZWN0JiByKQorICAgIHZpcnR1YWwgYm9vbCBwYWludFJh ZGlvKGNvbnN0IFJlbmRlck9iamVjdCYgbywgY29uc3QgUGFpbnRJbmZvJiBpLCBjb25zdCBJbnRS ZWN0JiByKSBvdmVycmlkZQogICAgIHsgcmV0dXJuIHBhaW50QnV0dG9uKG8sIGksIHIpOyB9Ci0g ICAgdmlydHVhbCB2b2lkIHNldFJhZGlvU2l6ZShSZW5kZXJTdHlsZSogc3R5bGUpIGNvbnN0Cisg ICAgdmlydHVhbCB2b2lkIHNldFJhZGlvU2l6ZShSZW5kZXJTdHlsZSogc3R5bGUpIGNvbnN0IG92 ZXJyaWRlCiAgICAgeyByZXR1cm4gc2V0Q2hlY2tib3hTaXplKHN0eWxlKTsgfQogCi0gICAgdmly dHVhbCBib29sIHBhaW50QnV0dG9uKGNvbnN0IFJlbmRlck9iamVjdCYsIGNvbnN0IFBhaW50SW5m byYsIGNvbnN0IEludFJlY3QmKTsKKyAgICB2aXJ0dWFsIGJvb2wgcGFpbnRCdXR0b24oY29uc3Qg UmVuZGVyT2JqZWN0JiwgY29uc3QgUGFpbnRJbmZvJiwgY29uc3QgSW50UmVjdCYpIG92ZXJyaWRl OwogCi0gICAgdmlydHVhbCB2b2lkIGFkanVzdElubmVyU3BpbkJ1dHRvblN0eWxlKFN0eWxlUmVz b2x2ZXIqLCBSZW5kZXJTdHlsZSosIEVsZW1lbnQqKSBjb25zdDsKLSAgICB2aXJ0dWFsIGJvb2wg cGFpbnRJbm5lclNwaW5CdXR0b24oY29uc3QgUmVuZGVyT2JqZWN0JiwgY29uc3QgUGFpbnRJbmZv JiwgY29uc3QgSW50UmVjdCYpOworICAgIHZpcnR1YWwgdm9pZCBhZGp1c3RJbm5lclNwaW5CdXR0 b25TdHlsZShTdHlsZVJlc29sdmVyKiwgUmVuZGVyU3R5bGUqLCBFbGVtZW50KikgY29uc3Qgb3Zl cnJpZGU7CisgICAgdmlydHVhbCBib29sIHBhaW50SW5uZXJTcGluQnV0dG9uKGNvbnN0IFJlbmRl ck9iamVjdCYsIGNvbnN0IFBhaW50SW5mbyYsIGNvbnN0IEludFJlY3QmKSBvdmVycmlkZTsKIAot ICAgIHZpcnR1YWwgYm9vbCBwYWludFRleHRGaWVsZChjb25zdCBSZW5kZXJPYmplY3QmLCBjb25z dCBQYWludEluZm8mLCBjb25zdCBJbnRSZWN0Jik7CisgICAgdmlydHVhbCBib29sIHBhaW50VGV4 dEZpZWxkKGNvbnN0IFJlbmRlck9iamVjdCYsIGNvbnN0IFBhaW50SW5mbyYsIGNvbnN0IEZsb2F0 UmVjdCYpIG92ZXJyaWRlOwogCi0gICAgdmlydHVhbCBib29sIHBhaW50VGV4dEFyZWEoY29uc3Qg UmVuZGVyT2JqZWN0JiBvLCBjb25zdCBQYWludEluZm8mIGksIGNvbnN0IEludFJlY3QmIHIpCisg ICAgdmlydHVhbCBib29sIHBhaW50VGV4dEFyZWEoY29uc3QgUmVuZGVyT2JqZWN0JiBvLCBjb25z dCBQYWludEluZm8mIGksIGNvbnN0IEZsb2F0UmVjdCYgcikgb3ZlcnJpZGUKICAgICB7IHJldHVy biBwYWludFRleHRGaWVsZChvLCBpLCByKTsgfQogCi0gICAgdmlydHVhbCB2b2lkIGFkanVzdE1l bnVMaXN0U3R5bGUoU3R5bGVSZXNvbHZlciosIFJlbmRlclN0eWxlKiwgRWxlbWVudCopIGNvbnN0 OwotICAgIHZpcnR1YWwgYm9vbCBwYWludE1lbnVMaXN0KGNvbnN0IFJlbmRlck9iamVjdCYsIGNv bnN0IFBhaW50SW5mbyYsIGNvbnN0IEludFJlY3QmKTsKLSAgICB2aXJ0dWFsIHZvaWQgYWRqdXN0 TWVudUxpc3RCdXR0b25TdHlsZShTdHlsZVJlc29sdmVyKiwgUmVuZGVyU3R5bGUqLCBFbGVtZW50 KikgY29uc3Q7CisgICAgdmlydHVhbCB2b2lkIGFkanVzdE1lbnVMaXN0U3R5bGUoU3R5bGVSZXNv bHZlciosIFJlbmRlclN0eWxlKiwgRWxlbWVudCopIGNvbnN0IG92ZXJyaWRlOworICAgIHZpcnR1 YWwgYm9vbCBwYWludE1lbnVMaXN0KGNvbnN0IFJlbmRlck9iamVjdCYsIGNvbnN0IFBhaW50SW5m byYsIGNvbnN0IEZsb2F0UmVjdCYpIG92ZXJyaWRlOworICAgIHZpcnR1YWwgdm9pZCBhZGp1c3RN ZW51TGlzdEJ1dHRvblN0eWxlKFN0eWxlUmVzb2x2ZXImLCBSZW5kZXJTdHlsZSYsIEVsZW1lbnQm KSBjb25zdCBvdmVycmlkZTsKIAotICAgIHZpcnR1YWwgYm9vbCBwYWludE1lbnVMaXN0QnV0dG9u RGVjb3JhdGlvbnMoY29uc3QgUmVuZGVyT2JqZWN0JiwgY29uc3QgUGFpbnRJbmZvJiwgY29uc3Qg RmxvYXRSZWN0Jik7CisgICAgdmlydHVhbCBib29sIHBhaW50TWVudUxpc3RCdXR0b25EZWNvcmF0 aW9ucyhjb25zdCBSZW5kZXJPYmplY3QmLCBjb25zdCBQYWludEluZm8mLCBjb25zdCBGbG9hdFJl Y3QmKSBvdmVycmlkZTsKIAotICAgIHZpcnR1YWwgYm9vbCBwYWludFNsaWRlclRyYWNrKGNvbnN0 IFJlbmRlck9iamVjdCYsIGNvbnN0IFBhaW50SW5mbyYsIGNvbnN0IEludFJlY3QmKTsKLSAgICB2 aXJ0dWFsIGJvb2wgcGFpbnRTbGlkZXJUaHVtYihjb25zdCBSZW5kZXJPYmplY3QmLCBjb25zdCBQ YWludEluZm8mLCBjb25zdCBJbnRSZWN0Jik7Ci0gICAgdmlydHVhbCB2b2lkIGFkanVzdFNsaWRl clRodW1iU2l6ZShSZW5kZXJTdHlsZSosIEVsZW1lbnQqKSBjb25zdDsKKyAgICB2aXJ0dWFsIGJv b2wgcGFpbnRTbGlkZXJUcmFjayhjb25zdCBSZW5kZXJPYmplY3QmLCBjb25zdCBQYWludEluZm8m LCBjb25zdCBJbnRSZWN0Jikgb3ZlcnJpZGU7CisgICAgdmlydHVhbCBib29sIHBhaW50U2xpZGVy VGh1bWIoY29uc3QgUmVuZGVyT2JqZWN0JiwgY29uc3QgUGFpbnRJbmZvJiwgY29uc3QgSW50UmVj dCYpIG92ZXJyaWRlOworICAgIHZpcnR1YWwgdm9pZCBhZGp1c3RTbGlkZXJUaHVtYlNpemUoUmVu ZGVyU3R5bGUqLCBFbGVtZW50KikgY29uc3Qgb3ZlcnJpZGU7CiAKLSAgICB2aXJ0dWFsIGJvb2wg cG9wdXBPcHRpb25TdXBwb3J0c1RleHRJbmRlbnQoKSBjb25zdCB7IHJldHVybiB0cnVlOyB9Cisg ICAgdmlydHVhbCBib29sIHBvcHVwT3B0aW9uU3VwcG9ydHNUZXh0SW5kZW50KCkgY29uc3Qgb3Zl cnJpZGUgeyByZXR1cm4gdHJ1ZTsgfQogCi0gICAgdmlydHVhbCB2b2lkIGFkanVzdFNlYXJjaEZp ZWxkU3R5bGUoU3R5bGVSZXNvbHZlciosIFJlbmRlclN0eWxlKiwgRWxlbWVudCopIGNvbnN0Owot ICAgIHZpcnR1YWwgYm9vbCBwYWludFNlYXJjaEZpZWxkKGNvbnN0IFJlbmRlck9iamVjdCYsIGNv bnN0IFBhaW50SW5mbyYsIGNvbnN0IEludFJlY3QmKTsKKyAgICB2aXJ0dWFsIHZvaWQgYWRqdXN0 U2VhcmNoRmllbGRTdHlsZShTdHlsZVJlc29sdmVyKiwgUmVuZGVyU3R5bGUqLCBFbGVtZW50Kikg Y29uc3Qgb3ZlcnJpZGU7CisgICAgdmlydHVhbCBib29sIHBhaW50U2VhcmNoRmllbGQoY29uc3Qg UmVuZGVyT2JqZWN0JiwgY29uc3QgUGFpbnRJbmZvJiwgY29uc3QgSW50UmVjdCYpIG92ZXJyaWRl OwogCi0gICAgdmlydHVhbCB2b2lkIGFkanVzdFNlYXJjaEZpZWxkQ2FuY2VsQnV0dG9uU3R5bGUo U3R5bGVSZXNvbHZlciosIFJlbmRlclN0eWxlKiwgRWxlbWVudCopIGNvbnN0OwotICAgIHZpcnR1 YWwgYm9vbCBwYWludFNlYXJjaEZpZWxkQ2FuY2VsQnV0dG9uKGNvbnN0IFJlbmRlck9iamVjdCYs IGNvbnN0IFBhaW50SW5mbyYsIGNvbnN0IEludFJlY3QmKTsKKyAgICB2aXJ0dWFsIHZvaWQgYWRq dXN0U2VhcmNoRmllbGRDYW5jZWxCdXR0b25TdHlsZShTdHlsZVJlc29sdmVyKiwgUmVuZGVyU3R5 bGUqLCBFbGVtZW50KikgY29uc3Qgb3ZlcnJpZGU7CisgICAgdmlydHVhbCBib29sIHBhaW50U2Vh cmNoRmllbGRDYW5jZWxCdXR0b24oY29uc3QgUmVuZGVyT2JqZWN0JiwgY29uc3QgUGFpbnRJbmZv JiwgY29uc3QgSW50UmVjdCYpIG92ZXJyaWRlOwogCi0gICAgdmlydHVhbCB2b2lkIGFkanVzdFNl YXJjaEZpZWxkRGVjb3JhdGlvblBhcnRTdHlsZShTdHlsZVJlc29sdmVyKiwgUmVuZGVyU3R5bGUq LCBFbGVtZW50KikgY29uc3Q7Ci0gICAgdmlydHVhbCBib29sIHBhaW50U2VhcmNoRmllbGREZWNv cmF0aW9uUGFydChjb25zdCBSZW5kZXJPYmplY3QmLCBjb25zdCBQYWludEluZm8mLCBjb25zdCBJ bnRSZWN0JikgeyByZXR1cm4gZmFsc2U7IH0KKyAgICB2aXJ0dWFsIHZvaWQgYWRqdXN0U2VhcmNo RmllbGREZWNvcmF0aW9uUGFydFN0eWxlKFN0eWxlUmVzb2x2ZXIqLCBSZW5kZXJTdHlsZSosIEVs ZW1lbnQqKSBjb25zdCBvdmVycmlkZTsKKyAgICB2aXJ0dWFsIGJvb2wgcGFpbnRTZWFyY2hGaWVs ZERlY29yYXRpb25QYXJ0KGNvbnN0IFJlbmRlck9iamVjdCYsIGNvbnN0IFBhaW50SW5mbyYsIGNv bnN0IEludFJlY3QmKSBvdmVycmlkZSB7IHJldHVybiBmYWxzZTsgfQogCi0gICAgdmlydHVhbCB2 b2lkIGFkanVzdFNlYXJjaEZpZWxkUmVzdWx0c0RlY29yYXRpb25QYXJ0U3R5bGUoU3R5bGVSZXNv bHZlciosIFJlbmRlclN0eWxlKiwgRWxlbWVudCopIGNvbnN0OwotICAgIHZpcnR1YWwgYm9vbCBw YWludFNlYXJjaEZpZWxkUmVzdWx0c0RlY29yYXRpb25QYXJ0KGNvbnN0IFJlbmRlck9iamVjdCYs IGNvbnN0IFBhaW50SW5mbyYsIGNvbnN0IEludFJlY3QmKTsKKyAgICB2aXJ0dWFsIHZvaWQgYWRq dXN0U2VhcmNoRmllbGRSZXN1bHRzRGVjb3JhdGlvblBhcnRTdHlsZShTdHlsZVJlc29sdmVyKiwg UmVuZGVyU3R5bGUqLCBFbGVtZW50KikgY29uc3Qgb3ZlcnJpZGU7CisgICAgdmlydHVhbCBib29s IHBhaW50U2VhcmNoRmllbGRSZXN1bHRzRGVjb3JhdGlvblBhcnQoY29uc3QgUmVuZGVyT2JqZWN0 JiwgY29uc3QgUGFpbnRJbmZvJiwgY29uc3QgSW50UmVjdCYpIG92ZXJyaWRlOwogCi0gICAgdmly dHVhbCB2b2lkIGFkanVzdFNlYXJjaEZpZWxkUmVzdWx0c0J1dHRvblN0eWxlKFN0eWxlUmVzb2x2 ZXIqLCBSZW5kZXJTdHlsZSosIEVsZW1lbnQqKSBjb25zdDsKLSAgICB2aXJ0dWFsIGJvb2wgcGFp bnRTZWFyY2hGaWVsZFJlc3VsdHNCdXR0b24oY29uc3QgUmVuZGVyT2JqZWN0JiwgY29uc3QgUGFp bnRJbmZvJiwgY29uc3QgSW50UmVjdCYpOworICAgIHZpcnR1YWwgdm9pZCBhZGp1c3RTZWFyY2hG aWVsZFJlc3VsdHNCdXR0b25TdHlsZShTdHlsZVJlc29sdmVyKiwgUmVuZGVyU3R5bGUqLCBFbGVt ZW50KikgY29uc3Qgb3ZlcnJpZGU7CisgICAgdmlydHVhbCBib29sIHBhaW50U2VhcmNoRmllbGRS ZXN1bHRzQnV0dG9uKGNvbnN0IFJlbmRlck9iamVjdCYsIGNvbnN0IFBhaW50SW5mbyYsIGNvbnN0 IEludFJlY3QmKSBvdmVycmlkZTsKIAotICAgIHZpcnR1YWwgdm9pZCB0aGVtZUNoYW5nZWQoKTsK KyAgICB2aXJ0dWFsIHZvaWQgdGhlbWVDaGFuZ2VkKCkgb3ZlcnJpZGU7CiAKLSAgICB2aXJ0dWFs IHZvaWQgYWRqdXN0QnV0dG9uU3R5bGUoU3R5bGVSZXNvbHZlciosIFJlbmRlclN0eWxlKiBzdHls ZSwgRWxlbWVudCopIGNvbnN0IHsgfQotICAgIHZpcnR1YWwgdm9pZCBhZGp1c3RUZXh0RmllbGRT dHlsZShTdHlsZVJlc29sdmVyKiwgUmVuZGVyU3R5bGUqIHN0eWxlLCBFbGVtZW50KikgY29uc3Qg eyB9Ci0gICAgdmlydHVhbCB2b2lkIGFkanVzdFRleHRBcmVhU3R5bGUoU3R5bGVSZXNvbHZlcios IFJlbmRlclN0eWxlKiBzdHlsZSwgRWxlbWVudCopIGNvbnN0IHsgfQorICAgIHZpcnR1YWwgdm9p ZCBhZGp1c3RCdXR0b25TdHlsZShTdHlsZVJlc29sdmVyKiwgUmVuZGVyU3R5bGUqIHN0eWxlLCBF bGVtZW50KikgY29uc3Qgb3ZlcnJpZGUgeyB9CisgICAgdmlydHVhbCB2b2lkIGFkanVzdFRleHRG aWVsZFN0eWxlKFN0eWxlUmVzb2x2ZXIqLCBSZW5kZXJTdHlsZSogc3R5bGUsIEVsZW1lbnQqKSBj b25zdCBvdmVycmlkZSB7IH0KKyAgICB2aXJ0dWFsIHZvaWQgYWRqdXN0VGV4dEFyZWFTdHlsZShT dHlsZVJlc29sdmVyKiwgUmVuZGVyU3R5bGUqIHN0eWxlLCBFbGVtZW50KikgY29uc3Qgb3ZlcnJp ZGUgeyB9CiAKICAgICBzdGF0aWMgdm9pZCBzZXRXZWJLaXRJc0JlaW5nVW5sb2FkZWQoKTsKIAog ICAgIHN0YXRpYyBTdHJpbmcgc3RyaW5nV2l0aENvbnRlbnRzT2ZGaWxlKENGU3RyaW5nUmVmIG5h bWUsIENGU3RyaW5nUmVmIHR5cGUpOwogCi0gICAgdmlydHVhbCBib29sIHN1cHBvcnRzRm9jdXNS aW5nKGNvbnN0IFJlbmRlclN0eWxlKikgY29uc3Q7CisgICAgdmlydHVhbCBib29sIHN1cHBvcnRz Rm9jdXNSaW5nKGNvbnN0IFJlbmRlclN0eWxlKikgY29uc3Qgb3ZlcnJpZGU7CiAKICNpZiBFTkFC TEUoVklERU8pCiAgICAgdmlydHVhbCBTdHJpbmcgbWVkaWFDb250cm9sc1N0eWxlU2hlZXQoKSBv dmVycmlkZTsKQEAgLTEzNiw3ICsxMzYsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBib29sIHBh aW50TWV0ZXIoY29uc3QgUmVuZGVyT2JqZWN0JiwgY29uc3QgUGFpbnRJbmZvJiwgY29uc3QgSW50 UmVjdCYpIG92ZXJyaWRlOwogI2VuZGlmCiAKLSAgICB2aXJ0dWFsIGJvb2wgc2hvdWxkU2hvd1Bs YWNlaG9sZGVyV2hlbkZvY3VzZWQoKSBjb25zdCB7IHJldHVybiB0cnVlOyB9CisgICAgdmlydHVh bCBib29sIHNob3VsZFNob3dQbGFjZWhvbGRlcldoZW5Gb2N1c2VkKCkgY29uc3Qgb3ZlcnJpZGUg eyByZXR1cm4gdHJ1ZTsgfQogCiBwcml2YXRlOgogICAgIGVudW0gQ29udHJvbFN1YlBhcnQgewo=