OSDN Git Service
Chris Craik [Fri, 23 Sep 2011 00:18:56 +0000 (17:18 -0700)]
Merge "Discard BaseTileTextures entirely when they delete their GL textures"
Chris Craik [Thu, 22 Sep 2011 23:25:22 +0000 (16:25 -0700)]
Discard BaseTileTextures entirely when they delete their GL textures
bug:
5361337
Fixes issue with garbage being drawn in unpainted tiles, and also allocates
tiles very lazily.
Change-Id: I9799b63670a80748a4809b61506da96a739d3a65
Steve Block [Thu, 22 Sep 2011 21:58:54 +0000 (14:58 -0700)]
Merge "Fix find-in-page to scroll scrollable layers"
Steve Block [Wed, 21 Sep 2011 14:43:37 +0000 (15:43 +0100)]
Fix find-in-page to scroll scrollable layers
This requires the addition of the following methods ...
- Layer::contentIsScrollable()
- Layer::localToParent()
- ScrollableLayerAndroid::scrollRectIntoView()
Bug:
5262656
Change-Id: I2f1cf3342f73890f98a172f1b4e3f440c02dd9f4
Teng-Hui Zhu [Thu, 22 Sep 2011 21:49:11 +0000 (14:49 -0700)]
Merge "Get rid of unnecessary glFinish"
Ben Murdoch [Thu, 22 Sep 2011 18:43:55 +0000 (19:43 +0100)]
Port Webkit r74089 to GraphicsContextAndroid.
Port the change made to PlatformContextSkia in
http://trac.webkit.org/changeset/74089
to GraphicsContext Android.
This fixes the rendering of inset box shadows.
Bug:
5351383
Change-Id: I7b68c965aec87e610d853a8220468fd8113351e6
The Android Open Source Project [Thu, 22 Sep 2011 17:57:22 +0000 (10:57 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: I114e6f3e54ba6d293aebfbaf560170e0728ca3a1
Steve Block [Thu, 22 Sep 2011 09:54:14 +0000 (02:54 -0700)]
Merge "Clean up style and add some comments in Layer"
Ben Murdoch [Thu, 22 Sep 2011 09:20:08 +0000 (02:20 -0700)]
Merge "Post a full WebView inval when we navigate to a new page."
Chris Craik [Thu, 22 Sep 2011 00:28:53 +0000 (17:28 -0700)]
Merge "Prefetch browser content with tiled page"
Teng-Hui Zhu [Thu, 22 Sep 2011 00:23:49 +0000 (17:23 -0700)]
Get rid of unnecessary glFinish
bug:
5347539
Change-Id: Iac3888afe1130043e7800e623dd6e061ecf6f40d
John Reck [Wed, 21 Sep 2011 22:55:21 +0000 (15:55 -0700)]
Merge "Increase default button padding"
Chris Craik [Wed, 21 Sep 2011 18:32:15 +0000 (11:32 -0700)]
Prefetch browser content with tiled page
bug:
5262519
Use the tiled page not used by content rendering to render much fewer tiles
for the same content, at an inflated scale.
These prefetched tiles are prioritized for painting above all others, so that
content is (almost) always visible on the base layer.
Change-Id: I598b7925cb68beef632f828df3ae522a0b21e2b4
John Reck [Wed, 21 Sep 2011 20:45:48 +0000 (13:45 -0700)]
Increase default button padding
Bug:
5354009
12 for left/right
8 for top/bottom
Change-Id: Iec50b82b95d24b3a50c858017f52d52310c86ee9
John Reck [Wed, 21 Sep 2011 19:56:53 +0000 (12:56 -0700)]
Merge "Prevent rings from being clipped"
Steve Block [Wed, 21 Sep 2011 14:36:17 +0000 (15:36 +0100)]
Clean up style and add some comments in Layer
This is preparation for https://android-git.corp.google.com/g/#/c/134488/4
Refactoring only, no functional change.
Bug:
5262656
Change-Id: I44e362cf35fc5080f7d9fba34183188d3a2a6331
The Android Automerger [Wed, 21 Sep 2011 13:28:58 +0000 (06:28 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
The Android Open Source Project [Wed, 21 Sep 2011 13:19:14 +0000 (06:19 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: Ia810d54c1fafa6502c251e6e5b3334a8c39e0a1a
Ben Murdoch [Wed, 21 Sep 2011 10:25:56 +0000 (11:25 +0100)]
Post a full WebView inval when we navigate to a new page.
Rather than just posting an inval when we start to load a new
page, we should do so on any new intra-page navigation, so that
we cover cases that don't originate from Java. For example, when
navigating the page cache.
Bug:
5266447
Change-Id: I035ddcd9ef7d06a69a8adfe89cba75be7c502edb
The Android Automerger [Wed, 21 Sep 2011 03:43:02 +0000 (20:43 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
John Reck [Wed, 21 Sep 2011 01:33:32 +0000 (18:33 -0700)]
Prevent rings from being clipped
Bug:
5348386
Change-Id: I6fd9c1d856be257a1a757649aa85e55d4a14a8d1
Teng-Hui Zhu [Tue, 20 Sep 2011 23:55:46 +0000 (16:55 -0700)]
Merge "Actually update the texture filter."
Teng-Hui Zhu [Tue, 20 Sep 2011 23:27:41 +0000 (16:27 -0700)]
Actually update the texture filter.
bug:
5347539
Change-Id: Ic70f9a3d3d780ddf8c60bf51ee94e0b36f56c22e
Teng-Hui Zhu [Tue, 20 Sep 2011 22:09:18 +0000 (15:09 -0700)]
Merge "Support drawing the quad in GL_NEAREST mode."
Teng-Hui Zhu [Tue, 20 Sep 2011 21:45:05 +0000 (14:45 -0700)]
Merge "A better CPU upload path"
Teng-Hui Zhu [Tue, 20 Sep 2011 21:27:34 +0000 (14:27 -0700)]
Support drawing the quad in GL_NEAREST mode.
This can save the draw call perf up to about 20-40% for each quad.
We should make more draw calls using NEAREST mode when it is 1 to 1 mapping.
bug:
5347539
Change-Id: I1ae206716f2b1352775e0079e25e54f46bc18578
Teng-Hui Zhu [Tue, 20 Sep 2011 17:01:02 +0000 (10:01 -0700)]
A better CPU upload path
Clean up the unnecessary Surface Texture operation in CPU upload code path.
bug:
5347539
Change-Id: Id8cf1d3e472dce2470bc62a844b95e8d5d2a6371
Teng-Hui Zhu [Tue, 20 Sep 2011 21:13:31 +0000 (14:13 -0700)]
am
6d611101: (-s ours) Merge "DO NOT MERGE:Share the display from the UI thread" into ics-factoryrom
* commit '
6d611101f901fbf23e794fe37693e5904ed9a2bb':
DO NOT MERGE:Share the display from the UI thread
Ben Murdoch [Tue, 20 Sep 2011 17:30:12 +0000 (10:30 -0700)]
Merge "Reapply: Fix for bug
5226268 [Browser] http keep-alive packets DO NOT MERGE"
Teng-Hui Zhu [Tue, 20 Sep 2011 16:42:53 +0000 (09:42 -0700)]
Merge "DO NOT MERGE:Share the display from the UI thread" into ics-factoryrom
The Android Open Source Project [Tue, 20 Sep 2011 14:43:08 +0000 (07:43 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: Ib1851b27f90fa70a31e3f4b3abaa2aff59f54372
The Android Automerger [Tue, 20 Sep 2011 13:27:48 +0000 (06:27 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
Ben Murdoch [Tue, 20 Sep 2011 08:30:31 +0000 (01:30 -0700)]
am
5cfbc58a: (-s ours) Cherry-pick fix for rect sizes from master - do not merge
* commit '
5cfbc58a9c1b7639519272029d1d3aa452723685':
Cherry-pick fix for rect sizes from master - do not merge
Ben Murdoch [Thu, 15 Sep 2011 11:01:40 +0000 (12:01 +0100)]
Cherry-pick fix for rect sizes from master - do not merge
Fix invalidation rect sizes
When splitting the invalidation rect over the tiles that it
invalidates, we need to use the tile's offset to calculate the
top/left co-ordinate in the case that the inval rect only covers
part of the tile.
(See change Ie3b4be68 for the regression)
Bug:
4965594
Cherry-pick of:
1672c0ff79526ae74ab745724fa57c877811d071
Change-Id: I6a18f1d3d223f5389b0f4f35fab9e579f499e9da
Teng-Hui Zhu [Tue, 20 Sep 2011 01:38:55 +0000 (18:38 -0700)]
am
ab7f5033: (-s ours) Cherry-pick fix for renamed asset from master - do not merge
* commit '
ab7f5033f435437499cefc7066915f88a7f1cae9':
Cherry-pick fix for renamed asset from master - do not merge
Teng-Hui Zhu [Mon, 19 Sep 2011 22:56:58 +0000 (15:56 -0700)]
Cherry-pick fix for renamed asset from master - do not merge
Fix the missing controller for inline video.
Bug:
5340451
Cherry pick of:
9062292ef8421fc64437c478064f2ba21515ddc8
Change-Id: Ifd706f61f824d1019f998569774b600ae9a9f5b9
Chris Craik [Tue, 20 Sep 2011 01:16:17 +0000 (18:16 -0700)]
am
d6b2e695: (-s ours) Cherry-pick "Fix missing tiles" from master - do not merge
* commit '
d6b2e6954f8448ca1940a17a9f891cd1e6032f2c':
Cherry-pick "Fix missing tiles" from master - do not merge
Chris Craik [Mon, 19 Sep 2011 22:27:48 +0000 (15:27 -0700)]
Cherry-pick "Fix missing tiles" from master - do not merge
bug:
5288530
Fix issue where stealing a back texture from a tile (while the tile was ready to
swap) wouldn't mark tile as dirty. Now, mark tile dirty whenever texture is
stolen from it, and avoid trying to steal busy textures.
Cherry-pick of CL:
6aa089bded6a1abbf8d61264588e1e3a32be31b3
Change-Id: Iacbda17ba4b4c6382ceb1c84a6e5f02e609a76a5
Teng-Hui Zhu [Thu, 15 Sep 2011 20:58:26 +0000 (13:58 -0700)]
DO NOT MERGE:Share the display from the UI thread
Currently disable the wait b/c b/
5332112.
For now it should be the same functionality as the original workaround by
using glDraw.
cherry pick from master c/135811/
bug:
5270526
Change-Id: I1973188d8f86ea28e684d14bca794b2a61dac34c
Chris Craik [Mon, 19 Sep 2011 23:58:18 +0000 (16:58 -0700)]
Merge "Fix missing tiles"
Teng-Hui Zhu [Mon, 19 Sep 2011 23:55:07 +0000 (16:55 -0700)]
Merge "Fix the missing controller for inline video."
Steve Block [Mon, 19 Sep 2011 23:16:31 +0000 (16:16 -0700)]
Merge changes Ifb6cc64e,I4d819cc5
* changes:
Simplify logic in ScrollableLayerAndroid::scrollTo()
Fixes style and adds some comments to layers code
Chris Craik [Mon, 19 Sep 2011 22:27:48 +0000 (15:27 -0700)]
Fix missing tiles
bug:
5335634
Fix issue where stealing a back texture from a tile (while the tile was ready to
swap) wouldn't mark tile as dirty. Now, mark tile dirty whenever texture is
stolen from it, and avoid trying to steal busy textures.
Change-Id: Iacbda17ba4b4c6382ceb1c84a6e5f02e609a76a5
Teng-Hui Zhu [Mon, 19 Sep 2011 22:56:58 +0000 (15:56 -0700)]
Fix the missing controller for inline video.
Bug:
5340451
Change-Id: Ifd706f61f824d1019f998569774b600ae9a9f5b9
Russell Brenner [Mon, 19 Sep 2011 20:57:08 +0000 (13:57 -0700)]
Merge "Check for null selection in modifySelection"
John Reck [Mon, 19 Sep 2011 18:07:26 +0000 (11:07 -0700)]
Merge "We be GL ringing it all over them layers"
Chris Craik [Mon, 19 Sep 2011 18:06:25 +0000 (11:06 -0700)]
Merge "Prepare tiles in reverse draw order"
Steve Block [Fri, 9 Sep 2011 14:05:06 +0000 (15:05 +0100)]
Simplify logic in ScrollableLayerAndroid::scrollTo()
No functional change
Bug:
5262656
Change-Id: Ifb6cc64e7578625acc1d5e91b8296b9e4cf1d449
Steve Block [Mon, 12 Sep 2011 10:07:57 +0000 (11:07 +0100)]
Fixes style and adds some comments to layers code
Also removes FrameCachePermission::AllowNewest. This should have been removed
as part of https://android-git.corp.google.com/g/#/c/2712.
Bug:
5262656
Change-Id: I4d819cc5087653e4a1180d04ca0b5b20db7e2305
Chris Craik [Sun, 18 Sep 2011 21:29:47 +0000 (14:29 -0700)]
Prepare tiles in reverse draw order
bug:
5335634
By preparing tiles in the reverse of draw order, tiles on top are given textures
first and less likely to be missing.
Change-Id: Idafde3e0789e24459bba2db150081969810a0021
John Reck [Sun, 18 Sep 2011 18:03:03 +0000 (11:03 -0700)]
We be GL ringing it all over them layers
Bug:
5333083
Change-Id: Ia2b03d8d9e0167d06f8a900152e25e66372acd59
Steve Block [Mon, 19 Sep 2011 17:43:09 +0000 (10:43 -0700)]
Merge "Fix find-in-page to scroll to search results in layers"
Teng-Hui Zhu [Sun, 18 Sep 2011 23:42:40 +0000 (16:42 -0700)]
Fix one typo in the GL state restore
bug:
5044597
Change-Id: Ib70e48f4503a85952afb28da3a6c500b0c011bb8
Russell Brenner [Tue, 13 Sep 2011 21:14:09 +0000 (14:14 -0700)]
Check for null selection in modifySelection
MoveSelection and supporting routines have appeared in one-off crash
reports for monkey runs. It's not yet clear whether or not these
conditions are human-reproducible, but returning an empty string when
a null selection is unexpectedly encountered in modifySelection()
should make the release build somewhat safer, while asserting in the
debug build.
Bug:
5244036
Change-Id: I4d492286cebf9884da0c675aa71175b8aa39f4b9
Kristian Monsen [Thu, 15 Sep 2011 12:56:57 +0000 (13:56 +0100)]
Reapply: Fix for bug
5226268 [Browser] http keep-alive packets DO NOT MERGE
Disabling SPDY as part of not reusing connections
Also needs the following CL in external/chromium:
https://android-git.corp.google.com/g/#/c/135472/
Change-Id: If69a5c4ba3965c0465808b13a51f9221fdf4e639
The Android Open Source Project [Mon, 19 Sep 2011 15:00:39 +0000 (08:00 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: I624eabee29a69cd658c97a534da7033e6d51e727
Steve Block [Mon, 12 Sep 2011 10:07:41 +0000 (11:07 +0100)]
Fix find-in-page to scroll to search results in layers
Note that this fix does not correctly handle search results in scrollable
layers. This will be done in a later fix.
Bug:
5262656
Change-Id: I9f16e2f0f0a94d2d8a6ad995bde1715c822d5dab
Ben Murdoch [Mon, 19 Sep 2011 09:10:45 +0000 (02:10 -0700)]
Merge "Fix invalidation rect sizes"
Kristian Monsen [Thu, 15 Sep 2011 12:56:57 +0000 (13:56 +0100)]
Fix for bug
5226268 [Browser] http keep-alive packets DO NOT MERGE
Disabling SPDY as part of not reusing connections
Also needs the following CL in external/chromium:
https://android-git.corp.google.com/g/#/c/135472/
Change-Id: I246096834c5ca601435df0089fb7f59001506e54
Kristian Monsen [Sun, 18 Sep 2011 22:01:18 +0000 (15:01 -0700)]
am
54168158: (-s ours) Fix for bug
5226268 [Browser] http keep-alive packets DO NOT MERGE
* commit '
541681581f45b3bee31c3ad44ff52642ed7e9ab5':
Fix for bug
5226268 [Browser] http keep-alive packets DO NOT MERGE
Kristian Monsen [Thu, 15 Sep 2011 12:56:57 +0000 (13:56 +0100)]
Fix for bug
5226268 [Browser] http keep-alive packets DO NOT MERGE
Disabling SPDY as part of not reusing connections
Also needs the following CL in external/chromium:
https://android-git.corp.google.com/g/#/c/135472/
Change-Id: I246096834c5ca601435df0089fb7f59001506e54
Teng-Hui Zhu [Fri, 16 Sep 2011 21:24:40 +0000 (14:24 -0700)]
Merge "Share the display from the UI thread"
Ben Murdoch [Fri, 16 Sep 2011 18:20:47 +0000 (11:20 -0700)]
Merge "Fix crash in WebViewCore::scrollNodeIntoView"
Teng-Hui Zhu [Thu, 15 Sep 2011 20:58:26 +0000 (13:58 -0700)]
Share the display from the UI thread
Currently disable the wait b/c b/
5332112.
For now it should be the same functionality as the original workaround by
using glDraw.
bug:
5270526
Change-Id: Ia6d6739909994d6ed756c6b195e6cf7ee9518c54
Russell Brenner [Fri, 16 Sep 2011 16:42:02 +0000 (09:42 -0700)]
Merge "Add null checks in getTouchHighlightRects()"
Ben Murdoch [Thu, 15 Sep 2011 11:01:40 +0000 (12:01 +0100)]
Fix invalidation rect sizes
When splitting the invalidation rect over the tiles that it
invalidates, we need to use the tile's offset to calculate the
top/left co-ordinate in the case that the inval rect only covers
part of the tile.
(See change Ie3b4be68 for the regression)
Bug:
4965594
Change-Id: I6a18f1d3d223f5389b0f4f35fab9e579f499e9da
Ben Murdoch [Fri, 16 Sep 2011 11:24:38 +0000 (12:24 +0100)]
Fix crash in WebViewCore::scrollNodeIntoView
Fix crash when traversing the node hierarchy. Need to
stop when parent() returns null.
Bug:
5244036
Change-Id: I4120d4b6ea14c0a20c84f6bb789573d03e1915b3
Russell Brenner [Thu, 15 Sep 2011 23:53:35 +0000 (16:53 -0700)]
Add null checks in getTouchHighlightRects()
Make sure renderer exists before calling it.
Bug:
5300238
Change-Id: Ie01bc1aaab3390d7c82be65a9b1d183167677e3c
Ben Murdoch [Thu, 15 Sep 2011 18:01:09 +0000 (11:01 -0700)]
Merge "Fix Monkey crash in V8AbstractEventListener"
Steve Block [Thu, 15 Sep 2011 17:00:03 +0000 (10:00 -0700)]
Merge "Fix handling of empty URLs when setting up the NoDomain error page"
Ben Murdoch [Thu, 15 Sep 2011 11:19:42 +0000 (12:19 +0100)]
Fix Monkey crash in V8AbstractEventListener
Monkey can trigger a situation such that script can execute while
the frame is detached. Not clear if this can be triggered in
normal usage, but the fix is simple enough.
Bug:
5201341
Change-Id: Id5701cc0947e30103f9168cf43fcb164c0fe8356
Chris Craik [Wed, 14 Sep 2011 23:56:00 +0000 (16:56 -0700)]
Merge "Improve tile painting prioritization to minimize stalled, blank tiles"
Chris Craik [Wed, 14 Sep 2011 23:06:57 +0000 (16:06 -0700)]
Improve tile painting prioritization to minimize stalled, blank tiles
bug:
5320450
* Greedily deallocate textures from stolen tiles
* Force all prioritization values to be positive
* Create simply described prioritization ordering:
* Draw count
* Has front texture?
* position (if base tile)
Change-Id: Icd5dab931f735c14c18feef5186c8245c5956cfd
Teng-Hui Zhu [Wed, 14 Sep 2011 16:20:56 +0000 (09:20 -0700)]
Merge "A better WAR of driver issue by using GPU fence"
Chris Craik [Tue, 13 Sep 2011 21:54:08 +0000 (14:54 -0700)]
Merge "Allocate textures based purely on viewport size"
Chris Craik [Tue, 13 Sep 2011 18:46:17 +0000 (11:46 -0700)]
Allocate textures based purely on viewport size
bug:
5211417
Allocate textures based upon viewport size, instead of visible nr of tiles. This
will help prevent rare OOM issues triggering from a certain position in the
page.
Change-Id: Ib43fef0e0b9b8e4e26df448d67bb159a105e300c
Teng-Hui Zhu [Tue, 13 Sep 2011 20:24:19 +0000 (13:24 -0700)]
A better WAR of driver issue by using GPU fence
bug:
5270526
Change-Id: I790a3fc995edc73192b2bcb24eaa29e99434f2fb
Chris Craik [Tue, 13 Sep 2011 17:03:55 +0000 (10:03 -0700)]
Merge "Fix layer tile allocation to be more consistent, less disco"
Chris Craik [Mon, 12 Sep 2011 22:49:36 +0000 (15:49 -0700)]
Fix layer tile allocation to be more consistent, less disco
bug:
5290559
Two major things:
* Avoid swapping front/back textures before the textures have been blitted to
avoid race condition where blit fails because it doesn't see a back texture
* Don't allow a tile to acquire its front texture to paint into, as the
acquisition logic doesn't handle this.
Change-Id: I84b59396ca9faaf3ddc7c75b6f66e4736bf4c3cf
Teng-Hui Zhu [Mon, 12 Sep 2011 22:57:44 +0000 (15:57 -0700)]
Merge "Fix the poster issue and full screen behavior html5 video"
Teng-Hui Zhu [Mon, 12 Sep 2011 18:20:44 +0000 (11:20 -0700)]
Fix the poster issue and full screen behavior html5 video
This is related to the change in https://bugs.webkit.org/show_bug.cgi?id=49481,
and it seems there is some following up discussion in this area.
We will just follow what we did from Honeycomb and work around issues for now.
bug:
4523481
Change-Id: I3c2225afb078c24db423119a235266f222055431
Steve Block [Mon, 12 Sep 2011 15:03:58 +0000 (16:03 +0100)]
Fix handling of empty URLs when setting up the NoDomain error page
Bug:
5293606
Change-Id: Iace4f8a56bc4d8b8cbd01fb369cecf22564b7c8c
Chris Craik [Fri, 9 Sep 2011 18:56:55 +0000 (11:56 -0700)]
Fudge layer translation to always line up with view pixels
bug:
3367478
Change-Id: I37632de8503b0f3eba0a183a156d71ea48bdba98
Chris Craik [Fri, 9 Sep 2011 18:04:00 +0000 (11:04 -0700)]
Merge "If unlock base layer marks tiles dirty, repaint"
Derek Sollenberger [Fri, 9 Sep 2011 17:32:39 +0000 (10:32 -0700)]
Merge "Hookup internal plumbing needed to expose new plugin API."
Steve Block [Fri, 9 Sep 2011 16:18:25 +0000 (09:18 -0700)]
Merge "Cherry-pick WebKit change 93521 to fix FrameLoader"
Derek Sollenberger [Fri, 9 Sep 2011 14:03:09 +0000 (10:03 -0400)]
Hookup internal plumbing needed to expose new plugin API.
bug:
5239378
Change-Id: I2078db559315f93e8c43052bf9718566157f971b
Steve Block [Thu, 8 Sep 2011 10:31:09 +0000 (11:31 +0100)]
Cherry-pick WebKit change 93521 to fix FrameLoader
See http://trac.webkit.org/changeset/93521
Note that the change did not apply cleanly to
FrameLoader::stopLoading() because we don't have
http://trac.webkit.org/changeset/90164. See bug for details.
Bug:
5264509
Change-Id: I824284b9daaa8bc033aebca558d5362ebfb617d8
Chris Craik [Thu, 8 Sep 2011 23:54:13 +0000 (16:54 -0700)]
If unlock base layer marks tiles dirty, repaint
bug:
5278818
Change-Id: I03206bdc5e95743054c361f235e2d94b835a95d1
Chris Craik [Thu, 8 Sep 2011 21:53:37 +0000 (14:53 -0700)]
Merge "Stop layer tile flickering"
Chris Craik [Thu, 8 Sep 2011 21:09:43 +0000 (14:09 -0700)]
Stop layer tile flickering
bug:
5265207
Don't steal textures with a draw count from last frame to prevent flickering
Change-Id: I0a37b2417f0721b150b47920feea9ddb1666ec28
Chris Craik [Thu, 8 Sep 2011 20:40:18 +0000 (13:40 -0700)]
Merge "Deallocate graphics memory with onTrimMemory signals"
Derek Sollenberger [Thu, 8 Sep 2011 19:49:37 +0000 (12:49 -0700)]
Merge "Add Plugin API for a video framerate callback."
Chris Craik [Thu, 8 Sep 2011 03:04:24 +0000 (20:04 -0700)]
Deallocate graphics memory with onTrimMemory signals
bug:
5269460
Deallocate the graphics memory backing a BaseTileTexture on onTrimMemory
signals, and accordingly allocate it lazily, as needed.
Change-Id: I52039723f47e6470e4fe8dd987d384017005390f
Ben Murdoch [Thu, 8 Sep 2011 17:59:32 +0000 (10:59 -0700)]
Merge "Roll back fix for b/issue?id=
4203823"
Teng-Hui Zhu [Thu, 8 Sep 2011 16:40:28 +0000 (09:40 -0700)]
Merge "The CPU code path for uploading the textures"
Derek Sollenberger [Thu, 8 Sep 2011 15:25:50 +0000 (11:25 -0400)]
Add Plugin API for a video framerate callback.
bug:
5239378
Change-Id: I5f7d33302d5a40f58ec12a3c0be63cb51d4ffc75
Ben Murdoch [Thu, 8 Sep 2011 02:04:22 +0000 (03:04 +0100)]
Roll back fix for http://b/issue?id=
4203823
Allow positioned divs with overflow to scroll.
Keeps tidying up that fix for http://b/issue?id=
4203823 did and rolls
back the functional change.
Bug:
5216561ยง
Change-Id: I6268bbe880c432c87ca04e68697f66b32b7032d0
John Reck [Wed, 7 Sep 2011 23:08:34 +0000 (16:08 -0700)]
Merge "Implement PictureSet(SkPicture*) ctor in FAST_PICTURESET case"
John Reck [Wed, 7 Sep 2011 22:16:17 +0000 (15:16 -0700)]
Implement PictureSet(SkPicture*) ctor in FAST_PICTURESET case
Bug:
5270617
Change-Id: I5bcdf551a028588aa34956f98039d893d646b362