summaryrefslogtreecommitdiffstats
path: root/WebCore/platform/image-decoders
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r75315: Initial merge by git.Steve Block2011-05-1225-6083/+0
| | | | Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
* Merge WebKit at r74534: Fix conflicts.Ben Murdoch2011-05-101-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | .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-1014-35/+41
| | | | Change-Id: I6ccd1154fa1b19c2ec2a66878eb675738735f1eb
* Merge WebKit at Chromium 9.0.597.107: Initial merge by git.Ben Murdoch2011-02-281-0/+6
| | | | | | | | | Note that we are tracking the Chromium 9.0.597 release branch, which is WebKit r72805 + stability cherry picks. This corresponds to r78920 on the 597 release branch. Change-Id: I610ebdbcba92cfa788b229ee207a405789d45e67
* Merge WebKit at Chromium 9.0.597.55: trivial merge by gitBen Murdoch2011-01-072-1/+8
| | | | Change-Id: I2c6f2ebc4431d15ac82b5b1a9f08159e1731bc57
* Merge WebKit at r73109: Initial merge by git.Shimeng (Simon) Wang2010-12-224-3/+7
| | | | Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8
* Merge WebKit at r72272: Fix conflicts.Russell Brenner2010-12-021-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebCore/Android.v8bindings.mk http://trac.webkit.org/changeset/71802 WebCore/bindings/v8/V8Proxy.cpp http://trac.webkit.org/changeset/71735 WebCore/css/CSSParser.cpp http://trac.webkit.org/changeset/71767 http://trac.webkit.org/changeset/72116 (several APIs purged) WebCore/loader/ResourceLoader.cpp http://trac.webkit.org/changeset/71884 WebCore/platform/graphics/MediaPlayer.cpp http://trac.webkit.org/changeset/72117 WebCore/platform/image-decoders/ImageDecoder.cpp http://trac.webkit.org/changeset/72130 WebCore/rendering/RenderBlockLineLayout.cpp http://trac.webkit.org/changeset/72235 WebCore/rendering/RenderView.cpp http://trac.webkit.org/changeset/71851 Change-Id: If0a3466754b9755c1f4be97bf589f88c48eece0a
* Merge WebKit at r72274: Initial merge by git.Russell Brenner2010-12-0215-37/+47
| | | | Change-Id: Ie51f0b4a16da82942bd516dce59cfb79ebbe25fb
* Merge WebKit at r71558: Initial merge by git.Teng-Hui Zhu2010-11-179-22/+133
| | | | Change-Id: Ib345578fa29df7e4bc72b4f00e4a6fddcb754c4c
* Merge Webkit at r70949: Initial merge by git.John Reck2010-11-099-36/+138
| | | | Change-Id: I77b8645c083b5d0da8dba73ed01d4014aab9848e
* Merge WebKit at r70209: Initial merge by GitBen Murdoch2010-10-263-0/+193
| | | | Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
* Merge WebKit at r68651 : Initial merge by git.Kristian Monsen2010-10-076-13/+17
| | | | Change-Id: I3d6bff59f17eedd6722723354f386fec9be8ad12
* Merge WebKit at r67908: Initial merge by GitSteve Block2010-09-291-2/+2
| | | | Change-Id: I43a553e7b3299b28cb6ee8aa035ed70fe342b972
* Merge WebKit at r66079 : Fix conflictsSteve Block2010-09-021-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | - WebCore/dom/Document.cpp Conflict due to Android guards around m_axObjectCache See http://trac.webkit.org/changeset/65787 - WebCore/dom/Document.h Conflict due to Android guards around m_axObjectCache whitespace diff See http://trac.webkit.org/changeset/65787 and http://trac.webkit.org/changeset/66037 - WebCore/html/HTMLDocumentParser.cpp Conflict due to ANDROID_INSTRUMENT See http://trac.webkit.org/changeset/65692 - WebCore/platform/image-decoders/ImageDecoder.cpp Conflict due to Android not implementing ImageDecoder::create() See http://trac.webkit.org/changeset/66039 - WebCore/plugins/PluginView.h Conflict due to PLUGIN_SCHEDULE_TIMER See http://trac.webkit.org/changeset/65697 Change-Id: I5dc94bad471ea566dbabf965425938b732735d02
* Merge WebKit at r66079 : Initial merge by gitSteve Block2010-09-0213-30/+60
| | | | Change-Id: Ie2e1440fb9d487d24e52c247342c076fecaecac7
* Merge WebKit at r65072 : Initial merge by git.Ben Murdoch2010-08-122-10/+14
| | | | Change-Id: Ibcf418498376b2660aacb7f8d46ea7085ef91585
* Merge WebKit at r62496: Initial merge by gitSteve Block2010-07-092-6/+12
| | | | Change-Id: Ie3da0770eca22a70a632e3571f31cfabc80facb2
* Merge WebKit at r61871: Initial merge by git.Kristian Monsen2010-07-0214-80/+169
| | | | Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
* Merge webkit.org at r60469 : Initial merge by git.Leon Clarke2010-06-082-17/+11
| | | | Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234
* Merge WebKit at r60074: Initial merge by gitSteve Block2010-05-271-0/+77
| | | | Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7
* Merge Webkit at r58956: Initial merge by Git.Ben Murdoch2010-05-148-82/+63
| | | | Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
* Merge webkit.org at r58033 : Initial merge by gitSteve Block2010-05-1110-145/+110
| | | | Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
* Merge webkit.org at r55033 : Initial merge by gitSteve Block2010-04-2718-847/+623
| | | | Change-Id: I98a4af828067cc243ec3dc5e5826154dd88074b5
* correct rgba order for skiaMike Reed2010-03-261-0/+5
| | | | Change-Id: I9814bfbffe595d8c3fdd845160df33d60138d081
* Merge webkit.org at r54731 : Initial merge by gitSteve Block2010-02-162-4/+37
| | | | Change-Id: Ia79977b6cf3b0b00c06ef39419989b28e57e4f4a
* Merge webkit.org at r54127 : GIFImageDecoder now requires ImageDecoder.Steve Block2010-02-041-0/+5
| | | | | | ImageDecoder requires numerous additional include paths. Change-Id: I047d36db7b5f28e7602f55eeeedc04beb713c079
* Merge webkit.org at r54127 : Initial merge by gitSteve Block2010-02-0438-11644/+256
| | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
* Defines PLATFORM(SKIA), instead of PLATFROM(SGL) for Android.Steve Block2010-01-052-9/+7
| | | | | | | | | | | | 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-173-27/+33
| | | | Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
* Merge webkit.org at R49305 : Fix merge conflicts.Steve Block2009-10-201-18/+3
| | | | Change-Id: I9e0ffbe9b9b824399653da038093874e315ccd6a
* Merge webkit.org at R49305 : Automatic merge by git.Steve Block2009-10-2011-321/+591
| | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
* Revert "Merge WebKit r47420"Andrei Popescu2009-08-196-253/+30
| | | | This reverts commit d227fc870c7a697500a3c900c31baf05fb9a8524.
* Merge WebKit r47420Ben Murdoch2009-08-186-30/+253
|
* Fix compilation error inside ImageDecoderSkia.cppBen Murdoch2009-08-171-0/+8
|
* More build fixes.Ben Murdoch2009-08-171-4/+10
|
* Merge in WebKit r47029.Ben Murdoch2009-08-1135-4676/+2203
|
* Get WebKit r44544.Feng Qian2009-06-1721-460/+396
|
* AI 145796: Land the WebKit merge @r42026.Feng Qian2009-04-103-24/+40
| | | | Automated import of CL 145796
* Automated import from //branches/master/...@142337,142337Mike Reed2009-03-242-17/+48
|
* auto import from //depot/cupcake/@136594The Android Open Source Project2009-03-0526-4/+5221
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-0338-0/+14075
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-0338-14075/+0
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-174-6/+42
|
* Initial ContributionThe Android Open Source Project2008-10-213-3/+0
|
* external/webkit r30707Upstream1970-01-1238-0/+14042
generated by cgit v1.1 at 2025-05-21 02:16:43 +0000