OSDN Git Service
Russell Brenner [Mon, 14 Mar 2011 23:05:47 +0000 (16:05 -0700)]
Merge "Custom font was appearing all white in Books" into honeycomb-mr1
Russell Brenner [Mon, 14 Mar 2011 20:57:47 +0000 (13:57 -0700)]
Custom font was appearing all white in Books
This is a strategic rollback of a previous change:
https://android-git.corp.google.com/g/#change,99977
Although that change fixes a browser crash, it introduces a problematic
UI situation in Books.
The browser crash is rare, but keeps some web pages from being usable.
Nonetheless, upon failure, the browser will shutdown and can be
relaunched for other sites. Another potential point of failure for this
crash has been identified, with a solution to follow in a separate CL.
From discussion with Bart it was decided that the rare browser crash is
less problematic than the usability problem incurred with a book
containing blank pages, and so, regardless of whether or not the
resulting browser crash is fixed, this change needs to be rolled back.
With any luck, however, both issues will be fixed.
(See also http://b/
3469204.)
Bug:
4064041
Change-Id: I3416f9e9ae728a99dd84d3df8b0f8d0c0876dbad
Huahui Wu [Mon, 14 Mar 2011 21:42:05 +0000 (14:42 -0700)]
Merge "b/
3392594 keep the remaining touch points when one is ended." into honeycomb-mr1
Huahui Wu [Mon, 14 Mar 2011 01:10:25 +0000 (18:10 -0700)]
b/
3392594 keep the remaining touch points when one is ended.
This is native side code for b/
3392594, which takes the action
index from java side, and set the touch point state accordingly.
Change-Id: I894bcfc25f761725a5f37317a8fadffbba68b6df
Bart Sears [Mon, 14 Mar 2011 00:32:54 +0000 (17:32 -0700)]
am
bcc07753: Cherry-pick change Ibaa52a6b (webkit security patch)
* commit '
bcc077531734eca7eb8663a76ab8d4c15721672c':
Cherry-pick change Ibaa52a6b (webkit security patch)
Bart Sears [Sat, 12 Mar 2011 00:17:22 +0000 (16:17 -0800)]
Cherry-pick change Ibaa52a6b (webkit security patch)
Apply webit security patch
bug:
4089100
Change-Id: I80069fe6ec12a03fce88128be0ce90fee410911c
Nicolas Roard [Sat, 12 Mar 2011 00:31:22 +0000 (16:31 -0800)]
Merge "Improve HTML5 audio/video controls" into honeycomb-mr1
Nicolas Roard [Sat, 12 Mar 2011 00:00:46 +0000 (16:00 -0800)]
Improve HTML5 audio/video controls
Only allow translucent controls for video...
bug:
2126902
Change-Id: I95fbf1fc736391a3adec3930119531684a1a9082
Teng-Hui Zhu [Fri, 11 Mar 2011 22:58:38 +0000 (14:58 -0800)]
Fix a crash caused by the wrong destruction handling
The VideoLayer is ref counted, so unref at the destrutor is the right way.
Don't do a deletion.
bug:
4072630
Change-Id: I1da4ec138ef119b1d8dd7700fef36bab4df55064
Nicolas Roard [Fri, 11 Mar 2011 22:25:43 +0000 (14:25 -0800)]
HTML5 Video improvements
- remove the seek buttons on the control bar
- make the control bar translucent
- add a fullscreen button passing the layer id to the java side
bug:
2126902
Change-Id: Id9638f6b01f968839eaf4b0bd8cf1603957753af
Cary Clark [Fri, 11 Mar 2011 16:56:56 +0000 (08:56 -0800)]
Merge "allow multiple invals to return first difference" into honeycomb-mr1
Cary Clark [Fri, 11 Mar 2011 16:05:21 +0000 (11:05 -0500)]
allow multiple invals to return first difference
The shape of the text selection changed recently, so the
inval computation for the shape area was slightly incorrect.
But most of the problem is caused by multiple calls to
draw the selection area. The old assumption was that
successive calls to compute the inval could each work
from the prior state, since only the difference between
the last inval and the current inval needs to be redrawn.
Now, there are multiple calls to compute the area, and any
of them need to return the last difference computed, only
computing a new difference if the selection changed.
Keep track of the last changed selection, so that the last
position, the current position, and the last drawn position
can be tracked correctly.
bug:
4073219
Change-Id: Ic9b9d037329e8f792b5ec09c112e665dbdfd0b81
Cary Clark [Fri, 11 Mar 2011 16:34:35 +0000 (11:34 -0500)]
increase the memory cap for bitmaps
Increasing this size from 8 megs to 32 megs
allows more RAM to be used before
the image is sampled down.
bug:
3421165
Change-Id: I73047009522d6e80d1adc95cd12d763307ab1980
Nicolas Roard [Fri, 11 Mar 2011 02:13:59 +0000 (18:13 -0800)]
Fix for display glitches.
We were trying to update the texture with a bitmap larger than it.
GL did not like this, so the texture was not updated at all...
bug:
4078436
Change-Id: I180f4da6991a3db988169d7abd06cc08d5b69a32
Teng-Hui Zhu [Fri, 25 Feb 2011 23:18:51 +0000 (15:18 -0800)]
webkit support for inline video
Basically we provide a Video Layer for the inline video.
The java side change is at 101311.
bug:
3506407,
2126902
Change-Id: I9cc1b910f502595d6be7ac81e448343ca6ca9100
Nicolas Roard [Thu, 10 Mar 2011 23:23:23 +0000 (15:23 -0800)]
Merge "Fix CSS animations" into honeycomb-mr1
Nicolas Roard [Wed, 9 Mar 2011 21:52:11 +0000 (13:52 -0800)]
Fix CSS animations
- we were overriding existing animations.
- implement correctly the removeAnimations functions
- refactor AndroidAnimation (share common code)
- fix how we use the timing functions for the animations
- implements timing functions per keyframes
bug:
2453890
Change-Id: I367d708338c270171eeaacc7e2fb3729eb78c444
Patrick Scott [Thu, 10 Mar 2011 17:27:01 +0000 (12:27 -0500)]
Fix a crash with column layout.
If a layer is paginated and has a positioned grandparent,
paintPaginatedChildLayer might have an empty columnLayers vector. The logic in
updatePagination has a similar check.
Bug filed against webkit.org.
Bug:
4026385
Change-Id: I9c7de5ccab171148d26cdd187efb97d13c033ae5
Kristian Monsen [Thu, 10 Mar 2011 10:45:51 +0000 (02:45 -0800)]
Merge "Android part of fix for bug
3491968 Browser frozen on dunkindonuts.com" into honeycomb-mr1
Nicolas Roard [Thu, 10 Mar 2011 00:12:54 +0000 (16:12 -0800)]
Merge "Fix for gmail messages not showing after the first one. We were not resetting the unusable state (set by the clearView() function) when receiving new content..." into honeycomb-mr1
Nicolas Roard [Thu, 10 Mar 2011 00:08:15 +0000 (16:08 -0800)]
Fix for gmail messages not showing after the first one.
We were not resetting the unusable state (set by the clearView()
function) when receiving new content...
bug:
4080072
Change-Id: Ie1110b511392b0a7fd21bbc23aa1b824eb8a78ad
Leon Scroggins [Wed, 9 Mar 2011 22:21:09 +0000 (14:21 -0800)]
Merge "Do not attempt to put textfield onscreen when size changes." into honeycomb-mr1
Ben Murdoch [Wed, 9 Mar 2011 21:22:16 +0000 (13:22 -0800)]
Merge "Clear DOM storage when clearing other cached data." into honeycomb-mr1
Leon Scroggins [Wed, 9 Mar 2011 21:16:50 +0000 (16:16 -0500)]
Do not attempt to put textfield onscreen when size changes.
Bug:
4079218
A frameworks/base change will make it so the textfield scrolls
on screen when the IME is shown.
Change-Id: I654079288fdad657f476948476d689359cf48804
Cary Clark [Wed, 9 Mar 2011 21:05:53 +0000 (13:05 -0800)]
Merge "remove restriction on CSS Mimetype" into honeycomb-mr1
Kristian Monsen [Mon, 7 Mar 2011 16:00:00 +0000 (16:00 +0000)]
Android part of fix for bug
3491968 Browser frozen on dunkindonuts.com
Setting the new ignore limits flag when doing a sync load.
Depends on a chromium change:
https://android-git.corp.google.com/g/#change,100399
Change-Id: I5634c5ac6a158e39a31b04e51ccb74bd21430a0b
Cary Clark [Wed, 9 Mar 2011 20:48:29 +0000 (15:48 -0500)]
remove restriction on CSS Mimetype
This code is two years old and no longer relevant with the
Chromium http stack.
bug:
4075135
Change-Id: I4f0616d1992167aacdc6f8f0ef1ed1a6fc52bff8
Ben Murdoch [Fri, 4 Mar 2011 10:24:10 +0000 (10:24 +0000)]
Clear DOM storage when clearing other cached data.
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.
Bug:
2117649
Change-Id: I5b6ee075d2a8fb44ee373ad4462a33623c9c2460
Derek Sollenberger [Wed, 9 Mar 2011 17:26:57 +0000 (09:26 -0800)]
Merge "Prevent double deletion when timer callback causes plugin to be deleted." into honeycomb-mr1
Derek Sollenberger [Wed, 9 Mar 2011 16:21:07 +0000 (11:21 -0500)]
Prevent double deletion when timer callback causes plugin to be deleted.
bug:
4040002
Change-Id: I9e85db08805561109fdb1d270c018d7308bef5cf
Patrick Scott [Wed, 9 Mar 2011 13:05:26 +0000 (05:05 -0800)]
Merge "Parse x-auto-login and send it up to Java." into honeycomb-mr1
Cary Clark [Wed, 9 Mar 2011 12:48:12 +0000 (04:48 -0800)]
Merge "make the text selection handles match framework" into honeycomb-mr1
Ed Heyl [Wed, 9 Mar 2011 07:03:03 +0000 (23:03 -0800)]
cherry-pick this change from master (should be in honeycomb-mr1) (please don't merge)
Avoid Android modifications to JavaNPObjectV8.cpp/h
https://android-git.corp.google.com/g/40387 fixed a long-standing bug to
avoid leaking references to injected Java objects. However, it did so by
making changes to JavaNPObjectV8.cpp/h which were never upstreamed. This
change avoids the need for these changes.
This change also avoids the use of a local PassRefPtr, which was
incorrectly introduced in https://android-git.corp.google.com/g/36204.
Change-Id: Ia1e3245a953826bbfd8e085f7ed1b1341228255d
Nicolas Roard [Wed, 9 Mar 2011 01:06:17 +0000 (17:06 -0800)]
Fix CSS animation bugs
- we were replacing animations by new ones regardless of their types, so
when two anims (i.e. transform and opacity) where set on the same
layer, we'd only run the last one
- the selection of the keys for keyframes animations was buggy
bug:
2453890
Change-Id: I03da3f6c2ba1f5bf778e099e52d71d2f5e67d27e
Nicolas Roard [Wed, 9 Mar 2011 03:03:34 +0000 (19:03 -0800)]
Merge "Fix
2453890: animation via css -webkit-transform" into honeycomb-mr1
Nicolas Roard [Mon, 7 Mar 2011 19:14:44 +0000 (11:14 -0800)]
Partial invalidation of the browser textures
bug:
3461349 bug:
3464483
Change-Id: I627f06d0fe48aaa0adca65cd13dc738af87eeefc
Russell Brenner [Tue, 8 Mar 2011 22:20:31 +0000 (14:20 -0800)]
Fix
2453890: animation via css -webkit-transform
Followed model used for transform animations. Tested with
http://www.webkit.org/blog-files/leaves/.
Fixes http://b/
2453890.
Change-Id: Ie71217743b6e1ee9ab0e023fdff44e8c65c8d477
Cary Clark [Tue, 8 Mar 2011 21:02:44 +0000 (16:02 -0500)]
make the text selection handles match framework
bug:[TBD]
Change-Id: I1b1c912ba210c1f9126723ed8819a05f1617b3e6
Patrick Scott [Mon, 24 Jan 2011 17:17:56 +0000 (12:17 -0500)]
Parse x-auto-login and send it up to Java.
Bug:
3367381
Change-Id: Ia50dcf39c9045642037e684ecd1e2bee90a69f72
Kristian Monsen [Thu, 17 Feb 2011 16:43:20 +0000 (16:43 +0000)]
Fix for bug
3324285 jsc::bindings::convertValueToNPVariant fails to findroot() and passes objects as npvariant_void
Also trying lexicalGlobalObject as root object, the comment for
lexicalGlobalObject says:
// Global object in which the currently executing code was defined.
// Differs from dynamicGlobalObject() during function calls across web browser frames.
I'm guessing that is the case here.
Webkit bug:
https://bugs.webkit.org/show_bug.cgi?id=55216
Change-Id: I61b3df93261e3688f022cde058845b1e3dfedb38
Romain Guy [Tue, 8 Mar 2011 06:40:35 +0000 (22:40 -0800)]
Merge "Add support for partial invalidations Bug #
3461349" into honeycomb-mr1
Romain Guy [Tue, 8 Mar 2011 01:47:17 +0000 (17:47 -0800)]
Add support for partial invalidations
Bug #
3461349
Change-Id: Ie7905d44bc732b375a9468f9086e3e32ffe37388
Leon Scroggins [Mon, 7 Mar 2011 20:43:08 +0000 (15:43 -0500)]
DO NOT MERGE. Render media button and buttons properly.
Bug:
3009375
Requires a change to frameworks/base.
Change-Id: I39758fd9d21ed447c48ae050a9c3b0ed1b757b5a
Russell Brenner [Mon, 7 Mar 2011 18:53:57 +0000 (10:53 -0800)]
Merge "Fixed
3469204: Crash using downloaded fonts" into honeycomb-mr1
Patrick Scott [Wed, 2 Mar 2011 15:45:24 +0000 (10:45 -0500)]
Do not merge.
Remove the notion of root layers.
We were computing the root layer status incorrectly for some child layers. If an
iframe has a layer but it hasn't been attached, we might assume it is the root
layer of the tree and not produce a recording content.
Bug:
3492471
Change-Id: Ib81fb26d76742d74ebe244c34c1fab353fb9b78d
Russell Brenner [Thu, 3 Mar 2011 23:57:01 +0000 (15:57 -0800)]
Fixed
3469204: Crash using downloaded fonts
This change is still pending upstream, but is being applied here now to
make it into M1 before lockdown. Track the WebKit change at:
https://bugs.webkit.org/show_bug.cgi?id=54758
When font downloading completes, CSSFontFaceSource::fontLoaded() and
CSSSegmentedFontFace::fontLoaded() called pruneTable() to reclaim
GlyphPageTreeNode memory. On Android, downloading and rendering are on
different threads and these GlyphPageTreeNodes may still be in use on
the UI thread.
This change defers freeing those GlyphPageTreeNodes until
CSSFontFaceSource and CSSSegmentedFontFace are destroyed, which occurs
on the UI thread in response to Document::scheduleForcedStyleRecalc(),
which was called by CSSFontSelector::fontLoaded().
Change-Id: Ica74e5be92c00b8c761f5d29a2310c46e62fd9eb
Nicolas Roard [Fri, 4 Mar 2011 09:21:43 +0000 (01:21 -0800)]
am
8519dcd5: (-s ours) DO NOT MERGE : Cherry-pick of change I9942e8e4 from master
* commit '
8519dcd53eb4325b8d2d76c030d0af4503472df7':
DO NOT MERGE : Cherry-pick of change I9942e8e4 from master
Derek Sollenberger [Thu, 3 Mar 2011 22:00:11 +0000 (14:00 -0800)]
Merge "ensure plugins draw correctly even when they have been given focus." into honeycomb-mr1
Derek Sollenberger [Thu, 3 Mar 2011 20:13:18 +0000 (15:13 -0500)]
ensure plugins draw correctly even when they have been given focus.
The initial attempt at fixing this bug was to modify the clip, but
this was not correct and only fixed cases where the plugin was on
the left edge of the screen. This CL properly adjusts the plugin's
boundaries to make sure the content is drawn in the appropriate
position.
bug:
3477581
Change-Id: I5958228a93fa5600cd7e24ed9e7e1e26f6b241bc
Nicolas Roard [Thu, 3 Mar 2011 18:16:31 +0000 (10:16 -0800)]
Do not merge: Cherry-pick change I9942e8e4 from master
Wait the remaining of the 60FPS cap delay rather than not paint.
Returning true if called faster than 60FPS means
we are not drawing and ask for the framework to call
us again; this works in general because the framework recopy
the previous framebuffer. But in some cases, it didn't, causing
the webview to flicker. A correct fix would be to introduce
the capping in framework rather than try to doing it in the
webview; in the meantime we will sleep the remaining of the delay
as a workaround, so that we still provide the GPU
benefits we wanted (at >60FPS the GPU was being saturated in
some cases).
bug:
3500655
Change-Id: Ibaa1d93e0a13433a2c842b19b58538894fdaa7e4
Nicolas Roard [Thu, 3 Mar 2011 18:16:31 +0000 (10:16 -0800)]
DO NOT MERGE : Cherry-pick of change I9942e8e4 from master
Wait the remaining of the 60FPS cap delay rather than not paint.
Returning true if called faster than 60FPS means
we are not drawing and ask for the framework to call
us again; this works in general because the framework recopy
the previous framebuffer. But in some cases, it didn't, causing
the webview to flicker. A correct fix would be to introduce
the capping in framework rather than try to doing it in the
webview; in the meantime we will sleep the remaining of the delay
as a workaround, so that we still provide the GPU
benefits we wanted (at >60FPS the GPU was being saturated in
some cases).
bug:
3500655
Change-Id: Iae50737b6d3202a8a0d3ec6d4a5261fe1b6d1b3f
Derek Sollenberger [Thu, 3 Mar 2011 06:27:27 +0000 (22:27 -0800)]
am
1a2d40c0: (-s ours) am
b715a7c4: Do not merge: Cherry-pick change I21555e92 from master
* commit '
1a2d40c0fc6710c8ccefb3779b3f9c04c6e43ef5':
Do not merge: Cherry-pick change I21555e92 from master
Derek Sollenberger [Thu, 3 Mar 2011 02:26:16 +0000 (18:26 -0800)]
am
b715a7c4: Do not merge: Cherry-pick change I21555e92 from master
* commit '
b715a7c48aa637ebc2832775ea04567c915f6296':
Do not merge: Cherry-pick change I21555e92 from master
Derek Sollenberger [Wed, 2 Mar 2011 21:33:19 +0000 (16:33 -0500)]
Do not merge: Cherry-pick change I21555e92 from master
Bug:
3471680
Enable the plugin to specify the BGRA internal format for textures.
Change-Id: Ied336c0a2309d14033a065b74e675d6d4405551b
Bart Sears [Wed, 2 Mar 2011 23:35:34 +0000 (15:35 -0800)]
Merge "Enable the plugin to specify the BGRA internal format for textures."
Derek Sollenberger [Wed, 2 Mar 2011 21:33:19 +0000 (16:33 -0500)]
Enable the plugin to specify the BGRA internal format for textures.
Change-Id: I21555e923ba6ac6c2bcd291ffa73a1aa087bdb3b
Derek Sollenberger [Wed, 2 Mar 2011 21:03:09 +0000 (13:03 -0800)]
Merge "Ensure plugin content does not shift when gaining focus."
Derek Sollenberger [Wed, 2 Mar 2011 20:53:43 +0000 (12:53 -0800)]
am
959e9dbc: (-s ours) am
2764765b: Do not merge: Cherry-pick fix to framerate cap
* commit '
959e9dbc6321a6dafa3f419e67459e50ea29bc14':
Do not merge: Cherry-pick fix to framerate cap
Derek Sollenberger [Wed, 2 Mar 2011 20:44:58 +0000 (15:44 -0500)]
Ensure plugin content does not shift when gaining focus.
bug:
3477581
Change-Id: Ia7bbaaca405db33dbefaa8f6f00e9250580e5f7b
Nicolas Roard [Wed, 2 Mar 2011 19:04:40 +0000 (11:04 -0800)]
Merge "Fix Browser ANR"
Nicolas Roard [Tue, 1 Mar 2011 20:46:27 +0000 (12:46 -0800)]
Fix Browser ANR
The dtor of GLWebViewState is calling the dtor of its TiledPage
variables; the dtor of TiledPage wait until any pending painting
operations running in the TextureGenerator thread are done. The painting
operations ultimately paint using the current GLWebViewState's base
layer. We were doing unref() on the baselayer before destroying the
TiledPage...
bug:
3429924
Change-Id: I685e7fca5e5bae796f808debbf7e4ce668b83e6b
Leon Scroggins [Wed, 2 Mar 2011 17:31:51 +0000 (09:31 -0800)]
Merge "New assets for checkboxes and radio buttons."
Leon Scroggins [Wed, 2 Mar 2011 16:27:04 +0000 (11:27 -0500)]
New assets for checkboxes and radio buttons.
Bug:
3009375
Requires a change to frameworks/base.
Change-Id: I444d44c92fbf5fb3621fb39bfc7582a2ec987ce5
Cary Clark [Wed, 2 Mar 2011 14:34:43 +0000 (09:34 -0500)]
check for stacking context before scrolling layer
It doesn't make sense to scroll without a stacking
context.
bug:
3494970
Change-Id: I59e951b3688aa21f5c99b16a953b6620b501442c
Cary Clark [Wed, 2 Mar 2011 12:54:56 +0000 (04:54 -0800)]
Merge "disable nodes that are completely clipped out"
Ben Murdoch [Wed, 2 Mar 2011 10:18:03 +0000 (02:18 -0800)]
Merge "Crash on GL OOM to stop fallback to SW rendering."
Ben Murdoch [Wed, 2 Mar 2011 10:17:00 +0000 (02:17 -0800)]
Merge "Revert "Work around for pure virtual layers crash.""
Derek Sollenberger [Tue, 1 Mar 2011 21:49:43 +0000 (13:49 -0800)]
am
2764765b: Do not merge: Cherry-pick fix to framerate cap
* commit '
2764765b1eae36aff2deaec49a1589aeb636ee1d':
Do not merge: Cherry-pick fix to framerate cap
Kristian Monsen [Tue, 1 Mar 2011 21:12:31 +0000 (13:12 -0800)]
Merge "Part bug
3489551 Browser doesn't send cookies for HTML5 video in incognito"
Cary Clark [Tue, 1 Mar 2011 21:09:18 +0000 (16:09 -0500)]
disable nodes that are completely clipped out
If clipping a node's cursor rings results in all of the
rings going away, mark the node as disabled, and find a new
node.
bug:
3500759
Change-Id: Ie633b06de948ea0e1805598b0e8321f1f9863dc2
Derek Sollenberger [Tue, 1 Mar 2011 14:23:53 +0000 (09:23 -0500)]
Do not merge: Cherry-pick fix to framerate cap
Bug:
3471680
Fix framerate cap when multiple webviews exist.
Each view will now be capped at 60fps. The previous code would
either starve the drawing of additional webviews or would draw
them at a rate of 60fps/N where N is the number of webviews.
Change-Id: I359a79f5981bc29d57ce4b94eb00a5c9aee754d0
Kristian Monsen [Tue, 1 Mar 2011 20:10:09 +0000 (20:10 +0000)]
Part bug
3489551 Browser doesn't send cookies for HTML5 video in incognito
Added private mode variable for some cookie methods.
Needs following CL in frameworks/base:
https://android-git.corp.google.com/g/#change,99052
Change-Id: I158b5456d60b321be4264f130d39e4b444bfba47
John Reck [Tue, 1 Mar 2011 18:17:13 +0000 (10:17 -0800)]
Merge "Only support saveWebArchive for (X)HTML"
Kristian Monsen [Tue, 1 Mar 2011 18:08:41 +0000 (10:08 -0800)]
Merge "Part of fix for bug
3317722 User Trial: Browser stuck loading pages - IKXEVEREST-2628"
Kristian Monsen [Tue, 1 Mar 2011 17:01:17 +0000 (17:01 +0000)]
Part of fix for bug
3317722 User Trial: Browser stuck loading pages - IKXEVEREST-2628
Preserving original mime type when no new type is found for type
application/octet-stream or text/plain
Change-Id: Id98d4c4faef599e14ba5e1789700932ab55729de
Nicolas Roard [Mon, 28 Feb 2011 22:05:24 +0000 (14:05 -0800)]
GL perfs measurement
Change-Id: Id6e0b8199f82c44de0e7b1b7e7eb42bdb96bf908
Derek Sollenberger [Tue, 1 Mar 2011 15:39:54 +0000 (07:39 -0800)]
Merge "Fix framerate cap when multiple webviews exist."
Kristian Monsen [Tue, 1 Mar 2011 14:42:28 +0000 (06:42 -0800)]
Merge "Fix warning"
Kristian Monsen [Tue, 1 Mar 2011 11:46:07 +0000 (11:46 +0000)]
Fix warning
Change-Id: Ifb290ab8e027b1828c1c10ca3ee70eadedf23f66
Derek Sollenberger [Tue, 1 Mar 2011 14:23:53 +0000 (09:23 -0500)]
Fix framerate cap when multiple webviews exist.
Each view will now be capped at 60fps. The previous code would
either starve the drawing of additional webviews or would draw
them at a rate of 60fps/N where N is the number of webviews.
Change-Id: I5698d610b17d4c8cfe137c51c2b978dae04ae1cf
Derek Sollenberger [Tue, 1 Mar 2011 13:19:47 +0000 (05:19 -0800)]
Merge "Add support for plugins to use incognito mode."
Ben Murdoch [Tue, 1 Mar 2011 10:08:54 +0000 (02:08 -0800)]
Merge changes I7d73cc44,I610ebdbc
* changes:
Merge WebKit at Chromium 9.0.597.107: Update WebKit merge revision
Merge WebKit at Chromium 9.0.597.107: Initial merge by git.
Nicolas Roard [Tue, 1 Mar 2011 06:23:43 +0000 (22:23 -0800)]
am
17ed9cd4: am
7571a1f2: Cap framerate at 60fps
* commit '
17ed9cd411dd026b58faa85f77cf63c25eee4883':
Cap framerate at 60fps
John Reck [Tue, 1 Mar 2011 00:17:28 +0000 (16:17 -0800)]
Only support saveWebArchive for (X)HTML
Bug:
3492152
If the mimetype is not text/html or application/xhtml+xml, don't
try to save the page as a web archive and instead return NULL
Change-Id: Ieb9d65efd72392bedec41ba33ae2aeb1a0954bb4
Nicolas Roard [Mon, 28 Feb 2011 22:47:15 +0000 (14:47 -0800)]
am
7571a1f2: Cap framerate at 60fps
* commit '
7571a1f293987b3cbe0b393968b163d5ece2bd64':
Cap framerate at 60fps
Nicolas Roard [Mon, 28 Feb 2011 17:58:49 +0000 (09:58 -0800)]
Cap framerate at 60fps
bug:
3471680
Change-Id: Ia19c4402858b758312c1f801bda990275f970b63
Nicolas Roard [Mon, 28 Feb 2011 17:58:49 +0000 (09:58 -0800)]
Cap framerate at 60fps
Change-Id: I1b6be15a38d2afc55659872b82e13ebcd8fd2ada
Ben Murdoch [Mon, 28 Feb 2011 17:48:07 +0000 (17:48 +0000)]
Merge WebKit at Chromium 9.0.597.107: Update WebKit merge revision
Note that we are tracking the Chromium 9.0.597 release branch,
which is WebKit r72805 + stability cherry picks.
This corresponds to r78920 on the 597 release branch.
Change-Id: I7d73cc447de8511b956a75d8acb1379c21ab266e
Ben Murdoch [Mon, 28 Feb 2011 17:44:23 +0000 (17:44 +0000)]
Merge WebKit at Chromium 9.0.597.107: Initial merge by git.
Note that we are tracking the Chromium 9.0.597 release branch,
which is WebKit r72805 + stability cherry picks.
This corresponds to r78920 on the 597 release branch.
Change-Id: I610ebdbcba92cfa788b229ee207a405789d45e67
Ben Murdoch [Mon, 28 Feb 2011 13:57:18 +0000 (13:57 +0000)]
Crash on GL OOM to stop fallback to SW rendering.
If we detect an OOM from GL, crash the process to stop the
framework falling back to software rendering. The framework will
not enable HW rendering again until the process is killed and
Flash does not work with software rendering.
Bug:
3477085
Change-Id: I8defebbe3ea281c342fc99ace8638c347a3eb246
Derek Sollenberger [Fri, 25 Feb 2011 15:34:46 +0000 (10:34 -0500)]
Add support for plugins to use incognito mode.
bug:
2968415
Change-Id: Ie67c9f6b28a81d4a65f39bde2896078d7b49b8ee
Leon Scroggins [Fri, 25 Feb 2011 19:50:57 +0000 (14:50 -0500)]
Allow a site to specify to not show the IME for a textfield.
Bug:
3391139
Change-Id: Ic1c99750c9e91940d9ac628444be594f5f860748
Leon Scroggins [Fri, 25 Feb 2011 20:58:18 +0000 (12:58 -0800)]
Merge "Use UI side scrolling for readOnly textareas."
Leon Scroggins [Fri, 25 Feb 2011 20:54:52 +0000 (15:54 -0500)]
Use UI side scrolling for readOnly textareas.
Bug:
3300760
Change-Id: I44641bb4ba385ece2ace9f8dba2205b76e755289
Nicolas Roard [Fri, 25 Feb 2011 20:37:56 +0000 (12:37 -0800)]
Merge "Clean up synchronisation in Texture code."
Patrick Scott [Fri, 25 Feb 2011 19:42:01 +0000 (11:42 -0800)]
Merge "Fix frameset expansion."
Ben Murdoch [Thu, 24 Feb 2011 16:42:27 +0000 (16:42 +0000)]
Clean up synchronisation in Texture code.
Ensure that we wait in a while loop checking the condition when
we call wait, and only signal after unlocking the Mutex.
Also removes mNewRequest lock and condition in the TexturesGenerator
as it doesn't seem to be needed.
Hopefully this will clear up some ANRs.
Change-Id: I1b8b103a6effd2aa678a304e2519a6f6c484aaad
Patrick Scott [Thu, 17 Feb 2011 15:58:02 +0000 (10:58 -0500)]
Fix frameset expansion.
Do not expand frames that cannot scroll. Use contentsWidth and contentsHeight
instead of exposing docWidth. Trigger a layout of the parent if the FrameView's
layout reveals a larger content dimension. Remove iframe flattening code.
Bug:
3370518
Bug:
3323913
Change-Id: I60e89caf335bfaf271f90ffd538c65f3735572da
Leon Scroggins [Fri, 25 Feb 2011 18:01:39 +0000 (10:01 -0800)]
Merge "Use an appropriate parameter for revealSelection."
Russell Brenner [Fri, 25 Feb 2011 17:33:53 +0000 (09:33 -0800)]
Merge "Fixed
3425519, misalignment with fixed width font"