summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/platform/network
Commit message (Collapse)AuthorAgeFilesLines
* Cherry-pick WebKit change r87623 to fix use of KURL::prettyURL()Steve Block2012-03-281-2/+2
| | | | | | | | | | | | | | This is a prerequisite for http://trac.webkit.org/changeset/96779 to fix window.location. Note that a conflict occurred in Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp but the change is not required. See http://trac.webkit.org/changeset/87623 Bug: 2159848 Change-Id: I5614b3588f30508f81b562aa7fb2f9027c2bda72
* Drop support for Android HTTP stackSteve Block2012-02-221-7/+0
| | | | | | | | | | | | | All future releases will use the Chromium HTTP stack and maintaining two HTTP stacks adds maintenance overhead. The Chromium HTTP stack requires V8, but we now use V8 in all build targets (b/5495373), so we can safely drop the Android HTTP stack. See corresponding framework change https://android-git.corp.google.com/g/166325. Bug: 5495616 Change-Id: I41117b6750fbc1c84cbd4a5951b0d1a457354f93
* Fix comments for willLoadFromCache()Steve Block2012-02-212-4/+1
| | | | | | | This method is used by both the Android and Chromium HTTP stacks, so does not always call through to Java. Change-Id: I55a2ecd2db8ee29815048d217a9b0a2f4824750e
* Merge WebKit at r84325: Initial merge by git.Ben Murdoch2011-06-1030-433/+1122
| | | | Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
* Merge WebKit at r82507: Initial merge by gitSteve Block2011-06-0833-696/+1008
| | | | Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
* Merge WebKit at r80534: Fix conflicts.Ben Murdoch2011-06-022-19/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android.jscbindings.mk 79223 Conflict due to http://trac.webkit.org/changeset/79223 Android.mk Conflicts due to http://trac.webkit.org/changeset/79825 and http://trac.webkit.org/changeset/79978 Android.v8bindings.mk 80367 Conflicts due to http://trac.webkit.org/changeset/80103 and http://trac.webkit.org/changeset/80367 HTMLMediaElement.cpp Conflicts due to http://trac.webkit.org/changeset/80030 and local TOUCH_EVENTS modifications. HTMLDocumentParser.cpp Conflict due to http://trac.webkit.org/changeset/79772 and local ANDROID_INSTRUMENT modifications. CachedResourceLoader.cpp|h Conflicts due to http://trac.webkit.org/changeset/78602 and ANDROID_BLOCK_NETWORK_IMAGE. MemoryCache.h Conflicts due to http://trac.webkit.org/changeset/78848 and ANDROID_INSTRUMENT. FrameView.cpp Conflict due to http://trac.webkit.org/changeset/78928 and locally added updatePositionedObjects function. NetworkStateNotifier JobjectWrapper.cpp Git seems to have got confused with a rename here in JobjectWrapper.cpp, keep ours. Conflicts due to http://trac.webkit.org/changeset/79563 and local Android additions. PluginViewNone.cpp 79904 Conflicts due to http://trac.webkit.org/changeset/79904 and local cherry pick of http://trac.webkit.org/changeset/79988 RenderBox.cpp Conflicts due to http://trac.webkit.org/changeset/79467 and local android modifications. Change-Id: I98bd80de86b5169212da137ad3df42c1c35e8931
* Merge WebKit at r80534: Intial merge by GitBen Murdoch2011-06-0241-978/+768
| | | | Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
* Merge WebKit at r78450: Initial merge by git.Steve Block2011-05-2454-5133/+692
| | | | Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
* Merge WebKit at r76408: Initial merge by git.Ben Murdoch2011-05-2311-27/+88
| | | | Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
* Merge WebKit at r75993: Initial merge by git.Ben Murdoch2011-05-167-35/+98
| | | | Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
* Merge WebKit at r75315: Initial merge by git.Steve Block2011-05-12197-0/+28998
Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
generated by cgit v1.1 at 2024-08-02 11:48:48 +0000