Changeset 80218 in webkit


Ignore:
Timestamp:
Mar 3, 2011 2:24:49 AM (13 years ago)
Author:
commit-queue@webkit.org
Message:

2011-03-03 Peter Kasting <​pkasting@google.com>

Reviewed by James Robinson.

Drop redundant "Windows; " from the Windows-specific User Agent string.
​https://bugs.webkit.org/show_bug.cgi?id=54567

  • http/tests/navigation/useragent-expected.txt:
  • http/tests/navigation/useragent.php:

2011-03-03 Peter Kasting <​pkasting@google.com>

Reviewed by James Robinson.

Drop redundant "Windows; " from the Windows-specific User Agent string.
​https://bugs.webkit.org/show_bug.cgi?id=54567

  • StringsNotToBeLocalized.txt:

2011-03-03 Peter Kasting <​pkasting@google.com>

Reviewed by James Robinson.

Drop redundant "Windows; " from the Windows-specific User Agent string.
​https://bugs.webkit.org/show_bug.cgi?id=54567

  • webkit/webkitwebsettings.cpp: (webkitPlatform): (webkitUserAgent):

2011-03-03 Peter Kasting <​pkasting@google.com>

Reviewed by James Robinson.

Drop redundant "Windows; " from the Windows-specific User Agent string.
​https://bugs.webkit.org/show_bug.cgi?id=54567

  • Api/qwebpage.cpp: (QWebPage::userAgentForUrl):

2011-03-03 Peter Kasting <​pkasting@google.com>

Reviewed by James Robinson.

Drop redundant "Windows; " from the Windows-specific User Agent string.
​https://bugs.webkit.org/show_bug.cgi?id=54567

  • WebView.cpp: (WebView::standardUserAgentWithApplicationName):

2011-03-03 Peter Kasting <​pkasting@google.com>

Reviewed by James Robinson.

Drop redundant "Windows; " from the Windows-specific User Agent string.
​https://bugs.webkit.org/show_bug.cgi?id=54567

  • UIProcess/win/WebPageProxyWin.cpp: (WebKit::WebPageProxy::standardUserAgent):
Location:
trunk
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r80217 r80218  
     12011-03-03  Peter Kasting  <pkasting@google.com>
     2
     3        Reviewed by James Robinson.
     4
     5        Drop redundant "Windows; " from the Windows-specific User Agent string.
     6        https://bugs.webkit.org/show_bug.cgi?id=54567
     7
     8        * http/tests/navigation/useragent-expected.txt:
     9        * http/tests/navigation/useragent.php:
     10
    1112011-03-03  Peter Varga  <pvarga@webkit.org>
    212

  • trunk/LayoutTests/http/tests/navigation/useragent-expected.txt

    r79589 r80218  
    11Tests for user agent string template
    22
    3 UserAgent should match the Mozilla/5.0 (%Platform%; %Subplatform%) AppleWebKit/%WebKitVersion% (KHTML, like Gecko) template: true
     3UserAgent should match the Mozilla/5.0 (%Platform%%Subplatform%) AppleWebKit/%WebKitVersion% (KHTML, like Gecko) template: true
    44UserAgent should be the same as the appVersion with appCodeName prefix: true
    55HTTP User-Agent header should be the same as userAgent: true

  • trunk/LayoutTests/http/tests/navigation/useragent.php

    r79589 r80218  
    1212
    1313    // Validate the user agent string using the following template:
    14     var userAgentTemplate = "Mozilla/5.0 (%Platform%; %Subplatform%) AppleWebKit/%WebKitVersion% (KHTML, like Gecko)"
    15     var userAgentTemplateRegExp = /^Mozilla\/5\.0 \(.+; [^;]+\) AppleWebKit\/[0-9\.]+(\+)? \(KHTML, like Gecko\).*$/;
     14    var userAgentTemplate = "Mozilla/5.0 (%Platform%%Subplatform%) AppleWebKit/%WebKitVersion% (KHTML, like Gecko)"
     15    var userAgentTemplateRegExp = /^Mozilla\/5\.0 \(([^;]+; )*[^;]+\) AppleWebKit\/[0-9\.]+(\+)? \(KHTML, like Gecko\).*$/;
    1616    document.write("UserAgent should match the " + userAgentTemplate + " template: " + !!userAgent.match(userAgentTemplateRegExp) + "<br>");
    1717

  • trunk/Source/WebCore/ChangeLog

    r80214 r80218  
     12011-03-03  Peter Kasting  <pkasting@google.com>
     2
     3        Reviewed by James Robinson.
     4
     5        Drop redundant "Windows; " from the Windows-specific User Agent string.
     6        https://bugs.webkit.org/show_bug.cgi?id=54567
     7
     8        * StringsNotToBeLocalized.txt:
     9
    1102011-03-03  Mario Sanchez Prada  <msanchez@igalia.com>
    211

  • trunk/Source/WebCore/StringsNotToBeLocalized.txt

    r80014 r80218  
    271271"MoveWordRightAndModifySelection"
    272272"Mozilla/5.0 (Macintosh; "
    273 "Mozilla/5.0 (Windows; "
     273"Mozilla/5.0 ("
    274274"MuteButton"
    275275"NP_GetEntryPoints"

  • trunk/Source/WebKit/gtk/ChangeLog

    r80184 r80218  
     12011-03-03  Peter Kasting  <pkasting@google.com>
     2
     3        Reviewed by James Robinson.
     4
     5        Drop redundant "Windows; " from the Windows-specific User Agent string.
     6        https://bugs.webkit.org/show_bug.cgi?id=54567
     7
     8        * webkit/webkitwebsettings.cpp:
     9        (webkitPlatform):
     10        (webkitUserAgent):
     11
    1122011-03-02  Martin Robinson  <mrobinson@igalia.com>
    213

  • trunk/Source/WebKit/gtk/webkit/webkitwebsettings.cpp

    r79589 r80218  
    172172{
    173173#if PLATFORM(X11)
    174     DEFINE_STATIC_LOCAL(const String, uaPlatform, (String("X11")));
     174    DEFINE_STATIC_LOCAL(const String, uaPlatform, (String("X11; ")));
    175175#elif OS(WINDOWS)
    176     DEFINE_STATIC_LOCAL(const String, uaPlatform, (String("Windows")));
     176    DEFINE_STATIC_LOCAL(const String, uaPlatform, (String("")));
    177177#elif PLATFORM(MAC)
    178     DEFINE_STATIC_LOCAL(const String, uaPlatform, (String("Macintosh")));
     178    DEFINE_STATIC_LOCAL(const String, uaPlatform, (String("Macintosh; ")));
    179179#elif defined(GDK_WINDOWING_DIRECTFB)
    180     DEFINE_STATIC_LOCAL(const String, uaPlatform, (String("DirectFB")));
     180    DEFINE_STATIC_LOCAL(const String, uaPlatform, (String("DirectFB; ")));
    181181#else
    182     DEFINE_STATIC_LOCAL(const String, uaPlatform, (String("Unknown")));
     182    DEFINE_STATIC_LOCAL(const String, uaPlatform, (String("Unknown; ")));
    183183#endif
    184184
    … …  
    223223
    224224    DEFINE_STATIC_LOCAL(const String, uaVersion, (makeString(String::number(WEBKIT_USER_AGENT_MAJOR_VERSION), '.', String::number(WEBKIT_USER_AGENT_MINOR_VERSION), '+')));
    225     DEFINE_STATIC_LOCAL(const String, staticUA, (makeString("Mozilla/5.0 (", webkitPlatform(), "; ", webkitOSVersion(), ") AppleWebKit/", uaVersion) +
     225    DEFINE_STATIC_LOCAL(const String, staticUA, (makeString("Mozilla/5.0 (", webkitPlatform(), webkitOSVersion(), ") AppleWebKit/", uaVersion) +
    226226                                                 makeString(" (KHTML, like Gecko) Version/5.0 Safari/", uaVersion)));
    227227

  • trunk/Source/WebKit/qt/Api/qwebpage.cpp

    r80077 r80218  
    36833683    The default implementation returns the following value:
    36843684
    3685     "Mozilla/5.0 (%Platform%; %Security%%Subplatform%) AppleWebKit/%WebKitVersion% (KHTML, like Gecko) %AppVersion Safari/%WebKitVersion%"
     3685    "Mozilla/5.0 (%Platform%%Security%%Subplatform%) AppleWebKit/%WebKitVersion% (KHTML, like Gecko) %AppVersion Safari/%WebKitVersion%"
    36863686
    36873687    On mobile platforms such as Symbian S60 and Maemo, "Mobile Safari" is used instead of "Safari".
    … …  
    36893689    In this string the following values are replaced at run-time:
    36903690    \list
    3691     \o %Platform% and %Subplatform% are expanded to the windowing system and the operation system.
     3691    \o %Platform% expands to the windowing system followed by "; " if it is not Windows (e.g. "X11; ").
    36923692    \o %Security% expands to "N; " if SSL is disabled.
     3693    \o %Subplatform% expands to the operating system version (e.g. "Windows NT 6.1" or "Intel Mac OS X 10.5").
    36933694    \o %WebKitVersion% is the version of WebKit the application was compiled against.
    36943695    \o %AppVersion% expands to QCoreApplication::applicationName()/QCoreApplication::applicationVersion() if they're set; otherwise defaulting to Qt and the current Qt version.
    … …  
    37093710    // Platform
    37103711#ifdef Q_WS_MAC
    3711         "Macintosh"
     3712        "Macintosh; "
    37123713#elif defined Q_WS_QWS
    3713         "QtEmbedded"
     3714        "QtEmbedded; "
    37143715#elif defined Q_WS_WIN
    3715         "Windows"
     3716        // Nothing
    37163717#elif defined Q_WS_X11
    3717         "X11"
     3718        "X11; "
    37183719#elif defined Q_OS_SYMBIAN
    37193720        "Symbian"
    37203721#else
    3721         "Unknown"
     3722        "Unknown; "
    37223723#endif
    37233724    );
    … …  
    37273728        switch (symbianVersion) {
    37283729        case QSysInfo::SV_9_2:
    3729             firstPartTemp += QString::fromLatin1("OS/9.2");
     3730            firstPartTemp += QString::fromLatin1("OS/9.2; ");
    37303731            break;
    37313732        case QSysInfo::SV_9_3:
    3732             firstPartTemp += QString::fromLatin1("OS/9.3");
     3733            firstPartTemp += QString::fromLatin1("OS/9.3; ");
    37333734            break;               
    37343735        case QSysInfo::SV_9_4:
    3735             firstPartTemp += QString::fromLatin1("OS/9.4");
     3736            firstPartTemp += QString::fromLatin1("OS/9.4; ");
    37363737            break;
    37373738        case QSysInfo::SV_SF_2:
    3738             firstPartTemp += QString::fromLatin1("/2");
     3739            firstPartTemp += QString::fromLatin1("/2; ");
    37393740            break;
    37403741        case QSysInfo::SV_SF_3:
    3741             firstPartTemp += QString::fromLatin1("/3");
     3742            firstPartTemp += QString::fromLatin1("/3; ");
    37423743            break;
    37433744        case QSysInfo::SV_SF_4:
    3744             firstPartTemp += QString::fromLatin1("/4");
     3745            firstPartTemp += QString::fromLatin1("/4; ");
     3746            break;
    37453747        default:
     3748            firstPartTemp += QString::fromLatin1("; ");
    37463749            break;
    37473750        }
    37483751#endif
    3749 
    3750         firstPartTemp += QString::fromLatin1("; ");
    37513752
    37523753#if defined(QT_NO_OPENSSL)

  • trunk/Source/WebKit/qt/ChangeLog

    r80145 r80218  
     12011-03-03  Peter Kasting  <pkasting@google.com>
     2
     3        Reviewed by James Robinson.
     4
     5        Drop redundant "Windows; " from the Windows-specific User Agent string.
     6        https://bugs.webkit.org/show_bug.cgi?id=54567
     7
     8        * Api/qwebpage.cpp:
     9        (QWebPage::userAgentForUrl):
     10
    1112011-03-01  Brian Weinstein  <bweinstein@apple.com>
    212

  • trunk/Source/WebKit/win/ChangeLog

    r80145 r80218  
     12011-03-03  Peter Kasting  <pkasting@google.com>
     2
     3        Reviewed by James Robinson.
     4
     5        Drop redundant "Windows; " from the Windows-specific User Agent string.
     6        https://bugs.webkit.org/show_bug.cgi?id=54567
     7
     8        * WebView.cpp:
     9        (WebView::standardUserAgentWithApplicationName):
     10
    1112011-03-01  Brian Weinstein  <bweinstein@apple.com>
    212

  • trunk/Source/WebKit/win/WebView.cpp

    r79589 r80218  
    12451245{
    12461246    if (applicationName.isEmpty())
    1247         return makeString("Mozilla/5.0 (Windows; ", osVersion(), ") AppleWebKit/", webKitVersion(), " (KHTML, like Gecko)");
    1248     return makeString("Mozilla/5.0 (Windows; ", osVersion(), ") AppleWebKit/", webKitVersion(), " (KHTML, like Gecko) ", applicationName);
     1247        return makeString("Mozilla/5.0 (", osVersion(), ") AppleWebKit/", webKitVersion(), " (KHTML, like Gecko)");
     1248    return makeString("Mozilla/5.0 (", osVersion(), ") AppleWebKit/", webKitVersion(), " (KHTML, like Gecko) ", applicationName);
    12491249}
    12501250

  • trunk/Source/WebKit2/ChangeLog

    r80200 r80218  
     12011-03-03  Peter Kasting  <pkasting@google.com>
     2
     3        Reviewed by James Robinson.
     4
     5        Drop redundant "Windows; " from the Windows-specific User Agent string.
     6        https://bugs.webkit.org/show_bug.cgi?id=54567
     7
     8        * UIProcess/win/WebPageProxyWin.cpp:
     9        (WebKit::WebPageProxy::standardUserAgent):
     10
    1112011-03-02  Sheriff Bot  <webkit.review.bot@gmail.com>
    212

  • trunk/Source/WebKit2/UIProcess/win/WebPageProxyWin.cpp

    r79589 r80218  
    104104
    105105    if (applicationNameForUserAgent.isEmpty())
    106         return makeString("Mozilla/5.0 (Windows; ", osVersion, ") AppleWebKit/", webKitVersion, " (KHTML, like Gecko)");
    107     return makeString("Mozilla/5.0 (Windows; ", osVersion, ") AppleWebKit/", webKitVersion, " (KHTML, like Gecko) ", applicationNameForUserAgent);
     106        return makeString("Mozilla/5.0 (", osVersion, ") AppleWebKit/", webKitVersion, " (KHTML, like Gecko)");
     107    return makeString("Mozilla/5.0 (", osVersion, ") AppleWebKit/", webKitVersion, " (KHTML, like Gecko) ", applicationNameForUserAgent);
    108108}
    109109
Note: See TracChangeset for help on using the changeset viewer.