Bug 61858 – [GTK] run-launcher should run MiniBrowser in WebKit2

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKit2

[Carlos Garcia Campos]

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.

[Carlos Garcia Campos]

Created attachment 95594 [details]
Patch

[Martin Robinson]

Comment on attachment 95594 [details]
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.

[Carlos Garcia Campos]

(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.

[Martin Robinson]

Comment on attachment 95594 [details]
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."

[Carlos Garcia Campos]

(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!

[Carlos Garcia Campos]

Committed r87808: <http://trac.webkit.org/changeset/87808>