116094 2013-05-14 01:56:41 -0700 [Qt][Win] Input events aren't mapped properly with windowless plugins. 2013-05-27 05:32:49 -0700 1 1 1 Unclassified WebKit Plug-ins 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Qt P2 Normal --- 1 jturcotte webkit-unassigned commit-queue hausmann jturcotte net147 oldest_to_newest 888741 0 jturcotte 2013-05-14 01:56:41 -0700 [Qt][Win] Input events aren't mapped properly with windowless plugins. 888745 1 201689 jturcotte 2013-05-14 02:00:06 -0700 Created attachment 201689 Patch 888746 2 commit-queue 2013-05-14 02:01:38 -0700 Attachment 201689 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCore/platform/qt/QWebPageClient.h', u'Source/WebCore/plugins/win/PluginViewWin.cpp', u'Source/WebKit/qt/ChangeLog', u'Source/WebKit/qt/WidgetSupport/PageClientQt.cpp', u'Source/WebKit/qt/WidgetSupport/PageClientQt.h']" exit_code: 1 Source/WebCore/plugins/win/PluginViewWin.cpp:350: Do not add platform specific code in WebCore outside of platform. [build/webcore_platform_layering_violation] [5] Source/WebCore/plugins/win/PluginViewWin.cpp:362: Do not add platform specific code in WebCore outside of platform. [build/webcore_platform_layering_violation] [5] Total errors found: 2 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 888747 3 jturcotte 2013-05-14 02:08:39 -0700 (In reply to comment #2) > Source/WebCore/plugins/win/PluginViewWin.cpp:350: Do not add platform specific code in WebCore outside of platform. [build/webcore_platform_layering_violation] [5] Source/WebCore/plugins subdirectories would need to be merged with those in Source/WebCore/platform. Hopefully we can land this patch first. 893979 4 201689 vestbo 2013-05-27 05:10:48 -0700 Comment on attachment 201689 Patch lgtm 893991 5 201689 commit-queue 2013-05-27 05:32:47 -0700 Comment on attachment 201689 Patch Clearing flags on attachment: 201689 Committed r150749: <http://trac.webkit.org/changeset/150749> 893992 6 commit-queue 2013-05-27 05:32:49 -0700 All reviewed patches have been landed. Closing bug. 201689 2013-05-14 02:00:06 -0700 2013-05-27 05:32:47 -0700 Patch windowlesspluginevents.patch text/plain 10668 jturcotte ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA4OWFmMjE2Li43NjNhYjU2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMg QEAKKzIwMTMtMDUtMTQgIEpvY2VseW4gVHVyY290dGUgIDxqb2NlbHluLnR1cmNvdHRlQGRpZ2lh LmNvbT4KKworICAgICAgICBbUXRdW1dpbl0gSW5wdXQgZXZlbnRzIGFyZW4ndCBtYXBwZWQgcHJv cGVybHkgd2l0aCB3aW5kb3dsZXNzIHBsdWdpbnMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTYwOTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgZXZlbnRzIGFyZSBmaXJzdCBzZW50IHByb3Blcmx5 IGJ1dCBGbGFzaCB0aGVuIGltbWVkaWF0ZWx5IHJlcGFpbnRzCisgICAgICAgIGFuZCB0aGlzIGNh dXNlcyBmbGlja2VyaW5nIHBhaW50aW5nLgorICAgICAgICBUaGUgaXNzdWUgaXMgdGhhdCBGbGFz aCBzZWVtcyB0byBiZSBkb2luZyBzb21lIGlucHV0IGV2ZW50IHRyYWNraW5nIG9mCisgICAgICAg IGl0cyBvd24gaW50ZXJuYWxseSwgdXNpbmcgdGhlIEhXTkQgcmV0dXJuZWQgdGhyb3VnaCBOUE5f R2V0VmFsdWUoTlBOVm5ldHNjYXBlV2luZG93KS4KKworICAgICAgICBXZSBhcmUgY3VycmVudGx5 IHVzaW5nIHR3byBjb29yZGluYXRlIHN5c3RlbXMgZm9yIHdpbmRvd2xlc3MgcGx1Z2lucyBvbiBX aW5kb3dzIHdpdGggUXQ6CisgICAgICAgIC0gRnJhbWVWaWV3IGNvb3JkaW5hdGVzOiBVc2VkIGZv ciBpbnB1dCBldmVudHMgYW5kIGFqdXN0ZWQgd2l0aCB0aGUgV01fV0lORE9XUE9TQ0hBTkdFRCBt ZXNzYWdlCisgICAgICAgIC0gRHJhd2FibGUgY29vcmRpbmF0ZXM6IFVzZWQgYnkgV01fUEFJTlQg YW5kIGFkanVzdGVkIHdpdGggTlBQX1NldFdpbmRvdworCisgICAgICAgIFRoaXMgcGF0Y2ggZml4 ZXMgdGhlIGJ1ZyBieSBtYXBwaW5nIGlucHV0IGV2ZW50cyB0byB0aGUgbmF0aXZlIHdpbmRvdyBy ZXR1cm5lZAorICAgICAgICBhcyBOUE5WbmV0c2NhcGVXaW5kb3cgaW5zdGVhZCBvZiB0aGUgRnJh bWVWaWV3IHRvIGVuc3VyZSB0aGF0IHRob3NlIGNvb3JkaW5hdGVzIHdpbGwgbWF0Y2gKKyAgICAg ICAgdGhlIG9uZXMgdXNlZCBieSBGbGFzaCBpbnRlcm5hbGx5LgorICAgICAgICBXaXRoIHRoaXMg d2Ugc2hvdWxkbid0IGJlIHVzaW5nIEZyYW1lVmlldyBjb29yZGluYXRlcyBhbnl3aGVyZSBmb3Ig d2luZG93bGVzcyBwbHVnaW5zCisgICAgICAgIG9uIFdpbmRvd3Mgd2l0aCBRdC4KKworICAgICAg ICAqIHBsYXRmb3JtL3F0L1FXZWJQYWdlQ2xpZW50Lmg6CisgICAgICAgIChRV2ViUGFnZUNsaWVu dCk6CisgICAgICAgICAgQWRkZWQgbWFwVG9Pd25lcldpbmRvdyB0byB0aGUgaW50ZXJmYWNlLCBt YXBwaW5nIGZyb20gdGhlIEZyYW1lVmlldyB1cCB0byB0aGUgd3JhcHBpbmcgbmF0aXZlUGFyZW50 V2lkZ2V0LgorICAgICAgICAqIHBsdWdpbnMvd2luL1BsdWdpblZpZXdXaW4uY3BwOgorICAgICAg ICAoV2ViQ29yZTo6Y29udGVudHNUb05hdGl2ZVdpbmRvdyk6CisgICAgICAgIChXZWJDb3JlOjpQ bHVnaW5WaWV3OjpwYWludEludG9UcmFuc2Zvcm1lZENvbnRleHQpOgorICAgICAgICAoV2ViQ29y ZTo6UGx1Z2luVmlldzo6aGFuZGxlTW91c2VFdmVudCk6CisKIDIwMTMtMDUtMTMgIFphbGFuIEJ1 anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWJQcm9jZXNzIGNvbnN1bWluZyB2 ZXJ5IGhpZ2ggQ1BVIG9uIGxpbmtlZGluLmNvbQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vcXQvUVdlYlBhZ2VDbGllbnQuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3F0 L1FXZWJQYWdlQ2xpZW50LmgKaW5kZXggMTUyNmU5ZC4uZGE5ZWYwNSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vcXQvUVdlYlBhZ2VDbGllbnQuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9xdC9RV2ViUGFnZUNsaWVudC5oCkBAIC04Niw2ICs4Niw3IEBAIHB1Ymxp YzoKICAgICB2aXJ0dWFsIGludCBzY3JlZW5OdW1iZXIoKSBjb25zdCA9IDA7CiAgICAgdmlydHVh bCBRT2JqZWN0KiBvd25lcldpZGdldCgpIGNvbnN0ID0gMDsKICAgICB2aXJ0dWFsIFFSZWN0IGdl b21ldHJ5UmVsYXRpdmVUb093bmVyV2lkZ2V0KCkgY29uc3QgPSAwOworICAgIHZpcnR1YWwgUVBv aW50IG1hcFRvT3duZXJXaW5kb3coY29uc3QgUVBvaW50JikgY29uc3QgPSAwOwogCiAgICAgdmly dHVhbCBRT2JqZWN0KiBwbHVnaW5QYXJlbnQoKSBjb25zdCA9IDA7CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsdWdpbnMvd2luL1BsdWdpblZpZXdXaW4uY3BwIGIvU291cmNlL1dlYkNv cmUvcGx1Z2lucy93aW4vUGx1Z2luVmlld1dpbi5jcHAKaW5kZXggOTE1OWJiOS4uYjg2MDZkOCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGx1Z2lucy93aW4vUGx1Z2luVmlld1dpbi5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcGx1Z2lucy93aW4vUGx1Z2luVmlld1dpbi5jcHAKQEAgLTM0 NSw2ICszNDUsMjkgQEAgc3RhdGljIGJvb2wgaXNXaW5kb3dzTWVzc2FnZVVzZXJHZXN0dXJlKFVJ TlQgbWVzc2FnZSkKICAgICB9CiB9CiAKK3N0YXRpYyBpbmxpbmUgSW50UG9pbnQgY29udGVudHNU b05hdGl2ZVdpbmRvdyhGcmFtZVZpZXcqIHZpZXcsIGNvbnN0IEludFBvaW50JiBwb2ludCkKK3sK KyNpZiBQTEFURk9STShRVCkKKyAgICAvLyBPdXIgd2ViIHZpZXcncyBRV2lkZ2V0IGlzbid0IG5l Y2Vzc2FyaWx5IGEgbmF0aXZlIHdpbmRvdyBpdHNlbGYuIE1hcCB0aGUgcG9zaXRpb24KKyAgICAv LyBhbGwgdGhlIHdheSB1cCB0byB0aGUgUVdpZGdldCBhc3NvY2lhdGVkIHdpdGggdGhlIEhXTkQg cmV0dXJuZWQgYXMgTlBOVm5ldHNjYXBlV2luZG93LgorICAgIFBsYXRmb3JtUGFnZUNsaWVudCBj bGllbnQgPSB2aWV3LT5ob3N0V2luZG93KCktPnBsYXRmb3JtUGFnZUNsaWVudCgpOworICAgIHJl dHVybiBjbGllbnQtPm1hcFRvT3duZXJXaW5kb3codmlldy0+Y29udGVudHNUb1dpbmRvdyhwb2lu dCkpOworI2Vsc2UKKyAgICByZXR1cm4gdmlldy0+Y29udGVudHNUb1dpbmRvdyhwb2ludCk7Cisj ZW5kaWYKK30KKworc3RhdGljIGlubGluZSBJbnRSZWN0IGNvbnRlbnRzVG9OYXRpdmVXaW5kb3co RnJhbWVWaWV3KiB2aWV3LCBjb25zdCBJbnRSZWN0JiByZWN0KQoreworI2lmIFBMQVRGT1JNKFFU KQorICAgIC8vIFRoaXMgb25seSBoYW5kbGVzIHRyYW5zbGF0aW9uIG9mIHRoZSByZWN0LgorICAg IEFTU0VSVCh2aWV3LT5jb250ZW50c1RvV2luZG93KHJlY3QpLnNpemUoKSA9PSByZWN0LnNpemUo KSk7CisgICAgcmV0dXJuIEludFJlY3QoY29udGVudHNUb05hdGl2ZVdpbmRvdyh2aWV3LCByZWN0 LmxvY2F0aW9uKCkpLCByZWN0LnNpemUoKSk7CisjZWxzZQorICAgIHJldHVybiB2aWV3LT5jb250 ZW50c1RvV2luZG93KHJlY3QpOworI2VuZGlmCit9CisKIExSRVNVTFQKIFBsdWdpblZpZXc6Ondu ZFByb2MoSFdORCBoV25kLCBVSU5UIG1lc3NhZ2UsIFdQQVJBTSB3UGFyYW0sIExQQVJBTSBsUGFy YW0pCiB7CkBAIC01NDEsNyArNTY0LDcgQEAgdm9pZCBQbHVnaW5WaWV3OjpwYWludEludG9UcmFu c2Zvcm1lZENvbnRleHQoSERDIGhkYykKIAogICAgIFdJTkRPV1BPUyB3aW5kb3dwb3MgPSB7IDAs IDAsIDAsIDAsIDAsIDAsIDAgfTsKIAotICAgIEludFJlY3QgciA9IHRvRnJhbWVWaWV3KHBhcmVu dCgpKS0+Y29udGVudHNUb1dpbmRvdyhmcmFtZVJlY3QoKSk7CisgICAgSW50UmVjdCByID0gY29u dGVudHNUb05hdGl2ZVdpbmRvdyh0b0ZyYW1lVmlldyhwYXJlbnQoKSksIGZyYW1lUmVjdCgpKTsK IAogICAgIHdpbmRvd3Bvcy54ID0gci54KCk7CiAgICAgd2luZG93cG9zLnkgPSByLnkoKTsKQEAg LTY5MCw3ICs3MTMsNyBAQCB2b2lkIFBsdWdpblZpZXc6OmhhbmRsZU1vdXNlRXZlbnQoTW91c2VF dmVudCogZXZlbnQpCiAKICAgICBOUEV2ZW50IG5wRXZlbnQ7CiAKLSAgICBJbnRQb2ludCBwID0g dG9GcmFtZVZpZXcocGFyZW50KCkpLT5jb250ZW50c1RvV2luZG93KEludFBvaW50KGV2ZW50LT5w YWdlWCgpLCBldmVudC0+cGFnZVkoKSkpOworICAgIEludFBvaW50IHAgPSBjb250ZW50c1RvTmF0 aXZlV2luZG93KHRvRnJhbWVWaWV3KHBhcmVudCgpKSwgSW50UG9pbnQoZXZlbnQtPnBhZ2VYKCks IGV2ZW50LT5wYWdlWSgpKSk7CiAKICAgICBucEV2ZW50LmxQYXJhbSA9IE1BS0VMUEFSQU0ocC54 KCksIHAueSgpKTsKICAgICBucEV2ZW50LndQYXJhbSA9IDA7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L3F0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4IDE1 Y2ZmYjIuLmY0N2Q0OTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTMtMDUt MTQgIEpvY2VseW4gVHVyY290dGUgIDxqb2NlbHluLnR1cmNvdHRlQGRpZ2lhLmNvbT4KKworICAg ICAgICBbUXRdW1dpbl0gSW5wdXQgZXZlbnRzIGFyZW4ndCBtYXBwZWQgcHJvcGVybHkgd2l0aCB3 aW5kb3dsZXNzIHBsdWdpbnMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMTYwOTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIFdpZGdldFN1cHBvcnQvUGFnZUNsaWVudFF0LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlBhZ2VDbGllbnRRV2lkZ2V0OjptYXBUb093bmVyV2luZG93KToKKyAgICAgICAgKFdl YkNvcmU6OlBhZ2VDbGllbnRRR3JhcGhpY3NXaWRnZXQ6Om1ha2VPcGVuR0xDb250ZXh0Q3VycmVu dElmQXZhaWxhYmxlKToKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2VDbGllbnRRR3JhcGhpY3NXaWRn ZXQ6OnNjcmVlbk51bWJlcik6CisgICAgICAgIChXZWJDb3JlOjpQYWdlQ2xpZW50UUdyYXBoaWNz V2lkZ2V0OjpnZW9tZXRyeVJlbGF0aXZlVG9Pd25lcldpZGdldCk6CisgICAgICAgIChXZWJDb3Jl OjpQYWdlQ2xpZW50UUdyYXBoaWNzV2lkZ2V0OjptYXBUb093bmVyV2luZG93KToKKyAgICAgICAg KFdlYkNvcmU6OlBhZ2VDbGllbnRRR3JhcGhpY3NXaWRnZXQ6OmdyYXBoaWNzSXRlbVZpc2libGVS ZWN0KToKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2VDbGllbnRRR3JhcGhpY3NXaWRnZXQ6OmZpcnN0 R3JhcGhpY3NWaWV3KToKKyAgICAgICAgICBFeHRyYWN0ZWQgdGhpcyBjb21tb24gbG9naWMgZnJv bSBtYWtlT3BlbkdMQ29udGV4dEN1cnJlbnRJZkF2YWlsYWJsZSwKKyAgICAgICAgICBzY3JlZW5O dW1iZXIsIGdlb21ldHJ5UmVsYXRpdmVUb093bmVyV2lkZ2V0IGFuZCBncmFwaGljc0l0ZW1WaXNp YmxlUmVjdAorICAgICAgICAgIHRvIGJlIGFibGUgdG8gdXNlIGl0IGluIG1hcFRvT3duZXJXaW5k b3cuCisgICAgICAgICogV2lkZ2V0U3VwcG9ydC9QYWdlQ2xpZW50UXQuaDoKKyAgICAgICAgKFBh Z2VDbGllbnRRV2lkZ2V0KToKKyAgICAgICAgKFBhZ2VDbGllbnRRR3JhcGhpY3NXaWRnZXQpOgor CiAyMDEzLTA1LTA5ICBBbmRyZWFzIEtsaW5nICA8YWtsaW5nQGFwcGxlLmNvbT4KIAogICAgICAg ICBbUXRdW1dLMV1SRUdSRVNTSU9OKHIxNDk1MzIpIHRzdF9xd2ViZWxlbWVudCBhbmQgdHN0X3F3 ZWJmcmFtZSBBUEkgdGVzdHMgY3Jhc2guCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0L1dp ZGdldFN1cHBvcnQvUGFnZUNsaWVudFF0LmNwcCBiL1NvdXJjZS9XZWJLaXQvcXQvV2lkZ2V0U3Vw cG9ydC9QYWdlQ2xpZW50UXQuY3BwCmluZGV4IDA5NWY5ZTUuLjhmNDg2ZDUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvcXQvV2lkZ2V0U3VwcG9ydC9QYWdlQ2xpZW50UXQuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQvcXQvV2lkZ2V0U3VwcG9ydC9QYWdlQ2xpZW50UXQuY3BwCkBAIC0xMjAsNiAr MTIwLDE2IEBAIFFSZWN0IFBhZ2VDbGllbnRRV2lkZ2V0OjpnZW9tZXRyeVJlbGF0aXZlVG9Pd25l cldpZGdldCgpIGNvbnN0CiAgICAgcmV0dXJuIHZpZXctPmdlb21ldHJ5KCk7CiB9CiAKK1FQb2lu dCBQYWdlQ2xpZW50UVdpZGdldDo6bWFwVG9Pd25lcldpbmRvdyhjb25zdCBRUG9pbnQmIHBvaW50 KSBjb25zdAoreworICAgIFFXaWRnZXQqIHdpZGdldCA9IHFvYmplY3RfY2FzdDxRV2lkZ2V0Kj4o b3duZXJXaWRnZXQoKSk7CisgICAgLy8gQ2FuIGJlIGZhbHNlIGJvdGggaWYgb3duZXJXaWRnZXQo KSBpcyBuYXRpdmUgb3IgaWYgaXQgZG9lc24ndCBoYXZlIGFueSBuYXRpdmUgcGFyZW50LgorICAg IGlmIChjb25zdCBRV2lkZ2V0ICpuYXRpdmVQYXJlbnQgPSB3aWRnZXQtPm5hdGl2ZVBhcmVudFdp ZGdldCgpKQorICAgICAgICByZXR1cm4gd2lkZ2V0LT5tYXBUbyhuYXRpdmVQYXJlbnQsIHBvaW50 KTsKKworICAgIHJldHVybiBwb2ludDsKK30KKwogUU9iamVjdCogUGFnZUNsaWVudFFXaWRnZXQ6 OnBsdWdpblBhcmVudCgpIGNvbnN0CiB7CiAgICAgcmV0dXJuIHZpZXc7CkBAIC0xNzAsNyArMTgw LDcgQEAgdm9pZCBQYWdlQ2xpZW50UUdyYXBoaWNzV2lkZ2V0OjpyZXBhaW50Vmlld3BvcnQoKQog Ym9vbCBQYWdlQ2xpZW50UUdyYXBoaWNzV2lkZ2V0OjptYWtlT3BlbkdMQ29udGV4dEN1cnJlbnRJ ZkF2YWlsYWJsZSgpCiB7CiAjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKSAmJiBVU0Uo VEVYVFVSRV9NQVBQRVJfR0wpICYmIGRlZmluZWQoUVRfT1BFTkdMX0xJQikKLSAgICBRR3JhcGhp Y3NWaWV3KiBncmFwaGljc1ZpZXcgPSB2aWV3LT5zY2VuZSgpLT52aWV3cygpWzBdOworICAgIFFH cmFwaGljc1ZpZXcqIGdyYXBoaWNzVmlldyA9IGZpcnN0R3JhcGhpY3NWaWV3KCk7CiAgICAgaWYg KGdyYXBoaWNzVmlldyAmJiBncmFwaGljc1ZpZXctPnZpZXdwb3J0KCkpIHsKICAgICAgICAgUUdM V2lkZ2V0KiBnbFdpZGdldCA9IHFvYmplY3RfY2FzdDxRR0xXaWRnZXQqPihncmFwaGljc1ZpZXct PnZpZXdwb3J0KCkpOwogICAgICAgICBpZiAoZ2xXaWRnZXQpIHsKQEAgLTIxOCwxNCArMjI4LDkg QEAgUVBhbGV0dGUgUGFnZUNsaWVudFFHcmFwaGljc1dpZGdldDo6cGFsZXR0ZSgpIGNvbnN0CiBp bnQgUGFnZUNsaWVudFFHcmFwaGljc1dpZGdldDo6c2NyZWVuTnVtYmVyKCkgY29uc3QKIHsKICNp ZiBkZWZpbmVkKFFfV1NfWDExKQotICAgIGlmIChRR3JhcGhpY3NTY2VuZSogc2NlbmUgPSB2aWV3 LT5zY2VuZSgpKSB7Ci0gICAgICAgIGNvbnN0IFFMaXN0PFFHcmFwaGljc1ZpZXcqPiB2aWV3cyA9 IHNjZW5lLT52aWV3cygpOwotCi0gICAgICAgIGlmICghdmlld3MuaXNFbXB0eSgpKQotICAgICAg ICAgICAgcmV0dXJuIHZpZXdzLmF0KDApLT54MTFJbmZvKCkuc2NyZWVuKCk7Ci0gICAgfQorICAg IGlmIChRR3JhcGhpY3NWaWV3KiBncmFwaGljc1ZpZXcgPSBmaXJzdEdyYXBoaWNzVmlldygpKQor ICAgICAgICByZXR1cm4gZ3JhcGhpY3NWaWV3LT54MTFJbmZvKCkuc2NyZWVuKCk7CiAjZW5kaWYK LQogICAgIHJldHVybiAwOwogfQogCkBAIC0yNDAsMjggKzI0NSwyNiBAQCBRT2JqZWN0KiBQYWdl Q2xpZW50UUdyYXBoaWNzV2lkZ2V0Ojpvd25lcldpZGdldCgpIGNvbnN0CiAKIFFSZWN0IFBhZ2VD bGllbnRRR3JhcGhpY3NXaWRnZXQ6Omdlb21ldHJ5UmVsYXRpdmVUb093bmVyV2lkZ2V0KCkgY29u c3QKIHsKLSAgICBpZiAoIXZpZXctPnNjZW5lKCkpCi0gICAgICAgIHJldHVybiBRUmVjdCgpOwot Ci0gICAgUUxpc3Q8UUdyYXBoaWNzVmlldyo+IHZpZXdzID0gdmlldy0+c2NlbmUoKS0+dmlld3Mo KTsKLSAgICBpZiAodmlld3MuaXNFbXB0eSgpKQotICAgICAgICByZXR1cm4gUVJlY3QoKTsKKyAg ICBpZiAoUUdyYXBoaWNzVmlldyogZ3JhcGhpY3NWaWV3ID0gZmlyc3RHcmFwaGljc1ZpZXcoKSkK KyAgICAgICAgcmV0dXJuIGdyYXBoaWNzVmlldy0+bWFwRnJvbVNjZW5lKHZpZXctPmJvdW5kaW5n UmVjdCgpKS5ib3VuZGluZ1JlY3QoKTsKKyAgICByZXR1cm4gUVJlY3QoKTsKK30KIAotICAgIFFH cmFwaGljc1ZpZXcqIGdyYXBoaWNzVmlldyA9IHZpZXdzLmF0KDApOwotICAgIHJldHVybiBncmFw aGljc1ZpZXctPm1hcEZyb21TY2VuZSh2aWV3LT5ib3VuZGluZ1JlY3QoKSkuYm91bmRpbmdSZWN0 KCk7CitRUG9pbnQgUGFnZUNsaWVudFFHcmFwaGljc1dpZGdldDo6bWFwVG9Pd25lcldpbmRvdyhj b25zdCBRUG9pbnQmIHBvaW50KSBjb25zdAoreworICAgIGlmIChjb25zdCBRR3JhcGhpY3NWaWV3 KiBncmFwaGljc1ZpZXcgPSBmaXJzdEdyYXBoaWNzVmlldygpKQorICAgICAgICBpZiAoY29uc3Qg UVdpZGdldCAqbmF0aXZlUGFyZW50ID0gZ3JhcGhpY3NWaWV3LT5uYXRpdmVQYXJlbnRXaWRnZXQo KSkKKyAgICAgICAgICAgIHJldHVybiBncmFwaGljc1ZpZXctPm1hcFRvKG5hdGl2ZVBhcmVudCwg Z3JhcGhpY3NWaWV3LT5tYXBGcm9tU2NlbmUodmlldy0+bWFwVG9TY2VuZShwb2ludCkpKTsKKyAg ICByZXR1cm4gcG9pbnQ7CiB9CiAKICNpZiBVU0UoVElMRURfQkFDS0lOR19TVE9SRSkKIFFSZWN0 RiBQYWdlQ2xpZW50UUdyYXBoaWNzV2lkZ2V0OjpncmFwaGljc0l0ZW1WaXNpYmxlUmVjdCgpIGNv bnN0CiB7Ci0gICAgaWYgKCF2aWV3LT5zY2VuZSgpKQorICAgIFFHcmFwaGljc1ZpZXcqIGdyYXBo aWNzVmlldyA9IGZpcnN0R3JhcGhpY3NWaWV3KCk7CisgICAgaWYgKCFncmFwaGljc1ZpZXcpCiAg ICAgICAgIHJldHVybiBRUmVjdEYoKTsKIAotICAgIFFMaXN0PFFHcmFwaGljc1ZpZXcqPiB2aWV3 cyA9IHZpZXctPnNjZW5lKCktPnZpZXdzKCk7Ci0gICAgaWYgKHZpZXdzLmlzRW1wdHkoKSkKLSAg ICAgICAgcmV0dXJuIFFSZWN0RigpOwotCi0gICAgUUdyYXBoaWNzVmlldyogZ3JhcGhpY3NWaWV3 ID0gdmlld3MuYXQoMCk7CiAgICAgaW50IHhPZmZzZXQgPSBncmFwaGljc1ZpZXctPmhvcml6b250 YWxTY3JvbGxCYXIoKS0+dmFsdWUoKTsKICAgICBpbnQgeU9mZnNldCA9IGdyYXBoaWNzVmlldy0+ dmVydGljYWxTY3JvbGxCYXIoKS0+dmFsdWUoKTsKICAgICByZXR1cm4gdmlldy0+bWFwUmVjdEZy b21TY2VuZShRUmVjdEYoUVBvaW50Rih4T2Zmc2V0LCB5T2Zmc2V0KSwgZ3JhcGhpY3NWaWV3LT52 aWV3cG9ydCgpLT5zaXplKCkpKTsKQEAgLTI5MSw2ICsyOTQsMTMgQEAgUVJlY3RGIFBhZ2VDbGll bnRRR3JhcGhpY3NXaWRnZXQ6OndpbmRvd1JlY3QoKSBjb25zdAogICAgIC8vIFRoZSBzY2VuZVJl Y3QgaXMgYSBnb29kIGFwcHJveGltYXRpb24gb2YgdGhlIHNpemUgb2YgdGhlIGFwcGxpY2F0aW9u LCBpbmRlcGVuZGVudCBvZiB0aGUgdmlldy4KICAgICByZXR1cm4gdmlldy0+c2NlbmUoKS0+c2Nl bmVSZWN0KCk7CiB9CisKK1FHcmFwaGljc1ZpZXcqIFBhZ2VDbGllbnRRR3JhcGhpY3NXaWRnZXQ6 OmZpcnN0R3JhcGhpY3NWaWV3KCkgY29uc3QKK3sKKyAgICBpZiAodmlldy0+c2NlbmUoKSAmJiAh dmlldy0+c2NlbmUoKS0+dmlld3MoKS5pc0VtcHR5KCkpCisgICAgICAgIHJldHVybiB2aWV3LT5z Y2VuZSgpLT52aWV3cygpLmZpcnN0KCk7CisgICAgcmV0dXJuIDA7Cit9CiAjZW5kaWYgLy8gUVRf Tk9fR1JBUEhJQ1NWSUVXCiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvcXQvV2lkZ2V0U3VwcG9ydC9QYWdlQ2xpZW50UXQuaCBiL1NvdXJjZS9XZWJL aXQvcXQvV2lkZ2V0U3VwcG9ydC9QYWdlQ2xpZW50UXQuaAppbmRleCA2M2E4MGFkLi5lOWRhMzYw IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L1dpZGdldFN1cHBvcnQvUGFnZUNsaWVudFF0 LmgKKysrIGIvU291cmNlL1dlYktpdC9xdC9XaWRnZXRTdXBwb3J0L1BhZ2VDbGllbnRRdC5oCkBA IC03Miw2ICs3Miw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIGludCBzY3JlZW5OdW1iZXIoKSBj b25zdDsKICAgICB2aXJ0dWFsIFFPYmplY3QqIG93bmVyV2lkZ2V0KCkgY29uc3Q7CiAgICAgdmly dHVhbCBRUmVjdCBnZW9tZXRyeVJlbGF0aXZlVG9Pd25lcldpZGdldCgpIGNvbnN0OworICAgIHZp cnR1YWwgUVBvaW50IG1hcFRvT3duZXJXaW5kb3coY29uc3QgUVBvaW50JikgY29uc3Q7CiAKICAg ICB2aXJ0dWFsIFFPYmplY3QqIHBsdWdpblBhcmVudCgpIGNvbnN0OwogCkBAIC0xNTgsNiArMTU5 LDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgaW50IHNjcmVlbk51bWJlcigpIGNvbnN0OwogICAg IHZpcnR1YWwgUU9iamVjdCogb3duZXJXaWRnZXQoKSBjb25zdDsKICAgICB2aXJ0dWFsIFFSZWN0 IGdlb21ldHJ5UmVsYXRpdmVUb093bmVyV2lkZ2V0KCkgY29uc3Q7CisgICAgdmlydHVhbCBRUG9p bnQgbWFwVG9Pd25lcldpbmRvdyhjb25zdCBRUG9pbnQmKSBjb25zdDsKIAogICAgIHZpcnR1YWwg UU9iamVjdCogcGx1Z2luUGFyZW50KCkgY29uc3Q7CiAKQEAgLTE3NSw2ICsxNzcsOCBAQCBwdWJs aWM6CiAKICAgICB2aXJ0dWFsIFFSZWN0RiB3aW5kb3dSZWN0KCkgY29uc3Q7CiAKKyAgICBRR3Jh cGhpY3NWaWV3KiBmaXJzdEdyYXBoaWNzVmlldygpIGNvbnN0OworCiAgICAgUUdyYXBoaWNzV2Vi VmlldyogdmlldzsKICAgICBRV2ViUGFnZSogcGFnZTsKICAgICBib29sIHZpZXdSZXNpemVzVG9D b250ZW50czsK