126840 2014-01-12 04:34:48 -0800 [GTK] Make MiniBrowser windows non-transient by default 2014-01-13 00:08:39 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 aperez webkit-unassigned andersca cgarcia commit-queue mrobinson oldest_to_newest 966932 0 aperez 2014-01-12 04:34:48 -0800 Instead of making new browser windows transient as soon as they are created, do ir later when handling the "run-as-modal" signal. This makes it easier to use the MiniBrowser to do tests involving multiple windows, and will be useful as well when multi-web-process mode is enabled for the GTK port. 966933 1 220965 aperez 2014-01-12 04:36:43 -0800 Created attachment 220965 Patch 966936 2 commit-queue 2014-01-12 04:38:48 -0800 Attachment 220965 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Tools/ChangeLog', u'Tools/MiniBrowser/gtk/BrowserWindow.c', '--commit-queue']" exit_code: 1 ERROR: Tools/MiniBrowser/gtk/BrowserWindow.c:273: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] ERROR: Tools/MiniBrowser/gtk/BrowserWindow.c:274: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] ERROR: Tools/MiniBrowser/gtk/BrowserWindow.c:706: Declaration has space between * and variable name in GtkWidget* window [whitespace/declaration] [3] ERROR: Tools/MiniBrowser/gtk/BrowserWindow.c:707: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] Total errors found: 4 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 966938 3 220969 aperez 2014-01-12 04:50:23 -0800 Created attachment 220969 Patch 966939 4 commit-queue 2014-01-12 04:52:21 -0800 Attachment 220969 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Tools/ChangeLog', u'Tools/MiniBrowser/gtk/BrowserWindow.c', '--commit-queue']" exit_code: 1 ERROR: Tools/MiniBrowser/gtk/BrowserWindow.c:706: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 966941 5 220970 aperez 2014-01-12 05:07:30 -0800 Created attachment 220970 Patch 966944 6 220970 cgarcia 2014-01-12 05:24:13 -0800 Comment on attachment 220970 Patch I think we can simply make the browser windows independent to each other. If you open two windows, then close the parent, and run-as-modal is emitted on the child window, it will crash because the parent window has already been destroyed. 966961 7 aperez 2014-01-12 08:27:22 -0800 (In reply to comment #6) > (From update of attachment 220970 [details]) > I think we can simply make the browser windows independent to each other. If you open two windows, then close the parent, and run-as-modal is emitted on the child window, it will crash because the parent window has already been destroyed. Good point, though I think it is more correct to connect to the "destroy" signal of the parent window, and clear the pointer to it in the child window. This way closing parent windows before run-as-modal is emitted will not cause a crash, and the transient-for property is still set when parent windows do exist. 966962 8 220973 aperez 2014-01-12 08:29:49 -0800 Created attachment 220973 Patch 966966 9 220973 cgarcia 2014-01-12 09:12:48 -0800 Comment on attachment 220973 Patch I still think we could just make windows independent to each other, but if we really want to keep the parent window, I think it would be simpler to keep the pointer to the parent window in the BroserWindow struct and use g_object_add_weak_pointer to make sure the parent pointer is NULL when the parent is destroyed. 967003 10 aperez 2014-01-12 11:23:47 -0800 (In reply to comment #9) > (From update of attachment 220973 [details]) > I still think we could just make windows independent to each other, but if we really want to keep the parent window, I think it would be simpler to keep the pointer to the parent window in the BroserWindow struct and use g_object_add_weak_pointer to make sure the parent pointer is NULL when the parent is destroyed. IMHO it is more correct to try to make the windows set the transient-for when they are meant to be modal. Not that it will matter much for the MiniBrowser, but provided that the fix is easy, I am making the change you suggested to use g_object_add_weak_pointer() and re-upload. 967004 11 220979 aperez 2014-01-12 11:24:24 -0800 Created attachment 220979 Patch 967005 12 220979 cgarcia 2014-01-12 11:39:37 -0800 Comment on attachment 220979 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=220979&action=review > Tools/MiniBrowser/gtk/BrowserWindow.c:704 > +static void parentWindowDestroy(GtkWidget *parent_window, gpointer window) > +{ > + if (window) > + g_object_set_data(G_OBJECT(window), "transient-for", NULL); > +} You forgot to remove this. 967009 13 220980 aperez 2014-01-12 12:04:14 -0800 Created attachment 220980 Patch 967010 14 aperez 2014-01-12 12:05:15 -0800 (In reply to comment #12) > (From update of attachment 220979 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=220979&action=review > > > Tools/MiniBrowser/gtk/BrowserWindow.c:704 > > +static void parentWindowDestroy(GtkWidget *parent_window, gpointer window) > > +{ > > + if (window) > > + g_object_set_data(G_OBJECT(window), "transient-for", NULL); > > +} > > You forgot to remove this. Certainly, good catch. I have already re-uploaded with this cleaned. 967182 15 220980 commit-queue 2014-01-13 00:08:35 -0800 Comment on attachment 220980 Patch Clearing flags on attachment: 220980 Committed r161864: <http://trac.webkit.org/changeset/161864> 967184 16 commit-queue 2014-01-13 00:08:39 -0800 All reviewed patches have been landed. Closing bug. 220965 2014-01-12 04:36:43 -0800 2014-01-12 04:50:09 -0800 Patch bug-126840-20140112143706.patch text/plain 2908 aperez U3VidmVyc2lvbiBSZXZpc2lvbjogMTYxODA1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNWQxMjRjYWM3NzcwZmY0OTFjNGQ2YjVjMzRiMzZiNWVj Y2ZmNTIyNC4uNTU1OTFlNDgxZDg3ZjUzMTAyN2ZmZDZkNGE5OGE3ZDU3ZTlkZTQ2ZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1 IEBACisyMDE0LTAxLTEyICBBZHJpYW4gUGVyZXogZGUgQ2FzdHJvICA8YXBlcmV6QGlnYWxpYS5j b20+CisKKyAgICAgICAgW0dUS10gTWFrZSBNaW5pQnJvd3NlciB3aW5kb3dzIG5vbi10cmFuc2ll bnQgYnkgZGVmYXVsdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTI2ODQwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgSW5zdGVhZCBvZiBtYWtpbmcgbmV3IGJyb3dzZXIgd2luZG93cyB0cmFuc2llbnQgYXMg c29vbiBhcyB0aGV5IGFyZQorICAgICAgICBjcmVhdGVkLCBzYXZlIHRoZSBwb2ludGVyIHRvIHRo ZSBwYXJlbnQgd2luZG93IGFuZCBzZXQgdGhlIHRyYW5zaWVudAorICAgICAgICBzdGF0ZSBsYXRl ciBvbiB3aGVuIGhhbmRsaW5nIHRoZSAicnVuLWFzLW1vZGFsIiBzaWduYWwuIFRoaXMgbWFrZXMK KyAgICAgICAgaXQgZWFzaWVyIHRvIHVzZSB0aGUgTWluaUJyb3dzZXIgdG8gZG8gdGVzdHMgaW52 b2x2aW5nIG11bHRpcGxlCisgICAgICAgIHdpbmRvd3MsIGFuZCB3aWxsIGJlIHVzZWZ1bCBhcyB3 ZWxsIHdoZW4gbXVsdGktd2ViLXByb2Nlc3MgbW9kZSBpcworICAgICAgICBlbmFibGVkIGZvciB0 aGUgR1RLIHBvcnQuCisKKyAgICAgICAgKiBNaW5pQnJvd3Nlci9ndGsvQnJvd3NlcldpbmRvdy5j OgorICAgICAgICAod2ViVmlld1J1bkFzTW9kYWwpOiBTZXQgdGhlIHBhcmVudCB3aW5kb3cgdXNp bmcKKyAgICAgICAgZ3RrX3dpbmRvd19zZXRfdHJhbnNpZW50X2ZvcigpIHVzaW5nIHRoZSBzYXZl ZCBwYXJlbnQKKyAgICAgICAgd2luZG93LgorICAgICAgICAoYnJvd3Nlcl93aW5kb3dfbmV3KTog U2F2ZSB0aGUgcGFyZW50IHdpbmRvdyB1c2luZworICAgICAgICBnX29iamVjdF9zZXRfZGF0YSgp IGluc3RlYWQgb2YgbWFraW5nIHRoZSBuZXcgd2luZG93CisgICAgICAgIHRyYW5zaWVudCBpbW1l ZGlhdGVseS4KKwogMjAxNC0wMS0xMiAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGln YWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gRml4IHJldHVybiB2YWx1ZSBvZiBXZWJLaXREb3du bG9hZDo6Y3JlYXRlZC1kZXN0aW5hdGlvbgpkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIv Z3RrL0Jyb3dzZXJXaW5kb3cuYyBiL1Rvb2xzL01pbmlCcm93c2VyL2d0ay9Ccm93c2VyV2luZG93 LmMKaW5kZXggZGRmZmRkZGNjMzA4ZmUzMzhkMjZmMGM1ZTA5YTRjM2RhNjI0M2Q0ZS4uMGQxZDk5 YWY2Yjc5N2ExZWEzYzg3MjEwNTNkODNjNzJmMDc5Y2Q5NyAxMDA2NDQKLS0tIGEvVG9vbHMvTWlu aUJyb3dzZXIvZ3RrL0Jyb3dzZXJXaW5kb3cuYworKysgYi9Ub29scy9NaW5pQnJvd3Nlci9ndGsv QnJvd3NlcldpbmRvdy5jCkBAIC0yNjksNiArMjY5LDkgQEAgc3RhdGljIHZvaWQgd2ViVmlld0Ns b3NlKFdlYktpdFdlYlZpZXcgKndlYlZpZXcsIEJyb3dzZXJXaW5kb3cgKndpbmRvdykKIHN0YXRp YyB2b2lkIHdlYlZpZXdSdW5Bc01vZGFsKFdlYktpdFdlYlZpZXcgKndlYlZpZXcsIEJyb3dzZXJX aW5kb3cgKndpbmRvdykKIHsKICAgICBndGtfd2luZG93X3NldF9tb2RhbChHVEtfV0lORE9XKHdp bmRvdyksIFRSVUUpOworICAgIGd0a193aW5kb3dfc2V0X3RyYW5zaWVudF9mb3IoR1RLX1dJTkRP Vyh3aW5kb3cpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgR1RLX1dJTkRPVyhn X29iamVjdF9nZXRfZGF0YShHX09CSkVDVCh3aW5kb3cpLAorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAidHJhbnNpZW50LWZvciIp KSk7CiB9CiAKIHN0YXRpYyB2b2lkIHdlYlZpZXdSZWFkeVRvU2hvdyhXZWJLaXRXZWJWaWV3ICp3 ZWJWaWV3LCBCcm93c2VyV2luZG93ICp3aW5kb3cpCkBAIC03MDAsMTAgKzcwMywxMSBAQCBHdGtX aWRnZXQgKmJyb3dzZXJfd2luZG93X25ldyhXZWJLaXRXZWJWaWV3ICp2aWV3LCBHdGtXaW5kb3cg KnBhcmVudCkKIHsKICAgICBnX3JldHVybl92YWxfaWZfZmFpbChXRUJLSVRfSVNfV0VCX1ZJRVco dmlldyksIDApOwogCi0gICAgcmV0dXJuIEdUS19XSURHRVQoZ19vYmplY3RfbmV3KEJST1dTRVJf VFlQRV9XSU5ET1csCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJ0cmFuc2ll bnQtZm9yIiwgcGFyZW50LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAidHlw ZSIsIEdUS19XSU5ET1dfVE9QTEVWRUwsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICJ2aWV3IiwgdmlldywgTlVMTCkpOworICAgIEd0a1dpZGdldCogd2luZG93ID0gR1RLX1dJ REdFVChnX29iamVjdF9uZXcoQlJPV1NFUl9UWVBFX1dJTkRPVywKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJ0eXBlIiwgR1RLX1dJTkRPV19UT1BMRVZF TCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJ2aWV3 IiwgdmlldywgTlVMTCkpOworICAgIGdfb2JqZWN0X3NldF9kYXRhKEdfT0JKRUNUKHdpbmRvdyks ICJ0cmFuc2llbnQtZm9yIiwgcGFyZW50KTsKKyAgICByZXR1cm4gd2luZG93OwogfQogCiBXZWJL aXRXZWJWaWV3ICpicm93c2VyX3dpbmRvd19nZXRfdmlldyhCcm93c2VyV2luZG93ICp3aW5kb3cp Cg== 220969 2014-01-12 04:50:23 -0800 2014-01-12 05:07:12 -0800 Patch bug-126840-20140112145046.patch text/plain 2820 aperez U3VidmVyc2lvbiBSZXZpc2lvbjogMTYxODA1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNWQxMjRjYWM3NzcwZmY0OTFjNGQ2YjVjMzRiMzZiNWVj Y2ZmNTIyNC4uNTU1OTFlNDgxZDg3ZjUzMTAyN2ZmZDZkNGE5OGE3ZDU3ZTlkZTQ2ZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1 IEBACisyMDE0LTAxLTEyICBBZHJpYW4gUGVyZXogZGUgQ2FzdHJvICA8YXBlcmV6QGlnYWxpYS5j b20+CisKKyAgICAgICAgW0dUS10gTWFrZSBNaW5pQnJvd3NlciB3aW5kb3dzIG5vbi10cmFuc2ll bnQgYnkgZGVmYXVsdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTI2ODQwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgSW5zdGVhZCBvZiBtYWtpbmcgbmV3IGJyb3dzZXIgd2luZG93cyB0cmFuc2llbnQgYXMg c29vbiBhcyB0aGV5IGFyZQorICAgICAgICBjcmVhdGVkLCBzYXZlIHRoZSBwb2ludGVyIHRvIHRo ZSBwYXJlbnQgd2luZG93IGFuZCBzZXQgdGhlIHRyYW5zaWVudAorICAgICAgICBzdGF0ZSBsYXRl ciBvbiB3aGVuIGhhbmRsaW5nIHRoZSAicnVuLWFzLW1vZGFsIiBzaWduYWwuIFRoaXMgbWFrZXMK KyAgICAgICAgaXQgZWFzaWVyIHRvIHVzZSB0aGUgTWluaUJyb3dzZXIgdG8gZG8gdGVzdHMgaW52 b2x2aW5nIG11bHRpcGxlCisgICAgICAgIHdpbmRvd3MsIGFuZCB3aWxsIGJlIHVzZWZ1bCBhcyB3 ZWxsIHdoZW4gbXVsdGktd2ViLXByb2Nlc3MgbW9kZSBpcworICAgICAgICBlbmFibGVkIGZvciB0 aGUgR1RLIHBvcnQuCisKKyAgICAgICAgKiBNaW5pQnJvd3Nlci9ndGsvQnJvd3NlcldpbmRvdy5j OgorICAgICAgICAod2ViVmlld1J1bkFzTW9kYWwpOiBTZXQgdGhlIHBhcmVudCB3aW5kb3cgdXNp bmcKKyAgICAgICAgZ3RrX3dpbmRvd19zZXRfdHJhbnNpZW50X2ZvcigpIHVzaW5nIHRoZSBzYXZl ZCBwYXJlbnQKKyAgICAgICAgd2luZG93LgorICAgICAgICAoYnJvd3Nlcl93aW5kb3dfbmV3KTog U2F2ZSB0aGUgcGFyZW50IHdpbmRvdyB1c2luZworICAgICAgICBnX29iamVjdF9zZXRfZGF0YSgp IGluc3RlYWQgb2YgbWFraW5nIHRoZSBuZXcgd2luZG93CisgICAgICAgIHRyYW5zaWVudCBpbW1l ZGlhdGVseS4KKwogMjAxNC0wMS0xMiAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGln YWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gRml4IHJldHVybiB2YWx1ZSBvZiBXZWJLaXREb3du bG9hZDo6Y3JlYXRlZC1kZXN0aW5hdGlvbgpkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIv Z3RrL0Jyb3dzZXJXaW5kb3cuYyBiL1Rvb2xzL01pbmlCcm93c2VyL2d0ay9Ccm93c2VyV2luZG93 LmMKaW5kZXggZGRmZmRkZGNjMzA4ZmUzMzhkMjZmMGM1ZTA5YTRjM2RhNjI0M2Q0ZS4uNTU3NmQ3 N2QwNzYyNjY3NTAzMDg1NzE2NTk0NjMyZDI3MWQxYmNjMiAxMDA2NDQKLS0tIGEvVG9vbHMvTWlu aUJyb3dzZXIvZ3RrL0Jyb3dzZXJXaW5kb3cuYworKysgYi9Ub29scy9NaW5pQnJvd3Nlci9ndGsv QnJvd3NlcldpbmRvdy5jCkBAIC0yNjksNiArMjY5LDggQEAgc3RhdGljIHZvaWQgd2ViVmlld0Ns b3NlKFdlYktpdFdlYlZpZXcgKndlYlZpZXcsIEJyb3dzZXJXaW5kb3cgKndpbmRvdykKIHN0YXRp YyB2b2lkIHdlYlZpZXdSdW5Bc01vZGFsKFdlYktpdFdlYlZpZXcgKndlYlZpZXcsIEJyb3dzZXJX aW5kb3cgKndpbmRvdykKIHsKICAgICBndGtfd2luZG93X3NldF9tb2RhbChHVEtfV0lORE9XKHdp bmRvdyksIFRSVUUpOworICAgIGd0a193aW5kb3dfc2V0X3RyYW5zaWVudF9mb3IoR1RLX1dJTkRP Vyh3aW5kb3cpLAorICAgICAgICBHVEtfV0lORE9XKGdfb2JqZWN0X2dldF9kYXRhKEdfT0JKRUNU KHdpbmRvdyksICJ0cmFuc2llbnQtZm9yIikpKTsKIH0KIAogc3RhdGljIHZvaWQgd2ViVmlld1Jl YWR5VG9TaG93KFdlYktpdFdlYlZpZXcgKndlYlZpZXcsIEJyb3dzZXJXaW5kb3cgKndpbmRvdykK QEAgLTcwMCwxMCArNzAyLDExIEBAIEd0a1dpZGdldCAqYnJvd3Nlcl93aW5kb3dfbmV3KFdlYktp dFdlYlZpZXcgKnZpZXcsIEd0a1dpbmRvdyAqcGFyZW50KQogewogICAgIGdfcmV0dXJuX3ZhbF9p Zl9mYWlsKFdFQktJVF9JU19XRUJfVklFVyh2aWV3KSwgMCk7CiAKLSAgICByZXR1cm4gR1RLX1dJ REdFVChnX29iamVjdF9uZXcoQlJPV1NFUl9UWVBFX1dJTkRPVywKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgInRyYW5zaWVudC1mb3IiLCBwYXJlbnQsCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICJ0eXBlIiwgR1RLX1dJTkRPV19UT1BMRVZFTCwKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgInZpZXciLCB2aWV3LCBOVUxMKSk7CisgICAg R3RrV2lkZ2V0ICp3aW5kb3cgPSBHVEtfV0lER0VUKGdfb2JqZWN0X25ldyhCUk9XU0VSX1RZUEVf V0lORE9XLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg InR5cGUiLCBHVEtfV0lORE9XX1RPUExFVkVMLAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgInZpZXciLCB2aWV3LCBOVUxMKSk7CisgICAgZ19vYmplY3Rf c2V0X2RhdGEoR19PQkpFQ1Qod2luZG93KSwgInRyYW5zaWVudC1mb3IiLCBwYXJlbnQpOworICAg IHJldHVybiB3aW5kb3c7CiB9CiAKIFdlYktpdFdlYlZpZXcgKmJyb3dzZXJfd2luZG93X2dldF92 aWV3KEJyb3dzZXJXaW5kb3cgKndpbmRvdykK 220970 2014-01-12 05:07:30 -0800 2014-01-12 08:29:33 -0800 Patch bug-126840-20140112150752.patch text/plain 2731 aperez U3VidmVyc2lvbiBSZXZpc2lvbjogMTYxODA1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNWQxMjRjYWM3NzcwZmY0OTFjNGQ2YjVjMzRiMzZiNWVj Y2ZmNTIyNC4uNTU1OTFlNDgxZDg3ZjUzMTAyN2ZmZDZkNGE5OGE3ZDU3ZTlkZTQ2ZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1 IEBACisyMDE0LTAxLTEyICBBZHJpYW4gUGVyZXogZGUgQ2FzdHJvICA8YXBlcmV6QGlnYWxpYS5j b20+CisKKyAgICAgICAgW0dUS10gTWFrZSBNaW5pQnJvd3NlciB3aW5kb3dzIG5vbi10cmFuc2ll bnQgYnkgZGVmYXVsdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTI2ODQwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgSW5zdGVhZCBvZiBtYWtpbmcgbmV3IGJyb3dzZXIgd2luZG93cyB0cmFuc2llbnQgYXMg c29vbiBhcyB0aGV5IGFyZQorICAgICAgICBjcmVhdGVkLCBzYXZlIHRoZSBwb2ludGVyIHRvIHRo ZSBwYXJlbnQgd2luZG93IGFuZCBzZXQgdGhlIHRyYW5zaWVudAorICAgICAgICBzdGF0ZSBsYXRl ciBvbiB3aGVuIGhhbmRsaW5nIHRoZSAicnVuLWFzLW1vZGFsIiBzaWduYWwuIFRoaXMgbWFrZXMK KyAgICAgICAgaXQgZWFzaWVyIHRvIHVzZSB0aGUgTWluaUJyb3dzZXIgdG8gZG8gdGVzdHMgaW52 b2x2aW5nIG11bHRpcGxlCisgICAgICAgIHdpbmRvd3MsIGFuZCB3aWxsIGJlIHVzZWZ1bCBhcyB3 ZWxsIHdoZW4gbXVsdGktd2ViLXByb2Nlc3MgbW9kZSBpcworICAgICAgICBlbmFibGVkIGZvciB0 aGUgR1RLIHBvcnQuCisKKyAgICAgICAgKiBNaW5pQnJvd3Nlci9ndGsvQnJvd3NlcldpbmRvdy5j OgorICAgICAgICAod2ViVmlld1J1bkFzTW9kYWwpOiBTZXQgdGhlIHBhcmVudCB3aW5kb3cgdXNp bmcKKyAgICAgICAgZ3RrX3dpbmRvd19zZXRfdHJhbnNpZW50X2ZvcigpIHVzaW5nIHRoZSBzYXZl ZCBwYXJlbnQKKyAgICAgICAgd2luZG93LgorICAgICAgICAoYnJvd3Nlcl93aW5kb3dfbmV3KTog U2F2ZSB0aGUgcGFyZW50IHdpbmRvdyB1c2luZworICAgICAgICBnX29iamVjdF9zZXRfZGF0YSgp IGluc3RlYWQgb2YgbWFraW5nIHRoZSBuZXcgd2luZG93CisgICAgICAgIHRyYW5zaWVudCBpbW1l ZGlhdGVseS4KKwogMjAxNC0wMS0xMiAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGln YWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gRml4IHJldHVybiB2YWx1ZSBvZiBXZWJLaXREb3du bG9hZDo6Y3JlYXRlZC1kZXN0aW5hdGlvbgpkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIv Z3RrL0Jyb3dzZXJXaW5kb3cuYyBiL1Rvb2xzL01pbmlCcm93c2VyL2d0ay9Ccm93c2VyV2luZG93 LmMKaW5kZXggZGRmZmRkZGNjMzA4ZmUzMzhkMjZmMGM1ZTA5YTRjM2RhNjI0M2Q0ZS4uNDQwN2I2 NjdjNjUxYTUyMjUyNDU0ZjdkN2M0MTk4YmZlODcxMmE4MSAxMDA2NDQKLS0tIGEvVG9vbHMvTWlu aUJyb3dzZXIvZ3RrL0Jyb3dzZXJXaW5kb3cuYworKysgYi9Ub29scy9NaW5pQnJvd3Nlci9ndGsv QnJvd3NlcldpbmRvdy5jCkBAIC0yNjksNiArMjY5LDggQEAgc3RhdGljIHZvaWQgd2ViVmlld0Ns b3NlKFdlYktpdFdlYlZpZXcgKndlYlZpZXcsIEJyb3dzZXJXaW5kb3cgKndpbmRvdykKIHN0YXRp YyB2b2lkIHdlYlZpZXdSdW5Bc01vZGFsKFdlYktpdFdlYlZpZXcgKndlYlZpZXcsIEJyb3dzZXJX aW5kb3cgKndpbmRvdykKIHsKICAgICBndGtfd2luZG93X3NldF9tb2RhbChHVEtfV0lORE9XKHdp bmRvdyksIFRSVUUpOworICAgIGd0a193aW5kb3dfc2V0X3RyYW5zaWVudF9mb3IoR1RLX1dJTkRP Vyh3aW5kb3cpLAorICAgICAgICBHVEtfV0lORE9XKGdfb2JqZWN0X2dldF9kYXRhKEdfT0JKRUNU KHdpbmRvdyksICJ0cmFuc2llbnQtZm9yIikpKTsKIH0KIAogc3RhdGljIHZvaWQgd2ViVmlld1Jl YWR5VG9TaG93KFdlYktpdFdlYlZpZXcgKndlYlZpZXcsIEJyb3dzZXJXaW5kb3cgKndpbmRvdykK QEAgLTcwMCwxMCArNzAyLDEwIEBAIEd0a1dpZGdldCAqYnJvd3Nlcl93aW5kb3dfbmV3KFdlYktp dFdlYlZpZXcgKnZpZXcsIEd0a1dpbmRvdyAqcGFyZW50KQogewogICAgIGdfcmV0dXJuX3ZhbF9p Zl9mYWlsKFdFQktJVF9JU19XRUJfVklFVyh2aWV3KSwgMCk7CiAKLSAgICByZXR1cm4gR1RLX1dJ REdFVChnX29iamVjdF9uZXcoQlJPV1NFUl9UWVBFX1dJTkRPVywKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgInRyYW5zaWVudC1mb3IiLCBwYXJlbnQsCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICJ0eXBlIiwgR1RLX1dJTkRPV19UT1BMRVZFTCwKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgInZpZXciLCB2aWV3LCBOVUxMKSk7CisgICAg R3RrV2lkZ2V0ICp3aW5kb3cgPSBHVEtfV0lER0VUKGdfb2JqZWN0X25ldyhCUk9XU0VSX1RZUEVf V0lORE9XLAorICAgICAgICAidHlwZSIsIEdUS19XSU5ET1dfVE9QTEVWRUwsICJ2aWV3Iiwgdmll dywgTlVMTCkpOworICAgIGdfb2JqZWN0X3NldF9kYXRhKEdfT0JKRUNUKHdpbmRvdyksICJ0cmFu c2llbnQtZm9yIiwgcGFyZW50KTsKKyAgICByZXR1cm4gd2luZG93OwogfQogCiBXZWJLaXRXZWJW aWV3ICpicm93c2VyX3dpbmRvd19nZXRfdmlldyhCcm93c2VyV2luZG93ICp3aW5kb3cpCg== 220973 2014-01-12 08:29:49 -0800 2014-01-12 11:24:04 -0800 Patch bug-126840-20140112183011.patch text/plain 3212 aperez U3VidmVyc2lvbiBSZXZpc2lvbjogMTYxODA1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNWQxMjRjYWM3NzcwZmY0OTFjNGQ2YjVjMzRiMzZiNWVj Y2ZmNTIyNC4uNTU1OTFlNDgxZDg3ZjUzMTAyN2ZmZDZkNGE5OGE3ZDU3ZTlkZTQ2ZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1 IEBACisyMDE0LTAxLTEyICBBZHJpYW4gUGVyZXogZGUgQ2FzdHJvICA8YXBlcmV6QGlnYWxpYS5j b20+CisKKyAgICAgICAgW0dUS10gTWFrZSBNaW5pQnJvd3NlciB3aW5kb3dzIG5vbi10cmFuc2ll bnQgYnkgZGVmYXVsdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTI2ODQwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgSW5zdGVhZCBvZiBtYWtpbmcgbmV3IGJyb3dzZXIgd2luZG93cyB0cmFuc2llbnQgYXMg c29vbiBhcyB0aGV5IGFyZQorICAgICAgICBjcmVhdGVkLCBzYXZlIHRoZSBwb2ludGVyIHRvIHRo ZSBwYXJlbnQgd2luZG93IGFuZCBzZXQgdGhlIHRyYW5zaWVudAorICAgICAgICBzdGF0ZSBsYXRl ciBvbiB3aGVuIGhhbmRsaW5nIHRoZSAicnVuLWFzLW1vZGFsIiBzaWduYWwuIFRoaXMgbWFrZXMK KyAgICAgICAgaXQgZWFzaWVyIHRvIHVzZSB0aGUgTWluaUJyb3dzZXIgdG8gZG8gdGVzdHMgaW52 b2x2aW5nIG11bHRpcGxlCisgICAgICAgIHdpbmRvd3MsIGFuZCB3aWxsIGJlIHVzZWZ1bCBhcyB3 ZWxsIHdoZW4gbXVsdGktd2ViLXByb2Nlc3MgbW9kZSBpcworICAgICAgICBlbmFibGVkIGZvciB0 aGUgR1RLIHBvcnQuCisKKyAgICAgICAgKiBNaW5pQnJvd3Nlci9ndGsvQnJvd3NlcldpbmRvdy5j OgorICAgICAgICAod2ViVmlld1J1bkFzTW9kYWwpOiBTZXQgdGhlIHBhcmVudCB3aW5kb3cgdXNp bmcKKyAgICAgICAgZ3RrX3dpbmRvd19zZXRfdHJhbnNpZW50X2ZvcigpIHVzaW5nIHRoZSBzYXZl ZCBwYXJlbnQKKyAgICAgICAgd2luZG93LgorICAgICAgICAoYnJvd3Nlcl93aW5kb3dfbmV3KTog U2F2ZSB0aGUgcGFyZW50IHdpbmRvdyB1c2luZworICAgICAgICBnX29iamVjdF9zZXRfZGF0YSgp IGluc3RlYWQgb2YgbWFraW5nIHRoZSBuZXcgd2luZG93CisgICAgICAgIHRyYW5zaWVudCBpbW1l ZGlhdGVseS4KKwogMjAxNC0wMS0xMiAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGln YWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gRml4IHJldHVybiB2YWx1ZSBvZiBXZWJLaXREb3du bG9hZDo6Y3JlYXRlZC1kZXN0aW5hdGlvbgpkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIv Z3RrL0Jyb3dzZXJXaW5kb3cuYyBiL1Rvb2xzL01pbmlCcm93c2VyL2d0ay9Ccm93c2VyV2luZG93 LmMKaW5kZXggZGRmZmRkZGNjMzA4ZmUzMzhkMjZmMGM1ZTA5YTRjM2RhNjI0M2Q0ZS4uMWVmMTI4 ZjgwM2E1ZWViNTFhZTk2ZDA2ZWFmODA0MmU2MjgxYzIwZiAxMDA2NDQKLS0tIGEvVG9vbHMvTWlu aUJyb3dzZXIvZ3RrL0Jyb3dzZXJXaW5kb3cuYworKysgYi9Ub29scy9NaW5pQnJvd3Nlci9ndGsv QnJvd3NlcldpbmRvdy5jCkBAIC0yNjksNiArMjY5LDggQEAgc3RhdGljIHZvaWQgd2ViVmlld0Ns b3NlKFdlYktpdFdlYlZpZXcgKndlYlZpZXcsIEJyb3dzZXJXaW5kb3cgKndpbmRvdykKIHN0YXRp YyB2b2lkIHdlYlZpZXdSdW5Bc01vZGFsKFdlYktpdFdlYlZpZXcgKndlYlZpZXcsIEJyb3dzZXJX aW5kb3cgKndpbmRvdykKIHsKICAgICBndGtfd2luZG93X3NldF9tb2RhbChHVEtfV0lORE9XKHdp bmRvdyksIFRSVUUpOworICAgIGd0a193aW5kb3dfc2V0X3RyYW5zaWVudF9mb3IoR1RLX1dJTkRP Vyh3aW5kb3cpLAorICAgICAgICBHVEtfV0lORE9XKGdfb2JqZWN0X2dldF9kYXRhKEdfT0JKRUNU KHdpbmRvdyksICJ0cmFuc2llbnQtZm9yIikpKTsKIH0KIAogc3RhdGljIHZvaWQgd2ViVmlld1Jl YWR5VG9TaG93KFdlYktpdFdlYlZpZXcgKndlYlZpZXcsIEJyb3dzZXJXaW5kb3cgKndpbmRvdykK QEAgLTY5NSwxNSArNjk3LDI2IEBAIHN0YXRpYyB2b2lkIGJyb3dzZXJfd2luZG93X2NsYXNzX2lu aXQoQnJvd3NlcldpbmRvd0NsYXNzICprbGFzcykKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgR19QQVJBTV9SRUFEV1JJVEUgfCBHX1BBUkFN X0NPTlNUUlVDVF9PTkxZKSk7CiB9CiAKK3N0YXRpYyB2b2lkIHBhcmVudFdpbmRvd0Rlc3Ryb3ko R3RrV2lkZ2V0ICpwYXJlbnRfd2luZG93LCBncG9pbnRlciB3aW5kb3cpCit7CisgICAgaWYgKHdp bmRvdykKKyAgICAgICAgZ19vYmplY3Rfc2V0X2RhdGEoR19PQkpFQ1Qod2luZG93KSwgInRyYW5z aWVudC1mb3IiLCBOVUxMKTsKK30KKwogLy8gUHVibGljIEFQSS4KIEd0a1dpZGdldCAqYnJvd3Nl cl93aW5kb3dfbmV3KFdlYktpdFdlYlZpZXcgKnZpZXcsIEd0a1dpbmRvdyAqcGFyZW50KQogewog ICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWlsKFdFQktJVF9JU19XRUJfVklFVyh2aWV3KSwgMCk7CiAK LSAgICByZXR1cm4gR1RLX1dJREdFVChnX29iamVjdF9uZXcoQlJPV1NFUl9UWVBFX1dJTkRPVywK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgInRyYW5zaWVudC1mb3IiLCBwYXJl bnQsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJ0eXBlIiwgR1RLX1dJTkRP V19UT1BMRVZFTCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgInZpZXciLCB2 aWV3LCBOVUxMKSk7CisgICAgR3RrV2lkZ2V0ICp3aW5kb3cgPSBHVEtfV0lER0VUKGdfb2JqZWN0 X25ldyhCUk9XU0VSX1RZUEVfV0lORE9XLAorICAgICAgICAidHlwZSIsIEdUS19XSU5ET1dfVE9Q TEVWRUwsICJ2aWV3IiwgdmlldywgTlVMTCkpOworCisgICAgaWYgKHBhcmVudCkgeworICAgICAg ICBnX3NpZ25hbF9jb25uZWN0KHBhcmVudCwgImRlc3Ryb3kiLCBHX0NBTExCQUNLKHBhcmVudFdp bmRvd0Rlc3Ryb3kpLCB3aW5kb3cpOworICAgICAgICBnX29iamVjdF9zZXRfZGF0YShHX09CSkVD VCh3aW5kb3cpLCAidHJhbnNpZW50LWZvciIsIHBhcmVudCk7CisgICAgfQorCisgICAgcmV0dXJu IHdpbmRvdzsKIH0KIAogV2ViS2l0V2ViVmlldyAqYnJvd3Nlcl93aW5kb3dfZ2V0X3ZpZXcoQnJv d3NlcldpbmRvdyAqd2luZG93KQo= 220979 2014-01-12 11:24:24 -0800 2014-01-12 12:03:36 -0800 Patch bug-126840-20140112212446.patch text/plain 3324 aperez U3VidmVyc2lvbiBSZXZpc2lvbjogMTYxODE2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMDU2ZjY3ODlmMjdiOGNlOTE4NGJiNjY2ZDg5ZTNmNWRl ODExMjM1NS4uODk2MjhkMGJjODMwMzNjZjEwNmY1ZTJlYTBiODNiMmQyOTViMDNlYyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1 IEBACisyMDE0LTAxLTEyICBBZHJpYW4gUGVyZXogZGUgQ2FzdHJvICA8YXBlcmV6QGlnYWxpYS5j b20+CisKKyAgICAgICAgW0dUS10gTWFrZSBNaW5pQnJvd3NlciB3aW5kb3dzIG5vbi10cmFuc2ll bnQgYnkgZGVmYXVsdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTI2ODQwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgSW5zdGVhZCBvZiBtYWtpbmcgbmV3IGJyb3dzZXIgd2luZG93cyB0cmFuc2llbnQgYXMg c29vbiBhcyB0aGV5IGFyZQorICAgICAgICBjcmVhdGVkLCBzYXZlIHRoZSBwb2ludGVyIHRvIHRo ZSBwYXJlbnQgd2luZG93IGFuZCBzZXQgdGhlIHRyYW5zaWVudAorICAgICAgICBzdGF0ZSBsYXRl ciBvbiB3aGVuIGhhbmRsaW5nIHRoZSAicnVuLWFzLW1vZGFsIiBzaWduYWwuIFRoaXMgbWFrZXMK KyAgICAgICAgaXQgZWFzaWVyIHRvIHVzZSB0aGUgTWluaUJyb3dzZXIgdG8gZG8gdGVzdHMgaW52 b2x2aW5nIG11bHRpcGxlCisgICAgICAgIHdpbmRvd3MsIGFuZCB3aWxsIGJlIHVzZWZ1bCBhcyB3 ZWxsIHdoZW4gbXVsdGktd2ViLXByb2Nlc3MgbW9kZSBpcworICAgICAgICBlbmFibGVkIGZvciB0 aGUgR1RLIHBvcnQuCisKKyAgICAgICAgKiBNaW5pQnJvd3Nlci9ndGsvQnJvd3NlcldpbmRvdy5j OgorICAgICAgICAod2ViVmlld1J1bkFzTW9kYWwpOiBTZXQgdGhlIHBhcmVudCB3aW5kb3cgdXNp bmcKKyAgICAgICAgZ3RrX3dpbmRvd19zZXRfdHJhbnNpZW50X2ZvcigpIHVzaW5nIHRoZSBzYXZl ZCBwYXJlbnQKKyAgICAgICAgd2luZG93LgorICAgICAgICAoYnJvd3Nlcl93aW5kb3dfbmV3KTog U2F2ZSB0aGUgcGFyZW50IHdpbmRvdyB1c2luZworICAgICAgICBnX29iamVjdF9zZXRfZGF0YSgp IGluc3RlYWQgb2YgbWFraW5nIHRoZSBuZXcgd2luZG93CisgICAgICAgIHRyYW5zaWVudCBpbW1l ZGlhdGVseS4KKwogMjAxNC0wMS0xMiAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGln YWxpYS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZC4gRml4IG1ha2UgZGlzdGNoZWNrLgpkaWZm IC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvZ3RrL0Jyb3dzZXJXaW5kb3cuYyBiL1Rvb2xzL01p bmlCcm93c2VyL2d0ay9Ccm93c2VyV2luZG93LmMKaW5kZXggZGRmZmRkZGNjMzA4ZmUzMzhkMjZm MGM1ZTA5YTRjM2RhNjI0M2Q0ZS4uMmRiMTYzNTViZDk0ZTQ4NTZlMzljNmRlNTJiMTNhNjk5NGRm YzU2OSAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvZ3RrL0Jyb3dzZXJXaW5kb3cuYwor KysgYi9Ub29scy9NaW5pQnJvd3Nlci9ndGsvQnJvd3NlcldpbmRvdy5jCkBAIC01OSw2ICs1OSw3 IEBAIHN0cnVjdCBfQnJvd3NlcldpbmRvdyB7CiAgICAgR2RrUGl4YnVmICpmYXZpY29uOwogICAg IEd0a1dpZGdldCAqcmVsb2FkT3JTdG9wQnV0dG9uOwogICAgIEd0a1dpZGdldCAqZnVsbFNjcmVl bk1lc3NhZ2VMYWJlbDsKKyAgICBHdGtXaW5kb3cgKnBhcmVudFdpbmRvdzsKICAgICBndWludCBm dWxsU2NyZWVuTWVzc2FnZUxhYmVsSWQ7CiB9OwogCkBAIC0yNjksNiArMjcwLDcgQEAgc3RhdGlj IHZvaWQgd2ViVmlld0Nsb3NlKFdlYktpdFdlYlZpZXcgKndlYlZpZXcsIEJyb3dzZXJXaW5kb3cg KndpbmRvdykKIHN0YXRpYyB2b2lkIHdlYlZpZXdSdW5Bc01vZGFsKFdlYktpdFdlYlZpZXcgKndl YlZpZXcsIEJyb3dzZXJXaW5kb3cgKndpbmRvdykKIHsKICAgICBndGtfd2luZG93X3NldF9tb2Rh bChHVEtfV0lORE9XKHdpbmRvdyksIFRSVUUpOworICAgIGd0a193aW5kb3dfc2V0X3RyYW5zaWVu dF9mb3IoR1RLX1dJTkRPVyh3aW5kb3cpLCB3aW5kb3ctPnBhcmVudFdpbmRvdyk7CiB9CiAKIHN0 YXRpYyB2b2lkIHdlYlZpZXdSZWFkeVRvU2hvdyhXZWJLaXRXZWJWaWV3ICp3ZWJWaWV3LCBCcm93 c2VyV2luZG93ICp3aW5kb3cpCkBAIC02OTUsMTUgKzY5NywyNiBAQCBzdGF0aWMgdm9pZCBicm93 c2VyX3dpbmRvd19jbGFzc19pbml0KEJyb3dzZXJXaW5kb3dDbGFzcyAqa2xhc3MpCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEdfUEFSQU1f UkVBRFdSSVRFIHwgR19QQVJBTV9DT05TVFJVQ1RfT05MWSkpOwogfQogCitzdGF0aWMgdm9pZCBw YXJlbnRXaW5kb3dEZXN0cm95KEd0a1dpZGdldCAqcGFyZW50X3dpbmRvdywgZ3BvaW50ZXIgd2lu ZG93KQoreworICAgIGlmICh3aW5kb3cpCisgICAgICAgIGdfb2JqZWN0X3NldF9kYXRhKEdfT0JK RUNUKHdpbmRvdyksICJ0cmFuc2llbnQtZm9yIiwgTlVMTCk7Cit9CisKIC8vIFB1YmxpYyBBUEku CiBHdGtXaWRnZXQgKmJyb3dzZXJfd2luZG93X25ldyhXZWJLaXRXZWJWaWV3ICp2aWV3LCBHdGtX aW5kb3cgKnBhcmVudCkKIHsKICAgICBnX3JldHVybl92YWxfaWZfZmFpbChXRUJLSVRfSVNfV0VC X1ZJRVcodmlldyksIDApOwogCi0gICAgcmV0dXJuIEdUS19XSURHRVQoZ19vYmplY3RfbmV3KEJS T1dTRVJfVFlQRV9XSU5ET1csCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJ0 cmFuc2llbnQtZm9yIiwgcGFyZW50LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAidHlwZSIsIEdUS19XSU5ET1dfVE9QTEVWRUwsCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICJ2aWV3IiwgdmlldywgTlVMTCkpOworICAgIEJyb3dzZXJXaW5kb3cgKndpbmRv dyA9IEJST1dTRVJfV0lORE9XKGdfb2JqZWN0X25ldyhCUk9XU0VSX1RZUEVfV0lORE9XLAorICAg ICAgICAidHlwZSIsIEdUS19XSU5ET1dfVE9QTEVWRUwsICJ2aWV3IiwgdmlldywgTlVMTCkpOwor CisgICAgaWYgKHBhcmVudCkgeworICAgICAgICB3aW5kb3ctPnBhcmVudFdpbmRvdyA9IHBhcmVu dDsKKyAgICAgICAgZ19vYmplY3RfYWRkX3dlYWtfcG9pbnRlcihHX09CSkVDVChwYXJlbnQpLCAm d2luZG93LT5wYXJlbnRXaW5kb3cpOworICAgIH0KKworICAgIHJldHVybiBHVEtfV0lER0VUKHdp bmRvdyk7CiB9CiAKIFdlYktpdFdlYlZpZXcgKmJyb3dzZXJfd2luZG93X2dldF92aWV3KEJyb3dz ZXJXaW5kb3cgKndpbmRvdykK 220980 2014-01-12 12:04:14 -0800 2014-01-13 00:08:34 -0800 Patch bug-126840-20140112220436.patch text/plain 2964 aperez U3VidmVyc2lvbiBSZXZpc2lvbjogMTYxODIxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMDU2ZjY3ODlmMjdiOGNlOTE4NGJiNjY2ZDg5ZTNmNWRl ODExMjM1NS4uODk2MjhkMGJjODMwMzNjZjEwNmY1ZTJlYTBiODNiMmQyOTViMDNlYyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1 IEBACisyMDE0LTAxLTEyICBBZHJpYW4gUGVyZXogZGUgQ2FzdHJvICA8YXBlcmV6QGlnYWxpYS5j b20+CisKKyAgICAgICAgW0dUS10gTWFrZSBNaW5pQnJvd3NlciB3aW5kb3dzIG5vbi10cmFuc2ll bnQgYnkgZGVmYXVsdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTI2ODQwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgSW5zdGVhZCBvZiBtYWtpbmcgbmV3IGJyb3dzZXIgd2luZG93cyB0cmFuc2llbnQgYXMg c29vbiBhcyB0aGV5IGFyZQorICAgICAgICBjcmVhdGVkLCBzYXZlIHRoZSBwb2ludGVyIHRvIHRo ZSBwYXJlbnQgd2luZG93IGFuZCBzZXQgdGhlIHRyYW5zaWVudAorICAgICAgICBzdGF0ZSBsYXRl ciBvbiB3aGVuIGhhbmRsaW5nIHRoZSAicnVuLWFzLW1vZGFsIiBzaWduYWwuIFRoaXMgbWFrZXMK KyAgICAgICAgaXQgZWFzaWVyIHRvIHVzZSB0aGUgTWluaUJyb3dzZXIgdG8gZG8gdGVzdHMgaW52 b2x2aW5nIG11bHRpcGxlCisgICAgICAgIHdpbmRvd3MsIGFuZCB3aWxsIGJlIHVzZWZ1bCBhcyB3 ZWxsIHdoZW4gbXVsdGktd2ViLXByb2Nlc3MgbW9kZSBpcworICAgICAgICBlbmFibGVkIGZvciB0 aGUgR1RLIHBvcnQuCisKKyAgICAgICAgKiBNaW5pQnJvd3Nlci9ndGsvQnJvd3NlcldpbmRvdy5j OgorICAgICAgICAod2ViVmlld1J1bkFzTW9kYWwpOiBTZXQgdGhlIHBhcmVudCB3aW5kb3cgdXNp bmcKKyAgICAgICAgZ3RrX3dpbmRvd19zZXRfdHJhbnNpZW50X2ZvcigpIHVzaW5nIHRoZSBzYXZl ZCBwYXJlbnQKKyAgICAgICAgd2luZG93LgorICAgICAgICAoYnJvd3Nlcl93aW5kb3dfbmV3KTog U2F2ZSB0aGUgcGFyZW50IHdpbmRvdyB1c2luZworICAgICAgICBnX29iamVjdF9zZXRfZGF0YSgp IGluc3RlYWQgb2YgbWFraW5nIHRoZSBuZXcgd2luZG93CisgICAgICAgIHRyYW5zaWVudCBpbW1l ZGlhdGVseS4KKwogMjAxNC0wMS0xMiAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGln YWxpYS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZC4gRml4IG1ha2UgZGlzdGNoZWNrLgpkaWZm IC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvZ3RrL0Jyb3dzZXJXaW5kb3cuYyBiL1Rvb2xzL01p bmlCcm93c2VyL2d0ay9Ccm93c2VyV2luZG93LmMKaW5kZXggZGRmZmRkZGNjMzA4ZmUzMzhkMjZm MGM1ZTA5YTRjM2RhNjI0M2Q0ZS4uOWEwMzlkZWNmNGE2NGU1MDgwZWU1NjljOTk0ZDM1YTU3YTQx YzQ3ZSAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvZ3RrL0Jyb3dzZXJXaW5kb3cuYwor KysgYi9Ub29scy9NaW5pQnJvd3Nlci9ndGsvQnJvd3NlcldpbmRvdy5jCkBAIC01OSw2ICs1OSw3 IEBAIHN0cnVjdCBfQnJvd3NlcldpbmRvdyB7CiAgICAgR2RrUGl4YnVmICpmYXZpY29uOwogICAg IEd0a1dpZGdldCAqcmVsb2FkT3JTdG9wQnV0dG9uOwogICAgIEd0a1dpZGdldCAqZnVsbFNjcmVl bk1lc3NhZ2VMYWJlbDsKKyAgICBHdGtXaW5kb3cgKnBhcmVudFdpbmRvdzsKICAgICBndWludCBm dWxsU2NyZWVuTWVzc2FnZUxhYmVsSWQ7CiB9OwogCkBAIC0yNjksNiArMjcwLDcgQEAgc3RhdGlj IHZvaWQgd2ViVmlld0Nsb3NlKFdlYktpdFdlYlZpZXcgKndlYlZpZXcsIEJyb3dzZXJXaW5kb3cg KndpbmRvdykKIHN0YXRpYyB2b2lkIHdlYlZpZXdSdW5Bc01vZGFsKFdlYktpdFdlYlZpZXcgKndl YlZpZXcsIEJyb3dzZXJXaW5kb3cgKndpbmRvdykKIHsKICAgICBndGtfd2luZG93X3NldF9tb2Rh bChHVEtfV0lORE9XKHdpbmRvdyksIFRSVUUpOworICAgIGd0a193aW5kb3dfc2V0X3RyYW5zaWVu dF9mb3IoR1RLX1dJTkRPVyh3aW5kb3cpLCB3aW5kb3ctPnBhcmVudFdpbmRvdyk7CiB9CiAKIHN0 YXRpYyB2b2lkIHdlYlZpZXdSZWFkeVRvU2hvdyhXZWJLaXRXZWJWaWV3ICp3ZWJWaWV3LCBCcm93 c2VyV2luZG93ICp3aW5kb3cpCkBAIC03MDAsMTAgKzcwMiwxNSBAQCBHdGtXaWRnZXQgKmJyb3dz ZXJfd2luZG93X25ldyhXZWJLaXRXZWJWaWV3ICp2aWV3LCBHdGtXaW5kb3cgKnBhcmVudCkKIHsK ICAgICBnX3JldHVybl92YWxfaWZfZmFpbChXRUJLSVRfSVNfV0VCX1ZJRVcodmlldyksIDApOwog Ci0gICAgcmV0dXJuIEdUS19XSURHRVQoZ19vYmplY3RfbmV3KEJST1dTRVJfVFlQRV9XSU5ET1cs Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJ0cmFuc2llbnQtZm9yIiwgcGFy ZW50LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAidHlwZSIsIEdUS19XSU5E T1dfVE9QTEVWRUwsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJ2aWV3Iiwg dmlldywgTlVMTCkpOworICAgIEJyb3dzZXJXaW5kb3cgKndpbmRvdyA9IEJST1dTRVJfV0lORE9X KGdfb2JqZWN0X25ldyhCUk9XU0VSX1RZUEVfV0lORE9XLAorICAgICAgICAidHlwZSIsIEdUS19X SU5ET1dfVE9QTEVWRUwsICJ2aWV3IiwgdmlldywgTlVMTCkpOworCisgICAgaWYgKHBhcmVudCkg eworICAgICAgICB3aW5kb3ctPnBhcmVudFdpbmRvdyA9IHBhcmVudDsKKyAgICAgICAgZ19vYmpl Y3RfYWRkX3dlYWtfcG9pbnRlcihHX09CSkVDVChwYXJlbnQpLCAmd2luZG93LT5wYXJlbnRXaW5k b3cpOworICAgIH0KKworICAgIHJldHVybiBHVEtfV0lER0VUKHdpbmRvdyk7CiB9CiAKIFdlYktp dFdlYlZpZXcgKmJyb3dzZXJfd2luZG93X2dldF92aWV3KEJyb3dzZXJXaW5kb3cgKndpbmRvdykK