summaryrefslogtreecommitdiffstats
path: root/Source/WebKit/android/jni/WebIconDatabase.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Handle more favicon decoding error casesJohn Reck2012-05-221-11/+16
| | | | | | | | | | | | | Bug: 6517530 Switch to having webcoreImageToSkBitmap return a pointer instead as it makes dealing with error cases easier. Also add a check to see if SkImageDecoder::DecodeMemory returned true or false, as if it returns false we may have already allocated pixels (so isNull = false), however it might not have valid data or any config Also aggressively check that we have a valid bitmap with a valid config Change-Id: I2a2e856a389d73cdda319eaeaee5d1279a9e2eb6
* Delay creating Java objects for WebHistoryItemJohn Reck2012-05-071-7/+15
| | | | | | Bug: 6447632 Change-Id: Ib2fb66f607dd62ffa2d8acbe5882ad6219413120
* Fix up webkit to reflect Java class renamesJonathan Dixon2012-04-231-3/+3
| | | | | | | | | GeolocationPermissionsClassic CookieManagerClassic WebIconDatabaseClassic WebStorageClassic Change-Id: I3fb125ea286db55c906d80e322b06060464a8bff
* Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGESteve Block2012-01-101-5/+5
| | | | | | | See https://android-git.corp.google.com/g/157519 Bug: 5449033 Change-Id: Icaed25ccf4d689b533101e966e8303810b61b0d4
* Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block2012-01-081-2/+2
| | | | | | | See https://android-git.corp.google.com/g/#/c/157220 Bug: 5449033 Change-Id: I4de9cd9a3bc462c4aead1fbcd4ac0f426556bc59
* Rename LOGV(_IF) to ALOGV(_IF) DO NOT MERGESteve Block2011-10-251-5/+5
| | | | | | | See https://android-git.corp.google.com/g/#/c/143865 Bug: 5449033 Change-Id: I821098330652380686aca9e83222936bd5678970
* 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