69617 2011-10-07 04:25:11 -0700 [Qt][WK2] Touch mocking is broken with Qt 5 post refactor merge 2011-10-07 05:33:30 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 hausmann hausmann oldest_to_newest 479931 0 hausmann 2011-10-07 04:25:11 -0700 [Qt][WK2] Touch mocking is broken with Qt 5 post refactor merge 479932 1 110123 hausmann 2011-10-07 04:30:13 -0700 Created attachment 110123 Patch 479937 2 110123 kling 2011-10-07 04:58:23 -0700 Comment on attachment 110123 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=110123&action=review r=me with some tweaks: > Tools/MiniBrowser/qt/MiniBrowserApplication.cpp:96 > + if (isMouseEvent(event) && targetWindow) { Nit: The targetWindow null check is cheaper so it should be first. > Tools/MiniBrowser/qt/MiniBrowserApplication.cpp:100 > + touchPoint.area = QRectF(mouseEvent->globalPos(), QSizeF(1., 1.)); Style: Unless required in order to force floating point math, do not append .0, .f and .0f to floating point literals. > Tools/MiniBrowser/qt/MiniBrowserApplication.cpp:132 > + for (QHash<int, QWindowSystemInterface::TouchPoint>::iterator it = m_touchPoints.begin(); it != m_touchPoints.end(); ++it) { Nit: I like it when we cache the end iterator. :) > Tools/MiniBrowser/qt/MiniBrowserApplication.cpp:142 > + QEvent::Type eventType; > + switch (touchPoint.state) { Something goes wrong with indentation here. > Tools/MiniBrowser/qt/MiniBrowserApplication.cpp:150 > + // don't send the event if nothing changed Style: comments should be in sentence form. 479949 3 hausmann 2011-10-07 05:33:30 -0700 Committed r96931: <http://trac.webkit.org/changeset/96931> 110123 2011-10-07 04:30:13 -0700 2011-10-07 04:58:23 -0700 Patch bug-69617-20111007133011.patch text/plain 8720 hausmann U3VidmVyc2lvbiBSZXZpc2lvbjogOTY5MTQKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCBjODY5MTg4MGJiN2Q0NDU1MWQ5NzlkNGQ0NzMzZjljZTE5 MjJjNWNhLi4yM2RmNGE3MzU3ZjcxZmJmYmVkZDEwODRlMTBjOWY1YTFhODc2YWIxIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTEtMTAtMDcgIFNpbW9uIEhhdXNtYW5uICA8c2ltb24uaGF1c21hbm5Abm9raWEuY29t PgorCisgICAgICAgIFtRdF1bV0syXSBUb3VjaCBtb2NraW5nIGlzIGJyb2tlbiB3aXRoIFF0IDUg cG9zdCByZWZhY3RvciBtZXJnZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9Njk2MTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBJbmplY3RpbmcgZmFrZSB0b3VjaCBldmVudHMgdXNpbmcgcXRfdHJhbnNsYXRl UmF3VG91Y2hFdmVudCBkb2VzIG5vdCB3b3JrIGFueW1vcmUsIGFzIGl0IHNlbmRzCisgICAgICAg IHRoZSB0b3VjaCBldmVudHMgdG8gd2lkZ2V0cyBvbmx5LiBUaGUgUU1MIHZpZXcgaG93ZXZlciBp cyBhIFFXaW5kb3cuIFRoZXJlZm9yZSB0aGUgZmFrZSB0b3VjaAorICAgICAgICBldmVudHMgaGF2 ZSB0byBiZSBkaXNwYXRjaGVkIHRocm91Z2ggUVdpbmRvd1N5c3RlbUludGVyZmFjZTo6aGFuZGxl VG91Y2hFdmVudC4gQXMgYSByZXN1bHQgdGhlCisgICAgICAgIGV2ZW50cyBhcHBlYXIgdG8gYmUg c3BvbnRhZW5vdXMsIHdoaWNoIHJlcXVpcmVkIGFkanVzdGluZyB0aGUgYXJlLXdlLW9uLWEtcmVh bC10b3VjaC1kZXZpY2UKKyAgICAgICAgbG9naWMuCisKKyAgICAgICAgKiBNaW5pQnJvd3Nlci9x dC9NaW5pQnJvd3NlckFwcGxpY2F0aW9uLmNwcDoKKyAgICAgICAgKE1pbmlCcm93c2VyQXBwbGlj YXRpb246Ok1pbmlCcm93c2VyQXBwbGljYXRpb24pOgorICAgICAgICAoTWluaUJyb3dzZXJBcHBs aWNhdGlvbjo6bm90aWZ5KToKKyAgICAgICAgKiBNaW5pQnJvd3Nlci9xdC9NaW5pQnJvd3NlckFw cGxpY2F0aW9uLmg6CisKIDIwMTEtMTAtMDYgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9y Zz4KIAogICAgICAgICBQb3J0IFBpeGVsWm9vbWVyIHRvIHdvcmsgaW4gZ2FyZGVuLW8tbWF0aWMK ZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL3F0L01pbmlCcm93c2VyQXBwbGljYXRpb24u Y3BwIGIvVG9vbHMvTWluaUJyb3dzZXIvcXQvTWluaUJyb3dzZXJBcHBsaWNhdGlvbi5jcHAKaW5k ZXggMDZjNzYzZjc4N2MwOTVjZGJhNDg4MWZmOWU0MDI1YTMzZWUyNjU5YS4uY2Q3MjFjMjQ0YTc0 MTI1MGNjZDlkMzY3YTNiY2ZiMjZiZGMzYTI0OCAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dz ZXIvcXQvTWluaUJyb3dzZXJBcHBsaWNhdGlvbi5jcHAKKysrIGIvVG9vbHMvTWluaUJyb3dzZXIv cXQvTWluaUJyb3dzZXJBcHBsaWNhdGlvbi5jcHAKQEAgLTMzLDggKzMzLDcgQEAKICNpbmNsdWRl IDxRRXZlbnQ+CiAjaW5jbHVkZSA8UU1vdXNlRXZlbnQ+CiAjaW5jbHVkZSA8UVRvdWNoRXZlbnQ+ Ci0KLWV4dGVybiBRX0dVSV9FWFBPUlQgdm9pZCBxdF90cmFuc2xhdGVSYXdUb3VjaEV2ZW50KFFX aWRnZXQqLCBRVG91Y2hFdmVudDo6RGV2aWNlVHlwZSwgY29uc3QgUUxpc3Q8UVRvdWNoRXZlbnQ6 OlRvdWNoUG9pbnQ+Jik7CisjaW5jbHVkZSA8UUd1aUFwcGxpY2F0aW9uPgogCiBzdGF0aWMgaW5s aW5lIGJvb2wgaXNUb3VjaEV2ZW50KGNvbnN0IFFFdmVudCogZXZlbnQpCiB7CkBAIC02NCw4ICs2 Myw4IEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBpc01vdXNlRXZlbnQoY29uc3QgUUV2ZW50KiBldmVu dCkKIE1pbmlCcm93c2VyQXBwbGljYXRpb246Ok1pbmlCcm93c2VyQXBwbGljYXRpb24oaW50JiBh cmdjLCBjaGFyKiogYXJndikKICAgICA6IFFBcHBsaWNhdGlvbihhcmdjLCBhcmd2LCBRQXBwbGlj YXRpb246Okd1aVNlcnZlcikKICAgICAsIG1fd2luZG93T3B0aW9ucygpCi0gICAgLCBtX3Nwb250 YW5lb3VzVG91Y2hFdmVudFJlY2VpdmVkKGZhbHNlKQotICAgICwgbV9zZW5kaW5nRmFrZVRvdWNo RXZlbnQoZmFsc2UpCisgICAgLCBtX3JlYWxUb3VjaEV2ZW50UmVjZWl2ZWQoZmFsc2UpCisgICAg LCBtX3BlbmRpbmdGYWtlVG91Y2hFdmVudENvdW50KDApCiAgICAgLCBtX2lzUm9ib3RpemVkKGZh bHNlKQogICAgICwgbV9yb2JvdFRpbWVvdXRTZWNvbmRzKDApCiAgICAgLCBtX3JvYm90RXh0cmFU aW1lU2Vjb25kcygwKQpAQCAtODIsNjUgKzgxLDg4IEBAIGJvb2wgTWluaUJyb3dzZXJBcHBsaWNh dGlvbjo6bm90aWZ5KFFPYmplY3QqIHRhcmdldCwgUUV2ZW50KiBldmVudCkKICAgICAvLyBXZSB0 cnkgdG8gYmUgc21hcnQsIGlmIHdlIHJlY2VpdmVkIHJlYWwgdG91Y2ggZXZlbnQsIHdlIGFyZSBw cm9iYWJseSBvbiBhIGRldmljZQogICAgIC8vIHdpdGggdG91Y2ggc2NyZWVuLCBhbmQgd2Ugc2hv dWxkIG5vdCBoYXZlIHRvdWNoIG1vY2tpbmcuCiAKLSAgICBpZiAoIWV2ZW50LT5zcG9udGFuZW91 cygpIHx8IG1fc2VuZGluZ0Zha2VUb3VjaEV2ZW50IHx8IG1fc3BvbnRhbmVvdXNUb3VjaEV2ZW50 UmVjZWl2ZWQpCisgICAgaWYgKCFldmVudC0+c3BvbnRhbmVvdXMoKSB8fCBtX3JlYWxUb3VjaEV2 ZW50UmVjZWl2ZWQpCiAgICAgICAgIHJldHVybiBRQXBwbGljYXRpb246Om5vdGlmeSh0YXJnZXQs IGV2ZW50KTsKKwogICAgIGlmIChpc1RvdWNoRXZlbnQoZXZlbnQpICYmIHN0YXRpY19jYXN0PFFU b3VjaEV2ZW50Kj4oZXZlbnQpLT5kZXZpY2VUeXBlKCkgPT0gUVRvdWNoRXZlbnQ6OlRvdWNoU2Ny ZWVuKSB7Ci0gICAgICAgIG1fc3BvbnRhbmVvdXNUb3VjaEV2ZW50UmVjZWl2ZWQgPSB0cnVlOwor ICAgICAgICBpZiAobV9wZW5kaW5nRmFrZVRvdWNoRXZlbnRDb3VudCkKKyAgICAgICAgICAgIC0t bV9wZW5kaW5nRmFrZVRvdWNoRXZlbnRDb3VudDsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAg bV9yZWFsVG91Y2hFdmVudFJlY2VpdmVkID0gdHJ1ZTsKICAgICAgICAgcmV0dXJuIFFBcHBsaWNh dGlvbjo6bm90aWZ5KHRhcmdldCwgZXZlbnQpOwogICAgIH0KLSAgICBpZiAoaXNNb3VzZUV2ZW50 KGV2ZW50KSkgeworCisgICAgUVdpbmRvdyogdGFyZ2V0V2luZG93ID0gcW9iamVjdF9jYXN0PFFX aW5kb3cqPih0YXJnZXQpOworICAgIGlmIChpc01vdXNlRXZlbnQoZXZlbnQpICYmIHRhcmdldFdp bmRvdykgewogICAgICAgICBjb25zdCBRTW91c2VFdmVudCogY29uc3QgbW91c2VFdmVudCA9IHN0 YXRpY19jYXN0PFFNb3VzZUV2ZW50Kj4oZXZlbnQpOwogCi0gICAgICAgIFFUb3VjaEV2ZW50OjpU b3VjaFBvaW50IHRvdWNoUG9pbnQ7Ci0gICAgICAgIHRvdWNoUG9pbnQuc2V0U2NyZWVuUG9zKG1v dXNlRXZlbnQtPmdsb2JhbFBvcygpKTsKLSAgICAgICAgdG91Y2hQb2ludC5zZXRQb3MobW91c2VF dmVudC0+cG9zKCkpOworICAgICAgICBRV2luZG93U3lzdGVtSW50ZXJmYWNlOjpUb3VjaFBvaW50 IHRvdWNoUG9pbnQ7CisgICAgICAgIHRvdWNoUG9pbnQuYXJlYSA9IFFSZWN0Rihtb3VzZUV2ZW50 LT5nbG9iYWxQb3MoKSwgUVNpemVGKDEuLCAxLikpOworICAgICAgICB0b3VjaFBvaW50LnByZXNz dXJlID0gMS47CiAKICAgICAgICAgc3dpdGNoIChtb3VzZUV2ZW50LT50eXBlKCkpIHsKICAgICAg ICAgY2FzZSBRRXZlbnQ6Ok1vdXNlQnV0dG9uUHJlc3M6CiAgICAgICAgIGNhc2UgUUV2ZW50OjpN b3VzZUJ1dHRvbkRibENsaWNrOgotICAgICAgICAgICAgdG91Y2hQb2ludC5zZXRJZChtb3VzZUV2 ZW50LT5idXR0b24oKSk7Ci0gICAgICAgICAgICBpZiAobV90b3VjaFBvaW50cy5jb250YWlucyh0 b3VjaFBvaW50LmlkKCkpKQotICAgICAgICAgICAgICAgIHRvdWNoUG9pbnQuc2V0U3RhdGUoUXQ6 OlRvdWNoUG9pbnRNb3ZlZCk7CisgICAgICAgICAgICB0b3VjaFBvaW50LmlkID0gbW91c2VFdmVu dC0+YnV0dG9uKCk7CisgICAgICAgICAgICBpZiAobV90b3VjaFBvaW50cy5jb250YWlucyh0b3Vj aFBvaW50LmlkKSkKKyAgICAgICAgICAgICAgICB0b3VjaFBvaW50LnN0YXRlID0gUXQ6OlRvdWNo UG9pbnRNb3ZlZDsKICAgICAgICAgICAgIGVsc2UKLSAgICAgICAgICAgICAgICB0b3VjaFBvaW50 LnNldFN0YXRlKFF0OjpUb3VjaFBvaW50UHJlc3NlZCk7CisgICAgICAgICAgICAgICAgdG91Y2hQ b2ludC5zdGF0ZSA9IFF0OjpUb3VjaFBvaW50UHJlc3NlZDsKICAgICAgICAgICAgIGJyZWFrOwog ICAgICAgICBjYXNlIFFFdmVudDo6TW91c2VNb3ZlOgogICAgICAgICAgICAgaWYgKCFtb3VzZUV2 ZW50LT5idXR0b25zKCkgfHwgIW1fdG91Y2hQb2ludHMuY29udGFpbnMobW91c2VFdmVudC0+YnV0 dG9ucygpKSkKICAgICAgICAgICAgICAgICByZXR1cm4gUUFwcGxpY2F0aW9uOjpub3RpZnkodGFy Z2V0LCBldmVudCk7Ci0gICAgICAgICAgICB0b3VjaFBvaW50LnNldFN0YXRlKFF0OjpUb3VjaFBv aW50TW92ZWQpOwotICAgICAgICAgICAgdG91Y2hQb2ludC5zZXRJZChtb3VzZUV2ZW50LT5idXR0 b25zKCkpOworICAgICAgICAgICAgdG91Y2hQb2ludC5zdGF0ZSA9IFF0OjpUb3VjaFBvaW50TW92 ZWQ7CisgICAgICAgICAgICB0b3VjaFBvaW50LmlkID0gbW91c2VFdmVudC0+YnV0dG9ucygpOwog ICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgUUV2ZW50OjpNb3VzZUJ1dHRvblJlbGVh c2U6CiAgICAgICAgICAgICBpZiAobW91c2VFdmVudC0+bW9kaWZpZXJzKCkudGVzdEZsYWcoUXQ6 OkNvbnRyb2xNb2RpZmllcikpCiAgICAgICAgICAgICAgICAgcmV0dXJuIFFBcHBsaWNhdGlvbjo6 bm90aWZ5KHRhcmdldCwgZXZlbnQpOwotICAgICAgICAgICAgdG91Y2hQb2ludC5zZXRTdGF0ZShR dDo6VG91Y2hQb2ludFJlbGVhc2VkKTsKLSAgICAgICAgICAgIHRvdWNoUG9pbnQuc2V0SWQobW91 c2VFdmVudC0+YnV0dG9uKCkpOworICAgICAgICAgICAgdG91Y2hQb2ludC5zdGF0ZSA9IFF0OjpU b3VjaFBvaW50UmVsZWFzZWQ7CisgICAgICAgICAgICB0b3VjaFBvaW50LmlkID0gbW91c2VFdmVu dC0+YnV0dG9uKCk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgZGVmYXVsdDoKICAgICAg ICAgICAgIFFfQVNTRVJUX1goZmFsc2UsICJtdWx0aS10b3VjaCBtb2NraW5nIiwgInVuaGFuZGxl ZCBldmVudCB0eXBlIik7CiAgICAgICAgIH0KIAogICAgICAgICAvLyBVcGRhdGUgY3VycmVudCB0 b3VjaC1wb2ludAotICAgICAgICBtX3RvdWNoUG9pbnRzLmluc2VydCh0b3VjaFBvaW50LmlkKCks IHRvdWNoUG9pbnQpOworICAgICAgICBtX3RvdWNoUG9pbnRzLmluc2VydCh0b3VjaFBvaW50Lmlk LCB0b3VjaFBvaW50KTsKIAogICAgICAgICAvLyBVcGRhdGUgc3RhdGVzIGZvciBhbGwgb3RoZXIg dG91Y2gtcG9pbnRzCi0gICAgICAgIGZvciAoUUhhc2g8aW50LCBRVG91Y2hFdmVudDo6VG91Y2hQ b2ludD46Oml0ZXJhdG9yIGl0ID0gbV90b3VjaFBvaW50cy5iZWdpbigpOyBpdCAhPSBtX3RvdWNo UG9pbnRzLmVuZCgpOyArK2l0KSB7Ci0gICAgICAgICAgICBpZiAoaXQudmFsdWUoKS5pZCgpICE9 IHRvdWNoUG9pbnQuaWQoKSkKLSAgICAgICAgICAgICAgICBpdC52YWx1ZSgpLnNldFN0YXRlKFF0 OjpUb3VjaFBvaW50U3RhdGlvbmFyeSk7CisgICAgICAgIGZvciAoUUhhc2g8aW50LCBRV2luZG93 U3lzdGVtSW50ZXJmYWNlOjpUb3VjaFBvaW50Pjo6aXRlcmF0b3IgaXQgPSBtX3RvdWNoUG9pbnRz LmJlZ2luKCk7IGl0ICE9IG1fdG91Y2hQb2ludHMuZW5kKCk7ICsraXQpIHsKKyAgICAgICAgICAg IGlmIChpdC52YWx1ZSgpLmlkICE9IHRvdWNoUG9pbnQuaWQpCisgICAgICAgICAgICAgICAgaXQu dmFsdWUoKS5zdGF0ZSA9IFF0OjpUb3VjaFBvaW50U3RhdGlvbmFyeTsKICAgICAgICAgfQogCi0g ICAgICAgIFFMaXN0PFFUb3VjaEV2ZW50OjpUb3VjaFBvaW50PiB0b3VjaFBvaW50cyA9IG1fdG91 Y2hQb2ludHMudmFsdWVzKCk7Ci0gICAgICAgIFFUb3VjaEV2ZW50OjpUb3VjaFBvaW50JiBmaXJz dFBvaW50ID0gdG91Y2hQb2ludHMuZmlyc3QoKTsKLSAgICAgICAgZmlyc3RQb2ludC5zZXRTdGF0 ZShmaXJzdFBvaW50LnN0YXRlKCkgfCBRdDo6VG91Y2hQb2ludFByaW1hcnkpOwotICAgICAgICBt X3NlbmRpbmdGYWtlVG91Y2hFdmVudCA9IHRydWU7Ci0gICAgICAgIHF0X3RyYW5zbGF0ZVJhd1Rv dWNoRXZlbnQoMCwgUVRvdWNoRXZlbnQ6OlRvdWNoU2NyZWVuLCB0b3VjaFBvaW50cyk7Ci0gICAg ICAgIG1fc2VuZGluZ0Zha2VUb3VjaEV2ZW50ID0gZmFsc2U7CisgICAgICAgIFFMaXN0PFFXaW5k b3dTeXN0ZW1JbnRlcmZhY2U6OlRvdWNoUG9pbnQ+IHRvdWNoUG9pbnRzID0gbV90b3VjaFBvaW50 cy52YWx1ZXMoKTsKKyAgICAgICAgUVdpbmRvd1N5c3RlbUludGVyZmFjZTo6VG91Y2hQb2ludCYg Zmlyc3RQb2ludCA9IHRvdWNoUG9pbnRzLmZpcnN0KCk7CisgICAgICAgIGZpcnN0UG9pbnQuaXNQ cmltYXJ5ID0gdHJ1ZTsKKworICAgICAgICBRRXZlbnQ6OlR5cGUgZXZlbnRUeXBlOworICAgICAg ICAgc3dpdGNoICh0b3VjaFBvaW50LnN0YXRlKSB7CisgICAgICAgICBjYXNlIFF0OjpUb3VjaFBv aW50UHJlc3NlZDoKKyAgICAgICAgICAgICBldmVudFR5cGUgPSBRRXZlbnQ6OlRvdWNoQmVnaW47 CisgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICBjYXNlIFF0OjpUb3VjaFBvaW50UmVsZWFz ZWQ6CisgICAgICAgICAgICAgZXZlbnRUeXBlID0gUUV2ZW50OjpUb3VjaEVuZDsKKyAgICAgICAg ICAgICBicmVhazsKKyAgICAgICAgIGNhc2UgUXQ6OlRvdWNoUG9pbnRTdGF0aW9uYXJ5OgorICAg ICAgICAgICAgIC8vIGRvbid0IHNlbmQgdGhlIGV2ZW50IGlmIG5vdGhpbmcgY2hhbmdlZAorICAg ICAgICAgICAgIHJldHVybiBRQXBwbGljYXRpb246Om5vdGlmeSh0YXJnZXQsIGV2ZW50KTsKKyAg ICAgICAgIGRlZmF1bHQ6CisgICAgICAgICAgICAgZXZlbnRUeXBlID0gUUV2ZW50OjpUb3VjaFVw ZGF0ZTsKKyAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgIH0KKworICAgICAgICBtX3BlbmRp bmdGYWtlVG91Y2hFdmVudENvdW50Kys7CisgICAgICAgIFFXaW5kb3dTeXN0ZW1JbnRlcmZhY2U6 OmhhbmRsZVRvdWNoRXZlbnQodGFyZ2V0V2luZG93LCBldmVudFR5cGUsIFFUb3VjaEV2ZW50OjpU b3VjaFNjcmVlbiwgdG91Y2hQb2ludHMpOwogCiAgICAgICAgIC8vIEdldCByaWQgb2YgdG91Y2gt cG9pbnRzIHRoYXQgYXJlIG5vIGxvbmdlciB2YWxpZAotICAgICAgICBmb3JlYWNoIChjb25zdCBR VG91Y2hFdmVudDo6VG91Y2hQb2ludCYgdG91Y2hQb2ludCwgbV90b3VjaFBvaW50cykgewotICAg ICAgICAgICAgaWYgKHRvdWNoUG9pbnQuc3RhdGUoKSA9PSAgUXQ6OlRvdWNoUG9pbnRSZWxlYXNl ZCkKLSAgICAgICAgICAgICAgICBtX3RvdWNoUG9pbnRzLnJlbW92ZSh0b3VjaFBvaW50LmlkKCkp OworICAgICAgICBmb3JlYWNoIChjb25zdCBRV2luZG93U3lzdGVtSW50ZXJmYWNlOjpUb3VjaFBv aW50JiB0b3VjaFBvaW50LCBtX3RvdWNoUG9pbnRzKSB7CisgICAgICAgICAgICBpZiAodG91Y2hQ b2ludC5zdGF0ZSA9PSAgUXQ6OlRvdWNoUG9pbnRSZWxlYXNlZCkKKyAgICAgICAgICAgICAgICBt X3RvdWNoUG9pbnRzLnJlbW92ZSh0b3VjaFBvaW50LmlkKTsKICAgICAgICAgfQorICAgICAgICBy ZXR1cm4gdHJ1ZTsKICAgICB9CiAKICAgICByZXR1cm4gUUFwcGxpY2F0aW9uOjpub3RpZnkodGFy Z2V0LCBldmVudCk7CmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci9xdC9NaW5pQnJvd3Nl ckFwcGxpY2F0aW9uLmggYi9Ub29scy9NaW5pQnJvd3Nlci9xdC9NaW5pQnJvd3NlckFwcGxpY2F0 aW9uLmgKaW5kZXggMWZkZGMzOGQ3MmQ4M2ZkZGMyZDU5YmNlZGViZDhhY2Y1M2NjMDhlZC4uYjY4 YWU0ZjQ2MjZlMWM2MjU5N2ZkZTY3NTQwMjc2ZWNjY2Y5MzUxOSAxMDA2NDQKLS0tIGEvVG9vbHMv TWluaUJyb3dzZXIvcXQvTWluaUJyb3dzZXJBcHBsaWNhdGlvbi5oCisrKyBiL1Rvb2xzL01pbmlC cm93c2VyL3F0L01pbmlCcm93c2VyQXBwbGljYXRpb24uaApAQCAtNDMsNiArNDMsNyBAQAogI2lu Y2x1ZGUgPFFUb29sQmFyPgogI2luY2x1ZGUgPFFUb3VjaEV2ZW50PgogI2luY2x1ZGUgPFFVcmw+ CisjaW5jbHVkZSAicXdpbmRvd3N5c3RlbWludGVyZmFjZV9xcGEuaCIKIAogc3RydWN0IFdpbmRv d09wdGlvbnMgewogICAgIFdpbmRvd09wdGlvbnMoKQpAQCAtODEsMTQgKzgyLDE0IEBAIHByaXZh dGU6CiAgICAgdm9pZCBoYW5kbGVVc2VyT3B0aW9ucygpOwogCiBwcml2YXRlOgotICAgIGJvb2wg bV9zcG9udGFuZW91c1RvdWNoRXZlbnRSZWNlaXZlZDsKLSAgICBib29sIG1fc2VuZGluZ0Zha2VU b3VjaEV2ZW50OworICAgIGJvb2wgbV9yZWFsVG91Y2hFdmVudFJlY2VpdmVkOworICAgIGludCBt X3BlbmRpbmdGYWtlVG91Y2hFdmVudENvdW50OwogICAgIGJvb2wgbV9pc1JvYm90aXplZDsKICAg ICBpbnQgbV9yb2JvdFRpbWVvdXRTZWNvbmRzOwogICAgIGludCBtX3JvYm90RXh0cmFUaW1lU2Vj b25kczsKICAgICBRU3RyaW5nTGlzdCBtX3VybHM7CiAKLSAgICBRSGFzaDxpbnQsIFFUb3VjaEV2 ZW50OjpUb3VjaFBvaW50PiBtX3RvdWNoUG9pbnRzOworICAgIFFIYXNoPGludCwgUVdpbmRvd1N5 c3RlbUludGVyZmFjZTo6VG91Y2hQb2ludD4gbV90b3VjaFBvaW50czsKIH07CiAKICNlbmRpZgo=