33484 2010-01-11 12:16:28 -0800 [GTK] Add and cleanup return values of signals in view and frame 2010-02-04 15:39:39 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC All RESOLVED FIXED Gtk P2 Normal --- 1 christian christian eric oldest_to_newest 179473 0 46297 christian 2010-01-11 12:16:28 -0800 Created attachment 46297 Add and cleanup return values I noticed that the return values are missing from some of the signal in WebKitWebView and one in WebKitWebFrame. This causes confusion when looking up a signal and either having crashing code or lacking documented variables. While I was at it, I changed existing @return tags into Return value: for better readability. 179474 1 christian 2010-01-11 12:17:34 -0800 Note the move-cursor signal. I honestly don't know what the return value is supposed to do. Is it a bug that it has no boolean accumulator? 185574 2 46297 gustavo 2010-01-28 12:26:57 -0800 Comment on attachment 46297 Add and cleanup return values  1380 * * Return value: a #WebKitNavigationResponse  1381 * Additional * here. I would prefer if you leave move-cursor out of this for now, and report a bug specifically about it. I don't really know whether it should have an accummulator, or if we should simply make it return void, go ahead with the rest, though. Thanks! 186645 3 eric 2010-02-01 16:11:53 -0800 Attachment 46297 was posted by a committer and has review+, assigning to Christian Dywan for commit. 187972 4 christian 2010-02-04 15:39:39 -0800 Committed with the change to the move-cursor signal removed. 2010-02-04 Christian Dywan <christian@twotoasts.de> Reviewed by Gustavo Noronha Silva. [GTK] Add and cleanup return values of signals in view and frame https://bugs.webkit.org/show_bug.cgi?id=33484 Add missing and cleanup return values of web frame and web view signals. * webkit/webkitwebframe.cpp: (webkit_web_frame_class_init): * webkit/webkitwebview.cpp: (DNDContentsRequest::webkit_web_view_class_init): 46297 2010-01-11 12:16:28 -0800 2010-01-28 12:26:57 -0800 Add and cleanup return values webview-signals-return.diff text/plain 12796 christian ZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYmZyYW1lLmNwcCBiL1dlYktp dC9ndGsvd2Via2l0L3dlYmtpdHdlYmZyYW1lLmNwcAppbmRleCBlZDIzZjEzLi43YTVmYTc1IDEw MDY0NAotLS0gYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJmcmFtZS5jcHAKKysrIGIvV2Vi S2l0L2d0ay93ZWJraXQvd2Via2l0d2ViZnJhbWUuY3BwCkBAIC0yNjksNiArMjY5LDkgQEAgc3Rh dGljIHZvaWQgd2Via2l0X3dlYl9mcmFtZV9jbGFzc19pbml0KFdlYktpdFdlYkZyYW1lQ2xhc3Mq IGZyYW1lQ2xhc3MpCiAgICAgICogV2ViS2l0V2ViRnJhbWU6aG9yaXpvbnRhbC1zY3JvbGxiYXIt cG9saWN5IGFuZAogICAgICAqIFdlYktpdFdlYkZyYW1lOnZlcnRpY2FsLXNjcm9sbGJhci1wb2xp Y3kgcHJvcGVydGllcy4KICAgICAgKgorICAgICAqIFJldHVybiB2YWx1ZTogJVRSVUUgdG8gc3Rv cCBvdGhlciBoYW5kbGVycyBmcm9tIGJlaW5nIGludm9rZWQgZm9yIHRoZQorICAgICAqIGV2ZW50 LiAlRkFMU0UgdG8gcHJvcGFnYXRlIHRoZSBldmVudCBmdXJ0aGVyLgorICAgICAqCiAgICAgICog U2luY2U6IDEuMS4xNAogICAgICAqLwogICAgIHdlYmtpdF93ZWJfZnJhbWVfc2lnbmFsc1tTQ1JP TExCQVJTX1BPTElDWV9DSEFOR0VEXSA9IGdfc2lnbmFsX25ldygic2Nyb2xsYmFycy1wb2xpY3kt Y2hhbmdlZCIsCmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmNw cCBiL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwCmluZGV4IDJkMmU2ZTcuLjdk YWNhNGUgMTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwCisr KyBiL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwCkBAIC0xMjkwLDcgKzEyOTAs NiBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3ZpZXdfY2xhc3NfaW5pdChXZWJLaXRXZWJWaWV3 Q2xhc3MqIHdlYlZpZXdDbGFzcykKICAgICAgKiBXZWJLaXRXZWJWaWV3OjpjcmVhdGUtd2ViLXZp ZXc6CiAgICAgICogQHdlYl92aWV3OiB0aGUgb2JqZWN0IG9uIHdoaWNoIHRoZSBzaWduYWwgaXMg ZW1pdHRlZAogICAgICAqIEBmcmFtZTogdGhlICNXZWJLaXRXZWJGcmFtZQotICAgICAqIEByZXR1 cm46IGEgbmV3bHkgYWxsb2NhdGVkICNXZWJLaXRXZWJWaWV3IG9yICVOVUxMCiAgICAgICoKICAg ICAgKiBFbWl0dGVkIHdoZW4gdGhlIGNyZWF0aW9uIG9mIGEgbmV3IHdpbmRvdyBpcyByZXF1ZXN0 ZWQuCiAgICAgICogSWYgdGhpcyBzaWduYWwgaXMgaGFuZGxlZCB0aGUgc2lnbmFsIGhhbmRsZXIg c2hvdWxkIHJldHVybiB0aGUKQEAgLTEzMDMsNiArMTMwMiw4IEBAIHN0YXRpYyB2b2lkIHdlYmtp dF93ZWJfdmlld19jbGFzc19pbml0KFdlYktpdFdlYlZpZXdDbGFzcyogd2ViVmlld0NsYXNzKQog ICAgICAqIHRoZSBuZXcgI1dlYktpdFdlYlZpZXcuIFRoZSB3aWRnZXQgdG8gd2hpY2ggdGhlIHdp ZGdldCBpcyBhZGRlZCB3aWxsCiAgICAgICogaGFuZGxlIHRoYXQuCiAgICAgICoKKyAgICAgKiBS ZXR1cm4gdmFsdWU6IGEgbmV3bHkgYWxsb2NhdGVkICNXZWJLaXRXZWJWaWV3LCBvciAlTlVMTAor ICAgICAqCiAgICAgICogU2luY2U6IDEuMC4zCiAgICAgICovCiAgICAgd2Via2l0X3dlYl92aWV3 X3NpZ25hbHNbQ1JFQVRFX1dFQl9WSUVXXSA9IGdfc2lnbmFsX25ldygiY3JlYXRlLXdlYi12aWV3 IiwKQEAgLTEzMTgsOCArMTMxOSw2IEBAIHN0YXRpYyB2b2lkIHdlYmtpdF93ZWJfdmlld19jbGFz c19pbml0KFdlYktpdFdlYlZpZXdDbGFzcyogd2ViVmlld0NsYXNzKQogICAgIC8qKgogICAgICAq IFdlYktpdFdlYlZpZXc6OndlYi12aWV3LXJlYWR5OgogICAgICAqIEB3ZWJfdmlldzogdGhlIG9i amVjdCBvbiB3aGljaCB0aGUgc2lnbmFsIGlzIGVtaXR0ZWQKLSAgICAgKiBAcmV0dXJuOiAlVFJV RSB0byBzdG9wIG90aGVyIGhhbmRsZXJzIGZyb20gYmVpbmcgaW52b2tlZCBmb3IKLSAgICAgKiB0 aGUgZXZlbnQsICVGQUxTRSB0byBwcm9wYWdhdGUgdGhlIGV2ZW50IGZ1cnRoZXIKICAgICAgKgog ICAgICAqIEVtaXR0ZWQgYWZ0ZXIgI1dlYktpdFdlYlZpZXc6OmNyZWF0ZS13ZWItdmlldyB3aGVu IHRoZSBuZXcgI1dlYktpdFdlYlZpZXcKICAgICAgKiBzaG91bGQgYmUgZGlzcGxheWVkIHRvIHRo ZSB1c2VyLiBXaGVuIHRoaXMgc2lnbmFsIGlzIGVtaXR0ZWQKQEAgLTEzMzIsNiArMTMzMSw5IEBA IHN0YXRpYyB2b2lkIHdlYmtpdF93ZWJfdmlld19jbGFzc19pbml0KFdlYktpdFdlYlZpZXdDbGFz cyogd2ViVmlld0NsYXNzKQogICAgICAqIHRpbWUgb2YgdGhlIHdpbmRvdywgc28geW91IG1heSB3 YW50IHRvIGNvbm5lY3QgdG8gdGhlIDo6bm90aWZ5CiAgICAgICogc2lnbmFsIG9mIHRoZSAjV2Vi S2l0V2ViV2luZG93RmVhdHVyZXMgb2JqZWN0IHRvIGhhbmRsZSB0aG9zZS4KICAgICAgKgorICAg ICAqIFJldHVybiB2YWx1ZTogJVRSVUUgdG8gc3RvcCBoYW5kbGVycyBmcm9tIGJlaW5nIGludm9r ZWQgZm9yIHRoZSBldmVudCBvcgorICAgICAqICVGQUxTRSB0byBwcm9wYWdhdGUgdGhlIGV2ZW50 IGZ1cnRlcgorICAgICAqCiAgICAgICogU2luY2U6IDEuMC4zCiAgICAgICovCiAgICAgd2Via2l0 X3dlYl92aWV3X3NpZ25hbHNbV0VCX1ZJRVdfUkVBRFldID0gZ19zaWduYWxfbmV3KCJ3ZWItdmll dy1yZWFkeSIsCkBAIC0xMzQ2LDE0ICsxMzQ4LDE2IEBAIHN0YXRpYyB2b2lkIHdlYmtpdF93ZWJf dmlld19jbGFzc19pbml0KFdlYktpdFdlYlZpZXdDbGFzcyogd2ViVmlld0NsYXNzKQogICAgIC8q KgogICAgICAqIFdlYktpdFdlYlZpZXc6OmNsb3NlLXdlYi12aWV3OgogICAgICAqIEB3ZWJfdmll dzogdGhlIG9iamVjdCBvbiB3aGljaCB0aGUgc2lnbmFsIGlzIGVtaXR0ZWQKLSAgICAgKiBAcmV0 dXJuOiAlVFJVRSB0byBzdG9wIGhhbmRsZXJzIGZyb20gYmVpbmcgaW52b2tlZCBmb3IgdGhlIGV2 ZW50IG9yCi0gICAgICogJUZBTFNFIHRvIHByb3BhZ2F0ZSB0aGUgZXZlbnQgZnVydGVyCiAgICAg ICoKICAgICAgKiBFbWl0dGVkIHdoZW4gY2xvc2luZyBhICNXZWJLaXRXZWJWaWV3IGlzIHJlcXVl c3RlZC4gVGhpcyBvY2N1cnMgd2hlbiBhCiAgICAgICogY2FsbCBpcyBtYWRlIGZyb20gSmF2YVNj cmlwdCdzIHdpbmRvdy5jbG9zZSBmdW5jdGlvbi4gVGhlIGRlZmF1bHQKICAgICAgKiBzaWduYWwg aGFuZGxlciBkb2VzIG5vdCBkbyBhbnl0aGluZy4gSXQgaXMgdGhlIG93bmVyJ3MgcmVzcG9uc2li aWxpdHkKICAgICAgKiB0byBoaWRlIG9yIGRlbGV0ZSB0aGUgd2ViIHZpZXcsIGlmIG5lY2Vzc2Fy eS4KICAgICAgKgorICAgICAqCisgICAgICogUmV0dXJuIHZhbHVlOiAlVFJVRSB0byBzdG9wIGhh bmRsZXJzIGZyb20gYmVpbmcgaW52b2tlZCBmb3IgdGhlIGV2ZW50IG9yCisgICAgICogJUZBTFNF IHRvIHByb3BhZ2F0ZSB0aGUgZXZlbnQgZnVydGVyCisgICAgICoKICAgICAgKiBTaW5jZTogMS4x LjExCiAgICAgICovCiAgICAgd2Via2l0X3dlYl92aWV3X3NpZ25hbHNbQ0xPU0VfV0VCX1ZJRVdd ID0gZ19zaWduYWxfbmV3KCJjbG9zZS13ZWItdmlldyIsCkBAIC0xMzcwLDEwICsxMzc0LDExIEBA IHN0YXRpYyB2b2lkIHdlYmtpdF93ZWJfdmlld19jbGFzc19pbml0KFdlYktpdFdlYlZpZXdDbGFz cyogd2ViVmlld0NsYXNzKQogICAgICAqIEB3ZWJfdmlldzogdGhlIG9iamVjdCBvbiB3aGljaCB0 aGUgc2lnbmFsIGlzIGVtaXR0ZWQKICAgICAgKiBAZnJhbWU6IHRoZSAjV2ViS2l0V2ViRnJhbWUg dGhhdCByZXF1aXJlZCB0aGUgbmF2aWdhdGlvbgogICAgICAqIEByZXF1ZXN0OiBhICNXZWJLaXRO ZXR3b3JrUmVxdWVzdAotICAgICAqIEByZXR1cm46IGEgV2ViS2l0TmF2aWdhdGlvblJlc3BvbnNl CiAgICAgICoKICAgICAgKiBFbWl0dGVkIHdoZW4gQGZyYW1lIHJlcXVlc3RzIGEgbmF2aWdhdGlv biB0byBhbm90aGVyIHBhZ2UuCiAgICAgICoKKyAgICAgKiAqIFJldHVybiB2YWx1ZTogYSAjV2Vi S2l0TmF2aWdhdGlvblJlc3BvbnNlCisgICAgICoKICAgICAgKiBEZXByZWNhdGVkOiBVc2UgV2Vi S2l0V2ViVmlldzo6bmF2aWdhdGlvbi1wb2xpY3ktZGVjaXNpb24tcmVxdWVzdGVkCiAgICAgICog aW5zdGVhZAogICAgICAqLwpAQCAtMTM5NSw4ICsxNDAwLDYgQEAgc3RhdGljIHZvaWQgd2Via2l0 X3dlYl92aWV3X2NsYXNzX2luaXQoV2ViS2l0V2ViVmlld0NsYXNzKiB3ZWJWaWV3Q2xhc3MpCiAg ICAgICogQHJlcXVlc3Q6IGEgI1dlYktpdE5ldHdvcmtSZXF1ZXN0CiAgICAgICogQG5hdmlnYXRp b25fYWN0aW9uOiBhICNXZWJLaXRXZWJOYXZpZ2F0aW9uCiAgICAgICogQHBvbGljeV9kZWNpc2lv bjogYSAjV2ViS2l0V2ViUG9saWN5RGVjaXNpb24KLSAgICAgKiBAcmV0dXJuOiBUUlVFIGlmIGEg ZGVjaXNpb24gd2FzIG1hZGUsIEZBTFNFIHRvIGhhdmUgdGhlCi0gICAgICogICAgICAgICAgZGVm YXVsdCBiZWhhdmlvciBhcHBseQogICAgICAqCiAgICAgICogRW1pdHRlZCB3aGVuIEBmcmFtZSBy ZXF1ZXN0cyBvcGVuaW5nIGEgbmV3IHdpbmRvdy4gV2l0aCB0aGlzCiAgICAgICogc2lnbmFsIHRo ZSBicm93c2VyIGNhbiB1c2UgdGhlIGNvbnRleHQgb2YgdGhlIHJlcXVlc3QgdG8gZGVjaWRlCkBA IC0xNDE4LDYgKzE0MjEsOSBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3ZpZXdfY2xhc3NfaW5p dChXZWJLaXRXZWJWaWV3Q2xhc3MqIHdlYlZpZXdDbGFzcykKICAgICAgKiB3ZWJraXRfd2ViX3Bv bGljeV9kZWNpc2lvbl9kb3dubG9hZCgpIG9uIHRoZSBAcG9saWN5X2RlY2lzaW9uCiAgICAgICog b2JqZWN0LgogICAgICAqCisgICAgICogUmV0dXJuIHZhbHVlOiAlVFJVRSBpZiBhIGRlY2lzaW9u IHdhcyBtYWRlLCAlRkFMU0UgdG8gaGF2ZSB0aGUKKyAgICAgKiBkZWZhdWx0IGJlaGF2aW9yIGFw cGx5CisgICAgICoKICAgICAgKiBTaW5jZTogMS4xLjQKICAgICAgKi8KICAgICB3ZWJraXRfd2Vi X3ZpZXdfc2lnbmFsc1tORVdfV0lORE9XX1BPTElDWV9ERUNJU0lPTl9SRVFVRVNURURdID0KQEAg LTE0NDEsOCArMTQ0Nyw2IEBAIHN0YXRpYyB2b2lkIHdlYmtpdF93ZWJfdmlld19jbGFzc19pbml0 KFdlYktpdFdlYlZpZXdDbGFzcyogd2ViVmlld0NsYXNzKQogICAgICAqIEByZXF1ZXN0OiBhICNX ZWJLaXROZXR3b3JrUmVxdWVzdAogICAgICAqIEBuYXZpZ2F0aW9uX2FjdGlvbjogYSAjV2ViS2l0 V2ViTmF2aWdhdGlvbgogICAgICAqIEBwb2xpY3lfZGVjaXNpb246IGEgI1dlYktpdFdlYlBvbGlj eURlY2lzaW9uCi0gICAgICogQHJldHVybjogVFJVRSBpZiBhIGRlY2lzaW9uIHdhcyBtYWRlLCBG QUxTRSB0byBoYXZlIHRoZQotICAgICAqICAgICAgICAgIGRlZmF1bHQgYmVoYXZpb3IgYXBwbHkK ICAgICAgKgogICAgICAqIEVtaXR0ZWQgd2hlbiBAZnJhbWUgcmVxdWVzdHMgYSBuYXZpZ2F0aW9u IHRvIGFub3RoZXIgcGFnZS4KICAgICAgKiBJZiB0aGlzIHNpZ25hbCBpcyBub3QgaGFuZGxlZCwg dGhlIGRlZmF1bHQgYmVoYXZpb3IgaXMgdG8gYWxsb3cgdGhlCkBAIC0xNDU1LDYgKzE0NTksOSBA QCBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3ZpZXdfY2xhc3NfaW5pdChXZWJLaXRXZWJWaWV3Q2xh c3MqIHdlYlZpZXdDbGFzcykKICAgICAgKiB3ZWJraXRfd2ViX3BvbGljeV9kZWNpc2lvbl9kb3du bG9hZCgpIG9uIHRoZSBAcG9saWN5X2RlY2lzaW9uCiAgICAgICogb2JqZWN0LgogICAgICAqCisg ICAgICogUmV0dXJuIHZhbHVlOiAlVFJVRSBpZiBhIGRlY2lzaW9uIHdhcyBtYWRlLCAlRkFMU0Ug dG8gaGF2ZSB0aGUKKyAgICAgKiBkZWZhdWx0IGJlaGF2aW9yIGFwcGx5CisgICAgICoKICAgICAg KiBTaW5jZTogMS4wLjMKICAgICAgKi8KICAgICB3ZWJraXRfd2ViX3ZpZXdfc2lnbmFsc1tOQVZJ R0FUSU9OX1BPTElDWV9ERUNJU0lPTl9SRVFVRVNURURdID0gZ19zaWduYWxfbmV3KCJuYXZpZ2F0 aW9uLXBvbGljeS1kZWNpc2lvbi1yZXF1ZXN0ZWQiLApAQCAtMTQ3Nyw4ICsxNDg0LDYgQEAgc3Rh dGljIHZvaWQgd2Via2l0X3dlYl92aWV3X2NsYXNzX2luaXQoV2ViS2l0V2ViVmlld0NsYXNzKiB3 ZWJWaWV3Q2xhc3MpCiAgICAgICogQHJlcXVlc3Q6IGEgV2ViS2l0TmV0d29ya1JlcXVlc3QKICAg ICAgKiBAbWltZXR5cGU6IHRoZSBNSU1FIHR5cGUgYXR0ZW1wdGVkIHRvIGxvYWQKICAgICAgKiBA cG9saWN5X2RlY2lzaW9uOiBhICNXZWJLaXRXZWJQb2xpY3lEZWNpc2lvbgotICAgICAqIEByZXR1 cm46IFRSVUUgaWYgYSBkZWNpc2lvbiB3YXMgbWFkZSwgRkFMU0UgdG8gaGF2ZSB0aGUKLSAgICAg KiAgICAgICAgICBkZWZhdWx0IGJlaGF2aW9yIGFwcGx5CiAgICAgICoKICAgICAgKiBEZWNpZGUg d2hldGhlciBvciBub3QgdG8gZGlzcGxheSB0aGUgZ2l2ZW4gTUlNRSB0eXBlLiAgSWYgdGhpcwog ICAgICAqIHNpZ25hbCBpcyBub3QgaGFuZGxlZCwgdGhlIGRlZmF1bHQgYmVoYXZpb3IgaXMgdG8g c2hvdyB0aGUKQEAgLTE0OTYsNiArMTUwMSw5IEBAIHN0YXRpYyB2b2lkIHdlYmtpdF93ZWJfdmll d19jbGFzc19pbml0KFdlYktpdFdlYlZpZXdDbGFzcyogd2ViVmlld0NsYXNzKQogICAgICAqIHdl YmtpdF93ZWJfcG9saWN5X2RlY2lzaW9uX2Rvd25sb2FkKCkgb24gdGhlIEBwb2xpY3lfZGVjaXNp b24KICAgICAgKiBvYmplY3QuCiAgICAgICoKKyAgICAgKiBSZXR1cm4gdmFsdWU6ICVUUlVFIGlm IGEgZGVjaXNpb24gd2FzIG1hZGUsICVGQUxTRSB0byBoYXZlIHRoZQorICAgICAqIGRlZmF1bHQg YmVoYXZpb3IgYXBwbHkKKyAgICAgKgogICAgICAqIFNpbmNlOiAxLjAuMwogICAgICAqLwogICAg IHdlYmtpdF93ZWJfdmlld19zaWduYWxzW01JTUVfVFlQRV9QT0xJQ1lfREVDSVNJT05fUkVRVUVT VEVEXSA9IGdfc2lnbmFsX25ldygibWltZS10eXBlLXBvbGljeS1kZWNpc2lvbi1yZXF1ZXN0ZWQi LApAQCAtMTU0Myw3ICsxNTUxLDYgQEAgc3RhdGljIHZvaWQgd2Via2l0X3dlYl92aWV3X2NsYXNz X2luaXQoV2ViS2l0V2ViVmlld0NsYXNzKiB3ZWJWaWV3Q2xhc3MpCiAgICAgICogQHdlYl92aWV3 OiB0aGUgb2JqZWN0IG9uIHdoaWNoIHRoZSBzaWduYWwgaXMgZW1pdHRlZAogICAgICAqIEBkb3du bG9hZDogYSAjV2ViS2l0RG93bmxvYWQgb2JqZWN0IHRoYXQgbGV0cyB5b3UgY29udHJvbCB0aGUK ICAgICAgKiBkb3dubG9hZCBwcm9jZXNzCi0gICAgICogQHJldHVybjogJVRSVUUgaWYgdGhlIGRv d25sb2FkIHNob3VsZCBiZSBwZXJmb3JtZWQsICVGQUxTRSB0byBjYW5jZWwgaXQuCiAgICAgICoK ICAgICAgKiBBIG5ldyBEb3dubG9hZCBpcyBiZWluZyByZXF1ZXN0ZWQuIEJ5IGRlZmF1bHQsIGlm IHRoZSBzaWduYWwgaXMKICAgICAgKiBub3QgaGFuZGxlZCwgdGhlIGRvd25sb2FkIGlzIGNhbmNl bGxlZC4gSWYgeW91IGhhbmRsZSB0aGUgZG93bmxvYWQKQEAgLTE1NjYsNiArMTU3Myw5IEBAIHN0 YXRpYyB2b2lkIHdlYmtpdF93ZWJfdmlld19jbGFzc19pbml0KFdlYktpdFdlYlZpZXdDbGFzcyog d2ViVmlld0NsYXNzKQogICAgICAqIGlzIHRvIGRvd25sb2FkIGFueXRoaW5nIHRoYXQgV2ViS2l0 IGNhbid0IGhhbmRsZSwgd2hpY2ggeW91IGNhbgogICAgICAqIGZpZ3VyZSBvdXQgYnkgdXNpbmcg d2Via2l0X3dlYl92aWV3X2Nhbl9zaG93X21pbWVfdHlwZSgpKS4KICAgICAgKgorICAgICAqIFJl dHVybiB2YWx1ZTogVFJVRSBpZiB0aGUgZG93bmxvYWQgc2hvdWxkIGJlIHBlcmZvcm1lZCwgJUZB TFNFIHRvCisgICAgICogY2FuY2VsIGl0CisgICAgICoKICAgICAgKiBTaW5jZTogMS4xLjIKICAg ICAgKi8KICAgICB3ZWJraXRfd2ViX3ZpZXdfc2lnbmFsc1tET1dOTE9BRF9SRVFVRVNURURdID0g Z19zaWduYWxfbmV3KCJkb3dubG9hZC1yZXF1ZXN0ZWQiLApAQCAtMTY0Niw2ICsxNjU2LDkgQEAg c3RhdGljIHZvaWQgd2Via2l0X3dlYl92aWV3X2NsYXNzX2luaXQoV2ViS2l0V2ViVmlld0NsYXNz KiB3ZWJWaWV3Q2xhc3MpCiAgICAgICogaGFuZGxlIHRoZSBzaWduYWwgaWYgeW91IHdhbnQgdG8g cHJvdmlkZSB5b3VyIG93biBlcnJvciBwYWdlLgogICAgICAqCiAgICAgICogU2luY2U6IDEuMS42 CisgICAgICoKKyAgICAgKiBSZXR1cm4gdmFsdWU6ICVUUlVFIHRvIHN0b3Agb3RoZXIgaGFuZGxl cnMgZnJvbSBiZWluZyBpbnZva2VkIGZvciB0aGUKKyAgICAgKiBldmVudC4gJUZBTFNFIHRvIHBy b3BhZ2F0ZSB0aGUgZXZlbnQgZnVydGhlci4KICAgICAgKi8KICAgICB3ZWJraXRfd2ViX3ZpZXdf c2lnbmFsc1tMT0FEX0VSUk9SXSA9IGdfc2lnbmFsX25ldygibG9hZC1lcnJvciIsCiAgICAgICAg ICAgICBHX1RZUEVfRlJPTV9DTEFTUyh3ZWJWaWV3Q2xhc3MpLApAQCAtMTczOSw4ICsxNzUyLDYg QEAgc3RhdGljIHZvaWQgd2Via2l0X3dlYl92aWV3X2NsYXNzX2luaXQoV2ViS2l0V2ViVmlld0Ns YXNzKiB3ZWJWaWV3Q2xhc3MpCiAgICAgICogV2ViS2l0V2ViVmlldzo6cHJpbnQtcmVxdWVzdGVk CiAgICAgICogQHdlYl92aWV3OiB0aGUgb2JqZWN0IGluIHdoaWNoIHRoZSBzaWduYWwgaXMgZW1p dHRlZAogICAgICAqIEB3ZWJfZnJhbWU6IHRoZSBmcmFtZSB0aGF0IGlzIHJlcXVlc3RpbmcgdG8g YmUgcHJpbnRlZAotICAgICAqIEByZXR1cm46ICVUUlVFIGlmIHRoZSBwcmludCByZXF1ZXN0IGhh cyBiZWVuIGhhbmRsZWQsICVGQUxTRSBpZgotICAgICAqIHRoZSBkZWZhdWx0IGhhbmRsZXIgc2hv dWxkIHJ1bgogICAgICAqCiAgICAgICogRW1pdHRlZCB3aGVuIHByaW50aW5nIGlzIHJlcXVlc3Rl ZCBieSB0aGUgZnJhbWUsIHVzdWFsbHkKICAgICAgKiBiZWNhdXNlIG9mIGEgamF2YXNjcmlwdCBj YWxsLiBXaGVuIGhhbmRsaW5nIHRoaXMgc2lnbmFsIHlvdQpAQCAtMTc1Miw2ICsxNzYzLDkgQEAg c3RhdGljIHZvaWQgd2Via2l0X3dlYl92aWV3X2NsYXNzX2luaXQoV2ViS2l0V2ViVmlld0NsYXNz KiB3ZWJWaWV3Q2xhc3MpCiAgICAgICogaWdub3JlIGEgcHJpbnQgcmVxdWVzdCB5b3UgbXVzdCBj b25uZWN0IHRvIHRoaXMgc2lnbmFsLCBhbmQKICAgICAgKiByZXR1cm4gJVRSVUUuCiAgICAgICoK KyAgICAgKiBSZXR1cm4gdmFsdWU6ICVUUlVFIGlmIHRoZSBwcmludCByZXF1ZXN0IGhhcyBiZWVu IGhhbmRsZWQsICVGQUxTRSBpZgorICAgICAqIHRoZSBkZWZhdWx0IGhhbmRsZXIgc2hvdWxkIHJ1 bgorICAgICAqCiAgICAgICogU2luY2U6IDEuMS41CiAgICAgICovCiAgICAgd2Via2l0X3dlYl92 aWV3X3NpZ25hbHNbUFJJTlRfUkVRVUVTVEVEXSA9IGdfc2lnbmFsX25ldygicHJpbnQtcmVxdWVz dGVkIiwKQEAgLTE4MDgsOSArMTgyMiwxMSBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3ZpZXdf Y2xhc3NfaW5pdChXZWJLaXRXZWJWaWV3Q2xhc3MqIHdlYlZpZXdDbGFzcykKICAgICAgKiBAbWVz c2FnZTogdGhlIG1lc3NhZ2UgdGV4dAogICAgICAqIEBsaW5lOiB0aGUgbGluZSB3aGVyZSB0aGUg ZXJyb3Igb2NjdXJlZAogICAgICAqIEBzb3VyY2VfaWQ6IHRoZSBzb3VyY2UgaWQKLSAgICAgKiBA cmV0dXJuOiBUUlVFIHRvIHN0b3Agb3RoZXIgaGFuZGxlcnMgZnJvbSBiZWluZyBpbnZva2VkIGZv ciB0aGUgZXZlbnQuIEZBTFNFIHRvIHByb3BhZ2F0ZSB0aGUgZXZlbnQgZnVydGhlci4KICAgICAg KgogICAgICAqIEEgSmF2YVNjcmlwdCBjb25zb2xlIG1lc3NhZ2Ugd2FzIGNyZWF0ZWQuCisgICAg ICoKKyAgICAgKiBSZXR1cm4gdmFsdWU6ICVUUlVFIHRvIHN0b3Agb3RoZXIgaGFuZGxlcnMgZnJv bSBiZWluZyBpbnZva2VkIGZvciB0aGUKKyAgICAgKiBldmVudC4gJUZBTFNFIHRvIHByb3BhZ2F0 ZSB0aGUgZXZlbnQgZnVydGhlci4KICAgICAgKi8KICAgICB3ZWJraXRfd2ViX3ZpZXdfc2lnbmFs c1tDT05TT0xFX01FU1NBR0VdID0gZ19zaWduYWxfbmV3KCJjb25zb2xlLW1lc3NhZ2UiLAogICAg ICAgICAgICAgR19UWVBFX0ZST01fQ0xBU1Mod2ViVmlld0NsYXNzKSwKQEAgLTE4MjcsOSArMTg0 MywxMSBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3ZpZXdfY2xhc3NfaW5pdChXZWJLaXRXZWJW aWV3Q2xhc3MqIHdlYlZpZXdDbGFzcykKICAgICAgKiBAd2ViX3ZpZXc6IHRoZSBvYmplY3Qgb24g d2hpY2ggdGhlIHNpZ25hbCBpcyBlbWl0dGVkCiAgICAgICogQGZyYW1lOiB0aGUgcmVsZXZhbnQg ZnJhbWUKICAgICAgKiBAbWVzc2FnZTogdGhlIG1lc3NhZ2UgdGV4dAotICAgICAqIEByZXR1cm46 IFRSVUUgdG8gc3RvcCBvdGhlciBoYW5kbGVycyBmcm9tIGJlaW5nIGludm9rZWQgZm9yIHRoZSBl dmVudC4gRkFMU0UgdG8gcHJvcGFnYXRlIHRoZSBldmVudCBmdXJ0aGVyLgogICAgICAqCiAgICAg ICogQSBKYXZhU2NyaXB0IGFsZXJ0IGRpYWxvZyB3YXMgY3JlYXRlZC4KKyAgICAgKgorICAgICAq IFJldHVybiB2YWx1ZTogJVRSVUUgdG8gc3RvcCBvdGhlciBoYW5kbGVycyBmcm9tIGJlaW5nIGlu dm9rZWQgZm9yIHRoZQorICAgICAqIGV2ZW50LiAlRkFMU0UgdG8gcHJvcGFnYXRlIHRoZSBldmVu dCBmdXJ0aGVyLgogICAgICAqLwogICAgIHdlYmtpdF93ZWJfdmlld19zaWduYWxzW1NDUklQVF9B TEVSVF0gPSBnX3NpZ25hbF9uZXcoInNjcmlwdC1hbGVydCIsCiAgICAgICAgICAgICBHX1RZUEVf RlJPTV9DTEFTUyh3ZWJWaWV3Q2xhc3MpLApAQCAtMTg0Nyw5ICsxODY1LDExIEBAIHN0YXRpYyB2 b2lkIHdlYmtpdF93ZWJfdmlld19jbGFzc19pbml0KFdlYktpdFdlYlZpZXdDbGFzcyogd2ViVmll d0NsYXNzKQogICAgICAqIEBmcmFtZTogdGhlIHJlbGV2YW50IGZyYW1lCiAgICAgICogQG1lc3Nh Z2U6IHRoZSBtZXNzYWdlIHRleHQKICAgICAgKiBAY29uZmlybWVkOiB3aGV0aGVyIHRoZSBkaWFs b2cgaGFzIGJlZW4gY29uZmlybWVkCi0gICAgICogQHJldHVybjogVFJVRSB0byBzdG9wIG90aGVy IGhhbmRsZXJzIGZyb20gYmVpbmcgaW52b2tlZCBmb3IgdGhlIGV2ZW50LiBGQUxTRSB0byBwcm9w YWdhdGUgdGhlIGV2ZW50IGZ1cnRoZXIuCiAgICAgICoKICAgICAgKiBBIEphdmFTY3JpcHQgY29u ZmlybSBkaWFsb2cgd2FzIGNyZWF0ZWQsIHByb3ZpZGluZyBZZXMgYW5kIE5vIGJ1dHRvbnMuCisg ICAgICoKKyAgICAgKiBSZXR1cm4gdmFsdWU6ICVUUlVFIHRvIHN0b3Agb3RoZXIgaGFuZGxlcnMg ZnJvbSBiZWluZyBpbnZva2VkIGZvciB0aGUKKyAgICAgKiBldmVudC4gJUZBTFNFIHRvIHByb3Bh Z2F0ZSB0aGUgZXZlbnQgZnVydGhlci4KICAgICAgKi8KICAgICB3ZWJraXRfd2ViX3ZpZXdfc2ln bmFsc1tTQ1JJUFRfQ09ORklSTV0gPSBnX3NpZ25hbF9uZXcoInNjcmlwdC1jb25maXJtIiwKICAg ICAgICAgICAgIEdfVFlQRV9GUk9NX0NMQVNTKHdlYlZpZXdDbGFzcyksCkBAIC0xODY4LDkgKzE4 ODgsMTEgQEAgc3RhdGljIHZvaWQgd2Via2l0X3dlYl92aWV3X2NsYXNzX2luaXQoV2ViS2l0V2Vi Vmlld0NsYXNzKiB3ZWJWaWV3Q2xhc3MpCiAgICAgICogQG1lc3NhZ2U6IHRoZSBtZXNzYWdlIHRl eHQKICAgICAgKiBAZGVmYXVsdDogdGhlIGRlZmF1bHQgdmFsdWUKICAgICAgKiBAdGV4dDogVG8g YmUgZmlsbGVkIHdpdGggdGhlIHJldHVybiB2YWx1ZSBvciBOVUxMIGlmIHRoZSBkaWFsb2cgd2Fz IGNhbmNlbGxlZC4KLSAgICAgKiBAcmV0dXJuOiBUUlVFIHRvIHN0b3Agb3RoZXIgaGFuZGxlcnMg ZnJvbSBiZWluZyBpbnZva2VkIGZvciB0aGUgZXZlbnQuIEZBTFNFIHRvIHByb3BhZ2F0ZSB0aGUg ZXZlbnQgZnVydGhlci4KICAgICAgKgogICAgICAqIEEgSmF2YVNjcmlwdCBwcm9tcHQgZGlhbG9n IHdhcyBjcmVhdGVkLCBwcm92aWRpbmcgYW4gZW50cnkgdG8gaW5wdXQgdGV4dC4KKyAgICAgKgor ICAgICAqIFJldHVybiB2YWx1ZTogJVRSVUUgdG8gc3RvcCBvdGhlciBoYW5kbGVycyBmcm9tIGJl aW5nIGludm9rZWQgZm9yIHRoZQorICAgICAqIGV2ZW50LiAlRkFMU0UgdG8gcHJvcGFnYXRlIHRo ZSBldmVudCBmdXJ0aGVyLgogICAgICAqLwogICAgIHdlYmtpdF93ZWJfdmlld19zaWduYWxzW1ND UklQVF9QUk9NUFRdID0gZ19zaWduYWxfbmV3KCJzY3JpcHQtcHJvbXB0IiwKICAgICAgICAgICAg IEdfVFlQRV9GUk9NX0NMQVNTKHdlYlZpZXdDbGFzcyksCkBAIC0xOTk3LDYgKzIwMTksMTAgQEAg c3RhdGljIHZvaWQgd2Via2l0X3dlYl92aWV3X2NsYXNzX2luaXQoV2ViS2l0V2ViVmlld0NsYXNz KiB3ZWJWaWV3Q2xhc3MpCiAgICAgICoKICAgICAgKiBUaGUgI1dlYktpdFdlYlZpZXc6Om1vdmUt Y3Vyc29yIHdpbGwgYmUgZW1pdHRlZCB0byBhcHBseSB0aGUKICAgICAgKiBjdXJzb3IgbW92ZW1l bnQgZGVzY3JpYmVkIGJ5IGl0cyBwYXJhbWV0ZXJzIHRvIHRoZSBAdmlldy4KKyAgICAgKgorICAg ICAqIFRoZSByZXR1cm4gdmFsdWUgaGFzIG5vIHByYWN0aWNhbCBtZWFuaW5nLgorICAgICAqCisg ICAgICogUmV0dXJuIHZhbHVlOiAlVFJVRSBvciAlRkFMU0UKICAgICAgKiAKICAgICAgKiBTaW5j ZTogMS4xLjQKICAgICAgKi8KQEAgLTIwMjQsNiArMjA1MCw4IEBAIHN0YXRpYyB2b2lkIHdlYmtp dF93ZWJfdmlld19jbGFzc19pbml0KFdlYktpdFdlYlZpZXdDbGFzcyogd2ViVmlld0NsYXNzKQog ICAgICAqIHRvIHNldCB0aGUgcHJvcGVydHkgdmFsdWUgb2YgIndlYmtpdC13aWRnZXQtaXMtc2Vs ZWN0ZWQiLiBUaGlzIGNhbgogICAgICAqIGJlIHVzZWQgdG8gZHJhdyBhIHZpc3VhbCBpbmRpY2F0 b3Igb2YgdGhlIHNlbGVjdGlvbi4KICAgICAgKgorICAgICAqIFJldHVybiB2YWx1ZTogYSBuZXcg I0d0a1dpZGdldCwgb3IgJU5VTEwKKyAgICAgKgogICAgICAqIFNpbmNlOiAxLjEuOAogICAgICAq LwogICAgIHdlYmtpdF93ZWJfdmlld19zaWduYWxzW1BMVUdJTl9XSURHRVRdID0gZ19zaWduYWxf bmV3KCJjcmVhdGUtcGx1Z2luLXdpZGdldCIsCg==