Changeset 234753 in webkit


Ignore:
Timestamp:
Aug 10, 2018 1:17:06 AM (6 years ago)
Author:
Carlos Garcia Campos
Message:

[GTK][WPE] WebDriver: do not use default browser arguments when browser binary has been provided
https://bugs.webkit.org/show_bug.cgi?id=188465

Reviewed by Žan Doberšek.

We only want to use --automation when no options or no browser binary is provided, because we fallback to
MiniBrowser and we know it needs --automation flag.

  • glib/SessionHostGlib.cpp:

(WebDriver::SessionHost::launchBrowser): Handle the case of browser arguments being std::nullopt.

  • gtk/WebDriverServiceGtk.cpp:

(WebDriver::WebDriverService::platformParseCapabilities const): Initialize browser arguments to std:nullopt if
browser binary was provided.

  • wpe/WebDriverServiceWPE.cpp:

(WebDriver::WebDriverService::platformParseCapabilities const): Ditto.

Location:
trunk/Source/WebDriver
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebDriver/ChangeLog

    r234555 r234753  
     12018-08-10  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [GTK][WPE] WebDriver: do not use default browser arguments when browser binary has been provided
     4        https://bugs.webkit.org/show_bug.cgi?id=188465
     5
     6        Reviewed by Žan Doberšek.
     7
     8        We only want to use --automation when no options or no browser binary is provided, because we fallback to
     9        MiniBrowser and we know it needs --automation flag.
     10
     11        * glib/SessionHostGlib.cpp:
     12        (WebDriver::SessionHost::launchBrowser): Handle the case of browser arguments being std::nullopt.
     13        * gtk/WebDriverServiceGtk.cpp:
     14        (WebDriver::WebDriverService::platformParseCapabilities const): Initialize browser arguments to std:nullopt if
     15        browser binary was provided.
     16        * wpe/WebDriverServiceWPE.cpp:
     17        (WebDriver::WebDriverService::platformParseCapabilities const): Ditto.
     18
    1192018-08-03  Ms2ger  <Ms2ger@igalia.com>
    220
  • trunk/Source/WebDriver/glib/SessionHostGlib.cpp

    r233137 r234753  
    148148#endif
    149149
    150     const auto& browserArguments = m_capabilities.browserArguments.value();
    151     GUniquePtr<char*> args(g_new0(char*, browserArguments.size() + 2));
     150    size_t browserArgumentsSize = m_capabilities.browserArguments ? m_capabilities.browserArguments->size() : 0;
     151    GUniquePtr<char*> args(g_new0(char*, browserArgumentsSize + 2));
    152152    args.get()[0] = g_strdup(m_capabilities.browserBinary.value().utf8().data());
    153     for (unsigned i = 0; i < browserArguments.size(); ++i)
    154         args.get()[i + 1] = g_strdup(browserArguments[i].utf8().data());
     153    for (unsigned i = 0; i < browserArgumentsSize; ++i)
     154        args.get()[i + 1] = g_strdup(m_capabilities.browserArguments.value()[i].utf8().data());
    155155
    156156    GUniqueOutPtr<GError> error;
  • trunk/Source/WebDriver/gtk/WebDriverServiceGtk.cpp

    r233122 r234753  
    122122
    123123    String browserBinary;
    124     if (browserOptions->getString("binary"_s, browserBinary))
     124    if (browserOptions->getString("binary"_s, browserBinary)) {
    125125        capabilities.browserBinary = browserBinary;
     126        capabilities.browserArguments = std::nullopt;
     127    }
    126128
    127129    RefPtr<JSON::Array> browserArguments;
  • trunk/Source/WebDriver/wpe/WebDriverServiceWPE.cpp

    r233122 r234753  
    8989
    9090    String browserBinary;
    91     if (browserOptions->getString("binary"_s, browserBinary))
     91    if (browserOptions->getString("binary"_s, browserBinary)) {
    9292        capabilities.browserBinary = browserBinary;
     93        capabilities.browserArguments = std::nullopt;
     94    }
    9395
    9496    RefPtr<JSON::Array> browserArguments;
Note: See TracChangeset for help on using the changeset viewer.