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

[jhoneycutt at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 0519163be5effc83353efec4e35cdfab7e5a880f
Author: jhoneycutt at apple.com <jhoneycutt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 13 03:46:53 2010 +0000

    WebKit2 needs to initialize SafariTheme
    https://bugs.webkit.org/show_bug.cgi?id=43901
    
    Reviewed by Sam Weinig.
    
    * WebProcess/win/WebProcessMainWin.cpp:
    (WebKit::initializeSafariTheme):
    Copied from old WebKit.
    (WebKit::WebProcessMain):
    If we're using SafariTheme, initialize it.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65293 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 10fdb6b..340f02f 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -18,6 +18,19 @@
 
 2010-08-12  Jon Honeycutt  <jhoneycutt at apple.com>
 
+        WebKit2 needs to initialize SafariTheme
+        https://bugs.webkit.org/show_bug.cgi?id=43901
+
+        Reviewed by Sam Weinig.
+
+        * WebProcess/win/WebProcessMainWin.cpp:
+        (WebKit::initializeSafariTheme):
+        Copied from old WebKit.
+        (WebKit::WebProcessMain):
+        If we're using SafariTheme, initialize it.
+
+2010-08-12  Jon Honeycutt  <jhoneycutt at apple.com>
+
         WebKitTestRunner needs to run tests without using native controls
         https://bugs.webkit.org/show_bug.cgi?id=43772
 
diff --git a/WebKit2/WebProcess/win/WebProcessMainWin.cpp b/WebKit2/WebProcess/win/WebProcessMainWin.cpp
index 09dcfc2..e822ed8 100644
--- a/WebKit2/WebProcess/win/WebProcessMainWin.cpp
+++ b/WebKit2/WebProcess/win/WebProcessMainWin.cpp
@@ -29,6 +29,7 @@
 #include "RunLoop.h"
 #include "WebProcess.h"
 #include <WebCore/PlatformString.h>
+#include <WebCore/SoftLinking.h>
 #include <runtime/InitializeThreading.h>
 #include <wtf/Threading.h>
 #include <wtf/text/StringHash.h>
@@ -37,10 +38,34 @@ using namespace WebCore;
 
 namespace WebKit {
 
+#if USE(SAFARI_THEME)
+#ifdef DEBUG_ALL
+SOFT_LINK_DEBUG_LIBRARY(SafariTheme)
+#else
+SOFT_LINK_LIBRARY(SafariTheme)
+#endif
+
+SOFT_LINK(SafariTheme, STInitialize, void, APIENTRY, (), ())
+
+static void initializeSafariTheme()
+{
+    static bool didInitializeSafariTheme;
+    if (!didInitializeSafariTheme) {
+        if (SafariThemeLibrary())
+            STInitialize();
+        didInitializeSafariTheme = true;
+    }
+}
+#endif // USE(SAFARI_THEME)
+
 int WebProcessMain(CommandLine* commandLine)
 {
     ::OleInitialize(0);
 
+#if USE(SAFARI_THEME)
+    initializeSafariTheme();
+#endif
+
     JSC::initializeThreading();
     WTF::initializeMainThread();
     RunLoop::initializeMainRunLoop();

-- 
WebKit Debian packaging