40571 2010-06-14 08:00:10 -0700 [Qt] Rename NotificatioIconWrapper to NotificationWrapper 2010-08-03 08:36:37 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) PC All RESOLVED FIXED Qt P2 Normal --- 39995 1 yael webkit-unassigned hausmann oldest_to_newest 237819 0 yael 2010-06-14 08:00:10 -0700 Suggested in https://bugs.webkit.org/show_bug.cgi?id=40005#c13 that the name of this class no longer replects its purpose. 237827 1 58651 yael 2010-06-14 08:04:49 -0700 Created attachment 58651 Patch -simple name change. 238406 2 58651 yael 2010-06-15 08:55:34 -0700 Comment on attachment 58651 Patch -simple name change. This patch will need update after https://bugs.webkit.org/show_bug.cgi?id=40624 is committed. 238427 3 58791 yael 2010-06-15 09:54:28 -0700 Created attachment 58791 Updated patch after r61187. 238454 4 yael 2010-06-15 10:26:35 -0700 Committed r61197: <http://trac.webkit.org/changeset/61197> 259470 5 hausmann 2010-08-03 08:36:37 -0700 Revision r61197 cherry-picked into qtwebkit-2.1 with commit c1c59b8ede2b44de9df472653820d3bf4fdb3021 58651 2010-06-14 08:04:49 -0700 2010-06-15 09:54:28 -0700 Patch -simple name change. 40571.patch text/plain 6647 yael SW5kZXg6IFdlYktpdC9xdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0NoYW5n ZUxvZwkocmV2aXNpb24gNjExMjIpCisrKyBXZWJLaXQvcXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTAtMDYtMTQgIFlhZWwgQWhhcm9uICA8eWFlbC5haGFy b25Abm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFtRdF0gUmVuYW1lIE5vdGlmaWNhdGlvSWNvbldyYXBwZXIgdG8gTm90aWZpY2F0aW9u V3JhcHBlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NDA1NzEKKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L05vdGlmaWNhdGlvblByZXNlbnRlckNs aWVudFF0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok5vdGlmaWNhdGlvbldyYXBwZXI6Ok5vdGlm aWNhdGlvbldyYXBwZXIpOgorICAgICAgICAoV2ViQ29yZTo6Tm90aWZpY2F0aW9uV3JhcHBlcjo6 fk5vdGlmaWNhdGlvbldyYXBwZXIpOgorICAgICAgICAoV2ViQ29yZTo6Tm90aWZpY2F0aW9uV3Jh cHBlcjo6Y2xvc2UpOgorICAgICAgICAoV2ViQ29yZTo6Tm90aWZpY2F0aW9uV3JhcHBlcjo6dGl0 bGUpOgorICAgICAgICAoV2ViQ29yZTo6Tm90aWZpY2F0aW9uV3JhcHBlcjo6bWVzc2FnZSk6Cisg ICAgICAgIChXZWJDb3JlOjpOb3RpZmljYXRpb25XcmFwcGVyOjppY29uRGF0YSk6CisgICAgICAg IChXZWJDb3JlOjpOb3RpZmljYXRpb25XcmFwcGVyOjpub3RpZmljYXRpb25DbG9zZWQpOgorICAg ICAgICAoV2ViQ29yZTo6Tm90aWZpY2F0aW9uUHJlc2VudGVyQ2xpZW50UXQ6OmRpc3BsYXlOb3Rp ZmljYXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6Tm90aWZpY2F0aW9uUHJlc2VudGVyQ2xpZW50 UXQ6OmNhbmNlbCk6CisgICAgICAgIChXZWJDb3JlOjpOb3RpZmljYXRpb25QcmVzZW50ZXJDbGll bnRRdDo6bm90aWZpY2F0aW9uRm9yV3JhcHBlcik6CisgICAgICAgICogV2ViQ29yZVN1cHBvcnQv Tm90aWZpY2F0aW9uUHJlc2VudGVyQ2xpZW50UXQuaDoKKwogMjAxMC0wNi0xMyAgWWFlbCBBaGFy b24gIDx5YWVsLmFoYXJvbkBub2tpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgS2VubmV0 aCBSb2hkZSBDaHJpc3RpYW5zZW4uCkluZGV4OiBXZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvTm90 aWZpY2F0aW9uUHJlc2VudGVyQ2xpZW50UXQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9xdC9X ZWJDb3JlU3VwcG9ydC9Ob3RpZmljYXRpb25QcmVzZW50ZXJDbGllbnRRdC5jcHAJKHJldmlzaW9u IDYxMTIxKQorKysgV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L05vdGlmaWNhdGlvblByZXNlbnRl ckNsaWVudFF0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjEsOCArNjEsOCBAQCBOb3RpZmljYXRp b25QcmVzZW50ZXJDbGllbnRRdCogTm90aWZpY2F0CiAgICAgcmV0dXJuIHNfbm90aWZpY2F0aW9u UHJlc2VudGVyOwogfQogCi1Ob3RpZmljYXRpb25JY29uV3JhcHBlcjo6Tm90aWZpY2F0aW9uSWNv bldyYXBwZXIoKQotICAgIDogbV9jbG9zZVRpbWVyKHRoaXMsICZOb3RpZmljYXRpb25JY29uV3Jh cHBlcjo6Y2xvc2UpCitOb3RpZmljYXRpb25XcmFwcGVyOjpOb3RpZmljYXRpb25XcmFwcGVyKCkK KyAgICA6IG1fY2xvc2VUaW1lcih0aGlzLCAmTm90aWZpY2F0aW9uV3JhcHBlcjo6Y2xvc2UpCiB7 CiAjaWZuZGVmIFFUX05PX1NZU1RFTVRSQVlJQ09OCiAgICAgbV9ub3RpZmljYXRpb25JY29uID0g MDsKQEAgLTcwLDE2ICs3MCwxNiBAQCBOb3RpZmljYXRpb25JY29uV3JhcHBlcjo6Tm90aWZpY2F0 aW9uSWNvCiAgICAgbV9wcmVzZW50ZXIgPSAwOwogfQogCi1Ob3RpZmljYXRpb25JY29uV3JhcHBl cjo6fk5vdGlmaWNhdGlvbkljb25XcmFwcGVyKCkKK05vdGlmaWNhdGlvbldyYXBwZXI6On5Ob3Rp ZmljYXRpb25XcmFwcGVyKCkKIHsKIH0KIAotdm9pZCBOb3RpZmljYXRpb25JY29uV3JhcHBlcjo6 Y2xvc2UoVGltZXI8Tm90aWZpY2F0aW9uSWNvbldyYXBwZXI+KikKK3ZvaWQgTm90aWZpY2F0aW9u V3JhcHBlcjo6Y2xvc2UoVGltZXI8Tm90aWZpY2F0aW9uV3JhcHBlcj4qKQogewogICAgIE5vdGlm aWNhdGlvblByZXNlbnRlckNsaWVudFF0Ojpub3RpZmljYXRpb25QcmVzZW50ZXIoKS0+Y2FuY2Vs KHRoaXMpOwogfQogCi1jb25zdCBRU3RyaW5nIE5vdGlmaWNhdGlvbkljb25XcmFwcGVyOjp0aXRs ZSgpIGNvbnN0Citjb25zdCBRU3RyaW5nIE5vdGlmaWNhdGlvbldyYXBwZXI6OnRpdGxlKCkgY29u c3QKIHsKICAgICBOb3RpZmljYXRpb24qIG5vdGlmaWNhdGlvbiA9IE5vdGlmaWNhdGlvblByZXNl bnRlckNsaWVudFF0Ojpub3RpZmljYXRpb25QcmVzZW50ZXIoKS0+bm90aWZpY2F0aW9uRm9yV3Jh cHBlcih0aGlzKTsKICAgICBpZiAobm90aWZpY2F0aW9uKQpAQCAtODcsNyArODcsNyBAQCBjb25z dCBRU3RyaW5nIE5vdGlmaWNhdGlvbkljb25XcmFwcGVyOjp0CiAgICAgcmV0dXJuIFFTdHJpbmco KTsKIH0KIAotY29uc3QgUVN0cmluZyBOb3RpZmljYXRpb25JY29uV3JhcHBlcjo6bWVzc2FnZSgp IGNvbnN0Citjb25zdCBRU3RyaW5nIE5vdGlmaWNhdGlvbldyYXBwZXI6Om1lc3NhZ2UoKSBjb25z dAogewogICAgIE5vdGlmaWNhdGlvbiogbm90aWZpY2F0aW9uID0gTm90aWZpY2F0aW9uUHJlc2Vu dGVyQ2xpZW50UXQ6Om5vdGlmaWNhdGlvblByZXNlbnRlcigpLT5ub3RpZmljYXRpb25Gb3JXcmFw cGVyKHRoaXMpOwogICAgIGlmIChub3RpZmljYXRpb24pCkBAIC05NSw3ICs5NSw3IEBAIGNvbnN0 IFFTdHJpbmcgTm90aWZpY2F0aW9uSWNvbldyYXBwZXI6Om0KICAgICByZXR1cm4gUVN0cmluZygp OwogfQogCi1jb25zdCBRQnl0ZUFycmF5IE5vdGlmaWNhdGlvbkljb25XcmFwcGVyOjppY29uRGF0 YSgpIGNvbnN0Citjb25zdCBRQnl0ZUFycmF5IE5vdGlmaWNhdGlvbldyYXBwZXI6Omljb25EYXRh KCkgY29uc3QKIHsKICAgICBOb3RpZmljYXRpb24qIG5vdGlmaWNhdGlvbiA9IE5vdGlmaWNhdGlv blByZXNlbnRlckNsaWVudFF0Ojpub3RpZmljYXRpb25QcmVzZW50ZXIoKS0+bm90aWZpY2F0aW9u Rm9yV3JhcHBlcih0aGlzKTsKICAgICBRQnl0ZUFycmF5IGljb25EYXRhOwpAQCAtMTI3LDcgKzEy Nyw3IEBAIHZvaWQgTm90aWZpY2F0aW9uUHJlc2VudGVyQ2xpZW50UXQ6OnJlbW8KICAgICB9CiB9 CiAKLXZvaWQgTm90aWZpY2F0aW9uSWNvbldyYXBwZXI6Om5vdGlmaWNhdGlvbkNsb3NlZCgpCit2 b2lkIE5vdGlmaWNhdGlvbldyYXBwZXI6Om5vdGlmaWNhdGlvbkNsb3NlZCgpCiB7CiAgICAgTm90 aWZpY2F0aW9uUHJlc2VudGVyQ2xpZW50UXQ6Om5vdGlmaWNhdGlvblByZXNlbnRlcigpLT5jYW5j ZWwodGhpcyk7CiB9CkBAIC0xNTIsNyArMTUyLDcgQEAgYm9vbCBOb3RpZmljYXRpb25QcmVzZW50 ZXJDbGllbnRRdDo6c2hvdwogCiB2b2lkIE5vdGlmaWNhdGlvblByZXNlbnRlckNsaWVudFF0Ojpk aXNwbGF5Tm90aWZpY2F0aW9uKE5vdGlmaWNhdGlvbiogbm90aWZpY2F0aW9uLCBjb25zdCBRQnl0 ZUFycmF5JiBieXRlcykKIHsKLSAgICBOb3RpZmljYXRpb25JY29uV3JhcHBlciogd3JhcHBlciA9 IG5ldyBOb3RpZmljYXRpb25JY29uV3JhcHBlcigpOworICAgIE5vdGlmaWNhdGlvbldyYXBwZXIq IHdyYXBwZXIgPSBuZXcgTm90aWZpY2F0aW9uV3JhcHBlcigpOwogICAgIG1fbm90aWZpY2F0aW9u cy5pbnNlcnQobm90aWZpY2F0aW9uLCB3cmFwcGVyKTsKICAgICBRU3RyaW5nIHRpdGxlOwogICAg IFFTdHJpbmcgbWVzc2FnZTsKQEAgLTIxMywxNCArMjEzLDE0IEBAIHZvaWQgTm90aWZpY2F0aW9u UHJlc2VudGVyQ2xpZW50UXQ6OmNhbmMKICAgICB9CiB9CiAKLXZvaWQgTm90aWZpY2F0aW9uUHJl c2VudGVyQ2xpZW50UXQ6OmNhbmNlbChOb3RpZmljYXRpb25JY29uV3JhcHBlciogd3JhcHBlcikK K3ZvaWQgTm90aWZpY2F0aW9uUHJlc2VudGVyQ2xpZW50UXQ6OmNhbmNlbChOb3RpZmljYXRpb25X cmFwcGVyKiB3cmFwcGVyKQogewogICAgIE5vdGlmaWNhdGlvbiogbm90aWZpY2F0aW9uID0gbm90 aWZpY2F0aW9uRm9yV3JhcHBlcih3cmFwcGVyKTsKICAgICBpZiAobm90aWZpY2F0aW9uKQogICAg ICAgICBjYW5jZWwobm90aWZpY2F0aW9uKTsKIH0KIAotTm90aWZpY2F0aW9uKiBOb3RpZmljYXRp b25QcmVzZW50ZXJDbGllbnRRdDo6bm90aWZpY2F0aW9uRm9yV3JhcHBlcihjb25zdCBOb3RpZmlj YXRpb25JY29uV3JhcHBlciogd3JhcHBlcikgY29uc3QKK05vdGlmaWNhdGlvbiogTm90aWZpY2F0 aW9uUHJlc2VudGVyQ2xpZW50UXQ6Om5vdGlmaWNhdGlvbkZvcldyYXBwZXIoY29uc3QgTm90aWZp Y2F0aW9uV3JhcHBlciogd3JhcHBlcikgY29uc3QKIHsKICAgICBOb3RpZmljYXRpb25zUXVldWU6 OkNvbnN0SXRlcmF0b3IgZW5kID0gbV9ub3RpZmljYXRpb25zLmVuZCgpOwogICAgIE5vdGlmaWNh dGlvbnNRdWV1ZTo6Q29uc3RJdGVyYXRvciBpdGVyID0gbV9ub3RpZmljYXRpb25zLmJlZ2luKCk7 CkluZGV4OiBXZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvTm90aWZpY2F0aW9uUHJlc2VudGVyQ2xp ZW50UXQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvTm90aWZpY2F0 aW9uUHJlc2VudGVyQ2xpZW50UXQuaAkocmV2aXNpb24gNjExMjEpCisrKyBXZWJLaXQvcXQvV2Vi Q29yZVN1cHBvcnQvTm90aWZpY2F0aW9uUHJlc2VudGVyQ2xpZW50UXQuaAkod29ya2luZyBjb3B5 KQpAQCAtNDcsMTQgKzQ3LDE0IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIGNsYXNzIERvY3VtZW50 OwogY2xhc3MgS1VSTDsKIAotY2xhc3MgTm90aWZpY2F0aW9uSWNvbldyYXBwZXIgOiBwdWJsaWMg UU9iamVjdCwgcHVibGljIFFXZWJOb3RpZmljYXRpb25EYXRhIHsKK2NsYXNzIE5vdGlmaWNhdGlv bldyYXBwZXIgOiBwdWJsaWMgUU9iamVjdCwgcHVibGljIFFXZWJOb3RpZmljYXRpb25EYXRhIHsK ICAgICBRX09CSkVDVAogcHVibGljOgotICAgIE5vdGlmaWNhdGlvbkljb25XcmFwcGVyKCk7Ci0g ICAgfk5vdGlmaWNhdGlvbkljb25XcmFwcGVyKCk7CisgICAgTm90aWZpY2F0aW9uV3JhcHBlcigp OworICAgIH5Ob3RpZmljYXRpb25XcmFwcGVyKCk7CiAKICAgICB2b2lkIGNsb3NlKCk7Ci0gICAg dm9pZCBjbG9zZShUaW1lcjxOb3RpZmljYXRpb25JY29uV3JhcHBlcj4qKTsKKyAgICB2b2lkIGNs b3NlKFRpbWVyPE5vdGlmaWNhdGlvbldyYXBwZXI+Kik7CiAgICAgY29uc3QgUVN0cmluZyB0aXRs ZSgpIGNvbnN0OwogICAgIGNvbnN0IFFTdHJpbmcgbWVzc2FnZSgpIGNvbnN0OwogICAgIGNvbnN0 IFFCeXRlQXJyYXkgaWNvbkRhdGEoKSBjb25zdDsKQEAgLTY4LDEyICs2OCwxMiBAQCBwdWJsaWM6 CiAjZW5kaWYKIAogICAgIE93blB0cjxRV2ViTm90aWZpY2F0aW9uUHJlc2VudGVyPiBtX3ByZXNl bnRlcjsKLSAgICBUaW1lcjxOb3RpZmljYXRpb25JY29uV3JhcHBlcj4gbV9jbG9zZVRpbWVyOwor ICAgIFRpbWVyPE5vdGlmaWNhdGlvbldyYXBwZXI+IG1fY2xvc2VUaW1lcjsKIH07CiAKICNpZiBF TkFCTEUoTk9USUZJQ0FUSU9OUykKIAotdHlwZWRlZiBRSGFzaCA8Tm90aWZpY2F0aW9uKiwgTm90 aWZpY2F0aW9uSWNvbldyYXBwZXIqPiBOb3RpZmljYXRpb25zUXVldWU7Cit0eXBlZGVmIFFIYXNo IDxOb3RpZmljYXRpb24qLCBOb3RpZmljYXRpb25XcmFwcGVyKj4gTm90aWZpY2F0aW9uc1F1ZXVl OwogCiBjbGFzcyBOb3RpZmljYXRpb25QcmVzZW50ZXJDbGllbnRRdCA6IHB1YmxpYyBOb3RpZmlj YXRpb25QcmVzZW50ZXIgewogcHVibGljOgpAQCAtODcsNyArODcsNyBAQCBwdWJsaWM6CiAgICAg dmlydHVhbCB2b2lkIHJlcXVlc3RQZXJtaXNzaW9uKFNlY3VyaXR5T3JpZ2luKiwgUGFzc1JlZlB0 cjxWb2lkQ2FsbGJhY2s+KTsKICAgICB2aXJ0dWFsIE5vdGlmaWNhdGlvblByZXNlbnRlcjo6UGVy bWlzc2lvbiBjaGVja1Blcm1pc3Npb24oY29uc3QgS1VSTCYpOwogCi0gICAgdm9pZCBjYW5jZWwo Tm90aWZpY2F0aW9uSWNvbldyYXBwZXIqKTsKKyAgICB2b2lkIGNhbmNlbChOb3RpZmljYXRpb25X cmFwcGVyKik7CiAKICAgICB2b2lkIGFsbG93Tm90aWZpY2F0aW9uRm9yT3JpZ2luKGNvbnN0IFFT dHJpbmcmIG9yaWdpbik7CiAKQEAgLTk5LDcgKzk5LDcgQEAgcHVibGljOgogICAgIHZvaWQgcmVt b3ZlQ2xpZW50KCk7CiAgICAgc3RhdGljIE5vdGlmaWNhdGlvblByZXNlbnRlckNsaWVudFF0KiBu b3RpZmljYXRpb25QcmVzZW50ZXIoKTsKIAotICAgIE5vdGlmaWNhdGlvbiogbm90aWZpY2F0aW9u Rm9yV3JhcHBlcihjb25zdCBOb3RpZmljYXRpb25JY29uV3JhcHBlciopIGNvbnN0OworICAgIE5v dGlmaWNhdGlvbiogbm90aWZpY2F0aW9uRm9yV3JhcHBlcihjb25zdCBOb3RpZmljYXRpb25XcmFw cGVyKikgY29uc3Q7CiAKIHByaXZhdGU6CiAgICAgdm9pZCBzZW5kRXZlbnQoTm90aWZpY2F0aW9u KiwgY29uc3QgQXRvbWljU3RyaW5nJiBldmVudE5hbWUpOwo= 58791 2010-06-15 09:54:28 -0700 2010-06-15 10:13:02 -0700 Updated patch after r61187. 40571.patch text/plain 6459 yael SW5kZXg6IFdlYktpdC9xdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0NoYW5n ZUxvZwkocmV2aXNpb24gNjExOTApCisrKyBXZWJLaXQvcXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTAtMDYtMTUgIFlhZWwgQWhhcm9uICA8eWFlbC5haGFy b25Abm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFtRdF0gUmVuYW1lIE5vdGlmaWNhdGlvSWNvbldyYXBwZXIgdG8gTm90aWZpY2F0aW9u V3JhcHBlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NDA1NzEKKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L05vdGlmaWNhdGlvblByZXNlbnRlckNs aWVudFF0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok5vdGlmaWNhdGlvbldyYXBwZXI6Ok5vdGlm aWNhdGlvbldyYXBwZXIpOgorICAgICAgICAoV2ViQ29yZTo6Tm90aWZpY2F0aW9uV3JhcHBlcjo6 Y2xvc2UpOgorICAgICAgICAoV2ViQ29yZTo6Tm90aWZpY2F0aW9uV3JhcHBlcjo6dGl0bGUpOgor ICAgICAgICAoV2ViQ29yZTo6Tm90aWZpY2F0aW9uV3JhcHBlcjo6bWVzc2FnZSk6CisgICAgICAg IChXZWJDb3JlOjpOb3RpZmljYXRpb25XcmFwcGVyOjppY29uRGF0YSk6CisgICAgICAgIChXZWJD b3JlOjpOb3RpZmljYXRpb25XcmFwcGVyOjpub3RpZmljYXRpb25DbG9zZWQpOgorICAgICAgICAo V2ViQ29yZTo6Tm90aWZpY2F0aW9uUHJlc2VudGVyQ2xpZW50UXQ6OmRpc3BsYXlOb3RpZmljYXRp b24pOgorICAgICAgICAoV2ViQ29yZTo6Tm90aWZpY2F0aW9uUHJlc2VudGVyQ2xpZW50UXQ6OmNh bmNlbCk6CisgICAgICAgIChXZWJDb3JlOjpOb3RpZmljYXRpb25QcmVzZW50ZXJDbGllbnRRdDo6 bm90aWZpY2F0aW9uRm9yV3JhcHBlcik6CisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvTm90aWZp Y2F0aW9uUHJlc2VudGVyQ2xpZW50UXQuaDoKKyAgICAgICAgKFdlYkNvcmU6Ok5vdGlmaWNhdGlv bldyYXBwZXI6On5Ob3RpZmljYXRpb25XcmFwcGVyKToKKwogMjAxMC0wNi0xNSAgTGFzemxvIEdv bWJvcyAgPGxhc3psby4xLmdvbWJvc0Bub2tpYS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwg U3ltYmlhbiBidWlsZCBmaXguCkluZGV4OiBXZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvTm90aWZp Y2F0aW9uUHJlc2VudGVyQ2xpZW50UXQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9xdC9XZWJD b3JlU3VwcG9ydC9Ob3RpZmljYXRpb25QcmVzZW50ZXJDbGllbnRRdC5jcHAJKHJldmlzaW9uIDYx MTg3KQorKysgV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L05vdGlmaWNhdGlvblByZXNlbnRlckNs aWVudFF0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjMsOCArNjMsOCBAQCBOb3RpZmljYXRpb25Q cmVzZW50ZXJDbGllbnRRdCogTm90aWZpY2F0CiAKICNlbmRpZgogCi1Ob3RpZmljYXRpb25JY29u V3JhcHBlcjo6Tm90aWZpY2F0aW9uSWNvbldyYXBwZXIoKQotICAgIDogbV9jbG9zZVRpbWVyKHRo aXMsICZOb3RpZmljYXRpb25JY29uV3JhcHBlcjo6Y2xvc2UpCitOb3RpZmljYXRpb25XcmFwcGVy OjpOb3RpZmljYXRpb25XcmFwcGVyKCkKKyAgICA6IG1fY2xvc2VUaW1lcih0aGlzLCAmTm90aWZp Y2F0aW9uV3JhcHBlcjo6Y2xvc2UpCiB7CiAjaWYgRU5BQkxFKE5PVElGSUNBVElPTlMpCiAKQEAg LTc1LDE0ICs3NSwxNCBAQCBOb3RpZmljYXRpb25JY29uV3JhcHBlcjo6Tm90aWZpY2F0aW9uSWNv CiAjZW5kaWYKIH0KIAotdm9pZCBOb3RpZmljYXRpb25JY29uV3JhcHBlcjo6Y2xvc2UoVGltZXI8 Tm90aWZpY2F0aW9uSWNvbldyYXBwZXI+KikKK3ZvaWQgTm90aWZpY2F0aW9uV3JhcHBlcjo6Y2xv c2UoVGltZXI8Tm90aWZpY2F0aW9uV3JhcHBlcj4qKQogewogI2lmIEVOQUJMRShOT1RJRklDQVRJ T05TKQogICAgIE5vdGlmaWNhdGlvblByZXNlbnRlckNsaWVudFF0Ojpub3RpZmljYXRpb25QcmVz ZW50ZXIoKS0+Y2FuY2VsKHRoaXMpOwogI2VuZGlmCiB9CiAKLWNvbnN0IFFTdHJpbmcgTm90aWZp Y2F0aW9uSWNvbldyYXBwZXI6OnRpdGxlKCkgY29uc3QKK2NvbnN0IFFTdHJpbmcgTm90aWZpY2F0 aW9uV3JhcHBlcjo6dGl0bGUoKSBjb25zdAogewogI2lmIEVOQUJMRShOT1RJRklDQVRJT05TKQog ICAgIE5vdGlmaWNhdGlvbiogbm90aWZpY2F0aW9uID0gTm90aWZpY2F0aW9uUHJlc2VudGVyQ2xp ZW50UXQ6Om5vdGlmaWNhdGlvblByZXNlbnRlcigpLT5ub3RpZmljYXRpb25Gb3JXcmFwcGVyKHRo aXMpOwpAQCAtOTIsNyArOTIsNyBAQCBjb25zdCBRU3RyaW5nIE5vdGlmaWNhdGlvbkljb25XcmFw cGVyOjp0CiAgICAgcmV0dXJuIFFTdHJpbmcoKTsKIH0KIAotY29uc3QgUVN0cmluZyBOb3RpZmlj YXRpb25JY29uV3JhcHBlcjo6bWVzc2FnZSgpIGNvbnN0Citjb25zdCBRU3RyaW5nIE5vdGlmaWNh dGlvbldyYXBwZXI6Om1lc3NhZ2UoKSBjb25zdAogewogI2lmIEVOQUJMRShOT1RJRklDQVRJT05T KQogICAgIE5vdGlmaWNhdGlvbiogbm90aWZpY2F0aW9uID0gTm90aWZpY2F0aW9uUHJlc2VudGVy Q2xpZW50UXQ6Om5vdGlmaWNhdGlvblByZXNlbnRlcigpLT5ub3RpZmljYXRpb25Gb3JXcmFwcGVy KHRoaXMpOwpAQCAtMTAyLDcgKzEwMiw3IEBAIGNvbnN0IFFTdHJpbmcgTm90aWZpY2F0aW9uSWNv bldyYXBwZXI6Om0KICAgICByZXR1cm4gUVN0cmluZygpOwogfQogCi1jb25zdCBRQnl0ZUFycmF5 IE5vdGlmaWNhdGlvbkljb25XcmFwcGVyOjppY29uRGF0YSgpIGNvbnN0Citjb25zdCBRQnl0ZUFy cmF5IE5vdGlmaWNhdGlvbldyYXBwZXI6Omljb25EYXRhKCkgY29uc3QKIHsKICAgICBRQnl0ZUFy cmF5IGljb25EYXRhOwogI2lmIEVOQUJMRShOT1RJRklDQVRJT05TKQpAQCAtMTE1LDcgKzExNSw3 IEBAIGNvbnN0IFFCeXRlQXJyYXkgTm90aWZpY2F0aW9uSWNvbldyYXBwZXIKICAgICByZXR1cm4g aWNvbkRhdGE7CiB9CiAKLXZvaWQgTm90aWZpY2F0aW9uSWNvbldyYXBwZXI6Om5vdGlmaWNhdGlv bkNsb3NlZCgpCit2b2lkIE5vdGlmaWNhdGlvbldyYXBwZXI6Om5vdGlmaWNhdGlvbkNsb3NlZCgp CiB7CiAjaWYgRU5BQkxFKE5PVElGSUNBVElPTlMpCiAgICAgTm90aWZpY2F0aW9uUHJlc2VudGVy Q2xpZW50UXQ6Om5vdGlmaWNhdGlvblByZXNlbnRlcigpLT5jYW5jZWwodGhpcyk7CkBAIC0xNjUs NyArMTY1LDcgQEAgYm9vbCBOb3RpZmljYXRpb25QcmVzZW50ZXJDbGllbnRRdDo6c2hvdwogCiB2 b2lkIE5vdGlmaWNhdGlvblByZXNlbnRlckNsaWVudFF0OjpkaXNwbGF5Tm90aWZpY2F0aW9uKE5v dGlmaWNhdGlvbiogbm90aWZpY2F0aW9uLCBjb25zdCBRQnl0ZUFycmF5JiBieXRlcykKIHsKLSAg ICBOb3RpZmljYXRpb25JY29uV3JhcHBlciogd3JhcHBlciA9IG5ldyBOb3RpZmljYXRpb25JY29u V3JhcHBlcigpOworICAgIE5vdGlmaWNhdGlvbldyYXBwZXIqIHdyYXBwZXIgPSBuZXcgTm90aWZp Y2F0aW9uV3JhcHBlcigpOwogICAgIG1fbm90aWZpY2F0aW9ucy5pbnNlcnQobm90aWZpY2F0aW9u LCB3cmFwcGVyKTsKICAgICBRU3RyaW5nIHRpdGxlOwogICAgIFFTdHJpbmcgbWVzc2FnZTsKQEAg LTIyNiwxNCArMjI2LDE0IEBAIHZvaWQgTm90aWZpY2F0aW9uUHJlc2VudGVyQ2xpZW50UXQ6OmNh bmMKICAgICB9CiB9CiAKLXZvaWQgTm90aWZpY2F0aW9uUHJlc2VudGVyQ2xpZW50UXQ6OmNhbmNl bChOb3RpZmljYXRpb25JY29uV3JhcHBlciogd3JhcHBlcikKK3ZvaWQgTm90aWZpY2F0aW9uUHJl c2VudGVyQ2xpZW50UXQ6OmNhbmNlbChOb3RpZmljYXRpb25XcmFwcGVyKiB3cmFwcGVyKQogewog ICAgIE5vdGlmaWNhdGlvbiogbm90aWZpY2F0aW9uID0gbm90aWZpY2F0aW9uRm9yV3JhcHBlcih3 cmFwcGVyKTsKICAgICBpZiAobm90aWZpY2F0aW9uKQogICAgICAgICBjYW5jZWwobm90aWZpY2F0 aW9uKTsKIH0KIAotTm90aWZpY2F0aW9uKiBOb3RpZmljYXRpb25QcmVzZW50ZXJDbGllbnRRdDo6 bm90aWZpY2F0aW9uRm9yV3JhcHBlcihjb25zdCBOb3RpZmljYXRpb25JY29uV3JhcHBlciogd3Jh cHBlcikgY29uc3QKK05vdGlmaWNhdGlvbiogTm90aWZpY2F0aW9uUHJlc2VudGVyQ2xpZW50UXQ6 Om5vdGlmaWNhdGlvbkZvcldyYXBwZXIoY29uc3QgTm90aWZpY2F0aW9uV3JhcHBlciogd3JhcHBl cikgY29uc3QKIHsKICAgICBOb3RpZmljYXRpb25zUXVldWU6OkNvbnN0SXRlcmF0b3IgZW5kID0g bV9ub3RpZmljYXRpb25zLmVuZCgpOwogICAgIE5vdGlmaWNhdGlvbnNRdWV1ZTo6Q29uc3RJdGVy YXRvciBpdGVyID0gbV9ub3RpZmljYXRpb25zLmJlZ2luKCk7CkluZGV4OiBXZWJLaXQvcXQvV2Vi Q29yZVN1cHBvcnQvTm90aWZpY2F0aW9uUHJlc2VudGVyQ2xpZW50UXQuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBXZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvTm90aWZpY2F0aW9uUHJlc2VudGVyQ2xpZW50UXQu aAkocmV2aXNpb24gNjExODcpCisrKyBXZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvTm90aWZpY2F0 aW9uUHJlc2VudGVyQ2xpZW50UXQuaAkod29ya2luZyBjb3B5KQpAQCAtNDcsMTQgKzQ3LDE0IEBA IG5hbWVzcGFjZSBXZWJDb3JlIHsKIGNsYXNzIERvY3VtZW50OwogY2xhc3MgS1VSTDsKIAotY2xh c3MgTm90aWZpY2F0aW9uSWNvbldyYXBwZXIgOiBwdWJsaWMgUU9iamVjdCwgcHVibGljIFFXZWJO b3RpZmljYXRpb25EYXRhIHsKK2NsYXNzIE5vdGlmaWNhdGlvbldyYXBwZXIgOiBwdWJsaWMgUU9i amVjdCwgcHVibGljIFFXZWJOb3RpZmljYXRpb25EYXRhIHsKICAgICBRX09CSkVDVAogcHVibGlj OgotICAgIE5vdGlmaWNhdGlvbkljb25XcmFwcGVyKCk7Ci0gICAgfk5vdGlmaWNhdGlvbkljb25X cmFwcGVyKCkge30KKyAgICBOb3RpZmljYXRpb25XcmFwcGVyKCk7CisgICAgfk5vdGlmaWNhdGlv bldyYXBwZXIoKSB7fQogCiAgICAgdm9pZCBjbG9zZSgpOwotICAgIHZvaWQgY2xvc2UoVGltZXI8 Tm90aWZpY2F0aW9uSWNvbldyYXBwZXI+Kik7CisgICAgdm9pZCBjbG9zZShUaW1lcjxOb3RpZmlj YXRpb25XcmFwcGVyPiopOwogICAgIGNvbnN0IFFTdHJpbmcgdGl0bGUoKSBjb25zdDsKICAgICBj b25zdCBRU3RyaW5nIG1lc3NhZ2UoKSBjb25zdDsKICAgICBjb25zdCBRQnl0ZUFycmF5IGljb25E YXRhKCkgY29uc3Q7CkBAIC02OCwxMiArNjgsMTIgQEAgcHVibGljOgogI2VuZGlmCiAKICAgICBP d25QdHI8UVdlYk5vdGlmaWNhdGlvblByZXNlbnRlcj4gbV9wcmVzZW50ZXI7Ci0gICAgVGltZXI8 Tm90aWZpY2F0aW9uSWNvbldyYXBwZXI+IG1fY2xvc2VUaW1lcjsKKyAgICBUaW1lcjxOb3RpZmlj YXRpb25XcmFwcGVyPiBtX2Nsb3NlVGltZXI7CiB9OwogCiAjaWYgRU5BQkxFKE5PVElGSUNBVElP TlMpCiAKLXR5cGVkZWYgUUhhc2ggPE5vdGlmaWNhdGlvbiosIE5vdGlmaWNhdGlvbkljb25XcmFw cGVyKj4gTm90aWZpY2F0aW9uc1F1ZXVlOwordHlwZWRlZiBRSGFzaCA8Tm90aWZpY2F0aW9uKiwg Tm90aWZpY2F0aW9uV3JhcHBlcio+IE5vdGlmaWNhdGlvbnNRdWV1ZTsKIAogY2xhc3MgTm90aWZp Y2F0aW9uUHJlc2VudGVyQ2xpZW50UXQgOiBwdWJsaWMgTm90aWZpY2F0aW9uUHJlc2VudGVyIHsK IHB1YmxpYzoKQEAgLTg3LDcgKzg3LDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCByZXF1 ZXN0UGVybWlzc2lvbihTZWN1cml0eU9yaWdpbiosIFBhc3NSZWZQdHI8Vm9pZENhbGxiYWNrPik7 CiAgICAgdmlydHVhbCBOb3RpZmljYXRpb25QcmVzZW50ZXI6OlBlcm1pc3Npb24gY2hlY2tQZXJt aXNzaW9uKGNvbnN0IEtVUkwmKTsKIAotICAgIHZvaWQgY2FuY2VsKE5vdGlmaWNhdGlvbkljb25X cmFwcGVyKik7CisgICAgdm9pZCBjYW5jZWwoTm90aWZpY2F0aW9uV3JhcHBlciopOwogCiAgICAg dm9pZCBhbGxvd05vdGlmaWNhdGlvbkZvck9yaWdpbihjb25zdCBRU3RyaW5nJiBvcmlnaW4pOwog CkBAIC05OSw3ICs5OSw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHJlbW92ZUNsaWVudCgpOwogICAg IHN0YXRpYyBOb3RpZmljYXRpb25QcmVzZW50ZXJDbGllbnRRdCogbm90aWZpY2F0aW9uUHJlc2Vu dGVyKCk7CiAKLSAgICBOb3RpZmljYXRpb24qIG5vdGlmaWNhdGlvbkZvcldyYXBwZXIoY29uc3Qg Tm90aWZpY2F0aW9uSWNvbldyYXBwZXIqKSBjb25zdDsKKyAgICBOb3RpZmljYXRpb24qIG5vdGlm aWNhdGlvbkZvcldyYXBwZXIoY29uc3QgTm90aWZpY2F0aW9uV3JhcHBlciopIGNvbnN0OwogCiBw cml2YXRlOgogICAgIHZvaWQgc2VuZEV2ZW50KE5vdGlmaWNhdGlvbiosIGNvbnN0IEF0b21pY1N0 cmluZyYgZXZlbnROYW1lKTsK