75885 2012-01-09 13:01:10 -0800 [Qt][WK2] Fix keyboard shortcuts in MiniBrowser. 2012-01-10 03:07:12 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zeno zeno oldest_to_newest 532448 0 zeno 2012-01-09 13:01:10 -0800 The following shortcuts do not work reliably in MiniBrowser: Ctrl+R & Ctrl+L. 532497 1 121720 zeno 2012-01-09 13:40:24 -0800 Created attachment 121720 patch for review. Doing this in C++ is the only reliable way due to the event delivery mechanism in QML. 532557 2 121720 kenneth 2012-01-09 15:15:24 -0800 Comment on attachment 121720 patch for review. View in context: https://bugs.webkit.org/attachment.cgi?id=121720&action=review > Tools/ChangeLog:7 > + [Qt][WK2] Fix keyboard shortcuts in MiniBrowser. > + https://bugs.webkit.org/show_bug.cgi?id=75885 > + > + Reviewed by NOBODY (OOPS!). > + A bit more description would be nice. Was the original code wrong? or is it due to bugs in QML? etc 532600 3 121745 zeno 2012-01-09 16:02:12 -0800 Created attachment 121745 patch for review. - same content, but some more ChangeLog. 532879 4 121745 kenneth 2012-01-10 01:21:17 -0800 Comment on attachment 121745 patch for review. - same content, but some more ChangeLog. View in context: https://bugs.webkit.org/attachment.cgi?id=121745&action=review > Tools/ChangeLog:10 > + In QML events are propagated through parents. But since the > + WebView may consume key events, a shortcut might never reach > + the top QtQuickItem. > + Therefore an application wide event handling function in C++ > + needs to take care of shortcuts for MiniBrowser. Way better... now a small comment in the code would be quite nice. like in the notify method 532925 5 zeno 2012-01-10 03:07:12 -0800 Committed r104546: <http://trac.webkit.org/changeset/104546> 121720 2012-01-09 13:40:24 -0800 2012-01-09 16:02:12 -0800 patch for review. 75885_20120109-223851.patch text/plain 5031 zeno ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBhYTIz ZmE2Li4zZWNhNzhkIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTItMDEtMDkgIFplbm8gQWxiaXNzZXIgIDx6ZW5v QHdlYmtpdC5vcmc+CisKKyAgICAgICAgW1F0XVtXSzJdIEZpeCBrZXlib2FyZCBzaG9ydGN1dHMg aW4gTWluaUJyb3dzZXIuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD03NTg4NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogTWluaUJyb3dzZXIvcXQvQnJvd3NlcldpbmRvdy5jcHA6CisgICAgICAgIChCcm93 c2VyV2luZG93OjpyZWxvYWQpOgorICAgICAgICAoQnJvd3NlcldpbmRvdzo6Zm9jdXNBZGRyZXNz QmFyKToKKyAgICAgICAgKiBNaW5pQnJvd3Nlci9xdC9Ccm93c2VyV2luZG93Lmg6CisgICAgICAg ICogTWluaUJyb3dzZXIvcXQvTWluaUJyb3dzZXJBcHBsaWNhdGlvbi5jcHA6CisgICAgICAgIChN aW5pQnJvd3NlckFwcGxpY2F0aW9uOjpub3RpZnkpOgorICAgICAgICAqIE1pbmlCcm93c2VyL3F0 L3FtbC9Ccm93c2VyV2luZG93LnFtbDoKKwogMjAxMi0wMS0wNiAgQ3NhYmEgT3N6dHJvZ29uw6Fj ICA8b3NzeUB3ZWJraXQub3JnPgogCiAgICAgICAgIE5SV1Qgc2hvdWxkIHVzZSB0ZXN0X2V4cGVj dGF0aW9uLnR4dCBvbiB3azIgcGxhdGZvcm1zCmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nl ci9xdC9Ccm93c2VyV2luZG93LmNwcCBiL1Rvb2xzL01pbmlCcm93c2VyL3F0L0Jyb3dzZXJXaW5k b3cuY3BwCmluZGV4IDI5YmY1OGEuLjljY2I4YTIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93 c2VyL3F0L0Jyb3dzZXJXaW5kb3cuY3BwCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL3F0L0Jyb3dz ZXJXaW5kb3cuY3BwCkBAIC03Niw2ICs3NiwxNiBAQCB2b2lkIEJyb3dzZXJXaW5kb3c6OmxvYWQo Y29uc3QgUVN0cmluZyYgdXJsKQogICAgIFFNZXRhT2JqZWN0OjppbnZva2VNZXRob2Qocm9vdE9i amVjdCgpLCAibG9hZCIsIFF0OjpEaXJlY3RDb25uZWN0aW9uLCBRX0FSRyhRVmFyaWFudCwgY29t cGxldGVkVXJsKSk7CiB9CiAKK3ZvaWQgQnJvd3NlcldpbmRvdzo6cmVsb2FkKCkKK3sKKyAgICBR TWV0YU9iamVjdDo6aW52b2tlTWV0aG9kKHJvb3RPYmplY3QoKSwgInJlbG9hZCIsIFF0OjpEaXJl Y3RDb25uZWN0aW9uKTsKK30KKwordm9pZCBCcm93c2VyV2luZG93Ojpmb2N1c0FkZHJlc3NCYXIo KQoreworICAgIFFNZXRhT2JqZWN0OjppbnZva2VNZXRob2Qocm9vdE9iamVjdCgpLCAiZm9jdXNB ZGRyZXNzQmFyIiwgUXQ6OkRpcmVjdENvbm5lY3Rpb24pOworfQorCiBCcm93c2VyV2luZG93KiBC cm93c2VyV2luZG93OjpuZXdXaW5kb3coY29uc3QgUVN0cmluZyYgdXJsKQogewogICAgIEJyb3dz ZXJXaW5kb3cqIHdpbmRvdyA9IG5ldyBCcm93c2VyV2luZG93KCk7CmRpZmYgLS1naXQgYS9Ub29s cy9NaW5pQnJvd3Nlci9xdC9Ccm93c2VyV2luZG93LmggYi9Ub29scy9NaW5pQnJvd3Nlci9xdC9C cm93c2VyV2luZG93LmgKaW5kZXggZTY5N2M3NS4uOTU5M2UxMCAxMDA2NDQKLS0tIGEvVG9vbHMv TWluaUJyb3dzZXIvcXQvQnJvd3NlcldpbmRvdy5oCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL3F0 L0Jyb3dzZXJXaW5kb3cuaApAQCAtNDIsNiArNDIsOCBAQCBwdWJsaWM6CiAgICAgQnJvd3Nlcldp bmRvdyhXaW5kb3dPcHRpb25zKiA9IDApOwogICAgIH5Ccm93c2VyV2luZG93KCk7CiAgICAgdm9p ZCBsb2FkKGNvbnN0IFFTdHJpbmcmIHVybCk7CisgICAgdm9pZCByZWxvYWQoKTsKKyAgICB2b2lk IGZvY3VzQWRkcmVzc0JhcigpOwogICAgIFFRdWlja1dlYlZpZXcqIHdlYlZpZXcoKSBjb25zdDsK IAogICAgIHZvaWQgdXBkYXRlVmlzdWFsTW9ja1RvdWNoUG9pbnRzKGNvbnN0IFFMaXN0PFFXaW5k b3dTeXN0ZW1JbnRlcmZhY2U6OlRvdWNoUG9pbnQ+JiB0b3VjaFBvaW50cyk7CmRpZmYgLS1naXQg YS9Ub29scy9NaW5pQnJvd3Nlci9xdC9NaW5pQnJvd3NlckFwcGxpY2F0aW9uLmNwcCBiL1Rvb2xz L01pbmlCcm93c2VyL3F0L01pbmlCcm93c2VyQXBwbGljYXRpb24uY3BwCmluZGV4IDBlYTNjM2Iu LjdiZjdiZGIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL3F0L01pbmlCcm93c2VyQXBw bGljYXRpb24uY3BwCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL3F0L01pbmlCcm93c2VyQXBwbGlj YXRpb24uY3BwCkBAIC05Nyw2ICs5NywxOCBAQCBib29sIE1pbmlCcm93c2VyQXBwbGljYXRpb246 Om5vdGlmeShRT2JqZWN0KiB0YXJnZXQsIFFFdmVudCogZXZlbnQpCiAgICAgaWYgKCFicm93c2Vy V2luZG93KQogICAgICAgICByZXR1cm4gUUFwcGxpY2F0aW9uOjpub3RpZnkodGFyZ2V0LCBldmVu dCk7CiAKKyAgICBpZiAoZXZlbnQtPnR5cGUoKSA9PSBRRXZlbnQ6OktleVByZXNzKSB7CisgICAg ICAgIFFLZXlFdmVudCoga2V5RXZlbnQgPSBzdGF0aWNfY2FzdDxRS2V5RXZlbnQqPihldmVudCk7 CisgICAgICAgIGlmICgoa2V5RXZlbnQtPmtleSgpID09IFF0OjpLZXlfUiAmJiBrZXlFdmVudC0+ bW9kaWZpZXJzKCkgPT0gUXQ6OkNvbnRyb2xNb2RpZmllcikgfHwga2V5RXZlbnQtPmtleSgpID09 IFF0OjpLZXlfRjUpIHsKKyAgICAgICAgICAgIGJyb3dzZXJXaW5kb3ctPnJlbG9hZCgpOworICAg ICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgIH0KKyAgICAgICAgaWYgKChrZXlFdmVudC0+ a2V5KCkgPT0gUXQ6OktleV9MICYmIGtleUV2ZW50LT5tb2RpZmllcnMoKSA9PSBRdDo6Q29udHJv bE1vZGlmaWVyKSB8fCBrZXlFdmVudC0+a2V5KCkgPT0gUXQ6OktleV9GNikgeworICAgICAgICAg ICAgYnJvd3NlcldpbmRvdy0+Zm9jdXNBZGRyZXNzQmFyKCk7CisgICAgICAgICAgICByZXR1cm4g dHJ1ZTsKKyAgICAgICAgfQorICAgIH0KKwogICAgIGlmIChldmVudC0+dHlwZSgpID09IFFFdmVu dDo6S2V5UmVsZWFzZSAmJiBzdGF0aWNfY2FzdDxRS2V5RXZlbnQqPihldmVudCktPmtleSgpID09 IFF0OjpLZXlfQ29udHJvbCkgewogICAgICAgICBmb3JlYWNoIChpbnQgaWQsIG1faGVsZFRvdWNo UG9pbnRzKQogICAgICAgICAgICAgaWYgKG1fdG91Y2hQb2ludHMuY29udGFpbnMoaWQpKQpkaWZm IC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvcXQvcW1sL0Jyb3dzZXJXaW5kb3cucW1sIGIvVG9v bHMvTWluaUJyb3dzZXIvcXQvcW1sL0Jyb3dzZXJXaW5kb3cucW1sCmluZGV4IDBkNzNkY2UuLjQy ODVmMWIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL3F0L3FtbC9Ccm93c2VyV2luZG93 LnFtbAorKysgYi9Ub29scy9NaW5pQnJvd3Nlci9xdC9xbWwvQnJvd3NlcldpbmRvdy5xbWwKQEAg LTQxLDYgKzQxLDEwIEBAIFJlY3RhbmdsZSB7CiAgICAgICAgIHdlYlZpZXcubG9hZChhZGRyZXNz KQogICAgIH0KIAorICAgIGZ1bmN0aW9uIHJlbG9hZCgpIHsKKyAgICAgICAgd2ViVmlldy5yZWxv YWQoKQorICAgIH0KKwogICAgIGZ1bmN0aW9uIGZvY3VzQWRkcmVzc0JhcigpIHsKICAgICAgICAg YWRkcmVzc0xpbmUuZm9yY2VBY3RpdmVGb2N1cygpCiAgICAgICAgIGFkZHJlc3NMaW5lLnNlbGVj dEFsbCgpCkBAIC0xNTEsMTEgKzE1NSw5IEBAIFJlY3RhbmdsZSB7CiAgICAgICAgICAgICAgICAg ICAgIG9uUmVsZWFzZWQ6IHsgcGFyZW50LmNvbG9yID0gIiNlZmVmZWYiIH0KICAgICAgICAgICAg ICAgICAgICAgb25DbGlja2VkOiB7CiAgICAgICAgICAgICAgICAgICAgICAgICBpZiAod2ViVmll dy5sb2FkaW5nKSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc29sZS5sb2coInN0 b3AgbG9hZGluZyIpCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgd2ViVmlldy5zdG9wKCkK ICAgICAgICAgICAgICAgICAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgY29uc29sZS5sb2coInJlbG9hZGluZyIpCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgd2ViVmlldy5yZWxvYWQoKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJlbG9hZCgp CiAgICAgICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgICAgIH0KICAgICAg ICAgICAgICAgICB9CkBAIC0yMzQsMTMgKzIzNiw2IEBAIFJlY3RhbmdsZSB7CiAgICAgICAgICAg ICAgICAgICAgIGNvbnNvbGUubG9nKCJnb2luZyB0bzogIiwgYWRkcmVzc0xpbmUudGV4dCkKICAg ICAgICAgICAgICAgICAgICAgd2ViVmlldy5sb2FkKHV0aWxzLnVybEZyb21Vc2VySW5wdXQoYWRk cmVzc0xpbmUudGV4dCkpCiAgICAgICAgICAgICAgICAgfQotCi0gICAgICAgICAgICAgICAgS2V5 cy5vblByZXNzZWQ6IHsKLSAgICAgICAgICAgICAgICAgICAgaWYgKCgoZXZlbnQubW9kaWZpZXJz ICYgUXQuQ29udHJvbE1vZGlmaWVyKSAmJiBldmVudC5rZXkgPT0gUXQuS2V5X0wpIHx8IGV2ZW50 LmtleSA9PSBRdC5rZXlfRjYpIHsKLSAgICAgICAgICAgICAgICAgICAgICAgIGZvY3VzQWRkcmVz c0JhcigpCi0gICAgICAgICAgICAgICAgICAgICAgICBldmVudC5hY2NlcHRlZCA9IHRydWUKLSAg ICAgICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0KICAg ICAgICAgfQogICAgIH0KQEAgLTI3OSwxMSArMjc0LDQgQEAgUmVjdGFuZ2xlIHsKICAgICAgICAg dmlzaWJsZTogZmFsc2UKICAgICAgICAgdmlld3BvcnRJbmZvIDogd2ViVmlldy5leHBlcmltZW50 YWwudmlld3BvcnRJbmZvCiAgICAgfQotCi0gICAgS2V5cy5vblByZXNzZWQ6IHsKLSAgICAgICAg aWYgKCgoZXZlbnQubW9kaWZpZXJzICYgUXQuQ29udHJvbE1vZGlmaWVyKSAmJiBldmVudC5rZXkg PT0gUXQuS2V5X0wpIHx8IGV2ZW50LmtleSA9PSBRdC5rZXlfRjYpIHsKLSAgICAgICAgICAgIGZv Y3VzQWRkcmVzc0JhcigpCi0gICAgICAgICAgICBldmVudC5hY2NlcHRlZCA9IHRydWUKLSAgICAg ICAgfQotICAgIH0KIH0K 121745 2012-01-09 16:02:12 -0800 2012-01-10 01:21:17 -0800 patch for review. - same content, but some more ChangeLog. 75885_20120110-010022.patch text/plain 5330 zeno ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBhYTIz ZmE2Li5iY2JlMWU3IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTItMDEtMDkgIFplbm8gQWxiaXNzZXIgIDx6ZW5v QHdlYmtpdC5vcmc+CisKKyAgICAgICAgW1F0XVtXSzJdIEZpeCBrZXlib2FyZCBzaG9ydGN1dHMg aW4gTWluaUJyb3dzZXIuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD03NTg4NQorCisgICAgICAgIEluIFFNTCBldmVudHMgYXJlIHByb3BhZ2F0ZWQgdGhy b3VnaCBwYXJlbnRzLiBCdXQgc2luY2UgdGhlCisgICAgICAgIFdlYlZpZXcgbWF5IGNvbnN1bWUg a2V5IGV2ZW50cywgYSBzaG9ydGN1dCBtaWdodCBuZXZlciByZWFjaAorICAgICAgICB0aGUgdG9w IFF0UXVpY2tJdGVtLgorICAgICAgICBUaGVyZWZvcmUgYW4gYXBwbGljYXRpb24gd2lkZSBldmVu dCBoYW5kbGluZyBmdW5jdGlvbiBpbiBDKysKKyAgICAgICAgbmVlZHMgdG8gdGFrZSBjYXJlIG9m IHNob3J0Y3V0cyBmb3IgTWluaUJyb3dzZXIuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBNaW5pQnJvd3Nlci9xdC9Ccm93c2VyV2luZG93LmNwcDoK KyAgICAgICAgKEJyb3dzZXJXaW5kb3c6OnJlbG9hZCk6CisgICAgICAgIChCcm93c2VyV2luZG93 Ojpmb2N1c0FkZHJlc3NCYXIpOgorICAgICAgICAqIE1pbmlCcm93c2VyL3F0L0Jyb3dzZXJXaW5k b3cuaDoKKyAgICAgICAgKiBNaW5pQnJvd3Nlci9xdC9NaW5pQnJvd3NlckFwcGxpY2F0aW9uLmNw cDoKKyAgICAgICAgKE1pbmlCcm93c2VyQXBwbGljYXRpb246Om5vdGlmeSk6CisgICAgICAgICog TWluaUJyb3dzZXIvcXQvcW1sL0Jyb3dzZXJXaW5kb3cucW1sOgorCiAyMDEyLTAxLTA2ICBDc2Fi YSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CiAKICAgICAgICAgTlJXVCBzaG91bGQg dXNlIHRlc3RfZXhwZWN0YXRpb24udHh0IG9uIHdrMiBwbGF0Zm9ybXMKZGlmZiAtLWdpdCBhL1Rv b2xzL01pbmlCcm93c2VyL3F0L0Jyb3dzZXJXaW5kb3cuY3BwIGIvVG9vbHMvTWluaUJyb3dzZXIv cXQvQnJvd3NlcldpbmRvdy5jcHAKaW5kZXggMjliZjU4YS4uOWNjYjhhMiAxMDA2NDQKLS0tIGEv VG9vbHMvTWluaUJyb3dzZXIvcXQvQnJvd3NlcldpbmRvdy5jcHAKKysrIGIvVG9vbHMvTWluaUJy b3dzZXIvcXQvQnJvd3NlcldpbmRvdy5jcHAKQEAgLTc2LDYgKzc2LDE2IEBAIHZvaWQgQnJvd3Nl cldpbmRvdzo6bG9hZChjb25zdCBRU3RyaW5nJiB1cmwpCiAgICAgUU1ldGFPYmplY3Q6Omludm9r ZU1ldGhvZChyb290T2JqZWN0KCksICJsb2FkIiwgUXQ6OkRpcmVjdENvbm5lY3Rpb24sIFFfQVJH KFFWYXJpYW50LCBjb21wbGV0ZWRVcmwpKTsKIH0KIAordm9pZCBCcm93c2VyV2luZG93OjpyZWxv YWQoKQoreworICAgIFFNZXRhT2JqZWN0OjppbnZva2VNZXRob2Qocm9vdE9iamVjdCgpLCAicmVs b2FkIiwgUXQ6OkRpcmVjdENvbm5lY3Rpb24pOworfQorCit2b2lkIEJyb3dzZXJXaW5kb3c6OmZv Y3VzQWRkcmVzc0JhcigpCit7CisgICAgUU1ldGFPYmplY3Q6Omludm9rZU1ldGhvZChyb290T2Jq ZWN0KCksICJmb2N1c0FkZHJlc3NCYXIiLCBRdDo6RGlyZWN0Q29ubmVjdGlvbik7Cit9CisKIEJy b3dzZXJXaW5kb3cqIEJyb3dzZXJXaW5kb3c6Om5ld1dpbmRvdyhjb25zdCBRU3RyaW5nJiB1cmwp CiB7CiAgICAgQnJvd3NlcldpbmRvdyogd2luZG93ID0gbmV3IEJyb3dzZXJXaW5kb3coKTsKZGlm ZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL3F0L0Jyb3dzZXJXaW5kb3cuaCBiL1Rvb2xzL01p bmlCcm93c2VyL3F0L0Jyb3dzZXJXaW5kb3cuaAppbmRleCBlNjk3Yzc1Li45NTkzZTEwIDEwMDY0 NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci9xdC9Ccm93c2VyV2luZG93LmgKKysrIGIvVG9vbHMv TWluaUJyb3dzZXIvcXQvQnJvd3NlcldpbmRvdy5oCkBAIC00Miw2ICs0Miw4IEBAIHB1YmxpYzoK ICAgICBCcm93c2VyV2luZG93KFdpbmRvd09wdGlvbnMqID0gMCk7CiAgICAgfkJyb3dzZXJXaW5k b3coKTsKICAgICB2b2lkIGxvYWQoY29uc3QgUVN0cmluZyYgdXJsKTsKKyAgICB2b2lkIHJlbG9h ZCgpOworICAgIHZvaWQgZm9jdXNBZGRyZXNzQmFyKCk7CiAgICAgUVF1aWNrV2ViVmlldyogd2Vi VmlldygpIGNvbnN0OwogCiAgICAgdm9pZCB1cGRhdGVWaXN1YWxNb2NrVG91Y2hQb2ludHMoY29u c3QgUUxpc3Q8UVdpbmRvd1N5c3RlbUludGVyZmFjZTo6VG91Y2hQb2ludD4mIHRvdWNoUG9pbnRz KTsKZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL3F0L01pbmlCcm93c2VyQXBwbGljYXRp b24uY3BwIGIvVG9vbHMvTWluaUJyb3dzZXIvcXQvTWluaUJyb3dzZXJBcHBsaWNhdGlvbi5jcHAK aW5kZXggMGVhM2MzYi4uN2JmN2JkYiAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvcXQv TWluaUJyb3dzZXJBcHBsaWNhdGlvbi5jcHAKKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvcXQvTWlu aUJyb3dzZXJBcHBsaWNhdGlvbi5jcHAKQEAgLTk3LDYgKzk3LDE4IEBAIGJvb2wgTWluaUJyb3dz ZXJBcHBsaWNhdGlvbjo6bm90aWZ5KFFPYmplY3QqIHRhcmdldCwgUUV2ZW50KiBldmVudCkKICAg ICBpZiAoIWJyb3dzZXJXaW5kb3cpCiAgICAgICAgIHJldHVybiBRQXBwbGljYXRpb246Om5vdGlm eSh0YXJnZXQsIGV2ZW50KTsKIAorICAgIGlmIChldmVudC0+dHlwZSgpID09IFFFdmVudDo6S2V5 UHJlc3MpIHsKKyAgICAgICAgUUtleUV2ZW50KiBrZXlFdmVudCA9IHN0YXRpY19jYXN0PFFLZXlF dmVudCo+KGV2ZW50KTsKKyAgICAgICAgaWYgKChrZXlFdmVudC0+a2V5KCkgPT0gUXQ6OktleV9S ICYmIGtleUV2ZW50LT5tb2RpZmllcnMoKSA9PSBRdDo6Q29udHJvbE1vZGlmaWVyKSB8fCBrZXlF dmVudC0+a2V5KCkgPT0gUXQ6OktleV9GNSkgeworICAgICAgICAgICAgYnJvd3NlcldpbmRvdy0+ cmVsb2FkKCk7CisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgfQorICAgICAgICBp ZiAoKGtleUV2ZW50LT5rZXkoKSA9PSBRdDo6S2V5X0wgJiYga2V5RXZlbnQtPm1vZGlmaWVycygp ID09IFF0OjpDb250cm9sTW9kaWZpZXIpIHx8IGtleUV2ZW50LT5rZXkoKSA9PSBRdDo6S2V5X0Y2 KSB7CisgICAgICAgICAgICBicm93c2VyV2luZG93LT5mb2N1c0FkZHJlc3NCYXIoKTsKKyAgICAg ICAgICAgIHJldHVybiB0cnVlOworICAgICAgICB9CisgICAgfQorCiAgICAgaWYgKGV2ZW50LT50 eXBlKCkgPT0gUUV2ZW50OjpLZXlSZWxlYXNlICYmIHN0YXRpY19jYXN0PFFLZXlFdmVudCo+KGV2 ZW50KS0+a2V5KCkgPT0gUXQ6OktleV9Db250cm9sKSB7CiAgICAgICAgIGZvcmVhY2ggKGludCBp ZCwgbV9oZWxkVG91Y2hQb2ludHMpCiAgICAgICAgICAgICBpZiAobV90b3VjaFBvaW50cy5jb250 YWlucyhpZCkpCmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci9xdC9xbWwvQnJvd3Nlcldp bmRvdy5xbWwgYi9Ub29scy9NaW5pQnJvd3Nlci9xdC9xbWwvQnJvd3NlcldpbmRvdy5xbWwKaW5k ZXggMGQ3M2RjZS4uNDI4NWYxYiAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvcXQvcW1s L0Jyb3dzZXJXaW5kb3cucW1sCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL3F0L3FtbC9Ccm93c2Vy V2luZG93LnFtbApAQCAtNDEsNiArNDEsMTAgQEAgUmVjdGFuZ2xlIHsKICAgICAgICAgd2ViVmll dy5sb2FkKGFkZHJlc3MpCiAgICAgfQogCisgICAgZnVuY3Rpb24gcmVsb2FkKCkgeworICAgICAg ICB3ZWJWaWV3LnJlbG9hZCgpCisgICAgfQorCiAgICAgZnVuY3Rpb24gZm9jdXNBZGRyZXNzQmFy KCkgewogICAgICAgICBhZGRyZXNzTGluZS5mb3JjZUFjdGl2ZUZvY3VzKCkKICAgICAgICAgYWRk cmVzc0xpbmUuc2VsZWN0QWxsKCkKQEAgLTE1MSwxMSArMTU1LDkgQEAgUmVjdGFuZ2xlIHsKICAg ICAgICAgICAgICAgICAgICAgb25SZWxlYXNlZDogeyBwYXJlbnQuY29sb3IgPSAiI2VmZWZlZiIg fQogICAgICAgICAgICAgICAgICAgICBvbkNsaWNrZWQ6IHsKICAgICAgICAgICAgICAgICAgICAg ICAgIGlmICh3ZWJWaWV3LmxvYWRpbmcpIHsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBj b25zb2xlLmxvZygic3RvcCBsb2FkaW5nIikKICAgICAgICAgICAgICAgICAgICAgICAgICAgICB3 ZWJWaWV3LnN0b3AoKQogICAgICAgICAgICAgICAgICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICBjb25zb2xlLmxvZygicmVsb2FkaW5nIikKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICB3ZWJWaWV3LnJlbG9hZCgpCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgcmVsb2FkKCkKICAgICAgICAgICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAg ICAgICAgfQogICAgICAgICAgICAgICAgIH0KQEAgLTIzNCwxMyArMjM2LDYgQEAgUmVjdGFuZ2xl IHsKICAgICAgICAgICAgICAgICAgICAgY29uc29sZS5sb2coImdvaW5nIHRvOiAiLCBhZGRyZXNz TGluZS50ZXh0KQogICAgICAgICAgICAgICAgICAgICB3ZWJWaWV3LmxvYWQodXRpbHMudXJsRnJv bVVzZXJJbnB1dChhZGRyZXNzTGluZS50ZXh0KSkKICAgICAgICAgICAgICAgICB9Ci0KLSAgICAg ICAgICAgICAgICBLZXlzLm9uUHJlc3NlZDogewotICAgICAgICAgICAgICAgICAgICBpZiAoKChl dmVudC5tb2RpZmllcnMgJiBRdC5Db250cm9sTW9kaWZpZXIpICYmIGV2ZW50LmtleSA9PSBRdC5L ZXlfTCkgfHwgZXZlbnQua2V5ID09IFF0LmtleV9GNikgewotICAgICAgICAgICAgICAgICAgICAg ICAgZm9jdXNBZGRyZXNzQmFyKCkKLSAgICAgICAgICAgICAgICAgICAgICAgIGV2ZW50LmFjY2Vw dGVkID0gdHJ1ZQotICAgICAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgfQogICAg ICAgICAgICAgfQogICAgICAgICB9CiAgICAgfQpAQCAtMjc5LDExICsyNzQsNCBAQCBSZWN0YW5n bGUgewogICAgICAgICB2aXNpYmxlOiBmYWxzZQogICAgICAgICB2aWV3cG9ydEluZm8gOiB3ZWJW aWV3LmV4cGVyaW1lbnRhbC52aWV3cG9ydEluZm8KICAgICB9Ci0KLSAgICBLZXlzLm9uUHJlc3Nl ZDogewotICAgICAgICBpZiAoKChldmVudC5tb2RpZmllcnMgJiBRdC5Db250cm9sTW9kaWZpZXIp ICYmIGV2ZW50LmtleSA9PSBRdC5LZXlfTCkgfHwgZXZlbnQua2V5ID09IFF0LmtleV9GNikgewot ICAgICAgICAgICAgZm9jdXNBZGRyZXNzQmFyKCkKLSAgICAgICAgICAgIGV2ZW50LmFjY2VwdGVk ID0gdHJ1ZQotICAgICAgICB9Ci0gICAgfQogfQo=