OSDN Git Service
Chris Craik [Tue, 11 Oct 2011 21:35:51 +0000 (14:35 -0700)]
Fixed infinite redraw loop from running out of layer tiles
bug:
5349958
Clear a flag when a layer tile can't allocate a texture, and only try and redraw
from tile dirtiness if that flag is set.
Also, don't ask for redraw if offending tiles are offscreen.
Change-Id: Iadb0cb267a9c1f308e5b42a6e0e3b4bc71d18ece
Derek Sollenberger [Mon, 10 Oct 2011 20:28:07 +0000 (13:28 -0700)]
Merge "Delay sending Plugin Draw event until the surface is ready."
Derek Sollenberger [Mon, 22 Aug 2011 17:46:32 +0000 (13:46 -0400)]
Delay sending Plugin Draw event until the surface is ready.
bug:
5436630
Change-Id: I058a0d750f185c56c0fe70ac0bff7c9781c35dc8
George Mount [Mon, 10 Oct 2011 20:06:48 +0000 (13:06 -0700)]
Merge "Fixed URL lookup for data URLs."
Chris Craik [Mon, 10 Oct 2011 20:05:29 +0000 (13:05 -0700)]
Merge "Double buffering for layers"
Chris Craik [Wed, 5 Oct 2011 20:19:22 +0000 (13:19 -0700)]
Double buffering for layers
bug:
5309934
Defer picture changes and invalidations when:
1) a tiled texture hasn't completed painting
2) the user is scrolling (done in PaintedSurface)
Remaining issues:
Should block updates on zooming
Change-Id: I60ee722e651f96e95a4ac0e819999fc1589037c3
Derek Sollenberger [Wed, 14 Sep 2011 18:11:23 +0000 (14:11 -0400)]
Adding support for multiple video surfaces per plugin.
This CL refactors our implementation to support multiple
non-overlapping video surfaces per plugin instance. This
will allow plugins to hardware decode simulatenous video
streams using hardware.
Additionally, this CL improves plugin startup latency by
constructing the primary plugin surface as soon as possible
in the UI thread.
bug:
5318290
Change-Id: I53ceb8b6696159ecc4765c922704727a9a75a17d
Nicolas Roard [Sat, 8 Oct 2011 01:31:58 +0000 (18:31 -0700)]
The new FAST_PICTURESET code path seems to trigger repaint
bugs in some cases. The current performance improvement of this
code path is reasonably small compared to the default PICTURESET.
This CL turns off FAST_PICTURESET for now (we will revisit the
issue in the future)
bug:
5406701
Change-Id: I7ab7addf14d46b28ebf6bd4ff7f2b3b4ee044cc4
George Mount [Fri, 7 Oct 2011 22:41:57 +0000 (15:41 -0700)]
Fixed URL lookup for data URLs.
Bug
5383517
Data URLs were being stripped, preventing long click from doing anything.
Change-Id: I5eba97725375a155d39f2489f97714a2b8bc8189
John Reck [Fri, 7 Oct 2011 20:10:24 +0000 (13:10 -0700)]
Merge "Switch find on page to GL"
John Reck [Thu, 6 Oct 2011 23:17:19 +0000 (16:17 -0700)]
Switch find on page to GL
Bug:
5354191
Refactor how extras are drawn in GL
Change-Id: Ifb61c73abecd2d074903a7fb44fe4b82aacc64ac
Nicolas Roard [Fri, 7 Oct 2011 19:04:05 +0000 (12:04 -0700)]
Merge "Fix scrolling offset of ScrollableLayer when we touch them. With the new direct update, we are setting directly the layers position; but for ScrollableLayer, we already set their position in the UI, so for them their webkit counterpart is actually older/wrong. The fix consists simply in not updating the positioning of ScrollableLayer."
Nicolas Roard [Fri, 7 Oct 2011 18:54:14 +0000 (11:54 -0700)]
Fix scrolling offset of ScrollableLayer when we touch them.
With the new direct update, we are setting directly the layers position;
but for ScrollableLayer, we already set their position in the UI, so for
them their webkit counterpart is actually older/wrong.
The fix consists simply in not updating the positioning of
ScrollableLayer.
bug:
5421867
Change-Id: Ia14e41aff641173a45ed898cd3b3eceab3f7bd7a
Nicolas Roard [Fri, 7 Oct 2011 17:40:12 +0000 (10:40 -0700)]
Merge "Fix inverted mode rendering"
Ben Murdoch [Fri, 7 Oct 2011 11:58:57 +0000 (12:58 +0100)]
Fix WebViewCore uninitialised data.
Improve WebViewCore initialisation by using the
initialiser list rather than assignment in the
constructor. Ensure that *all* members get an initial
value.
Also remove the WebViewCore::reset(bool) function, that
was only being called from the constructor and so is
now unnecessary.
Additionally remove two completely unused members and one
(m_now) that was being written once but never read (and only
ever behind a debug #ifdef).
Bug:
5399726
Change-Id: I29216737c2406eed1cdc426d011bca0728fdf232
Nicolas Roard [Fri, 7 Oct 2011 01:50:02 +0000 (18:50 -0700)]
Fix inverted mode rendering
The GPU texture upload workaround broke it, as we are not using the
Shaders when doing the copy. Adding some code to instead use a final
shader that can be either normal or inverted, on demand.
bug:
5424589
Change-Id: If845233e12c65738925fbc81b21f1dc0fd38546e
Nicolas Roard [Fri, 7 Oct 2011 00:10:55 +0000 (17:10 -0700)]
Fix repaint request logic for the image layer code path
bug:
5425608 bug:
5218173
Change-Id: Ib14a5e53466b05781a842e24443e89a4779dba68
Nicolas Roard [Wed, 5 Oct 2011 23:14:36 +0000 (16:14 -0700)]
Fix repaint issues with overflow layers
bug:
5297412
Change-Id: I6b483e174339bc854e5d301c5c1f2e5851e57772
Nicolas Roard [Wed, 5 Oct 2011 18:35:24 +0000 (11:35 -0700)]
Merge "Streamline the layers update codepath. Directly update the layers transform and position. This makes updates faster and less dependent on other webkit work."
Nicolas Roard [Wed, 5 Oct 2011 01:01:40 +0000 (18:01 -0700)]
Streamline the layers update codepath.
Directly update the layers transform and position.
This makes updates faster and less dependent on other webkit work.
counterpart java CL: https://android-git.corp.google.com/g/#/c/139853/
bug:
5218173
Change-Id: I03a76ab853e81f0f12177fb785707ffb8dace330
John Reck [Wed, 5 Oct 2011 00:41:15 +0000 (17:41 -0700)]
Merge "Remove m_contentsImage usage"
John Reck [Tue, 4 Oct 2011 23:04:01 +0000 (16:04 -0700)]
Remove m_contentsImage usage
Bug:
5410522
Change-Id: Id8457715665dbd51761900011beba57b7f634fff
John Reck [Tue, 4 Oct 2011 16:12:27 +0000 (09:12 -0700)]
Fix ring clip
Bug:
5406350
Change-Id: I95507ee163a2cb41cc605efaabf32b7cad814533
Chris Craik [Mon, 3 Oct 2011 21:38:23 +0000 (14:38 -0700)]
allow for compositing of 1x1 plugins
bug:
5382635
Change-Id: I0da21245ec7808da452941a45ae5008e278f3007
John Reck [Mon, 3 Oct 2011 16:26:49 +0000 (09:26 -0700)]
HW accelate button focus rings
Bug:
5353510
Change-Id: I1bb306381864357dab4c38fd5c182fda2dd08d8c
Nicolas Roard [Sat, 1 Oct 2011 01:49:21 +0000 (18:49 -0700)]
Merge "Fine-tune the number of buckets in PictureSet add some clearing logic as well"
Nicolas Roard [Sat, 1 Oct 2011 01:24:04 +0000 (18:24 -0700)]
Fine-tune the number of buckets in PictureSet
add some clearing logic as well
bug:
5145259 bug:
5255262
Change-Id: I764e2b67ff15893e853e36185cd610e7293d0129
Teng-Hui Zhu [Fri, 30 Sep 2011 22:34:25 +0000 (15:34 -0700)]
Merge "Turn on the new Gpu Upload code path"
Chris Craik [Fri, 30 Sep 2011 22:31:01 +0000 (15:31 -0700)]
Merge "Fix low-res tiles rendering too early"
Teng-Hui Zhu [Fri, 30 Sep 2011 21:47:05 +0000 (14:47 -0700)]
Turn on the new Gpu Upload code path
bug:
5395019
Change-Id: Ifc16eb59fec62e5f4b95ad4e35f140969226506d
Chris Craik [Fri, 30 Sep 2011 21:16:28 +0000 (14:16 -0700)]
Fix low-res tiles rendering too early
bug:
5369978
Low-res tiles were being prepared before high res, so despite being lower
priority, they had a chance to start rendering when a new page was loaded before
any other tiles existed in the priority queue.
Change-Id: I479f01a00c2507bcabf13929eb099571d8886c4c
Teng-Hui Zhu [Fri, 30 Sep 2011 19:59:01 +0000 (12:59 -0700)]
Merge "The new Gpu upload code path."
Russell Brenner [Fri, 30 Sep 2011 18:00:21 +0000 (11:00 -0700)]
Merge "Initialize to BUCKET_SIZE instead of 0"
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
Teng-Hui Zhu [Thu, 29 Sep 2011 00:28:58 +0000 (17:28 -0700)]
The new Gpu upload code path.
This relied on the hacky Surface Texture change:
https://android-git.corp.google.com/g/#/c/138516/
bug:
5347539
Change-Id: I78e0f677a9c201ba49e11ddb24fa095471cbf3c9
Teng-Hui Zhu [Fri, 30 Sep 2011 16:22:46 +0000 (09:22 -0700)]
Merge "Make the Gpu Upload path faster"
Teng-Hui Zhu [Fri, 30 Sep 2011 00:51:13 +0000 (17:51 -0700)]
Make the Gpu Upload path faster
Basically, move unnecessary function calls out from the loop.
And move the clear related code into DEBUG only.
This is saving us some CPU overhead.
bug:
5347539
Change-Id: I237162fd6a502e93ea32c9856f907c5a9ddb2e78
Chris Craik [Thu, 29 Sep 2011 23:44:59 +0000 (16:44 -0700)]
Merge "Use state machine to track tile state"
Chris Craik [Tue, 27 Sep 2011 17:17:32 +0000 (10:17 -0700)]
Use state machine to track tile state
bug:
5369978
Manage invalidations, painting, transferring, and swapping with a
state machine.
notes:
* readyFor shouldn't be needed if all of the events that would cause a readyfor
fail mark the tile dirty (such as stealing, scale change)
* changing the scale of a page should discard all textures
* m_dirty should be more gracefully worked into the state machine
* a tile may drop dirtiness notifications if it's already painting, since upon
completion m_dirty will be cleared - (issues for layers only)
Change-Id: I5909fb5d208da2fb276e223c56bf143741a9a24c
Nicolas Roard [Thu, 29 Sep 2011 20:58:29 +0000 (13:58 -0700)]
Add debug informations to keep better track of layers allocation
Fix coherency issue in ClassTracker (it's accessed from two different
threads and we were not locking the datastructure)
bug:
5366807
Change-Id: I7dbd4417a49f4b3af3e09d614cec6b4568b09f7a
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"