summaryrefslogtreecommitdiffstats
path: root/WebCore/loader/loader.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r74534: Fix conflicts.Ben Murdoch2011-05-101-354/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | .gitignore - keep ours Android.mk http://trac.webkit.org/changeset/74431 Parser.cpp http://trac.webkit.org/changeset/74377 ImageDecoder.cpp http://trac.webkit.org/changeset/73819 GraphicsContext.cpp http://trac.webkit.org/changeset/73729 ContextMenuItem.h http://trac.webkit.org/changeset/74028 SVGFontFaceUriElement.h http://trac.webkit.org/changeset/74493 RenderView.h http://trac.webkit.org/changeset/74524 RenderSVGResourceSolidColor.cpp http://trac.webkit.org/changeset/72926 InlineTextBox.cpp http://trac.webkit.org/changeset/73548 SliderThumbElement.cpp RenderSlider.cpp http://trac.webkit.org/changeset/74044 StyleRareInheritedData.cpp|h CSSStyleSelector.cpp CSSParser.cpp http://trac.webkit.org/changeset/73219 RenderBox.h http://trac.webkit.org/changeset/73385 FrameLoader.cpp http://trac.webkit.org/changeset/73486 http://trac.webkit.org/changeset/74426 ResourceLoader.cpp http://trac.webkit.org/changeset/74453 DOMWindow.cpp|h http://trac.webkit.org/changeset/73829 HTMLLinkElement.cpp http://trac.webkit.org/changeset/74476 V8NPUtils.cpp: Do not undo http://trac.webkit.org/changeset/78994 RenderSVGResourceSolidColor.cpp http://trac.webkit.org/changeset/72926 Remove loader.cpp http://trac.webkit.org/changeset/74049 Change-Id: I8e97de5b2237d85310e1005e067f0b3a6b14432f
* Merge WebKit at r73109: Initial merge by git.Shimeng (Simon) Wang2010-12-221-2/+3
| | | | Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8
* Merge WebKit at r72274: Fix CodeGeneratorV8.pmRussell Brenner2010-12-021-0/+1
| | | | | | | | | | Some of the script-generation code puts include statements in source files when they need to be in headers. Cherry-picked from webkit: http://trac.webkit.org/changeset/72948 Change-Id: I07d425bcb97abcdda25b5ff2ea7af887a925f489
* Merge WebKit at r72274: Initial merge by git.Russell Brenner2010-12-021-346/+75
| | | | Change-Id: Ie51f0b4a16da82942bd516dce59cfb79ebbe25fb
* Merge WebKit at r71558: Initial merge by git.Teng-Hui Zhu2010-11-171-7/+7
| | | | Change-Id: Ib345578fa29df7e4bc72b4f00e4a6fddcb754c4c
* Merge WebKit at r70209: Initial merge by GitBen Murdoch2010-10-261-21/+31
| | | | Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
* Merge WebKit at r67178 : Initial merge by git.Iain Merrick2010-09-161-46/+46
| | | | Change-Id: I57e01163b6866cb029cdadf405a0394a3918bc18
* Merge WebKit at r66079 : Initial merge by gitSteve Block2010-09-021-9/+1
| | | | Change-Id: Ie2e1440fb9d487d24e52c247342c076fecaecac7
* Merge WebKit at r63859 : Initial merge by git.Ben Murdoch2010-07-271-1/+1
| | | | Change-Id: Ie8096c63ec7c991c9a9cba8bdd9c3b74a3b8ed62
* Copy back the upstreamed version of prefetchLeon Clarke2010-07-121-7/+1
| | | | | | https://bugs.webkit.org/show_bug.cgi?id=3652 Change-Id: Ibda522afed15e7581019a198e773785b7cad57ca
* Merge WebKit at r59636: Initial merge by gitKristian Monsen2010-05-251-0/+22
| | | | Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91
* Merge webkit.org at r58033 : Initial merge by gitSteve Block2010-05-111-2/+3
| | | | Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
* Link prefetch supportLeon Clarke2010-05-041-8/+23
| | | | http://b/issue?id=2268353
* Merge webkit.org at r54731 : Initial merge by gitSteve Block2010-02-161-0/+1
| | | | Change-Id: Ia79977b6cf3b0b00c06ef39419989b28e57e4f4a
* Merge webkit.org at r54127 : Initial merge by gitSteve Block2010-02-041-3/+8
| | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
* Merge webkit.org at r51976 : Initial merge by git.Steve Block2009-12-171-1/+23
| | | | Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
* Merge webkit.org at R49305 : Automatic merge by git.Steve Block2009-10-201-3/+3
| | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
* Revert "Merge WebKit r47420"Andrei Popescu2009-08-191-2/+2
| | | | This reverts commit d227fc870c7a697500a3c900c31baf05fb9a8524.
* Merge WebKit r47420Ben Murdoch2009-08-181-2/+2
|
* Merge in WebKit r47029.Ben Murdoch2009-08-111-5/+47
|
* Turn on webcore's request management and remove our hacks.Patrick Scott2009-07-151-4/+1
| | | | | | With only turning on request management (no fine tuning of parameters), loading cnn.com was 3-4 seconds faster and the main content displayed about 1-2 seconds sooner.
* Get WebKit r44544.Feng Qian2009-06-171-35/+62
|
* AI 145796: Land the WebKit merge @r42026.Feng Qian2009-04-101-4/+9
| | | | Automated import of CL 145796
* auto import from //depot/cupcake/@136594The Android Open Source Project2009-03-051-19/+14
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-0/+495
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-495/+0
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-171-113/+337
|
* Initial ContributionThe Android Open Source Project2008-10-211-19/+38
|
* external/webkit r30707Upstream1970-01-121-0/+252