OSDN Git Service
Russell Brenner [Thu, 29 Sep 2011 20:11:14 +0000 (13:11 -0700)]
Initialize to BUCKET_SIZE instead of 0
Some execution path appears to be leaving mBucketSizeX and/or Y set
to 0, causing a divide-by-zero exception. This should only be
feasible when mWidth and mHeight are also 0, but, to keep things
safe, we'll initialize to BUCKET_SIZE instead.
Bug:
5391435
Change-Id: I4e01f980731619e6a6fb70a6eb315c44dd677c7b
Nicolas Roard [Thu, 29 Sep 2011 02:08:00 +0000 (19:08 -0700)]
Fix a memory leak with LayerAndroid
(we had a cycle between LayerAndroid and PaintedSurface)
bug:
5366807
Change-Id: I1b7341984b3cc6fd998b9ab54205bb963eb9223d
Russell Brenner [Wed, 28 Sep 2011 20:22:18 +0000 (13:22 -0700)]
Merge "Make bucket sizes in increments of 256"
John Reck [Wed, 28 Sep 2011 18:12:08 +0000 (11:12 -0700)]
Merge "Don't scale text selection handles"
John Reck [Wed, 28 Sep 2011 03:15:22 +0000 (20:15 -0700)]
Don't scale text selection handles
Bug:
5367280
Don't scale the old software handle and, more importantly,
don't scale the touch target.
Change-Id: I9a731b2117b3f2fe3bd6ca35388da61c47724d91
Teng-Hui Zhu [Tue, 27 Sep 2011 22:38:35 +0000 (15:38 -0700)]
Dynamically set the upper limit of layer tiles' texture number
Instead of using a static number, now the upper limit of the layer tiles is
also dependent on the viewport size.
At the same time, get rid of the old code only useful without tiled layer.
bug:
5347539
Change-Id: Ie720449ea15043d42a56f4c8af57820fa7f6e93c
Russell Brenner [Tue, 27 Sep 2011 22:48:24 +0000 (15:48 -0700)]
Make bucket sizes in increments of 256
As pages grow, limit the number of bucket refills by making them in
chunks of 256 (BUCKET_SIZE). This also fixes a divide-by-zero
error in the earlier update to limit the bucket brigade.
Bug:
5382243
Change-Id: I4ee6eb86c5934175b7cf0f7b69bcfb416d68b967
Teng-Hui Zhu [Tue, 27 Sep 2011 18:35:22 +0000 (11:35 -0700)]
Merge "Increase the texture number for layers"
Ben Murdoch [Tue, 27 Sep 2011 17:22:51 +0000 (10:22 -0700)]
Merge "Do not force "mobile" sites to use a viewport"
Teng-Hui Zhu [Tue, 27 Sep 2011 16:54:40 +0000 (09:54 -0700)]
Increase the texture number for layers
This will break the Gpu upload code path on phones which is turned off by
default, but it will work on the tablet.
bug:
5347539
Change-Id: Idc9889a8681035addd85843191322039a69110e5
Russell Brenner [Tue, 27 Sep 2011 16:32:59 +0000 (09:32 -0700)]
Merge "Limit the number of buckets in a PictureSet"
Steve Block [Tue, 27 Sep 2011 09:11:58 +0000 (02:11 -0700)]
Merge "Add temporary work-around to allow loading local data from Documents with substituted data"
Russell Brenner [Thu, 22 Sep 2011 23:54:49 +0000 (16:54 -0700)]
Limit the number of buckets in a PictureSet
Added MAX_BUCKET_COUNT_X and _Y so that absurdly large pages, such as
those in LayoutTests, don't run out of memory due to millions of
buckets.
Renamed checkDimensions() to setDimensions() and made inval an
optional parameter so that it can be used more generally within
PictureSet to adjust settings.
Bug:
5300146
Change-Id: Ic6c2dc97085ef38d5782aa005b71a6797d165e24
Teng-Hui Zhu [Mon, 26 Sep 2011 22:37:44 +0000 (15:37 -0700)]
Merge "Egl sync code path should be only activated when we are in GpuUpload mode"
Nicolas Roard [Mon, 26 Sep 2011 22:06:45 +0000 (15:06 -0700)]
Merge "Add shared images for layers"
Steve Block [Mon, 26 Sep 2011 12:12:35 +0000 (13:12 +0100)]
Add temporary work-around to allow loading local data from Documents with substituted data
This is a temporary workaround for a WebCore bug which is awaiting resolution.
See https://bugs.webkit.org/show_bug.cgi?id=68711 and this bug for details.
This change adds a new property to Frame to track when its Document pointer is
up-to-date. This is is used only when setting up the securty context for a
Document with substituted data and allows us to skip the buggy check in
Document::loader().
Bug:
5188895
Change-Id: I5d7d2cca83fa0c6db084d505f5b48207046a9cd0
Teng-Hui Zhu [Mon, 26 Sep 2011 20:33:30 +0000 (13:33 -0700)]
Egl sync code path should be only activated when we are in GpuUpload mode
bug:
5347539
Change-Id: I12b8b45792d5aa684295b897be308181a7d44631
Nicolas Roard [Wed, 31 Aug 2011 23:02:00 +0000 (16:02 -0700)]
Add shared images for layers
bug:
5242595 bug:
5218173
Change-Id: I37d395e85441671312aac3e236cc8276019aa990
The Android Open Source Project [Mon, 26 Sep 2011 19:11:27 +0000 (12:11 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: I796bddb9801561a822514af709f557b017cd4cea
Ben Murdoch [Mon, 26 Sep 2011 13:01:21 +0000 (14:01 +0100)]
Do not force "mobile" sites to use a viewport
Remove some old code for detecting mobile sites and forcing
them to use a mobil viewport. This broke some websites, e.g.
Wikipedia.
Bug:
5371421
Change-Id: Icb93a1345f24d77d23b783fc965558a11135037a
The Android Automerger [Mon, 26 Sep 2011 01:15:15 +0000 (18:15 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
Bart Sears [Sun, 25 Sep 2011 23:10:37 +0000 (16:10 -0700)]
am
8e0c7b9e: (-s ours) Cherry-pick master fix for ANRs - Do not merge
* commit '
8e0c7b9ea6359c938b4a1994a6e890eaff473a4b':
Cherry-pick master fix for ANRs - Do not merge
Bart Sears [Sun, 25 Sep 2011 20:59:29 +0000 (13:59 -0700)]
Cherry-pick master fix for ANRs - Do not merge
cherry-pick CL:
941349353627b11c3b9a4deeee6cd7ae831836c0
Avoid infinite prepare loop if bad scale provided
bug:
5362098
Note: we shouldn't be getting bad scales, now that the scale corruption issue
has been reverted. Added logging for these to wrap transfer queue as well to
detect fp corruption regression.
Change-Id: I5e6d2afc1d483452140fab5390395c9581db86ca
The Android Automerger [Sun, 25 Sep 2011 13:28:13 +0000 (06:28 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
Russell Brenner [Sat, 24 Sep 2011 00:40:32 +0000 (17:40 -0700)]
am
fab9df83: Rename Lohit_Hindi to Lohit-Devanagari
* commit '
fab9df838471ec0516f4ce0360c6bc2f7248f53f':
Rename Lohit_Hindi to Lohit-Devanagari
Chris Craik [Fri, 23 Sep 2011 23:33:32 +0000 (16:33 -0700)]
Merge "Crash if stack is corrupted"
Chris Craik [Fri, 23 Sep 2011 23:21:40 +0000 (16:21 -0700)]
Crash if stack is corrupted
bug:
5362098
For tracking down very rare, very wrong scale values
Change-Id: I00a5dd8d75c47c4c13c903e587b3983ea23496d7
Teng-Hui Zhu [Fri, 23 Sep 2011 22:58:09 +0000 (15:58 -0700)]
Merge "Enable the CPU upload path for Browser."
Russell Brenner [Fri, 23 Sep 2011 21:53:35 +0000 (14:53 -0700)]
Rename Lohit_Hindi to Lohit-Devanagari
Bug:
5364436
Change-Id: I0ce921e330ab892d8334b3b8bf4539e6a175a78c
Chris Craik [Fri, 23 Sep 2011 21:54:03 +0000 (14:54 -0700)]
Merge "Avoid infinite prepare loop if bad scale provided"
Teng-Hui Zhu [Fri, 23 Sep 2011 20:34:05 +0000 (13:34 -0700)]
Enable the CPU upload path for Browser.
The default for WebView should be still be GPU upload.
That means Gmail will be default to using GPU upload.
bug:
5347539
The browser change is in
https://android-git.corp.google.com/g/#/c/137606/
Change-Id: Ic7d42331511b24cf8a58f2f5fb64aaffc18cae5f
Chris Craik [Fri, 23 Sep 2011 20:55:59 +0000 (13:55 -0700)]
Avoid infinite prepare loop if bad scale provided
bug:
5362098
Note: we shouldn't be getting bad scales, now that the scale corruption issue
has been reverted. Added logging for these to wrap transfer queue as well to
detect fp corruption regression.
Change-Id: I5e6d2afc1d483452140fab5390395c9581db86ca
Chris Craik [Fri, 23 Sep 2011 20:54:16 +0000 (13:54 -0700)]
Merge "If we have a bad framework inval rect, request entire screen redraw"
Chris Craik [Fri, 23 Sep 2011 20:35:27 +0000 (13:35 -0700)]
If we have a bad framework inval rect, request entire screen redraw
bug:
5365139
This problem is occurring because we convert webkit invals to framework ones,
but webkit invals don't account for stolen/discarded tiles/textures.
This is just a temporary fix, see also bug:
5321078 which describes the root of
the problem.
Change-Id: I6d823315dba8d669171c9c7c9ed3ca20fbed07ae
Chris Craik [Fri, 23 Sep 2011 20:06:51 +0000 (13:06 -0700)]
Merge "Prioritize ugly tiles only when scrolling"
Chris Craik [Fri, 23 Sep 2011 17:58:49 +0000 (10:58 -0700)]
Prioritize ugly tiles only when scrolling
bug:
5365139
Change-Id: Iad181cd1a6f1c9b30f3ac64527c84036bd57ac2c
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