[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[bweinstein at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit bdbe9e3cb7248286b15b99d06eff42def3221214
Author: bweinstein at apple.com <bweinstein at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Feb 11 19:55:20 2010 +0000

    Attempt to fix the Windows build
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54662 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/WebCore.base.exp b/WebCore/WebCore.base.exp
index a0a5262..96eb13d 100644
--- a/WebCore/WebCore.base.exp
+++ b/WebCore/WebCore.base.exp
@@ -661,6 +661,7 @@ __ZN7WebCore8Settings25setDeveloperExtrasEnabledEb
 __ZN7WebCore8Settings25setMinimumLogicalFontSizeEi
 __ZN7WebCore8Settings25setNeedsLeopardMailQuirksEb
 __ZN7WebCore8Settings25setPrivateBrowsingEnabledEb
+__ZN7WebCore8Settings39setLocalStorageOverridesPrivateBrowsingEb
 __ZN7WebCore8Settings25setShouldPrintBackgroundsEb
 __ZN7WebCore8Settings25setUserStyleSheetLocationERKNS_4KURLE
 __ZN7WebCore8Settings26setDefaultTextEncodingNameERKNS_6StringE
diff --git a/WebCore/inspector/InspectorController.cpp b/WebCore/inspector/InspectorController.cpp
index 3d0ba9e..bf70cb9 100644
--- a/WebCore/inspector/InspectorController.cpp
+++ b/WebCore/inspector/InspectorController.cpp
@@ -1847,3 +1847,4 @@ InjectedScript InspectorController::injectedScriptForNodeId(long id)
 } // namespace WebCore
     
 #endif // ENABLE(INSPECTOR)
+
diff --git a/WebCore/loader/HistoryController.cpp b/WebCore/loader/HistoryController.cpp
index 43c9979..f7b719f 100644
--- a/WebCore/loader/HistoryController.cpp
+++ b/WebCore/loader/HistoryController.cpp
@@ -295,12 +295,12 @@ void HistoryController::updateForStandardLoad()
     if (!frameLoader->documentLoader()->isClientRedirect()) {
         if (!historyURL.isEmpty()) {
             updateBackForwardListClippedAtTarget(true);
-            if (!needPrivacy) {
+//            if (!needPrivacy) {
                 frameLoader->client()->updateGlobalHistory();
                 frameLoader->documentLoader()->setDidCreateGlobalHistoryEntry(true);
                 if (frameLoader->documentLoader()->unreachableURL().isEmpty())
                     frameLoader->client()->updateGlobalHistoryRedirectLinks();
-            }
+//            }
             if (Page* page = m_frame->page())
                 page->setGlobalHistoryItem(needPrivacy ? 0 : page->backForwardList()->currentItem());
         }
diff --git a/WebCore/page/Settings.cpp b/WebCore/page/Settings.cpp
index 969969f..86410bf 100644
--- a/WebCore/page/Settings.cpp
+++ b/WebCore/page/Settings.cpp
@@ -275,6 +275,11 @@ void Settings::setPrivateBrowsingEnabled(bool privateBrowsingEnabled)
     m_privateBrowsingEnabled = privateBrowsingEnabled;
 }
 
+void Settings::setLocalStorageOverridesPrivateBrowsing(bool localStorageOverrides)
+{
+    m_localStorageOverridesPrivateBrowsing = localStorageOverrides;
+}
+
 void Settings::setJavaScriptCanOpenWindowsAutomatically(bool javaScriptCanOpenWindowsAutomatically)
 {
     m_javaScriptCanOpenWindowsAutomatically = javaScriptCanOpenWindowsAutomatically;
diff --git a/WebCore/page/Settings.h b/WebCore/page/Settings.h
index 577459c..697c716 100644
--- a/WebCore/page/Settings.h
+++ b/WebCore/page/Settings.h
@@ -136,6 +136,9 @@ namespace WebCore {
         void setPrivateBrowsingEnabled(bool);
         bool privateBrowsingEnabled() const { return m_privateBrowsingEnabled; }
 
+        void setLocalStorageOverridesPrivateBrowsing(bool);
+        bool localStorageOverridesPrivateBrowsing() const { return m_localStorageOverridesPrivateBrowsing; }
+
         void setCaretBrowsingEnabled(bool);
         bool caretBrowsingEnabled() const { return m_caretBrowsingEnabled; }
 
@@ -312,6 +315,7 @@ namespace WebCore {
         bool m_isJavaEnabled : 1;
         bool m_loadsImagesAutomatically : 1;
         bool m_privateBrowsingEnabled : 1;
+        bool m_localStorageOverridesPrivateBrowsing : 1;
         bool m_caretBrowsingEnabled : 1;
         bool m_areImagesEnabled : 1;
         bool m_arePluginsEnabled : 1;
diff --git a/WebCore/platform/graphics/GraphicsContext3D.h b/WebCore/platform/graphics/GraphicsContext3D.h
index d7406c9..5133181 100644
--- a/WebCore/platform/graphics/GraphicsContext3D.h
+++ b/WebCore/platform/graphics/GraphicsContext3D.h
@@ -33,7 +33,7 @@
 #include <wtf/PassOwnPtr.h>
 
 // FIXME: Find a better way to avoid the name confliction for NO_ERROR.
-#if PLATFORM(CHROMIUM) && OS(WINDOWS)
+#if ((PLATFORM(CHROMIUM) && OS(WINDOWS)) || PLATFORM(WINDOWS))
 #undef NO_ERROR
 #endif
 
diff --git a/WebCore/storage/StorageAreaImpl.cpp b/WebCore/storage/StorageAreaImpl.cpp
index aa04781..15a2598 100644
--- a/WebCore/storage/StorageAreaImpl.cpp
+++ b/WebCore/storage/StorageAreaImpl.cpp
@@ -100,7 +100,7 @@ static bool privateBrowsingEnabled(Frame* frame)
     ASSERT(!frame);
     return false;
 #else
-    return frame->page()->settings()->privateBrowsingEnabled();
+    return frame->page()->settings()->privateBrowsingEnabled() && !frame->page()->settings()->localStorageOverridesPrivateBrowsing();
 #endif
 }
 

-- 
WebKit Debian packaging