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

[jorlow at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit b64047555426921efe30eb03e6c1216e435cb90e
Author: jorlow at chromium.org <jorlow at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 12 10:21:09 2010 +0000

    2010-08-12  Jeremy Orlow  <jorlow at chromium.org>
    
            Build fix.  Matches solutions in qt and mac ports for
            https://bugs.webkit.org/show_bug.cgi?id=43794
    
            * WebView.cpp:
            (WebView::initWithFrame):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65230 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 9e8872d..faaef20 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,11 @@
+2010-08-12  Jeremy Orlow  <jorlow at chromium.org>
+
+        Build fix.  Matches solutions in qt and mac ports for
+        https://bugs.webkit.org/show_bug.cgi?id=43794 
+
+        * WebView.cpp:
+        (WebView::initWithFrame):
+
 2010-08-10  Gavin Barraclough  <barraclough at apple.com>
 
         Build fix (update more includes)
diff --git a/WebKit/win/WebView.cpp b/WebKit/win/WebView.cpp
index c307c02..90bd779 100644
--- a/WebKit/win/WebView.cpp
+++ b/WebKit/win/WebView.cpp
@@ -90,6 +90,7 @@
 #include <WebCore/FrameWin.h>
 #include <WebCore/GDIObjectCounter.h>
 #include <WebCore/GraphicsContext.h>
+#include <WebCore/GroupSettings.h>
 #include <WebCore/HTMLMediaElement.h>
 #include <WebCore/HTMLNames.h>
 #include <WebCore/HistoryItem.h>
@@ -2580,9 +2581,11 @@ HRESULT STDMETHODCALLTYPE WebView::initWithFrame(
 #endif
     m_page = new Page(pageClients);
 
+    // FIXME: Whenever any future groupSettings need to be exposed to the embedder, they should NOT be exposed
+    //        via the WebView since they aren't actually per-view settings.
     BSTR localStoragePath;
     if (SUCCEEDED(m_preferences->localStorageDatabasePath(&localStoragePath))) {
-        m_page->settings()->setLocalStorageDatabasePath(String(localStoragePath, SysStringLen(localStoragePath)));
+        m_page->group().groupSettings()->setLocalStorageDatabasePath(String(localStoragePath, SysStringLen(localStoragePath)));
         SysFreeString(localStoragePath);
     }
 

-- 
WebKit Debian packaging