Remove Apple's unused implementation of private browsing from WebCore

Source/WebCore/loader/HistoryController.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
@@ skipping 342 matching lines @@
 //     1) Back/forward: The m_currentItem is part of this mechanism.
 //     2) Global history: Handled by the client.
 //     3) Visited links: Handled by the PageGroup.
 
 void HistoryController::updateForStandardLoad(HistoryUpdateType updateType)
 {
     LOG(History, "WebCoreHistory: Updating History for Standard Load in frame %s", m_frame->loader()->documentLoader()->url().string().ascii().data());
 
     FrameLoader* frameLoader = m_frame->loader();
 
-    Settings* settings = m_frame->settings();
-    bool needPrivacy = !settings || settings->privateBrowsingEnabled();
     const KURL& historyURL = frameLoader->documentLoader()->urlForHistory();
 
     if (!frameLoader->documentLoader()->isClientRedirect()) {
         if (!historyURL.isEmpty()) {
             if (updateType != UpdateAllExceptBackForwardList)
                 updateBackForwardListClippedAtTarget(true);
-            if (!needPrivacy) {
-                frameLoader->client()->updateGlobalHistory();
-                frameLoader->documentLoader()->setDidCreateGlobalHistoryEntry(true);
-                if (frameLoader->documentLoader()->unreachableURL().isEmpty())
-                    frameLoader->client()->updateGlobalHistoryRedirectLinks();
-            }
+            frameLoader->client()->updateGlobalHistory();
+            frameLoader->documentLoader()->setDidCreateGlobalHistoryEntry(true);
+            if (frameLoader->documentLoader()->unreachableURL().isEmpty())
+                frameLoader->client()->updateGlobalHistoryRedirectLinks();
 
             m_frame->loader()->client()->updateGlobalHistoryItemForPage();
         }
     } else {
         // The client redirect replaces the current history item.
         updateCurrentItem();
     }
 
-    if (!historyURL.isEmpty() && !needPrivacy) {
+    if (!historyURL.isEmpty()) {
         if (Page* page = m_frame->page())
             addVisitedLink(page, historyURL);
 
         if (!frameLoader->documentLoader()->didCreateGlobalHistoryEntry() && frameLoader->documentLoader()->unreachableURL().isEmpty() && !m_frame->document()->url().isEmpty())
             frameLoader->client()->updateGlobalHistoryRedirectLinks();
     }
 }
 
 void HistoryController::updateForRedirectWithLockedBackForwardList()
 {
 #if !LOG_DISABLED
     if (m_frame->loader()->documentLoader())
         LOG(History, "WebCoreHistory: Updating History for redirect load in frame %s", m_frame->loader()->documentLoader()->title().string().utf8().data());
 #endif
     
-    Settings* settings = m_frame->settings();
-    bool needPrivacy = !settings || settings->privateBrowsingEnabled();
     const KURL& historyURL = m_frame->loader()->documentLoader()->urlForHistory();
 
     if (m_frame->loader()->documentLoader()->isClientRedirect()) {
         if (!m_currentItem && !m_frame->tree()->parent()) {
             if (!historyURL.isEmpty()) {
                 updateBackForwardListClippedAtTarget(true);
-                if (!needPrivacy) {
-                    m_frame->loader()->client()->updateGlobalHistory();
-                    m_frame->loader()->documentLoader()->setDidCreateGlobalHistoryEntry(true);
-                    if (m_frame->loader()->documentLoader()->unreachableURL().isEmpty())
-                        m_frame->loader()->client()->updateGlobalHistoryRedirectLinks();
-                }
+                m_frame->loader()->client()->updateGlobalHistory();
+                m_frame->loader()->documentLoader()->setDidCreateGlobalHistoryEntry(true);
+                if (m_frame->loader()->documentLoader()->unreachableURL().isEmpty())
+                    m_frame->loader()->client()->updateGlobalHistoryRedirectLinks();
 
                 m_frame->loader()->client()->updateGlobalHistoryItemForPage();
             }
         }
         // The client redirect replaces the current history item.
         updateCurrentItem();
     } else {
         Frame* parentFrame = m_frame->tree()->parent();
         if (parentFrame && parentFrame->loader()->history()->m_currentItem)
             parentFrame->loader()->history()->m_currentItem->setChildItem(createItem());
     }
 
-    if (!historyURL.isEmpty() && !needPrivacy) {
+    if (!historyURL.isEmpty()) {
         if (Page* page = m_frame->page())
             addVisitedLink(page, historyURL);
 
         if (!m_frame->loader()->documentLoader()->didCreateGlobalHistoryEntry() && m_frame->loader()->documentLoader()->unreachableURL().isEmpty() && !m_frame->document()->url().isEmpty())
             m_frame->loader()->client()->updateGlobalHistoryRedirectLinks();
     }
 }
 
 void HistoryController::updateForClientRedirect()
 {
 #if !LOG_DISABLED
     if (m_frame->loader()->documentLoader())
         LOG(History, "WebCoreHistory: Updating History for client redirect in frame %s", m_frame->loader()->documentLoader()->title().string().utf8().data());
 #endif
 
     // Clear out form data so we don't try to restore it into the incoming page.  Must happen after
     // webcore has closed the URL and saved away the form state.
     if (m_currentItem) {
         m_currentItem->clearDocumentState();
         m_currentItem->clearScrollPoint();
     }
 
-    Settings* settings = m_frame->settings();
-    bool needPrivacy = !settings || settings->privateBrowsingEnabled();
     const KURL& historyURL = m_frame->loader()->documentLoader()->urlForHistory();
 
-    if (!historyURL.isEmpty() && !needPrivacy) {
+    if (!historyURL.isEmpty()) {
         if (Page* page = m_frame->page())
             addVisitedLink(page, historyURL);
     }
 }
 
 void HistoryController::updateForCommit()
 {
     FrameLoader* frameLoader = m_frame->loader();
 #if !LOG_DISABLED
     if (frameLoader->documentLoader())
@@ skipping 68 matching lines @@
     // Iterate over the rest of the tree
     for (Frame* child = m_frame->tree()->firstChild(); child; child = child->tree()->nextSibling())
         child->loader()->history()->recursiveUpdateForCommit();
 }
 
 void HistoryController::updateForSameDocumentNavigation()
 {
     if (m_frame->document()->url().isEmpty())
         return;
 
-    Settings* settings = m_frame->settings();
-    if (!settings || settings->privateBrowsingEnabled())
-        return;
-
     Page* page = m_frame->page();
     if (!page)
         return;
 
     addVisitedLink(page, m_frame->document()->url());
     page->mainFrame()->loader()->history()->recursiveUpdateForSameDocumentNavigation();
 
     if (m_currentItem) {
         m_currentItem->setURL(m_frame->document()->url());
         m_frame->loader()->client()->updateGlobalHistory();
@@ skipping 305 matching lines @@
     RefPtr<HistoryItem> topItem = page->mainFrame()->loader()->history()->createItemTree(m_frame, false);
     
     // Override data in the current item (created by createItemTree) to reflect
     // the pushState() arguments.
     m_currentItem->setTitle(title);
     m_currentItem->setStateObject(stateObject);
     m_currentItem->setURLString(urlString);
 
     page->backForward()->addItem(topItem.release());
 
-    Settings* settings = m_frame->settings();
-    if (!settings || settings->privateBrowsingEnabled())
-        return;
-
     addVisitedLink(page, KURL(ParsedURLString, urlString));
     m_frame->loader()->client()->updateGlobalHistory();
 
 }
 
 void HistoryController::replaceState(PassRefPtr<SerializedScriptValue> stateObject, const String& title, const String& urlString)
 {
     if (!m_currentItem)
         return;
 
     if (!urlString.isEmpty())
         m_currentItem->setURLString(urlString);
     m_currentItem->setTitle(title);
     m_currentItem->setStateObject(stateObject);
     m_currentItem->setFormData(0);
     m_currentItem->setFormContentType(String());
 
-    Settings* settings = m_frame->settings();
-    if (!settings || settings->privateBrowsingEnabled())
-        return;
-
     ASSERT(m_frame->page());
     addVisitedLink(m_frame->page(), KURL(ParsedURLString, urlString));
     m_frame->loader()->client()->updateGlobalHistory();
 }
 
 } // namespace WebCore