| Index: Source/core/xml/XMLHttpRequest.h
|
| diff --git a/Source/core/xml/XMLHttpRequest.h b/Source/core/xml/XMLHttpRequest.h
|
| index 5a1e5e3ae3568c709b922d3c27a2e30dc59020ed..69b0f07f16b5d2fbddbe6df1cdbcbf055f7c16bd 100644
|
| --- a/Source/core/xml/XMLHttpRequest.h
|
| +++ b/Source/core/xml/XMLHttpRequest.h
|
| @@ -72,9 +72,7 @@ public:
|
| };
|
|
|
| virtual void contextDestroyed();
|
| -#if ENABLE(XHR_TIMEOUT)
|
| virtual void didTimeout();
|
| -#endif
|
| virtual bool canSuspend() const;
|
| virtual void suspend(ReasonForSuspension);
|
| virtual void resume();
|
| @@ -110,10 +108,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 sendForInspector(ExceptionCode&);
|
| void sendForInspectorXHRReplay(PassRefPtr<FormData>, ExceptionCode&);
|
| @@ -146,9 +142,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;
|
| @@ -204,9 +198,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;
|
|
|