Update Chromium to branch 1650 (31.0.1650.63)

Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>

1 files changed, 5 insertions, 19 deletions

diff --git a/chromium/third_party/WebKit/Source/core/loader/DocumentLoader.h b/chromium/third_party/WebKit/Source/core/loader/DocumentLoader.h
index 112292e661e..7fe971f89c8 100644
--- a/chromium/third_party/WebKit/Source/core/loader/DocumentLoader.h
+++ b/chromium/third_party/WebKit/Source/core/loader/DocumentLoader.h
@@ -30,18 +30,17 @@
 #ifndef DocumentLoader_h
 #define DocumentLoader_h
 
+#include "core/fetch/RawResource.h"
+#include "core/fetch/ResourceLoaderOptions.h"
+#include "core/fetch/ResourcePtr.h"
 #include "core/loader/DocumentLoadTiming.h"
 #include "core/loader/DocumentWriter.h"
 #include "core/loader/NavigationAction.h"
-#include "core/loader/ResourceLoaderOptions.h"
 #include "core/loader/SubstituteData.h"
-#include "core/loader/cache/RawResource.h"
-#include "core/loader/cache/ResourcePtr.h"
 #include "core/platform/Timer.h"
 #include "core/platform/network/ResourceError.h"
 #include "core/platform/network/ResourceRequest.h"
 #include "core/platform/network/ResourceResponse.h"
-#include "core/platform/text/StringWithDirection.h"
 #include "wtf/HashSet.h"
 #include "wtf/RefPtr.h"
 
@@ -63,8 +62,6 @@ namespace WebCore {
     class ResourceLoader;
     class SharedBuffer;
 
-    typedef HashSet<RefPtr<ResourceLoader> > ResourceLoaderSet;
-
     class DocumentLoader : public RefCounted<DocumentLoader>, private RawResourceClient {
         WTF_MAKE_FAST_ALLOCATED;
     public:
@@ -108,7 +105,6 @@ namespace WebCore {
         const String& responseMIMEType() const;
 
         void replaceRequestURLForSameDocumentNavigation(const KURL&);
-        bool isStopping() const { return m_isStopping; }
         void stopLoading();
         void setCommitted(bool committed) { m_committed = committed; }
         bool isCommitted() const { return m_committed; }
@@ -120,7 +116,6 @@ namespace WebCore {
         bool replacesCurrentHistoryItem() const { return m_replacesCurrentHistoryItem; }
         void setReplacesCurrentHistoryItem(bool replacesCurrentHistoryItem) { m_replacesCurrentHistoryItem = replacesCurrentHistoryItem; }
         bool isLoadingInAPISense() const;
-        void setTitle(const StringWithDirection&);
         const String& overrideEncoding() const { return m_overrideEncoding; }
 
         bool scheduleArchiveLoad(Resource*, const ResourceRequest&);
@@ -128,14 +123,13 @@ namespace WebCore {
 
         enum PolicyCheckLoadType {
             PolicyCheckStandard,
-            PolicyCheckRedirect
+            PolicyCheckFragment
         };
         bool shouldContinueForNavigationPolicy(const ResourceRequest&, PolicyCheckLoadType);
         const NavigationAction& triggeringAction() const { return m_triggeringAction; }
         void setTriggeringAction(const NavigationAction& action) { m_triggeringAction = action; }
 
         void setOverrideEncoding(const String& encoding) { m_overrideEncoding = encoding; }
-        const StringWithDirection& title() const { return m_pageTitle; }
 
         KURL urlForHistory() const;
 
@@ -147,8 +141,6 @@ namespace WebCore {
         bool isLoadingMainResource() const { return m_loadingMainResource; }
 
         void stopLoadingSubresources();
-        void addResourceLoader(ResourceLoader*);
-        void removeResourceLoader(ResourceLoader*);
 
         void subresourceLoaderFinishedLoadingOnePart(ResourceLoader*);
 
@@ -205,10 +197,9 @@ namespace WebCore {
 
         bool maybeLoadEmpty();
 
-        bool isPostOrRedirectAfterPost(const ResourceRequest&, const ResourceResponse&);
+        bool isRedirectAfterPost(const ResourceRequest&, const ResourceResponse&);
 
         bool shouldContinueForResponse() const;
-        void stopLoadingForPolicyChange();
 
         typedef Timer<DocumentLoader> DocumentLoaderTimer;
 
@@ -220,8 +211,6 @@ namespace WebCore {
         RefPtr<ResourceFetcher> m_fetcher;
 
         ResourcePtr<RawResource> m_mainResource;
-        ResourceLoaderSet m_resourceLoaders;
-        ResourceLoaderSet m_multipartResourceLoaders;
 
         RefPtr<DocumentWriter> m_writer;
 
@@ -247,12 +236,9 @@ namespace WebCore {
         ResourceError m_mainDocumentError;
 
         bool m_committed;
-        bool m_isStopping;
         bool m_isClientRedirect;
         bool m_replacesCurrentHistoryItem;
 
-        StringWithDirection m_pageTitle;
-
         String m_overrideEncoding;
 
         // The action that triggered loading - we keep this around for the