124652 2013-11-20 03:44:06 -0800 [GTK] Add API to WebKitResponsePolicyDecision to check if the MIME type can be shown 2014-01-03 00:38:29 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned cdumez commit-queue gustavo gyuyoung.kim mrobinson rakuco oldest_to_newest 952533 0 cgarcia 2013-11-20 03:44:06 -0800 The decidePolicyForResponse callback in the WKPagePolicyClient now receives a boolean parameter canShowMIMEType. We could expose it in our API to make it easier and more efficient to check whether the MIME Type of the response can be shown in the WebView that triggered the policy decision. 952535 1 217417 cgarcia 2013-11-20 03:49:56 -0800 Created attachment 217417 Patch I'm not sure about the name though, I'm using webkit_response_policy_decision_is_mime_type_supported() but I'm not totally convinced. Any other suggestion for the function name? 952536 2 commit-queue 2013-11-20 03:52:01 -0800 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 952602 3 217417 mrobinson 2013-11-20 08:36:37 -0800 Comment on attachment 217417 Patch Hrm. Wouldn't webkit_response_policy_decision_can_show_mime_type make sense since we already have webkit_web_view_can_show_mime_type? 952605 4 cgarcia 2013-11-20 08:41:14 -0800 (In reply to comment #3) > (From update of attachment 217417 [details]) > Hrm. Wouldn't webkit_response_policy_decision_can_show_mime_type make sense since we already have webkit_web_view_can_show_mime_type? That was my first idea, but sounded a bit weird to me, webkit_web_view_can_show_mime_type makes sense because a WebView can show content, but a policy decision doesn't. What we want to know is whether the web view that triggered this policy decision request can show the mime type of the response. 961351 5 217417 gustavo 2013-12-19 05:20:43 -0800 Comment on attachment 217417 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=217417&action=review > Source/WebKit2/UIProcess/API/gtk/WebKitResponsePolicyDecision.cpp:142 > + * webkit_response_policy_decision_is_mime_type_supported: I like the name in principle. If we want to be very accurate about it, though, we could have webkit_response_policy_decision_can_web_view_show_mime_type(). I'm OK with is_mime_type_supported(), though, if you guys don't like that one ;) I agree with Carlos that can_show_mime_type makes a bit less sense here than in WebView. > Source/WebKit2/UIProcess/API/gtk/WebKitResponsePolicyDecision.cpp:147 > + * that triggered this policy decision request. > + * See also webkit_web_view_can_show_mime_type(). Nit: these could be on the same line. 961365 6 cgarcia 2013-12-19 06:22:42 -0800 (In reply to comment #5) > (From update of attachment 217417 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=217417&action=review > > > Source/WebKit2/UIProcess/API/gtk/WebKitResponsePolicyDecision.cpp:142 > > + * webkit_response_policy_decision_is_mime_type_supported: > > I like the name in principle. If we want to be very accurate about it, though, we could have webkit_response_policy_decision_can_web_view_show_mime_type(). I'm OK with is_mime_type_supported(), though, if you guys don't like that one ;) I agree with Carlos that can_show_mime_type makes a bit less sense here than in WebView. I'm fine with is_mime_type_supported() too, Martin? > > Source/WebKit2/UIProcess/API/gtk/WebKitResponsePolicyDecision.cpp:147 > > + * that triggered this policy decision request. > > + * See also webkit_web_view_can_show_mime_type(). > > Nit: these could be on the same line. Sure! 963335 7 mrobinson 2013-12-30 09:30:54 -0800 (In reply to comment #6) > I'm fine with is_mime_type_supported() too, Martin? The name seems reasonable given the constraints Carlos mentioned. It's a little sloppy, in that there's a difference between a mime type being supported and showable. What I mean is that we support non-showable mime types by downloading them. I think my point is a nitpick though, so unless anyone can think of a better one, is_mime_type_supported should work just fine. The next best thing I can think of is is_mime_type_showable, but that feels a little bit tortured. 963741 8 cgarcia 2014-01-02 05:47:25 -0800 so, if we agree on the name, could someone please review the patch? :-) 964045 9 cgarcia 2014-01-03 00:38:29 -0800 Committed r161256: <http://trac.webkit.org/changeset/161256> 217417 2013-11-20 03:49:56 -0800 2014-01-02 07:52:47 -0800 Patch wk2-response-policy-mime-type.diff text/plain 11272 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA0NDI4MmQ3Li4xYjY3N2RhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjkg QEAKIDIwMTMtMTEtMjAgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgogCisgICAgICAgIFtHVEtdIEFkZCBBUEkgdG8gV2ViS2l0UmVzcG9uc2VQb2xpY3lEZWNpc2lv biB0byBjaGVjayBpZiB0aGUgTUlNRSB0eXBlIGNhbiBiZSBzaG93bgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI0NjUyCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJL aXRQb2xpY3lDbGllbnQuY3BwOgorICAgICAgICAoZGVjaWRlUG9saWN5Rm9yUmVzcG9uc2UpOiBQ YXNzIGNhblNob3dNSU1FVHlwZSB0bworICAgICAgICB3ZWJraXRSZXNwb25zZVBvbGljeURlY2lz aW9uQ3JlYXRlLgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFJlc3BvbnNlUG9s aWN5RGVjaXNpb24uY3BwOgorICAgICAgICAod2Via2l0X3Jlc3BvbnNlX3BvbGljeV9kZWNpc2lv bl9pc19taW1lX3R5cGVfc3VwcG9ydGVkKTogUmV0dXJuCisgICAgICAgIGNhblNob3dNSU1FVHlw ZS4KKyAgICAgICAgKHdlYmtpdFJlc3BvbnNlUG9saWN5RGVjaXNpb25DcmVhdGUpOiBTZXQgdGhl IGNhblNob3dNSU1FVHlwZQorICAgICAgICBtZW1iZXIgZnJvbSB0aGUgZ2l2ZW4gcGFyYW1ldGVy LgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFJlc3BvbnNlUG9saWN5RGVjaXNp b24uaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRSZXNwb25zZVBvbGljeURl Y2lzaW9uUHJpdmF0ZS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZp ZXcuY3BwOgorICAgICAgICAod2Via2l0V2ViVmlld0RlY2lkZVBvbGljeSk6IFVzZSB0aGUgbmV3 IEFQSSBpbnN0ZWFkIG9mCisgICAgICAgIHdlYmtpdF93ZWJfdmlld19jYW5fc2hvd19taW1lX3R5 cGUoKSBzaW5jZSBpdCdzIG1vcmUgZWZmaWNpZW50LgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkv Z3RrL2RvY3Mvd2Via2l0Mmd0ay1zZWN0aW9ucy50eHQ6IEFkZCBuZXcgc3ltYm9sLgorICAgICAg ICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rlc3RXZWJLaXRQb2xpY3lDbGllbnQuY3BwOgor ICAgICAgICAodGVzdFJlc3BvbnNlUG9saWN5KTogVGVzdCB0aGUgbmV3IEFQSS4KKworMjAxMy0x MS0yMCAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CisKICAgICAg ICAgW0dUS10gRG8gbm90IHVzZSBkZXByZWNhdGVkIGNhbGxiYWNrcyBpbiBXZWJLaXRQb2xpY3lD bGllbnQKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEy NDY0OAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJL aXRQb2xpY3lDbGllbnQuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2Vi S2l0UG9saWN5Q2xpZW50LmNwcAppbmRleCAwZWFhOWJlLi45NWU3ZTNmIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRQb2xpY3lDbGllbnQuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFBvbGljeUNsaWVudC5j cHAKQEAgLTYwLDcgKzYwLDcgQEAgc3RhdGljIHZvaWQgZGVjaWRlUG9saWN5Rm9yTmV3V2luZG93 QWN0aW9uKFdLUGFnZVJlZiBwYWdlLCBXS0ZyYW1lUmVmIGZyYW1lLCBXS0YKIHN0YXRpYyB2b2lk IGRlY2lkZVBvbGljeUZvclJlc3BvbnNlKFdLUGFnZVJlZiBwYWdlLCBXS0ZyYW1lUmVmIGZyYW1l LCBXS1VSTFJlc3BvbnNlUmVmIHJlc3BvbnNlLCBXS1VSTFJlcXVlc3RSZWYgcmVxdWVzdCwgYm9v bCBjYW5TaG93TUlNRVR5cGUsIFdLRnJhbWVQb2xpY3lMaXN0ZW5lclJlZiBsaXN0ZW5lciwgV0tU eXBlUmVmIHVzZXJEYXRhLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKQogewogICAgIEdSZWZQdHI8 V2ViS2l0UmVzcG9uc2VQb2xpY3lEZWNpc2lvbj4gZGVjaXNpb24gPQotICAgICAgICBhZG9wdEdS ZWYod2Via2l0UmVzcG9uc2VQb2xpY3lEZWNpc2lvbkNyZWF0ZSh0b0ltcGwocmVxdWVzdCksIHRv SW1wbChyZXNwb25zZSksIHRvSW1wbChsaXN0ZW5lcikpKTsKKyAgICAgICAgYWRvcHRHUmVmKHdl YmtpdFJlc3BvbnNlUG9saWN5RGVjaXNpb25DcmVhdGUodG9JbXBsKHJlcXVlc3QpLCB0b0ltcGwo cmVzcG9uc2UpLCBjYW5TaG93TUlNRVR5cGUsIHRvSW1wbChsaXN0ZW5lcikpKTsKICAgICB3ZWJr aXRXZWJWaWV3TWFrZVBvbGljeURlY2lzaW9uKFdFQktJVF9XRUJfVklFVyhjbGllbnRJbmZvKSwK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFdFQktJVF9QT0xJQ1lfREVDSVNJ T05fVFlQRV9SRVNQT05TRSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFdF QktJVF9QT0xJQ1lfREVDSVNJT04oZGVjaXNpb24uZ2V0KCkpKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFJlc3BvbnNlUG9saWN5RGVjaXNpb24u Y3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0UmVzcG9uc2VQb2xp Y3lEZWNpc2lvbi5jcHAKaW5kZXggMjI2MTNkYi4uNzUwNjZhZSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0UmVzcG9uc2VQb2xpY3lEZWNpc2lvbi5j cHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0UmVzcG9uc2VQ b2xpY3lEZWNpc2lvbi5jcHAKQEAgLTQ4LDYgKzQ4LDcgQEAgdXNpbmcgbmFtZXNwYWNlIFdlYktp dDsKIHN0cnVjdCBfV2ViS2l0UmVzcG9uc2VQb2xpY3lEZWNpc2lvblByaXZhdGUgewogICAgIEdS ZWZQdHI8V2ViS2l0VVJJUmVxdWVzdD4gcmVxdWVzdDsKICAgICBHUmVmUHRyPFdlYktpdFVSSVJl c3BvbnNlPiByZXNwb25zZTsKKyAgICBib29sIGNhblNob3dNSU1FVHlwZTsKIH07CiAKIFdFQktJ VF9ERUZJTkVfVFlQRShXZWJLaXRSZXNwb25zZVBvbGljeURlY2lzaW9uLCB3ZWJraXRfcmVzcG9u c2VfcG9saWN5X2RlY2lzaW9uLCBXRUJLSVRfVFlQRV9QT0xJQ1lfREVDSVNJT04pCkBAIC0xMzcs MTEgKzEzOCwzMCBAQCBXZWJLaXRVUklSZXNwb25zZSogd2Via2l0X3Jlc3BvbnNlX3BvbGljeV9k ZWNpc2lvbl9nZXRfcmVzcG9uc2UoV2ViS2l0UmVzcG9uc2VQbwogICAgIHJldHVybiBkZWNpc2lv bi0+cHJpdi0+cmVzcG9uc2UuZ2V0KCk7CiB9CiAKLVdlYktpdFJlc3BvbnNlUG9saWN5RGVjaXNp b24qIHdlYmtpdFJlc3BvbnNlUG9saWN5RGVjaXNpb25DcmVhdGUoV2ViVVJMUmVxdWVzdCogcmVx dWVzdCwgV2ViVVJMUmVzcG9uc2UqIHJlc3BvbnNlLCBXZWJGcmFtZVBvbGljeUxpc3RlbmVyUHJv eHkqIGxpc3RlbmVyKQorLyoqCisgKiB3ZWJraXRfcmVzcG9uc2VfcG9saWN5X2RlY2lzaW9uX2lz X21pbWVfdHlwZV9zdXBwb3J0ZWQ6CisgKiBAZGVjaXNpb246IGEgI1dlYktpdFJlc3BvbnNlUG9s aWN5RGVjaXNpb24KKyAqCisgKiBHZXRzIHdoZXRoZXIgdGhlIE1JTUUgdHlwZSBvZiB0aGUgcmVz cG9uc2UgY2FuIGJlIGRpc3BsYXllZCBpbiB0aGUgI1dlYktpdFdlYlZpZXcKKyAqIHRoYXQgdHJp Z2dlcmVkIHRoaXMgcG9saWN5IGRlY2lzaW9uIHJlcXVlc3QuCisgKiBTZWUgYWxzbyB3ZWJraXRf d2ViX3ZpZXdfY2FuX3Nob3dfbWltZV90eXBlKCkuCisgKgorICogUmV0dXJuczogJVRSVUUgaWYg dGhlIE1JTUUgdHlwZSBvZiB0aGUgcmVzcG9uc2UgaXMgc3VwcG9ydGVkIG9yICVGQUxTRSBvdGhl cndpc2UKKyAqCisgKiBTaW5jZTogMi40CisgKi8KK2dib29sZWFuIHdlYmtpdF9yZXNwb25zZV9w b2xpY3lfZGVjaXNpb25faXNfbWltZV90eXBlX3N1cHBvcnRlZChXZWJLaXRSZXNwb25zZVBvbGlj eURlY2lzaW9uKiBkZWNpc2lvbikKK3sKKyAgICBnX3JldHVybl92YWxfaWZfZmFpbChXRUJLSVRf SVNfUkVTUE9OU0VfUE9MSUNZX0RFQ0lTSU9OKGRlY2lzaW9uKSwgRkFMU0UpOworICAgIHJldHVy biBkZWNpc2lvbi0+cHJpdi0+Y2FuU2hvd01JTUVUeXBlOworfQorCitXZWJLaXRSZXNwb25zZVBv bGljeURlY2lzaW9uKiB3ZWJraXRSZXNwb25zZVBvbGljeURlY2lzaW9uQ3JlYXRlKFdlYlVSTFJl cXVlc3QqIHJlcXVlc3QsIFdlYlVSTFJlc3BvbnNlKiByZXNwb25zZSwgYm9vbCBjYW5TaG93TUlN RVR5cGUsIFdlYkZyYW1lUG9saWN5TGlzdGVuZXJQcm94eSogbGlzdGVuZXIpCiB7CiAgICAgV2Vi S2l0UmVzcG9uc2VQb2xpY3lEZWNpc2lvbiogZGVjaXNpb24gPSBXRUJLSVRfUkVTUE9OU0VfUE9M SUNZX0RFQ0lTSU9OKGdfb2JqZWN0X25ldyhXRUJLSVRfVFlQRV9SRVNQT05TRV9QT0xJQ1lfREVD SVNJT04sIE5VTEwpKTsKICAgICBkZWNpc2lvbi0+cHJpdi0+cmVxdWVzdCA9IGFkb3B0R1JlZih3 ZWJraXRVUklSZXF1ZXN0Q3JlYXRlRm9yUmVzb3VyY2VSZXF1ZXN0KHJlcXVlc3QtPnJlc291cmNl UmVxdWVzdCgpKSk7CiAgICAgZGVjaXNpb24tPnByaXYtPnJlc3BvbnNlID0gYWRvcHRHUmVmKHdl YmtpdFVSSVJlc3BvbnNlQ3JlYXRlRm9yUmVzb3VyY2VSZXNwb25zZShyZXNwb25zZS0+cmVzb3Vy Y2VSZXNwb25zZSgpKSk7CisgICAgZGVjaXNpb24tPnByaXYtPmNhblNob3dNSU1FVHlwZSA9IGNh blNob3dNSU1FVHlwZTsKICAgICB3ZWJraXRQb2xpY3lEZWNpc2lvblNldExpc3RlbmVyKFdFQktJ VF9QT0xJQ1lfREVDSVNJT04oZGVjaXNpb24pLCBsaXN0ZW5lcik7CiAgICAgcmV0dXJuIGRlY2lz aW9uOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2Vi S2l0UmVzcG9uc2VQb2xpY3lEZWNpc2lvbi5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9ndGsvV2ViS2l0UmVzcG9uc2VQb2xpY3lEZWNpc2lvbi5oCmluZGV4IDRhNjg5ZmIuLmI0ZThm ZTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFJl c3BvbnNlUG9saWN5RGVjaXNpb24uaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2d0ay9XZWJLaXRSZXNwb25zZVBvbGljeURlY2lzaW9uLmgKQEAgLTYwLDEzICs2MCwxNiBAQCBz dHJ1Y3QgX1dlYktpdFJlc3BvbnNlUG9saWN5RGVjaXNpb25DbGFzcyB7CiB9OwogCiBXRUJLSVRf QVBJIEdUeXBlCi13ZWJraXRfcmVzcG9uc2VfcG9saWN5X2RlY2lzaW9uX2dldF90eXBlICAgICAg ICAgICAgKHZvaWQpOword2Via2l0X3Jlc3BvbnNlX3BvbGljeV9kZWNpc2lvbl9nZXRfdHlwZSAg ICAgICAgICAgICAgICh2b2lkKTsKIAogV0VCS0lUX0FQSSBXZWJLaXRVUklSZXF1ZXN0ICoKLXdl YmtpdF9yZXNwb25zZV9wb2xpY3lfZGVjaXNpb25fZ2V0X3JlcXVlc3QgICAgICAgICAoV2ViS2l0 UmVzcG9uc2VQb2xpY3lEZWNpc2lvbiAqZGVjaXNpb24pOword2Via2l0X3Jlc3BvbnNlX3BvbGlj eV9kZWNpc2lvbl9nZXRfcmVxdWVzdCAgICAgICAgICAgIChXZWJLaXRSZXNwb25zZVBvbGljeURl Y2lzaW9uICpkZWNpc2lvbik7CiAKIFdFQktJVF9BUEkgV2ViS2l0VVJJUmVzcG9uc2UgKgotd2Vi a2l0X3Jlc3BvbnNlX3BvbGljeV9kZWNpc2lvbl9nZXRfcmVzcG9uc2UgICAgICAgIChXZWJLaXRS ZXNwb25zZVBvbGljeURlY2lzaW9uICpkZWNpc2lvbik7Cit3ZWJraXRfcmVzcG9uc2VfcG9saWN5 X2RlY2lzaW9uX2dldF9yZXNwb25zZSAgICAgICAgICAgKFdlYktpdFJlc3BvbnNlUG9saWN5RGVj aXNpb24gKmRlY2lzaW9uKTsKKworV0VCS0lUX0FQSSBnYm9vbGVhbgord2Via2l0X3Jlc3BvbnNl X3BvbGljeV9kZWNpc2lvbl9pc19taW1lX3R5cGVfc3VwcG9ydGVkIChXZWJLaXRSZXNwb25zZVBv bGljeURlY2lzaW9uICpkZWNpc2lvbik7CiAKIEdfRU5EX0RFQ0xTCiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFJlc3BvbnNlUG9saWN5RGVjaXNp b25Qcml2YXRlLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRSZXNw b25zZVBvbGljeURlY2lzaW9uUHJpdmF0ZS5oCmluZGV4IDNlN2U1OWUuLmQ1MjEyZjA5IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRSZXNwb25zZVBv bGljeURlY2lzaW9uUHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv Z3RrL1dlYktpdFJlc3BvbnNlUG9saWN5RGVjaXNpb25Qcml2YXRlLmgKQEAgLTIzLDYgKzIzLDYg QEAKICNpbmNsdWRlICJXZWJLaXRQcml2YXRlLmgiCiAjaW5jbHVkZSAiV2ViS2l0UmVzcG9uc2VQ b2xpY3lEZWNpc2lvbi5oIgogCi1XZWJLaXRSZXNwb25zZVBvbGljeURlY2lzaW9uKiB3ZWJraXRS ZXNwb25zZVBvbGljeURlY2lzaW9uQ3JlYXRlKFdlYktpdDo6V2ViVVJMUmVxdWVzdCosIFdlYktp dDo6V2ViVVJMUmVzcG9uc2UqLCBXZWJLaXQ6OldlYkZyYW1lUG9saWN5TGlzdGVuZXJQcm94eSop OworV2ViS2l0UmVzcG9uc2VQb2xpY3lEZWNpc2lvbiogd2Via2l0UmVzcG9uc2VQb2xpY3lEZWNp c2lvbkNyZWF0ZShXZWJLaXQ6OldlYlVSTFJlcXVlc3QqLCBXZWJLaXQ6OldlYlVSTFJlc3BvbnNl KiwgYm9vbCBjYW5TaG93TUlNRVR5cGUsIFdlYktpdDo6V2ViRnJhbWVQb2xpY3lMaXN0ZW5lclBy b3h5Kik7CiAKICNlbmRpZiAvLyBXZWJLaXRSZXNwb25zZVBvbGljeURlY2lzaW9uUHJpdmF0ZV9o CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJW aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcu Y3BwCmluZGV4IDk4MTBkODcuLmZkZjVkN2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuY3BwCkBAIC0yNzksNyArMjc5LDcgQEAgc3Rh dGljIGdib29sZWFuIHdlYmtpdFdlYlZpZXdEZWNpZGVQb2xpY3koV2ViS2l0V2ViVmlldyogd2Vi VmlldywgV2ViS2l0UG9saWN5RGUKICAgICAgICAgcmV0dXJuIFRSVUU7CiAgICAgfQogCi0gICAg aWYgKHdlYmtpdF93ZWJfdmlld19jYW5fc2hvd19taW1lX3R5cGUod2ViVmlldywgd2Via2l0X3Vy aV9yZXNwb25zZV9nZXRfbWltZV90eXBlKHJlc3BvbnNlKSkpCisgICAgaWYgKHdlYmtpdF9yZXNw b25zZV9wb2xpY3lfZGVjaXNpb25faXNfbWltZV90eXBlX3N1cHBvcnRlZChXRUJLSVRfUkVTUE9O U0VfUE9MSUNZX0RFQ0lTSU9OKGRlY2lzaW9uKSkpCiAgICAgICAgIHdlYmtpdF9wb2xpY3lfZGVj aXNpb25fdXNlKGRlY2lzaW9uKTsKICAgICBlbHNlCiAgICAgICAgIHdlYmtpdF9wb2xpY3lfZGVj aXNpb25faWdub3JlKGRlY2lzaW9uKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZ3RrL2RvY3Mvd2Via2l0Mmd0ay1zZWN0aW9ucy50eHQgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2d0ay9kb2NzL3dlYmtpdDJndGstc2VjdGlvbnMudHh0CmluZGV4IDVh NmNiNDMuLjI0MjgzYjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv Z3RrL2RvY3Mvd2Via2l0Mmd0ay1zZWN0aW9ucy50eHQKKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9ndGsvZG9jcy93ZWJraXQyZ3RrLXNlY3Rpb25zLnR4dApAQCAtNTY0LDYgKzU2 NCw3IEBAIHdlYmtpdF9uYXZpZ2F0aW9uX3BvbGljeV9kZWNpc2lvbl9nZXRfdHlwZQogV2ViS2l0 UmVzcG9uc2VQb2xpY3lEZWNpc2lvbgogd2Via2l0X3Jlc3BvbnNlX3BvbGljeV9kZWNpc2lvbl9n ZXRfcmVxdWVzdAogd2Via2l0X3Jlc3BvbnNlX3BvbGljeV9kZWNpc2lvbl9nZXRfcmVzcG9uc2UK K3dlYmtpdF9yZXNwb25zZV9wb2xpY3lfZGVjaXNpb25faXNfbWltZV90eXBlX3N1cHBvcnRlZAog CiA8U1VCU0VDVElPTiBTdGFuZGFyZD4KIFdlYktpdFJlc3BvbnNlUG9saWN5RGVjaXNpb25DbGFz cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvVGVz dFdlYktpdFBvbGljeUNsaWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0 ay90ZXN0cy9UZXN0V2ViS2l0UG9saWN5Q2xpZW50LmNwcAppbmRleCBhYmJmZDY1Li4yMDllYTA0 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0 V2ViS2l0UG9saWN5Q2xpZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2d0ay90ZXN0cy9UZXN0V2ViS2l0UG9saWN5Q2xpZW50LmNwcApAQCAtMTU3LDYgKzE1NywxNiBA QCBzdGF0aWMgdm9pZCB0ZXN0UmVzcG9uc2VQb2xpY3koUG9saWN5Q2xpZW50VGVzdCogdGVzdCwg Z2NvbnN0cG9pbnRlcikKICAgICBnX2Fzc2VydF9jbXBpbnQodGVzdC0+bV9sb2FkRXZlbnRzWzFd LCA9PSwgTG9hZFRyYWNraW5nVGVzdDo6TG9hZENvbW1pdHRlZCk7CiAgICAgZ19hc3NlcnRfY21w aW50KHRlc3QtPm1fbG9hZEV2ZW50c1syXSwgPT0sIExvYWRUcmFja2luZ1Rlc3Q6OkxvYWRGaW5p c2hlZCk7CiAKKyAgICBXZWJLaXRSZXNwb25zZVBvbGljeURlY2lzaW9uKiBkZWNpc2lvbiA9IFdF QktJVF9SRVNQT05TRV9QT0xJQ1lfREVDSVNJT04odGVzdC0+bV9wcmV2aW91c1BvbGljeURlY2lz aW9uLmdldCgpKTsKKyAgICBXZWJLaXRVUklSZXF1ZXN0KiByZXF1ZXN0ID0gd2Via2l0X3Jlc3Bv bnNlX3BvbGljeV9kZWNpc2lvbl9nZXRfcmVxdWVzdChkZWNpc2lvbik7CisgICAgZ19hc3NlcnQo V0VCS0lUX0lTX1VSSV9SRVFVRVNUKHJlcXVlc3QpKTsKKyAgICBBU1NFUlRfQ01QX0NTVFJJTkco d2Via2l0X3VyaV9yZXF1ZXN0X2dldF91cmkocmVxdWVzdCksID09LCBrU2VydmVyLT5nZXRVUklG b3JQYXRoKCIvIikpOworICAgIFdlYktpdFVSSVJlc3BvbnNlKiByZXNwb25zZSA9IHdlYmtpdF9y ZXNwb25zZV9wb2xpY3lfZGVjaXNpb25fZ2V0X3Jlc3BvbnNlKGRlY2lzaW9uKTsKKyAgICBnX2Fz c2VydChXRUJLSVRfSVNfVVJJX1JFU1BPTlNFKHJlc3BvbnNlKSk7CisgICAgQVNTRVJUX0NNUF9D U1RSSU5HKHdlYmtpdF91cmlfcmVzcG9uc2VfZ2V0X3VyaShyZXNwb25zZSksID09LCBrU2VydmVy LT5nZXRVUklGb3JQYXRoKCIvIikpOworICAgIGdfYXNzZXJ0KHdlYmtpdF93ZWJfdmlld19jYW5f c2hvd19taW1lX3R5cGUodGVzdC0+bV93ZWJWaWV3LCB3ZWJraXRfdXJpX3Jlc3BvbnNlX2dldF9t aW1lX3R5cGUocmVzcG9uc2UpKSA9PQorICAgICAgICB3ZWJraXRfcmVzcG9uc2VfcG9saWN5X2Rl Y2lzaW9uX2lzX21pbWVfdHlwZV9zdXBwb3J0ZWQoZGVjaXNpb24pKTsKKwogICAgIHRlc3QtPm1f cmVzcG9uZFRvUG9saWN5RGVjaXNpb25Bc3luY2hyb25vdXNseSA9IHRydWU7CiAgICAgdGVzdC0+ bG9hZFVSSShrU2VydmVyLT5nZXRVUklGb3JQYXRoKCIvIikuZGF0YSgpKTsKICAgICB0ZXN0LT53 YWl0VW50aWxMb2FkRmluaXNoZWQoKTsKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rv b2xzL0NoYW5nZUxvZwppbmRleCBiOWIzZWU2Li5kMDQ0ZDgzIDEwMDY0NAotLS0gYS9Ub29scy9D aGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTMtMTEt MjAgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCisgICAgICAg IFtHVEtdIEFkZCBBUEkgdG8gV2ViS2l0UmVzcG9uc2VQb2xpY3lEZWNpc2lvbiB0byBjaGVjayBp ZiB0aGUgTUlNRSB0eXBlIGNhbiBiZSBzaG93bgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI0NjUyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBNaW5pQnJvd3Nlci9ndGsvQnJvd3NlcldpbmRvdy5jOgor ICAgICAgICAod2ViVmlld0RlY2lkZVBvbGljeSk6IFVzZSB0aGUgbmV3IEFQSSBpbnN0ZWFkIG9m CisgICAgICAgIHdlYmtpdF93ZWJfdmlld19jYW5fc2hvd19taW1lX3R5cGUoKS4KKwogMjAxMy0x MS0yMCAgQ29tbWl0IFF1ZXVlICA8Y29tbWl0LXF1ZXVlQHdlYmtpdC5vcmc+CiAKICAgICAgICAg VW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjE1OTQ5Ni4KZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlC cm93c2VyL2d0ay9Ccm93c2VyV2luZG93LmMgYi9Ub29scy9NaW5pQnJvd3Nlci9ndGsvQnJvd3Nl cldpbmRvdy5jCmluZGV4IDFkM2I0ZmMuLjEyNDRlM2EgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlC cm93c2VyL2d0ay9Ccm93c2VyV2luZG93LmMKKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvZ3RrL0Jy b3dzZXJXaW5kb3cuYwpAQCAtMzc4LDEwICszNzgsNyBAQCBzdGF0aWMgZ2Jvb2xlYW4gd2ViVmll d0RlY2lkZVBvbGljeShXZWJLaXRXZWJWaWV3ICp3ZWJWaWV3LCBXZWJLaXRQb2xpY3lEZWNpc2lv bgogICAgIH0KICAgICBjYXNlIFdFQktJVF9QT0xJQ1lfREVDSVNJT05fVFlQRV9SRVNQT05TRTog ewogICAgICAgICBXZWJLaXRSZXNwb25zZVBvbGljeURlY2lzaW9uICpyZXNwb25zZURlY2lzaW9u ID0gV0VCS0lUX1JFU1BPTlNFX1BPTElDWV9ERUNJU0lPTihkZWNpc2lvbik7Ci0gICAgICAgIFdl YktpdFVSSVJlc3BvbnNlICpyZXNwb25zZSA9IHdlYmtpdF9yZXNwb25zZV9wb2xpY3lfZGVjaXNp b25fZ2V0X3Jlc3BvbnNlKHJlc3BvbnNlRGVjaXNpb24pOwotICAgICAgICBjb25zdCBjaGFyICpt aW1lVHlwZSA9IHdlYmtpdF91cmlfcmVzcG9uc2VfZ2V0X21pbWVfdHlwZShyZXNwb25zZSk7Ci0K LSAgICAgICAgaWYgKHdlYmtpdF93ZWJfdmlld19jYW5fc2hvd19taW1lX3R5cGUod2ViVmlldywg bWltZVR5cGUpKQorICAgICAgICBpZiAod2Via2l0X3Jlc3BvbnNlX3BvbGljeV9kZWNpc2lvbl9p c19taW1lX3R5cGVfc3VwcG9ydGVkKHJlc3BvbnNlRGVjaXNpb24pKQogICAgICAgICAgICAgcmV0 dXJuIEZBTFNFOwogCiAgICAgICAgIFdlYktpdFdlYlJlc291cmNlICptYWluUmVzb3VyY2UgPSB3 ZWJraXRfd2ViX3ZpZXdfZ2V0X21haW5fcmVzb3VyY2Uod2ViVmlldyk7Cg==