111430 2013-03-05 05:56:17 -0800 [Qt][MiniBrowser] Touch mocking broken for chained getures 2013-03-06 06:10:31 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 111429 1 abecsi abecsi jturcotte oldest_to_newest 847598 0 abecsi 2013-03-05 05:56:17 -0800 [Qt][MiniBrowser] Touch mocking broken for chained getures 847599 1 191479 abecsi 2013-03-05 05:57:24 -0800 Created attachment 191479 Patch 847650 2 191479 jturcotte 2013-03-05 07:05:16 -0800 Comment on attachment 191479 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=191479&action=review > Tools/MiniBrowser/qt/MiniBrowserApplication.cpp:134 > + QSet<int> currentlyHeldTouchPoints; Could you do it the other way? - if (m_touchPoints.contains(id) && !m_pressedMouseButtons.testFlag(Qt::MouseButton(id))) { ...; m_heldTouchPoints.remove(id); } - Remove the call to m_heldTouchPoints.clear(); > Tools/MiniBrowser/qt/MiniBrowserApplication.cpp:137 > + if (m_touchPoints.contains(id) && !m_pressedMouseButtons.testFlag(Qt::MouseButton(id))) Did you try with QGuiApplication::mouseButtons()? I know at some point it wasn't working well, but if it does it would be cleaner. 847652 3 jturcotte 2013-03-05 07:06:02 -0800 (In reply to comment #2) > Did you try with QGuiApplication::mouseButtons()? > I know at some point it wasn't working well, but if it does it would be cleaner. At least on Mac I recall it not working well pre 5.0.0 847663 4 191495 abecsi 2013-03-05 07:25:10 -0800 Created attachment 191495 Patch 847673 5 abecsi 2013-03-05 07:36:57 -0800 (In reply to comment #3) > (In reply to comment #2) > > Did you try with QGuiApplication::mouseButtons()? > > I know at some point it wasn't working well, but if it does it would be cleaner. > > At least on Mac I recall it not working well pre 5.0.0 It works on Linux, I didn't test it on Mac, but from looking at the code in qguiapplication it should work on Mac too. 847675 6 191496 abecsi 2013-03-05 07:45:28 -0800 Created attachment 191496 Patch 847676 7 abecsi 2013-03-05 07:47:19 -0800 (In reply to comment #6) > Created an attachment (id=191496) [details] > Patch Also updated to use QGuiApplication::keyboardModifiers() for m_holdingControl, since it works now in Qt5. 847691 8 191496 jturcotte 2013-03-05 08:05:45 -0800 Comment on attachment 191496 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=191496&action=review r=me > Tools/MiniBrowser/qt/MiniBrowserApplication.cpp:113 > + m_holdingControl = QGuiApplication::keyboardModifiers().testFlag(Qt::ControlModifier); Nit: could be worth mentioning in the ChangeLog 848788 9 abecsi 2013-03-06 06:08:48 -0800 Committed r144915: <http://trac.webkit.org/changeset/144915> 191479 2013-03-05 05:57:24 -0800 2013-03-05 07:25:05 -0800 Patch bug-111430-20130305145105.patch text/plain 3895 abecsi U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ0NzQ2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYmU4NWZhYzZiNjY1ODAyMDA1OTFiMzc1YjUyN2JmZTJh M2QyNzViZi4uMTMxMGIxMWRhNTBiOTc3ODExNDA0NGUzNWY1NmI2MTJjZGZiYmMzZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIz IEBACisyMDEzLTAzLTA1ICBBbmRyYXMgQmVjc2kgIDxhbmRyYXMuYmVjc2lAZGlnaWEuY29tPgor CisgICAgICAgIFtRdF1bTWluaUJyb3dzZXJdIFRvdWNoIG1vY2tpbmcgYnJva2VuIGZvciBjaGFp bmVkIGdldHVyZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTExMTQzMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIE1ha2UgaXQgcG9zc2libGUgYWdhaW4gdG8gdXNlIHRvdWNoIG1vY2tpbmcgdG8gdGVzdCBn ZXN0dXJlIGNoYWlucworICAgICAgICBsaWtlIHBhbi0+cGluY2gtPnBhbi0+cGluY2ggd2l0aG91 dCBsaWZ0aW5nIHRoZSBwcmltYXJ5ICJmaW5nZXIiLgorICAgICAgICBGb3IgdGhpcyB0byB3b3Jr IHdlIG5lZWQgdG8gdHJhY2sgdGhlIHByZXNzZWQgbW91c2UgYnV0dG9ucyBhbmQKKyAgICAgICAg b25seSBzeW50aGVzaXplIHRvdWNoIHJlbGVhc2UgZXZlbnRzIHdoZW4gdGhlIGNvbnRyb2wga2V5 IGlzIHJlbGVhc2VkCisgICAgICAgIGlmIG5vIG1vdXNlIGJ1dHRvbiBpcyBwcmVzc2VkLiBFbHNl IHRoZSBwcmVzc2VkIG1vdXNlIGJ1dHRvbihzKSBzaG91bGQKKyAgICAgICAgcmVzdWx0IGluIGEg c3RhdGlvbmFyeSB0b3VjaCBwb2ludCBpbiBhIHRvdWNoIHVwZGF0ZSBldmVudC4KKworICAgICAg ICAqIE1pbmlCcm93c2VyL3F0L01pbmlCcm93c2VyQXBwbGljYXRpb24uY3BwOgorICAgICAgICAo TWluaUJyb3dzZXJBcHBsaWNhdGlvbjo6TWluaUJyb3dzZXJBcHBsaWNhdGlvbik6CisgICAgICAg IChNaW5pQnJvd3NlckFwcGxpY2F0aW9uOjpub3RpZnkpOgorICAgICAgICAqIE1pbmlCcm93c2Vy L3F0L01pbmlCcm93c2VyQXBwbGljYXRpb24uaDoKKyAgICAgICAgKE1pbmlCcm93c2VyQXBwbGlj YXRpb24pOgorCiAyMDEzLTAzLTA1ICBKb2NoZW4gRWlzaW5nZXIgIDxqb2NoZW5AY2hyb21pdW0u b3JnPgogCiAgICAgICAgIEFkZCBjb250ZW50IHNoZWxsIGJvdHMgdG8gZ2FyZGVuLW8tbWF0aWMg Zm9yIGdlbmVyYWwgZmFpbHVyc2UKZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL3F0L01p bmlCcm93c2VyQXBwbGljYXRpb24uY3BwIGIvVG9vbHMvTWluaUJyb3dzZXIvcXQvTWluaUJyb3dz ZXJBcHBsaWNhdGlvbi5jcHAKaW5kZXggYWNjZWZlNmI5Njc5MWQ3N2YzZWM3OGU1NDEzNjU5OTll YzZkZGQyYS4uMTU3ZDZhN2JiOTgzYTZlMjFiZjI3YThmY2MwZDk1ODFhODliYmMzZCAxMDA2NDQK LS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvcXQvTWluaUJyb3dzZXJBcHBsaWNhdGlvbi5jcHAKKysr IGIvVG9vbHMvTWluaUJyb3dzZXIvcXQvTWluaUJyb3dzZXJBcHBsaWNhdGlvbi5jcHAKQEAgLTgx LDYgKzgxLDcgQEAgTWluaUJyb3dzZXJBcHBsaWNhdGlvbjo6TWluaUJyb3dzZXJBcHBsaWNhdGlv bihpbnQmIGFyZ2MsIGNoYXIqKiBhcmd2KQogICAgICwgbV9yb2JvdFRpbWVvdXRTZWNvbmRzKDAp CiAgICAgLCBtX3JvYm90RXh0cmFUaW1lU2Vjb25kcygwKQogICAgICwgbV93aW5kb3dPcHRpb25z KHRoaXMpCisgICAgLCBtX3ByZXNzZWRNb3VzZUJ1dHRvbnMoUXQ6Ok5vQnV0dG9uKQogICAgICwg bV9ob2xkaW5nQ29udHJvbChmYWxzZSkKIHsKICAgICBzZXRPcmdhbml6YXRpb25OYW1lKCJOb2tp YSIpOwpAQCAtMTMwLDExICsxMzEsMjYgQEAgYm9vbCBNaW5pQnJvd3NlckFwcGxpY2F0aW9uOjpu b3RpZnkoUU9iamVjdCogdGFyZ2V0LCBRRXZlbnQqIGV2ZW50KQogICAgIH0KIAogICAgIGlmIChl dmVudC0+dHlwZSgpID09IFFFdmVudDo6S2V5UmVsZWFzZSAmJiBzdGF0aWNfY2FzdDxRS2V5RXZl bnQqPihldmVudCktPmtleSgpID09IFF0OjpLZXlfQ29udHJvbCkgeworICAgICAgICBRU2V0PGlu dD4gY3VycmVudGx5SGVsZFRvdWNoUG9pbnRzOworCiAgICAgICAgIGZvcmVhY2ggKGludCBpZCwg bV9oZWxkVG91Y2hQb2ludHMpCi0gICAgICAgICAgICBpZiAobV90b3VjaFBvaW50cy5jb250YWlu cyhpZCkpCisgICAgICAgICAgICBpZiAobV90b3VjaFBvaW50cy5jb250YWlucyhpZCkgJiYgIW1f cHJlc3NlZE1vdXNlQnV0dG9ucy50ZXN0RmxhZyhRdDo6TW91c2VCdXR0b24oaWQpKSkKICAgICAg ICAgICAgICAgICBtX3RvdWNoUG9pbnRzW2lkXS5zZXRTdGF0ZShRdDo6VG91Y2hQb2ludFJlbGVh c2VkKTsKKyAgICAgICAgICAgIGVsc2UgeworICAgICAgICAgICAgICAgIG1fdG91Y2hQb2ludHNb aWRdLnNldFN0YXRlKFF0OjpUb3VjaFBvaW50U3RhdGlvbmFyeSk7CisgICAgICAgICAgICAgICAg Y3VycmVudGx5SGVsZFRvdWNoUG9pbnRzLmluc2VydChpZCk7CisgICAgICAgICAgICB9CisKICAg ICAgICAgbV9oZWxkVG91Y2hQb2ludHMuY2xlYXIoKTsKLSAgICAgICAgc2VuZFRvdWNoRXZlbnQo YnJvd3NlcldpbmRvdywgUUV2ZW50OjpUb3VjaEVuZCwgc3RhdGljX2Nhc3Q8UUtleUV2ZW50Kj4o ZXZlbnQpLT50aW1lc3RhbXAoKSk7CisgICAgICAgIFFFdmVudDo6VHlwZSB0b3VjaFR5cGUgPSBR RXZlbnQ6OlRvdWNoRW5kOworCisgICAgICAgIGlmICghY3VycmVudGx5SGVsZFRvdWNoUG9pbnRz LmlzRW1wdHkoKSkgeworICAgICAgICAgICAgdG91Y2hUeXBlID0gUUV2ZW50OjpUb3VjaFVwZGF0 ZTsKKyAgICAgICAgICAgIG1faGVsZFRvdWNoUG9pbnRzID0gY3VycmVudGx5SGVsZFRvdWNoUG9p bnRzOworICAgICAgICB9CisKKyAgICAgICAgbV9ob2xkaW5nQ29udHJvbCA9IGZhbHNlOworICAg ICAgICBzZW5kVG91Y2hFdmVudChicm93c2VyV2luZG93LCB0b3VjaFR5cGUsIHN0YXRpY19jYXN0 PFFLZXlFdmVudCo+KGV2ZW50KS0+dGltZXN0YW1wKCkpOwogICAgIH0KIAogICAgIGlmIChpc01v dXNlRXZlbnQoZXZlbnQpKSB7CkBAIC0xNDUsNiArMTYxLDcgQEAgYm9vbCBNaW5pQnJvd3NlckFw cGxpY2F0aW9uOjpub3RpZnkoUU9iamVjdCogdGFyZ2V0LCBRRXZlbnQqIGV2ZW50KQogICAgICAg ICB0b3VjaFBvaW50LnNldFByZXNzdXJlKDEpOwogCiAgICAgICAgIFFFdmVudDo6VHlwZSB0b3Vj aFR5cGUgPSBRRXZlbnQ6Ok5vbmU7CisgICAgICAgIG1fcHJlc3NlZE1vdXNlQnV0dG9ucyA9IG1v dXNlRXZlbnQtPmJ1dHRvbnMoKTsKIAogICAgICAgICBzd2l0Y2ggKG1vdXNlRXZlbnQtPnR5cGUo KSkgewogICAgICAgICBjYXNlIFFFdmVudDo6TW91c2VCdXR0b25QcmVzczoKZGlmZiAtLWdpdCBh L1Rvb2xzL01pbmlCcm93c2VyL3F0L01pbmlCcm93c2VyQXBwbGljYXRpb24uaCBiL1Rvb2xzL01p bmlCcm93c2VyL3F0L01pbmlCcm93c2VyQXBwbGljYXRpb24uaAppbmRleCAzZGMzODBhZWM0ZGZl NGJlZTA0MWMxN2QzMmU0ZGNiYzBhOTBhMjcwLi5hODM3NmNiMWZjNmJjZGYwZDU4Yzg4OWExN2Vh NWYzYjlmYzVjODhhIDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci9xdC9NaW5pQnJvd3Nl ckFwcGxpY2F0aW9uLmgKKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvcXQvTWluaUJyb3dzZXJBcHBs aWNhdGlvbi5oCkBAIC0xMTcsNiArMTE3LDcgQEAgcHJpdmF0ZToKICAgICBRU2V0PGludD4gbV9o ZWxkVG91Y2hQb2ludHM7CiAKICAgICBXaW5kb3dPcHRpb25zIG1fd2luZG93T3B0aW9uczsKKyAg ICBRdDo6TW91c2VCdXR0b25zIG1fcHJlc3NlZE1vdXNlQnV0dG9uczsKICAgICBib29sIG1faG9s ZGluZ0NvbnRyb2w7CiB9OwogCg== 191495 2013-03-05 07:25:10 -0800 2013-03-05 07:45:24 -0800 Patch bug-111430-20130305161851.patch text/plain 2538 abecsi U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ0NzU4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNTUyNTU3ZjUzZThhNmNiMDI1ODk0NjcyMGRkYzNmZTFh ZTdjZWViNC4uY2E2YmY1NGQ4YzEzNTZiMzc1MGY3OTEwYjk0Y2MwMTAyYjc2OTYyNiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIz IEBACiAyMDEzLTAzLTA1ICBBbmRyYXMgQmVjc2kgIDxhbmRyYXMuYmVjc2lAZGlnaWEuY29tPgog CisgICAgICAgIFtRdF1bTWluaUJyb3dzZXJdIFRvdWNoIG1vY2tpbmcgYnJva2VuIGZvciBjaGFp bmVkIGdldHVyZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTExMTQzMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIE1ha2UgaXQgcG9zc2libGUgYWdhaW4gdG8gdXNlIHRvdWNoIG1vY2tpbmcgdG8gdGVzdCBn ZXN0dXJlIGNoYWlucworICAgICAgICBsaWtlIHBhbi0+cGluY2gtPnBhbi0+cGluY2ggd2l0aG91 dCBsaWZ0aW5nIHRoZSBwcmltYXJ5ICJmaW5nZXIiLgorICAgICAgICBGb3IgdGhpcyB0byB3b3Jr IHdlIG5lZWQgdG8gdHJhY2sgdGhlIHByZXNzZWQgbW91c2UgYnV0dG9ucyBhbmQKKyAgICAgICAg b25seSBzeW50aGVzaXplIHRvdWNoIHJlbGVhc2UgZXZlbnRzIHdoZW4gdGhlIGNvbnRyb2wga2V5 IGlzIHJlbGVhc2VkCisgICAgICAgIGlmIG5vIG1vdXNlIGJ1dHRvbiBpcyBwcmVzc2VkLiBFbHNl IHRoZSBwcmVzc2VkIG1vdXNlIGJ1dHRvbihzKSBzaG91bGQKKyAgICAgICAgcmVzdWx0IGluIGEg c3RhdGlvbmFyeSB0b3VjaCBwb2ludCBpbiBhIHRvdWNoIHVwZGF0ZSBldmVudC4KKworICAgICAg ICAqIE1pbmlCcm93c2VyL3F0L01pbmlCcm93c2VyQXBwbGljYXRpb24uY3BwOgorICAgICAgICAo TWluaUJyb3dzZXJBcHBsaWNhdGlvbjo6TWluaUJyb3dzZXJBcHBsaWNhdGlvbik6CisgICAgICAg IChNaW5pQnJvd3NlckFwcGxpY2F0aW9uOjpub3RpZnkpOgorCisyMDEzLTAzLTA1ICBBbmRyYXMg QmVjc2kgIDxhbmRyYXMuYmVjc2lAZGlnaWEuY29tPgorCiAgICAgICAgIFtRdF1bTWluaUJyb3dz ZXJdIEltcHJvdmUgdGhlIHVwZGF0ZSBvZiB0b3VjaCBpbmRpY2F0b3JzCiAgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTE0MjkKIApkaWZmIC0tZ2l0IGEv VG9vbHMvTWluaUJyb3dzZXIvcXQvTWluaUJyb3dzZXJBcHBsaWNhdGlvbi5jcHAgYi9Ub29scy9N aW5pQnJvd3Nlci9xdC9NaW5pQnJvd3NlckFwcGxpY2F0aW9uLmNwcAppbmRleCBhY2NlZmU2Yjk2 NzkxZDc3ZjNlYzc4ZTU0MTM2NTk5OWVjNmRkZDJhLi5lYmVlOWUzNWViMmU4MWM5Y2NkZTZiY2Nh NGY0NmMyZTNmZTM2NTRjIDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci9xdC9NaW5pQnJv d3NlckFwcGxpY2F0aW9uLmNwcAorKysgYi9Ub29scy9NaW5pQnJvd3Nlci9xdC9NaW5pQnJvd3Nl ckFwcGxpY2F0aW9uLmNwcApAQCAtMTMxLDEwICsxMzEsMTQgQEAgYm9vbCBNaW5pQnJvd3NlckFw cGxpY2F0aW9uOjpub3RpZnkoUU9iamVjdCogdGFyZ2V0LCBRRXZlbnQqIGV2ZW50KQogCiAgICAg aWYgKGV2ZW50LT50eXBlKCkgPT0gUUV2ZW50OjpLZXlSZWxlYXNlICYmIHN0YXRpY19jYXN0PFFL ZXlFdmVudCo+KGV2ZW50KS0+a2V5KCkgPT0gUXQ6OktleV9Db250cm9sKSB7CiAgICAgICAgIGZv cmVhY2ggKGludCBpZCwgbV9oZWxkVG91Y2hQb2ludHMpCi0gICAgICAgICAgICBpZiAobV90b3Vj aFBvaW50cy5jb250YWlucyhpZCkpCisgICAgICAgICAgICBpZiAobV90b3VjaFBvaW50cy5jb250 YWlucyhpZCkgJiYgIVFHdWlBcHBsaWNhdGlvbjo6bW91c2VCdXR0b25zKCkudGVzdEZsYWcoUXQ6 Ok1vdXNlQnV0dG9uKGlkKSkpIHsKICAgICAgICAgICAgICAgICBtX3RvdWNoUG9pbnRzW2lkXS5z ZXRTdGF0ZShRdDo6VG91Y2hQb2ludFJlbGVhc2VkKTsKLSAgICAgICAgbV9oZWxkVG91Y2hQb2lu dHMuY2xlYXIoKTsKLSAgICAgICAgc2VuZFRvdWNoRXZlbnQoYnJvd3NlcldpbmRvdywgUUV2ZW50 OjpUb3VjaEVuZCwgc3RhdGljX2Nhc3Q8UUtleUV2ZW50Kj4oZXZlbnQpLT50aW1lc3RhbXAoKSk7 CisgICAgICAgICAgICAgICAgbV9oZWxkVG91Y2hQb2ludHMucmVtb3ZlKGlkKTsKKyAgICAgICAg ICAgIH0gZWxzZQorICAgICAgICAgICAgICAgIG1fdG91Y2hQb2ludHNbaWRdLnNldFN0YXRlKFF0 OjpUb3VjaFBvaW50U3RhdGlvbmFyeSk7CisKKyAgICAgICAgbV9ob2xkaW5nQ29udHJvbCA9IGZh bHNlOworICAgICAgICBzZW5kVG91Y2hFdmVudChicm93c2VyV2luZG93LCBtX2hlbGRUb3VjaFBv aW50cy5pc0VtcHR5KCkgPyBRRXZlbnQ6OlRvdWNoRW5kIDogUUV2ZW50OjpUb3VjaFVwZGF0ZSwg c3RhdGljX2Nhc3Q8UUtleUV2ZW50Kj4oZXZlbnQpLT50aW1lc3RhbXAoKSk7CiAgICAgfQogCiAg ICAgaWYgKGlzTW91c2VFdmVudChldmVudCkpIHsK 191496 2013-03-05 07:45:28 -0800 2013-03-06 06:10:31 -0800 Patch bug-111430-20130305163910.patch text/plain 3226 abecsi U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ0NzU4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNTUyNTU3ZjUzZThhNmNiMDI1ODk0NjcyMGRkYzNmZTFh ZTdjZWViNC4uY2E2YmY1NGQ4YzEzNTZiMzc1MGY3OTEwYjk0Y2MwMTAyYjc2OTYyNiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIz IEBACiAyMDEzLTAzLTA1ICBBbmRyYXMgQmVjc2kgIDxhbmRyYXMuYmVjc2lAZGlnaWEuY29tPgog CisgICAgICAgIFtRdF1bTWluaUJyb3dzZXJdIFRvdWNoIG1vY2tpbmcgYnJva2VuIGZvciBjaGFp bmVkIGdldHVyZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTExMTQzMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIE1ha2UgaXQgcG9zc2libGUgYWdhaW4gdG8gdXNlIHRvdWNoIG1vY2tpbmcgdG8gdGVzdCBn ZXN0dXJlIGNoYWlucworICAgICAgICBsaWtlIHBhbi0+cGluY2gtPnBhbi0+cGluY2ggd2l0aG91 dCBsaWZ0aW5nIHRoZSBwcmltYXJ5ICJmaW5nZXIiLgorICAgICAgICBGb3IgdGhpcyB0byB3b3Jr IHdlIG5lZWQgdG8gdHJhY2sgdGhlIHByZXNzZWQgbW91c2UgYnV0dG9ucyBhbmQKKyAgICAgICAg b25seSBzeW50aGVzaXplIHRvdWNoIHJlbGVhc2UgZXZlbnRzIHdoZW4gdGhlIGNvbnRyb2wga2V5 IGlzIHJlbGVhc2VkCisgICAgICAgIGlmIG5vIG1vdXNlIGJ1dHRvbiBpcyBwcmVzc2VkLiBFbHNl IHRoZSBwcmVzc2VkIG1vdXNlIGJ1dHRvbihzKSBzaG91bGQKKyAgICAgICAgcmVzdWx0IGluIGEg c3RhdGlvbmFyeSB0b3VjaCBwb2ludCBpbiBhIHRvdWNoIHVwZGF0ZSBldmVudC4KKworICAgICAg ICAqIE1pbmlCcm93c2VyL3F0L01pbmlCcm93c2VyQXBwbGljYXRpb24uY3BwOgorICAgICAgICAo TWluaUJyb3dzZXJBcHBsaWNhdGlvbjo6TWluaUJyb3dzZXJBcHBsaWNhdGlvbik6CisgICAgICAg IChNaW5pQnJvd3NlckFwcGxpY2F0aW9uOjpub3RpZnkpOgorCisyMDEzLTAzLTA1ICBBbmRyYXMg QmVjc2kgIDxhbmRyYXMuYmVjc2lAZGlnaWEuY29tPgorCiAgICAgICAgIFtRdF1bTWluaUJyb3dz ZXJdIEltcHJvdmUgdGhlIHVwZGF0ZSBvZiB0b3VjaCBpbmRpY2F0b3JzCiAgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTE0MjkKIApkaWZmIC0tZ2l0IGEv VG9vbHMvTWluaUJyb3dzZXIvcXQvTWluaUJyb3dzZXJBcHBsaWNhdGlvbi5jcHAgYi9Ub29scy9N aW5pQnJvd3Nlci9xdC9NaW5pQnJvd3NlckFwcGxpY2F0aW9uLmNwcAppbmRleCBhY2NlZmU2Yjk2 NzkxZDc3ZjNlYzc4ZTU0MTM2NTk5OWVjNmRkZDJhLi42ZDVjNmE2MzAyYzc3ZmEzZGY0MDBiOTc1 YTNkNmMyNmEzZWNhMGU2IDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci9xdC9NaW5pQnJv d3NlckFwcGxpY2F0aW9uLmNwcAorKysgYi9Ub29scy9NaW5pQnJvd3Nlci9xdC9NaW5pQnJvd3Nl ckFwcGxpY2F0aW9uLmNwcApAQCAtMTEwLDYgKzExMCw4IEBAIGJvb2wgTWluaUJyb3dzZXJBcHBs aWNhdGlvbjo6bm90aWZ5KFFPYmplY3QqIHRhcmdldCwgUUV2ZW50KiBldmVudCkKICAgICBpZiAo IWJyb3dzZXJXaW5kb3cpCiAgICAgICAgIHJldHVybiBRR3VpQXBwbGljYXRpb246Om5vdGlmeSh0 YXJnZXQsIGV2ZW50KTsKIAorICAgIG1faG9sZGluZ0NvbnRyb2wgPSBRR3VpQXBwbGljYXRpb246 OmtleWJvYXJkTW9kaWZpZXJzKCkudGVzdEZsYWcoUXQ6OkNvbnRyb2xNb2RpZmllcik7CisKICAg ICAvLyBJbiBRTUwgZXZlbnRzIGFyZSBwcm9wYWdhdGVkIHRocm91Z2ggcGFyZW50cy4gQnV0IHNp bmNlIHRoZSBXZWJWaWV3CiAgICAgLy8gbWF5IGNvbnN1bWUga2V5IGV2ZW50cywgYSBzaG9ydGN1 dCBtaWdodCBuZXZlciByZWFjaCB0aGUgdG9wIFFRdWlja0l0ZW0uCiAgICAgLy8gVGhlcmVmb3Jl IHdlIGFyZSBjaGVja2luZyBoZXJlIGZvciBzaG9ydGN1dHMuCkBAIC0xMzEsMTUgKzEzMywxNyBA QCBib29sIE1pbmlCcm93c2VyQXBwbGljYXRpb246Om5vdGlmeShRT2JqZWN0KiB0YXJnZXQsIFFF dmVudCogZXZlbnQpCiAKICAgICBpZiAoZXZlbnQtPnR5cGUoKSA9PSBRRXZlbnQ6OktleVJlbGVh c2UgJiYgc3RhdGljX2Nhc3Q8UUtleUV2ZW50Kj4oZXZlbnQpLT5rZXkoKSA9PSBRdDo6S2V5X0Nv bnRyb2wpIHsKICAgICAgICAgZm9yZWFjaCAoaW50IGlkLCBtX2hlbGRUb3VjaFBvaW50cykKLSAg ICAgICAgICAgIGlmIChtX3RvdWNoUG9pbnRzLmNvbnRhaW5zKGlkKSkKKyAgICAgICAgICAgIGlm IChtX3RvdWNoUG9pbnRzLmNvbnRhaW5zKGlkKSAmJiAhUUd1aUFwcGxpY2F0aW9uOjptb3VzZUJ1 dHRvbnMoKS50ZXN0RmxhZyhRdDo6TW91c2VCdXR0b24oaWQpKSkgewogICAgICAgICAgICAgICAg IG1fdG91Y2hQb2ludHNbaWRdLnNldFN0YXRlKFF0OjpUb3VjaFBvaW50UmVsZWFzZWQpOwotICAg ICAgICBtX2hlbGRUb3VjaFBvaW50cy5jbGVhcigpOwotICAgICAgICBzZW5kVG91Y2hFdmVudChi cm93c2VyV2luZG93LCBRRXZlbnQ6OlRvdWNoRW5kLCBzdGF0aWNfY2FzdDxRS2V5RXZlbnQqPihl dmVudCktPnRpbWVzdGFtcCgpKTsKKyAgICAgICAgICAgICAgICBtX2hlbGRUb3VjaFBvaW50cy5y ZW1vdmUoaWQpOworICAgICAgICAgICAgfSBlbHNlCisgICAgICAgICAgICAgICAgbV90b3VjaFBv aW50c1tpZF0uc2V0U3RhdGUoUXQ6OlRvdWNoUG9pbnRTdGF0aW9uYXJ5KTsKKworICAgICAgICBz ZW5kVG91Y2hFdmVudChicm93c2VyV2luZG93LCBtX2hlbGRUb3VjaFBvaW50cy5pc0VtcHR5KCkg PyBRRXZlbnQ6OlRvdWNoRW5kIDogUUV2ZW50OjpUb3VjaFVwZGF0ZSwgc3RhdGljX2Nhc3Q8UUtl eUV2ZW50Kj4oZXZlbnQpLT50aW1lc3RhbXAoKSk7CiAgICAgfQogCiAgICAgaWYgKGlzTW91c2VF dmVudChldmVudCkpIHsKICAgICAgICAgY29uc3QgUU1vdXNlRXZlbnQqIGNvbnN0IG1vdXNlRXZl bnQgPSBzdGF0aWNfY2FzdDxRTW91c2VFdmVudCo+KGV2ZW50KTsKLSAgICAgICAgbV9ob2xkaW5n Q29udHJvbCA9IG1vdXNlRXZlbnQtPm1vZGlmaWVycygpLnRlc3RGbGFnKFF0OjpDb250cm9sTW9k aWZpZXIpOwogCiAgICAgICAgIFFUb3VjaEV2ZW50OjpUb3VjaFBvaW50IHRvdWNoUG9pbnQ7CiAg ICAgICAgIHRvdWNoUG9pbnQuc2V0UHJlc3N1cmUoMSk7Cg==