summaryrefslogtreecommitdiffstats
path: root/Source/WebKit/android/jni/WebIconDatabase.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r82507: IconDatabaseClient interface expandedSteve Block2011-06-081-2/+31
| | | | | | See http://trac.webkit.org/changeset/81719 Change-Id: Ida2b2a8ac767182bc2c93cbe60399ed39f91c99c
* Merge WebKit at r82507: IcondDatabaseBase::iconForPageURL() renamedSteve Block2011-06-081-2/+3
| | | | | | See http://trac.webkit.org/changeset/81484 Change-Id: I72f818d5d0075c63b658c2d8457d2182a7968c05
* Merge WebKit at r82507: IconDatabaseBase::Open() signature changedSteve Block2011-06-081-1/+1
| | | | | | See http://trac.webkit.org/changeset/81824 Change-Id: I2e3b588b7d38211310bd6bf488f1a8d3f6edac5d
* Merge WebKit at r82507: Use icon database through IconDatabaseBaseSteve Block2011-06-081-1/+1
| | | | | | See http://trac.webkit.org/changeset/80900 Change-Id: Ia724c78b9db4665a0c30cc214c2d6fa61e81f888
* Merge WebKit at r80534: Fix IconDatabase uses.Ben Murdoch2011-06-021-10/+10
| | | | | | | | | WebCore::iconDatabase() now returns a reference rather than a pointer. Update our calls to reflect this. See http://trac.webkit.org/changeset/80299 Change-Id: Iebf2f199fd8913e227572753cee2cf3a2e380985
* Merge WebKit at r75993: Move WebKit/android files to SourceBen Murdoch2011-05-161-0/+237
Change-Id: Ifa871f8320bdb3a09fe189fffecc23f702c394b9