Changeset 64463 in webkit


Ignore:
Timestamp:
Aug 2, 2010 8:10:06 AM (14 years ago)
Author:
tkent@chromium.org
Message:

2010-08-02 Kent Tamura <​tkent@chromium.org>

Reviewed by Dimitri Glazkov.

[DRT/Chromium] Always initialize GTK
​https://bugs.webkit.org/show_bug.cgi?id=43327

  • WebKit.gyp: Add GTK dependency for DRT.

2010-08-02 Kent Tamura <​tkent@chromium.org>

Reviewed by Dimitri Glazkov.

[DRT/Chromium] Always initialize GTK
​https://bugs.webkit.org/show_bug.cgi?id=43327

Call gtk_init() in order to fix plugin test crash.

  • DumpRenderTree/chromium/DumpRenderTree.cpp: (main): Pass argc/argv to platformInit().
  • DumpRenderTree/chromium/TestShell.h:
  • DumpRenderTree/chromium/TestShellGtk.cpp: (platformInit): Update parameters, call gtk_init().
  • DumpRenderTree/chromium/TestShellMac.mm: (platformInit): Update parameters.
  • DumpRenderTree/chromium/TestShellWin.cpp: (platformInit): Update parameters.
Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebKit/chromium/ChangeLog

    r64462 r64463  
     12010-08-02  Kent Tamura  <tkent@chromium.org>
     2
     3        Reviewed by Dimitri Glazkov.
     4
     5        [DRT/Chromium] Always initialize GTK
     6        https://bugs.webkit.org/show_bug.cgi?id=43327
     7
     8        * WebKit.gyp: Add GTK dependency for DRT.
     9
    1102010-08-02  Jeremy Orlow  <jorlow@chromium.org>
    211

  • trunk/WebKit/chromium/WebKit.gyp

    r64358 r64463  
    855855                }],
    856856                ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
     857                    'dependencies': [
     858                        '<(chromium_src_dir)/build/linux/system.gyp:fontconfig',
     859                        '<(chromium_src_dir)/build/linux/system.gyp:gtk',
     860                    ],
     861                    'include_dirs': [
     862                        'public/gtk',
     863                    ],
    857864                    'copies': [{
    858865                        'destination': '<(PRODUCT_DIR)',

  • trunk/WebKitTools/ChangeLog

    r64460 r64463  
     12010-08-02  Kent Tamura  <tkent@chromium.org>
     2
     3        Reviewed by Dimitri Glazkov.
     4
     5        [DRT/Chromium] Always initialize GTK
     6        https://bugs.webkit.org/show_bug.cgi?id=43327
     7
     8        Call gtk_init() in order to fix plugin test crash.
     9
     10        * DumpRenderTree/chromium/DumpRenderTree.cpp:
     11        (main): Pass argc/argv to platformInit().
     12        * DumpRenderTree/chromium/TestShell.h:
     13        * DumpRenderTree/chromium/TestShellGtk.cpp:
     14        (platformInit): Update parameters, call gtk_init().
     15        * DumpRenderTree/chromium/TestShellMac.mm:
     16        (platformInit): Update parameters.
     17        * DumpRenderTree/chromium/TestShellWin.cpp:
     18        (platformInit): Update parameters.
     19
    1202010-08-02  Balazs Kelemen  <kb@inf.u-szeged.hu>
    221

  • trunk/WebKitTools/DumpRenderTree/chromium/DumpRenderTree.cpp

    r61527 r64463  
    8585{
    8686    webkit_support::SetUpTestEnvironment();
    87     platformInit();
     87    platformInit(&argc, &argv);
    8888
    8989    TestParams params;

  • trunk/WebKitTools/DumpRenderTree/chromium/TestShell.h

    r62545 r64463  
    185185};
    186186
    187 void platformInit();
     187void platformInit(int*, char***);
    188188
    189189#endif // TestShell_h

  • trunk/WebKitTools/DumpRenderTree/chromium/TestShellGtk.cpp

    r60218 r64463  
    3434#include "webkit/support/webkit_support.h"
    3535#include <fontconfig/fontconfig.h>
     36#include <gtk/gtk.h>
    3637#include <signal.h>
    3738
    … …  
    186187}
    187188
    188 void platformInit()
     189void platformInit(int* argc, char*** argv)
    189190{
     191    // FIXME: It's better call gtk_init() only when we run plugin tests.
     192    // See http://groups.google.com/a/chromium.org/group/chromium-dev/browse_thread/thread/633ea167cde196ca#
     193    gtk_init(argc, argv);
     194
    190195    setupFontconfig();
    191196}

  • trunk/WebKitTools/DumpRenderTree/chromium/TestShellMac.mm

    r60005 r64463  
    125125}
    126126
    127 void platformInit()
     127void platformInit(int*, char***)
    128128{
    129129}

  • trunk/WebKitTools/DumpRenderTree/chromium/TestShellWin.cpp

    r60883 r64463  
    104104}
    105105
    106 void platformInit()
     106void platformInit(int*, char***)
    107107{
    108108    // Set stdout/stderr binary mode.
Note: See TracChangeset for help on using the changeset viewer.