summaryrefslogtreecommitdiffstats
path: root/Source/WebKit/android/jni
Commit message (Collapse)AuthorAgeFilesLines
* Fix reboot loop on master ToTKristian Monsen2011-05-311-1/+1
| | | | Change-Id: I34534273f70c1fe32b83f994808de03616c85922
* Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn't ↵Kristian Monsen2011-05-311-4/+5
| | | | | | | | | | | | | | | bypass proxy Passing the extra string argument, blacklist, to the proxy in chromium. Need CL in frameworks/base: https://android-git.corp.google.com/g/#change,112400 And external/chromium: https://android-git.corp.google.com/g/#change,111832 Change-Id: Ie8ca84b5ebf9701391dbd8a5097638e24ac2cb85
* Merge "Fix the way we maintain the list of Pictures in PictureSet. This ↵Nicolas Roard2011-05-253-106/+195
|\ | | | | | | improves drawing performances on the base surface by a decent amount."
| * Fix the way we maintain the list of Pictures in PictureSet.Nicolas Roard2011-05-243-106/+195
| | | | | | | | | | | | | | This improves drawing performances on the base surface by a decent amount. Change-Id: I59b63c0e5748eed2c729024c11a5da390faefda7
* | Merge "merge from honeycomb mr2"Russell Brenner2011-05-251-5/+5
|\ \
| * | merge from honeycomb mr2Russell Brenner2011-05-251-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move check for pending style recalc The previous implementation had no way to notify the caller as to whether or not the recording was successful. Now, recordContent detects the pending recalc and returns null to indicate that no recording was done. bug: 4474358 Change-Id: I511d6f1118c0a122ee893167311f3cc82f2cbf7e
* | | Merge WebKit at r78450: FrameLoader::url() removedSteve Block2011-05-251-3/+2
| | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/76872 Change-Id: I54790419f4e3b7dcd1e6123d6ff4bda8d7997066
* | | Merge WebKit at r78450: IntRect::bottom()/right() renamedSteve Block2011-05-251-12/+12
| | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/77286 and http://trac.webkit.org/changeset/77398 Change-Id: I0ae670bff327fb981e037f5394c55bfb4aeb81eb
* | | Merge WebKit at r78450: Fix remaining conflictsSteve Block2011-05-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Document.cpp Conflict due to AX object cache disabled on Android See http://trac.webkit.org/changeset/78314 - CachedResourceLoader.cpp/h Conflict due to ANDROID_BLOCK_NETWORK_IMAGE See http://trac.webkit.org/changeset/76701 - Source/WebCore/page/ChromeClient.h Conflict due to ANDROID_INSTALLABLE_WEB_APPS See http://trac.webkit.org/changeset/77509 - FrameView.cpp Conflict due to Android FrameView::updatePositionedObjects() See http://trac.webkit.org/changeset/77274 - ScrollView.h Conflict due to Android ScrollView::actualWidth/Height/ScrollX/ScrollY() See http://trac.webkit.org/changeset/76831 - TemporaryLinkStubs.cpp and MIMETypeRegistry.cpp conflict due to Android stubbed out MIMETypeRegistry::getMIMETypeForExtension() See http://trac.webkit.org/changeset/77368 and https://android-git.corp.google.com/g/#change,37272 - ImageDecoder.cpp Conflict due to Android excluding code See http://trac.webkit.org/changeset/77427 - ImageDecoder.h Conflict due to ANDROID guard upstreamed as SKIA guard See http://trac.webkit.org/changeset/77946 - InlineTextBox.cpp Conflict due to ANDROID_DISABLE_ROUNDING_HACKS See http://trac.webkit.org/changeset/76743 and http://trac.webkit.org/changeset/77286 - RenderBlockLineLayout.cpp Conflict due to ANDROID_LAYOUT See http://trac.webkit.org/changeset/77062 Change-Id: Ide4d58dc52418b8fc1a965a9524eb57cd46b4859
* | | Merge WebKit at r78450: Fix conflicts due to new ENABLE_WEB_ARCHIVE guardSteve Block2011-05-251-8/+5
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | 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 r76408: Fix calls to RenderLayer::scrollToOffset()Ben Murdoch2011-05-231-1/+1
|/ | | | | | | | As of http://trac.webkit.org/changeset/76291 RenderLayer::scrollToOffset only takes two parameters (the x and y offset). Update our callsites to reflect this. It seems safe to disregard the booleans. Change-Id: I63bc103e4fc961968055770792aead82be82435a
* Merge Chromium at 10.0.621.0: CookieList moved out of CookieMonsterKristian Monsen2011-05-201-2/+2
| | | | | | | Upstream CL: http://src.chromium.org/viewvc/chrome/trunk/src/net/http/http_cache.h?view=diff&r1=69413&r2=69414 Change-Id: I618b42f163c0a4cf329fe6fb95be4b86bca8f202
* Fix build when WEBARCHIVE is disabledSteve Block2011-05-181-1/+1
| | | | Change-Id: Ibbc124a51f2c58188eb8132a57adc5d87373f25c
* Merge WebKit at r75993: Fix uses of cache() functionBen Murdoch2011-05-162-7/+7
| | | | | | | WebCore::cache() is renamed to WebCore::memoryCache() See http://trac.webkit.org/changeset/75857 Change-Id: Id102b534c784191461a4d077058e5c25d5741d57
* Merge WebKit at r75993: Move WebKit/android files to SourceBen Murdoch2011-05-1636-0/+13718
Change-Id: Ifa871f8320bdb3a09fe189fffecc23f702c394b9
generated by cgit v1.1 at 2024-09-22 20:40:53 +0000