summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am f286c7d3: Merge "Scroll position now passed to all layers" into ics-mr1Chris Craik2011-12-016-5/+37
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am f1a22119: Merge "Fix image layer codepath" into ics-mr1Nicolas Roard2011-12-0120-223/+425
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am f2dadfc1: Merge "Ensure font encoding is correct for drawing loopers." int...Derek Sollenberger2011-12-011-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 87f8fc15: Merge "add support for WebTextView on scrolling layers" into ics...Bart Sears2011-11-301-0/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 587dc59f: Merge "Fix offscreen tile optimization with small content" into ...Bart Sears2011-11-301-14/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d9b4da81: Merge "Increase the transfer queue size a little to improve the ...Bart Sears2011-11-301-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 42e97318: Merge "A WAR to enable the slider touch event on youtube.com" in...Bart Sears2011-11-301-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am ed03bc99: Merge "Swap tiled page tiles on zoom" into ics-mr1Chris Craik2011-11-301-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e1ea7f83: Merge "DO NOT MERGE Use unsigned length when reading data" into ...Russell Brenner2011-11-301-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 797c8d18: Do not load uncached images if blocked by embedding app.Ben Murdoch2011-11-305-11/+29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 32f18956: Merge "Don\'t prepare offscreen tiles" into ics-mr1Chris Craik2011-11-291-9/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am a5c5de10: Merge "Set the exact buffer size to Surf Tex" into ics-mr1Teng-Hui Zhu2011-11-291-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 807ee5ec: Merge "synchronize animation starts with webkit" into ics-mr1Chris Craik2011-11-2913-67/+135
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 06081e3d: Merge "WebView Animation support" into ics-mr1Teng-Hui Zhu2011-11-296-6/+102
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 9c0e7d80: Merge "Fix WebViewCore::createBaseLayer() to always do a layout ...Steve Block2011-11-291-8/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \