Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1588)

Unified Diff: Source/core/xml/XMLHttpRequest.h

Issue 14246006: Implementing timeout support for XHR (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@timeoutResourceHandle
Patch Set: Rebased patch Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/xml/XMLHttpRequest.h
diff --git a/Source/core/xml/XMLHttpRequest.h b/Source/core/xml/XMLHttpRequest.h
index f821c2eaa899eb4002267409b846e4571afee718..8a6cbe5c44bfc9dcb327f9091dd3b56015fbb3d5 100644
--- a/Source/core/xml/XMLHttpRequest.h
+++ b/Source/core/xml/XMLHttpRequest.h
@@ -71,9 +71,7 @@ public:
};
virtual void contextDestroyed();
-#if ENABLE(XHR_TIMEOUT)
virtual void didTimeout();
-#endif
virtual bool canSuspend() const;
virtual void suspend(ReasonForSuspension);
virtual void resume();
@@ -109,10 +107,8 @@ public:
Document* optionalResponseXML() const { return m_responseDocument.get(); }
Blob* responseBlob(ExceptionCode&);
Blob* optionalResponseBlob() const { return m_responseBlob.get(); }
-#if ENABLE(XHR_TIMEOUT)
unsigned long timeout() const { return m_timeoutMilliseconds; }
void setTimeout(unsigned long timeout, ExceptionCode&);
-#endif
void sendFromInspector(PassRefPtr<FormData>, ExceptionCode&);
@@ -144,9 +140,7 @@ public:
DEFINE_ATTRIBUTE_EVENT_LISTENER(loadend);
DEFINE_ATTRIBUTE_EVENT_LISTENER(loadstart);
DEFINE_ATTRIBUTE_EVENT_LISTENER(progress);
-#if ENABLE(XHR_TIMEOUT)
DEFINE_ATTRIBUTE_EVENT_LISTENER(timeout);
-#endif
using RefCounted<XMLHttpRequest>::ref;
using RefCounted<XMLHttpRequest>::deref;
@@ -201,9 +195,7 @@ private:
String m_mimeTypeOverride;
bool m_async;
bool m_includeCredentials;
-#if ENABLE(XHR_TIMEOUT)
unsigned long m_timeoutMilliseconds;
-#endif
RefPtr<Blob> m_responseBlob;
RefPtr<ThreadableLoader> m_loader;

Powered by Google App Engine
This is Rietveld 408576698