summaryrefslogtreecommitdiffstats
path: root/WebCore/loader/cache
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r75315: Initial merge by git.Steve Block2011-05-1224-4762/+0
| | | | Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
* Merge WebKit at r74534: Fix CachedResourceLoader.cppBen Murdoch2011-05-101-1/+1
| | | | | | | | Make upstream changes in our code. See http://trac.webkit.org/changeset/73749 Change-Id: I6764c637cf0c7ed0bf0dabde47488b95c1fa7062
* Merge WebKit at r74534: Initial merge by git.Ben Murdoch2011-05-1011-59/+504
| | | | Change-Id: I6ccd1154fa1b19c2ec2a66878eb675738735f1eb
* Merge WebKit at r72805: Cherry-pick WebKit change 72948Steve Block2011-01-061-0/+1
| | | | | | | | | | | | | | | This fixes CodeGeneratorV8.pm It is a re-commit of 'Merge WebKit at r72274: Fix CodeGeneratorV8.pm', which was inadvertantly removed as part of the initial merge by Git to r72805. See http://trac.webkit.org/changeset/72948 Note that this is a backwards merge from Chromium release 9.0.600.0 to 9.0.597.0, to align with the Chromium 9 stable release branch. Change-Id: Iaa56a5a503aaaf4d996ebc44d66d557d12838cfa
* Merge WebKit at r72805: Initial merge by GitSteve Block2011-01-061-8/+6
| | | | | | | Note that this is a backwards merge from Chromium release 9.0.600.0 to 9.0.597.0, to align with the Chromium 9 stable release branch. Change-Id: I5d2bb4e8cee9d39ae8485abf48bdb55ecf8b3790
* Merge WebKit at r73109: Initial merge by git.Shimeng (Simon) Wang2010-12-228-21/+33
| | | | 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-0212-28/+32
| | | | Change-Id: Ie51f0b4a16da82942bd516dce59cfb79ebbe25fb
* Merge Webkit at r71558: Fix compiling error after a renamingTeng-Hui Zhu2010-11-171-1/+1
| | | | | | http://trac.webkit.org/changeset/71503 Change-Id: I12f477f18630b364b704b28fd63aaf46abb1be9a
* Merge WebKit at r71558: Initial merge by git.Teng-Hui Zhu2010-11-1722-0/+4301
Change-Id: Ib345578fa29df7e4bc72b4f00e4a6fddcb754c4c