summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/platform/MIMETypeRegistry.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r84325: Initial merge by git.Ben Murdoch2011-06-101-4/+4
| | | | Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
* Merge WebKit at r82507: Initial merge by gitSteve Block2011-06-081-0/+41
| | | | Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
* Add image/webp to the mimeType list.Shimeng (Simon) Wang2011-06-021-0/+1
| | | | | | | This will let a webp image url be displayed directly inside browser. issue: 3291572 Change-Id: I6870c5461c5d746d11457b7afba26cb277b25bbb
* Merge WebKit at r78450: Fix conflicts due to new ENABLE_WEB_ARCHIVE guardSteve Block2011-05-251-10/+0
| | | | | | | | | | | | | This replaces, and therefore conflicts with, Android's existing ENABLE_ARCHIVE guard. This change resolves the conflicts by taking the upstream guard in WebCore, updates WebKit to use the new guard, and enables this guard on Android. See http://trac.webkit.org/changeset/78439 See also http://trac.webkit.org/changeset/78342 for FrameLoader.cpp Change-Id: I28ebaf3d69ea4c352ab4cfbf91c33a8ba25f89b5
* Merge WebKit at r78450: Initial merge by git.Steve Block2011-05-241-0/+18
| | | | Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
* Merge WebKit at r75315: Initial merge by git.Steve Block2011-05-121-0/+546
Change-Id: I570314b346ce101c935ed22a626b48c2af266b84