OSDN Git Service
Russell Brenner [Fri, 18 Mar 2011 23:53:58 +0000 (16:53 -0700)]
am
b1444e52: Fix for FBO offset when drawing with alpha
* commit '
b1444e524d3f5e888d1ae3300b2658321fc56349':
Fix for FBO offset when drawing with alpha
Nicolas Roard [Fri, 18 Mar 2011 23:53:25 +0000 (16:53 -0700)]
am
9af1c3b9: Merge "Fix for missing invals" into honeycomb-mr1
* commit '
9af1c3b94981315f36e34dea401adedbbb98d7da':
Fix for missing invals
Russell Brenner [Fri, 18 Mar 2011 20:57:51 +0000 (13:57 -0700)]
Fix for FBO offset when drawing with alpha
Use new DrawGlInfo struct to detect when drawing to an FBO and adjust
topLeft of destination to (0,0).
Bug:
3275491
Change-Id: Ia3ef85d6a21475dbd27743a15edd9d16d0d9cc9e
Nicolas Roard [Fri, 18 Mar 2011 22:50:54 +0000 (15:50 -0700)]
Merge "Fix for missing invals" into honeycomb-mr1
Nicolas Roard [Fri, 18 Mar 2011 22:42:12 +0000 (15:42 -0700)]
Fix for missing invals
bug:
4124433
Change-Id: I8cc7203dad408eff30da33f1c9a0a77dd7c97d66
Russell Brenner [Fri, 18 Mar 2011 22:34:22 +0000 (15:34 -0700)]
am
885c7dee: Merge "DO NOT MERGE Use libhwui\'s new private header. Bug #
3275491" into honeycomb-mr1
* commit '
885c7dee9944991f07e34aefe0b303d5b98ef560':
DO NOT MERGE Use libhwui's new private header. Bug #
3275491
Russell Brenner [Fri, 18 Mar 2011 22:28:44 +0000 (15:28 -0700)]
Merge "DO NOT MERGE Use libhwui's new private header. Bug #
3275491" into honeycomb-mr1
Romain Guy [Thu, 17 Mar 2011 18:08:18 +0000 (11:08 -0700)]
DO NOT MERGE Use libhwui's new private header.
Bug #
3275491
The DrawGlInfo struct is used by the OpenGL UI renderer and WebView to exchange
information. This new version of the struct adds information about the render
target and the current transform set on the Canvas.
Change-Id: Icc3bcc278898493ef4fe0f4574b231e6cfd6aca5
Nicolas Roard [Fri, 18 Mar 2011 02:05:56 +0000 (19:05 -0700)]
am
776c5d44: Limit the SkPicture size we use to paint. This improves performances by a visible factor on some websites.
* commit '
776c5d4485a2b75fb4e143b0a5984cba47aaac4d':
Limit the SkPicture size we use to paint. This improves performances by a visible factor on some websites.
Nicolas Roard [Fri, 18 Mar 2011 01:20:38 +0000 (18:20 -0700)]
Limit the SkPicture size we use to paint.
This improves performances by a visible factor on some websites.
bug:
4124418
Change-Id: I9b24408b686e24cf323eb5bae977d74a0f2e2a34
Russell Brenner [Thu, 17 Mar 2011 21:45:30 +0000 (14:45 -0700)]
am
1ae2d07b: Merge "Enabled shadow drawing" into honeycomb-mr1
* commit '
1ae2d07bc763fbb9dc3df9a62631d2f8fb707ce2':
Enabled shadow drawing
Russell Brenner [Thu, 17 Mar 2011 21:43:06 +0000 (14:43 -0700)]
Merge "Enabled shadow drawing" into honeycomb-mr1
Russell Brenner [Thu, 17 Mar 2011 19:06:52 +0000 (12:06 -0700)]
Enabled shadow drawing
Reworked the logic of setupForText() and setupShadowPaint() to render
correctly, as exhibited by http://acid3.acidtests.org.
Bug:
4075135
Change-Id: I595456b658d0872183dedcbc726be44783440f89
Nicolas Roard [Thu, 17 Mar 2011 18:54:26 +0000 (11:54 -0700)]
am
439cfed4: Fix Browser ANR
* commit '
439cfed476441572caa4206a622e3ef3c188798b':
Fix Browser ANR
Nicolas Roard [Thu, 17 Mar 2011 17:31:57 +0000 (10:31 -0700)]
Fix Browser ANR
The problem was that when attempting to forcefully destroy a texture
in TilesManager::cleanupLayersTextures(), the call to
LayerAndroid::removeTexture() may fail if the texture was busy being
painted -- the call to BackedDoubleBufferedTexture::release() would
return false, and the layer may thus still keep a pointer to the texture.
But the release() call, while indicating it failed, was only delaying
the release -- as soon as the texture was marked as not busy, it
could set its owner to nil.
We could thus have a situation where the layer did not reset its
texture pointers because the owner of the texture was not yet
changed, but the texture would then reset its owner to nil as soon
as it was not busy painting.
In TilesManager::cleanupLayersTexture() the next step before deleting
a texture is to check that the texture does not have an owner -- but
by then the texture could have been marked as not busy, and removed
its owner, letting TilesManager destroying it.
bug:
3472320
Change-Id: I3bcf169b30dfacba1773d3b79a3c0d205bf3cbdb
Nicolas Roard [Thu, 17 Mar 2011 06:51:33 +0000 (23:51 -0700)]
am
9f5143f9: Implement partial screen invalidations
* commit '
9f5143f9ae49a8e5fdb7ea626c4efad66096b020':
Implement partial screen invalidations
Nicolas Roard [Wed, 16 Mar 2011 01:20:42 +0000 (18:20 -0700)]
Implement partial screen invalidations
bug:
3461349
Change-Id: Id654d176c58027c67be7cb604b87c0ec68984525
Teng-Hui Zhu [Thu, 17 Mar 2011 06:03:10 +0000 (23:03 -0700)]
am
8e1d1088: Pass the URL at the enterfullscreen time
* commit '
8e1d10880da3108f7eb53ae81682a7c4192a2e3f':
Pass the URL at the enterfullscreen time
Teng-Hui Zhu [Tue, 15 Mar 2011 01:16:58 +0000 (18:16 -0700)]
Pass the URL at the enterfullscreen time
bug:
2126902
Change-Id: I84a27fabccc32ef85c8d78d6702d22ffca497db7
Shimeng (Simon) Wang [Thu, 17 Mar 2011 00:26:52 +0000 (17:26 -0700)]
am
9863c30d: Merge "Fix page jump after clicking links in nytimes.com" into honeycomb-mr1
* commit '
9863c30dfa5b5a03577c0ad069bb04d70435ac2d':
Fix page jump after clicking links in nytimes.com
Romain Guy [Thu, 17 Mar 2011 00:26:46 +0000 (17:26 -0700)]
am
6e9c5336: Merge "Pass the clip rect to WebView to optimize rendering" into honeycomb-mr1
* commit '
6e9c5336ef1a230b1cabc7c55ef19aeee6c00f55':
Pass the clip rect to WebView to optimize rendering
Shimeng (Simon) Wang [Thu, 17 Mar 2011 00:24:44 +0000 (17:24 -0700)]
Merge "Fix page jump after clicking links in nytimes.com" into honeycomb-mr1
Romain Guy [Thu, 17 Mar 2011 00:24:35 +0000 (17:24 -0700)]
Merge "Pass the clip rect to WebView to optimize rendering" into honeycomb-mr1
Shimeng (Simon) Wang [Thu, 17 Mar 2011 00:13:12 +0000 (17:13 -0700)]
Fix page jump after clicking links in nytimes.com
This reverts parts of change in
https://android-git.corp.google.com/g/#change,96777
issue:
4024447
Change-Id: I29b5de1f97ed9d7cd70786cdcfeb91b53563e66e
Russell Brenner [Wed, 16 Mar 2011 23:02:03 +0000 (16:02 -0700)]
am
d6f0aa4a: Merge "Fix crash in WebCore::GlyphPageTreeNode::getChild" into honeycomb-mr1
* commit '
d6f0aa4a5a76d43d382dad30b31541fc7372206b':
Fix crash in WebCore::GlyphPageTreeNode::getChild
Russell Brenner [Wed, 16 Mar 2011 23:00:54 +0000 (16:00 -0700)]
Merge "Fix crash in WebCore::GlyphPageTreeNode::getChild" into honeycomb-mr1
Russell Brenner [Fri, 4 Mar 2011 02:29:26 +0000 (18:29 -0800)]
Fix crash in WebCore::GlyphPageTreeNode::getChild
Using existing Skia APIs, FontCache::createFontPlatformData can detect
when the retrieved font is the Skia default and will reject that choice,
allowing WebCore to try the next font on the CSS fallback list. If the
requested family is a generic family, e.g. "serif" or "monotype", the
Skia default will be accepted.
A prior attempt at this fix was not properly handling bold and italic
stylings, which could eventually lead to dangling references to freed
font data used for layout while custom fonts were loading, causing
segfaults in getChild and elsewhere during page rendering.
Bug:
3469204
Bug:
2720133
Change-Id: I3a9e746e18fd27848d0c4b9e1232392df33254a6
Romain Guy [Wed, 16 Mar 2011 22:29:42 +0000 (15:29 -0700)]
Pass the clip rect to WebView to optimize rendering
Change-Id: Ic1f96b82a5da5cd08d282002a0ae5d4f53d0f92e
Shimeng (Simon) Wang [Wed, 16 Mar 2011 21:47:34 +0000 (14:47 -0700)]
am
6a3bd3f2: For first layout, reset current textures and update base layer.
* commit '
6a3bd3f2b6b5a5c80e5fc1674550456b67e2cc7c':
For first layout, reset current textures and update base layer.
Shimeng (Simon) Wang [Wed, 16 Mar 2011 18:31:36 +0000 (11:31 -0700)]
For first layout, reset current textures and update base layer.
issue:
4094300
Change-Id: If8e58daa621e01ac372f2111ebde522a6f90b2e5
Derek Sollenberger [Wed, 16 Mar 2011 20:34:41 +0000 (13:34 -0700)]
am
ab60a512: Merge "Disable the use of EGL fences for synchronization." into honeycomb-mr1
* commit '
ab60a5124c80ef3bbbe80a8ad714f07457d29f98':
Disable the use of EGL fences for synchronization.
Leon Scroggins [Wed, 16 Mar 2011 20:34:39 +0000 (13:34 -0700)]
am
9d867bf3: More improvements to video player controls.
* commit '
9d867bf3af621a847929fdc13e4c36ffcaa580f2':
More improvements to video player controls.
Derek Sollenberger [Wed, 16 Mar 2011 20:17:43 +0000 (13:17 -0700)]
Merge "Disable the use of EGL fences for synchronization." into honeycomb-mr1
Leon Scroggins [Wed, 16 Mar 2011 19:34:02 +0000 (15:34 -0400)]
More improvements to video player controls.
Bug:
4080127
Inset the track by half the width of the thumb so the thumb
travels along the entire length of it.
Make the track narrower vertically, and align it with the
center of the thumb drawing.
Draw the portion of the track that has already been covered
with a different asset.
Change-Id: I37acedc8e8b75bab59fcac7e075c59d70550795c
Derek Sollenberger [Wed, 16 Mar 2011 19:47:39 +0000 (15:47 -0400)]
Disable the use of EGL fences for synchronization.
bug:
4098273
Change-Id: Iaf7eaa13b9d4410dfb984af0e4a83dadedb09648
Leon Scroggins [Wed, 16 Mar 2011 17:52:25 +0000 (10:52 -0700)]
am
4754f763: Turn on filtering so the buttons look better.
* commit '
4754f7630fe9e26150d5ed2cfb4f231c57539c02':
Turn on filtering so the buttons look better.
Leon Scroggins [Wed, 16 Mar 2011 15:29:21 +0000 (11:29 -0400)]
Turn on filtering so the buttons look better.
Bug:
4080127
Change-Id: Ie1f29ce09fcc0389c5d458238460ae846d449ccc
Derek Sollenberger [Tue, 15 Mar 2011 19:58:39 +0000 (12:58 -0700)]
am
49fff159: Merge "Enable synchronization with fencing." into honeycomb-mr1
* commit '
49fff159362adc0289fe593ac113a8d0a0671edf':
Enable synchronization with fencing.
Derek Sollenberger [Tue, 15 Mar 2011 19:56:56 +0000 (12:56 -0700)]
Merge "Enable synchronization with fencing." into honeycomb-mr1
Derek Sollenberger [Tue, 15 Mar 2011 18:51:30 +0000 (14:51 -0400)]
Enable synchronization with fencing.
We currently rely on the fact that nvidia serializes glFlush calls
to ensure synchronization, but we should be using fences to handle
this synchronization step.
bug:
4098273
Change-Id: I13c4790434dea07d9da68b8ebebbba15b1e085a5
Nicolas Roard [Tue, 15 Mar 2011 17:46:22 +0000 (10:46 -0700)]
am
c9464184: Merge "Fix layers repaint synchronisation issues" into honeycomb-mr1
* commit '
c9464184bfacc628a8d6cbc59969c1d4f9413c81':
Fix layers repaint synchronisation issues
Nicolas Roard [Tue, 15 Mar 2011 17:44:42 +0000 (10:44 -0700)]
Merge "Fix layers repaint synchronisation issues" into honeycomb-mr1
Ben Murdoch [Tue, 15 Mar 2011 16:29:49 +0000 (09:29 -0700)]
am
115fa20e: Fix scrolling on sites hosting content inside a single <frame>
* commit '
115fa20e56568607490319cf8075fca19ae9112c':
Fix scrolling on sites hosting content inside a single <frame>
Ben Murdoch [Tue, 15 Mar 2011 12:47:30 +0000 (12:47 +0000)]
Fix scrolling on sites hosting content inside a single <frame>
Force a layout of the frameview when we detect that a frames
content post flattening is wider than the original frame.
Also force a relayout of the frame as necessary to sync the
correct dimensions (i.e. when navigation occurs inside the frame)
Bug:
4051085
Change-Id: Ib2543601a71b6931bb3ec4bfda75a2cac26bb2a1
Nicolas Roard [Sat, 12 Mar 2011 03:03:28 +0000 (19:03 -0800)]
Fix layers repaint synchronisation issues
bug:
4079662 bug:
3469243
Change-Id: I2538e33c97e3cf8a937bc310847298b68669a24f
Nicolas Roard [Tue, 15 Mar 2011 02:16:26 +0000 (19:16 -0700)]
am
833c9cea: Improving HTML5 video controls
* commit '
833c9ceaa300f52cf2d1b12a9b3482ad417a3c21':
Improving HTML5 video controls
Nicolas Roard [Mon, 14 Mar 2011 20:23:18 +0000 (13:23 -0700)]
Improving HTML5 video controls
- correct support for the fullscreen button
- change the controls to be 48px high
- auto-hide the controls, touching the video makes them appear again
bug:
2126902
Change-Id: Idd2b720034de3d5d432c9ea62d9045934c46f6c1
Russell Brenner [Tue, 15 Mar 2011 00:02:27 +0000 (17:02 -0700)]
am
a0fb3c7e: Merge "Custom font was appearing all white in Books" into honeycomb-mr1
* commit '
a0fb3c7e0c38540c392a5248b0f1100c158612f9':
Custom font was appearing all white in Books
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:44:48 +0000 (14:44 -0700)]
am
9bddcae7: Merge "b/
3392594 keep the remaining touch points when one is ended." into honeycomb-mr1
* commit '
9bddcae7719c7fd62778a3cf1a63b1fdceb8e25a':
b/
3392594 keep the remaining touch points when one is ended.
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 18:50:34 +0000 (11:50 -0700)]
am
db584582: am
68c22180: Apply webit security patch
* commit '
db584582301d76b995c98bb52ba4dd87c3cf8caf':
Apply webit security patch
Bart Sears [Mon, 14 Mar 2011 00:34:36 +0000 (17:34 -0700)]
am
df04d7a7: am
bcc07753: Cherry-pick change Ibaa52a6b (webkit security patch)
* commit '
df04d7a71c88ac5b84b3a3d06fdc8834eb1f2da2':
Cherry-pick change Ibaa52a6b (webkit security patch)
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
Bart Sears [Sun, 13 Mar 2011 23:50:03 +0000 (16:50 -0700)]
am
68c22180: Apply webit security patch
* commit '
68c221808cf7a4776ba8feae02611d3c78e9f857':
Apply webit security patch
Nicolas Roard [Sat, 12 Mar 2011 00:34:19 +0000 (16:34 -0800)]
am
25b37912: Merge "Improve HTML5 audio/video controls" into honeycomb-mr1
* commit '
25b379124e2660c9310c65e647c32d533d9237c0':
Improve HTML5 audio/video controls
Nicolas Roard [Sat, 12 Mar 2011 00:31:22 +0000 (16:31 -0800)]
Merge "Improve HTML5 audio/video controls" into honeycomb-mr1
Bart Sears [Sat, 12 Mar 2011 00:17:22 +0000 (16:17 -0800)]
Apply webit security patch
bug:
4089100
Change-Id: Ibaa52a6bcbbe47f33ec4131051309ed05b05748b
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 23:53:14 +0000 (15:53 -0800)]
am
e8173146: Fix a crash caused by the wrong destruction handling
* commit '
e81731463bed439d17002741ea595c5800e87854':
Fix a crash caused by the wrong destruction handling
Nicolas Roard [Fri, 11 Mar 2011 23:14:18 +0000 (15:14 -0800)]
am
cc267939: HTML5 Video improvements
* commit '
cc2679391d89b57997f78365d54d99c9ae062db3':
HTML5 Video improvements
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:59:51 +0000 (08:59 -0800)]
am
418d5bb2: Merge "allow multiple invals to return first difference" into honeycomb-mr1
* commit '
418d5bb2d2861f58a456e803f2e4246376585185':
allow multiple invals to return first difference
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:56:47 +0000 (08:56 -0800)]
am
d17e8139: increase the memory cap for bitmaps
* commit '
d17e8139637faa490628e75a3a5647a96786afce':
increase the memory cap for bitmaps
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:24:37 +0000 (18:24 -0800)]
am
a1c8c003: Fix for display glitches.
* commit '
a1c8c0030ee40ef422e2d7229fed1737d1b270ac':
Fix for display glitches.
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, 11 Mar 2011 01:13:07 +0000 (17:13 -0800)]
am
331fdb19: webkit support for inline video
* commit '
331fdb1964135091e1a4f5508cbff6a9dab0ea97':
webkit support for inline video
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:25:17 +0000 (15:25 -0800)]
am
ad5136a7: Merge "Fix CSS animations" into honeycomb-mr1
* commit '
ad5136a701b6100295270b62040f2cfb8fecb053':
Fix CSS animations
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:56:25 +0000 (09:56 -0800)]
am
2a22f2ec: Fix a crash with column layout.
* commit '
2a22f2ec394ac3dc5b4e26c8e9ade6942005e7a2':
Fix a crash with column layout.
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:52:17 +0000 (02:52 -0800)]
am
08a7cd3d: Merge "Android part of fix for bug
3491968 Browser frozen on dunkindonuts.com" into honeycomb-mr1
* commit '
08a7cd3d0a715e83b2b51febab13f9ab62154cf2':
Android part of fix for bug
3491968 Browser frozen on dunkindonuts.com
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:16:04 +0000 (16:16 -0800)]
am
95cb21b0: 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
* commit '
95cb21b0cde2a64281360f9e45f31f049e583273':
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...
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:22:52 +0000 (14:22 -0800)]
am
55550b6a: Merge "Do not attempt to put textfield onscreen when size changes." into honeycomb-mr1
* commit '
55550b6a4e21f05e01e48dfa7674bdad8f17c3d1':
Do not attempt to put textfield onscreen when size changes.
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:36:38 +0000 (13:36 -0800)]
am
05bdccdb: Merge "Clear DOM storage when clearing other cached data." into honeycomb-mr1
* commit '
05bdccdbcfd40b731c68ddc249d43bf9cfa08f3d':
Clear DOM storage when clearing other cached data.
Cary Clark [Wed, 9 Mar 2011 21:36:35 +0000 (13:36 -0800)]
am
63e8611f: Merge "remove restriction on CSS Mimetype" into honeycomb-mr1
* commit '
63e8611fe24e589a25662aa5ef011da87ad25074':
remove restriction on CSS Mimetype
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:30:40 +0000 (09:30 -0800)]
am
615fcf00: Merge "Prevent double deletion when timer callback causes plugin to be deleted." into honeycomb-mr1
* commit '
615fcf00641400b4851396f3ac5525818c4aa33a':
Prevent double deletion when timer callback causes plugin to be deleted.
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:08:17 +0000 (05:08 -0800)]
am
d9fa508e: Merge "Parse x-auto-login and send it up to Java." into honeycomb-mr1
* commit '
d9fa508e3486607d040245aac43aa3f60e761a03':
Parse x-auto-login and send it up to Java.
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