summaryrefslogtreecommitdiffstats
path: root/WebCore/Android.mk
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r65615 : Fix Makefiles.Iain Merrick2010-08-231-0/+1
| | | | | | | WebkitTools/Scripts/create-html-entity-table was added in http://trac.webkit.org/changeset/65351. Change-Id: Iff5c7aaa13e79f3666ef4176ca12d284c985b005
* Merge WebKit at r65615 : Fix conflicts.Iain Merrick2010-08-231-8/+0
| | | | | | | | | | Removing call to Geolocation::stop(), which was lost in the merge with http://trac.webkit.org/changeset/65416 We may still have memory leaks here. This is being tracked in https://bugs.webkit.org/show_bug.cgi?id=39288 Change-Id: I69b75bf07775536ac603a450dbde8c2935c4db16
* Merge WebKit at r65615 : Initial merge by git.Iain Merrick2010-08-231-1/+16
| | | | Change-Id: Ifbf384f4531e3b58475a662e38195c2d9152ae79
* Merge Webkit at r65072 : Fix Makefiles.Ben Murdoch2010-08-121-4/+3
| | | | Change-Id: I2da1ae98ee39f7f817d4b4363140872b931ac8bf
* Merge WebKit at r65072 : Initial merge by git.Ben Murdoch2010-08-121-8/+26
| | | | Change-Id: Ibcf418498376b2660aacb7f8d46ea7085ef91585
* Merge WebKit at r64523 : Provide PopupMenuAndroid and related ChromeClient ↵Steve Block2010-08-091-2/+0
| | | | | | | | methods See http://trac.webkit.org/changeset/64513 Change-Id: I9f55ae27989f7a246c0c1e5f771677c66a9b1556
* Merge WebKit at r64523 : Fix other conflictsSteve Block2010-08-091-6/+0
| | | | | | | | | | | | | | | | | | | | | - WebCore/Android.mk Conflict due to error introduced upstream. See http://trac.webkit.org/changeset/64344/trunk/WebCore/Android.mk and http://trac.webkit.org/changeset/60228/trunk/WebCore/Android.mk - WebCore/html/HTMLFrameSetElement.cpp Conflict due to ANDROID_FLATTEN_FRAMESET See http://trac.webkit.org/changeset/64383 - WebCore/page/Navigator.h Conflict due to APPLICATION_INSTALLED See http://trac.webkit.org/changeset/64371 - WebCore/rendering/SVGResourcesCycleSolver.cpp Conflict due to local ENABLE(FILTERS) guard See http://trac.webkit.org/changeset/64440 Change-Id: Ibafe3b92117c3a7b3eaaa44c6cf3d04c8c6027c2
* Merge WebKit at r64523 : Initial merge by git.Steve Block2010-08-091-2/+10
| | | | Change-Id: Ibb796c6802e757b1d9b40f58205cfbe4da95fcd4
* Merge Webkit at r64264 : Fix Makefiles.Kristian Monsen2010-08-041-0/+2
| | | | Change-Id: Ie4783363cff9eb7f70d6bbfec1a6237b5f5a72b5
* Merge WebKit at r64264 : Initial merge by git.Kristian Monsen2010-08-041-0/+4
| | | | Change-Id: Ic42bef02efef8217a0f84c47176a9c617c28d1f1
* Merge Webkit at r63859 : SVG code now required ImageBuffer::transformColorSpace,Ben Murdoch2010-07-271-0/+1
| | | | | | | so add it and stub out platformTransformColorSpace. See http://trac.webkit.org/changeset/63450 Change-Id: I2c84c13a19b1a787b0edbfb9fcefd08acd9ed6ff
* Merge Webkit at r63859 : Fix Makefiles.Ben Murdoch2010-07-271-0/+2
| | | | Change-Id: I5a218be0b26003f4fceb964e7add0f1eda410710
* Merge WebKit at r63859: Fix conflicts.Ben Murdoch2010-07-271-3/+0
| | | | | | | | | | | | html/HTMLCanvasElement.h due to http://trac.webkit.org/changeset/63502 html/HTMLLinkElement.cpp due to http://trac.webkit.org/changeset/63622 Android.mk and WebCore/Android.mk due to http://trac.webkit.org/changeset/63735 WebCore/page/Settings.cpp|h due to http://trac.webkit.org/changeset/63537 WebCore/page/EventHandler.cpp|h due to http://trac.webkit.org/changeset/63807 WebCore/Android.jscbindings.mk due to http://trac.webkit.org/changeset/63193 WebCore/platform/network/ResourceHandle.h due to http://trac.webkit.org/changeset/63332 Change-Id: I03c929b97550014373f044f56c248040b66118f0
* Merge WebKit at r63859 : Initial merge by git.Ben Murdoch2010-07-271-0/+9
| | | | Change-Id: Ie8096c63ec7c991c9a9cba8bdd9c3b74a3b8ed62
* Merge Webkit at r63173 : Fix Makefiles.Leon Clarke2010-07-201-6/+6
| | | | | | | | | | | Note that MathML tags and attribute names are now generated, and SVG tags and attribute names are always generated. This is because the HTML5 parser relies on knowing about the tags even if the features are disabled. See https://bugs.webkit.org/show_bug.cgi?id=42050 https://bugs.webkit.org/show_bug.cgi?id=42059 Change-Id: Ie8b66217989673f90ffc61aabf499ab91a6a6bd1
* Merge WebKit at r63173 : Initial merge by git.Leon Clarke2010-07-201-1/+3
| | | | Change-Id: Ife5af0c7c6261fbbc8ae6bc08c390efa9ef10b44
* Implements the lastHyphenLocation for Android.Shimeng (Simon) Wang2010-07-121-1/+1
| | | | | | | | | | | | | Upstream webkit implemented the hyphenation working draft http://www.w3.org/TR/2010/WD-css3-gcpm-20100608/#hyphenation in: http://trac.webkit.org/changeset/61548 This change implements the interface function for Android. English only support for now. Issue: 2672163 Change-Id: I6763adc0ff56de1431bdb09e79b110b30bac01d1
* Browser save page as web archive.Elliott Slaughter2010-07-121-0/+7
| | | | Change-Id: Ie92953142ed31fc859975289a978172bdb8b6d79
* Merge WebKit at r62496: Fix MakefilesSteve Block2010-07-091-0/+2
| | | | | | New files added in http://trac.webkit.org/changeset/62215 Change-Id: I8fd5b51f0c38396060fac61d64bc8d159e234a5d
* Merge WebKit at r62496: Initial merge by gitSteve Block2010-07-091-1/+10
| | | | Change-Id: Ie3da0770eca22a70a632e3571f31cfabc80facb2
* Merge WebKit at r61871: Update makefilesKristian Monsen2010-07-021-20/+4
| | | | Change-Id: I85e597beedb768af8d3cf4aa269ecdeb2af9a113
* Merge WebKit at r61871: Initial merge by git.Kristian Monsen2010-07-021-6/+34
| | | | Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
* Support complex scripts by calling Harfbuzz APIs.claireho2010-06-181-0/+6
| | | | | | | | | Ported the Chrome complex script suppport to Android. The Harfbuzz libary is built optionally. If the Harfbuzz is not included, we swicth back to default webkit complex script logic - it does not work correctly, but at least webkit won't be crash. Change-Id: I53cd81c82cc4c6a550bcc0f4fe5870f641a881ac
* Merge webkit.org at r61121: Fix Makefiles.Ben Murdoch2010-06-181-2/+7
| | | | Change-Id: Ief303a7cc7e10561e016ffe7b737dc94cc852a61
* Merge webkit.org at r61121: Fix conflicts.Ben Murdoch2010-06-181-4/+1
| | | | | | | | | | | | | | | | | | | | | | Fix conflicts due to addition of m_pageinateDuringLayoutEnabled in Settings.cpp|h See http://trac.webkit.org/changeset/60509 Fix conflicts in ImageSource.h due to new functions being added in the same spot as an un upstreamed Android addition. See http://trac.webkit.org/changeset/60927 Fix conflicts due to addition of !PLATFORM(CAIRO) to guard Android has changed and not upstreamed. See http://trac.webkit.org/changeset/60760 Fix conflicts due to a variable renaming colliding with an Android ifdef which is not upstream. See http://trac.webkit.org/changeset/61106 Fix conflicts due to Android IDB makefile fix collising with addition of new IDB file. See http://trac.webkit.org/changeset/61120 Fix conflicts due to un-upstreamed makefile edits colliding with an upstream change. See http://trac.webkit.org/changeset/61000 Change-Id: I330e08850b96d7c9fb1d093663c5847b9140683d
* Merge webkit.org at r61121: Initial merge by git.Ben Murdoch2010-06-161-7/+15
| | | | Change-Id: Icd6db395c62285be384d137164d95d7466c98760
* Merge webkit.org at r60469 : Fix Makefiles.Leon Clarke2010-06-081-2/+3
| | | | Change-Id: Iaa99d053248875da694b806b913fe43922134cbb
* Merge webkit.org at r60469 : Initial merge by git.Leon Clarke2010-06-081-1/+17
| | | | Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234
* Enable File Reader and blob.slice APIs.Ben Murdoch2010-06-021-0/+4
| | | | | | | | | Notes: - the change to WebCore/html/FileStream.cpp is a cherry pick of http://trac.webkit.org/changeset/60325 - the change to WebCore/platform/posix/FileSystemPOSIX.cpp is a cherry pick of http://trac.webkit.org/changeset/60374 - this needs a corresponding frameworks/base change Change-Id: I05d1496e1e95adf1c6a61c6f07bbf62e9bc92820
* Merge WebKit at r60074: Fix Android makefilesSteve Block2010-05-271-0/+3
| | | | Change-Id: I549373cf00e9cc72060eccaf55e6a3efb0623df0
* Merge WebKit at r60074: Initial merge by gitSteve Block2010-05-271-3/+7
| | | | Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7
* Merge WebKit at r59636: Initial merge by gitKristian Monsen2010-05-251-1/+3
| | | | Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91
* Merge Webkit at r58956: Update Android makefiles.Ben Murdoch2010-05-141-1/+4
| | | | Change-Id: Ie3bcd0e3d0363ad5fdfa26e275af3cca5f147ca2
* Merge Webkit at r58956: Initial merge by Git.Ben Murdoch2010-05-141-8/+7
| | | | Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
* Merge webkit.org at r58033 : Fix MakefilesSteve Block2010-05-111-7/+3
| | | | Change-Id: Ie97b3c249bbda11ec4bc249be915f88361858d85
* Merge webkit.org at r58033 : Initial merge by gitSteve Block2010-05-111-7/+18
| | | | Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
* Merge webkit.org at r55033 : Initial merge by gitSteve Block2010-04-271-1/+1
| | | | Change-Id: I98a4af828067cc243ec3dc5e5826154dd88074b5
* Enable XSLT in Android webkit.Shimeng (Simon) Wang2010-04-221-0/+11
| | | | | | | | Before this change, the libwebcore size is: 4902184 Bytes After this change, the libwebcore size is: 5103712 Bytes The diff is: 200KB. Change-Id: I2554a043c2686de56c802e8a9e02cce604fb25c0
* Enable XPATH in Android browser.Shimeng (Simon) Wang2010-04-191-0/+19
| | | | | Issue: 2582105 Change-Id: I270de4478e639bba8ba9a12558dff05746e991b0
* Merge webkit.org at r54731 : Refactoring of BiDi supportSteve Block2010-02-161-0/+1
| | | | | | See http://trac.webkit.org/changeset/54665 Change-Id: Ieffcf1b8d0401af5403ae9e3cea4414198ee612a
* Merge webkit.org at r54340 : Initial merge by gitSteve Block2010-02-151-0/+1
| | | | Change-Id: Ib489d2ff91186ea3652522e1d586e54416a2cf44
* Implement navigator.isApplicationInstalled() APIAndrei Popescu2010-02-121-0/+1
| | | | | | This CL contains the wiring between the API and the Java side. Fix b: 2371005
* Merge webkit.org at r54127 : GIFImageDecoder now requires ImageDecoder.Steve Block2010-02-041-0/+1
| | | | | | ImageDecoder requires numerous additional include paths. Change-Id: I047d36db7b5f28e7602f55eeeedc04beb713c079
* Merge webkit.org at r54127 : Fix MakefilesSteve Block2010-02-041-1/+3
| | | | | | | Note that we update the XCode project file to add the new GeolocationPositionCache files to allow us to build Android WebKit on Mac. Change-Id: Iab5f73da50b0457cf6212d0aa1a8f6a413027f50
* Merge webkit.org at r54127 : Initial merge by gitSteve Block2010-02-041-1/+6
| | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
* Moves the Geolocation position cache out of the Geolocation object.Steve Block2010-01-251-0/+1
| | | | | | | | | | | | | | | The position cache is an implementation detail of the Geolocation object, but is being moved to its own file to keep files to a reasonable size. Also updates some names and fixes soem style. This will be upstreamed in https://bugs.webkit.org/show_bug.cgi?id=34084 The maximumAge code in the Geolocation object, which may make use of this caching, is being upstreamed in https://bugs.webkit.org/show_bug.cgi?id=30676 Change-Id: I083556de732bd7be240a75da5369117aabc50e33
* Refactor our touch event code to use the version submitted to webkit.org by ↵Ben Murdoch2010-01-201-0/+2
| | | | | | the Qt team. Change-Id: I2953472cee68aadf18f9dd740e9b3f69ad729cf0
* Add navigator.networkType to allow apps to detect the connection type.Andrei Popescu2010-01-151-0/+1
| | | | | | The online event is fired when the networkType changes. Bug: 2368650
* resolved conflicts for merge of 870689c8Nicolas Roard2010-01-041-0/+3
|
* Update the cookie code in platform/network to matchAndrei Popescu2009-12-211-1/+1
| | | | | | the code upstreamed in https://bugs.webkit.org/show_bug.cgi?id=32559