summaryrefslogtreecommitdiffstats
path: root/WebCore/svg
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r75315: Initial merge by git.Steve Block2011-05-12487-44000/+0
| | | | Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
* Merge WebKit at r74534: Fix conflicts.Ben Murdoch2011-05-101-16/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | .gitignore - keep ours Android.mk http://trac.webkit.org/changeset/74431 Parser.cpp http://trac.webkit.org/changeset/74377 ImageDecoder.cpp http://trac.webkit.org/changeset/73819 GraphicsContext.cpp http://trac.webkit.org/changeset/73729 ContextMenuItem.h http://trac.webkit.org/changeset/74028 SVGFontFaceUriElement.h http://trac.webkit.org/changeset/74493 RenderView.h http://trac.webkit.org/changeset/74524 RenderSVGResourceSolidColor.cpp http://trac.webkit.org/changeset/72926 InlineTextBox.cpp http://trac.webkit.org/changeset/73548 SliderThumbElement.cpp RenderSlider.cpp http://trac.webkit.org/changeset/74044 StyleRareInheritedData.cpp|h CSSStyleSelector.cpp CSSParser.cpp http://trac.webkit.org/changeset/73219 RenderBox.h http://trac.webkit.org/changeset/73385 FrameLoader.cpp http://trac.webkit.org/changeset/73486 http://trac.webkit.org/changeset/74426 ResourceLoader.cpp http://trac.webkit.org/changeset/74453 DOMWindow.cpp|h http://trac.webkit.org/changeset/73829 HTMLLinkElement.cpp http://trac.webkit.org/changeset/74476 V8NPUtils.cpp: Do not undo http://trac.webkit.org/changeset/78994 RenderSVGResourceSolidColor.cpp http://trac.webkit.org/changeset/72926 Remove loader.cpp http://trac.webkit.org/changeset/74049 Change-Id: I8e97de5b2237d85310e1005e067f0b3a6b14432f
* Merge WebKit at r74534: Initial merge by git.Ben Murdoch2011-05-10208-2481/+3014
| | | | Change-Id: I6ccd1154fa1b19c2ec2a66878eb675738735f1eb
* Merge WebKit at Chromium 9.0.597.106: Initial merge by GitSteve Block2011-02-164-5/+14
| | | | | | | | | Note that we are tracking the Chromium 9.0.597 release branch, which is WebKit r72805 + stability cherry picks. This corresponds to r78455 on the 597 release branch. Change-Id: I72375d9b61a767449086f0c9dc4105b2a6b62ddc
* Merge WebKit at Chromium 9.0.597.69: Trivial merge by Git.Ben Murdoch2011-01-167-15/+21
| | | | | | http://svn.webkit.org/repository/webkit/branches/chromium/597/WebCore@75681 Change-Id: Ibe552cf7af31f74b81e337eadf3d3b73a53daf60
* Merge WebKit at Chromium 9.0.597.55: trivial merge by gitBen Murdoch2011-01-075-4/+37
| | | | Change-Id: I2c6f2ebc4431d15ac82b5b1a9f08159e1731bc57
* Merge WebKit at r72805: Initial merge by GitSteve Block2011-01-0699-1158/+850
| | | | | | | Note that this is a backwards merge from Chromium release 9.0.600.0 to 9.0.597.0, to align with the Chromium 9 stable release branch. Change-Id: I5d2bb4e8cee9d39ae8485abf48bdb55ecf8b3790
* Merge WebKit at r73109: Initial merge by git.Shimeng (Simon) Wang2010-12-22206-3097/+3010
| | | | Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8
* Merge WebKit at r72274: Initial merge by git.Russell Brenner2010-12-0274-414/+883
| | | | Change-Id: Ie51f0b4a16da82942bd516dce59cfb79ebbe25fb
* Merge WebKit at r71558: Initial merge by git.Teng-Hui Zhu2010-11-17114-1158/+1759
| | | | Change-Id: Ib345578fa29df7e4bc72b4f00e4a6fddcb754c4c
* Merge Webkit at r70949: Initial merge by git.John Reck2010-11-0999-566/+2092
| | | | Change-Id: I77b8645c083b5d0da8dba73ed01d4014aab9848e
* Merge WebKit at r70209: Initial merge by GitBen Murdoch2010-10-2676-313/+605
| | | | Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
* Merge WebKit at r68651 : Initial merge by git.Kristian Monsen2010-10-0751-3445/+133
| | | | Change-Id: I3d6bff59f17eedd6722723354f386fec9be8ad12
* Merge WebKit at r67908: Initial merge by GitSteve Block2010-09-2942-260/+262
| | | | Change-Id: I43a553e7b3299b28cb6ee8aa035ed70fe342b972
* Merge WebKit at r67178 : Initial merge by git.Iain Merrick2010-09-1613-50/+66
| | | | Change-Id: I57e01163b6866cb029cdadf405a0394a3918bc18
* Merge Webkit at r66666 : Fix conflicts.Kristian Monsen2010-09-111-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | css/CSSParser.cpp Replaced m_mediaQuery = 0 with ASSERT(!m_mediaQuery): http://trac.webkit.org/changeset/66334/trunk/WebCore/css/CSSParser.cpp dom/Document.cpp Removed a function call next to an Android specific change: http://trac.webkit.org/changeset/66247/trunk/WebCore/dom/Document.cpp html/HTMLPlugInElement.cpp Removed a function next to an Android change: http://trac.webkit.org/changeset/66653/trunk/WebCore/html/HTMLPlugInElement.cpp page/Settings.h Whitespace change in this CL: http://trac.webkit.org/changeset/66570/trunk/WebCore/page/Settings.h svg/SVGFontFaceUriElement.h Small change next to an Android change: http://trac.webkit.org/changeset/66397/trunk/WebCore/svg/SVGFontFaceUriElement.h Change-Id: I8d395474f9a08d3a1432249da9a1aa06b01765e0
* Merge WebKit at r66666 : Initial merge by git.Kristian Monsen2010-09-11264-1328/+1085
| | | | Change-Id: I57dedeb49859adc9c539e760f0e749768c66626f
* Merge WebKit at r66079 : Initial merge by gitSteve Block2010-09-0214-50/+60
| | | | Change-Id: Ie2e1440fb9d487d24e52c247342c076fecaecac7
* Merge WebKit at r65615 : Initial merge by git.Iain Merrick2010-08-2339-273/+687
| | | | Change-Id: Ifbf384f4531e3b58475a662e38195c2d9152ae79
* Merge WebKit at r65072 : Complete cherry-pick of WebKit change 43848 to add ↵Steve Block2010-08-131-0/+2
| | | | | | | | | | | EmptyDeviceMotionClient See https://android-git.corp.google.com/g/#change,61020 which picked part of this change for EmptyDeviceOrientationClient. See also https://bugs.webkit.org/show_bug.cgi?id=43848 Change-Id: Idefd9becf89199ae9afe475074fc56a66252db8a
* Merge WebKit at r65072 : Initial merge by git.Ben Murdoch2010-08-12494-6848/+8530
| | | | Change-Id: Ibcf418498376b2660aacb7f8d46ea7085ef91585
* Provide EmptyDeviceOrientationClient for use with SVGImageSteve Block2010-08-121-1/+5
| | | | | | | | | | | This is a partial cherry-pick of WebKit change 64106 See https://bugs.webkit.org/show_bug.cgi?id=43848 We can't take the complete change because we don't yet have DeviceMotion in our version of WebKit. Bug: 2907653 Change-Id: Ie038a21f9e989af46fb6b77decd7ea10da734b3c
* Merge WebKit at r64523 : Initial merge by git.Steve Block2010-08-0928-148/+476
| | | | Change-Id: Ibb796c6802e757b1d9b40f58205cfbe4da95fcd4
* Merge WebKit at r64264 : Initial merge by git.Kristian Monsen2010-08-0413-26/+74
| | | | Change-Id: Ic42bef02efef8217a0f84c47176a9c617c28d1f1
* Merge WebKit at r63859 : Initial merge by git.Ben Murdoch2010-07-2750-798/+1233
| | | | Change-Id: Ie8096c63ec7c991c9a9cba8bdd9c3b74a3b8ed62
* Merge WebKit at r63173 : Initial merge by git.Leon Clarke2010-07-2021-56/+169
| | | | Change-Id: Ife5af0c7c6261fbbc8ae6bc08c390efa9ef10b44
* Merge WebKit at r62496: Initial merge by gitSteve Block2010-07-0951-171/+1091
| | | | Change-Id: Ie3da0770eca22a70a632e3571f31cfabc80facb2
* Merge WebKit at r61871: Initial merge by git.Kristian Monsen2010-07-0216-371/+49
| | | | Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
* Merge webkit.org at r61121: Initial merge by git.Ben Murdoch2010-06-1613-48/+70
| | | | Change-Id: Icd6db395c62285be384d137164d95d7466c98760
* Merge webkit.org at r60469 : Initial merge by git.Leon Clarke2010-06-082-12/+13
| | | | Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234
* Merge WebKit at r60074: Initial merge by gitSteve Block2010-05-27133-212/+214
| | | | Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7
* Remove the unnecessary return keyword.Shimeng (Simon) Wang2010-05-261-2/+2
| | | | Change-Id: If55ba03f4c46afed544083263fbd6d3577807909
* Merge WebKit at r59636: Initial merge by gitKristian Monsen2010-05-2544-420/+1105
| | | | Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91
* Merge Webkit at r58956: SVGPaintServer has been deleted upstream and ↵Ben Murdoch2010-05-141-277/+0
| | | | | | | | | | | replaced with SVGResourceSolidColor.cpp. We had local modifications in the deleted file to correctly guard some Chromium/Skia includes we don't have on Android, so move the guards into the new file. See http://trac.webkit.org/changeset/58212 See http://trac.webkit.org/changeset/588212 Change-Id: I8e7e9ea39009019f7caefd68d99942be77ea602d
* Merge Webkit at r58956: Initial merge by Git.Ben Murdoch2010-05-1457-2147/+662
| | | | Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
* Merge webkit.org at r58033 : Initial merge by gitSteve Block2010-05-1199-1922/+1239
| | | | Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
* Choose correct new/delete in case of multiple inheritance.Shimeng (Simon) Wang2010-05-071-0/+16
| | | | | | | The compilation issue happens when android webcore instrumentation is turned on. issue: 2582105 Change-Id: I403b43c69a0561ee52baf4265831dca185264ced
* Merge webkit.org at r55033 : Initial merge by gitSteve Block2010-04-2712-411/+51
| | | | Change-Id: I98a4af828067cc243ec3dc5e5826154dd88074b5
* Merge webkit.org at r54731 : Initial merge by gitSteve Block2010-02-1653-369/+376
| | | | Change-Id: Ia79977b6cf3b0b00c06ef39419989b28e57e4f4a
* Merge webkit.org at r54127 : Initial merge by gitSteve Block2010-02-04217-2631/+3308
| | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
* Cherry-pick WebKit change 52103 - Add a client based Geolocation providerSteve Block2010-01-181-1/+1
| | | | | | | | This is required to ease the process of upstreaming the Geolocation maximumAge handling code. Note that changes to WebCoreFrameBridge.cpp and WebCoreJniOnLoad.cpp were required as a result of this. Change-Id: Icd8524da9050acda3b991051877c3b5cf262b2b3
* Defines PLATFORM(SKIA), instead of PLATFROM(SGL) for Android.Steve Block2010-01-051-2/+2
| | | | | | | | | | | | Skia is used by Chromium, which defines PLATFORM(SKIA). Android also uses Skia, but currently defines PLATFORM(SGL) to account for platform-specific differences between Android and Chromum. We now use PLATFORM(SKIA) on Android and remove PLATFORM(SGL). Platform-specific differences are achieved with PLATFORM(ANDROID) guards. This reduces our diff with webkit.org. Change-Id: Ibf920b1929e7c3cdabb025ae61ceae3df67258bb
* Merge webkit.org at r51976 : Initial merge by git.Steve Block2009-12-17215-467/+506
| | | | Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
* Merge webkit.org at r50258 : Initial merge by git.Steve Block2009-11-10105-753/+1021
| | | | Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0
* Remove superfluous files from WebCore/svg/graphics.Steve Block2009-10-2151-2983/+0
| | | | | | | | | | | | | | | | | | This change removes the contents of the following directories, which were removed in http://trac.webkit.org/changeset/44332 - WebCore/svg/graphics/cairo - WebCore/svg/graphics/cg - WebCore/svg/graphics/filters/cg - WebCore/svg/graphics/mac - WebCore/svg/graphics/qt - WebCore/svg/graphics/skia These files contained Android specific edits, but these were trivial (ENABLE(FILTERS) changed to ENABLE(SVG_FILTERS)). Due to these changes, the files were not deleted in subsequent WebKit merges. Only WebCore/svg/graphics/skia/SVGResourceFilterSkia.cpp was used in Android Makefiles, and this was only in the V8 Makefile. When SVG is re-enabled, the Android code will have to be updated to work with the refactoring that has taken place in WebKit, so I'm deleting these files now to ease WebKit merging and upstreaming. Change-Id: I4cc74167193175d05bf6b0382b3059b5230cc94d
* Merge webkit.org at R49305 : Automatic merge by git.Steve Block2009-10-2067-892/+432
| | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
* Revert "Merge WebKit r47420"Andrei Popescu2009-08-197-30/+35
| | | | This reverts commit d227fc870c7a697500a3c900c31baf05fb9a8524.
* Merge WebKit r47420Ben Murdoch2009-08-187-35/+30
|
* Merge in WebKit r47029.Ben Murdoch2009-08-1197-220/+338
|
* Get WebKit r44544.Feng Qian2009-06-17185-1279/+1085
|
generated by cgit v1.1 at 2024-09-09 10:00:18 +0000