OSDN Git Service
Derek Sollenberger [Fri, 24 Jun 2011 20:51:55 +0000 (13:51 -0700)]
am
96b31381: (-s ours) Merge "Update WebKit to work with the latest Skia (r1562)."
* commit '
96b3138148c51cb4ad4bddca665fc528677dd182':
Update WebKit to work with the latest Skia (r1562).
Derek Sollenberger [Fri, 24 Jun 2011 18:30:07 +0000 (11:30 -0700)]
Merge "Update WebKit to work with the latest Skia (r1562)."
Derek Sollenberger [Thu, 23 Jun 2011 19:33:53 +0000 (15:33 -0400)]
Update WebKit to work with the latest Skia (r1562).
Change-Id: Iefa4e71603cfdfd8ecaff61994c007853cab2970
Jean-Baptiste Queru [Thu, 26 May 2011 22:24:48 +0000 (15:24 -0700)]
Merge from honeycomb-LTE - do not merge
Change-Id: Ic966b478eb67830bfe44fbf4d3b7984508300c66
Russell Brenner [Thu, 26 May 2011 22:18:52 +0000 (15:18 -0700)]
am
0da3e5e1: Update isFallbackFamily() with missing fonts
* commit '
0da3e5e1d2b913ba0c47bfd1c7923bbce60faa6a':
Update isFallbackFamily() with missing fonts
Russell Brenner [Thu, 26 May 2011 21:05:45 +0000 (14:05 -0700)]
Update isFallbackFamily() with missing fonts
Skia maps numerous fonts to the standard system fonts. Only a few of
these were matched by isFallbackFamily(). This brings them to parity,
adding standards like arial, times, courier, and more.
Bug:
4499169
Change-Id: I02a1816501c61f59ebaddb487bb0ff24cc5c1cca
Russell Brenner [Wed, 25 May 2011 16:17:06 +0000 (09:17 -0700)]
am
4ce956cc: am
3d487c65: Merge "DO NOT MERGE-Move check for pending style recalc" into honeycomb-mr2
* commit '
4ce956cc43762bec0962eae9707369b235c354a2':
DO NOT MERGE-Move check for pending style recalc
Russell Brenner [Wed, 25 May 2011 16:06:02 +0000 (09:06 -0700)]
am
3d487c65: Merge "DO NOT MERGE-Move check for pending style recalc" into honeycomb-mr2
* commit '
3d487c65ee7e11672335cae6240879d3421abf24':
DO NOT MERGE-Move check for pending style recalc
Russell Brenner [Wed, 25 May 2011 16:00:16 +0000 (09:00 -0700)]
Merge "DO NOT MERGE-Move check for pending style recalc" into honeycomb-mr2
Russell Brenner [Tue, 24 May 2011 20:25:21 +0000 (13:25 -0700)]
DO NOT MERGE-Move check for pending style recalc
The previous implementation had no way to notify the caller as to
whether or not the recording was successful. Now, recordContent
detects the pending recalc and returns null to indicate that no
recording was done.
bug:
4474358
Change-Id: I5d54fc606a059203a96270eae5dc78dc21e39a53
Kristian Monsen [Tue, 24 May 2011 18:25:09 +0000 (11:25 -0700)]
am
19d88459: am
f18b71fe: Merge "Fix for bug
4144936: [Proxy setting]: traffic to a bypass domain doesn\'t bypass proxy DO NOT MERGE" into honeycomb-mr2
* commit '
19d88459b21f666ef99b72db249b9f3329c28c5e':
Fix for bug
4144936: [Proxy setting]: traffic to a bypass domain doesn't bypass proxy DO NOT MERGE
Kristian Monsen [Tue, 24 May 2011 18:19:11 +0000 (11:19 -0700)]
am
f18b71fe: Merge "Fix for bug
4144936: [Proxy setting]: traffic to a bypass domain doesn\'t bypass proxy DO NOT MERGE" into honeycomb-mr2
* commit '
f18b71fe96d66428ffbf90961f13f81b248f9157':
Fix for bug
4144936: [Proxy setting]: traffic to a bypass domain doesn't bypass proxy DO NOT MERGE
Kristian Monsen [Tue, 24 May 2011 18:16:45 +0000 (11:16 -0700)]
Merge "Fix for bug
4144936: [Proxy setting]: traffic to a bypass domain doesn't bypass proxy DO NOT MERGE" into honeycomb-mr2
Kristian Monsen [Mon, 23 May 2011 14:14:04 +0000 (15:14 +0100)]
Fix for bug
4144936: [Proxy setting]: traffic to a bypass domain doesn't bypass proxy DO NOT MERGE
Passing the extra string argument, blacklist, to the proxy in
chromium.
Need CL in frameworks/base:
https://android-git.corp.google.com/g/#change,111109
And external/chromium:
https://android-git.corp.google.com/g/#change,111107
Change-Id: I09e70c7f201dbee2823d9cbbd394b2bab9a76f06
Teng-Hui Zhu [Mon, 23 May 2011 23:17:09 +0000 (16:17 -0700)]
am
49fd7191: am
e17c8aee: DO NOT MERGE: The clip should be effective even if it is empty.
* commit '
49fd7191e899fca66e2b63b8b3055efad4a47ad8':
DO NOT MERGE: The clip should be effective even if it is empty.
Teng-Hui Zhu [Mon, 23 May 2011 23:07:53 +0000 (16:07 -0700)]
am
e17c8aee: DO NOT MERGE: The clip should be effective even if it is empty.
* commit '
e17c8aeecb722a98f9cac8556cf7d49d7247a83a':
DO NOT MERGE: The clip should be effective even if it is empty.
Teng-Hui Zhu [Mon, 23 May 2011 22:02:14 +0000 (15:02 -0700)]
DO NOT MERGE: The clip should be effective even if it is empty.
bug:
4473188
Change-Id: Ib38b31074dbd7f4905cf8bbd6539673678669638
Teng-Hui Zhu [Mon, 23 May 2011 19:55:51 +0000 (12:55 -0700)]
am
f69d55a8: am
635861a9: DO NOT MERGE:Fix position update
* commit '
f69d55a820e0b7b57af6a843880f5338a220b27c':
DO NOT MERGE:Fix position update
Teng-Hui Zhu [Mon, 23 May 2011 19:11:57 +0000 (12:11 -0700)]
am
635861a9: DO NOT MERGE:Fix position update
* commit '
635861a90dfb699f7c81038576ad7d993d2a9972':
DO NOT MERGE:Fix position update
Teng-Hui Zhu [Fri, 20 May 2011 22:03:54 +0000 (15:03 -0700)]
DO NOT MERGE:Fix position update
We fixed two issues here.
First, when fixed left/right both undefined, the renderlayer position already
took the fix margin into consideration, so we don't need to compute that again.
Second, for compute the fix element's ViewRect, we just need the normal width,
not the overflow one.
bug:
4440999
Change-Id: Ie3f9b0d4d87de576ce852e7a4898d57a80add7a9
Teng-Hui Zhu [Wed, 18 May 2011 21:45:12 +0000 (14:45 -0700)]
am
b39b82ea: am
e61ae1cb: DO NOT MERGE: Partially revert change from 96777
* commit '
b39b82eaeadd4d876ce301279d919bc2fa7fe7dd':
DO NOT MERGE: Partially revert change from 96777
Teng-Hui Zhu [Wed, 18 May 2011 21:42:44 +0000 (14:42 -0700)]
am
e61ae1cb: DO NOT MERGE: Partially revert change from 96777
* commit '
e61ae1cb52fb14cf18cef0044ed125e162c8c2dd':
DO NOT MERGE: Partially revert change from 96777
Teng-Hui Zhu [Tue, 17 May 2011 23:02:02 +0000 (16:02 -0700)]
DO NOT MERGE: Partially revert change from 96777
By reverting this part, the preview is scrolling fine now.
The old bug
3416512 is kept fixed.
bug:
4440227
Change-Id: I3e7639b29ec818ccc9553fd459ac53f13752a1e2
John Reck [Fri, 13 May 2011 00:39:37 +0000 (17:39 -0700)]
am
7d1dae3f: am
58348114: Merge "DO NOT MERGE cursor ring drawing in GL" into honeycomb-mr2
* commit '
7d1dae3f7a9a698d4564b3529278fa703aed7d89':
DO NOT MERGE cursor ring drawing in GL
John Reck [Fri, 13 May 2011 00:35:33 +0000 (17:35 -0700)]
am
58348114: Merge "DO NOT MERGE cursor ring drawing in GL" into honeycomb-mr2
* commit '
58348114645f3987aaabae40612a876cfd2bc678':
DO NOT MERGE cursor ring drawing in GL
John Reck [Thu, 12 May 2011 23:29:48 +0000 (16:29 -0700)]
Merge "DO NOT MERGE cursor ring drawing in GL" into honeycomb-mr2
Jean-Baptiste Queru [Thu, 12 May 2011 20:58:21 +0000 (13:58 -0700)]
am
169f8bc5: (-s ours) Merge "Remove unused function that relies on an obsolete API"
* commit '
169f8bc5df73bcd9cd286f188d1c741ce5035c37':
Remove unused function that relies on an obsolete API
Jean-Baptiste Queru [Thu, 12 May 2011 20:40:05 +0000 (13:40 -0700)]
Merge "Remove unused function that relies on an obsolete API"
Jean-Baptiste Queru [Thu, 12 May 2011 20:29:42 +0000 (13:29 -0700)]
Remove unused function that relies on an obsolete API
Change-Id: I9bf5b4abb570f84a472740ec3076200398767ecb
Jean-Baptiste Queru [Thu, 12 May 2011 20:20:04 +0000 (13:20 -0700)]
am
61719739: Merge "Port toward newer versions of skia."
* commit '
61719739938e34b0a33995d4ab72eaa4604bcf67':
Port toward newer versions of skia.
Jean-Baptiste Queru [Thu, 12 May 2011 19:56:57 +0000 (12:56 -0700)]
Merge "Port toward newer versions of skia."
Jean-Baptiste Queru [Thu, 12 May 2011 19:55:38 +0000 (12:55 -0700)]
Port toward newer versions of skia.
Change-Id: Id3f330a151227ff95cc15d2a65be6004dbac05a7
Jean-Baptiste Queru [Thu, 12 May 2011 19:53:59 +0000 (12:53 -0700)]
am
d45deba0: (-s ours) Merge "Switch to SkSafeRef"
* commit '
d45deba0c666cf706366b04ae4e529c91ff23e79':
Switch to SkSafeRef
Jean-Baptiste Queru [Thu, 12 May 2011 19:23:22 +0000 (12:23 -0700)]
Merge "Switch to SkSafeRef"
Jean-Baptiste Queru [Thu, 12 May 2011 19:22:37 +0000 (12:22 -0700)]
Switch to SkSafeRef
Change-Id: Ia4fa9adb7d5096e71357d3428244cbe35f24bd50
Jean-Baptiste Queru [Thu, 12 May 2011 16:02:34 +0000 (09:02 -0700)]
am
555569c5: (-s ours) Merge "Switch to SkSafeUnref for better portability"
* commit '
555569c59ced09743507966f73d2d500c6deccec':
Switch to SkSafeUnref for better portability
Jean-Baptiste Queru [Thu, 12 May 2011 15:05:27 +0000 (08:05 -0700)]
Merge "Switch to SkSafeUnref for better portability"
Jean-Baptiste Queru [Wed, 11 May 2011 22:41:55 +0000 (15:41 -0700)]
Switch to SkSafeUnref for better portability
Change-Id: Idffdf11f857e28190cbe7ebf3fa08c5b3a8eb192
Russell Brenner [Tue, 10 May 2011 16:41:18 +0000 (09:41 -0700)]
am
86ca6e2e: am
c74d30ac: Merge "Fix calculation in WebView::scrollRectOnScreen" into honeycomb-mr2
* commit '
86ca6e2e4d40c69c268633e600ef5b045d102180':
Fix calculation in WebView::scrollRectOnScreen
Russell Brenner [Tue, 10 May 2011 16:33:46 +0000 (09:33 -0700)]
am
c74d30ac: Merge "Fix calculation in WebView::scrollRectOnScreen" into honeycomb-mr2
* commit '
c74d30ac1079750a0d7f87704a9962f8045cce94':
Fix calculation in WebView::scrollRectOnScreen
Russell Brenner [Tue, 10 May 2011 16:30:16 +0000 (09:30 -0700)]
Merge "Fix calculation in WebView::scrollRectOnScreen" into honeycomb-mr2
Nicolas Roard [Tue, 10 May 2011 01:11:19 +0000 (18:11 -0700)]
Nicolas Roard [Tue, 10 May 2011 01:04:35 +0000 (18:04 -0700)]
Nicolas Roard [Thu, 24 Mar 2011 16:52:26 +0000 (09:52 -0700)]
DO NOT MERGE
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
The Android Automerger [Mon, 9 May 2011 17:39:57 +0000 (10:39 -0700)]
am
1d62edec: Merge remote branch \'goog/honeycomb-mr2\' into honeycomb-LTE
* 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
The Android Automerger [Mon, 9 May 2011 05:37:22 +0000 (22:37 -0700)]
Merge remote branch 'goog/honeycomb-mr2' into honeycomb-LTE
Russell Brenner [Fri, 6 May 2011 16:03:45 +0000 (09:03 -0700)]
Merge "DO NOT MERGE" into honeycomb-mr2
John Reck [Fri, 6 May 2011 15:34:09 +0000 (08:34 -0700)]
Merge "DO NOT MERGE Fix issue with zooming in/out quickly" into honeycomb-mr2
John Reck [Fri, 6 May 2011 15:34:00 +0000 (08:34 -0700)]
Merge "DO NOT MERGE ANR fix" into honeycomb-mr2
Nicolas Roard [Thu, 4 Nov 2010 02:49:27 +0000 (19:49 -0700)]
DO NOT MERGE cursor ring drawing in GL
Cherry pick of 3 CLs:
105851, 105988, 108900
David Deephanphongs [Sun, 1 May 2011 23:18:52 +0000 (16:18 -0700)]
DO NOT MERGE
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
John Reck [Thu, 5 May 2011 19:59:45 +0000 (12:59 -0700)]
DO NOT MERGE Fix issue with zooming in/out quickly
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
John Reck [Fri, 8 Apr 2011 18:41:20 +0000 (11:41 -0700)]
DO NOT MERGE ANR fix
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
John Reck [Thu, 24 Mar 2011 01:02:27 +0000 (18:02 -0700)]
DO NOT MERGE priority queue based tile manager
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
Russell Brenner [Thu, 5 May 2011 20:16:52 +0000 (13:16 -0700)]
Fix calculation in WebView::scrollRectOnScreen
Call to subtractLayers() was always returning an empty rect and, as a
result, we would exit without calling viewInvalidate().
Bug:
4310520
Change-Id: Icad9e3efd157e5ae970a3200f5b0bbecbee66f79
Nicolas Roard [Thu, 28 Apr 2011 01:47:11 +0000 (18:47 -0700)]
am
0702955d: am
2d60bef7: Fix clipping issues with layers
* commit '
0702955df30f6610313bdf9363bc22a7fd6d640a':
Fix clipping issues with layers
Nicolas Roard [Thu, 28 Apr 2011 01:44:46 +0000 (18:44 -0700)]
am
2d60bef7: Fix clipping issues with layers
* commit '
2d60bef786645e5b9e2da0e8374d3f06a40d0638':
Fix clipping issues with layers
Nicolas Roard [Wed, 20 Apr 2011 17:39:28 +0000 (10:39 -0700)]
Fix clipping issues with layers
Fix remaining gmail/slate.com issues, embedded webview in apps, etc.
bug:
4303702
Change-Id: I3fb0e7b618d62d9d8baa096dad4fc4f0ad66cc1b
Bart Sears [Wed, 20 Apr 2011 17:17:18 +0000 (10:17 -0700)]
am
c471914f: am
80e2925e: Merge "DO NOT MERGE" into honeycomb-mr1
* commit '
c471914f1c3bb86fb8c2fae304d848e7675a9258':
DO NOT MERGE
Bart Sears [Wed, 20 Apr 2011 17:17:16 +0000 (10:17 -0700)]
am
4cebdc6a: am
0357bffe: Merge "DO NOT MERGE" into honeycomb-mr1
* commit '
4cebdc6a346b38052dbdcc29d90247e4bc7f8c5c':
DO NOT MERGE
Nicolas Roard [Wed, 20 Apr 2011 17:17:13 +0000 (10:17 -0700)]
am
e448c08e: am
8804f084: Fix for clipped layers
* commit '
e448c08e0f1ff5c948071498d73ff9b40a52fd21':
Fix for clipped layers
Bart Sears [Wed, 20 Apr 2011 17:14:33 +0000 (10:14 -0700)]
am
80e2925e: Merge "DO NOT MERGE" into honeycomb-mr1
* commit '
80e2925eccdb827184e288d20181bf186db9391b':
DO NOT MERGE
Bart Sears [Wed, 20 Apr 2011 17:14:31 +0000 (10:14 -0700)]
am
0357bffe: Merge "DO NOT MERGE" into honeycomb-mr1
* commit '
0357bffe4faf3b906879e8f180ddcc46d97687fc':
DO NOT MERGE
Nicolas Roard [Wed, 20 Apr 2011 17:14:28 +0000 (10:14 -0700)]
am
8804f084: Fix for clipped layers
* commit '
8804f0848d7d3165c86cbb529e3b51cffdb4b56b':
Fix for clipped layers
Bart Sears [Wed, 20 Apr 2011 04:44:42 +0000 (21:44 -0700)]
Merge "DO NOT MERGE" into honeycomb-mr1
Bart Sears [Wed, 20 Apr 2011 04:43:45 +0000 (21:43 -0700)]
Merge "DO NOT MERGE" into honeycomb-mr1
Nicolas Roard [Wed, 20 Apr 2011 02:27:23 +0000 (19:27 -0700)]
Fix for clipped layers
bug:
4303702
Change-Id: I31f8df1e24206ef6389f814d421a3fb84b1dc00f
Huahui Wu [Tue, 19 Apr 2011 22:51:22 +0000 (15:51 -0700)]
DO NOT MERGE
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
Nicolas Roard [Fri, 1 Apr 2011 17:14:33 +0000 (10:14 -0700)]
DO NOT MERGE
Cherry-picked from master
Fix layers flickering
bug:
4266091 bug:
4181605 bug:
4211039 bug:
4308380
Change-Id: I73950c4378f10b22c5c10d5b697cfba3cb46105a
Nicolas Roard [Wed, 13 Apr 2011 00:59:47 +0000 (17:59 -0700)]
am
9011f30e: am
1deed5ff: Fix out-of-place content when zooming out.
* commit '
9011f30e569e6d05a2e4a39db84b07703a4c194b':
Fix out-of-place content when zooming out.
Nicolas Roard [Wed, 13 Apr 2011 00:57:57 +0000 (17:57 -0700)]
am
1deed5ff: Fix out-of-place content when zooming out.
* commit '
1deed5ff76dad5d0783c0e07639338f1d6b08a67':
Fix out-of-place content when zooming out.
Ben Murdoch [Tue, 12 Apr 2011 20:18:31 +0000 (13:18 -0700)]
am
80aad5ee: (-s ours) am
622d72be: Clear DOM storage when clearing other cached data. Do not merge.
* commit '
80aad5eedfe9e84cabb8540f818f7d1971ecadc3':
Clear DOM storage when clearing other cached data. Do not merge.
Ben Murdoch [Tue, 12 Apr 2011 10:13:59 +0000 (03:13 -0700)]
am
622d72be: Clear DOM storage when clearing other cached data. Do not merge.
* commit '
622d72beb96a024bb18591feb39d4b21d0a34bd7':
Clear DOM storage when clearing other cached data. Do not merge.
Ben Murdoch [Mon, 11 Apr 2011 19:08:03 +0000 (20:08 +0100)]
Clear DOM storage when clearing other cached data. Do not merge.
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
Nicolas Roard [Fri, 8 Apr 2011 21:17:49 +0000 (14:17 -0700)]
Fix out-of-place content when zooming out.
bug:
4271501
Change-Id: I9836f2775b0acf89b09b6edf2111cd44f0d1daa8
Nicolas Roard [Fri, 8 Apr 2011 00:27:03 +0000 (17:27 -0700)]
am
15692f0c: Merge "Fix regression for superpudu animations" into honeycomb-mr1
* commit '
15692f0cb85c86ff494b94d4e61ad0757f5238b4':
Fix regression for superpudu animations
Nicolas Roard [Fri, 8 Apr 2011 00:25:49 +0000 (17:25 -0700)]
Merge "Fix regression for superpudu animations" into honeycomb-mr1
Nicolas Roard [Thu, 7 Apr 2011 23:45:06 +0000 (16:45 -0700)]
Fix regression for superpudu animations
bug:
4181605 bug:
3389597
Change-Id: I2717cdfdeea12df434a119bb8dcc9d2f17f07a7e
(cherry picked from commit
14866c7d6aaa0930627503d0b49bde8e21e90a6e)
Nicolas Roard [Fri, 8 Apr 2011 00:24:07 +0000 (17:24 -0700)]
am
b6ac9086: Merge "Fix for bug:
4183801" into honeycomb-mr1
* commit '
b6ac908669555fedfaf5dc648367d4ad459fc53e':
Fix for bug:
4183801
Nicolas Roard [Fri, 8 Apr 2011 00:21:50 +0000 (17:21 -0700)]
Merge "Fix for bug:
4183801" into honeycomb-mr1
Nicolas Roard [Tue, 5 Apr 2011 01:40:11 +0000 (18:40 -0700)]
Fix for bug:
4183801
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
John Reck [Thu, 7 Apr 2011 23:44:32 +0000 (16:44 -0700)]
am
63f5370e: Fix race condition
* commit '
63f5370e1736a4e699dd9ccd643525772d67ffef':
Fix race condition
John Reck [Thu, 7 Apr 2011 23:25:54 +0000 (16:25 -0700)]
Fix race condition
Bug:
4262018
Change-Id: I0ddda2348e72484cd57fc1909efed47bf8e2222d
Teng-Hui Zhu [Thu, 7 Apr 2011 19:02:02 +0000 (12:02 -0700)]
am
e4cbbfc0: Merge "Show the fullscreen button all the time" into honeycomb-mr1
* commit '
e4cbbfc01b360475415d07bc3a4276fc46e828b9':
Show the fullscreen button all the time
Teng-Hui Zhu [Thu, 7 Apr 2011 18:59:42 +0000 (11:59 -0700)]
Merge "Show the fullscreen button all the time" into honeycomb-mr1
Teng-Hui Zhu [Wed, 6 Apr 2011 22:01:42 +0000 (15:01 -0700)]
Show the fullscreen button all the time
bug:
4232704
Change-Id: I64833baeab708fabe88873573235a896b86b6098
John Reck [Wed, 6 Apr 2011 01:12:21 +0000 (18:12 -0700)]
am
7404fb69: Merge "Race condition fix" into honeycomb-mr1
* commit '
7404fb69c0389c04c5d20d9d2dff7a4aba1db63a':
Race condition fix
Teng-Hui Zhu [Wed, 6 Apr 2011 01:10:24 +0000 (18:10 -0700)]
am
bd064363: Merge "Fix the precision loss issue" into honeycomb-mr1
* commit '
bd064363b650efb80cde0685b2260a854311a3bb':
Fix the precision loss issue
John Reck [Wed, 6 Apr 2011 01:08:35 +0000 (18:08 -0700)]
Merge "Race condition fix" into honeycomb-mr1
Teng-Hui Zhu [Wed, 6 Apr 2011 01:05:09 +0000 (18:05 -0700)]
Merge "Fix the precision loss issue" into honeycomb-mr1
John Reck [Tue, 5 Apr 2011 22:39:47 +0000 (15:39 -0700)]
Race condition fix
Bug:
4232693
Change-Id: I273671aea3dc379858f11546e6459fd9e1443d4f
Teng-Hui Zhu [Tue, 5 Apr 2011 00:22:51 +0000 (17:22 -0700)]
Fix the precision loss issue
Instead of scaling the final rect to compare, scaling the dirtyrect.
Because the dirtyrect will be discarded anyway.
This can better preserve the precision the final rect.
bug:
4186567
Change-Id: Icade7a0b1ff13cd36791c7a3c0e2d624870fb44a
John Reck [Tue, 5 Apr 2011 02:00:14 +0000 (19:00 -0700)]
am
a33d4903: Fix tile vanishing act
* commit '
a33d490302a04453e2c671114d30a4ee93cb08f1':
Fix tile vanishing act
John Reck [Tue, 5 Apr 2011 01:18:37 +0000 (18:18 -0700)]
Fix tile vanishing act
Bug:
4184047
This is caused by textures being marked as unused by swapPages().
Limiting when swapPages() releases textures slightly fixes the issue.
Change-Id: I8ac94f1370b023355f4b6f5877c3929b5d6d3ef6
Nicolas Roard [Fri, 1 Apr 2011 18:05:30 +0000 (11:05 -0700)]
am
ca84feeb: Merge "Fix animations bug" into honeycomb-mr1
* commit '
ca84feebe782358e319da8bd13938179e941f9b4':
Fix animations bug
Nicolas Roard [Fri, 1 Apr 2011 17:53:22 +0000 (10:53 -0700)]
Merge "Fix animations bug" into honeycomb-mr1
Nicolas Roard [Fri, 1 Apr 2011 01:56:54 +0000 (18:56 -0700)]
Fix animations bug
This solves the problem on the nytimes.com/skimmer website.
We were applying the last animation step twice.
bug:
4181605
Change-Id: Id2c003b5a2b6a8c56aa3d6be76d4a6cccfb86ad8
Nicolas Roard [Thu, 31 Mar 2011 23:14:55 +0000 (16:14 -0700)]
am
39ff342c: Fix regression impacting Flash performances
* commit '
39ff342cb3755bb7529c775a6d15b1ccbbe9be6a':
Fix regression impacting Flash performances
Nicolas Roard [Thu, 31 Mar 2011 22:54:41 +0000 (15:54 -0700)]
Fix regression impacting Flash performances
We marked layers dirty when they did not
have a texture -- even the layers that
did not *need* a texture...
bug:
4195690
Change-Id: Ic2a0fdf9462277d060f07ef7d281f5d27e7e8ed5
Bart Sears [Fri, 25 Mar 2011 20:54:22 +0000 (13:54 -0700)]
am
bd14a6fc: Merge "try faster dashing" into honeycomb-mr1
* commit '
bd14a6fcc48d3d5713574a34c441f84296a03c0b':
try faster dashing