summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/platform/android
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r78450: Fix remaining conflictsSteve Block2011-05-251-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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: Initial merge by git.Steve Block2011-05-241-0/+12
| | | | Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
* Merge WebKit at r76408: Update Uses of Noncopyable/FastAllocBaseBen Murdoch2011-05-232-1/+3
| | | | | | | | | | | | | | | | Upstream now uses macros rather than inheritance for classes declard Noncopyable or Fast Allocated. Note that in the case of PluginTimer and ClipboardAndroid we now need to explicitly declare them fast allocated. This is because previously they got the fast allocated methods through a common superclass (FastAllocBase) but now both parents provide implementations, so there is an ambiguity the compiler cannot resolve. See http://trac.webkit.org/changeset/76248 Change-Id: I186e3fd36bde2074d34f453983d48e8fc223f420
* Merge WebKit at r76408: Initial merge by git.Ben Murdoch2011-05-231-1/+1
| | | | Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
* Merge WebKit at r75993: Fix TemporaryLinkStubs.cppBen Murdoch2011-05-161-6/+0
| | | | | | | PasteBoard destructor has been removed. See http://trac.webkit.org/changeset/75523 Change-Id: I9beec1cca66e84c5459b0f0f29a25902f7a9fced
* Merge WebKit at r75993: Fix RenderThemeAndroid.cppBen Murdoch2011-05-161-0/+1
| | | | | | | PaintInfo.h include was removed from RenderObject.h in http://trac.webkit.org/changeset/75837 Change-Id: I4347c028ea55506096b658206b04e96d158c08d3
* Merge WebKit at r75993: Initial merge by git.Ben Murdoch2011-05-161-4/+4
| | | | Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
* Merge WebKit at r75315: Stub out AXObjectCache::remove()Steve Block2011-05-131-0/+5
| | | | | | See http://trac.webkit.org/changeset/75031 Change-Id: I1158a8086e2b184f5728eb1ea3d6344af4fee162
* Merge WebKit at r75315: Move Android-specific WebCore files to SourceSteve Block2011-05-124-0/+281
| | | | | | | | | | | | | 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-1229-0/+4305
Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
generated by cgit v1.1 at 2024-08-30 01:10:46 +0000