[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[tkent at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 7f2d75ff958a7f6561717bacbe78ef93accce488
Author: tkent at chromium.org <tkent at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Aug 2 15:10:06 2010 +0000

    2010-08-02  Kent Tamura  <tkent at 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 at 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.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64463 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 94cccbd..f41799c 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-02  Kent Tamura  <tkent at 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  Jeremy Orlow  <jorlow at chromium.org>
 
         Speculative revert of 64425 due to Chromium instability
diff --git a/WebKit/chromium/WebKit.gyp b/WebKit/chromium/WebKit.gyp
index 0138554..10f01e5 100644
--- a/WebKit/chromium/WebKit.gyp
+++ b/WebKit/chromium/WebKit.gyp
@@ -854,6 +854,13 @@
                     ]
                 }],
                 ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
+                    'dependencies': [
+                        '<(chromium_src_dir)/build/linux/system.gyp:fontconfig',
+                        '<(chromium_src_dir)/build/linux/system.gyp:gtk',
+                    ],
+                    'include_dirs': [
+                        'public/gtk',
+                    ],
                     'copies': [{
                         'destination': '<(PRODUCT_DIR)',
                         'files': [
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 3b32dc1..dd9c6ed 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,22 @@
+2010-08-02  Kent Tamura  <tkent at 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.
+
 2010-08-02  Balazs Kelemen  <kb at inf.u-szeged.hu>
 
         Reviewed by Simon Hausmann.
diff --git a/WebKitTools/DumpRenderTree/chromium/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/chromium/DumpRenderTree.cpp
index 7194279..2885cf6 100644
--- a/WebKitTools/DumpRenderTree/chromium/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/chromium/DumpRenderTree.cpp
@@ -84,7 +84,7 @@ static void runTest(TestShell& shell, TestParams& params, const string& testName
 int main(int argc, char* argv[])
 {
     webkit_support::SetUpTestEnvironment();
-    platformInit();
+    platformInit(&argc, &argv);
 
     TestParams params;
     Vector<string> tests;
diff --git a/WebKitTools/DumpRenderTree/chromium/TestShell.h b/WebKitTools/DumpRenderTree/chromium/TestShell.h
index 0f74ee1..0615552 100644
--- a/WebKitTools/DumpRenderTree/chromium/TestShell.h
+++ b/WebKitTools/DumpRenderTree/chromium/TestShell.h
@@ -184,6 +184,6 @@ private:
 #endif
 };
 
-void platformInit();
+void platformInit(int*, char***);
 
 #endif // TestShell_h
diff --git a/WebKitTools/DumpRenderTree/chromium/TestShellGtk.cpp b/WebKitTools/DumpRenderTree/chromium/TestShellGtk.cpp
index 4f3eefd..a9d374c 100644
--- a/WebKitTools/DumpRenderTree/chromium/TestShellGtk.cpp
+++ b/WebKitTools/DumpRenderTree/chromium/TestShellGtk.cpp
@@ -33,6 +33,7 @@
 
 #include "webkit/support/webkit_support.h"
 #include <fontconfig/fontconfig.h>
+#include <gtk/gtk.h>
 #include <signal.h>
 
 static void AlarmHandler(int signatl)
@@ -185,7 +186,11 @@ void TestShell::waitTestFinished()
     signal(SIGALRM, SIG_DFL);
 }
 
-void platformInit()
+void platformInit(int* argc, char*** argv)
 {
+    // FIXME: It's better call gtk_init() only when we run plugin tests.
+    // See http://groups.google.com/a/chromium.org/group/chromium-dev/browse_thread/thread/633ea167cde196ca#
+    gtk_init(argc, argv);
+
     setupFontconfig();
 }
diff --git a/WebKitTools/DumpRenderTree/chromium/TestShellMac.mm b/WebKitTools/DumpRenderTree/chromium/TestShellMac.mm
index 218b6d0..19cfd07 100644
--- a/WebKitTools/DumpRenderTree/chromium/TestShellMac.mm
+++ b/WebKitTools/DumpRenderTree/chromium/TestShellMac.mm
@@ -124,6 +124,6 @@ void TestShell::waitTestFinished()
     [thread release];
 }
 
-void platformInit()
+void platformInit(int*, char***)
 {
 }
diff --git a/WebKitTools/DumpRenderTree/chromium/TestShellWin.cpp b/WebKitTools/DumpRenderTree/chromium/TestShellWin.cpp
index a9ca6a9..72f800c 100644
--- a/WebKitTools/DumpRenderTree/chromium/TestShellWin.cpp
+++ b/WebKitTools/DumpRenderTree/chromium/TestShellWin.cpp
@@ -103,7 +103,7 @@ void TestShell::waitTestFinished()
     WaitForSingleObject(threadHandle, 1000);
 }
 
-void platformInit()
+void platformInit(int*, char***)
 {
     // Set stdout/stderr binary mode.
     _setmode(_fileno(stdout), _O_BINARY);

-- 
WebKit Debian packaging