61858 2011-06-01 06:42:42 -0700 [GTK] run-launcher should run MiniBrowser in WebKit2 2011-06-01 09:08:41 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned oldest_to_newest 413335 0 cgarcia 2011-06-01 06:42:42 -0700 Since r87760 we are passing -2 command line option to run-launcher script for wk2, but we are still executing GtkLauncher and it fails because -2 option is passed to GtkLauncher too. We should check whether -2 option has been passed, so that it's removed, and run MiniBrowser instead. 413339 1 95594 cgarcia 2011-06-01 06:44:46 -0700 Created attachment 95594 Patch 413394 2 95594 mrobinson 2011-06-01 08:33:56 -0700 Comment on attachment 95594 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=95594&action=review > Tools/Scripts/run-launcher:72 > + # isWK2() removes -2 option from @ARGV. > + @args = @ARGV; Why is it necessary to preserve "-2" here? I ask because Qt does not do this. 413396 3 cgarcia 2011-06-01 08:37:40 -0700 (In reply to comment #2) > (From update of attachment 95594 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=95594&action=review > > > Tools/Scripts/run-launcher:72 > > + # isWK2() removes -2 option from @ARGV. > > + @args = @ARGV; > > Why is it necessary to preserve "-2" here? I ask because Qt does not do this. I guess the Qt program ignores options that it doesn't handle, MiniBrowser returns with an error because -2 option is invalid. I added this, because I wasn't sure, so I wanted to make sure I didn't break other ports. 413402 4 95594 mrobinson 2011-06-01 08:43:38 -0700 Comment on attachment 95594 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=95594&action=review >>> Tools/Scripts/run-launcher:72 >>> + @args = @ARGV; >> >> Why is it necessary to preserve "-2" here? I ask because Qt does not do this. > > I guess the Qt program ignores options that it doesn't handle, MiniBrowser returns with an error because -2 option is invalid. I added this, because I wasn't sure, so I wanted to make sure I didn't break other ports. Ah, I see. I misunderstood the comment. You might consider expanding it to something like: "isWK2() removes the -2 option from @ARGV, but not @args. We do not want to pass -2 to MiniBrowser." 413405 5 cgarcia 2011-06-01 08:47:50 -0700 (In reply to comment #4) > (From update of attachment 95594 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=95594&action=review > > >>> Tools/Scripts/run-launcher:72 > >>> + @args = @ARGV; > >> > >> Why is it necessary to preserve "-2" here? I ask because Qt does not do this. > > > > I guess the Qt program ignores options that it doesn't handle, MiniBrowser returns with an error because -2 option is invalid. I added this, because I wasn't sure, so I wanted to make sure I didn't break other ports. > > Ah, I see. I misunderstood the comment. You might consider expanding it to something like: "isWK2() removes the -2 option from @ARGV, but not @args. We do not want to pass -2 to MiniBrowser." Sure, thanks for reviewing! 413422 6 cgarcia 2011-06-01 09:08:41 -0700 Committed r87808: <http://trac.webkit.org/changeset/87808> 95594 2011-06-01 06:44:46 -0700 2011-06-01 08:43:38 -0700 Patch wk2-run-launcher text/plain 1211 cgarcia ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBkYmZl Y2Q0Li40NzkxYzk3IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDYtMDEgIENhcmxvcyBHYXJjaWEgQ2FtcG9z ICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFtHVEtdIHJ1bi1sYXVuY2hlciBzaG91bGQgcnVuIE1pbmlCcm93c2Vy IGluIFdlYktpdDIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTYxODU4CisKKyAgICAgICAgKiBTY3JpcHRzL3J1bi1sYXVuY2hlcjogQ2hlY2sgd2hldGhl ciAtMiBjb21tYW5kIGxpbmUgb3B0aW9uIGhhcworICAgICAgICBiZWVuIHBhc3NlZCBhbmQgcnVu IE1pbmlCcm93c2VyIGluc3RlYWQgb2YgR3RrTGF1bmNoZXIuCisKIDIwMTEtMDUtMzEgIEhhbyBa aGVuZyAgPHpoZW5naGFvQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEaXJr IFByYW5rZS4KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvcnVuLWxhdW5jaGVyIGIvVG9vbHMv U2NyaXB0cy9ydW4tbGF1bmNoZXIKaW5kZXggNzMxZmJjMC4uNTFhYzYxZCAxMDA3NTUKLS0tIGEv VG9vbHMvU2NyaXB0cy9ydW4tbGF1bmNoZXIKKysrIGIvVG9vbHMvU2NyaXB0cy9ydW4tbGF1bmNo ZXIKQEAgLTY1LDcgKzY1LDE0IEBAIGlmIChpc1F0KCkpIHsKIH0gZWxzZSB7CiAKICAgICBpZiAo aXNHdGsoKSkgewotICAgICAgICAkbGF1bmNoZXJQYXRoID0gY2F0ZGlyKCRsYXVuY2hlclBhdGgs ICJQcm9ncmFtcyIsICJHdGtMYXVuY2hlciIpOworICAgICAgICBpZiAoaXNXSzIoKSkgeworICAg ICAgICAgICAgJGxhdW5jaGVyUGF0aCA9IGNhdGRpcigkbGF1bmNoZXJQYXRoLCAiUHJvZ3JhbXMi LCAiTWluaUJyb3dzZXIiKTsKKworICAgICAgICAgICAgIyBpc1dLMigpIHJlbW92ZXMgLTIgb3B0 aW9uIGZyb20gQEFSR1YuCisgICAgICAgICAgICBAYXJncyA9IEBBUkdWOworICAgICAgICB9IGVs c2UgeworICAgICAgICAgICAgJGxhdW5jaGVyUGF0aCA9IGNhdGRpcigkbGF1bmNoZXJQYXRoLCAi UHJvZ3JhbXMiLCAiR3RrTGF1bmNoZXIiKTsKKyAgICAgICAgfQogICAgIH0KICAgICAKICAgICBp ZiAoaXNFZmwoKSkgewo=