Merge ResourceLoader's ResourceLoaderState and ConnectionState enums

third_party/WebKit/Source/core/fetch/ResourceLoader.h

 /*
  * Copyright (C) 2005, 2006, 2011 Apple Inc. All rights reserved.
  *
  * 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
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 69 matching lines @@
     void didReceiveResponse(WebURLLoader*, const WebURLResponse&, WebDataConsumerHandle*) override;
     void didReceiveData(WebURLLoader*, const char*, int, int encodedDataLength) override;
     void didReceiveCachedMetadata(WebURLLoader*, const char* data, int length) override;
     void didFinishLoading(WebURLLoader*, double finishTime, int64_t encodedDataLength) override;
     void didFail(WebURLLoader*, const WebURLError&) override;
     void didDownloadData(WebURLLoader*, int, int) override;
 
     const KURL& url() const { return m_request.url(); }
     bool isLoadedBy(ResourceFetcher*) const;
 
-    bool reachedTerminalState() const { return m_state == Terminated; }
     const ResourceRequest& request() const { return m_request; }
 
     bool loadingMultipartContent() const { return m_loadingMultipartContent; }
 
 private:
     // Assumes ResourceFetcher and Resource are non-null.
     ResourceLoader(ResourceFetcher*, Resource*, const ResourceLoaderOptions&);
 
     void init(const ResourceRequest&);
     void requestSynchronously();
@@ skipping 10 matching lines @@
     ResourceRequest m_request;
     ResourceRequest m_originalRequest; // Before redirects.
 
     bool m_notifiedLoadComplete;
 
     bool m_defersLoading;
     bool m_loadingMultipartContent;
     ResourceRequest m_deferredRequest;
     ResourceLoaderOptions m_options;
 
-    enum ResourceLoaderState {
-        Initialized,
-        Finishing,
-        Terminated
-    };
-
     enum ConnectionState {
         ConnectionStateNew,
         ConnectionStateStarted,
         ConnectionStateReceivedResponse,
         ConnectionStateReceivingData,
         ConnectionStateFinishedLoading,
         ConnectionStateCanceled,
         ConnectionStateFailed,
+        ConnectionStateReleased
     };
+    bool isFinishing() { return m_state >= ConnectionStateFinishedLoading && m_state <= ConnectionStateFailed; }
 
     RefPtrWillBeMember<Resource> m_resource;
-    ResourceLoaderState m_state;
 
     // Used for sanity checking to make sure we don't experience illegal state
     // transitions.
-    ConnectionState m_connectionState;
+    ConnectionState m_state;
 };
 
 } // namespace blink
 
 #endif