summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/loader
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r78450: Fix remaining conflictsSteve Block2011-05-252-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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-256-95/+7
| | | | | | | | | | | | | 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-2433-157/+349
| | | | Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
* Merge WebKit at r76408: Initial merge by git.Ben Murdoch2011-05-2338-99/+234
| | | | Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
* Remove some superfluous ARCHIVE enable guardsSteve Block2011-05-192-6/+0
| | | | | | | | | | | A new WEB_ARCHIVE enable guard will be added upstream in http://trac.webkit.org/changeset/78439, replacing our downstream ARCHIVE guard. This patch removes a couple of instances of the downstream guard that are not required and hence will not be replaced by the upstream guard. Change-Id: Ibc8ca754617e8b34fd8563f6f3b9fa671e871f23
* 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 r75993: Initial merge by git.Ben Murdoch2011-05-1621-240/+229
| | | | Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
* 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
* Merge WebKit at r75315: Initial merge by git.Steve Block2011-05-12138-0/+32595
Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
generated by cgit v1.1 at 2025-05-29 20:54:19 +0000