summaryrefslogtreecommitdiffstats
path: root/WebCore/platform/android/TemporaryLinkStubs.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r75315: Initial merge by git.Steve Block2011-05-121-490/+0
| | | | Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
* Merge WebKit at r74534: Initial merge by git.Ben Murdoch2011-05-101-2/+1
| | | | Change-Id: I6ccd1154fa1b19c2ec2a66878eb675738735f1eb
* Merge Webkit at r71558: Fix conflicts.Teng-Hui Zhu2010-11-171-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebCore/loader/FrameLoader.cpp http://trac.webkit.org/changeset/70960 http://trac.webkit.org/changeset/70971 WebCore/css/CSSStyleSelector.cpp http://trac.webkit.org/changeset/71218 WebCore/css/CSSParser.cpp http://trac.webkit.org/changeset/71218 WebCore/html/HTMLLinkElement.cpp http://trac.webkit.org/changeset/71159 WebCore/platform/android/PlatformBridge.h http://trac.webkit.org/changeset/71484 WebCore/platform/android/TemporaryLinkStubs.cpp http://trac.webkit.org/changeset/71484 WebCore/rendering/RenderTableSection.cpp http://trac.webkit.org/changeset/71382 http://trac.webkit.org/changeset/71251 WebCore/rendering/RenderLayer.cpp http://trac.webkit.org/changeset/71536 WebCore/rendering/RenderTable.cpp http://trac.webkit.org/changeset/71382 WebCore/Android.v8bindings.mk http://trac.webkit.org/changeset/71515 WebCore/bindings/scripts/CodeGeneratorV8.pm http://trac.webkit.org/changeset/71227 http://trac.webkit.org/changeset/71230 Change-Id: I3ad8c6bc6e36c90aedebedf915a8614b2c786550
* Merge WebKit at r71558: Initial merge by git.Teng-Hui Zhu2010-11-171-0/+3
| | | | Change-Id: Ib345578fa29df7e4bc72b4f00e4a6fddcb754c4c
* Merge Webkit at r70949: moved stub to right namespaceJohn Reck2010-11-091-1/+5
| | | | | | Cherry pick of http://trac.webkit.org/changeset/71346 Change-Id: Id64a084c3e0e74e5b9ec7c0c22141b46b044097d
* Merge Webkit at r70949: Initial merge by git.John Reck2010-11-091-0/+6
| | | | Change-Id: I77b8645c083b5d0da8dba73ed01d4014aab9848e
* Merge Webkit at r70209: defaultLanguage has been renamed.Ben Murdoch2010-10-261-1/+1
| | | | | | | It is now known as defaultPlatformLanguage. See http://trac.webkit.org/changeset/70095 Change-Id: I523e93e78317a2e365429a8027967aa46d0370fa
* Merge WebKit at r67178 : Initial merge by git.Iain Merrick2010-09-161-1/+1
| | | | Change-Id: I57e01163b6866cb029cdadf405a0394a3918bc18
* Merge Webkit at r65072 : Fix conflicts.Ben Murdoch2010-08-131-10/+0
| | | | | | | | | | | | HTMLInputElement.cpp: New include. See http://trac.webkit.org/changeset/64616 TemporaryLinkStubs.cpp, Navigator.h: Relocation of string forwarders. See http://trac.webkit.org/changeset/65021 GraphicsContext.h, ImageSource.h: addition of WebCore namespace on Chromium's NativeImagePtr type. See http://trac.webkit.org/changeset/64584 Platform.h: Renaming of iPhone PLATFORM macros. See http://trac.webkit.org/changeset/64798 Change-Id: Ife412e30f733fe6bb66321a3600814d6499ddf70
* Merge WebKit at r65072 : Initial merge by git.Ben Murdoch2010-08-121-0/+10
| | | | Change-Id: Ibcf418498376b2660aacb7f8d46ea7085ef91585
* Merge Webkit at r63859 : The static AccessibilityObject::getAttribute(Node*, ↵Ben Murdoch2010-07-271-6/+0
| | | | | | | | const QualfiedName&) function has been removed. See http://trac.webkit.org/changeset/63358 Change-Id: I89c6a0a98d04f0a0cd40492229fa03f2e9782622
* Merge Webkit at r63859 : PluginWidget class has been renamed and moved to ↵Ben Murdoch2010-07-271-5/+0
| | | | | | WebKit. See http://trac.webkit.org/changeset/63638 Change-Id: I97784c98b694f28804421637716afa649aa09a6e
* Merge webkit.org at r60469 : Fix conflicts.Leon Clarke2010-06-081-48/+1
| | | | | | | The changes to DomWindow.cpp are needed by @60104 moving things from the frame to the FrameView http://trac.webkit.org/changeset/60104 Change-Id: I8a7aa0478c2f0239bc52bb5078c446e5c8c84972
* Merge webkit.org at r60469 : Initial merge by git.Leon Clarke2010-06-081-0/+6
| | | | Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234
* Merge webkit.org at r58033 : Provide link stub for ↵Steve Block2010-05-111-0/+6
| | | | | | | | | | | AccessibilityObject::getAttribute This is used in RenderMenuList. Neither implementation nor call site are guarded with HAVE(ACCESSIBILITY) but Android does not compile any accessibility code. See http://trac.webkit.org/changeset/55425 Change-Id: I3e94a80052287d38c6266e4f01b1b31b127e7781
* Merge webkit.org at r58033 : Initial merge by gitSteve Block2010-05-111-3/+2
| | | | Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
* Add on-demand plugin support.Patrick Scott2010-03-231-0/+5
| | | | | | | | | | | | | | | | The Settings object now has an on-demand flag for plugins (this was to avoid more edits to webkit code). If plugins are on-demand and a plugin is installed that can handle the content, insert a placeholder widget. If the user clicks on the placeholder, the plugin will be enabled. The widget currently does not clip the context correctly. It only clips based on the widget frame. This is due to a bug (already filed) where the scroll offset is producing bad clip rectangles. Requires a framework change. Bug: 2411524 Change-Id: If3931da8da2339a2385ae78b609c49fa069892ab
* Cherry-pick WebKit change 53497 to rename jni_utility and ↵Steve Block2010-01-201-1/+1
| | | | | | | | | | | jni_utility_private to JNIUtility and JNIUtilityPrivate See http://trac.webkit.org/changeset/53497 This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge. This change required updating headers in Android-specific files in WebCore and WebKit. Change-Id: I4b80eb3eadcff66cbd261aa6ccef0f37927250b1
* Call into MimeTypeMap to get the mime type for an extension.Patrick Scott2010-01-131-7/+0
| | | | | | | | | Use the default method to obtain the content type of a plugin. Implement extension to mime type by calling into the java map. Requires a small change to the webkit package. Bug: 2368893
* Merge webkit.org at r51976 : Icon::createIconForFile has been removed.Steve Block2009-12-171-6/+0
| | | | | | See http://trac.webkit.org/changeset/50632 Change-Id: I3b10aff021d89b66d4d3d5f52773e4922654fbfa
* Moves JSC-specific functions from jni_utility and moves them to a new ↵Steve Block2009-12-071-2/+2
| | | | | | | | jsc/jni_utility_private.h. See https://bugs.webkit.org/show_bug.cgi?id=32157 Change-Id: I1f7f0bb6fa9e72ee3eeb31160e0a828b3d076fee
* Merge webkit.org at r50258 : Initial merge by git.Steve Block2009-11-101-17/+16
| | | | Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0
* Merge webkit.org at R49305 : Automatic merge by git.Steve Block2009-10-201-0/+5
| | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
* Fixes a bunch of WebKit whitespace discrepancies between Android and ↵Steve Block2009-10-141-1/+1
| | | | | | | | webkit.org. Do not merge. This will avoid noise in the diffs when upstreaming Android-specific changes to webkit.org. This has already been submitted to master branch.
* File upload.Leon Scroggins2009-10-091-12/+0
| | | | | | | | Webkit implementation for passing in the data for file uploads. Requires a change to frameworks/base to not break things; also requires a change to packages/apps/Browser to work. Fixes http://b/issue?id=675743
* fix JSC support.Andrei Popescu2009-08-191-112/+2
|
* Fix first set of linker errors.Ben Murdoch2009-08-171-10/+0
|
* Merge in WebKit r47029.Ben Murdoch2009-08-111-20/+26
|
* Merge commit 'goog/master' into webkit_mergeFeng Qian2009-06-181-16/+0
|\ | | | | | | | | | | | | | | Resolved conflicts: WebCore/Android.mk WebCore/storage/LocalStorageArea.h WebCore/storage/SessionStorageArea.cpp WebCore/storage/StorageEvent.cpp
| * cherry-pick 0f07938f7e51e7a7eb4239b8a30e64b68dac8c66 due to automerger snafuGrace Kloba2009-06-161-16/+0
| |
* | Get WebKit r44544.Feng Qian2009-06-171-9/+10
|/
* Fix some minor issues from webkit review feedbacks.Feng Qian2009-06-111-1/+1
|
* Fix more issues for upstreamingFeng Qian2009-06-101-303/+22
| | | | | | Moved string localization functions into LocalizedStringsAndroid.cpp Removed unused functions. See https://bugs.webkit.org/show_bug.cgi?id=26266
* Fix SVG build with V8.Feng Qian2009-05-061-35/+0
| | | | | | Because some SVG anomation source files depend on generic sort functions, we cannot compile them. Add as ENABLE_SVG_ANIMATION build flag to disable SVG Animation.
* add svg support to v8 experimentCary Clark2009-05-011-0/+34
|
* Merges p9 CLs 144856 and 145055 to GIT to enable the Database API in the ↵Ben Murdoch2009-04-301-8/+0
| | | | browser.
* Make WebCore built with V8.Feng Qian2009-04-241-1/+9
| | | | Picked up several new files from Chrome port.
* auto import from //depot/cupcake/@136594The Android Open Source Project2009-03-051-25/+24
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-0/+965
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-965/+0
|
* auto import from //branches/cupcake/...@127101The Android Open Source Project2009-01-201-143/+627
|
* auto import from //branches/cupcake/...@126645The Android Open Source Project2009-01-151-16/+24
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-171-23/+206
|
* Initial ContributionThe Android Open Source Project2008-10-211-0/+290