summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/loader/archive/android
Commit message (Collapse)AuthorAgeFilesLines
* Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGESteve Block2012-01-031-30/+30
| | | | | | | See https://android-git.corp.google.com/g/156016 Bug: 5449033 Change-Id: I35a9fa5e53a83a9c9a920333a3752dd151fbd3b8
* Only log from notImplemented() in debug buildsSteve Block2011-11-241-0/+1
| | | | | | | | | | | | | | The upstream notImplemented() is only enabled in debug builds. Currently, we use an Android-specific implementation of notImplemented(), which is enabled in all builds. We probably don't want this logging in all builds: logging in debug builds only is sufficient. Also, now that WebKit logging is functional (b/5448972), we don't need an Android-specific implementation of notImplemented(). This patch removes our local edit to address both of these. Change-Id: I07e2e8cb42d99dece1c711508c297d8ae0bdda72
* Merge WebKit at r78450: Fix conflicts due to new ENABLE_WEB_ARCHIVE guardSteve Block2011-05-251-2/+2
| | | | | | | | | | | | | 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
* Fix WebArchiveAndroid loggingSteve Block2011-05-191-28/+28
| | | | Change-Id: I6adc6f64f3833d3bc5016da929ffd1e95930d5c5
* Fix build when WEBARCHIVE is disabledSteve Block2011-05-181-0/+4
| | | | Change-Id: Ibbc124a51f2c58188eb8132a57adc5d87373f25c
* Merge WebKit at r75315: Move Android-specific WebCore files to SourceSteve Block2011-05-122-0/+524
This moves files in the following WebCore subdirectories ... - bindings/js - bindings/v8/custom - plugins/android - platform/android - platform/graphics/android - page/ - css/ - dom/ - loader/archive/android