222985 2021-03-09 10:00:34 -0800 [GTK] Duplicate WebKitWebView::show-option-menu confuses introspection, should use --warn-error when building gir 2022-09-20 14:08:48 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build PC Linux RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=222803 P2 Normal --- 178901 226662 1 mcatanzaro mcatanzaro annulen aperez berto bugs-noreply cgarcia ews-watchlist gustavo gyuyoung.kim mcatanzaro ryuan.choi sergio oldest_to_newest 1737633 0 mcatanzaro 2021-03-09 10:00:34 -0800 Since bug #222803 we use --warn-error when generating the JavaScriptCore gir. We should do this for the WebKit gir as well, to ensure we don't release broken gir. Problem is we in fact currently releasing a broken gir, and must fix that first: [29/72] Generating ../../WebKit2-4.0.gir ../../../../Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp:2207: Warning: WebKit2: multiple comment blocks documenting 'WebKitWebView::show-option-menu:' identifier (already seen at WebKitWebView.cpp:2171). ../../../../Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp:2207: Warning: WebKit2: incorrect number of parameters in comment block, parameter annotations will be ignored. 1768248 1 mcatanzaro 2021-06-09 11:32:17 -0700 Looks like the WPE version of our introspection is winning: <glib:signal name="show-option-menu" when="last" version="2.28"> <doc xml:space="preserve" filename="../Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp" line="2207">This signal is emitted when a select element in @web_view needs to display a dropdown menu. This signal can be used to show a custom menu, using @menu to get the details of all items that should be displayed. The area of the element in the #WebKitWebView is given as @rectangle parameter, it can be used to position the menu. To handle this signal asynchronously you should keep a ref of the @menu.</doc> <return-value transfer-ownership="none"> <doc xml:space="preserve" filename="../Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp" line="2220">%TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further.</doc> <type name="gboolean" c:type="gboolean"/> </return-value> <parameters> <parameter name="object" transfer-ownership="none"> <type name="OptionMenu"/> </parameter> <parameter name="p0" transfer-ownership="none"> <type name="Gdk.Event"/> </parameter> <parameter name="p1" transfer-ownership="none"> <type name="Gdk.Rectangle"/> </parameter> </parameters> </glib:signal> So... that's bad. I've tried various ways of passing -DPLATFORM_GTK to the introspection scanner, but I'm not having much luck. I got it to work by splitting the signal declaration out into the GTK and WPE files. 1768251 2 430983 mcatanzaro 2021-06-09 11:38:12 -0700 Created attachment 430983 Patch 1768252 3 ews-watchlist 2021-06-09 11:39:15 -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 https://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 1768253 4 mcatanzaro 2021-06-09 11:40:51 -0700 (In reply to Michael Catanzaro from comment #1) > </parameter> > <parameter name="p0" transfer-ownership="none"> > <type name="Gdk.Event"/> > </parameter> > <parameter name="p1" transfer-ownership="none"> > <type name="Gdk.Rectangle"/> > </parameter> Heh, it took the *documentation* from the WPE version of the signal, but it took the *parameter list* from the GTK version of the signal. So that could have been a lot worse. Let me revise the commit message. 1768257 5 430984 mcatanzaro 2021-06-09 11:44:39 -0700 Created attachment 430984 Patch 1768259 6 mcatanzaro 2021-06-09 11:47:55 -0700 With this patch, the generated signal looks much better: <glib:signal name="show-option-menu" when="last" version="2.18"> <doc xml:space="preserve" filename="../../Source/WebKit/UIProcess/API/gtk/WebKitWebViewGtk.cpp" line="471">This signal is emitted when a select element in @web_view needs to display a dropdown menu. This signal can be used to show a custom menu, using @menu to get the details of all items that should be displayed. The area of the element in the #WebKitWebView is given as @rectangle parameter, it can be used to position the menu. If this was triggered by a user interaction, like a mouse click, @event parameter provides the #GdkEvent. To handle this signal asynchronously you should keep a ref of the @menu. The default signal handler will pop up a #GtkMenu.</doc> <return-value transfer-ownership="none"> <doc xml:space="preserve" filename="../../Source/WebKit/UIProcess/API/gtk/WebKitWebViewGtk.cpp" line="488">%TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further.</doc> <type name="gboolean" c:type="gboolean"/> </return-value> <parameters> <parameter name="menu" transfer-ownership="none"> <doc xml:space="preserve" filename="../../Source/WebKit/UIProcess/API/gtk/WebKitWebViewGtk.cpp" line="474">the #WebKitOptionMenu</doc> <type name="OptionMenu"/> </parameter> <parameter name="event" transfer-ownership="none"> <doc xml:space="preserve" filename="../../Source/WebKit/UIProcess/API/gtk/WebKitWebViewGtk.cpp" line="475">the #GdkEvent that triggered the menu, or %NULL</doc> <type name="Gdk.Event"/> </parameter> <parameter name="rectangle" transfer-ownership="none"> <doc xml:space="preserve" filename="../../Source/WebKit/UIProcess/API/gtk/WebKitWebViewGtk.cpp" line="476">the option element area</doc> <type name="Gdk.Rectangle"/> </parameter> </parameters> </glib:signal> It will break any code that relied on positional parameters with the broken names p0 and p1, but those are obviously-broken names that a reasonable developer should not rely on, and it's very unlikely to be a problem. 1768279 7 430984 aperez 2021-06-09 12:27:39 -0700 Comment on attachment 430984 Patch Nice one, thanks for the patch! View in context: https://bugs.webkit.org/attachment.cgi?id=430984&action=review > Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp:2177 > + signals[SHOW_OPTION_MENU] = createShowOptionMenuSignal(webViewClass); This looks a bit awkward, but makes sense. I suppose that's only because it's the first and only place where this is being done ;-) 1768283 8 430984 mcatanzaro 2021-06-09 12:31:47 -0700 Comment on attachment 430984 Patch I think we'll need this all over the place for GTK 3 vs. GTK 4, unless we can come up with something better.... 1768351 9 ews-feeder 2021-06-09 14:28:55 -0700 Found 1 new test failure: imported/w3c/web-platform-tests/navigation-timing/nav2_test_attributes_values.html 1768387 10 ews-feeder 2021-06-09 16:44:47 -0700 Committed r278682 (238659@main): <https://commits.webkit.org/238659@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 430984. 1899934 11 mcatanzaro 2022-09-20 14:08:48 -0700 *** Bug 206794 has been marked as a duplicate of this bug. *** 430983 2021-06-09 11:38:12 -0700 2021-06-09 11:44:35 -0700 Patch bug-222985-20210609133811.patch text/plain 10856 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4NjI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDE5YjllZGExZTAxZjEzZmIw MDhiOWYzMWNiM2EyMDUyNWJhYjIzZGQuLjJmNjI5YjM5NDBhY2Y4ZTU2YmY3NDNiOGRmN2U3NzJh YWY2OGZiMDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAKKzIwMjEtMDYtMDkgIE1pY2hhZWwg Q2F0YW56YXJvICA8bWNhdGFuemFyb0Bnbm9tZS5vcmc+CisKKyAgICAgICAgW0dUS10gV2ViS2l0 V2ViVmlldzo6c2hvdy1vcHRpb24tbWVudSBpbnRyb3NwZWN0aW9uIGlzIGJyb2tlbiwgc2hvdWxk IHVzZSAtLXdhcm4tZXJyb3Igd2hlbiBidWlsZGluZyBnaXIKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMjk4NQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVuZm9ydHVuYXRlbHkgV2ViS2l0V2ViVmlldzo6 c2hvdy1vcHRpb24tbWVudSBoYXMgZGlmZmVyZW50IHBhcmFtZXRlcnMgZm9yIEdUSyB0aGFuIGl0 IGRvZXMKKyAgICAgICAgZm9yIFdQRS4gVW5mb3J0dW5hdGVseSwgYWRkaW5nIHRoZSBXUEUgdmVy c2lvbiBvZiB0aGlzIHNpZ25hbCBicm9rZSBHVEsgYmVjYXVzZQorICAgICAgICBpbnRyb3NwZWN0 aW9uIGRvZXMgbm90IHJlc3BlY3QgI2lmIFBMQVRGT1JNIGNvbmRpdGlvbmFscywgYW5kIGl0IHNl ZW1zIHRoZSB2ZXJzaW9uIGxpc3RlZAorICAgICAgICBsYXN0IHdpbnMuCisKKyAgICAgICAgV2Ug Y2FuIGZpeCB0aGlzIGJ5IG1vdmluZyB0aGUgaW50cm9zcGVjdGlvbiBjb21tZW50IGludG8gcGxh dGZvcm0tc3BlY2lmaWMgZmlsZXMuCisKKyAgICAgICAgQWRkaXRpb25hbGx5LCBsZXQncyB1c2Ug LS13YXJuLWVycm9yIHRvIHR1cm4gd2FybmluZ3MgaW50byBlcnJvcnMgdG8gcHJldmVudCB0aGlz IGZyb20gZXZlcgorICAgICAgICBoYXBwZW5pbmcgYWdhaW4sIGFzIHdlIGFscmVhZHkgZG8gd2hl biBnZW5lcmF0aW5nIGludHJvc3BlY3Rpb24gZm9yIEphdmFTY3JpcHRDb3JlLgorCisgICAgICAg ICogUGxhdGZvcm1HVEsuY21ha2U6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9nbGliL1dlYktp dFdlYlZpZXcuY3BwOgorICAgICAgICAod2Via2l0X3dlYl92aWV3X2NsYXNzX2luaXQpOgorICAg ICAgICAqIFVJUHJvY2Vzcy9BUEkvZ2xpYi9XZWJLaXRXZWJWaWV3UHJpdmF0ZS5oOgorICAgICAg ICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdHdGsuY3BwOgorICAgICAgICAoY3Jl YXRlU2hvd09wdGlvbk1lbnVTaWduYWwpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvd3BlL1dl YktpdFdlYlZpZXdXUEUuY3BwOgorICAgICAgICAoY3JlYXRlU2hvd09wdGlvbk1lbnVTaWduYWwp OgorCiAyMDIxLTA2LTA4ICBUcnVpdHQgU2F2ZWxsICA8dHNhdmVsbEBhcHBsZS5jb20+CiAKICAg ICAgICAgVW5yZXZpZXdlZCwgcmV2ZXJ0aW5nIHIyNzg2MDkuCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1BsYXRmb3JtR1RLLmNtYWtlIGIvU291cmNlL1dlYktpdC9QbGF0Zm9ybUdUSy5jbWFr ZQppbmRleCA2Y2ZhZjI4ODJhNzFlNzg3Zjk4MTlmNmYwNzJmNDM5NDViMjRlZGI1Li43ZmMzNmE0 Mzg0MDc0OGE2MGNjYzM2MzIxYzgyM2Q2ZDNjYWE0NzAzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1BsYXRmb3JtR1RLLmNtYWtlCisrKyBiL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm1HVEsuY21h a2UKQEAgLTY2NCw2ICs2NjQsNyBAQCBpZiAoRU5BQkxFX0lOVFJPU1BFQ1RJT04pCiAgICAgICAg ICAgICAke0lOVFJPU1BFQ1RJT05fU0NBTk5FUn0KICAgICAgICAgICAgIC0tcXVpZXQKICAgICAg ICAgICAgIC0td2Fybi1hbGwKKyAgICAgICAgICAgIC0td2Fybi1lcnJvcgogICAgICAgICAgICAg LS1zeW1ib2wtcHJlZml4PXdlYmtpdAogICAgICAgICAgICAgLS1pZGVudGlmaWVyLXByZWZpeD1X ZWJLaXQKICAgICAgICAgICAgIC0tbmFtZXNwYWNlPVdlYktpdDIKQEAgLTcxMCw2ICs3MTEsNyBA QCBpZiAoRU5BQkxFX0lOVFJPU1BFQ1RJT04pCiAgICAgICAgICAgICAke0lOVFJPU1BFQ1RJT05f U0NBTk5FUn0KICAgICAgICAgICAgIC0tcXVpZXQKICAgICAgICAgICAgIC0td2Fybi1hbGwKKyAg ICAgICAgICAgIC0td2Fybi1lcnJvcgogICAgICAgICAgICAgLS1zeW1ib2wtcHJlZml4PXdlYmtp dAogICAgICAgICAgICAgLS1pZGVudGlmaWVyLXByZWZpeD1XZWJLaXQKICAgICAgICAgICAgIC0t bmFtZXNwYWNlPVdlYktpdDJXZWJFeHRlbnNpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0FQSS9nbGliL1dlYktpdFdlYlZpZXcuY3BwIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQVBJL2dsaWIvV2ViS2l0V2ViVmlldy5jcHAKaW5kZXggZjJhODg2ZmZmYzM2NjA4YzYz MmIwMzQ5YjRmZTUxN2RhY2ZiMTUxNC4uYTY4NTkxMzZhZTcwZDY1ODk5MTZjNGRjNTE5YWNhMGYy MTNkNzExYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2dsaWIvV2Vi S2l0V2ViVmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2dsaWIvV2Vi S2l0V2ViVmlldy5jcHAKQEAgLTIxNzAsNzIgKzIxNzAsMTEgQEAgc3RhdGljIHZvaWQgd2Via2l0 X3dlYl92aWV3X2NsYXNzX2luaXQoV2ViS2l0V2ViVmlld0NsYXNzKiB3ZWJWaWV3Q2xhc3MpCiAg ICAgICAgIGdfY2Nsb3N1cmVfbWFyc2hhbF9nZW5lcmljLAogICAgICAgICBHX1RZUEVfQk9PTEVB TiwgMSwKICAgICAgICAgV0VCS0lUX1RZUEVfQ09MT1JfQ0hPT1NFUl9SRVFVRVNUKTsKLQotICAg IC8qKgotICAgICAqIFdlYktpdFdlYlZpZXc6OnNob3ctb3B0aW9uLW1lbnU6Ci0gICAgICogQHdl Yl92aWV3OiB0aGUgI1dlYktpdFdlYlZpZXcgb24gd2hpY2ggdGhlIHNpZ25hbCBpcyBlbWl0dGVk Ci0gICAgICogQG1lbnU6IHRoZSAjV2ViS2l0T3B0aW9uTWVudQotICAgICAqIEBldmVudDogdGhl ICNHZGtFdmVudCB0aGF0IHRyaWdnZXJlZCB0aGUgbWVudSwgb3IgJU5VTEwKLSAgICAgKiBAcmVj dGFuZ2xlOiB0aGUgb3B0aW9uIGVsZW1lbnQgYXJlYQotICAgICAqCi0gICAgICogVGhpcyBzaWdu YWwgaXMgZW1pdHRlZCB3aGVuIGEgc2VsZWN0IGVsZW1lbnQgaW4gQHdlYl92aWV3IG5lZWRzIHRv IGRpc3BsYXkgYQotICAgICAqIGRyb3Bkb3duIG1lbnUuIFRoaXMgc2lnbmFsIGNhbiBiZSB1c2Vk IHRvIHNob3cgYSBjdXN0b20gbWVudSwgdXNpbmcgQG1lbnUgdG8gZ2V0Ci0gICAgICogdGhlIGRl dGFpbHMgb2YgYWxsIGl0ZW1zIHRoYXQgc2hvdWxkIGJlIGRpc3BsYXllZC4gVGhlIGFyZWEgb2Yg dGhlIGVsZW1lbnQgaW4gdGhlCi0gICAgICogI1dlYktpdFdlYlZpZXcgaXMgZ2l2ZW4gYXMgQHJl Y3RhbmdsZSBwYXJhbWV0ZXIsIGl0IGNhbiBiZSB1c2VkIHRvIHBvc2l0aW9uIHRoZQotICAgICAq IG1lbnUuIElmIHRoaXMgd2FzIHRyaWdnZXJlZCBieSBhIHVzZXIgaW50ZXJhY3Rpb24sIGxpa2Ug YSBtb3VzZSBjbGljaywKLSAgICAgKiBAZXZlbnQgcGFyYW1ldGVyIHByb3ZpZGVzIHRoZSAjR2Rr RXZlbnQuCi0gICAgICogVG8gaGFuZGxlIHRoaXMgc2lnbmFsIGFzeW5jaHJvbm91c2x5IHlvdSBz aG91bGQga2VlcCBhIHJlZiBvZiB0aGUgQG1lbnUuCi0gICAgICoKLSAgICAgKiBUaGUgZGVmYXVs dCBzaWduYWwgaGFuZGxlciB3aWxsIHBvcCB1cCBhICNHdGtNZW51LgotICAgICAqCi0gICAgICog UmV0dXJuczogJVRSVUUgdG8gc3RvcCBvdGhlciBoYW5kbGVycyBmcm9tIGJlaW5nIGludm9rZWQg Zm9yIHRoZSBldmVudC4KLSAgICAgKiAgICVGQUxTRSB0byBwcm9wYWdhdGUgdGhlIGV2ZW50IGZ1 cnRoZXIuCi0gICAgICoKLSAgICAgKiBTaW5jZTogMi4xOAotICAgICAqLwotICAgIHNpZ25hbHNb U0hPV19PUFRJT05fTUVOVV0gPSBnX3NpZ25hbF9uZXcoCi0gICAgICAgICJzaG93LW9wdGlvbi1t ZW51IiwKLSAgICAgICAgR19UWVBFX0ZST01fQ0xBU1Mod2ViVmlld0NsYXNzKSwKLSAgICAgICAg R19TSUdOQUxfUlVOX0xBU1QsCi0gICAgICAgIEdfU1RSVUNUX09GRlNFVChXZWJLaXRXZWJWaWV3 Q2xhc3MsIHNob3dfb3B0aW9uX21lbnUpLAotICAgICAgICBnX3NpZ25hbF9hY2N1bXVsYXRvcl90 cnVlX2hhbmRsZWQsIG51bGxwdHIsCi0gICAgICAgIGdfY2Nsb3N1cmVfbWFyc2hhbF9nZW5lcmlj LAotICAgICAgICBHX1RZUEVfQk9PTEVBTiwgMywKLSAgICAgICAgV0VCS0lUX1RZUEVfT1BUSU9O X01FTlUsCi0gICAgICAgIEdES19UWVBFX0VWRU5UIHwgR19TSUdOQUxfVFlQRV9TVEFUSUNfU0NP UEUsCi0gICAgICAgIEdES19UWVBFX1JFQ1RBTkdMRSB8IEdfU0lHTkFMX1RZUEVfU1RBVElDX1ND T1BFKTsKICNlbmRpZiAvLyBQTEFURk9STShHVEspCiAKLSNpZiBQTEFURk9STShXUEUpCi0gICAg LyoqCi0gICAgICogV2ViS2l0V2ViVmlldzo6c2hvdy1vcHRpb24tbWVudToKLSAgICAgKiBAd2Vi X3ZpZXc6IHRoZSAjV2ViS2l0V2ViVmlldyBvbiB3aGljaCB0aGUgc2lnbmFsIGlzIGVtaXR0ZWQK LSAgICAgKiBAbWVudTogdGhlICNXZWJLaXRPcHRpb25NZW51Ci0gICAgICogQHJlY3RhbmdsZTog dGhlIG9wdGlvbiBlbGVtZW50IGFyZWEKLSAgICAgKgotICAgICAqIFRoaXMgc2lnbmFsIGlzIGVt aXR0ZWQgd2hlbiBhIHNlbGVjdCBlbGVtZW50IGluIEB3ZWJfdmlldyBuZWVkcyB0byBkaXNwbGF5 IGEKLSAgICAgKiBkcm9wZG93biBtZW51LiBUaGlzIHNpZ25hbCBjYW4gYmUgdXNlZCB0byBzaG93 IGEgY3VzdG9tIG1lbnUsIHVzaW5nIEBtZW51IHRvIGdldAotICAgICAqIHRoZSBkZXRhaWxzIG9m IGFsbCBpdGVtcyB0aGF0IHNob3VsZCBiZSBkaXNwbGF5ZWQuIFRoZSBhcmVhIG9mIHRoZSBlbGVt ZW50IGluIHRoZQotICAgICAqICNXZWJLaXRXZWJWaWV3IGlzIGdpdmVuIGFzIEByZWN0YW5nbGUg cGFyYW1ldGVyLCBpdCBjYW4gYmUgdXNlZCB0byBwb3NpdGlvbiB0aGUKLSAgICAgKiBtZW51Lgot ICAgICAqIFRvIGhhbmRsZSB0aGlzIHNpZ25hbCBhc3luY2hyb25vdXNseSB5b3Ugc2hvdWxkIGtl ZXAgYSByZWYgb2YgdGhlIEBtZW51LgotICAgICAqCi0gICAgICogUmV0dXJuczogJVRSVUUgdG8g c3RvcCBvdGhlciBoYW5kbGVycyBmcm9tIGJlaW5nIGludm9rZWQgZm9yIHRoZSBldmVudC4KLSAg ICAgKiAgICVGQUxTRSB0byBwcm9wYWdhdGUgdGhlIGV2ZW50IGZ1cnRoZXIuCi0gICAgICoKLSAg ICAgKiBTaW5jZTogMi4yOAotICAgICAqLwotICAgIHNpZ25hbHNbU0hPV19PUFRJT05fTUVOVV0g PSBnX3NpZ25hbF9uZXcoCi0gICAgICAgICJzaG93LW9wdGlvbi1tZW51IiwKLSAgICAgICAgR19U WVBFX0ZST01fQ0xBU1Mod2ViVmlld0NsYXNzKSwKLSAgICAgICAgR19TSUdOQUxfUlVOX0xBU1Qs Ci0gICAgICAgIEdfU1RSVUNUX09GRlNFVChXZWJLaXRXZWJWaWV3Q2xhc3MsIHNob3dfb3B0aW9u X21lbnUpLAotICAgICAgICBnX3NpZ25hbF9hY2N1bXVsYXRvcl90cnVlX2hhbmRsZWQsIG51bGxw dHIsCi0gICAgICAgIGdfY2Nsb3N1cmVfbWFyc2hhbF9nZW5lcmljLAotICAgICAgICBHX1RZUEVf Qk9PTEVBTiwgMiwKLSAgICAgICAgV0VCS0lUX1RZUEVfT1BUSU9OX01FTlUsCi0gICAgICAgIFdF QktJVF9UWVBFX1JFQ1RBTkdMRSB8IEdfU0lHTkFMX1RZUEVfU1RBVElDX1NDT1BFKTsKLSNlbmRp ZgorICAgIC8vIFRoaXMgc2lnbmFsIGlzIGRpZmZlcmVudCBmb3IgV1BFIGFuZCBHVEssIHNvIGl0 J3MgZGVjbGFyZWQgaW4KKyAgICAvLyBXZWJLaXRXZWJWaWV3W0d0ayxXUEVdLmNwcCB0byBlbnN1 cmUgd2UgZG9uJ3QgYnJlYWsgdGhlIGludHJvc3BlY3Rpb24uCisgICAgc2lnbmFsc1tTSE9XX09Q VElPTl9NRU5VXSA9IGNyZWF0ZVNob3dPcHRpb25NZW51U2lnbmFsKHdlYlZpZXdDbGFzcyk7CiAK ICAgICAvKioKICAgICAgKiBXZWJLaXRXZWJWaWV3Ojp1c2VyLW1lc3NhZ2UtcmVjZWl2ZWQ6CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ2xpYi9XZWJLaXRXZWJWaWV3 UHJpdmF0ZS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2dsaWIvV2ViS2l0V2ViVmll d1ByaXZhdGUuaAppbmRleCAwZDk4YTllZDYwNjE2YzdhODkzNzM2Yjc5NWFkZjkwZjJiN2IzM2Uw Li5kN2E0MzIwNGJlNjkzZjJhN2VmODYyNDBlYWY1NjdmZTcwMDUyYTJjIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ2xpYi9XZWJLaXRXZWJWaWV3UHJpdmF0ZS5oCisr KyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9nbGliL1dlYktpdFdlYlZpZXdQcml2YXRl LmgKQEAgLTEyMSwzICsxMjEsNSBAQCB2b2lkIHdlYmtpdFdlYlZpZXdDb25maXJtQ29tcG9zaXRp b24oV2ViS2l0V2ViVmlldyosIGNvbnN0IFN0cmluZyYpOwogdm9pZCB3ZWJraXRXZWJWaWV3Q2Fu Y2VsQ29tcG9zaXRpb24oV2ViS2l0V2ViVmlldyosIGNvbnN0IFN0cmluZyYpOwogdm9pZCB3ZWJr aXRXZWJWaWV3RGVsZXRlU3Vycm91bmRpbmcoV2ViS2l0V2ViVmlldyosIGludCBvZmZzZXQsIHVu c2lnbmVkIGNoYXJhY3RlckNvdW50KTsKIHZvaWQgd2Via2l0V2ViVmlld1NldElzV2ViUHJvY2Vz c1Jlc3BvbnNpdmUoV2ViS2l0V2ViVmlldyosIGJvb2wpOworCitndWludCBjcmVhdGVTaG93T3B0 aW9uTWVudVNpZ25hbChXZWJLaXRXZWJWaWV3Q2xhc3MqKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlld0d0ay5jcHAgYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdHdGsuY3BwCmluZGV4IDk3ZDA5ZGZm YmM2NzZjYzVjZDM4NTU1YzExMjViNDQwYmVjN2QxMmMuLjYyNGY3ZDkxYjdlNGY1NmVhYWY4NTY5 YTMxOGFlNjg5MDRiMTdlYzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQ SS9ndGsvV2ViS2l0V2ViVmlld0d0ay5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QVBJL2d0ay9XZWJLaXRXZWJWaWV3R3RrLmNwcApAQCAtNDY1LDMgKzQ2NSw0MCBAQCB2b2lkIHdl YmtpdF93ZWJfdmlld19nZXRfYmFja2dyb3VuZF9jb2xvcihXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3 LCBHZGtSR0JBKiByZ2JhKQogICAgIGF1dG8mIHBhZ2UgPSAqd2Via2l0V2ViVmlld0Jhc2VHZXRQ YWdlKHJlaW50ZXJwcmV0X2Nhc3Q8V2ViS2l0V2ViVmlld0Jhc2UqPih3ZWJWaWV3KSk7CiAgICAg KnJnYmEgPSBwYWdlLmJhY2tncm91bmRDb2xvcigpLnZhbHVlX29yKFdlYkNvcmU6OkNvbG9yOjp3 aGl0ZSk7CiB9CisKK2d1aW50IGNyZWF0ZVNob3dPcHRpb25NZW51U2lnbmFsKFdlYktpdFdlYlZp ZXdDbGFzcyogd2ViVmlld0NsYXNzKQoreworICAgIC8qKgorICAgICAqIFdlYktpdFdlYlZpZXc6 OnNob3ctb3B0aW9uLW1lbnU6CisgICAgICogQHdlYl92aWV3OiB0aGUgI1dlYktpdFdlYlZpZXcg b24gd2hpY2ggdGhlIHNpZ25hbCBpcyBlbWl0dGVkCisgICAgICogQG1lbnU6IHRoZSAjV2ViS2l0 T3B0aW9uTWVudQorICAgICAqIEBldmVudDogdGhlICNHZGtFdmVudCB0aGF0IHRyaWdnZXJlZCB0 aGUgbWVudSwgb3IgJU5VTEwKKyAgICAgKiBAcmVjdGFuZ2xlOiB0aGUgb3B0aW9uIGVsZW1lbnQg YXJlYQorICAgICAqCisgICAgICogVGhpcyBzaWduYWwgaXMgZW1pdHRlZCB3aGVuIGEgc2VsZWN0 IGVsZW1lbnQgaW4gQHdlYl92aWV3IG5lZWRzIHRvIGRpc3BsYXkgYQorICAgICAqIGRyb3Bkb3du IG1lbnUuIFRoaXMgc2lnbmFsIGNhbiBiZSB1c2VkIHRvIHNob3cgYSBjdXN0b20gbWVudSwgdXNp bmcgQG1lbnUgdG8gZ2V0CisgICAgICogdGhlIGRldGFpbHMgb2YgYWxsIGl0ZW1zIHRoYXQgc2hv dWxkIGJlIGRpc3BsYXllZC4gVGhlIGFyZWEgb2YgdGhlIGVsZW1lbnQgaW4gdGhlCisgICAgICog I1dlYktpdFdlYlZpZXcgaXMgZ2l2ZW4gYXMgQHJlY3RhbmdsZSBwYXJhbWV0ZXIsIGl0IGNhbiBi ZSB1c2VkIHRvIHBvc2l0aW9uIHRoZQorICAgICAqIG1lbnUuIElmIHRoaXMgd2FzIHRyaWdnZXJl ZCBieSBhIHVzZXIgaW50ZXJhY3Rpb24sIGxpa2UgYSBtb3VzZSBjbGljaywKKyAgICAgKiBAZXZl bnQgcGFyYW1ldGVyIHByb3ZpZGVzIHRoZSAjR2RrRXZlbnQuCisgICAgICogVG8gaGFuZGxlIHRo aXMgc2lnbmFsIGFzeW5jaHJvbm91c2x5IHlvdSBzaG91bGQga2VlcCBhIHJlZiBvZiB0aGUgQG1l bnUuCisgICAgICoKKyAgICAgKiBUaGUgZGVmYXVsdCBzaWduYWwgaGFuZGxlciB3aWxsIHBvcCB1 cCBhICNHdGtNZW51LgorICAgICAqCisgICAgICogUmV0dXJuczogJVRSVUUgdG8gc3RvcCBvdGhl ciBoYW5kbGVycyBmcm9tIGJlaW5nIGludm9rZWQgZm9yIHRoZSBldmVudC4KKyAgICAgKiAgICVG QUxTRSB0byBwcm9wYWdhdGUgdGhlIGV2ZW50IGZ1cnRoZXIuCisgICAgICoKKyAgICAgKiBTaW5j ZTogMi4xOAorICAgICAqLworICAgIHJldHVybiBnX3NpZ25hbF9uZXcoCisgICAgICAgICJzaG93 LW9wdGlvbi1tZW51IiwKKyAgICAgICAgR19UWVBFX0ZST01fQ0xBU1Mod2ViVmlld0NsYXNzKSwK KyAgICAgICAgR19TSUdOQUxfUlVOX0xBU1QsCisgICAgICAgIEdfU1RSVUNUX09GRlNFVChXZWJL aXRXZWJWaWV3Q2xhc3MsIHNob3dfb3B0aW9uX21lbnUpLAorICAgICAgICBnX3NpZ25hbF9hY2N1 bXVsYXRvcl90cnVlX2hhbmRsZWQsIG51bGxwdHIsCisgICAgICAgIGdfY2Nsb3N1cmVfbWFyc2hh bF9nZW5lcmljLAorICAgICAgICBHX1RZUEVfQk9PTEVBTiwgMywKKyAgICAgICAgV0VCS0lUX1RZ UEVfT1BUSU9OX01FTlUsCisgICAgICAgIEdES19UWVBFX0VWRU5UIHwgR19TSUdOQUxfVFlQRV9T VEFUSUNfU0NPUEUsCisgICAgICAgIEdES19UWVBFX1JFQ1RBTkdMRSB8IEdfU0lHTkFMX1RZUEVf U1RBVElDX1NDT1BFKTsKK30KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQ SS93cGUvV2ViS2l0V2ViVmlld1dQRS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkv d3BlL1dlYktpdFdlYlZpZXdXUEUuY3BwCmluZGV4IDIyNDAzMDRjOTYxZTEwMzg5MmRlYmYyODMz YjAwMWJmMDAxZGJiMTkuLjdkYzBjM2FjOGVhMmNhNDM4NmQ0ZjU3ZWM4N2I0OTRkMmI4M2FlMWQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS93cGUvV2ViS2l0V2ViVmll d1dQRS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL3dwZS9XZWJLaXRXZWJW aWV3V1BFLmNwcApAQCAtMjI3LDMgKzIyNywzNSBAQCB2b2lkIHdlYmtpdF93ZWJfdmlld19nZXRf YmFja2dyb3VuZF9jb2xvcihXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBXZWJLaXRDb2xvciogYwog ICAgIGF1dG8mIHdlYkNvcmVDb2xvciA9IHBhZ2UuYmFja2dyb3VuZENvbG9yKCk7CiAgICAgd2Vi a2l0Q29sb3JGaWxsRnJvbVdlYkNvcmVDb2xvcih3ZWJDb3JlQ29sb3IudmFsdWVfb3IoV2ViQ29y ZTo6Q29sb3I6OndoaXRlKSwgY29sb3IpOwogfQorCitndWludCBjcmVhdGVTaG93T3B0aW9uTWVu dVNpZ25hbChXZWJLaXRXZWJWaWV3Q2xhc3MqIHdlYlZpZXdDbGFzcykKK3sKKyAgICAvKioKKyAg ICAgKiBXZWJLaXRXZWJWaWV3OjpzaG93LW9wdGlvbi1tZW51OgorICAgICAqIEB3ZWJfdmlldzog dGhlICNXZWJLaXRXZWJWaWV3IG9uIHdoaWNoIHRoZSBzaWduYWwgaXMgZW1pdHRlZAorICAgICAq IEBtZW51OiB0aGUgI1dlYktpdE9wdGlvbk1lbnUKKyAgICAgKiBAcmVjdGFuZ2xlOiB0aGUgb3B0 aW9uIGVsZW1lbnQgYXJlYQorICAgICAqCisgICAgICogVGhpcyBzaWduYWwgaXMgZW1pdHRlZCB3 aGVuIGEgc2VsZWN0IGVsZW1lbnQgaW4gQHdlYl92aWV3IG5lZWRzIHRvIGRpc3BsYXkgYQorICAg ICAqIGRyb3Bkb3duIG1lbnUuIFRoaXMgc2lnbmFsIGNhbiBiZSB1c2VkIHRvIHNob3cgYSBjdXN0 b20gbWVudSwgdXNpbmcgQG1lbnUgdG8gZ2V0CisgICAgICogdGhlIGRldGFpbHMgb2YgYWxsIGl0 ZW1zIHRoYXQgc2hvdWxkIGJlIGRpc3BsYXllZC4gVGhlIGFyZWEgb2YgdGhlIGVsZW1lbnQgaW4g dGhlCisgICAgICogI1dlYktpdFdlYlZpZXcgaXMgZ2l2ZW4gYXMgQHJlY3RhbmdsZSBwYXJhbWV0 ZXIsIGl0IGNhbiBiZSB1c2VkIHRvIHBvc2l0aW9uIHRoZQorICAgICAqIG1lbnUuCisgICAgICog VG8gaGFuZGxlIHRoaXMgc2lnbmFsIGFzeW5jaHJvbm91c2x5IHlvdSBzaG91bGQga2VlcCBhIHJl ZiBvZiB0aGUgQG1lbnUuCisgICAgICoKKyAgICAgKiBSZXR1cm5zOiAlVFJVRSB0byBzdG9wIG90 aGVyIGhhbmRsZXJzIGZyb20gYmVpbmcgaW52b2tlZCBmb3IgdGhlIGV2ZW50LgorICAgICAqICAg JUZBTFNFIHRvIHByb3BhZ2F0ZSB0aGUgZXZlbnQgZnVydGhlci4KKyAgICAgKgorICAgICAqIFNp bmNlOiAyLjI4CisgICAgICovCisgICAgcmV0dXJuIGdfc2lnbmFsX25ldygKKyAgICAgICAgInNo b3ctb3B0aW9uLW1lbnUiLAorICAgICAgICBHX1RZUEVfRlJPTV9DTEFTUyh3ZWJWaWV3Q2xhc3Mp LAorICAgICAgICBHX1NJR05BTF9SVU5fTEFTVCwKKyAgICAgICAgR19TVFJVQ1RfT0ZGU0VUKFdl YktpdFdlYlZpZXdDbGFzcywgc2hvd19vcHRpb25fbWVudSksCisgICAgICAgIGdfc2lnbmFsX2Fj Y3VtdWxhdG9yX3RydWVfaGFuZGxlZCwgbnVsbHB0ciwKKyAgICAgICAgZ19jY2xvc3VyZV9tYXJz aGFsX2dlbmVyaWMsCisgICAgICAgIEdfVFlQRV9CT09MRUFOLCAyLAorICAgICAgICBXRUJLSVRf VFlQRV9PUFRJT05fTUVOVSwKKyAgICAgICAgV0VCS0lUX1RZUEVfUkVDVEFOR0xFIHwgR19TSUdO QUxfVFlQRV9TVEFUSUNfU0NPUEUpOworfQo= 430984 2021-06-09 11:44:39 -0700 2021-06-09 16:44:49 -0700 Patch bug-222985-20210609134438.patch text/plain 10821 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4NjY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGNjNGFhOTM5M2Q1ZjYxNmZm Yzk2ZTExYWY3OTRjZDAzYjRiZGFiNzkuLjg1YWM0OWJkNjhjZmVmZTAyYmNmYTE3MThmMTljNzE0 YzY3ZmIyZTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMjEtMDYtMDkgIE1pY2hhZWwg Q2F0YW56YXJvICA8bWNhdGFuemFyb0Bnbm9tZS5vcmc+CisKKyAgICAgICAgW0dUS10gRHVwbGlj YXRlIFdlYktpdFdlYlZpZXc6OnNob3ctb3B0aW9uLW1lbnUgY29uZnVzZXMgaW50cm9zcGVjdGlv biwgc2hvdWxkIHVzZSAtLXdhcm4tZXJyb3Igd2hlbiBidWlsZGluZyBnaXIKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMjk4NQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYktpdFdlYlZpZXc6OnNob3ct b3B0aW9uLW1lbnUgaGFzIGRpZmZlcmVudCBwYXJhbWV0ZXJzIGZvciBHVEsgdGhhbiBpdCBkb2Vz IGZvciBXUEUuIEl0CisgICAgICAgIHNlZW1zIGctaXItc2Nhbm5lciBpcyB0YWtpbmcgdGhlIFdQ RSBkb2N1bWVudGF0aW9uIGFuZCBtZXJnaW5nIGl0IHdpdGggdGhlIEdUSyBwYXJhbWV0ZXJzLgor ICAgICAgICBXZSBjYW4gZml4IHRoaXMgYnkgbW92aW5nIHRoZSBpbnRyb3NwZWN0aW9uIGNvbW1l bnQgaW50byBwbGF0Zm9ybS1zcGVjaWZpYyBmaWxlcy4KKworICAgICAgICBBZGRpdGlvbmFsbHks IGxldCdzIHVzZSAtLXdhcm4tZXJyb3IgdG8gdHVybiB3YXJuaW5ncyBpbnRvIGVycm9ycyB0byBw cmV2ZW50IHRoaXMgZnJvbSBldmVyCisgICAgICAgIGhhcHBlbmluZyBhZ2FpbiwgYXMgd2UgYWxy ZWFkeSBkbyB3aGVuIGdlbmVyYXRpbmcgaW50cm9zcGVjdGlvbiBmb3IgSmF2YVNjcmlwdENvcmUu CisKKyAgICAgICAgKiBQbGF0Zm9ybUdUSy5jbWFrZToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJ L2dsaWIvV2ViS2l0V2ViVmlldy5jcHA6CisgICAgICAgICh3ZWJraXRfd2ViX3ZpZXdfY2xhc3Nf aW5pdCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9nbGliL1dlYktpdFdlYlZpZXdQcml2YXRl Lmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlld0d0ay5jcHA6Cisg ICAgICAgIChjcmVhdGVTaG93T3B0aW9uTWVudVNpZ25hbCk6CisgICAgICAgICogVUlQcm9jZXNz L0FQSS93cGUvV2ViS2l0V2ViVmlld1dQRS5jcHA6CisgICAgICAgIChjcmVhdGVTaG93T3B0aW9u TWVudVNpZ25hbCk6CisKIDIwMjEtMDYtMDkgIFBlbmcgTGl1ICA8cGVuZy5saXU2QGFwcGxlLmNv bT4KIAogICAgICAgICBbaU9TXSBVSURlbGVnYXRlOjpVSUNsaWVudDo6ZnVsbHNjcmVlbk1heVJl dHVyblRvSW5saW5lKCkgaXMgbm90IGNhbGxlZCB3aGVuIGEgdmlkZW8gZXhpdHMgZnVsbHNjcmVl bgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9QbGF0Zm9ybUdUSy5jbWFrZSBiL1NvdXJjZS9X ZWJLaXQvUGxhdGZvcm1HVEsuY21ha2UKaW5kZXggYjFmNTZiMjJiNmU0MjgwYWI2ZWY2Yzk1ZDk4 YmMzMmQ1YmQ1YjkyYy4uZDY3OTc4NWNhM2JkNThiMmVkMmNlMDg3NjVlYjU1NzAxYmY1ZTcyMyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9QbGF0Zm9ybUdUSy5jbWFrZQorKysgYi9Tb3VyY2Uv V2ViS2l0L1BsYXRmb3JtR1RLLmNtYWtlCkBAIC02NjQsNiArNjY0LDcgQEAgaWYgKEVOQUJMRV9J TlRST1NQRUNUSU9OKQogICAgICAgICAgICAgJHtJTlRST1NQRUNUSU9OX1NDQU5ORVJ9CiAgICAg ICAgICAgICAtLXF1aWV0CiAgICAgICAgICAgICAtLXdhcm4tYWxsCisgICAgICAgICAgICAtLXdh cm4tZXJyb3IKICAgICAgICAgICAgIC0tc3ltYm9sLXByZWZpeD13ZWJraXQKICAgICAgICAgICAg IC0taWRlbnRpZmllci1wcmVmaXg9V2ViS2l0CiAgICAgICAgICAgICAtLW5hbWVzcGFjZT1XZWJL aXQyCkBAIC03MTAsNiArNzExLDcgQEAgaWYgKEVOQUJMRV9JTlRST1NQRUNUSU9OKQogICAgICAg ICAgICAgJHtJTlRST1NQRUNUSU9OX1NDQU5ORVJ9CiAgICAgICAgICAgICAtLXF1aWV0CiAgICAg ICAgICAgICAtLXdhcm4tYWxsCisgICAgICAgICAgICAtLXdhcm4tZXJyb3IKICAgICAgICAgICAg IC0tc3ltYm9sLXByZWZpeD13ZWJraXQKICAgICAgICAgICAgIC0taWRlbnRpZmllci1wcmVmaXg9 V2ViS2l0CiAgICAgICAgICAgICAtLW5hbWVzcGFjZT1XZWJLaXQyV2ViRXh0ZW5zaW9uCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ2xpYi9XZWJLaXRXZWJWaWV3LmNw cCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9nbGliL1dlYktpdFdlYlZpZXcuY3BwCmlu ZGV4IGYyYTg4NmZmZmMzNjYwOGM2MzJiMDM0OWI0ZmU1MTdkYWNmYjE1MTQuLmE2ODU5MTM2YWU3 MGQ2NTg5OTE2YzRkYzUxOWFjYTBmMjEzZDcxMWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0FQSS9nbGliL1dlYktpdFdlYlZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0FQSS9nbGliL1dlYktpdFdlYlZpZXcuY3BwCkBAIC0yMTcwLDcyICsyMTcwLDEx IEBAIHN0YXRpYyB2b2lkIHdlYmtpdF93ZWJfdmlld19jbGFzc19pbml0KFdlYktpdFdlYlZpZXdD bGFzcyogd2ViVmlld0NsYXNzKQogICAgICAgICBnX2NjbG9zdXJlX21hcnNoYWxfZ2VuZXJpYywK ICAgICAgICAgR19UWVBFX0JPT0xFQU4sIDEsCiAgICAgICAgIFdFQktJVF9UWVBFX0NPTE9SX0NI T09TRVJfUkVRVUVTVCk7Ci0KLSAgICAvKioKLSAgICAgKiBXZWJLaXRXZWJWaWV3OjpzaG93LW9w dGlvbi1tZW51OgotICAgICAqIEB3ZWJfdmlldzogdGhlICNXZWJLaXRXZWJWaWV3IG9uIHdoaWNo IHRoZSBzaWduYWwgaXMgZW1pdHRlZAotICAgICAqIEBtZW51OiB0aGUgI1dlYktpdE9wdGlvbk1l bnUKLSAgICAgKiBAZXZlbnQ6IHRoZSAjR2RrRXZlbnQgdGhhdCB0cmlnZ2VyZWQgdGhlIG1lbnUs IG9yICVOVUxMCi0gICAgICogQHJlY3RhbmdsZTogdGhlIG9wdGlvbiBlbGVtZW50IGFyZWEKLSAg ICAgKgotICAgICAqIFRoaXMgc2lnbmFsIGlzIGVtaXR0ZWQgd2hlbiBhIHNlbGVjdCBlbGVtZW50 IGluIEB3ZWJfdmlldyBuZWVkcyB0byBkaXNwbGF5IGEKLSAgICAgKiBkcm9wZG93biBtZW51LiBU aGlzIHNpZ25hbCBjYW4gYmUgdXNlZCB0byBzaG93IGEgY3VzdG9tIG1lbnUsIHVzaW5nIEBtZW51 IHRvIGdldAotICAgICAqIHRoZSBkZXRhaWxzIG9mIGFsbCBpdGVtcyB0aGF0IHNob3VsZCBiZSBk aXNwbGF5ZWQuIFRoZSBhcmVhIG9mIHRoZSBlbGVtZW50IGluIHRoZQotICAgICAqICNXZWJLaXRX ZWJWaWV3IGlzIGdpdmVuIGFzIEByZWN0YW5nbGUgcGFyYW1ldGVyLCBpdCBjYW4gYmUgdXNlZCB0 byBwb3NpdGlvbiB0aGUKLSAgICAgKiBtZW51LiBJZiB0aGlzIHdhcyB0cmlnZ2VyZWQgYnkgYSB1 c2VyIGludGVyYWN0aW9uLCBsaWtlIGEgbW91c2UgY2xpY2ssCi0gICAgICogQGV2ZW50IHBhcmFt ZXRlciBwcm92aWRlcyB0aGUgI0dka0V2ZW50LgotICAgICAqIFRvIGhhbmRsZSB0aGlzIHNpZ25h bCBhc3luY2hyb25vdXNseSB5b3Ugc2hvdWxkIGtlZXAgYSByZWYgb2YgdGhlIEBtZW51LgotICAg ICAqCi0gICAgICogVGhlIGRlZmF1bHQgc2lnbmFsIGhhbmRsZXIgd2lsbCBwb3AgdXAgYSAjR3Rr TWVudS4KLSAgICAgKgotICAgICAqIFJldHVybnM6ICVUUlVFIHRvIHN0b3Agb3RoZXIgaGFuZGxl cnMgZnJvbSBiZWluZyBpbnZva2VkIGZvciB0aGUgZXZlbnQuCi0gICAgICogICAlRkFMU0UgdG8g cHJvcGFnYXRlIHRoZSBldmVudCBmdXJ0aGVyLgotICAgICAqCi0gICAgICogU2luY2U6IDIuMTgK LSAgICAgKi8KLSAgICBzaWduYWxzW1NIT1dfT1BUSU9OX01FTlVdID0gZ19zaWduYWxfbmV3KAot ICAgICAgICAic2hvdy1vcHRpb24tbWVudSIsCi0gICAgICAgIEdfVFlQRV9GUk9NX0NMQVNTKHdl YlZpZXdDbGFzcyksCi0gICAgICAgIEdfU0lHTkFMX1JVTl9MQVNULAotICAgICAgICBHX1NUUlVD VF9PRkZTRVQoV2ViS2l0V2ViVmlld0NsYXNzLCBzaG93X29wdGlvbl9tZW51KSwKLSAgICAgICAg Z19zaWduYWxfYWNjdW11bGF0b3JfdHJ1ZV9oYW5kbGVkLCBudWxscHRyLAotICAgICAgICBnX2Nj bG9zdXJlX21hcnNoYWxfZ2VuZXJpYywKLSAgICAgICAgR19UWVBFX0JPT0xFQU4sIDMsCi0gICAg ICAgIFdFQktJVF9UWVBFX09QVElPTl9NRU5VLAotICAgICAgICBHREtfVFlQRV9FVkVOVCB8IEdf U0lHTkFMX1RZUEVfU1RBVElDX1NDT1BFLAotICAgICAgICBHREtfVFlQRV9SRUNUQU5HTEUgfCBH X1NJR05BTF9UWVBFX1NUQVRJQ19TQ09QRSk7CiAjZW5kaWYgLy8gUExBVEZPUk0oR1RLKQogCi0j aWYgUExBVEZPUk0oV1BFKQotICAgIC8qKgotICAgICAqIFdlYktpdFdlYlZpZXc6OnNob3ctb3B0 aW9uLW1lbnU6Ci0gICAgICogQHdlYl92aWV3OiB0aGUgI1dlYktpdFdlYlZpZXcgb24gd2hpY2gg dGhlIHNpZ25hbCBpcyBlbWl0dGVkCi0gICAgICogQG1lbnU6IHRoZSAjV2ViS2l0T3B0aW9uTWVu dQotICAgICAqIEByZWN0YW5nbGU6IHRoZSBvcHRpb24gZWxlbWVudCBhcmVhCi0gICAgICoKLSAg ICAgKiBUaGlzIHNpZ25hbCBpcyBlbWl0dGVkIHdoZW4gYSBzZWxlY3QgZWxlbWVudCBpbiBAd2Vi X3ZpZXcgbmVlZHMgdG8gZGlzcGxheSBhCi0gICAgICogZHJvcGRvd24gbWVudS4gVGhpcyBzaWdu YWwgY2FuIGJlIHVzZWQgdG8gc2hvdyBhIGN1c3RvbSBtZW51LCB1c2luZyBAbWVudSB0byBnZXQK LSAgICAgKiB0aGUgZGV0YWlscyBvZiBhbGwgaXRlbXMgdGhhdCBzaG91bGQgYmUgZGlzcGxheWVk LiBUaGUgYXJlYSBvZiB0aGUgZWxlbWVudCBpbiB0aGUKLSAgICAgKiAjV2ViS2l0V2ViVmlldyBp cyBnaXZlbiBhcyBAcmVjdGFuZ2xlIHBhcmFtZXRlciwgaXQgY2FuIGJlIHVzZWQgdG8gcG9zaXRp b24gdGhlCi0gICAgICogbWVudS4KLSAgICAgKiBUbyBoYW5kbGUgdGhpcyBzaWduYWwgYXN5bmNo cm9ub3VzbHkgeW91IHNob3VsZCBrZWVwIGEgcmVmIG9mIHRoZSBAbWVudS4KLSAgICAgKgotICAg ICAqIFJldHVybnM6ICVUUlVFIHRvIHN0b3Agb3RoZXIgaGFuZGxlcnMgZnJvbSBiZWluZyBpbnZv a2VkIGZvciB0aGUgZXZlbnQuCi0gICAgICogICAlRkFMU0UgdG8gcHJvcGFnYXRlIHRoZSBldmVu dCBmdXJ0aGVyLgotICAgICAqCi0gICAgICogU2luY2U6IDIuMjgKLSAgICAgKi8KLSAgICBzaWdu YWxzW1NIT1dfT1BUSU9OX01FTlVdID0gZ19zaWduYWxfbmV3KAotICAgICAgICAic2hvdy1vcHRp b24tbWVudSIsCi0gICAgICAgIEdfVFlQRV9GUk9NX0NMQVNTKHdlYlZpZXdDbGFzcyksCi0gICAg ICAgIEdfU0lHTkFMX1JVTl9MQVNULAotICAgICAgICBHX1NUUlVDVF9PRkZTRVQoV2ViS2l0V2Vi Vmlld0NsYXNzLCBzaG93X29wdGlvbl9tZW51KSwKLSAgICAgICAgZ19zaWduYWxfYWNjdW11bGF0 b3JfdHJ1ZV9oYW5kbGVkLCBudWxscHRyLAotICAgICAgICBnX2NjbG9zdXJlX21hcnNoYWxfZ2Vu ZXJpYywKLSAgICAgICAgR19UWVBFX0JPT0xFQU4sIDIsCi0gICAgICAgIFdFQktJVF9UWVBFX09Q VElPTl9NRU5VLAotICAgICAgICBXRUJLSVRfVFlQRV9SRUNUQU5HTEUgfCBHX1NJR05BTF9UWVBF X1NUQVRJQ19TQ09QRSk7Ci0jZW5kaWYKKyAgICAvLyBUaGlzIHNpZ25hbCBpcyBkaWZmZXJlbnQg Zm9yIFdQRSBhbmQgR1RLLCBzbyBpdCdzIGRlY2xhcmVkIGluCisgICAgLy8gV2ViS2l0V2ViVmll d1tHdGssV1BFXS5jcHAgdG8gZW5zdXJlIHdlIGRvbid0IGJyZWFrIHRoZSBpbnRyb3NwZWN0aW9u LgorICAgIHNpZ25hbHNbU0hPV19PUFRJT05fTUVOVV0gPSBjcmVhdGVTaG93T3B0aW9uTWVudVNp Z25hbCh3ZWJWaWV3Q2xhc3MpOwogCiAgICAgLyoqCiAgICAgICogV2ViS2l0V2ViVmlldzo6dXNl ci1tZXNzYWdlLXJlY2VpdmVkOgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QVBJL2dsaWIvV2ViS2l0V2ViVmlld1ByaXZhdGUuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0FQSS9nbGliL1dlYktpdFdlYlZpZXdQcml2YXRlLmgKaW5kZXggMGQ5OGE5ZWQ2MDYxNmM3YTg5 MzczNmI3OTVhZGY5MGYyYjdiMzNlMC4uZDdhNDMyMDRiZTY5M2YyYTdlZjg2MjQwZWFmNTY3ZmU3 MDA1MmEyYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2dsaWIvV2Vi S2l0V2ViVmlld1ByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ2xp Yi9XZWJLaXRXZWJWaWV3UHJpdmF0ZS5oCkBAIC0xMjEsMyArMTIxLDUgQEAgdm9pZCB3ZWJraXRX ZWJWaWV3Q29uZmlybUNvbXBvc2l0aW9uKFdlYktpdFdlYlZpZXcqLCBjb25zdCBTdHJpbmcmKTsK IHZvaWQgd2Via2l0V2ViVmlld0NhbmNlbENvbXBvc2l0aW9uKFdlYktpdFdlYlZpZXcqLCBjb25z dCBTdHJpbmcmKTsKIHZvaWQgd2Via2l0V2ViVmlld0RlbGV0ZVN1cnJvdW5kaW5nKFdlYktpdFdl YlZpZXcqLCBpbnQgb2Zmc2V0LCB1bnNpZ25lZCBjaGFyYWN0ZXJDb3VudCk7CiB2b2lkIHdlYmtp dFdlYlZpZXdTZXRJc1dlYlByb2Nlc3NSZXNwb25zaXZlKFdlYktpdFdlYlZpZXcqLCBib29sKTsK KworZ3VpbnQgY3JlYXRlU2hvd09wdGlvbk1lbnVTaWduYWwoV2ViS2l0V2ViVmlld0NsYXNzKik7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZp ZXdHdGsuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3 R3RrLmNwcAppbmRleCA5N2QwOWRmZmJjNjc2Y2M1Y2QzODU1NWMxMTI1YjQ0MGJlYzdkMTJjLi42 MjRmN2Q5MWI3ZTRmNTZlYWFmODU2OWEzMThhZTY4OTA0YjE3ZWM1IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdHdGsuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlld0d0ay5jcHAKQEAgLTQ2 NSwzICs0NjUsNDAgQEAgdm9pZCB3ZWJraXRfd2ViX3ZpZXdfZ2V0X2JhY2tncm91bmRfY29sb3Io V2ViS2l0V2ViVmlldyogd2ViVmlldywgR2RrUkdCQSogcmdiYSkKICAgICBhdXRvJiBwYWdlID0g KndlYmtpdFdlYlZpZXdCYXNlR2V0UGFnZShyZWludGVycHJldF9jYXN0PFdlYktpdFdlYlZpZXdC YXNlKj4od2ViVmlldykpOwogICAgICpyZ2JhID0gcGFnZS5iYWNrZ3JvdW5kQ29sb3IoKS52YWx1 ZV9vcihXZWJDb3JlOjpDb2xvcjo6d2hpdGUpOwogfQorCitndWludCBjcmVhdGVTaG93T3B0aW9u TWVudVNpZ25hbChXZWJLaXRXZWJWaWV3Q2xhc3MqIHdlYlZpZXdDbGFzcykKK3sKKyAgICAvKioK KyAgICAgKiBXZWJLaXRXZWJWaWV3OjpzaG93LW9wdGlvbi1tZW51OgorICAgICAqIEB3ZWJfdmll dzogdGhlICNXZWJLaXRXZWJWaWV3IG9uIHdoaWNoIHRoZSBzaWduYWwgaXMgZW1pdHRlZAorICAg ICAqIEBtZW51OiB0aGUgI1dlYktpdE9wdGlvbk1lbnUKKyAgICAgKiBAZXZlbnQ6IHRoZSAjR2Rr RXZlbnQgdGhhdCB0cmlnZ2VyZWQgdGhlIG1lbnUsIG9yICVOVUxMCisgICAgICogQHJlY3Rhbmds ZTogdGhlIG9wdGlvbiBlbGVtZW50IGFyZWEKKyAgICAgKgorICAgICAqIFRoaXMgc2lnbmFsIGlz IGVtaXR0ZWQgd2hlbiBhIHNlbGVjdCBlbGVtZW50IGluIEB3ZWJfdmlldyBuZWVkcyB0byBkaXNw bGF5IGEKKyAgICAgKiBkcm9wZG93biBtZW51LiBUaGlzIHNpZ25hbCBjYW4gYmUgdXNlZCB0byBz aG93IGEgY3VzdG9tIG1lbnUsIHVzaW5nIEBtZW51IHRvIGdldAorICAgICAqIHRoZSBkZXRhaWxz IG9mIGFsbCBpdGVtcyB0aGF0IHNob3VsZCBiZSBkaXNwbGF5ZWQuIFRoZSBhcmVhIG9mIHRoZSBl bGVtZW50IGluIHRoZQorICAgICAqICNXZWJLaXRXZWJWaWV3IGlzIGdpdmVuIGFzIEByZWN0YW5n bGUgcGFyYW1ldGVyLCBpdCBjYW4gYmUgdXNlZCB0byBwb3NpdGlvbiB0aGUKKyAgICAgKiBtZW51 LiBJZiB0aGlzIHdhcyB0cmlnZ2VyZWQgYnkgYSB1c2VyIGludGVyYWN0aW9uLCBsaWtlIGEgbW91 c2UgY2xpY2ssCisgICAgICogQGV2ZW50IHBhcmFtZXRlciBwcm92aWRlcyB0aGUgI0dka0V2ZW50 LgorICAgICAqIFRvIGhhbmRsZSB0aGlzIHNpZ25hbCBhc3luY2hyb25vdXNseSB5b3Ugc2hvdWxk IGtlZXAgYSByZWYgb2YgdGhlIEBtZW51LgorICAgICAqCisgICAgICogVGhlIGRlZmF1bHQgc2ln bmFsIGhhbmRsZXIgd2lsbCBwb3AgdXAgYSAjR3RrTWVudS4KKyAgICAgKgorICAgICAqIFJldHVy bnM6ICVUUlVFIHRvIHN0b3Agb3RoZXIgaGFuZGxlcnMgZnJvbSBiZWluZyBpbnZva2VkIGZvciB0 aGUgZXZlbnQuCisgICAgICogICAlRkFMU0UgdG8gcHJvcGFnYXRlIHRoZSBldmVudCBmdXJ0aGVy LgorICAgICAqCisgICAgICogU2luY2U6IDIuMTgKKyAgICAgKi8KKyAgICByZXR1cm4gZ19zaWdu YWxfbmV3KAorICAgICAgICAic2hvdy1vcHRpb24tbWVudSIsCisgICAgICAgIEdfVFlQRV9GUk9N X0NMQVNTKHdlYlZpZXdDbGFzcyksCisgICAgICAgIEdfU0lHTkFMX1JVTl9MQVNULAorICAgICAg ICBHX1NUUlVDVF9PRkZTRVQoV2ViS2l0V2ViVmlld0NsYXNzLCBzaG93X29wdGlvbl9tZW51KSwK KyAgICAgICAgZ19zaWduYWxfYWNjdW11bGF0b3JfdHJ1ZV9oYW5kbGVkLCBudWxscHRyLAorICAg ICAgICBnX2NjbG9zdXJlX21hcnNoYWxfZ2VuZXJpYywKKyAgICAgICAgR19UWVBFX0JPT0xFQU4s IDMsCisgICAgICAgIFdFQktJVF9UWVBFX09QVElPTl9NRU5VLAorICAgICAgICBHREtfVFlQRV9F VkVOVCB8IEdfU0lHTkFMX1RZUEVfU1RBVElDX1NDT1BFLAorICAgICAgICBHREtfVFlQRV9SRUNU QU5HTEUgfCBHX1NJR05BTF9UWVBFX1NUQVRJQ19TQ09QRSk7Cit9CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvd3BlL1dlYktpdFdlYlZpZXdXUEUuY3BwIGIvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvQVBJL3dwZS9XZWJLaXRXZWJWaWV3V1BFLmNwcAppbmRleCAyMjQw MzA0Yzk2MWUxMDM4OTJkZWJmMjgzM2IwMDFiZjAwMWRiYjE5Li43ZGMwYzNhYzhlYTJjYTQzODZk NGY1N2VjODdiNDk0ZDJiODNhZTFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9BUEkvd3BlL1dlYktpdFdlYlZpZXdXUEUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0FQSS93cGUvV2ViS2l0V2ViVmlld1dQRS5jcHAKQEAgLTIyNywzICsyMjcsMzUgQEAgdm9p ZCB3ZWJraXRfd2ViX3ZpZXdfZ2V0X2JhY2tncm91bmRfY29sb3IoV2ViS2l0V2ViVmlldyogd2Vi VmlldywgV2ViS2l0Q29sb3IqIGMKICAgICBhdXRvJiB3ZWJDb3JlQ29sb3IgPSBwYWdlLmJhY2tn cm91bmRDb2xvcigpOwogICAgIHdlYmtpdENvbG9yRmlsbEZyb21XZWJDb3JlQ29sb3Iod2ViQ29y ZUNvbG9yLnZhbHVlX29yKFdlYkNvcmU6OkNvbG9yOjp3aGl0ZSksIGNvbG9yKTsKIH0KKworZ3Vp bnQgY3JlYXRlU2hvd09wdGlvbk1lbnVTaWduYWwoV2ViS2l0V2ViVmlld0NsYXNzKiB3ZWJWaWV3 Q2xhc3MpCit7CisgICAgLyoqCisgICAgICogV2ViS2l0V2ViVmlldzo6c2hvdy1vcHRpb24tbWVu dToKKyAgICAgKiBAd2ViX3ZpZXc6IHRoZSAjV2ViS2l0V2ViVmlldyBvbiB3aGljaCB0aGUgc2ln bmFsIGlzIGVtaXR0ZWQKKyAgICAgKiBAbWVudTogdGhlICNXZWJLaXRPcHRpb25NZW51CisgICAg ICogQHJlY3RhbmdsZTogdGhlIG9wdGlvbiBlbGVtZW50IGFyZWEKKyAgICAgKgorICAgICAqIFRo aXMgc2lnbmFsIGlzIGVtaXR0ZWQgd2hlbiBhIHNlbGVjdCBlbGVtZW50IGluIEB3ZWJfdmlldyBu ZWVkcyB0byBkaXNwbGF5IGEKKyAgICAgKiBkcm9wZG93biBtZW51LiBUaGlzIHNpZ25hbCBjYW4g YmUgdXNlZCB0byBzaG93IGEgY3VzdG9tIG1lbnUsIHVzaW5nIEBtZW51IHRvIGdldAorICAgICAq IHRoZSBkZXRhaWxzIG9mIGFsbCBpdGVtcyB0aGF0IHNob3VsZCBiZSBkaXNwbGF5ZWQuIFRoZSBh cmVhIG9mIHRoZSBlbGVtZW50IGluIHRoZQorICAgICAqICNXZWJLaXRXZWJWaWV3IGlzIGdpdmVu IGFzIEByZWN0YW5nbGUgcGFyYW1ldGVyLCBpdCBjYW4gYmUgdXNlZCB0byBwb3NpdGlvbiB0aGUK KyAgICAgKiBtZW51LgorICAgICAqIFRvIGhhbmRsZSB0aGlzIHNpZ25hbCBhc3luY2hyb25vdXNs eSB5b3Ugc2hvdWxkIGtlZXAgYSByZWYgb2YgdGhlIEBtZW51LgorICAgICAqCisgICAgICogUmV0 dXJuczogJVRSVUUgdG8gc3RvcCBvdGhlciBoYW5kbGVycyBmcm9tIGJlaW5nIGludm9rZWQgZm9y IHRoZSBldmVudC4KKyAgICAgKiAgICVGQUxTRSB0byBwcm9wYWdhdGUgdGhlIGV2ZW50IGZ1cnRo ZXIuCisgICAgICoKKyAgICAgKiBTaW5jZTogMi4yOAorICAgICAqLworICAgIHJldHVybiBnX3Np Z25hbF9uZXcoCisgICAgICAgICJzaG93LW9wdGlvbi1tZW51IiwKKyAgICAgICAgR19UWVBFX0ZS T01fQ0xBU1Mod2ViVmlld0NsYXNzKSwKKyAgICAgICAgR19TSUdOQUxfUlVOX0xBU1QsCisgICAg ICAgIEdfU1RSVUNUX09GRlNFVChXZWJLaXRXZWJWaWV3Q2xhc3MsIHNob3dfb3B0aW9uX21lbnUp LAorICAgICAgICBnX3NpZ25hbF9hY2N1bXVsYXRvcl90cnVlX2hhbmRsZWQsIG51bGxwdHIsCisg ICAgICAgIGdfY2Nsb3N1cmVfbWFyc2hhbF9nZW5lcmljLAorICAgICAgICBHX1RZUEVfQk9PTEVB TiwgMiwKKyAgICAgICAgV0VCS0lUX1RZUEVfT1BUSU9OX01FTlUsCisgICAgICAgIFdFQktJVF9U WVBFX1JFQ1RBTkdMRSB8IEdfU0lHTkFMX1RZUEVfU1RBVElDX1NDT1BFKTsKK30K