summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r74534: Initial merge by git.Ben Murdoch2011-05-103820-213542/+424018
| | | | Change-Id: I6ccd1154fa1b19c2ec2a66878eb675738735f1eb
* Cleanspec needed for change https://android-git.corp.google.com/g/#change,109065Kristian Monsen2011-05-101-0/+2
| | | | Change-Id: Ic0627398c525f9c616024a81a70380775a981361
* Better support for exiting full screenTeng-Hui Zhu2011-05-096-1/+39
| | | | | | | | When exiting the full screen, we need to let the webkit know the status. bug:4312214 Change-Id: I4e475da3b426176fd232551e16fbe740994d8d36
* am 23652748: (-s ours) am 1d62edec: Merge remote branch ↵The Android Automerger2011-05-090-0/+0
|\ | | | | | | | | | | | | | | | | | | \'goog/honeycomb-mr2\' into honeycomb-LTE * commit '23652748ca27723b6da70f90460064d542f62130': 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
| * 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
* | | | Fix issue where solid was drawn instead of ringJohn Reck2011-05-053-8/+33
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Add the touch event handling for the slider.Teng-Hui Zhu2011-05-046-7/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:4232704 Change-Id: Ia3ac8a6003c1ff7b06d2a226b3206a3be0f8c6b5
* | | | | Merge "Correct the move latest positioning"Teng-Hui Zhu2011-05-041-2/+1
|\ \ \ \ \
| * | | | | Correct the move latest positioningTeng-Hui Zhu2011-05-031-2/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is fixing the issue when we move the slider, the moveLastest will send to 0,0, which cause a jump on the slider. bug:4232704 Change-Id: Ic7235158cbfb690a38f53ca1b3e4757a5d1a69f3
* | | | | Merge "Fix crash in font-handling code caused by repainting while a style ↵Russell Brenner2011-05-041-2/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | recalculation was pending."
| * | | | | Fix crash in font-handling code caused by repainting while a style ↵David Deephanphongs2011-05-041-2/+17
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Change-Id: I2ae80ddc2d596e2f15455f54f4de7dde6e42ade8
* | | | | 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
| * | | | 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
* | | | | Merge "webkit: convert to use new audio.h"Dima Zavin2011-04-271-7/+9
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | webkit: convert to use new audio.hDima Zavin2011-04-191-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2754c4fdf8a367530e2be5c215e5a3823e4957c5 Signed-off-by: Dima Zavin <dima@android.com>
* | | | | am 752846c3: (-s ours) am c471914f: am 80e2925e: Merge "DO NOT MERGE" into ↵Bart Sears2011-04-200-0/+0
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | honeycomb-mr1 * commit '752846c3545e73f6dc643afc8f8ebd8d84e39fe8': DO NOT MERGE
| * | | | 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 9e879a96: (-s ours) am 4cebdc6a: am 0357bffe: Merge "DO NOT MERGE" into ↵Bart Sears2011-04-200-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-mr1 * commit '9e879a9666886e49cfea841f0317116a108c1bc0': DO NOT MERGE
| * | | | | 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 8b8e0317: am e448c08e: am 8804f084: Fix for clipped layersNicolas Roard2011-04-201-0/+6
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '8b8e0317b9dc035ae96cba7eb3a10dfba3c0c172': Fix for clipped layers
| * | | | | 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
* | | | | Fix a compiler warning in handleTouchEvent()Steve Block2011-04-201-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I6aeafd3d83bbb114164445e7d9f6da0fbc0589f5
* | | | | Avoid prematurely deleting a JNI local ref in FindAddressSteve Block2011-04-201-3/+1
| |_|_|/ |/| | | | | | | | | | | Change-Id: Ib0e34890dd37736f809bbdd044ecc63320fe0ed6
* | | | b/3491968 stop the hanging of dunkindonuts.comHuahui Wu2011-04-191-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Same as https://android-git.corp.google.com/g/#change,105743 but in Master. Changed the waiting to 10 seconds each attempt after asking around. 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: I391fb3f815413f17b2927c1e90cbddab7faed071
* | | | Skia Merge (revision 1116)Derek Sollenberger2011-04-151-8/+1
| | | | | | | | | | | | | | | | | | | | | | | | Update draw looper to use the refactored skia code. Change-Id: I1e97d57f53f05f0699371fbef12ab2ef34faad29
* | | | Limit the number of layers created for fixed position.Nicolas Roard2011-04-131-10/+10
| | | | | | | | | | | | | | | | Change-Id: If7093770b420b37fbb0b073c85f96e781abc55c2
generated by cgit v1.1 at 2024-10-27 04:39:17 +0000