Changeset 143875 in webkit


Ignore:
Timestamp:
Feb 24, 2013 11:01:20 AM (11 years ago)
Author:
zandobersek@gmail.com
Message:

[GTK] Stop generating UserAgentGtk.h
https://bugs.webkit.org/show_bug.cgi?id=110582

Reviewed by Martin Robinson.

.:

  • configure.ac: Provide the USER_AGENT_GTK_(MAJOR|MINOR)_VERSION defines in the autotoolsconfig.h

header, containing the user agent versions that are to be used in the user agent string. The
WEBKIT_USER_AGENT_(MAJOR|MINOR)_VERSION name is avoided as the same defines are specified in the
webkitversion.h API header (but are not accessible from the WebCore layer). The UserAgentGtk.h
header is also not generated anymore from the input file.

Source/WebCore:

No new tests - no new functionality.

  • GNUmakefile.list.am: Move the UserAgentGtk.h build target from the derived sources list to

the list of the WebCore platform sources.

  • platform/gtk/UserAgentGtk.cpp:

(WebCore::standardUserAgent): Rename WEBKIT_USER_AGENT_(MAJOR|MINOR)_VERSION to
USER_AGENT_GTK_(MAJOR|MINOR)_VERSION.

  • platform/gtk/UserAgentGtk.h: Renamed from Source/WebCore/platform/gtk/UserAgentGtk.h.in.

Same as the input file expect for removed WEBKIT_USER_AGENT_(MAJOR|MINOR)_VERSION defines that
are now replaced by using the USER_AGENT_GTK_(MAJOR|MINOR)_VERSION defines placed in autotoolsconfig.h.

Location:
trunk
Files:
1 added
1 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r143652 r143875  
     12013-02-24  Zan Dobersek  <zdobersek@igalia.com>
     2
     3        [GTK] Stop generating UserAgentGtk.h
     4        https://bugs.webkit.org/show_bug.cgi?id=110582
     5
     6        Reviewed by Martin Robinson.
     7
     8        * configure.ac: Provide the USER_AGENT_GTK_(MAJOR|MINOR)_VERSION defines in the autotoolsconfig.h
     9        header, containing the user agent versions that are to be used in the user agent string. The
     10        WEBKIT_USER_AGENT_(MAJOR|MINOR)_VERSION name is avoided as the same defines are specified in the
     11        webkitversion.h API header (but are not accessible from the WebCore layer). The UserAgentGtk.h
     12        header is also not generated anymore from the input file.
     13
    1142013-02-21  Tony Chang  <tony@chromium.org>
    215
  • trunk/Source/WebCore/ChangeLog

    r143869 r143875  
     12013-02-24  Zan Dobersek  <zdobersek@igalia.com>
     2
     3        [GTK] Stop generating UserAgentGtk.h
     4        https://bugs.webkit.org/show_bug.cgi?id=110582
     5
     6        Reviewed by Martin Robinson.
     7
     8        No new tests - no new functionality.
     9
     10        * GNUmakefile.list.am: Move the UserAgentGtk.h build target from the derived sources list to
     11        the list of the WebCore platform sources.
     12        * platform/gtk/UserAgentGtk.cpp:
     13        (WebCore::standardUserAgent): Rename WEBKIT_USER_AGENT_(MAJOR|MINOR)_VERSION to
     14        USER_AGENT_GTK_(MAJOR|MINOR)_VERSION.
     15        * platform/gtk/UserAgentGtk.h: Renamed from Source/WebCore/platform/gtk/UserAgentGtk.h.in.
     16        Same as the input file expect for removed WEBKIT_USER_AGENT_(MAJOR|MINOR)_VERSION defines that
     17        are now replaced by using the USER_AGENT_GTK_(MAJOR|MINOR)_VERSION defines placed in autotoolsconfig.h.
     18
    1192013-02-24  Gustavo Noronha Silva  <gns@gnome.org>
    220
  • trunk/Source/WebCore/GNUmakefile.list.am

    r143742 r143875  
    871871        DerivedSources/WebCore/MathMLNames.h \
    872872        DerivedSources/WebCore/SettingsMacros.h \
    873         DerivedSources/WebCore/UserAgentGtk.h \
    874873        DerivedSources/WebCore/UserAgentStyleSheetsData.cpp \
    875874        DerivedSources/WebCore/UserAgentStyleSheets.h \
     
    57415740        Source/WebCore/platform/gtk/SharedBufferGtk.cpp \
    57425741        Source/WebCore/platform/gtk/UserAgentGtk.cpp \
     5742        Source/WebCore/platform/gtk/UserAgentGtk.h \
    57435743        Source/WebCore/platform/gtk/TemporaryLinkStubs.cpp \
    57445744        Source/WebCore/platform/HostWindow.h \
  • trunk/Source/WebCore/platform/gtk/UserAgentGtk.cpp

    r137044 r143875  
    8888    // also claim to be  Chromium. Getting this wrong can cause sites to load the wrong JavaScript,
    8989    // CSS, or custom fonts. In some cases sites won't load resources at all.
    90     DEFINE_STATIC_LOCAL(const CString, uaVersion, (String::format("%i.%i", WEBKIT_USER_AGENT_MAJOR_VERSION, WEBKIT_USER_AGENT_MINOR_VERSION).utf8()));
     90    DEFINE_STATIC_LOCAL(const CString, uaVersion, (String::format("%i.%i", USER_AGENT_GTK_MAJOR_VERSION, USER_AGENT_GTK_MINOR_VERSION).utf8()));
    9191    DEFINE_STATIC_LOCAL(const String, staticUA, (String::format("Mozilla/5.0 (%s; %s) AppleWebKit/%s (KHTML, like Gecko) "
    9292                                                                "Chromium/25.0.1349.2 Chrome/25.0.1349.2 Safari/%s",
  • trunk/configure.ac

    r143604 r143875  
    2020AC_SUBST(WEBKIT_USER_AGENT_MAJOR_VERSION)
    2121AC_SUBST(WEBKIT_USER_AGENT_MINOR_VERSION)
     22AC_DEFINE([USER_AGENT_GTK_MAJOR_VERSION], [webkit_user_agent_major_version], [The major version used in user agent string])
     23AC_DEFINE([USER_AGENT_GTK_MINOR_VERSION], [webkit_user_agent_minor_version], [The minor version used in user agent string])
    2224
    2325m4_include([Source/autotools/CheckSystemAndBasicDependencies.m4])
     
    3840
    3941AC_CONFIG_FILES([GNUmakefile])
    40 AC_CONFIG_FILES([DerivedSources/WebCore/UserAgentGtk.h:Source/WebCore/platform/gtk/UserAgentGtk.h.in])
    4142AC_CONFIG_FILES(
    4243    [Source/JavaScriptCore/javascriptcoregtk-${WEBKITGTK_API_VERSION}.pc:Source/JavaScriptCore/javascriptcoregtk.pc.in
Note: See TracChangeset for help on using the changeset viewer.