summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 61719739: Merge "Port toward newer versions of skia."Jean-Baptiste Queru2011-05-121-0/+4
|\ | | | | | | | | * commit '61719739938e34b0a33995d4ab72eaa4604bcf67': Port toward newer versions of skia.
| * Merge "Port toward newer versions of skia."Jean-Baptiste Queru2011-05-121-0/+4
| |\
| | * Port toward newer versions of skia.Jean-Baptiste Queru2011-05-121-0/+4
| |/ | | | | | | Change-Id: Id3f330a151227ff95cc15d2a65be6004dbac05a7
* | am d45deba0: (-s ours) Merge "Switch to SkSafeRef"Jean-Baptiste Queru2011-05-120-0/+0
|\ \ | |/ | | | | | | * commit 'd45deba0c666cf706366b04ae4e529c91ff23e79': Switch to SkSafeRef
| * Merge "Switch to SkSafeRef"Jean-Baptiste Queru2011-05-128-20/+20
| |\
| | * Switch to SkSafeRefJean-Baptiste Queru2011-05-128-20/+20
| |/ | | | | | | Change-Id: Ia4fa9adb7d5096e71357d3428244cbe35f24bd50
* | am 555569c5: (-s ours) Merge "Switch to SkSafeUnref for better portability"Jean-Baptiste Queru2011-05-120-0/+0
|\ \ | |/ | | | | | | * commit '555569c59ced09743507966f73d2d500c6deccec': Switch to SkSafeUnref for better portability
| * Merge "Switch to SkSafeUnref for better portability"Jean-Baptiste Queru2011-05-1218-37/+37
| |\
| | * Switch to SkSafeUnref for better portabilityJean-Baptiste Queru2011-05-1118-37/+37
| |/ | | | | | | Change-Id: Idffdf11f857e28190cbe7ebf3fa08c5b3a8eb192
* | am 86ca6e2e: am c74d30ac: Merge "Fix calculation in ↵Russell Brenner2011-05-101-8/+0
|\ \ | | | | | | | | | | | | | | | | | | WebView::scrollRectOnScreen" into honeycomb-mr2 * commit '86ca6e2e4d40c69c268633e600ef5b045d102180': Fix calculation in WebView::scrollRectOnScreen
| * \ am c74d30ac: Merge "Fix calculation in WebView::scrollRectOnScreen" into ↵Russell Brenner2011-05-101-8/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-mr2 * commit 'c74d30ac1079750a0d7f87704a9962f8045cce94': Fix calculation in WebView::scrollRectOnScreen
| | * \ Merge "Fix calculation in WebView::scrollRectOnScreen" into honeycomb-mr2Russell Brenner2011-05-101-8/+0
| | |\ \
| | | * | Fix calculation in WebView::scrollRectOnScreenRussell Brenner2011-05-051-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Call to subtractLayers() was always returning an empty rect and, as a result, we would exit without calling viewInvalidate(). Bug: 4310520 Change-Id: Icad9e3efd157e5ae970a3200f5b0bbecbee66f79
* | | | | am aecd2790: am c3da3ea3: DO NOT MERGENicolas Roard2011-05-094-20/+60
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'aecd2790ab5d8d358eb7a7ee0181a52ca18bc179': DO NOT MERGE
| * | | | am c3da3ea3: DO NOT MERGENicolas Roard2011-05-094-20/+60
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'c3da3ea3d67930a5593b455cdc697171a9115cae': DO NOT MERGE
| | * | | DO NOT MERGENicolas Roard2011-05-094-20/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry pick from Master Fix for maps - 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: Iace8e21b776df7b357654f66d40d159a1701b86d
* | | | | am 1d62edec: Merge remote branch \'goog/honeycomb-mr2\' into honeycomb-LTEThe Android Automerger2011-05-0915-312/+283
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1d62edecbc901d7d88ac6729e25aa0ad44b3aa04': DO NOT MERGE DO NOT MERGE Fix issue with zooming in/out quickly DO NOT MERGE ANR fix DO NOT MERGE priority queue based tile manager
| * | | | Merge remote branch 'goog/honeycomb-mr2' into honeycomb-LTEThe Android Automerger2011-05-0815-312/+283
| |\ \ \ \ | | |/ / /
| | * | | Merge "DO NOT MERGE" into honeycomb-mr2Russell Brenner2011-05-061-2/+17
| | |\ \ \
| | | * | | DO NOT MERGEDavid Deephanphongs2011-05-051-2/+17
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry-pick change I2ae80ddc from master: Fix crash in font-handling code caused by repainting while a style recalculation was pending. The Android FrameCache was being updated while a style recalculation was pending. This would cause the cached fonts in the FontFallbackList to be accessed, but that cache is not necessarily consistant while a recalculation is pending. A similar issue was occurring with recordPictureSet. In updateFrameCache() and recordPictureSet(), early-abort if the document is waiting for a style recalculation. In notifyProgressFinished(), remove the call to updateFrameCache(). Bug: 4292199 Bug: 4291311 Change-Id: Ie8bc4cb0637ccb7aee37597ac08fd8abffc149cd
| | * | | Merge "DO NOT MERGE Fix issue with zooming in/out quickly" into honeycomb-mr2John Reck2011-05-061-2/+2
| | |\ \ \
| | | * | | DO NOT MERGE Fix issue with zooming in/out quicklyJohn Reck2011-05-051-2/+2
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes an issue where BaseLayer would get stuck in a state trying to prepare the next page, but no longer needed to prepare a new page. This is caused by setting kWillScheduleRequest, but then the user zooming back to the starting scale. Change-Id: I4717482e451e3b9ce74b4cc431d7cec6760d1012
| | * | | Merge "DO NOT MERGE ANR fix" into honeycomb-mr2John Reck2011-05-062-31/+23
| | |\ \ \
| | | * | | DO NOT MERGE ANR fixJohn Reck2011-05-052-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: I66b38a042e66fc32f4e098428d1f4a537d76a9d8
| | * | | DO NOT MERGE priority queue based tile managerJohn Reck2011-05-0514-277/+241
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes TileSets and queues tiles individually Uses a priority queue to determine which tiles to render first Stops rendering the front tile page if we are prepping the back one Limits queue spam by tracking which tiles are already in the queue Change-Id: Idd4154b8a2771d0db2da94c84a683314597f8542
* | | | am 0702955d: am 2d60bef7: Fix clipping issues with layersNicolas Roard2011-04-271-5/+17
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '0702955df30f6610313bdf9363bc22a7fd6d640a': Fix clipping issues with layers
| * | | am 2d60bef7: Fix clipping issues with layersNicolas Roard2011-04-271-5/+17
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '2d60bef786645e5b9e2da0e8374d3f06a40d0638': 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
* | | | am c471914f: am 80e2925e: Merge "DO NOT MERGE" into honeycomb-mr1Bart Sears2011-04-201-2/+17
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'c471914f1c3bb86fb8c2fae304d848e7675a9258': DO NOT MERGE
| * | | am 80e2925e: Merge "DO NOT MERGE" into honeycomb-mr1Bart Sears2011-04-201-2/+17
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '80e2925eccdb827184e288d20181bf186db9391b': DO NOT MERGE
| | * | Merge "DO NOT MERGE" into honeycomb-mr1Bart Sears2011-04-191-2/+17
| | |\ \
| | | * | DO NOT MERGEHuahui Wu2011-04-191-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cherry pick of https://android-git.corp.google.com/g/#change,106682 b/3491968 stop the hanging of dunkindonuts.com Sometimes, a sync load can wait forever and lock up the network thread, here we replace Wait() with TimedWait() with multiple tries to avoid locking. Unfortunately, TimedWait() doesn't return anything and can't tell if it's a timeout or a quick pass, so we query timeofday and allow a few seconds for the system timing error. Change-Id: I991617130f93b44518d28926725f261d4569d73c
* | | | | am 4cebdc6a: am 0357bffe: Merge "DO NOT MERGE" into honeycomb-mr1Bart Sears2011-04-203-6/+13
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '4cebdc6a346b38052dbdcc29d90247e4bc7f8c5c': DO NOT MERGE
| * | | | am 0357bffe: Merge "DO NOT MERGE" into honeycomb-mr1Bart Sears2011-04-203-6/+13
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '0357bffe4faf3b906879e8f180ddcc46d97687fc': DO NOT MERGE
| | * | | 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 e448c08e: am 8804f084: Fix for clipped layersNicolas Roard2011-04-201-0/+6
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'e448c08e0f1ff5c948071498d73ff9b40a52fd21': Fix for clipped layers
| * | | | am 8804f084: Fix for clipped layersNicolas Roard2011-04-201-0/+6
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '8804f0848d7d3165c86cbb529e3b51cffdb4b56b': Fix for clipped layers
| | * | | Fix for clipped layersNicolas Roard2011-04-191-0/+6
| | |/ / | | | | | | | | | | | | | | | | bug:4303702 Change-Id: I31f8df1e24206ef6389f814d421a3fb84b1dc00f
* | | | am 9011f30e: am 1deed5ff: Fix out-of-place content when zooming out.Nicolas Roard2011-04-123-4/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '9011f30e569e6d05a2e4a39db84b07703a4c194b': Fix out-of-place content when zooming out.
| * | | am 1deed5ff: Fix out-of-place content when zooming out.Nicolas Roard2011-04-123-4/+4
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '1deed5ff76dad5d0783c0e07639338f1d6b08a67': Fix out-of-place content when zooming out.
| | * | Fix out-of-place content when zooming out.Nicolas Roard2011-04-083-4/+4
| | | | | | | | | | | | | | | | | | | | bug:4271501 Change-Id: I9836f2775b0acf89b09b6edf2111cd44f0d1daa8
* | | | am 80aad5ee: (-s ours) am 622d72be: Clear DOM storage when clearing other ↵Ben Murdoch2011-04-120-0/+0
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | | | | | | cached data. Do not merge. * commit '80aad5eedfe9e84cabb8540f818f7d1971ecadc3': Clear DOM storage when clearing other cached data. Do not merge.
| * | am 622d72be: Clear DOM storage when clearing other cached data. Do not merge.Ben Murdoch2011-04-1210-1/+162
| |\ \ | | | | | | | | | | | | | | | | * commit '622d72beb96a024bb18591feb39d4b21d0a34bd7': Clear DOM storage when clearing other cached data. Do not merge.
| | * | Clear DOM storage when clearing other cached data. Do not merge.Ben Murdoch2011-04-1110-1/+162
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Empty out DOM local and session storage in addition to HTML5 database and app cache when we get a request from java to delete cached data. Cherry pick of I5b6ee075d2a8fb44ee373ad4462a33623c9c2460 Bug: 4267038 Change-Id: Id2dece1963d443c3758710e9c3e871054991ae32
* | | | am 15692f0c: Merge "Fix regression for superpudu animations" into honeycomb-mr1Nicolas Roard2011-04-072-2/+14
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | * commit '15692f0cb85c86ff494b94d4e61ad0757f5238b4': 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 b6ac9086: Merge "Fix for bug:4183801" into honeycomb-mr1Nicolas Roard2011-04-079-85/+127
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'b6ac908669555fedfaf5dc648367d4ad459fc53e': Fix for bug:4183801
| * | | | Merge "Fix for bug:4183801" into honeycomb-mr1Nicolas Roard2011-04-079-85/+127
| |\ \ \ \
generated by cgit v1.1 at 2025-11-16 04:01:56 +0000