WebKit merge 40500:40539 [WebKit side]

third_party/WebKit/WebCore/loader/DocumentLoader.h

Index: third_party/WebKit/WebCore/loader/DocumentLoader.h
===================================================================
--- third_party/WebKit/WebCore/loader/DocumentLoader.h	(revision 9118)
+++ third_party/WebKit/WebCore/loader/DocumentLoader.h	(working copy)
@@ -156,6 +156,9 @@
 
         KURL urlForHistory() const;
         bool urlForHistoryReflectsFailure() const;
+        bool urlForHistoryReflectsServerRedirect() const { return urlForHistory() != url(); }
+        bool urlForHistoryReflectsClientRedirect() const { return m_urlForHistoryReflectsClientRedirect; }
+        void setURLForHistoryReflectsClientRedirect(bool b) { m_urlForHistoryReflectsClientRedirect = b; }
         
         void loadFromCachedPage(PassRefPtr<CachedPage>);
         void setLoadingFromCachedPage(bool loading) { m_loadingFromCachedPage = loading; }
@@ -287,6 +290,8 @@
 
         HashSet<String> m_resourcesClientKnowsAbout;
         Vector<String> m_resourcesLoadedFromMemoryCacheForClientNotification;
+        
+        bool m_urlForHistoryReflectsClientRedirect;
 
 #if ENABLE(OFFLINE_WEB_APPLICATIONS)  
         // The application cache that the document loader is associated with (if any).