diff options
| author | Steve Block <steveblock@google.com> | 2010-09-29 17:32:26 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-09-29 17:35:08 +0100 |
| commit | 68513a70bcd92384395513322f1b801e7bf9c729 (patch) | |
| tree | 161b50f75a5921d61731bb25e730005994fcec85 /WebCore/xml | |
| parent | fd5c6425ce58eb75211be7718d5dee960842a37e (diff) | |
| download | external_webkit-68513a70bcd92384395513322f1b801e7bf9c729.zip external_webkit-68513a70bcd92384395513322f1b801e7bf9c729.tar.gz external_webkit-68513a70bcd92384395513322f1b801e7bf9c729.tar.bz2 | |
Merge WebKit at r67908: Initial merge by Git
Change-Id: I43a553e7b3299b28cb6ee8aa035ed70fe342b972
Diffstat (limited to 'WebCore/xml')
| -rw-r--r-- | WebCore/xml/XMLHttpRequest.cpp | 2 | ||||
| -rw-r--r-- | WebCore/xml/XMLHttpRequest.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/xml/XMLHttpRequest.cpp b/WebCore/xml/XMLHttpRequest.cpp index 9f93e1a..9c7d076 100644 --- a/WebCore/xml/XMLHttpRequest.cpp +++ b/WebCore/xml/XMLHttpRequest.cpp @@ -1061,7 +1061,7 @@ bool XMLHttpRequest::canSuspend() const return !m_loader; } -void XMLHttpRequest::suspend() +void XMLHttpRequest::suspend(ReasonForSuspension) { m_progressEventThrottle.suspend(); } diff --git a/WebCore/xml/XMLHttpRequest.h b/WebCore/xml/XMLHttpRequest.h index d25f63f..ac18828 100644 --- a/WebCore/xml/XMLHttpRequest.h +++ b/WebCore/xml/XMLHttpRequest.h @@ -59,7 +59,7 @@ public: virtual void contextDestroyed(); virtual bool canSuspend() const; - virtual void suspend(); + virtual void suspend(ReasonForSuspension); virtual void resume(); virtual void stop(); |