diff options
| author | Steve Block <steveblock@google.com> | 2010-02-02 18:32:28 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-04 15:07:00 +0000 |
| commit | 8b17ffea299c44342b5479322adcb686277df548 (patch) | |
| tree | 15e53f60ae6227c7a9480fdb0933e1e385e9d4d7 /WebCore/platform/network/ResourceRequestBase.cpp | |
| parent | 2b08bb37d88be143f20b58ad7608aff476ca8a96 (diff) | |
| download | external_webkit-8b17ffea299c44342b5479322adcb686277df548.zip external_webkit-8b17ffea299c44342b5479322adcb686277df548.tar.gz external_webkit-8b17ffea299c44342b5479322adcb686277df548.tar.bz2 | |
Merge webkit.org at r54127 : Fix final trivial merges
Change-Id: Ib24c66a3c609fd1c8ae9697f471a8abc85e5aa33
Diffstat (limited to 'WebCore/platform/network/ResourceRequestBase.cpp')
| -rw-r--r-- | WebCore/platform/network/ResourceRequestBase.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/WebCore/platform/network/ResourceRequestBase.cpp b/WebCore/platform/network/ResourceRequestBase.cpp index adf635c..0a68972 100644 --- a/WebCore/platform/network/ResourceRequestBase.cpp +++ b/WebCore/platform/network/ResourceRequestBase.cpp @@ -390,11 +390,7 @@ void ResourceRequestBase::updateResourceRequest() const m_resourceRequestUpdated = true; } -<<<<<<< HEAD -#if !PLATFORM(MAC) && !USE(CFNETWORK) && !USE(SOUP) && !PLATFORM(CHROMIUM) && !PLATFORM(ANDROID) -======= #if !PLATFORM(MAC) && !USE(CFNETWORK) && !USE(SOUP) && !PLATFORM(CHROMIUM) && !PLATFORM(ANDROID) && !PLATFORM(QT) ->>>>>>> webkit.org at r54127 unsigned initializeMaximumHTTPConnectionCountPerHost() { // This is used by the loader to control the number of issued parallel load requests. |