summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Reorganize platform/graphics/androidNicolas Roard2012-04-06107-52/+61
* Merge "Implements a recording GraphicsContext"Nicolas Roard2012-04-0626-1215/+2962
|\
| * Implements a recording GraphicsContextNicolas Roard2012-04-0626-1215/+2962
* | Merge "Update notice file"Daniel Berlin2012-04-061-120/+55
|\ \
| * | Update notice fileDaniel Berlin2012-04-051-120/+55
* | | TransferQueue: use BufferQueue::setBufferCountJamie Gennis2012-04-061-3/+6
* | | Merge "Merging drawLayerQuad and drawQuad"Teng-Hui Zhu2012-04-0515-151/+324
|\ \ \
| * | | Merging drawLayerQuad and drawQuadTeng-Hui Zhu2012-04-0515-151/+324
| | |/ | |/|
* | | Merge "minor cleanup"Chris Craik2012-04-056-25/+7
|\ \ \
| * | | minor cleanupChris Craik2012-04-056-25/+7
| |/ /
* | | Merge "Avoid leaking a JNI local ref in JavaInputStreamWrapper::read()"Steve Block2012-04-051-36/+28
|\ \ \
| * | | Avoid leaking a JNI local ref in JavaInputStreamWrapper::read()Steve Block2012-04-051-36/+28
* | | | Cleanup unnecessary codeTeng-Hui Zhu2012-04-041-5/+0
| |/ / |/| |
* | | Merge "Rename several classes"Chris Craik2012-04-0452-607/+731
|\ \ \
| * | | Rename several classesChris Craik2012-04-0452-607/+731
* | | | Oops! Double negative in previous change.Amith Yamasani2012-04-041-1/+1
* | | | Merge "Small change in a structure used for storing nine patch info."Amith Yamasani2012-04-041-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Small change in a structure used for storing nine patch info.Amith Yamasani2012-04-041-1/+1
* | | | Merge "Cherry pick webkit change r95090 to fix HashMap/StringHash include pro...Chris Craik2012-04-042-2/+3
|\ \ \ \ | |_|/ / |/| | |
| * | | Cherry pick webkit change r95090 to fix HashMap/StringHash include problemsChris Craik2012-04-042-2/+3
| | |/ | |/|
* | | Merge "Use new draw-less functor execution mode to do work without redrawing"Chris Craik2012-04-038-78/+89
|\ \ \
| * | | Use new draw-less functor execution mode to do work without redrawingTeng-Hui Zhu2012-04-028-78/+89
| |/ /
* | | Merge remote-tracking branch 'goog/ics-aah'Mike Lockwood2012-04-030-0/+0
|\ \ \ | |/ / |/| |
| * | am 03eb739a: Prefer CpuUpload path on the emulator (DO NOT MERGE)Jesse Hall2012-03-291-0/+9
| |\ \
| * \ \ am f8596f1a: Reconcile with AOSPJean-Baptiste Queru2012-03-020-0/+0
| |\ \ \
| * \ \ \ am 538b01d6: Cherry-pick WebKit r100677 to fix a rendering crashSteve Block2012-02-281-8/+13
| |\ \ \ \
| * \ \ \ \ am 3c049d2a: Prevent infinite loop when turning on then off composited modeNicolas Roard2012-01-131-0/+14
| |\ \ \ \ \
| * \ \ \ \ \ am b627d5bd: Fully invalidate the pictureset when content size changesChris Craik2012-01-111-21/+14
| |\ \ \ \ \ \
| * \ \ \ \ \ \ am f62e398f: Merge "Enable History API. Do not merge." into ics-mr1Bart Sears2012-01-041-0/+7
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ am d13df54b: Merge "Fix crash with composited layers - DO NOT MERGE" into ics...Bart Sears2012-01-043-4/+51
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ am 08a2aede: Merge "When in singlesurfacemode, resist switching out - DO NOT ...Chris Craik2012-01-041-0/+7
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ am 2cc4497f: Merge "When loading new content, reset zoom state - DO NOT MERGE...Chris Craik2012-01-041-0/+1
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ am 41aebb2b: Return the tile generation thread to default priority.Chris Craik2012-01-041-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ am 599c05f3: Merge "Revert "Put canvas on a layer"" into ics-mr1John Reck2011-12-132-7/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ am c52e5656: Merge "Fix ANR when hitting very large layers" into ics-mr1Nicolas Roard2011-12-081-5/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am 2ee79460: Merge "Reset framework inval when done zooming" into ics-mr1Chris Craik2011-12-081-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am aa816687: Merge "Prevent native crashes on client cert request" into ics-mr1Selim Gurun2011-12-082-11/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e50c6da1: Merge "Revert change that caused text in floating divs to not re...Mangesh Ghiware2011-12-071-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c00fdf0b: Merge "Fix the repaint inval mechanism for layers - DO NOT MERGE...Nicolas Roard2011-12-073-4/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 1d9cab1b: Merge "Fix crash" into ics-mr1John Reck2011-12-071-3/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 84117244: Merge "fix viewport lagging a drawGL call behind" into ics-mr1Chris Craik2011-12-071-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am f288ebbc: Merge "Account for dirty tiles doubly in texture counting" into ...Chris Craik2011-12-071-2/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 5b792777: Remove unneeded PictureSet clearNicolas Roard2011-12-071-2/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c8ec6fac: Merge "Support spellcheck on text areas" into ics-mr1John Reck2011-12-071-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 1d71a5f4: Merge "Don\'t deep copy animations, prepare animations on both t...Chris Craik2011-12-076-102/+33
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c34cfbd2: Delete TextureGenerator operations outside the lockChris Craik2011-12-071-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 3fb3b3e0: Merge "Revert "Set the exact buffer size to Surf Tex"" into ics-mr1Teng-Hui Zhu2011-12-021-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am f4bc9879: Merge "Maintain UI-side start times for animations in SW renderi...Chris Craik2011-12-023-0/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d428cef6: clip tile prepare bounds to content OR viewportChris Craik2011-12-021-15/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 243f1a9f: Merge "Turn off partial layer inval in MR1 - DO NOT MERGE" into ...Chris Craik2011-12-021-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \