diff options
| author | Steve Block <steveblock@google.com> | 2009-11-05 18:34:51 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-11-10 22:41:13 +0000 |
| commit | 3f60c26c3fa9dc89d57ef4db083a4f13ef86c103 (patch) | |
| tree | 81c16accd4c9b2b2e4e29ec18b9e5fa7eb37ed93 /WebCore/platform/network | |
| parent | cac0f67c402d107cdb10971b95719e2ff9c7c76b (diff) | |
| download | external_webkit-3f60c26c3fa9dc89d57ef4db083a4f13ef86c103.zip external_webkit-3f60c26c3fa9dc89d57ef4db083a4f13ef86c103.tar.gz external_webkit-3f60c26c3fa9dc89d57ef4db083a4f13ef86c103.tar.bz2 | |
Merge webkit.org at r50258 : Fix conflicts.
Note that FrameLoader::gotoAnchor has been moved to FramveView::gotoAnchor.
See http://trac.webkit.org/changeset/49608
Change-Id: Ic2a87bb0c0f91d371508578ddccf200967524a77
Diffstat (limited to 'WebCore/platform/network')
| -rw-r--r-- | WebCore/platform/network/ResourceRequestBase.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/WebCore/platform/network/ResourceRequestBase.cpp b/WebCore/platform/network/ResourceRequestBase.cpp index 8ab72c1..936f26b 100644 --- a/WebCore/platform/network/ResourceRequestBase.cpp +++ b/WebCore/platform/network/ResourceRequestBase.cpp @@ -378,11 +378,7 @@ void ResourceRequestBase::updateResourceRequest() const m_resourceRequestUpdated = true; } -<<<<<<< HEAD:WebCore/platform/network/ResourceRequestBase.cpp -#if !PLATFORM(MAC) && !USE(CFNETWORK) && !USE(SOUP) && !PLATFORM(ANDROID) -======= -#if !PLATFORM(MAC) && !USE(CFNETWORK) && !USE(SOUP) && !PLATFORM(CHROMIUM) ->>>>>>> webkit.org at r50258.:WebCore/platform/network/ResourceRequestBase.cpp +#if !PLATFORM(MAC) && !USE(CFNETWORK) && !USE(SOUP) && !PLATFORM(CHROMIUM) && !PLATFORM(ANDROID) unsigned initializeMaximumHTTPConnectionCountPerHost() { // This is used by the loader to control the number of issued parallel load requests. |