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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit f65f274b9a54b79e629d57e1293b0b09944ee427
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 23 13:36:47 2010 +0000

    2010-09-23  Matthew Delaney  <mdelaney at apple.com>
    
            Reviewed by Adam Roben.
    
            Create one time initialization block for WebView's initWithFrame
            https://bugs.webkit.org/show_bug.cgi?id=46307
    
            * WebView.cpp: Added one time initialization block for webview code
            that needs only be run once and not for each webview. This is just as
            the mac version WebView.mm does.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68133 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 2e6cee4..e92fc8e 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,14 @@
+2010-09-23  Matthew Delaney  <mdelaney at apple.com>
+
+        Reviewed by Adam Roben.
+
+        Create one time initialization block for WebView's initWithFrame
+        https://bugs.webkit.org/show_bug.cgi?id=46307
+
+        * WebView.cpp: Added one time initialization block for webview code
+        that needs only be run once and not for each webview. This is just as
+        the mac version WebView.mm does.
+
 2010-09-22  Brent Fulgham  <bfulgham at webkit.org>
 
         Reviewed by Martin Robinson.
diff --git a/WebKit/win/WebView.cpp b/WebKit/win/WebView.cpp
index 04794c9..affd058 100755
--- a/WebKit/win/WebView.cpp
+++ b/WebKit/win/WebView.cpp
@@ -2561,12 +2561,17 @@ HRESULT STDMETHODCALLTYPE WebView::initWithFrame(
     sharedPreferences->willAddToWebView();
     m_preferences = sharedPreferences;
 
-    InitializeLoggingChannelsIfNecessary();
+    static bool didOneTimeInitialization;
+    if (!didOneTimeInitialization) {
+        InitializeLoggingChannelsIfNecessary();
 #if ENABLE(DATABASE)
-    WebKitInitializeWebDatabasesIfNecessary();
+        WebKitInitializeWebDatabasesIfNecessary();
 #endif
-    WebKitSetApplicationCachePathIfNecessary();
-    WebPlatformStrategies::initialize();
+        WebKitSetApplicationCachePathIfNecessary();
+        WebPlatformStrategies::initialize();
+
+        didOneTimeInitialization = true;
+     }
 
 #if USE(SAFARI_THEME)
     BOOL shouldPaintNativeControls;

-- 
WebKit Debian packaging