summaryrefslogtreecommitdiffstats
path: root/WebCore/loader/ResourceLoader.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r72272: Fix conflicts.Russell Brenner2010-12-021-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebCore/Android.v8bindings.mk http://trac.webkit.org/changeset/71802 WebCore/bindings/v8/V8Proxy.cpp http://trac.webkit.org/changeset/71735 WebCore/css/CSSParser.cpp http://trac.webkit.org/changeset/71767 http://trac.webkit.org/changeset/72116 (several APIs purged) WebCore/loader/ResourceLoader.cpp http://trac.webkit.org/changeset/71884 WebCore/platform/graphics/MediaPlayer.cpp http://trac.webkit.org/changeset/72117 WebCore/platform/image-decoders/ImageDecoder.cpp http://trac.webkit.org/changeset/72130 WebCore/rendering/RenderBlockLineLayout.cpp http://trac.webkit.org/changeset/72235 WebCore/rendering/RenderView.cpp http://trac.webkit.org/changeset/71851 Change-Id: If0a3466754b9755c1f4be97bf589f88c48eece0a
* Merge WebKit at r72274: Initial merge by git.Russell Brenner2010-12-021-17/+36
| | | | Change-Id: Ie51f0b4a16da82942bd516dce59cfb79ebbe25fb
* Merge WebKit at r70209: Initial merge by GitBen Murdoch2010-10-261-30/+5
| | | | Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
* Merge WebKit at r67908: Initial merge by GitSteve Block2010-09-291-7/+9
| | | | Change-Id: I43a553e7b3299b28cb6ee8aa035ed70fe342b972
* Merge WebKit at r67178 : Initial merge by git.Iain Merrick2010-09-161-4/+4
| | | | Change-Id: I57e01163b6866cb029cdadf405a0394a3918bc18
* Merge WebKit at r66079 : Initial merge by gitSteve Block2010-09-021-0/+9
| | | | Change-Id: Ie2e1440fb9d487d24e52c247342c076fecaecac7
* Merge WebKit at r61871: Initial merge by git.Kristian Monsen2010-07-021-1/+8
| | | | Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
* Merge Webkit at r58956: Initial merge by Git.Ben Murdoch2010-05-141-0/+8
| | | | Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
* Merge webkit.org at r58033 : Initial merge by gitSteve Block2010-05-111-1/+41
| | | | Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
* Add a new API on the resource loader to pause the current load. We use this ↵Ben Murdoch2010-03-221-0/+9
| | | | | | | | | | | when the plugin cannot accept any more data to prevent WebKit buffering the data that the plugin can't take. This can result in a crash if the buffer gets too big (when watching an HD movie clip in flash, for example). Requires a frameworks/base change. Change-Id: Ibb63d38df1014ff70fa4d65275613cbf3a217c1a
* Merge webkit.org at r54127 : Initial merge by gitSteve Block2010-02-041-1/+1
| | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
* Merge webkit.org at r50258 : Initial merge by git.Steve Block2009-11-101-11/+11
| | | | Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0
* Merge webkit.org at R49305 : Automatic merge by git.Steve Block2009-10-201-2/+3
| | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
* Merge in WebKit r47029.Ben Murdoch2009-08-111-24/+8
|
* auto import from //depot/cupcake/@136594The Android Open Source Project2009-03-051-7/+37
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-0/+446
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-446/+0
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-171-18/+51
|
* external/webkit r30707Upstream1970-01-121-0/+413
generated by cgit v1.1 at 2025-06-01 16:48:48 +0000