summaryrefslogtreecommitdiffstats
path: root/WebCore/platform/graphics
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r75315: Move Android-specific WebCore files to SourceSteve Block2011-05-1276-16879/+0
| | | | | | | | | | | | | 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-12644-126495/+0
| | | | Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
* Merge WebKit at r74534: Fix GraphicsContextAndroid.cpp ↵Ben Murdoch2011-05-101-1/+1
| | | | | | | | | | | (setPlatformCompositeOperation) Implement new setPlatformCompositeOperation method from upstream. See http://trac.webkit.org/changeset/73729 Change-Id: Ic87c3b8beec48c6b4c7bef5db61c6082f7e53639
* Merge WebKit at r74534: Fix ImageSourceAndroid.cppBen Murdoch2011-05-101-4/+4
| | | | | | | | Use enums instead of booleans after upstream refactoring. See http://trac.webkit.org/changeset/73819 Change-Id: Ifbfd886e7ff3779068b9aa2f0c849b2a8a449b84
* Merge WebKit at r74534: Fix ImageBufferAndroid.cppBen Murdoch2011-05-101-1/+1
| | | | | | | | | | Update our platform ImageBuffer class after new features added upstream. See http://trac.webkit.org/changeset/73949 and http://trac.webkit.org/changeset/73925 Change-Id: I40a982c855faabbbdbc0cb13dd503d3bbe76f3ef
* Merge WebKit at r74534: Fix GraphicsContextAndroid.cpp (Paths)Ben Murdoch2011-05-101-3/+16
| | | | | | | | | Update our platform FraphicsContext after upstream Path refactoring. See http://trac.webkit.org/changeset/72926 Change-Id: I574ede8dfc74fce5edc3558cd63c6b703f45fe7c
* Merge WebKit at r74534: Fix GraphicsContextAndroid.cppBen Murdoch2011-05-101-12/+9
| | | | | | | | | Update our platform GraphicsContext after upstream refactoring. See http://trac.webkit.org/changeset/73492 See http://trac.webkit.org/changeset/73728 Change-Id: I1d5ea12a57e7b96a90c1df250c716647bc4e0f26
* Merge WebKit at r74534: Fix FontDataAndroid.cppBen Murdoch2011-05-102-7/+25
| | | | | | | | | Add new functions introduced upstream for CSS text-emphasis property. See http://trac.webkit.org/changeset/74169 Change-Id: I5fff00db5b30979e29c9af75650e5df8d9eaff64
* Merge WebKit at r74534: Fix FontAndroid.cpp (TextMode constants)Ben Murdoch2011-05-101-8/+8
| | | | | | | | Port style changes to our code. See http://trac.webkit.org/changeset/73284 Change-Id: I03a5a7aa7a9a319ac4dbfc257c7adf83b362107c
* Merge WebKit at r74534: Fix FontAndroid.cpp (getShadow)Ben Murdoch2011-05-101-1/+2
| | | | | | | | | Update GraphicsContext::getShadow callsite with new parameter. See http://trac.webkit.org/changeset/74463 Change-Id: Ibfb36831800a57968963a5619c8425f5551829f5
* Merge WebKit at r74534: Fix GraphicsContext.cppBen Murdoch2011-05-101-5/+0
| | | | | | | | | | | Git got confused in the initial merge, and inserted the new version of this function but left the old one too, so remove the old definition of GraphicsContext::shadowsIgnoreTransforms() See http://trac.webkit.org/changeset/74532 Change-Id: Ide2cebc27122560349d715c25063a5a93cb54a0d
* Merge WebKit at r74534: Fix conflicts.Ben Murdoch2011-05-101-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | .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-10190-5121/+8634
| | | | Change-Id: I6ccd1154fa1b19c2ec2a66878eb675738735f1eb
* Better support for exiting full screenTeng-Hui Zhu2011-05-091-0/+1
| | | | | | | | When exiting the full screen, we need to let the webkit know the status. bug:4312214 Change-Id: I4e475da3b426176fd232551e16fbe740994d8d36
* Fix issue where solid was drawn instead of ringJohn Reck2011-05-052-7/+32
| | | | | | Bug: 4283275 Change-Id: Ie05440e3618ffa36004af35fed3d350763f09d50
* Merge "Fix issue with zooming in then out very quickly"John Reck2011-05-051-2/+2
|\
| * Fix issue with zooming in then out very quicklyJohn Reck2011-05-051-2/+2
| | | | | | | | Change-Id: I38d38d9c84a32182c84c3f89365ea8760664bd52
* | Implement hiding backfacesNicolas Roard2011-05-034-0/+26
| | | | | | | | | | bug:3456544 Change-Id: I0e6b10e435432ddbf40085c4b3a7a7e22baed28a
* | Fix z-sortingNicolas Roard2011-05-034-4/+17
|/ | | | | bug:3456526 Change-Id: Idfde406fec0d7afba91506eba806cd0b56cde784
* Merge "Fix CSS shadows and provide better support for HTML5 Canvas shadows."Derek Sollenberger2011-04-284-14/+70
|\
| * Fix CSS shadows and provide better support for HTML5 Canvas shadows.Derek Sollenberger2011-04-284-14/+70
| | | | | | | | | | bug: 4347315 Change-Id: I78c86f7da6174984dae9ac3db21e9168857f651b
* | am e5a6c868: am 0702955d: am 2d60bef7: Fix clipping issues with layersNicolas Roard2011-04-281-5/+17
|\ \ | |/ |/| | | | | * commit 'e5a6c868b4e82b9c4d7a536d1ab977149346e156': Fix clipping issues with layers
| * Fix clipping issues with layersNicolas Roard2011-04-271-5/+17
| | | | | | | | | | | | | | | | Fix remaining gmail/slate.com issues, embedded webview in apps, etc. bug:4303702 Change-Id: I3fb0e7b618d62d9d8baa096dad4fc4f0ad66cc1b
| * Merge "DO NOT MERGE" into honeycomb-mr1Bart Sears2011-04-193-6/+13
| |\
| | * DO NOT MERGENicolas Roard2011-04-193-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry-picked from master Fix layers flickering bug:4266091 bug:4181605 bug:4211039 bug:4308380 Change-Id: I73950c4378f10b22c5c10d5b697cfba3cb46105a
* | | am 8b8e0317: am e448c08e: am 8804f084: Fix for clipped layersNicolas Roard2011-04-201-0/+6
|\ \ \ | |/ / | | | | | | | | | * commit '8b8e0317b9dc035ae96cba7eb3a10dfba3c0c172': Fix for clipped layers
| * | Fix for clipped layersNicolas Roard2011-04-191-0/+6
| |/ | | | | | | | | bug:4303702 Change-Id: I31f8df1e24206ef6389f814d421a3fb84b1dc00f
* | Skia Merge (revision 1116)Derek Sollenberger2011-04-151-8/+1
| | | | | | | | | | | | Update draw looper to use the refactored skia code. Change-Id: I1e97d57f53f05f0699371fbef12ab2ef34faad29
* | resolved conflicts for merge of dd4e6571 to masterJohn Reck2011-04-123-4/+4
|\ \ | |/ | | | | Change-Id: I15e24dbb177aaed8b8349ef2e809582400f840c2
| * Fix out-of-place content when zooming out.Nicolas Roard2011-04-083-4/+4
| | | | | | | | | | bug:4271501 Change-Id: I9836f2775b0acf89b09b6edf2111cd44f0d1daa8
* | Fix for mapsNicolas Roard2011-04-124-20/+60
| | | | | | | | | | | | | | | | | | | | - Fix a repaint scheduling bug preventing layers containing only and image to update - Use an SkBitmap instead of SkBitmapRef and do a deep copy instead to prevent synchronization issues with the webkit thread. bug:4173057 Change-Id: I221fd0062e03ab4633b83d558956db48a408a194
* | Merge "Tweak ring drawing"John Reck2011-04-121-6/+9
|\ \
| * | Tweak ring drawingJohn Reck2011-04-121-6/+9
| | | | | | | | | | | | | | | | | | | | | Added some padding Darkened the overlay Change-Id: I96b53b1a31c44e3d895465cbbfefeef6b6f001ec
* | | Fix layers flickeringNicolas Roard2011-04-123-6/+13
|/ / | | | | | | | | bug:4266091 bug:4181605 Change-Id: I34152628a1f31b017b1b238db2c90dcdb5c6a45f
* | Implements the focus ring drawing in GL.Nicolas Roard2011-04-116-0/+97
| | | | | | | | | | | | | | | | | | In WebView::drawGL(), we check if the extras to draw are rings, and if so we get their rectangles and pass that to GLWebViewState. Updated with holo colors Change-Id: Id5f8941f16dba1733e8a84eae8cd2b317fbc7c55
* | Potential ANR fixJohn Reck2011-04-082-31/+23
| | | | | | | | | | | | | | | | | | | | Race condition in BaseTile could cause a texture's owner to change to a BaseTile, without that BaseTile actually using that texture. This could cause two texture's to point to the same BaseTile. Bug: 4268381 Change-Id: I5e04b1604093ab0b1af7c2e5571c46a03680766a
* | am a6e37cd4: am 15692f0c: Merge "Fix regression for superpudu animations" ↵Nicolas Roard2011-04-072-2/+14
|\ \ | |/ | | | | | | | | | | into honeycomb-mr1 * commit 'a6e37cd4911df717eef13fa5bcc484617e2cd7b9': Fix regression for superpudu animations
| * Merge "Fix regression for superpudu animations" into honeycomb-mr1Nicolas Roard2011-04-072-2/+14
| |\
| | * Fix regression for superpudu animationsNicolas Roard2011-04-072-2/+14
| | | | | | | | | | | | | | | | | | bug:4181605 bug:3389597 Change-Id: I2717cdfdeea12df434a119bb8dcc9d2f17f07a7e (cherry picked from commit 14866c7d6aaa0930627503d0b49bde8e21e90a6e)
* | | am f1a6509b: am b6ac9086: Merge "Fix for bug:4183801" into honeycomb-mr1Nicolas Roard2011-04-078-66/+115
|\ \ \ | |/ / | | | | | | | | | * commit 'f1a6509bb189c2240a8723c2a96d677d98d8b142': Fix for bug:4183801
| * | Merge "Fix for bug:4183801" into honeycomb-mr1Nicolas Roard2011-04-078-66/+115
| |\ \
| | * | Fix for bug:4183801Nicolas Roard2011-04-078-66/+115
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The computation for the invalidated / clipping rects were wrong, sometimes causing the linked bug when layers had a transparent background (they were not obeying the clipping rect passed by the framework). java counterpart CL: https://android-git.corp.google.com/g/#change,105503 Change-Id: I60769e7cbf1a3a939724c57b3d3ce63a6f87aa87
* | | am 74e0ecaa: am 63f5370e: Fix race conditionJohn Reck2011-04-071-2/+3
|\ \ \ | |/ / | | | | | | | | | * commit '74e0ecaa08d693681bb58899b789e520a7b14281': Fix race condition
| * | Fix race conditionJohn Reck2011-04-071-2/+3
| |/ | | | | | | | | | | Bug: 4262018 Change-Id: I0ddda2348e72484cd57fc1909efed47bf8e2222d
* | am bb69eea5: am e4cbbfc0: Merge "Show the fullscreen button all the time" ↵Teng-Hui Zhu2011-04-071-1/+0
|\ \ | |/ | | | | | | | | | | into honeycomb-mr1 * commit 'bb69eea599d55bb1958713e8f1614c9e7f38b2f2': Show the fullscreen button all the time
| * Merge "Show the fullscreen button all the time" into honeycomb-mr1Teng-Hui Zhu2011-04-071-1/+0
| |\
| | * Show the fullscreen button all the timeTeng-Hui Zhu2011-04-071-1/+0
| | | | | | | | | | | | | | | bug:4232704 Change-Id: I64833baeab708fabe88873573235a896b86b6098
* | | Merge "Fix EGL error"Teng-Hui Zhu2011-04-061-2/+3
|\ \ \
| * | | Fix EGL errorTeng-Hui Zhu2011-04-051-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EGL error show up when we try to create EGLImage from an texture which has not been uploaded. bug:4235319 Change-Id: I4d8395723c926ca066e7ee6a3943780689678312
* | | | am 59ffdea8: am 7404fb69: Merge "Race condition fix" into honeycomb-mr1John Reck2011-04-053-4/+16
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit '59ffdea8571156a5a3442bdd740cae186b10425a': Race condition fix