197233 2019-04-24 08:18:55 -0700 [GTK] Back/forward gesture snapshot always times out 2019-04-29 12:08:25 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Local Build Unspecified Linux RESOLVED FIXED P2 Normal --- 197363 1 alicem webkit-unassigned berto bugs-noreply cgarcia commit-queue ews-watchlist gustavo mcatanzaro oldest_to_newest 1529973 0 alicem 2019-04-24 08:18:55 -0700 See the attached patch. 1529975 1 368125 alicem 2019-04-24 08:20:41 -0700 Created attachment 368125 Patch 1529976 2 alicem 2019-04-24 08:21:43 -0700 I think it's a regression after https://trac.webkit.org/changeset/243094/webkit. But I'm not 100% sure, because that crash also introduced a crash, so it can also be any change until that crash was fixed. 1529978 3 ews-watchlist 2019-04-24 08:23:20 -0700 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 1530160 4 368125 mcatanzaro 2019-04-24 14:35:23 -0700 Comment on attachment 368125 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=368125&action=review > Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp:207 > + bool isBackForwardNavigationGestureEnabled { false }; It's a priv struct: let glib zero the memory for us. > Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp:1631 > + WebKitWebViewBasePrivate* priv = webkitWebViewBase->priv; Moved by mistake? 1530162 5 alicem 2019-04-24 14:38:31 -0700 > It's a priv struct: let glib zero the memory for us. Ok > Moved by mistake? No, it was inside an #if PLATFORM(X11) && USE(TEXTURE_MAPPER_GL) && !USE(REDIRECTED_XCOMPOSITE_WINDOW) block. 1530179 6 alicem 2019-04-24 14:58:36 -0700 > It's a priv struct: let glib zero the memory for us. After looking at the code again: other values in the same struct are initialized[1], so this was done for consistency. 1: https://github.com/webkit/webkit/blob/master/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp#L164-L193 1530393 7 mcatanzaro 2019-04-25 09:32:02 -0700 Note: this patch is NOT intended to be backported to 2.24. 1530403 8 368125 commit-queue 2019-04-25 09:58:14 -0700 Comment on attachment 368125 Patch Clearing flags on attachment: 368125 Committed r244648: <https://trac.webkit.org/changeset/244648> 1530404 9 commit-queue 2019-04-25 09:58:16 -0700 All reviewed patches have been landed. Closing bug. 1531130 10 commit-queue 2019-04-29 05:21:10 -0700 Re-opened since this is blocked by bug 197363 1531132 11 368125 cgarcia 2019-04-29 05:23:24 -0700 Comment on attachment 368125 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=368125&action=review > Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp:1650 > + priv->viewGestureController = std::make_unique<WebKit::ViewGestureController>(*priv->pageProxy); > + priv->viewGestureController->setSwipeGestureEnabled(priv->isBackForwardNavigationGestureEnabled); This requires to null-check viewGestureController everywhere before using it. And change webkitWebViewBaseViewGestureController() to return a pointer. 1531138 12 alicem 2019-04-29 06:28:35 -0700 Oh, right. Then I wonder how it even works and why didn't tests crash here?.. 1531181 13 368465 alicem 2019-04-29 10:21:31 -0700 Created attachment 368465 Patch 1531182 14 alicem 2019-04-29 10:22:27 -0700 Can anybody give me the list of tests that started to fail? I found one (animations/crash-on-removing-animation.html), but there might be others. Running all tests 2 times (with and without the patch) would take forever here... 1531183 15 368465 mcatanzaro 2019-04-29 10:31:56 -0700 Comment on attachment 368465 Patch I think it's fine. I see you added null checks everywhere needed. Sorry for missing this earlier. 1531184 16 mcatanzaro 2019-04-29 10:32:30 -0700 If it breaks tests again (unlikely) we'll just revert it again, not the end of the world. 1531193 17 368465 alicem 2019-04-29 11:05:19 -0700 Comment on attachment 368465 Patch Ok, marking as commit-queue? then. 1531220 18 368465 commit-queue 2019-04-29 12:08:23 -0700 Comment on attachment 368465 Patch Clearing flags on attachment: 368465 Committed r244744: <https://trac.webkit.org/changeset/244744> 1531221 19 commit-queue 2019-04-29 12:08:25 -0700 All reviewed patches have been landed. Closing bug. 368125 2019-04-24 08:20:41 -0700 2019-04-29 10:21:23 -0700 Patch bug-197233-20190424202039.patch text/plain 7096 alicem U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ0NDkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDUxZGM4ZGFmMGU3YzQ1Zjg1 M2YxYTkwYTZjMWQyYTM4NjY3YmM2ZWYuLjhkYjk1MTUzNjg5YTk1YWU2YTcyYjI1OGEwN2UyMWI5 YzNkMTQwYzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIgQEAKKzIwMTktMDQtMjQgIEFsZXhhbmRl ciBNaWtoYXlsZW5rbyAgPGV4YWxtNzY1OUBnbWFpbC5jb20+CisKKyAgICAgICAgW0dUS10gQmFj ay9mb3J3YXJkIGdlc3R1cmUgc25hcHNob3QgYWx3YXlzIHRpbWVzIG91dAorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk3MjMzCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRGVsYXlpbmcgd2ViIHByb2Nlc3Mg bGF1bmNoIGNhdXNlZCBhIHJlZ3Jlc3Npb24gd2hlcmUgd2UgY3JlYXRlIFZpZXdHZXN0dXJlQ29u dHJvbGxlciB3aGVuIHRoZQorICAgICAgICB3ZWIgcHJvY2VzcyBkb2Vzbid0IHlldCBleGlzdC4g VGhlIGNvbnRyb2xsZXIgaW1tZWRpYXRlbHkgdHJpZXMgdG8gY29ubmVjdCB0byBpdCBhbmQgZmFp bHMsCisgICAgICAgIGFuZCBiZWNhdXNlIG9mIHRoYXQgbmV2ZXIgcmVjZWl2ZXMgRGlkSGl0UmVu ZGVyVHJlZVNpemVUaHJlc2hvbGQoKSBtZXNzYWdlLCBzbyBuYXZpZ2F0aW9uCisgICAgICAgIHNu YXBzaG90IGFsd2F5cyBzdGF5cyB1bnRpbCB0aW1lb3V0IGFmdGVyIHBlcmZvcm1pbmcgdGhlIGdl c3R1cmUuCisKKyAgICAgICAgVG8gcHJldmVudCB0aGlzLCBjcmVhdGUgdGhlIGNvbnRyb2xsZXIg aW4gd2Via2l0V2ViVmlld0Jhc2VEaWRSZWxhdW5jaFdlYlByb2Nlc3MoKSBpbnN0ZWFkIG9mCisg ICAgICAgIHdlYmtpdFdlYlZpZXdCYXNlQ3JlYXRlV2ViUGFnZSgpLiBBZGRpdGlvbmFsbHksIHNp bmNlIHNldHRpbmdzIGFyZSBub3cgY3JlYXRlZCBlYXJsaWVyIHRoYW4KKyAgICAgICAgVmlld0dl c3R1cmVDb250cm9sbGVyLCBzdG9yZSB0aGUgdmFsdWUgb2Ygd2hldGhlciBzd2lwZSBnZXN0dXJl IGlzIGVuYWJsZWQgaW4gV2ViS2l0V2ViVmlld0Jhc2UKKyAgICAgICAgYW5kIGltbWVkaWF0ZWx5 IGFwcGx5IGl0IHdoZW4gY3JlYXRpbmcgdGhlIGNvbnRyb2xsZXIuCisKKyAgICAgICAgKiBVSVBy b2Nlc3MvQVBJL2dsaWIvV2ViS2l0V2ViVmlldy5jcHA6CisgICAgICAgIChlbmFibGVCYWNrRm9y d2FyZE5hdmlnYXRpb25HZXN0dXJlc0NoYW5nZWQpOgorICAgICAgICBNb3ZlIHRoZSBsb2dpYyBp bnRvIHdlYmtpdFdlYlZpZXdCYXNlU2V0RW5hYmxlQmFja0ZvcndhcmROYXZpZ2F0aW9uR2VzdHVy ZSgpLgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlLmNwcDoK KyAgICAgICAgKHdlYmtpdFdlYlZpZXdCYXNlU2V0RW5hYmxlQmFja0ZvcndhcmROYXZpZ2F0aW9u R2VzdHVyZSk6IEFkZGVkLiBJbiBhZGRpdGlvbiB0byB3aGF0IHdhcyBpbgorICAgICAgICBXZWJL aXRXZWJWaWV3QmFzZTo6ZW5hYmxlQmFja0ZvcndhcmROYXZpZ2F0aW9uR2VzdHVyZXNDaGFuZ2Vk KCksIHN0b3JlIHRoZSB2YWx1ZSBpbiBhIGZpZWxkCisgICAgICAgIGZvciB0aGUgY2FzZSBWaWV3 R2VzdHVyZUNvbnRyb2xsZXIgZG9lc24ndCBleGlzdCB5ZXQuCisgICAgICAgICh3ZWJraXRXZWJW aWV3QmFzZUNyZWF0ZVdlYlBhZ2UpOiBTdG9wIGNyZWF0aW5nIFZpZXdHZXN0dXJlQ29udHJvbGxl ci4KKyAgICAgICAgKHdlYmtpdFdlYlZpZXdCYXNlRGlkUmVsYXVuY2hXZWJQcm9jZXNzKTogTW92 ZSBjcmVhdGluZyBWaWV3R2VzdHVyZUNvbnRyb2xsZXIgaGVyZS4gQWxzbworICAgICAgICBpbW1l ZGlhdGVseSBjYWxsIHNldFN3aXBlR2VzdHVyZUVuYWJsZWQoKSB3aXRoIHRoZSBzdG9yZWQgdmFs dWUuCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlld0Jhc2VQcml2YXRl Lmg6CisKIDIwMTktMDQtMjAgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAg ICAgICBVbnJldmlld2VkLCBmaXggaU9TIGJ1aWxkIHdpdGggcmVjZW50IFNES3MuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ2xpYi9XZWJLaXRXZWJWaWV3LmNwcCBi L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9nbGliL1dlYktpdFdlYlZpZXcuY3BwCmluZGV4 IGFmMTBkNjg0YzFkMDNiNWQ2ODRjMGIxYmRlOTZhODRkZDdiYTE3ZTAuLjg4N2Y3YjMxYzBlNmQz YWVkMTJmYzEwM2Q0OTBlYTVlYTBiMzc5NzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS9nbGliL1dlYktpdFdlYlZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS9nbGliL1dlYktpdFdlYlZpZXcuY3BwCkBAIC01MTQsMTEgKzUxNCw3IEBAIHN0 YXRpYyB2b2lkIHVzZXJBZ2VudENoYW5nZWQoV2ViS2l0U2V0dGluZ3MqIHNldHRpbmdzLCBHUGFy YW1TcGVjKiwgV2ViS2l0V2ViVmllCiBzdGF0aWMgdm9pZCBlbmFibGVCYWNrRm9yd2FyZE5hdmln YXRpb25HZXN0dXJlc0NoYW5nZWQoV2ViS2l0U2V0dGluZ3MqIHNldHRpbmdzLCBHUGFyYW1TcGVj KiwgV2ViS2l0V2ViVmlldyogd2ViVmlldykKIHsKICAgICBnYm9vbGVhbiBlbmFibGUgPSB3ZWJr aXRfc2V0dGluZ3NfZ2V0X2VuYWJsZV9iYWNrX2ZvcndhcmRfbmF2aWdhdGlvbl9nZXN0dXJlcyhz ZXR0aW5ncyk7Ci0KLSAgICBWaWV3R2VzdHVyZUNvbnRyb2xsZXImIGNvbnRyb2xsZXIgPSB3ZWJr aXRXZWJWaWV3QmFzZVZpZXdHZXN0dXJlQ29udHJvbGxlcihXRUJLSVRfV0VCX1ZJRVdfQkFTRSh3 ZWJWaWV3KSk7Ci0gICAgY29udHJvbGxlci5zZXRTd2lwZUdlc3R1cmVFbmFibGVkKGVuYWJsZSk7 Ci0KLSAgICBnZXRQYWdlKHdlYlZpZXcpLnNldFNob3VsZFJlY29yZE5hdmlnYXRpb25TbmFwc2hv dHMoZW5hYmxlKTsKKyAgICB3ZWJraXRXZWJWaWV3QmFzZVNldEVuYWJsZUJhY2tGb3J3YXJkTmF2 aWdhdGlvbkdlc3R1cmUoV0VCS0lUX1dFQl9WSUVXX0JBU0Uod2ViVmlldyksIGVuYWJsZSk7CiB9 CiAKIHN0YXRpYyB2b2lkIHdlYmtpdFdlYlZpZXdVcGRhdGVGYXZpY29uKFdlYktpdFdlYlZpZXcq IHdlYlZpZXcsIGNhaXJvX3N1cmZhY2VfdCogZmF2aWNvbikKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlld0Jhc2UuY3BwIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZS5jcHAKaW5kZXggMDUwMDNh MTY2ZGRiYWZiZjE0NjlhYjBmZTRkNzljMGEyZWRmYjUxMS4uYzQyZDhjZmJhNGM5NWM2MjA3ZjQ2 N2Q1ZjVmYWNiMTllNmY1OGQ5NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZS5jcHAKQEAgLTIwNCw2ICsyMDQsNyBAQCBzdHJ1 Y3QgX1dlYktpdFdlYlZpZXdCYXNlUHJpdmF0ZSB7CiAgICAgc3RkOjp1bmlxdWVfcHRyPEdlc3R1 cmVDb250cm9sbGVyPiBnZXN0dXJlQ29udHJvbGxlcjsKICNlbmRpZgogICAgIHN0ZDo6dW5pcXVl X3B0cjxWaWV3R2VzdHVyZUNvbnRyb2xsZXI+IHZpZXdHZXN0dXJlQ29udHJvbGxlcjsKKyAgICBi b29sIGlzQmFja0ZvcndhcmROYXZpZ2F0aW9uR2VzdHVyZUVuYWJsZWQgeyBmYWxzZSB9OwogfTsK IAogV0VCS0lUX0RFRklORV9UWVBFKFdlYktpdFdlYlZpZXdCYXNlLCB3ZWJraXRfd2ViX3ZpZXdf YmFzZSwgR1RLX1RZUEVfQ09OVEFJTkVSKQpAQCAtMTE2Nyw2ICsxMTY4LDE4IEBAIEdlc3R1cmVD b250cm9sbGVyJiB3ZWJraXRXZWJWaWV3QmFzZUdlc3R1cmVDb250cm9sbGVyKFdlYktpdFdlYlZp ZXdCYXNlKiB3ZWJWaWV3CiB9CiAjZW5kaWYKIAordm9pZCB3ZWJraXRXZWJWaWV3QmFzZVNldEVu YWJsZUJhY2tGb3J3YXJkTmF2aWdhdGlvbkdlc3R1cmUoV2ViS2l0V2ViVmlld0Jhc2UqIHdlYlZp ZXdCYXNlLCBib29sIGVuYWJsZWQpCit7CisgICAgV2ViS2l0V2ViVmlld0Jhc2VQcml2YXRlKiBw cml2ID0gd2ViVmlld0Jhc2UtPnByaXY7CisKKyAgICBwcml2LT5pc0JhY2tGb3J3YXJkTmF2aWdh dGlvbkdlc3R1cmVFbmFibGVkID0gZW5hYmxlZDsKKworICAgIGlmIChwcml2LT5wYWdlUHJveHkt Pmhhc1J1bm5pbmdQcm9jZXNzKCkpCisgICAgICAgIHdlYlZpZXdCYXNlLT5wcml2LT52aWV3R2Vz dHVyZUNvbnRyb2xsZXItPnNldFN3aXBlR2VzdHVyZUVuYWJsZWQoZW5hYmxlZCk7CisKKyAgICBw cml2LT5wYWdlUHJveHktPnNldFNob3VsZFJlY29yZE5hdmlnYXRpb25TbmFwc2hvdHMoZW5hYmxl ZCk7Cit9CisKIFZpZXdHZXN0dXJlQ29udHJvbGxlciYgd2Via2l0V2ViVmlld0Jhc2VWaWV3R2Vz dHVyZUNvbnRyb2xsZXIoV2ViS2l0V2ViVmlld0Jhc2UqIHdlYlZpZXdCYXNlKQogewogICAgIHJl dHVybiAqd2ViVmlld0Jhc2UtPnByaXYtPnZpZXdHZXN0dXJlQ29udHJvbGxlcjsKQEAgLTEzOTgs OCArMTQxMSw2IEBAIHZvaWQgd2Via2l0V2ViVmlld0Jhc2VDcmVhdGVXZWJQYWdlKFdlYktpdFdl YlZpZXdCYXNlKiB3ZWJraXRXZWJWaWV3QmFzZSwgUmVmPEFQCiAgICAgcHJpdi0+cGFnZVByb3h5 LT5zZXRJbnRyaW5zaWNEZXZpY2VTY2FsZUZhY3RvcihndGtfd2lkZ2V0X2dldF9zY2FsZV9mYWN0 b3IoR1RLX1dJREdFVCh3ZWJraXRXZWJWaWV3QmFzZSkpKTsKICAgICBnX3NpZ25hbF9jb25uZWN0 KHdlYmtpdFdlYlZpZXdCYXNlLCAibm90aWZ5OjpzY2FsZS1mYWN0b3IiLCBHX0NBTExCQUNLKGRl dmljZVNjYWxlRmFjdG9yQ2hhbmdlZCksIG51bGxwdHIpOwogI2VuZGlmCi0KLSAgICBwcml2LT52 aWV3R2VzdHVyZUNvbnRyb2xsZXIgPSBzdGQ6Om1ha2VfdW5pcXVlPFdlYktpdDo6Vmlld0dlc3R1 cmVDb250cm9sbGVyPigqcHJpdi0+cGFnZVByb3h5KTsKIH0KIAogdm9pZCB3ZWJraXRXZWJWaWV3 QmFzZVNldFRvb2x0aXBUZXh0KFdlYktpdFdlYlZpZXdCYXNlKiB3ZWJWaWV3QmFzZSwgY29uc3Qg Y2hhciogdG9vbHRpcCkKQEAgLTE2MTcsMTEgKzE2MjgsMTIgQEAgdm9pZCB3ZWJraXRXZWJWaWV3 QmFzZURpZFJlbGF1bmNoV2ViUHJvY2VzcyhXZWJLaXRXZWJWaWV3QmFzZSogd2Via2l0V2ViVmll d0Jhc2UKICAgICAvLyBRdWV1ZSBhIHJlc2l6ZSB0byBlbnN1cmUgdGhlIG5ldyBEcmF3aW5nQXJl YVByb3h5IGlzIHJlc2l6ZWQuCiAgICAgZ3RrX3dpZGdldF9xdWV1ZV9yZXNpemVfbm9fcmVkcmF3 KEdUS19XSURHRVQod2Via2l0V2ViVmlld0Jhc2UpKTsKIAorICAgIFdlYktpdFdlYlZpZXdCYXNl UHJpdmF0ZSogcHJpdiA9IHdlYmtpdFdlYlZpZXdCYXNlLT5wcml2OworCiAjaWYgUExBVEZPUk0o WDExKSAmJiBVU0UoVEVYVFVSRV9NQVBQRVJfR0wpICYmICFVU0UoUkVESVJFQ1RFRF9YQ09NUE9T SVRFX1dJTkRPVykKICAgICBpZiAoUGxhdGZvcm1EaXNwbGF5OjpzaGFyZWREaXNwbGF5KCkudHlw ZSgpICE9IFBsYXRmb3JtRGlzcGxheTo6VHlwZTo6WDExKQogICAgICAgICByZXR1cm47CiAKLSAg ICBXZWJLaXRXZWJWaWV3QmFzZVByaXZhdGUqIHByaXYgPSB3ZWJraXRXZWJWaWV3QmFzZS0+cHJp djsKICAgICBhdXRvKiBkcmF3aW5nQXJlYSA9IHN0YXRpY19jYXN0PERyYXdpbmdBcmVhUHJveHlD b29yZGluYXRlZEdyYXBoaWNzKj4ocHJpdi0+cGFnZVByb3h5LT5kcmF3aW5nQXJlYSgpKTsKICAg ICBBU1NFUlQoZHJhd2luZ0FyZWEpOwogCkBAIC0xNjMzLDYgKzE2NDUsOSBAQCB2b2lkIHdlYmtp dFdlYlZpZXdCYXNlRGlkUmVsYXVuY2hXZWJQcm9jZXNzKFdlYktpdFdlYlZpZXdCYXNlKiB3ZWJr aXRXZWJWaWV3QmFzZQogI2Vsc2UKICAgICBVTlVTRURfUEFSQU0od2Via2l0V2ViVmlld0Jhc2Up OwogI2VuZGlmCisKKyAgICBwcml2LT52aWV3R2VzdHVyZUNvbnRyb2xsZXIgPSBzdGQ6Om1ha2Vf dW5pcXVlPFdlYktpdDo6Vmlld0dlc3R1cmVDb250cm9sbGVyPigqcHJpdi0+cGFnZVByb3h5KTsK KyAgICBwcml2LT52aWV3R2VzdHVyZUNvbnRyb2xsZXItPnNldFN3aXBlR2VzdHVyZUVuYWJsZWQo cHJpdi0+aXNCYWNrRm9yd2FyZE5hdmlnYXRpb25HZXN0dXJlRW5hYmxlZCk7CiB9CiAKIHZvaWQg d2Via2l0V2ViVmlld0Jhc2VQYWdlQ2xvc2VkKFdlYktpdFdlYlZpZXdCYXNlKiB3ZWJraXRXZWJW aWV3QmFzZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvV2Vi S2l0V2ViVmlld0Jhc2VQcml2YXRlLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ3Rr L1dlYktpdFdlYlZpZXdCYXNlUHJpdmF0ZS5oCmluZGV4IDEzNjAyODViZmEyMzZiNGMzNWM3NDQ0 ZjI1OWUxNjk4ZjRhMDQ1MWYuLjEwZGY4MGJkNzRiYWY0ZTA3MGM5YzAwMTZkMTA3ZmI5ZWNiZWQ3 NTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2Vi Vmlld0Jhc2VQcml2YXRlLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0ay9X ZWJLaXRXZWJWaWV3QmFzZVByaXZhdGUuaApAQCAtODQsNiArODQsNyBAQCBXZWJLaXQ6Okdlc3R1 cmVDb250cm9sbGVyJiB3ZWJraXRXZWJWaWV3QmFzZUdlc3R1cmVDb250cm9sbGVyKFdlYktpdFdl YlZpZXdCYXNlKgogCiBSZWZQdHI8V2ViS2l0OjpWaWV3U25hcHNob3Q+IHdlYmtpdFdlYlZpZXdC YXNlVGFrZVZpZXdTbmFwc2hvdChXZWJLaXRXZWJWaWV3QmFzZSopOwogCit2b2lkIHdlYmtpdFdl YlZpZXdCYXNlU2V0RW5hYmxlQmFja0ZvcndhcmROYXZpZ2F0aW9uR2VzdHVyZShXZWJLaXRXZWJW aWV3QmFzZSosIGJvb2wgZW5hYmxlZCk7CiBXZWJLaXQ6OlZpZXdHZXN0dXJlQ29udHJvbGxlciYg d2Via2l0V2ViVmlld0Jhc2VWaWV3R2VzdHVyZUNvbnRyb2xsZXIoV2ViS2l0V2ViVmlld0Jhc2Uq KTsKIAogdm9pZCB3ZWJraXRXZWJWaWV3QmFzZURpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yTWFp bkZyYW1lKFdlYktpdFdlYlZpZXdCYXNlKik7Cg== 368465 2019-04-29 10:21:31 -0700 2019-04-29 12:08:23 -0700 Patch bug-197233-20190429222129.patch text/plain 13762 alicem U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ0NzMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDE3NTgwNDMwNjkxZDlmYmQx MGZkN2ZlOGY0MzYxYmQ3YmY1ZGU4NjguLmM1ZDM1Y2Q0YjRlOGQ5OWNlODhjNDk3NDRkZjhiZTRh OTg2MjQzOWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDYgQEAKKzIwMTktMDQtMjkgIEFsZXhhbmRl ciBNaWtoYXlsZW5rbyAgPGV4YWxtNzY1OUBnbWFpbC5jb20+CisKKyAgICAgICAgW0dUS10gQmFj ay9mb3J3YXJkIGdlc3R1cmUgc25hcHNob3QgYWx3YXlzIHRpbWVzIG91dAorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk3MjMzCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRGVsYXlpbmcgd2ViIHByb2Nlc3Mg bGF1bmNoIGNhdXNlZCBhIHJlZ3Jlc3Npb24gd2hlcmUgd2UgY3JlYXRlIFZpZXdHZXN0dXJlQ29u dHJvbGxlciB3aGVuIHRoZQorICAgICAgICB3ZWIgcHJvY2VzcyBkb2Vzbid0IHlldCBleGlzdC4g VGhlIGNvbnRyb2xsZXIgaW1tZWRpYXRlbHkgdHJpZXMgdG8gY29ubmVjdCB0byBpdCBhbmQgZmFp bHMsCisgICAgICAgIGFuZCBiZWNhdXNlIG9mIHRoYXQgbmV2ZXIgcmVjZWl2ZXMgRGlkSGl0UmVu ZGVyVHJlZVNpemVUaHJlc2hvbGQoKSBtZXNzYWdlLCBzbyBuYXZpZ2F0aW9uCisgICAgICAgIHNu YXBzaG90IGFsd2F5cyBzdGF5cyB1bnRpbCB0aW1lb3V0IGFmdGVyIHBlcmZvcm1pbmcgdGhlIGdl c3R1cmUuCisKKyAgICAgICAgVG8gcHJldmVudCB0aGlzLCBjcmVhdGUgdGhlIGNvbnRyb2xsZXIg aW4gd2Via2l0V2ViVmlld0Jhc2VEaWRSZWxhdW5jaFdlYlByb2Nlc3MoKSBpbnN0ZWFkIG9mCisg ICAgICAgIHdlYmtpdFdlYlZpZXdCYXNlQ3JlYXRlV2ViUGFnZSgpLiBBZGRpdGlvbmFsbHksIHNp bmNlIHNldHRpbmdzIGFyZSBub3cgY3JlYXRlZCBlYXJsaWVyIHRoYW4KKyAgICAgICAgVmlld0dl c3R1cmVDb250cm9sbGVyLCBzdG9yZSB0aGUgdmFsdWUgb2Ygd2hldGhlciBzd2lwZSBnZXN0dXJl IGlzIGVuYWJsZWQgaW4gV2ViS2l0V2ViVmlld0Jhc2UKKyAgICAgICAgYW5kIGltbWVkaWF0ZWx5 IGFwcGx5IGl0IHdoZW4gY3JlYXRpbmcgdGhlIGNvbnRyb2xsZXIuCisKKyAgICAgICAgU2luY2Ug dGhlcmUgaXMgbm93IGEgcG9pbnQgd2hlcmUgY29udHJvbGxlciBpcyBudWxsLCBtYWtlIHdlYmtp dFdlYlZpZXdCYXNlVmlld0dlc3R1cmVDb250cm9sbGVyKCkKKyAgICAgICAgcmV0dXJuIG51bGwg YW5kIGFkZCBudWxsIGNoZWNrcyBldmVyeXdoZXJlLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQ SS9nbGliL1dlYktpdFdlYlZpZXcuY3BwOgorICAgICAgICAoZW5hYmxlQmFja0ZvcndhcmROYXZp Z2F0aW9uR2VzdHVyZXNDaGFuZ2VkKToKKyAgICAgICAgTW92ZSB0aGUgbG9naWMgaW50byB3ZWJr aXRXZWJWaWV3QmFzZVNldEVuYWJsZUJhY2tGb3J3YXJkTmF2aWdhdGlvbkdlc3R1cmUoKS4KKyAg ICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9QYWdlQ2xpZW50SW1wbC5jcHA6CisgICAgICAgIChX ZWJLaXQ6OlBhZ2VDbGllbnRJbXBsOjp3aGVlbEV2ZW50V2FzTm90SGFuZGxlZEJ5V2ViQ29yZSk6 IEFkZCBhIG51bGwgY2hlY2suCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2Vi Vmlld0Jhc2UuY3BwOgorICAgICAgICAod2Via2l0V2ViVmlld0Jhc2VEcmF3KTogRGl0dG8uCisg ICAgICAgICh3ZWJraXRXZWJWaWV3QmFzZVNjcm9sbEV2ZW50KTogRGl0dG8uCisgICAgICAgICh3 ZWJraXRXZWJWaWV3QmFzZVNldEVuYWJsZUJhY2tGb3J3YXJkTmF2aWdhdGlvbkdlc3R1cmUpOiBB ZGRlZC4gSW4gYWRkaXRpb24gdG8gd2hhdCB3YXMgaW4KKyAgICAgICAgV2ViS2l0V2ViVmlld0Jh c2U6OmVuYWJsZUJhY2tGb3J3YXJkTmF2aWdhdGlvbkdlc3R1cmVzQ2hhbmdlZCgpLCBzdG9yZSB0 aGUgdmFsdWUgaW4gYSBmaWVsZAorICAgICAgICBmb3IgdGhlIGNhc2UgVmlld0dlc3R1cmVDb250 cm9sbGVyIGRvZXNuJ3QgZXhpc3QgeWV0LgorICAgICAgICAod2Via2l0V2ViVmlld0Jhc2VWaWV3 R2VzdHVyZUNvbnRyb2xsZXIpOiBSZXR1cm4gYSBwb2ludGVyIGluc3RlYWQgb2YgcmVmZXJlbmNl LgorICAgICAgICAod2Via2l0V2ViVmlld0Jhc2VDcmVhdGVXZWJQYWdlKTogU3RvcCBjcmVhdGlu ZyBWaWV3R2VzdHVyZUNvbnRyb2xsZXIuCisgICAgICAgICh3ZWJraXRXZWJWaWV3QmFzZURpZFJl bGF1bmNoV2ViUHJvY2Vzcyk6IE1vdmUgY3JlYXRpbmcgVmlld0dlc3R1cmVDb250cm9sbGVyIGhl cmUuIEFsc28KKyAgICAgICAgaW1tZWRpYXRlbHkgY2FsbCBzZXRTd2lwZUdlc3R1cmVFbmFibGVk KCkgd2l0aCB0aGUgc3RvcmVkIHZhbHVlLgorICAgICAgICAod2Via2l0V2ViVmlld0Jhc2VEaWRT dGFydFByb3Zpc2lvbmFsTG9hZEZvck1haW5GcmFtZSk6IEFkZCBhIG51bGwgY2hlY2suCisgICAg ICAgICh3ZWJraXRXZWJWaWV3QmFzZURpZEZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dEZvck1h aW5GcmFtZSk6RGl0dG8uCisgICAgICAgICh3ZWJraXRXZWJWaWV3QmFzZURpZEZpbmlzaExvYWRG b3JNYWluRnJhbWUpOiBEaXR0by4KKyAgICAgICAgKHdlYmtpdFdlYlZpZXdCYXNlRGlkRmFpbExv YWRGb3JNYWluRnJhbWUpOiBEaXR0by4KKyAgICAgICAgKHdlYmtpdFdlYlZpZXdCYXNlRGlkU2Ft ZURvY3VtZW50TmF2aWdhdGlvbkZvck1haW5GcmFtZSk6IERpdHRvLgorICAgICAgICAod2Via2l0 V2ViVmlld0Jhc2VEaWRSZXN0b3JlU2Nyb2xsUG9zaXRpb24pOiBEaXR0by4KKyAgICAgICAgKiBV SVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZVByaXZhdGUuaDoKKwogMjAxOS0wNC0y OSAgQ29tbWl0IFF1ZXVlICA8Y29tbWl0LXF1ZXVlQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5y ZXZpZXdlZCwgcm9sbGluZyBvdXQgcjI0NDY0OC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0FQSS9nbGliL1dlYktpdFdlYlZpZXcuY3BwIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQVBJL2dsaWIvV2ViS2l0V2ViVmlldy5jcHAKaW5kZXggYWYxMGQ2ODRjMWQwM2I1ZDY4 NGMwYjFiZGU5NmE4NGRkN2JhMTdlMC4uODg3ZjdiMzFjMGU2ZDNhZWQxMmZjMTAzZDQ5MGVhNWVh MGIzNzk3MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2dsaWIvV2Vi S2l0V2ViVmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2dsaWIvV2Vi S2l0V2ViVmlldy5jcHAKQEAgLTUxNCwxMSArNTE0LDcgQEAgc3RhdGljIHZvaWQgdXNlckFnZW50 Q2hhbmdlZChXZWJLaXRTZXR0aW5ncyogc2V0dGluZ3MsIEdQYXJhbVNwZWMqLCBXZWJLaXRXZWJW aWUKIHN0YXRpYyB2b2lkIGVuYWJsZUJhY2tGb3J3YXJkTmF2aWdhdGlvbkdlc3R1cmVzQ2hhbmdl ZChXZWJLaXRTZXR0aW5ncyogc2V0dGluZ3MsIEdQYXJhbVNwZWMqLCBXZWJLaXRXZWJWaWV3KiB3 ZWJWaWV3KQogewogICAgIGdib29sZWFuIGVuYWJsZSA9IHdlYmtpdF9zZXR0aW5nc19nZXRfZW5h YmxlX2JhY2tfZm9yd2FyZF9uYXZpZ2F0aW9uX2dlc3R1cmVzKHNldHRpbmdzKTsKLQotICAgIFZp ZXdHZXN0dXJlQ29udHJvbGxlciYgY29udHJvbGxlciA9IHdlYmtpdFdlYlZpZXdCYXNlVmlld0dl c3R1cmVDb250cm9sbGVyKFdFQktJVF9XRUJfVklFV19CQVNFKHdlYlZpZXcpKTsKLSAgICBjb250 cm9sbGVyLnNldFN3aXBlR2VzdHVyZUVuYWJsZWQoZW5hYmxlKTsKLQotICAgIGdldFBhZ2Uod2Vi Vmlldykuc2V0U2hvdWxkUmVjb3JkTmF2aWdhdGlvblNuYXBzaG90cyhlbmFibGUpOworICAgIHdl YmtpdFdlYlZpZXdCYXNlU2V0RW5hYmxlQmFja0ZvcndhcmROYXZpZ2F0aW9uR2VzdHVyZShXRUJL SVRfV0VCX1ZJRVdfQkFTRSh3ZWJWaWV3KSwgZW5hYmxlKTsKIH0KIAogc3RhdGljIHZvaWQgd2Vi a2l0V2ViVmlld1VwZGF0ZUZhdmljb24oV2ViS2l0V2ViVmlldyogd2ViVmlldywgY2Fpcm9fc3Vy ZmFjZV90KiBmYXZpY29uKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJ L2d0ay9QYWdlQ2xpZW50SW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ3Rr L1BhZ2VDbGllbnRJbXBsLmNwcAppbmRleCBhMGFkYjEzNGE0NDhlNTgyMmYwODcxOTEzOTExN2Zk MjdiZTExMjA1Li4yYzk4ZjIwYzJmODEzNDA4MTNhODAwNzRjZjYyZDljNjIzZDcwOTM4IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ3RrL1BhZ2VDbGllbnRJbXBsLmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ3RrL1BhZ2VDbGllbnRJbXBsLmNw cApAQCAtNDMxLDkgKzQzMSw5IEBAIHZvaWQgUGFnZUNsaWVudEltcGw6OmRvbmVXaXRoVG91Y2hF dmVudChjb25zdCBOYXRpdmVXZWJUb3VjaEV2ZW50JiBldmVudCwgYm9vbCB3CiAKIHZvaWQgUGFn ZUNsaWVudEltcGw6OndoZWVsRXZlbnRXYXNOb3RIYW5kbGVkQnlXZWJDb3JlKGNvbnN0IE5hdGl2 ZVdlYldoZWVsRXZlbnQmIGV2ZW50KQogewotICAgIFZpZXdHZXN0dXJlQ29udHJvbGxlciYgY29u dHJvbGxlciA9IHdlYmtpdFdlYlZpZXdCYXNlVmlld0dlc3R1cmVDb250cm9sbGVyKFdFQktJVF9X RUJfVklFV19CQVNFKG1fdmlld1dpZGdldCkpOwotICAgIGlmIChjb250cm9sbGVyLmlzU3dpcGVH ZXN0dXJlRW5hYmxlZCgpKSB7Ci0gICAgICAgIGNvbnRyb2xsZXIud2hlZWxFdmVudFdhc05vdEhh bmRsZWRCeVdlYkNvcmUoJmV2ZW50Lm5hdGl2ZUV2ZW50KCktPnNjcm9sbCk7CisgICAgVmlld0dl c3R1cmVDb250cm9sbGVyKiBjb250cm9sbGVyID0gd2Via2l0V2ViVmlld0Jhc2VWaWV3R2VzdHVy ZUNvbnRyb2xsZXIoV0VCS0lUX1dFQl9WSUVXX0JBU0UobV92aWV3V2lkZ2V0KSk7CisgICAgaWYg KGNvbnRyb2xsZXIgJiYgY29udHJvbGxlci0+aXNTd2lwZUdlc3R1cmVFbmFibGVkKCkpIHsKKyAg ICAgICAgY29udHJvbGxlci0+d2hlZWxFdmVudFdhc05vdEhhbmRsZWRCeVdlYkNvcmUoJmV2ZW50 Lm5hdGl2ZUV2ZW50KCktPnNjcm9sbCk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlld0Jhc2Uu Y3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZS5j cHAKaW5kZXggODE2ZjBmYTc2OWYyYmVkNDAwNjhiZjZlNzViMTdlOTFiZmFjNzU5My4uMTBlYTRi MjJjZDZkM2ZkODAyNWM3N2EyMzE1NDZlYTFkYzMyOWMzMiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZS5jcHAKKysrIGIvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZS5jcHAKQEAgLTIwNiw2 ICsyMDYsNyBAQCBzdHJ1Y3QgX1dlYktpdFdlYlZpZXdCYXNlUHJpdmF0ZSB7CiAgICAgc3RkOjp1 bmlxdWVfcHRyPEdlc3R1cmVDb250cm9sbGVyPiBnZXN0dXJlQ29udHJvbGxlcjsKICNlbmRpZgog ICAgIHN0ZDo6dW5pcXVlX3B0cjxWaWV3R2VzdHVyZUNvbnRyb2xsZXI+IHZpZXdHZXN0dXJlQ29u dHJvbGxlcjsKKyAgICBib29sIGlzQmFja0ZvcndhcmROYXZpZ2F0aW9uR2VzdHVyZUVuYWJsZWQg eyBmYWxzZSB9OwogfTsKIAogV0VCS0lUX0RFRklORV9UWVBFKFdlYktpdFdlYlZpZXdCYXNlLCB3 ZWJraXRfd2ViX3ZpZXdfYmFzZSwgR1RLX1RZUEVfQ09OVEFJTkVSKQpAQCAtNTcyLDkgKzU3Myw5 IEBAIHN0YXRpYyBnYm9vbGVhbiB3ZWJraXRXZWJWaWV3QmFzZURyYXcoR3RrV2lkZ2V0KiB3aWRn ZXQsIGNhaXJvX3QqIGNyKQogICAgIH0KIAogICAgIGlmIChzaG93aW5nTmF2aWdhdGlvblNuYXBz aG90KSB7Ci0gICAgICAgIFZpZXdHZXN0dXJlQ29udHJvbGxlciYgY29udHJvbGxlciA9IHdlYmtp dFdlYlZpZXdCYXNlVmlld0dlc3R1cmVDb250cm9sbGVyKHdlYlZpZXdCYXNlKTsKICAgICAgICAg UmVmUHRyPGNhaXJvX3BhdHRlcm5fdD4gZ3JvdXAgPSBhZG9wdFJlZihjYWlyb19wb3BfZ3JvdXAo Y3IpKTsKLSAgICAgICAgY29udHJvbGxlci5kcmF3KGNyLCBncm91cC5nZXQoKSk7CisgICAgICAg IGlmIChhdXRvKiBjb250cm9sbGVyID0gd2Via2l0V2ViVmlld0Jhc2VWaWV3R2VzdHVyZUNvbnRy b2xsZXIod2ViVmlld0Jhc2UpKQorICAgICAgICAgICAgY29udHJvbGxlci0+ZHJhdyhjciwgZ3Jv dXAuZ2V0KCkpOwogICAgIH0KIAogICAgIEdUS19XSURHRVRfQ0xBU1Mod2Via2l0X3dlYl92aWV3 X2Jhc2VfcGFyZW50X2NsYXNzKS0+ZHJhdyh3aWRnZXQsIGNyKTsKQEAgLTg4OSw4ICs4OTAsOCBA QCBzdGF0aWMgZ2Jvb2xlYW4gd2Via2l0V2ViVmlld0Jhc2VTY3JvbGxFdmVudChHdGtXaWRnZXQq IHdpZGdldCwgR2RrRXZlbnRTY3JvbGwqCiAgICAgICAgIH0KICAgICB9CiAKLSAgICBWaWV3R2Vz dHVyZUNvbnRyb2xsZXImIGNvbnRyb2xsZXIgPSB3ZWJraXRXZWJWaWV3QmFzZVZpZXdHZXN0dXJl Q29udHJvbGxlcih3ZWJWaWV3QmFzZSk7Ci0gICAgaWYgKGNvbnRyb2xsZXIuaXNTd2lwZUdlc3R1 cmVFbmFibGVkKCkgJiYgY29udHJvbGxlci5oYW5kbGVTY3JvbGxXaGVlbEV2ZW50KGV2ZW50KSkK KyAgICBWaWV3R2VzdHVyZUNvbnRyb2xsZXIqIGNvbnRyb2xsZXIgPSB3ZWJraXRXZWJWaWV3QmFz ZVZpZXdHZXN0dXJlQ29udHJvbGxlcih3ZWJWaWV3QmFzZSk7CisgICAgaWYgKGNvbnRyb2xsZXIg JiYgY29udHJvbGxlci0+aXNTd2lwZUdlc3R1cmVFbmFibGVkKCkgJiYgY29udHJvbGxlci0+aGFu ZGxlU2Nyb2xsV2hlZWxFdmVudChldmVudCkpCiAgICAgICAgIHJldHVybiBHREtfRVZFTlRfU1RP UDsKIAogICAgIHdlYmtpdFdlYlZpZXdCYXNlSGFuZGxlV2hlZWxFdmVudCh3ZWJWaWV3QmFzZSwg cmVpbnRlcnByZXRfY2FzdDxHZGtFdmVudCo+KGV2ZW50KSk7CkBAIC0xMTg5LDkgKzExOTAsMjEg QEAgR2VzdHVyZUNvbnRyb2xsZXImIHdlYmtpdFdlYlZpZXdCYXNlR2VzdHVyZUNvbnRyb2xsZXIo V2ViS2l0V2ViVmlld0Jhc2UqIHdlYlZpZXcKIH0KICNlbmRpZgogCi1WaWV3R2VzdHVyZUNvbnRy b2xsZXImIHdlYmtpdFdlYlZpZXdCYXNlVmlld0dlc3R1cmVDb250cm9sbGVyKFdlYktpdFdlYlZp ZXdCYXNlKiB3ZWJWaWV3QmFzZSkKK3ZvaWQgd2Via2l0V2ViVmlld0Jhc2VTZXRFbmFibGVCYWNr Rm9yd2FyZE5hdmlnYXRpb25HZXN0dXJlKFdlYktpdFdlYlZpZXdCYXNlKiB3ZWJWaWV3QmFzZSwg Ym9vbCBlbmFibGVkKQogewotICAgIHJldHVybiAqd2ViVmlld0Jhc2UtPnByaXYtPnZpZXdHZXN0 dXJlQ29udHJvbGxlcjsKKyAgICBXZWJLaXRXZWJWaWV3QmFzZVByaXZhdGUqIHByaXYgPSB3ZWJW aWV3QmFzZS0+cHJpdjsKKworICAgIHByaXYtPmlzQmFja0ZvcndhcmROYXZpZ2F0aW9uR2VzdHVy ZUVuYWJsZWQgPSBlbmFibGVkOworCisgICAgaWYgKHByaXYtPnBhZ2VQcm94eS0+aGFzUnVubmlu Z1Byb2Nlc3MoKSkKKyAgICAgICAgd2ViVmlld0Jhc2UtPnByaXYtPnZpZXdHZXN0dXJlQ29udHJv bGxlci0+c2V0U3dpcGVHZXN0dXJlRW5hYmxlZChlbmFibGVkKTsKKworICAgIHByaXYtPnBhZ2VQ cm94eS0+c2V0U2hvdWxkUmVjb3JkTmF2aWdhdGlvblNuYXBzaG90cyhlbmFibGVkKTsKK30KKwor Vmlld0dlc3R1cmVDb250cm9sbGVyKiB3ZWJraXRXZWJWaWV3QmFzZVZpZXdHZXN0dXJlQ29udHJv bGxlcihXZWJLaXRXZWJWaWV3QmFzZSogd2ViVmlld0Jhc2UpCit7CisgICAgcmV0dXJuIHdlYlZp ZXdCYXNlLT5wcml2LT52aWV3R2VzdHVyZUNvbnRyb2xsZXIuZ2V0KCk7CiB9CiAKIHN0YXRpYyBn Ym9vbGVhbiB3ZWJraXRXZWJWaWV3QmFzZVF1ZXJ5VG9vbHRpcChHdGtXaWRnZXQqIHdpZGdldCwg Z2ludCAvKiB4ICovLCBnaW50IC8qIHkgKi8sIGdib29sZWFuIGtleWJvYXJkTW9kZSwgR3RrVG9v bHRpcCogdG9vbHRpcCkKQEAgLTE0MjAsOCArMTQzMyw2IEBAIHZvaWQgd2Via2l0V2ViVmlld0Jh c2VDcmVhdGVXZWJQYWdlKFdlYktpdFdlYlZpZXdCYXNlKiB3ZWJraXRXZWJWaWV3QmFzZSwgUmVm PEFQCiAgICAgcHJpdi0+cGFnZVByb3h5LT5zZXRJbnRyaW5zaWNEZXZpY2VTY2FsZUZhY3Rvcihn dGtfd2lkZ2V0X2dldF9zY2FsZV9mYWN0b3IoR1RLX1dJREdFVCh3ZWJraXRXZWJWaWV3QmFzZSkp KTsKICAgICBnX3NpZ25hbF9jb25uZWN0KHdlYmtpdFdlYlZpZXdCYXNlLCAibm90aWZ5OjpzY2Fs ZS1mYWN0b3IiLCBHX0NBTExCQUNLKGRldmljZVNjYWxlRmFjdG9yQ2hhbmdlZCksIG51bGxwdHIp OwogI2VuZGlmCi0KLSAgICBwcml2LT52aWV3R2VzdHVyZUNvbnRyb2xsZXIgPSBzdGQ6Om1ha2Vf dW5pcXVlPFdlYktpdDo6Vmlld0dlc3R1cmVDb250cm9sbGVyPigqcHJpdi0+cGFnZVByb3h5KTsK IH0KIAogdm9pZCB3ZWJraXRXZWJWaWV3QmFzZVNldFRvb2x0aXBUZXh0KFdlYktpdFdlYlZpZXdC YXNlKiB3ZWJWaWV3QmFzZSwgY29uc3QgY2hhciogdG9vbHRpcCkKQEAgLTE2MzksMTEgKzE2NTAs MTIgQEAgdm9pZCB3ZWJraXRXZWJWaWV3QmFzZURpZFJlbGF1bmNoV2ViUHJvY2VzcyhXZWJLaXRX ZWJWaWV3QmFzZSogd2Via2l0V2ViVmlld0Jhc2UKICAgICAvLyBRdWV1ZSBhIHJlc2l6ZSB0byBl bnN1cmUgdGhlIG5ldyBEcmF3aW5nQXJlYVByb3h5IGlzIHJlc2l6ZWQuCiAgICAgZ3RrX3dpZGdl dF9xdWV1ZV9yZXNpemVfbm9fcmVkcmF3KEdUS19XSURHRVQod2Via2l0V2ViVmlld0Jhc2UpKTsK IAorICAgIFdlYktpdFdlYlZpZXdCYXNlUHJpdmF0ZSogcHJpdiA9IHdlYmtpdFdlYlZpZXdCYXNl LT5wcml2OworCiAjaWYgUExBVEZPUk0oWDExKSAmJiBVU0UoVEVYVFVSRV9NQVBQRVJfR0wpICYm ICFVU0UoUkVESVJFQ1RFRF9YQ09NUE9TSVRFX1dJTkRPVykKICAgICBpZiAoUGxhdGZvcm1EaXNw bGF5OjpzaGFyZWREaXNwbGF5KCkudHlwZSgpICE9IFBsYXRmb3JtRGlzcGxheTo6VHlwZTo6WDEx KQogICAgICAgICByZXR1cm47CiAKLSAgICBXZWJLaXRXZWJWaWV3QmFzZVByaXZhdGUqIHByaXYg PSB3ZWJraXRXZWJWaWV3QmFzZS0+cHJpdjsKICAgICBhdXRvKiBkcmF3aW5nQXJlYSA9IHN0YXRp Y19jYXN0PERyYXdpbmdBcmVhUHJveHlDb29yZGluYXRlZEdyYXBoaWNzKj4ocHJpdi0+cGFnZVBy b3h5LT5kcmF3aW5nQXJlYSgpKTsKICAgICBBU1NFUlQoZHJhd2luZ0FyZWEpOwogCkBAIC0xNjU1 LDYgKzE2NjcsOSBAQCB2b2lkIHdlYmtpdFdlYlZpZXdCYXNlRGlkUmVsYXVuY2hXZWJQcm9jZXNz KFdlYktpdFdlYlZpZXdCYXNlKiB3ZWJraXRXZWJWaWV3QmFzZQogI2Vsc2UKICAgICBVTlVTRURf UEFSQU0od2Via2l0V2ViVmlld0Jhc2UpOwogI2VuZGlmCisKKyAgICBwcml2LT52aWV3R2VzdHVy ZUNvbnRyb2xsZXIgPSBzdGQ6Om1ha2VfdW5pcXVlPFdlYktpdDo6Vmlld0dlc3R1cmVDb250cm9s bGVyPigqcHJpdi0+cGFnZVByb3h5KTsKKyAgICBwcml2LT52aWV3R2VzdHVyZUNvbnRyb2xsZXIt PnNldFN3aXBlR2VzdHVyZUVuYWJsZWQocHJpdi0+aXNCYWNrRm9yd2FyZE5hdmlnYXRpb25HZXN0 dXJlRW5hYmxlZCk7CiB9CiAKIHZvaWQgd2Via2l0V2ViVmlld0Jhc2VQYWdlQ2xvc2VkKFdlYktp dFdlYlZpZXdCYXNlKiB3ZWJraXRXZWJWaWV3QmFzZSkKQEAgLTE3MDAsMzYgKzE3MTUsNDIgQEAg UmVmUHRyPFdlYktpdDo6Vmlld1NuYXBzaG90PiB3ZWJraXRXZWJWaWV3QmFzZVRha2VWaWV3U25h cHNob3QoV2ViS2l0V2ViVmlld0Jhc2UKIAogdm9pZCB3ZWJraXRXZWJWaWV3QmFzZURpZFN0YXJ0 UHJvdmlzaW9uYWxMb2FkRm9yTWFpbkZyYW1lKFdlYktpdFdlYlZpZXdCYXNlKiB3ZWJraXRXZWJW aWV3QmFzZSkKIHsKLSAgICBpZiAod2Via2l0V2ViVmlld0Jhc2UtPnByaXYtPnZpZXdHZXN0dXJl Q29udHJvbGxlci0+aXNTd2lwZUdlc3R1cmVFbmFibGVkKCkpCi0gICAgICAgIHdlYmtpdFdlYlZp ZXdCYXNlLT5wcml2LT52aWV3R2VzdHVyZUNvbnRyb2xsZXItPmRpZFN0YXJ0UHJvdmlzaW9uYWxM b2FkRm9yTWFpbkZyYW1lKCk7CisgICAgVmlld0dlc3R1cmVDb250cm9sbGVyKiBjb250cm9sbGVy ID0gd2Via2l0V2ViVmlld0Jhc2VWaWV3R2VzdHVyZUNvbnRyb2xsZXIod2Via2l0V2ViVmlld0Jh c2UpOworICAgIGlmIChjb250cm9sbGVyICYmIGNvbnRyb2xsZXItPmlzU3dpcGVHZXN0dXJlRW5h YmxlZCgpKQorICAgICAgICBjb250cm9sbGVyLT5kaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvck1h aW5GcmFtZSgpOwogfQogCiB2b2lkIHdlYmtpdFdlYlZpZXdCYXNlRGlkRmlyc3RWaXN1YWxseU5v bkVtcHR5TGF5b3V0Rm9yTWFpbkZyYW1lKFdlYktpdFdlYlZpZXdCYXNlKiB3ZWJraXRXZWJWaWV3 QmFzZSkKIHsKLSAgICBpZiAod2Via2l0V2ViVmlld0Jhc2UtPnByaXYtPnZpZXdHZXN0dXJlQ29u dHJvbGxlci0+aXNTd2lwZUdlc3R1cmVFbmFibGVkKCkpCi0gICAgICAgIHdlYmtpdFdlYlZpZXdC YXNlLT5wcml2LT52aWV3R2VzdHVyZUNvbnRyb2xsZXItPmRpZEZpcnN0VmlzdWFsbHlOb25FbXB0 eUxheW91dEZvck1haW5GcmFtZSgpOworICAgIFZpZXdHZXN0dXJlQ29udHJvbGxlciogY29udHJv bGxlciA9IHdlYmtpdFdlYlZpZXdCYXNlVmlld0dlc3R1cmVDb250cm9sbGVyKHdlYmtpdFdlYlZp ZXdCYXNlKTsKKyAgICBpZiAoY29udHJvbGxlciAmJiBjb250cm9sbGVyLT5pc1N3aXBlR2VzdHVy ZUVuYWJsZWQoKSkKKyAgICAgICAgY29udHJvbGxlci0+ZGlkRmlyc3RWaXN1YWxseU5vbkVtcHR5 TGF5b3V0Rm9yTWFpbkZyYW1lKCk7CiB9CiAKIHZvaWQgd2Via2l0V2ViVmlld0Jhc2VEaWRGaW5p c2hMb2FkRm9yTWFpbkZyYW1lKFdlYktpdFdlYlZpZXdCYXNlKiB3ZWJraXRXZWJWaWV3QmFzZSkK IHsKLSAgICBpZiAod2Via2l0V2ViVmlld0Jhc2UtPnByaXYtPnZpZXdHZXN0dXJlQ29udHJvbGxl ci0+aXNTd2lwZUdlc3R1cmVFbmFibGVkKCkpCi0gICAgICAgIHdlYmtpdFdlYlZpZXdCYXNlLT5w cml2LT52aWV3R2VzdHVyZUNvbnRyb2xsZXItPmRpZEZpbmlzaExvYWRGb3JNYWluRnJhbWUoKTsK KyAgICBWaWV3R2VzdHVyZUNvbnRyb2xsZXIqIGNvbnRyb2xsZXIgPSB3ZWJraXRXZWJWaWV3QmFz ZVZpZXdHZXN0dXJlQ29udHJvbGxlcih3ZWJraXRXZWJWaWV3QmFzZSk7CisgICAgaWYgKGNvbnRy b2xsZXIgJiYgY29udHJvbGxlci0+aXNTd2lwZUdlc3R1cmVFbmFibGVkKCkpCisgICAgICAgIGNv bnRyb2xsZXItPmRpZEZpbmlzaExvYWRGb3JNYWluRnJhbWUoKTsKIH0KIAogdm9pZCB3ZWJraXRX ZWJWaWV3QmFzZURpZEZhaWxMb2FkRm9yTWFpbkZyYW1lKFdlYktpdFdlYlZpZXdCYXNlKiB3ZWJr aXRXZWJWaWV3QmFzZSkKIHsKLSAgICBpZiAod2Via2l0V2ViVmlld0Jhc2UtPnByaXYtPnZpZXdH ZXN0dXJlQ29udHJvbGxlci0+aXNTd2lwZUdlc3R1cmVFbmFibGVkKCkpCi0gICAgICAgIHdlYmtp dFdlYlZpZXdCYXNlLT5wcml2LT52aWV3R2VzdHVyZUNvbnRyb2xsZXItPmRpZEZhaWxMb2FkRm9y TWFpbkZyYW1lKCk7CisgICAgVmlld0dlc3R1cmVDb250cm9sbGVyKiBjb250cm9sbGVyID0gd2Vi a2l0V2ViVmlld0Jhc2VWaWV3R2VzdHVyZUNvbnRyb2xsZXIod2Via2l0V2ViVmlld0Jhc2UpOwor ICAgIGlmIChjb250cm9sbGVyICYmIGNvbnRyb2xsZXItPmlzU3dpcGVHZXN0dXJlRW5hYmxlZCgp KQorICAgICAgICBjb250cm9sbGVyLT5kaWRGYWlsTG9hZEZvck1haW5GcmFtZSgpOwogfQogCiB2 b2lkIHdlYmtpdFdlYlZpZXdCYXNlRGlkU2FtZURvY3VtZW50TmF2aWdhdGlvbkZvck1haW5GcmFt ZShXZWJLaXRXZWJWaWV3QmFzZSogd2Via2l0V2ViVmlld0Jhc2UsIFNhbWVEb2N1bWVudE5hdmln YXRpb25UeXBlIHR5cGUpCiB7Ci0gICAgaWYgKHdlYmtpdFdlYlZpZXdCYXNlLT5wcml2LT52aWV3 R2VzdHVyZUNvbnRyb2xsZXItPmlzU3dpcGVHZXN0dXJlRW5hYmxlZCgpKQotICAgICAgICB3ZWJr aXRXZWJWaWV3QmFzZS0+cHJpdi0+dmlld0dlc3R1cmVDb250cm9sbGVyLT5kaWRTYW1lRG9jdW1l bnROYXZpZ2F0aW9uRm9yTWFpbkZyYW1lKHR5cGUpOworICAgIFZpZXdHZXN0dXJlQ29udHJvbGxl ciogY29udHJvbGxlciA9IHdlYmtpdFdlYlZpZXdCYXNlVmlld0dlc3R1cmVDb250cm9sbGVyKHdl YmtpdFdlYlZpZXdCYXNlKTsKKyAgICBpZiAoY29udHJvbGxlciAmJiBjb250cm9sbGVyLT5pc1N3 aXBlR2VzdHVyZUVuYWJsZWQoKSkKKyAgICAgICAgY29udHJvbGxlci0+ZGlkU2FtZURvY3VtZW50 TmF2aWdhdGlvbkZvck1haW5GcmFtZSh0eXBlKTsKIH0KIAogdm9pZCB3ZWJraXRXZWJWaWV3QmFz ZURpZFJlc3RvcmVTY3JvbGxQb3NpdGlvbihXZWJLaXRXZWJWaWV3QmFzZSogd2Via2l0V2ViVmll d0Jhc2UpCiB7Ci0gICAgaWYgKHdlYmtpdFdlYlZpZXdCYXNlLT5wcml2LT52aWV3R2VzdHVyZUNv bnRyb2xsZXItPmlzU3dpcGVHZXN0dXJlRW5hYmxlZCgpKQorICAgIFZpZXdHZXN0dXJlQ29udHJv bGxlciogY29udHJvbGxlciA9IHdlYmtpdFdlYlZpZXdCYXNlVmlld0dlc3R1cmVDb250cm9sbGVy KHdlYmtpdFdlYlZpZXdCYXNlKTsKKyAgICBpZiAoY29udHJvbGxlciAmJiBjb250cm9sbGVyLT5p c1N3aXBlR2VzdHVyZUVuYWJsZWQoKSkKICAgICAgICAgd2Via2l0V2ViVmlld0Jhc2UtPnByaXYt PnZpZXdHZXN0dXJlQ29udHJvbGxlci0+ZGlkUmVzdG9yZVNjcm9sbFBvc2l0aW9uKCk7CiB9CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdC YXNlUHJpdmF0ZS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJW aWV3QmFzZVByaXZhdGUuaAppbmRleCAxMzYwMjg1YmZhMjM2YjRjMzVjNzQ0NGYyNTllMTY5OGY0 YTA0NTFmLi41NGZlMDFlNWMzMDlhMjk0ODlhOGRlOTIyNjJkYzg5N2M3MTY5NWFhIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlUHJp dmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmll d0Jhc2VQcml2YXRlLmgKQEAgLTg0LDcgKzg0LDggQEAgV2ViS2l0OjpHZXN0dXJlQ29udHJvbGxl ciYgd2Via2l0V2ViVmlld0Jhc2VHZXN0dXJlQ29udHJvbGxlcihXZWJLaXRXZWJWaWV3QmFzZSoK IAogUmVmUHRyPFdlYktpdDo6Vmlld1NuYXBzaG90PiB3ZWJraXRXZWJWaWV3QmFzZVRha2VWaWV3 U25hcHNob3QoV2ViS2l0V2ViVmlld0Jhc2UqKTsKIAotV2ViS2l0OjpWaWV3R2VzdHVyZUNvbnRy b2xsZXImIHdlYmtpdFdlYlZpZXdCYXNlVmlld0dlc3R1cmVDb250cm9sbGVyKFdlYktpdFdlYlZp ZXdCYXNlKik7Cit2b2lkIHdlYmtpdFdlYlZpZXdCYXNlU2V0RW5hYmxlQmFja0ZvcndhcmROYXZp Z2F0aW9uR2VzdHVyZShXZWJLaXRXZWJWaWV3QmFzZSosIGJvb2wgZW5hYmxlZCk7CitXZWJLaXQ6 OlZpZXdHZXN0dXJlQ29udHJvbGxlciogd2Via2l0V2ViVmlld0Jhc2VWaWV3R2VzdHVyZUNvbnRy b2xsZXIoV2ViS2l0V2ViVmlld0Jhc2UqKTsKIAogdm9pZCB3ZWJraXRXZWJWaWV3QmFzZURpZFN0 YXJ0UHJvdmlzaW9uYWxMb2FkRm9yTWFpbkZyYW1lKFdlYktpdFdlYlZpZXdCYXNlKik7CiB2b2lk IHdlYmtpdFdlYlZpZXdCYXNlRGlkRmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0Rm9yTWFpbkZy YW1lKFdlYktpdFdlYlZpZXdCYXNlKik7Cg==