OSDN Git Service
Nicolas Roard [Sat, 12 Mar 2011 00:39:37 +0000 (16:39 -0800)]
resolved conflicts for merge of
43edd45c to master
Change-Id: I270cbb054174dd3c2dc4464b484ad2c5a8db2724
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
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:56:37 +0000 (15:56 -0800)]
am
c23f88ac: am
e8173146: Fix a crash caused by the wrong destruction handling
* commit '
c23f88acfdc140b27fb31ab21fa79a7fa288c5aa':
Fix a crash caused by the wrong destruction handling
Nicolas Roard [Fri, 11 Mar 2011 23:54:02 +0000 (15:54 -0800)]
resolved conflicts for merge of
24e276c8 to master
Change-Id: I1f46d4444330bf7e03b99a5d0089e9388b9ea8bd
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 17:01:37 +0000 (09:01 -0800)]
am
e76100ec: am
418d5bb2: Merge "allow multiple invals to return first difference" into honeycomb-mr1
* commit '
e76100ecb3b42c39d42e561ebe850b122a259f50':
allow multiple invals to return first difference
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:58:50 +0000 (08:58 -0800)]
am
64d778d8: am
d17e8139: increase the memory cap for bitmaps
* commit '
64d778d878c3458e0610d3276a5581c1cb134ef6':
increase the memory cap for bitmaps
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:27:02 +0000 (18:27 -0800)]
am
c8f51213: am
a1c8c003: Fix for display glitches.
* commit '
c8f5121342c691a3491be42df11029628fb0d7a3':
Fix for display glitches.
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:15:10 +0000 (17:15 -0800)]
am
76060d50: am
331fdb19: webkit support for inline video
* commit '
76060d5095d4cbdeeec7f24cffcf8509ff8319d3':
webkit support for inline video
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:27:09 +0000 (15:27 -0800)]
am
1ef33939: am
ad5136a7: Merge "Fix CSS animations" into honeycomb-mr1
* commit '
1ef33939a7137a30cae17f33be2c5c351627c12c':
Fix CSS animations
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 18:02:04 +0000 (10:02 -0800)]
am
5b3887e9: am
2a22f2ec: Fix a crash with column layout.
* commit '
5b3887e9865915bffea12f8bff3e2a6f6b41b346':
Fix a crash with column layout.
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:54:22 +0000 (02:54 -0800)]
am
98df90ee: am
08a7cd3d: Merge "Android part of fix for bug
3491968 Browser frozen on dunkindonuts.com" into honeycomb-mr1
* commit '
98df90ee912e96ba6b1ee2f6983bc9ac6e78d021':
Android part of fix for bug
3491968 Browser frozen on dunkindonuts.com
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:19:37 +0000 (16:19 -0800)]
am
9c386d95: 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 '
9c386d95d33a6a17d8e7634a60d9a21535b7e456':
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: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:25:14 +0000 (14:25 -0800)]
am
f6fdbf35: am
55550b6a: Merge "Do not attempt to put textfield onscreen when size changes." into honeycomb-mr1
* commit '
f6fdbf3574ff706462d9e1e495b7812556578e64':
Do not attempt to put textfield onscreen when size changes.
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 22:05:01 +0000 (14:05 -0800)]
am
bc3bf9d0: am
05bdccdb: Merge "Clear DOM storage when clearing other cached data." into honeycomb-mr1
* commit '
bc3bf9d0c1bcbb18a881f2be8a9b57b522b1fbde':
Clear DOM storage when clearing other cached data.
Cary Clark [Wed, 9 Mar 2011 22:04:53 +0000 (14:04 -0800)]
am
992fbcb2: am
63e8611f: Merge "remove restriction on CSS Mimetype" into honeycomb-mr1
* commit '
992fbcb2e10456f2fd90fc015ad49cf19c9c7911':
remove restriction on CSS Mimetype
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:34:21 +0000 (09:34 -0800)]
am
389f0e9b: am
615fcf00: Merge "Prevent double deletion when timer callback causes plugin to be deleted." into honeycomb-mr1
* commit '
389f0e9b6ac8f6a71e48062b2a92ec1b95f3bb4e':
Prevent double deletion when timer callback causes plugin to be deleted.
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:10:41 +0000 (05:10 -0800)]
am
e353f163: am
d9fa508e: Merge "Parse x-auto-login and send it up to Java." into honeycomb-mr1
* commit '
e353f163a37db818805a767a9ebd3166913cc429':
Parse x-auto-login and send it up to Java.
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
Cary Clark [Wed, 9 Mar 2011 12:51:33 +0000 (04:51 -0800)]
am
a31744c7: am
9901e533: Merge "make the text selection handles match framework" into honeycomb-mr1
* commit '
a31744c792d744c3f2534bec88ee3269c75e9f45':
make the text selection handles match framework
Cary Clark [Wed, 9 Mar 2011 12:49:25 +0000 (04:49 -0800)]
am
9901e533: Merge "make the text selection handles match framework" into honeycomb-mr1
* commit '
9901e53349de61181119ae283f302109dd020de4':
make the text selection handles match framework
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:53:49 +0000 (23:53 -0800)]
am
d365415b: (-s ours) am
12db9a64: cherry-pick this change from master (should be in honeycomb-mr1) (please don\'t merge) Avoid Android modifications to JavaNPObjectV8.cpp/h
* commit '
d365415b209f683e812414dc62e006efa5e0b10b':
cherry-pick this change from master (should be in honeycomb-mr1) (please don't merge) Avoid Android modifications to JavaNPObjectV8.cpp/h
Nicolas Roard [Wed, 9 Mar 2011 07:53:31 +0000 (23:53 -0800)]
am
2f6d1dd4: am
91672cbe: Fix CSS animation bugs
* commit '
2f6d1dd4fdca6cdfd126806d395518f1f719b493':
Fix CSS animation bugs
Nicolas Roard [Wed, 9 Mar 2011 07:53:29 +0000 (23:53 -0800)]
am
9f47571b: am
42046545: Merge "Fix
2453890: animation via css -webkit-transform" into honeycomb-mr1
* commit '
9f47571b269cadbf4980189a49eac73b993737b6':
Fix
2453890: animation via css -webkit-transform
Nicolas Roard [Wed, 9 Mar 2011 07:53:19 +0000 (23:53 -0800)]
am
99a10c9f: am
67e4aa15: Partial invalidation of the browser textures
* commit '
99a10c9fbf989ffb17c7871bcb0bc9ce9a959061':
Partial invalidation of the browser textures
Ed Heyl [Wed, 9 Mar 2011 07:05:52 +0000 (23:05 -0800)]
am
12db9a64: cherry-pick this change from master (should be in honeycomb-mr1) (please don\'t merge) Avoid Android modifications to JavaNPObjectV8.cpp/h
* commit '
12db9a6492824cedb54ec0cd640e686a7af09e91':
cherry-pick this change from master (should be in honeycomb-mr1) (please don't merge) Avoid Android modifications to JavaNPObjectV8.cpp/h
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 03:08:25 +0000 (19:08 -0800)]
am
91672cbe: Fix CSS animation bugs
* commit '
91672cbe203b55ec355d118636d333e9e7d7f3d7':
Fix CSS animation bugs
Nicolas Roard [Wed, 9 Mar 2011 03:06:19 +0000 (19:06 -0800)]
am
42046545: Merge "Fix
2453890: animation via css -webkit-transform" into honeycomb-mr1
* commit '
42046545ce1012ef3f925011573d265339778bed':
Fix
2453890: animation via css -webkit-transform
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:04:17 +0000 (19:04 -0800)]
am
67e4aa15: Partial invalidation of the browser textures
* commit '
67e4aa15702646d5ff50e9524f4e63eb9ed20122':
Partial invalidation of the browser textures
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 [Tue, 8 Mar 2011 18:31:58 +0000 (10:31 -0800)]
am
686f445b: am
deb796f5: Fix for bug
3324285 jsc::bindings::convertValueToNPVariant fails to findroot() and passes objects as npvariant_void
* commit '
686f445b3722f75d892bc87d362d148051bb433b':
Fix for bug
3324285 jsc::bindings::convertValueToNPVariant fails to findroot() and passes objects as npvariant_void
Kristian Monsen [Tue, 8 Mar 2011 18:28:51 +0000 (10:28 -0800)]
am
deb796f5: Fix for bug
3324285 jsc::bindings::convertValueToNPVariant fails to findroot() and passes objects as npvariant_void
* commit '
deb796f509e2ad13b4ef4c01b1a1e707b4e762ee':
Fix for bug
3324285 jsc::bindings::convertValueToNPVariant fails to findroot() and passes objects as npvariant_void
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:45:56 +0000 (22:45 -0800)]
am
8a897356: am
24b320d3: Merge "Add support for partial invalidations Bug #
3461349" into honeycomb-mr1
* commit '
8a8973568714f408e96af307c4c0705977be1c4a':
Add support for partial invalidations Bug #
3461349
Romain Guy [Tue, 8 Mar 2011 06:43:10 +0000 (22:43 -0800)]
am
24b320d3: Merge "Add support for partial invalidations Bug #
3461349" into honeycomb-mr1
* commit '
24b320d351369a76f0bf7ac2bad37f5dfd4681cd':
Add support for partial invalidations Bug #
3461349
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 21:55:53 +0000 (13:55 -0800)]
am
318f22f0: (-s ours) am
ee677f6f: DO NOT MERGE. Render media button and buttons properly.
* commit '
318f22f072d501f93608458108241a5a9cba47a2':
DO NOT MERGE. Render media button and buttons properly.
Leon Scroggins [Mon, 7 Mar 2011 21:53:16 +0000 (13:53 -0800)]
am
ee677f6f: DO NOT MERGE. Render media button and buttons properly.
* commit '
ee677f6fd67ba73ab199614a8feb02d41544b3ca':
DO NOT MERGE. Render media button and buttons properly.
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:58:46 +0000 (10:58 -0800)]
am
abdd559e: am
f61e9d35: Merge "Fixed
3469204: Crash using downloaded fonts" into honeycomb-mr1
* commit '
abdd559eedd585db57d167929b13aa1504e22d66':
Fixed
3469204: Crash using downloaded fonts
Russell Brenner [Mon, 7 Mar 2011 18:56:59 +0000 (10:56 -0800)]
am
f61e9d35: Merge "Fixed
3469204: Crash using downloaded fonts" into honeycomb-mr1
* commit '
f61e9d35316897cadf1f8969a368da73f826ac02':
Fixed
3469204: Crash using downloaded fonts
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 [Mon, 7 Mar 2011 18:13:25 +0000 (10:13 -0800)]
am
aaee3773: (-s ours) am
9e143ba2: Do not merge.
* commit '
aaee377323103c293737da2c699a1e47f1424678':
Do not merge.
Patrick Scott [Mon, 7 Mar 2011 18:11:55 +0000 (10:11 -0800)]
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
Leon Scroggins [Thu, 3 Mar 2011 21:41:44 +0000 (16:41 -0500)]
Clean up nine patch drawing for reusability.
Part of bug:
3009375
Change-Id: I0fb1ae509e8077cbec4a19be9391f880df4b6448
Leon Scroggins [Thu, 3 Mar 2011 21:05:45 +0000 (16:05 -0500)]
Use members rather than globals to avoid leaking memory.
Part of bug:
3009375
Requires a change to frameworks/base.
Change-Id: I9f5e86afff4c87e16889eadf0ad0049120885480
Patrick Scott [Wed, 2 Mar 2011 15:45:24 +0000 (10:45 -0500)]
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: I83d33d991d53108110f99fc2d33d58713b50a695
Nicolas Roard [Fri, 4 Mar 2011 09:41:22 +0000 (01:41 -0800)]
am
92e134c0: (-s ours) am
4ffd02f8: am
8519dcd5: (-s ours) DO NOT MERGE : Cherry-pick of change I9942e8e4 from master
* commit '
92e134c0de18436342a0e2ebe41b46396080d3ea':
DO NOT MERGE : Cherry-pick of change I9942e8e4 from master
Nicolas Roard [Fri, 4 Mar 2011 09:23:59 +0000 (01:23 -0800)]
am
4ffd02f8: am
8519dcd5: (-s ours) DO NOT MERGE : Cherry-pick of change I9942e8e4 from master
* commit '
4ffd02f8c673bc6ce1a6b96f9fd3b21e8337ec7c':
DO NOT MERGE : Cherry-pick of change I9942e8e4 from master
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
Ed Heyl [Fri, 4 Mar 2011 06:26:16 +0000 (22:26 -0800)]
Merge branch 'master' of ssh://android-git:29418/platform/external/webkit
Ed Heyl [Fri, 4 Mar 2011 05:49:08 +0000 (21:49 -0800)]
Merge branch 'master' into honeycomb-plus-aosp