70616 2011-10-21 09:49:36 -0700 [Qt] Improve command line arguments handling for MiniBrowser. 2011-10-27 04:44:04 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jturcotte jturcotte oldest_to_newest 488443 0 jturcotte 2011-10-21 09:49:36 -0700 [Qt] Improve command line arguments handling for MiniBrowser. 488475 1 111983 jturcotte 2011-10-21 10:41:38 -0700 Created attachment 111983 Patch 488655 2 111983 kenneth 2011-10-21 14:18:50 -0700 Comment on attachment 111983 Patch Nice! 491458 3 jturcotte 2011-10-27 04:44:04 -0700 Committed r98547: <http://trac.webkit.org/changeset/98547> 111983 2011-10-21 10:41:38 -0700 2011-10-21 14:18:49 -0700 Patch bug-70616-20111021194117.patch text/plain 6546 jturcotte U3VidmVyc2lvbiBSZXZpc2lvbjogOTgxMDQKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCBiZTcyMDE3Njc2NmE2OGE4MDE3MmY0OTMyY2NjYjhkNDBj MGRjMDE2Li44ZTcyOTZhZGNlNWFiMmY1NmY0Nzc2ODRkOWQzZTI4YWYwMjM4ZjQ3IDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMTEtMTAtMjEgIEpvY2VseW4gVHVyY290dGUgIDxqb2NlbHluLnR1cmNvdHRlQG5va2lh LmNvbT4KKworICAgICAgICBbUXRdIEltcHJvdmUgY29tbWFuZCBsaW5lIGFyZ3VtZW50cyBoYW5k bGluZyBmb3IgTWluaUJyb3dzZXIuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD03MDYxNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIC0gVXNlIHR3byBkYXNoZXMgZm9yIHdvcmQgYXJndW1lbnRzLgorICAgICAg ICAtIFJldHVybiB3aXRoIGFuIGVycm9yIHdoZW4gYW4gdW5zdXBwb3J0ZWQgYXJndW1lbnQgaXMg Z2l2ZW4uCisgICAgICAgIC0gQWxsb3cgdGhlIFVSTCB0byBiZSBwbGFjZWQgYmVmb3JlIG9wdGlv biBhcmd1bWVudHMuCisKKyAgICAgICAgKiBNaW5pQnJvd3Nlci9xdC9NaW5pQnJvd3NlckFwcGxp Y2F0aW9uLmNwcDoKKyAgICAgICAgKHByaW50SGVscCk6CisgICAgICAgIChNaW5pQnJvd3NlckFw cGxpY2F0aW9uOjpoYW5kbGVVc2VyT3B0aW9ucyk6CisgICAgICAgICogTWluaUJyb3dzZXIvcXQv dXRpbHMuY3BwOgorICAgICAgICAodGFrZU9wdGlvbkZsYWcpOgorICAgICAgICAodGFrZU9wdGlv blZhbHVlKToKKyAgICAgICAgKiBNaW5pQnJvd3Nlci9xdC91dGlscy5oOgorCiAyMDExLTEwLTIx ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICB3 YXRjaGxpc3Q6IEFkZCBhIG5ldyBlbnRyeSBmb3IgV2ViS2l0MiBHVEsrIHB1YmxpYyBBUEkKZGlm ZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL3F0L01pbmlCcm93c2VyQXBwbGljYXRpb24uY3Bw IGIvVG9vbHMvTWluaUJyb3dzZXIvcXQvTWluaUJyb3dzZXJBcHBsaWNhdGlvbi5jcHAKaW5kZXgg OThiN2M3ZWU1ZDMxNjU5MjcyNzRlNDhiNzlhNjg1NTNkYzI4N2I3NC4uZDlkNDQ5ZGY1NTMxNTg5 NzY5NWZjYWVlMjU0NmU5YjM4ZWM2NTc2ZiAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIv cXQvTWluaUJyb3dzZXJBcHBsaWNhdGlvbi5jcHAKKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvcXQv TWluaUJyb3dzZXJBcHBsaWNhdGlvbi5jcHAKQEAgLTE2OCwzOSArMTY4LDQyIEBAIGJvb2wgTWlu aUJyb3dzZXJBcHBsaWNhdGlvbjo6bm90aWZ5KFFPYmplY3QqIHRhcmdldCwgUUV2ZW50KiBldmVu dCkKICAgICByZXR1cm4gUUFwcGxpY2F0aW9uOjpub3RpZnkodGFyZ2V0LCBldmVudCk7CiB9CiAK K3N0YXRpYyB2b2lkIHByaW50SGVscChjb25zdCBRU3RyaW5nJiBwcm9ncmFtTmFtZSkKK3sKKyAg ICBxRGVidWcoKSA8PCAiVXNhZ2U6IiA8PCBwcm9ncmFtTmFtZS50b0xhdGluMSgpLmRhdGEoKQor ICAgICAgICAgPDwgIlstLXRvdWNoXSIKKyAgICAgICAgIDw8ICJbLS1tYXhpbWl6ZV0iCisgICAg ICAgICA8PCAiWy1yIGxpc3RdIgorICAgICAgICAgPDwgIlstLXJvYm90LXRpbWVvdXQgc2Vjb25k c10iCisgICAgICAgICA8PCAiWy0tcm9ib3QtZXh0cmEtdGltZSBzZWNvbmRzXSIKKyAgICAgICAg IDw8ICJbLXZdIgorI2lmIGRlZmluZWQoUVRfQ09ORklHVVJFRF9XSVRIX09QRU5HTCkKKyAgICAg ICAgIDw8ICJbLS1nbC12aWV3cG9ydF0iCisjZW5kaWYKKyAgICAgICAgIDw8ICJVUkwiOworfQor CiB2b2lkIE1pbmlCcm93c2VyQXBwbGljYXRpb246OmhhbmRsZVVzZXJPcHRpb25zKCkKIHsKICAg ICBRU3RyaW5nTGlzdCBhcmdzID0gYXJndW1lbnRzKCk7Ci0gICAgUUZpbGVJbmZvIHByb2dyYW0o YXJncy5hdCgwKSk7CisgICAgUUZpbGVJbmZvIHByb2dyYW0oYXJncy50YWtlQXQoMCkpOwogICAg IFFTdHJpbmcgcHJvZ3JhbU5hbWUoIk1pbmlCcm93c2VyIik7CiAgICAgaWYgKHByb2dyYW0uZXhp c3RzKCkpCiAgICAgICAgIHByb2dyYW1OYW1lID0gcHJvZ3JhbS5iYXNlTmFtZSgpOwogCi0gICAg aWYgKGFyZ3MuY29udGFpbnMoIi1oZWxwIikpIHsKLSAgICAgICAgcURlYnVnKCkgPDwgIlVzYWdl OiIgPDwgcHJvZ3JhbU5hbWUudG9MYXRpbjEoKS5kYXRhKCkKLSAgICAgICAgICAgICA8PCAiWy10 b3VjaF0iCi0gICAgICAgICAgICAgPDwgIlstbWF4aW1pemVdIgotICAgICAgICAgICAgIDw8ICJb LXIgbGlzdF0iCi0gICAgICAgICAgICAgPDwgIlstcm9ib3QtdGltZW91dCBzZWNvbmRzXSIKLSAg ICAgICAgICAgICA8PCAiWy1yb2JvdC1leHRyYS10aW1lIHNlY29uZHNdIgotICAgICAgICAgICAg IDw8ICJbLWNodW5rZWQtZHJhd2luZy1hcmVhXSIKLSAgICAgICAgICAgICA8PCAiWy1wcmludC1s b2FkZWQtdXJsc10iCi0jaWYgZGVmaW5lZChRVF9DT05GSUdVUkVEX1dJVEhfT1BFTkdMKQotICAg ICAgICAgICAgIDw8ICJbLWdsLXZpZXdwb3J0XSIKLSNlbmRpZgotICAgICAgICAgICAgIDw8ICJV UkxzIjsKKyAgICBpZiAodGFrZU9wdGlvbkZsYWcoJmFyZ3MsICItLWhlbHAiKSkgeworICAgICAg ICBwcmludEhlbHAocHJvZ3JhbU5hbWUpOwogICAgICAgICBhcHBRdWl0KDApOwogICAgIH0KIAot ICAgIGlmIChhcmdzLmNvbnRhaW5zKCItdG91Y2giKSkKLSAgICAgICAgbV93aW5kb3dPcHRpb25z LnVzZVRvdWNoV2ViVmlldyA9IHRydWU7CisgICAgbV93aW5kb3dPcHRpb25zLnVzZVRvdWNoV2Vi VmlldyA9IHRha2VPcHRpb25GbGFnKCZhcmdzLCAiLS10b3VjaCIpOworICAgIG1fd2luZG93T3B0 aW9ucy5zdGFydE1heGltaXplZCA9IHRha2VPcHRpb25GbGFnKCZhcmdzLCAiLS1tYXhpbWl6ZSIp OworICAgIG1fcm9ib3RUaW1lb3V0U2Vjb25kcyA9IHRha2VPcHRpb25WYWx1ZSgmYXJncywgIi0t cm9ib3QtdGltZW91dCIpLnRvSW50KCk7CisgICAgbV9yb2JvdEV4dHJhVGltZVNlY29uZHMgPSB0 YWtlT3B0aW9uVmFsdWUoJmFyZ3MsICItLXJvYm90LWV4dHJhLXRpbWUiKS50b0ludCgpOworICAg IG1fd2luZG93T3B0aW9ucy5wcmludExvYWRlZFVybHMgPSB0YWtlT3B0aW9uRmxhZygmYXJncywg Ii12Iik7CiAKLSAgICBpZiAoYXJncy5jb250YWlucygiLW1heGltaXplIikpCi0gICAgICAgIG1f d2luZG93T3B0aW9ucy5zdGFydE1heGltaXplZCA9IHRydWU7Ci0KLSAgICBpbnQgcm9ib3RJbmRl eCA9IGFyZ3MuaW5kZXhPZigiLXIiKTsKLSAgICBpZiAocm9ib3RJbmRleCAhPSAtMSkgewotICAg ICAgICBRU3RyaW5nIGxpc3RGaWxlID0gdGFrZU9wdGlvblZhbHVlKCZhcmdzLCByb2JvdEluZGV4 KTsKKyAgICBpZiAoYXJncy5jb250YWlucygiLXIiKSkgeworICAgICAgICBRU3RyaW5nIGxpc3RG aWxlID0gdGFrZU9wdGlvblZhbHVlKCZhcmdzLCAiLXIiKTsKICAgICAgICAgaWYgKGxpc3RGaWxl LmlzRW1wdHkoKSkKICAgICAgICAgICAgIGFwcFF1aXQoMSwgIi1yIG5lZWRzIGEgbGlzdCBmaWxl IHRvIHN0YXJ0IGluIHJvYm90aXplZCBtb2RlIik7CiAgICAgICAgIGlmICghUUZpbGU6OmV4aXN0 cyhsaXN0RmlsZSkpCkBAIC0yMDksMjMgKzIxMiwxNiBAQCB2b2lkIE1pbmlCcm93c2VyQXBwbGlj YXRpb246OmhhbmRsZVVzZXJPcHRpb25zKCkKICAgICAgICAgbV9pc1JvYm90aXplZCA9IHRydWU7 CiAgICAgICAgIG1fdXJscyA9IFFTdHJpbmdMaXN0KGxpc3RGaWxlKTsKICAgICB9IGVsc2Ugewot ICAgICAgICBpbnQgbGFzdEFyZyA9IGFyZ3MubGFzdEluZGV4T2YoUVJlZ0V4cCgiXi0uKiIpKTsK LSAgICAgICAgbV91cmxzID0gKGxhc3RBcmcgIT0gLTEpID8gYXJncy5taWQoKytsYXN0QXJnKSA6 IGFyZ3MubWlkKDEpOworICAgICAgICBpbnQgdXJsQXJnID0gYXJncy5pbmRleE9mKFFSZWdFeHAo Il5bXi1dLioiKSk7CisgICAgICAgIG1fdXJscyArPSBhcmdzLnRha2VBdCh1cmxBcmcpOwogICAg IH0KIAotICAgIGludCByb2JvdFRpbWVvdXRJbmRleCA9IGFyZ3MuaW5kZXhPZigiLXJvYm90LXRp bWVvdXQiKTsKLSAgICBpZiAocm9ib3RUaW1lb3V0SW5kZXggIT0gLTEpCi0gICAgICAgIG1fcm9i b3RUaW1lb3V0U2Vjb25kcyA9IHRha2VPcHRpb25WYWx1ZSgmYXJncywgcm9ib3RUaW1lb3V0SW5k ZXgpLnRvSW50KCk7Ci0KLSAgICBpbnQgcm9ib3RFeHRyYVRpbWVJbmRleCA9IGFyZ3MuaW5kZXhP ZigiLXJvYm90LWV4dHJhLXRpbWUiKTsKLSAgICBpZiAocm9ib3RFeHRyYVRpbWVJbmRleCAhPSAt MSkKLSAgICAgICAgbV9yb2JvdEV4dHJhVGltZVNlY29uZHMgPSB0YWtlT3B0aW9uVmFsdWUoJmFy Z3MsIHJvYm90RXh0cmFUaW1lSW5kZXgpLnRvSW50KCk7Ci0KLSAgICBpZiAoYXJncy5jb250YWlu cygiLXByaW50LWxvYWRlZC11cmxzIikpCi0gICAgICAgIG1fd2luZG93T3B0aW9ucy5wcmludExv YWRlZFVybHMgPSB0cnVlOwotCiAjaWYgZGVmaW5lZChRVF9DT05GSUdVUkVEX1dJVEhfT1BFTkdM KQotICAgIGlmIChhcmdzLmNvbnRhaW5zKCItZ2wtdmlld3BvcnQiKSkKLSAgICAgICAgbV93aW5k b3dPcHRpb25zLnVzZVFHTFdpZGdldFZpZXdwb3J0ID0gdHJ1ZTsKKyAgICBtX3dpbmRvd09wdGlv bnMudXNlUUdMV2lkZ2V0Vmlld3BvcnQgPSB0YWtlT3B0aW9uRmxhZygmYXJncywgIi0tZ2wtdmll d3BvcnQiKTsKICNlbmRpZgorCisgICAgaWYgKCFhcmdzLmlzRW1wdHkoKSkgeworICAgICAgICBw cmludEhlbHAocHJvZ3JhbU5hbWUpOworICAgICAgICBhcHBRdWl0KDEsIFFTdHJpbmcoIlVua25v d24gYXJndW1lbnQocyk6ICUxIikuYXJnKGFyZ3Muam9pbigiLCIpKSk7CisgICAgfQogfQpkaWZm IC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvcXQvdXRpbHMuY3BwIGIvVG9vbHMvTWluaUJyb3dz ZXIvcXQvdXRpbHMuY3BwCmluZGV4IDQ5NGRhNzE2YjljMmNmMWNlNWJjZWM1NzA3NWIwMjNmNjk3 MTgwYTEuLjQ5ZGI3M2Q3MGQxNDYxNDk4MTgwZjM1MTU1MGVkMTk1MDcxZjI0NDYgMTAwNjQ0Ci0t LSBhL1Rvb2xzL01pbmlCcm93c2VyL3F0L3V0aWxzLmNwcAorKysgYi9Ub29scy9NaW5pQnJvd3Nl ci9xdC91dGlscy5jcHAKQEAgLTI4LDEyICsyOCwyNCBAQAogCiAjaW5jbHVkZSAidXRpbHMuaCIK IAotUVN0cmluZyB0YWtlT3B0aW9uVmFsdWUoUVN0cmluZ0xpc3QqIGFyZ3VtZW50cywgaW50IGlu ZGV4KQorYm9vbCB0YWtlT3B0aW9uRmxhZyhRU3RyaW5nTGlzdCogYXJndW1lbnRzLCBjb25zdCBR U3RyaW5nJiBuYW1lKQoreworICAgIGludCBpbmRleCA9IGFyZ3VtZW50cy0+aW5kZXhPZihuYW1l KTsKKyAgICBpZiAoaW5kZXggIT0gLTEpCisgICAgICAgIGFyZ3VtZW50cy0+cmVtb3ZlQXQoaW5k ZXgpOworICAgIHJldHVybiBpbmRleCAhPSAtMTsKK30KKworUVN0cmluZyB0YWtlT3B0aW9uVmFs dWUoUVN0cmluZ0xpc3QqIGFyZ3VtZW50cywgY29uc3QgUVN0cmluZyYgbmFtZSkKIHsKICAgICBR U3RyaW5nIHJlc3VsdDsKIAotICAgIGlmICgrK2luZGV4IDwgYXJndW1lbnRzLT5jb3VudCgpICYm ICFhcmd1bWVudHMtPmF0KGluZGV4KS5zdGFydHNXaXRoKCItIikpCi0gICAgICAgIHJlc3VsdCA9 IGFyZ3VtZW50cy0+dGFrZUF0KGluZGV4KTsKKyAgICBpbnQgaW5kZXggPSBhcmd1bWVudHMtPmlu ZGV4T2YobmFtZSk7CisgICAgaWYgKGluZGV4ICE9IC0xKSB7CisgICAgICAgIGFyZ3VtZW50cy0+ cmVtb3ZlQXQoaW5kZXgpOworICAgICAgICBpZiAoaW5kZXggPCBhcmd1bWVudHMtPmNvdW50KCkg JiYgIWFyZ3VtZW50cy0+YXQoaW5kZXgpLnN0YXJ0c1dpdGgoIi0iKSkKKyAgICAgICAgICAgIHJl c3VsdCA9IGFyZ3VtZW50cy0+dGFrZUF0KGluZGV4KTsKKyAgICB9CiAKICAgICByZXR1cm4gcmVz dWx0OwogfQpkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvcXQvdXRpbHMuaCBiL1Rvb2xz L01pbmlCcm93c2VyL3F0L3V0aWxzLmgKaW5kZXggMmVjN2FmMjcyYjMzM2FjZTJjNDE2Y2NlMmMw ODA0ZTY3ZWQ3YWVkMi4uMmFjM2RkYjFhNTJiMDI3MTA2ZWIyNjY1NTJhZWNlMjBhYjUyNzVkYSAx MDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvcXQvdXRpbHMuaAorKysgYi9Ub29scy9NaW5p QnJvd3Nlci9xdC91dGlscy5oCkBAIC00Miw3ICs0Miw4IEBACiAjZW5kaWYKIAogLy8gb3B0aW9u cyBoYW5kbGluZwotUVN0cmluZyB0YWtlT3B0aW9uVmFsdWUoUVN0cmluZ0xpc3QqIGFyZ3VtZW50 cywgaW50IGluZGV4KTsKK2Jvb2wgdGFrZU9wdGlvbkZsYWcoUVN0cmluZ0xpc3QqIGFyZ3VtZW50 cywgY29uc3QgUVN0cmluZyYgbmFtZSk7CitRU3RyaW5nIHRha2VPcHRpb25WYWx1ZShRU3RyaW5n TGlzdCogYXJndW1lbnRzLCBjb25zdCBRU3RyaW5nJiBuYW1lKTsKIFFTdHJpbmcgZm9ybWF0S2V5 cyhRTGlzdDxRU3RyaW5nPiBrZXlzKTsKIFFMaXN0PFFTdHJpbmc+IGVudW1Ub0tleXMoY29uc3Qg UU1ldGFPYmplY3QsIGNvbnN0IFFTdHJpbmcmLCBjb25zdCBRU3RyaW5nJik7CiAK