summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/loader/DocumentLoader.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Remove some superfluous ARCHIVE enable guardsSteve Block2011-05-191-4/+0
| | | | | | | | | | | A new WEB_ARCHIVE enable guard will be added upstream in http://trac.webkit.org/changeset/78439, replacing our downstream ARCHIVE guard. This patch removes a couple of instances of the downstream guard that are not required and hence will not be replaced by the upstream guard. Change-Id: Ibc8ca754617e8b34fd8563f6f3b9fa671e871f23
* Merge WebKit at r75315: Initial merge by git.Steve Block2011-05-121-0/+840
Change-Id: I570314b346ce101c935ed22a626b48c2af266b84