OSDN Git Service
Bart Sears [Tue, 30 Nov 2010 01:12:45 +0000 (17:12 -0800)]
am
1baa4609: Cherry-pick WebKit security fix (webkit.org r64706) Do not merge
* commit '
1baa4609252ea42065c4399b9081b2087c8d70a2':
Cherry-pick WebKit security fix (webkit.org r64706) Do not merge
Bart Sears [Wed, 3 Nov 2010 23:03:53 +0000 (16:03 -0700)]
Cherry-pick WebKit security fix (webkit.org r64706) Do not merge
See http://trac.webkit.org/changeset/64706
Bug:
3162623
Change-Id: I17abfbac4013ea98401f4088e9079faa15b9b8d9
Ben Murdoch [Thu, 21 Oct 2010 18:46:23 +0000 (11:46 -0700)]
am
2da7ed0b: Cherry-pick WebKit security fix (webkit.org r67967) Do not merge
Merge commit '
2da7ed0ba7ed78d0ccaca0a65fc07cfe202a9ed3' into gingerbread-plus-aosp
* commit '
2da7ed0ba7ed78d0ccaca0a65fc07cfe202a9ed3':
Cherry-pick WebKit security fix (webkit.org r67967) Do not merge
Ben Murdoch [Thu, 21 Oct 2010 18:46:21 +0000 (11:46 -0700)]
am
ee4c9585: Cherry-pick WebKit security fix (webkit.org r69345) Do not merge
Merge commit '
ee4c9585fe53aff7a0aa833b9a5d3e861e16578e' into gingerbread-plus-aosp
* commit '
ee4c9585fe53aff7a0aa833b9a5d3e861e16578e':
Cherry-pick WebKit security fix (webkit.org r69345) Do not merge
Ben Murdoch [Thu, 21 Oct 2010 18:46:18 +0000 (11:46 -0700)]
am
3017f37b: Cherry-pick WebKit security fix (webkit.org r68705) Do not merge
Merge commit '
3017f37b06cfa16f11a1e986e3c4ecc0c4757c32' into gingerbread-plus-aosp
* commit '
3017f37b06cfa16f11a1e986e3c4ecc0c4757c32':
Cherry-pick WebKit security fix (webkit.org r68705) Do not merge
Ben Murdoch [Thu, 21 Oct 2010 18:46:15 +0000 (11:46 -0700)]
am
910dc2ab: Cherry-pick WebKit security fix (webkit.org r69476) Do not merge
Merge commit '
910dc2ab50b8f32067f7b45f9e46d26a2aa681c6' into gingerbread-plus-aosp
* commit '
910dc2ab50b8f32067f7b45f9e46d26a2aa681c6':
Cherry-pick WebKit security fix (webkit.org r69476) Do not merge
Ben Murdoch [Thu, 21 Oct 2010 18:46:11 +0000 (11:46 -0700)]
am
80a0e2c2: Cherry-pick WebKit security fix (webkit.org r68408) Do not merge
Merge commit '
80a0e2c21aa3d6657bbf3fbd69e5eb624f16a1bf' into gingerbread-plus-aosp
* commit '
80a0e2c21aa3d6657bbf3fbd69e5eb624f16a1bf':
Cherry-pick WebKit security fix (webkit.org r68408) Do not merge
Ben Murdoch [Thu, 21 Oct 2010 18:46:06 +0000 (11:46 -0700)]
am
d3bed0e7: Cherry-pick WebKit security fix (webkit.org r68096) Do not merge
Merge commit '
d3bed0e7c739f46e955406b920498b86724e7705' into gingerbread-plus-aosp
* commit '
d3bed0e7c739f46e955406b920498b86724e7705':
Cherry-pick WebKit security fix (webkit.org r68096) Do not merge
Ben Murdoch [Thu, 21 Oct 2010 18:46:02 +0000 (11:46 -0700)]
am
8da84207: Cherry-pick WebKit security fix (webkit.org r68485) Do not merge
Merge commit '
8da84207b2b14801ccc039279df2a859a4a52847' into gingerbread-plus-aosp
* commit '
8da84207b2b14801ccc039279df2a859a4a52847':
Cherry-pick WebKit security fix (webkit.org r68485) Do not merge
Ben Murdoch [Thu, 21 Oct 2010 18:45:53 +0000 (11:45 -0700)]
am
a7b8ec70: Cherry-pick WebKit security fix (webkit.org r68860) Do not merge
Merge commit '
a7b8ec708c2566cc6e69c0b464e416c018227b02' into gingerbread-plus-aosp
* commit '
a7b8ec708c2566cc6e69c0b464e416c018227b02':
Cherry-pick WebKit security fix (webkit.org r68860) Do not merge
Ben Murdoch [Thu, 21 Oct 2010 16:25:55 +0000 (17:25 +0100)]
Cherry-pick WebKit security fix (webkit.org r67967) Do not merge
See http://trac.webkit.org/changeset/67967
Note this is only a partial cherry pick of r67967 as it is
based on a CL later than our current revision and not all
deltas are relevant.
Change-Id: I7d153c9470abb2b0994900b2c5909fded4a94752
Ben Murdoch [Thu, 21 Oct 2010 16:18:11 +0000 (17:18 +0100)]
Cherry-pick WebKit security fix (webkit.org r69345) Do not merge
See http://trac.webkit.org/changeset/69345
Change-Id: Ie0f421c22fc4ec007417181c834e50033a389230
Ben Murdoch [Thu, 21 Oct 2010 16:16:55 +0000 (17:16 +0100)]
Cherry-pick WebKit security fix (webkit.org r68705) Do not merge
See http://trac.webkit.org/changeset/68705
Change-Id: I5a3b76fa6e536746af794a15b187bc197000387b
Ben Murdoch [Thu, 21 Oct 2010 16:09:00 +0000 (17:09 +0100)]
Cherry-pick WebKit security fix (webkit.org r69476) Do not merge
See http://trac.webkit.org/changeset/69476
Change-Id: If25c271f9d1cda225fbdf040d2f1d2bc57529768
Ben Murdoch [Thu, 21 Oct 2010 16:02:36 +0000 (17:02 +0100)]
Cherry-pick WebKit security fix (webkit.org r68408) Do not merge
See http://trac.webkit.org/changeset/68408
Change-Id: I53167c57f32a43c6bd80a1aca8126f41cb01da53
Ben Murdoch [Thu, 21 Oct 2010 15:28:03 +0000 (16:28 +0100)]
Cherry-pick WebKit security fix (webkit.org r68096) Do not merge
See http://trac.webkit.org/changeset/68096
Note that this is not an exact cherry pick of the above webkit
CL as it is dependant on http://trac.webkit.org/changeset/61094
that we do not have and provides the Element::isIdAttributName and
Element::getIdAttribute methods. 61094 is a large change so we do
not take it, rather use methods that achieve the same effect.
Change-Id: Ifae90116f794673a610dd7988ba366a0b51888d9
Ben Murdoch [Thu, 21 Oct 2010 15:26:08 +0000 (16:26 +0100)]
Cherry-pick WebKit security fix (webkit.org r68485) Do not merge
See http://trac.webkit.org/changeset/68485
Change-Id: I714d385759a6e30d315cd2ace4aa87a2d7b28e92
Ben Murdoch [Thu, 21 Oct 2010 15:17:55 +0000 (16:17 +0100)]
Cherry-pick WebKit security fix (webkit.org r68860) Do not merge
See http://trac.webkit.org/changeset/68860
Change-Id: I7860374528be836e1f4ea7c6faa48966fd3ed23c
Ben Murdoch [Tue, 19 Oct 2010 17:30:21 +0000 (10:30 -0700)]
am
93bec1ec: DO NOT MERGE : Fix Webkit comments for document.createTouch
Merge commit '
93bec1ec2d7bca6a6df6bb0391d1b6a0d6562f33' into gingerbread-plus-aosp
* commit '
93bec1ec2d7bca6a6df6bb0391d1b6a0d6562f33':
DO NOT MERGE : Fix Webkit comments for document.createTouch
Ben Murdoch [Sun, 17 Oct 2010 15:26:08 +0000 (16:26 +0100)]
DO NOT MERGE : Fix Webkit comments for document.createTouch
Cherry pick to GingerBread.
See WebKit bug https://bugs.webkit.org/show_bug.cgi?id=47676
for details.
Bug:
3101402
Change-Id: I8e2b0fc54468cd0827229243716c7d6bb62c7b3c
Shimeng (Simon) Wang [Tue, 19 Oct 2010 00:04:33 +0000 (17:04 -0700)]
am
77ab6dc8: Don\'t force video end event when full screen video playing is returned.
Merge commit '
77ab6dc8b75bf7684366ba6e154ed3f95a125a55' into gingerbread-plus-aosp
* commit '
77ab6dc8b75bf7684366ba6e154ed3f95a125a55':
Don't force video end event when full screen video playing is returned.
Shimeng (Simon) Wang [Mon, 18 Oct 2010 21:41:06 +0000 (14:41 -0700)]
Don't force video end event when full screen video playing is returned.
Use pause instead.
issue:
3102273
Change-Id: Ic4ba84a5d9f7976abbb8ff0443f1d00f4a8390f8
Leon Clarke [Mon, 18 Oct 2010 17:27:02 +0000 (10:27 -0700)]
am
156ddd48: Add more padding round select boxes, use different assets at different resolutions, use new assets and don\'t deform the arrows when stretching the select box. b/issue?id=
2506670
Merge commit '
156ddd48e9c54012469fed6e7341586e0425c3d2' into gingerbread-plus-aosp
* commit '
156ddd48e9c54012469fed6e7341586e0425c3d2':
Add more padding round select boxes, use different assets at
Nicolas Roard [Mon, 18 Oct 2010 17:27:00 +0000 (10:27 -0700)]
am
7d095dd5: fix the pause() problem...
Merge commit '
7d095dd5f96c8f68593ba0e848e5e26bb3785e5d' into gingerbread-plus-aosp
* commit '
7d095dd5f96c8f68593ba0e848e5e26bb3785e5d':
fix the pause() problem...
Nicolas Roard [Mon, 18 Oct 2010 17:26:57 +0000 (10:26 -0700)]
am
44b3c7e8: Fix media element creation
Merge commit '
44b3c7e814ec1151cbbcfb1960b9a1d44d0359ac' into gingerbread-plus-aosp
* commit '
44b3c7e814ec1151cbbcfb1960b9a1d44d0359ac':
Fix media element creation
Nicolas Roard [Mon, 18 Oct 2010 17:26:54 +0000 (10:26 -0700)]
am
3d57c253: Implement the audio tag in webkit -- the corresponding java CL is https://android-git.corp.google.com/g/#change,41406
Merge commit '
3d57c253bfa22c17c5f38a70e162a6115a1809b6' into gingerbread-plus-aosp
* commit '
3d57c253bfa22c17c5f38a70e162a6115a1809b6':
Implement the audio tag in webkit -- the corresponding java CL is https://android-git.corp.google.com/g/#change,41406
Leon Clarke [Wed, 21 Apr 2010 13:20:35 +0000 (14:20 +0100)]
Add more padding round select boxes, use different assets at
different resolutions, use new assets and don't deform the arrows
when stretching the select box.
http://b/issue?id=
2506670
DO NOT MERGE, cherry pick to GingerBread
Bug:
3101402
Change-Id: I21224922db45c1cf4585667d8fa323c6a59dd240
Nicolas Roard [Tue, 11 May 2010 22:46:00 +0000 (15:46 -0700)]
fix the pause() problem...
DO NOT MERGE, cherry pick to Gingerbread from master.
Bug:
3101402
Change-Id: Ifbdab630badfffa12bc166ac20e804efba16436a
Nicolas Roard [Tue, 11 May 2010 19:20:30 +0000 (12:20 -0700)]
Fix media element creation
Cherry pick to Gingerbread, DO NOT MERGE!
Bug:
3101402
Change-Id: I095182351ef49d5931241a50ab0880d6743659a5
Nicolas Roard [Tue, 2 Feb 2010 13:11:32 +0000 (13:11 +0000)]
Implement the audio tag in webkit -- the corresponding java CL is https://android-git.corp.google.com/g/#change,41406
Cherry pick to Gingerbread, DO NOT MERGE!
Bug:
3101402
Change-Id: Idbfb0efcc777f9354fcf88df32105ca9e50a24cd
Ben Murdoch [Mon, 18 Oct 2010 10:09:02 +0000 (03:09 -0700)]
am
5013a3fb: DO NOT MERGE Implement the document.createTouch, createTouchList APIs
Merge commit '
5013a3fb99f9ca1c7be4319cdebc7cddcaa56d7c' into gingerbread-plus-aosp
* commit '
5013a3fb99f9ca1c7be4319cdebc7cddcaa56d7c':
DO NOT MERGE Implement the document.createTouch, createTouchList APIs
Ben Murdoch [Sun, 17 Oct 2010 15:33:00 +0000 (16:33 +0100)]
DO NOT MERGE Implement the document.createTouch, createTouchList APIs
Cherry pick to Gingerbread to enable HTML5 video playback on some
sites that look for certain APIs to determine player compatability.
Do not merge.
Bug:
3101402
Change-Id: Id54f4cbac23208249922c3ef44086c8d9828d32c
Shimeng (Simon) Wang [Sat, 16 Oct 2010 01:36:02 +0000 (18:36 -0700)]
Shimeng (Simon) Wang [Thu, 16 Sep 2010 22:03:07 +0000 (15:03 -0700)]
DO NOT MERGE
For cherry-picking to GB.
Implement supportsType in MediaPlayerPrivateAndroid.
Use Java API to obtain this info.
issue:
3101402
Change-Id: I2baaf8ad861bec9b9b6f92fe753cbd879b33497c
Cary Clark [Wed, 13 Oct 2010 14:04:36 +0000 (07:04 -0700)]
am
e228a64d: Merge "Provide padding + border values for textfields." into gingerbread
Merge commit '
e228a64d32a6c1f9d88cf43529f69792207585dd' into gingerbread-plus-aosp
* commit '
e228a64d32a6c1f9d88cf43529f69792207585dd':
Provide padding + border values for textfields.
Cary Clark [Wed, 13 Oct 2010 13:57:15 +0000 (06:57 -0700)]
Merge "Provide padding + border values for textfields." into gingerbread
Leon Scroggins [Tue, 12 Oct 2010 18:01:13 +0000 (14:01 -0400)]
Provide padding + border values for textfields.
Bug:
3085564
They are used by WebView.java to align the WebTextView's
text positioning with the page below. This allows the
selection and insertion arrow handlers to line up better
with the actual selection on the page.
Requires a change in frameworks/base:
https://android-git.corp.google.com/g/#change,73565
Change-Id: Ia100286016a780abd5f30e32975f8ad566a6ed74
Cary Clark [Mon, 11 Oct 2010 19:56:57 +0000 (12:56 -0700)]
am
5cff132a: change webkit text select to orange
Merge commit '
5cff132af1e80304bdcb267bb9ee7201a25656ad' into gingerbread-plus-aosp
* commit '
5cff132af1e80304bdcb267bb9ee7201a25656ad':
change webkit text select to orange
Cary Clark [Mon, 11 Oct 2010 19:36:51 +0000 (15:36 -0400)]
change webkit text select to orange
This changes the selection to a transparent orange.
This won't match the UI exactly, because this draws
transparently over the text instead of opaquely
behind the text.
This also changes the design of the text selection
handles to match the bitmaps in the UI.
http://b/
3083069
Change-Id: I02656c42a3020f9b1e5dbc431c47bf2b51d22de8
Patrick Scott [Thu, 7 Oct 2010 21:48:21 +0000 (14:48 -0700)]
am
3f8366e5: Revert to skia\'s decoder for gifs with 1 frame.
Merge commit '
3f8366e53853027e7e11d4a40a1ad3f7a1ff5a65' into gingerbread-plus-aosp
* commit '
3f8366e53853027e7e11d4a40a1ad3f7a1ff5a65':
Revert to skia's decoder for gifs with 1 frame.
Patrick Scott [Thu, 7 Oct 2010 19:11:03 +0000 (15:11 -0400)]
Revert to skia's decoder for gifs with 1 frame.
If a site has a bunch of gifs, they will all be kept in memory. If the gif only
has one frame, revert to using skia's decoder so that we can share the memory
and use RLE encoding.
Bug:
3060919
Change-Id: I3091b184ce4a8c27a264473526ce4ea83a20e74f
Cary Clark [Fri, 1 Oct 2010 13:57:35 +0000 (06:57 -0700)]
am
8180f816: Do not merge: fix array overwrite crasher
Merge commit '
8180f8161470f2d0d6080c64149cf25ed3b755a5' into gingerbread-plus-aosp
* commit '
8180f8161470f2d0d6080c64149cf25ed3b755a5':
Do not merge: fix array overwrite crasher
Cary Clark [Thu, 30 Sep 2010 19:14:40 +0000 (15:14 -0400)]
Do not merge: fix array overwrite crasher
If two nodes have the same coordinates, one is deleted.
If either has focus, the focus needs to be transfered
to the other, and the focus index recomputed, so the
index won't point to the wrong node.
If the two nodes are at the end of the list, the
index may point off the end of the array, subsequently
crashing on access.
This is a possible security issue.
Change-Id: I1ca934074637fbf68e40318fbc354e28c6b474ba
http://b/
3043268
Cary Clark [Wed, 15 Sep 2010 17:36:46 +0000 (10:36 -0700)]
am
1441f89d: Do not merge -- restrict text selection to the main layer
Merge commit '
1441f89dceb65cbe25d23b1b90005e51d3ed28bd' into gingerbread-plus-aosp
* commit '
1441f89dceb65cbe25d23b1b90005e51d3ed28bd':
Do not merge -- restrict text selection to the main layer
Cary Clark [Wed, 15 Sep 2010 15:29:20 +0000 (11:29 -0400)]
Do not merge -- restrict text selection to the main layer
Gmail causes layers to appear as a message is scrolled. This confuses
the text selection logic. To workaround this in Gingerbread,
text selection is only allowed to be drawn in the main layer.
Change-Id: Idd814bcb5dfeef2fc12d6b0d586a63f711351d96
http://b/
2998882
Steve Block [Mon, 13 Sep 2010 13:53:45 +0000 (06:53 -0700)]
am
e3a33d1e: Cherry-pick security fix in WebKit change 63048. Do not merge
Merge commit '
e3a33d1e0c60357ad9f36df6e16799ddb5942917' into gingerbread-plus-aosp
* commit '
e3a33d1e0c60357ad9f36df6e16799ddb5942917':
Cherry-pick security fix in WebKit change 63048. Do not merge
Steve Block [Mon, 13 Sep 2010 09:38:59 +0000 (10:38 +0100)]
Cherry-pick security fix in WebKit change 63048. Do not merge
See http://trac.webkit.org/changeset/63048
Note that this required a manual merge as we do not have
http://trac.webkit.org/changeset/59988
Bug:
2986936
Change-Id: I82617a011f68aeea953000d5487f40b32dcc7c72
Steve Block [Fri, 10 Sep 2010 11:32:59 +0000 (04:32 -0700)]
am
946ea101: Cherry-pick security fix in WebKit change 66052
Merge commit '
946ea101a7673e7f566d52b1ba81f85b75666d16' into gingerbread-plus-aosp
* commit '
946ea101a7673e7f566d52b1ba81f85b75666d16':
Cherry-pick security fix in WebKit change 66052
Steve Block [Fri, 10 Sep 2010 11:32:57 +0000 (04:32 -0700)]
am
93f07dbc: Cherry-pick security fix in WebKit change 65826
Merge commit '
93f07dbc620b468fe98b72a93f0d0e84c40353cd' into gingerbread-plus-aosp
* commit '
93f07dbc620b468fe98b72a93f0d0e84c40353cd':
Cherry-pick security fix in WebKit change 65826
Steve Block [Fri, 10 Sep 2010 11:32:54 +0000 (04:32 -0700)]
am
badca5a6: Cherry-pick security fix in WebKit change 65748
Merge commit '
badca5a6d49b048c5dc9c5a847ab2d729b936b09' into gingerbread-plus-aosp
* commit '
badca5a6d49b048c5dc9c5a847ab2d729b936b09':
Cherry-pick security fix in WebKit change 65748
Steve Block [Fri, 10 Sep 2010 11:32:52 +0000 (04:32 -0700)]
am
0a05678e: Cherry-pick security fix in WebKit change 65329
Merge commit '
0a05678e32a04623b93aa4d3990d14877ee80386' into gingerbread-plus-aosp
* commit '
0a05678e32a04623b93aa4d3990d14877ee80386':
Cherry-pick security fix in WebKit change 65329
Steve Block [Fri, 10 Sep 2010 11:32:49 +0000 (04:32 -0700)]
am
6dba6e09: Cherry-pick security fix in WebKit change 65280
Merge commit '
6dba6e09f232d333432972b64d0074cbee59ca7a' into gingerbread-plus-aosp
* commit '
6dba6e09f232d333432972b64d0074cbee59ca7a':
Cherry-pick security fix in WebKit change 65280
Steve Block [Fri, 10 Sep 2010 11:32:46 +0000 (04:32 -0700)]
am
3f2f7e2f: Cherry-pick security fix in WebKit change 65090
Merge commit '
3f2f7e2fd4924ef8eaf542740438ede42a81732e' into gingerbread-plus-aosp
* commit '
3f2f7e2fd4924ef8eaf542740438ede42a81732e':
Cherry-pick security fix in WebKit change 65090
Steve Block [Fri, 10 Sep 2010 11:32:42 +0000 (04:32 -0700)]
am
e1d3e323: Cherry-pick security fix in WebKit change 64293
Merge commit '
e1d3e323642600e02d50760bd7dacd11e4ccfa83' into gingerbread-plus-aosp
* commit '
e1d3e323642600e02d50760bd7dacd11e4ccfa83':
Cherry-pick security fix in WebKit change 64293
Steve Block [Fri, 10 Sep 2010 11:32:39 +0000 (04:32 -0700)]
am
da4ffba3: Cherry-pick security fix in WebKit change 64077
Merge commit '
da4ffba387f70730453d4533272dd55870dd81bb' into gingerbread-plus-aosp
* commit '
da4ffba387f70730453d4533272dd55870dd81bb':
Cherry-pick security fix in WebKit change 64077
Steve Block [Fri, 10 Sep 2010 11:32:35 +0000 (04:32 -0700)]
am
237faca5: Cherry-pick security fix in WebKit change 63773
Merge commit '
237faca5ff0377c7fda5c4dcc0f287e67fe66091' into gingerbread-plus-aosp
* commit '
237faca5ff0377c7fda5c4dcc0f287e67fe66091':
Cherry-pick security fix in WebKit change 63773
Steve Block [Fri, 10 Sep 2010 11:32:31 +0000 (04:32 -0700)]
am
440c0366: Cherry-pick security fix in WebKit change 63772
Merge commit '
440c0366ae0192fb737c7dd87dc2d7156266b3f7' into gingerbread-plus-aosp
* commit '
440c0366ae0192fb737c7dd87dc2d7156266b3f7':
Cherry-pick security fix in WebKit change 63772
Steve Block [Fri, 10 Sep 2010 11:32:27 +0000 (04:32 -0700)]
am
be2b5a3f: Cherry-pick security fix in WebKit change 62873
Merge commit '
be2b5a3fe0063db46087ef38f78a1e2aa7b47631' into gingerbread-plus-aosp
* commit '
be2b5a3fe0063db46087ef38f78a1e2aa7b47631':
Cherry-pick security fix in WebKit change 62873
Steve Block [Fri, 10 Sep 2010 11:32:22 +0000 (04:32 -0700)]
am
d8dd893d: Cherry-pick security fix in WebKit change 62271
Merge commit '
d8dd893d690e9d208fe4a71b7d62374687d279f4' into gingerbread-plus-aosp
* commit '
d8dd893d690e9d208fe4a71b7d62374687d279f4':
Cherry-pick security fix in WebKit change 62271
Steve Block [Fri, 10 Sep 2010 11:32:15 +0000 (04:32 -0700)]
am
eea24577: Cherry-pick security fix in WebKit change 62134
Merge commit '
eea2457721313546f0b5ddab3836282e338847b9' into gingerbread-plus-aosp
* commit '
eea2457721313546f0b5ddab3836282e338847b9':
Cherry-pick security fix in WebKit change 62134
Steve Block [Fri, 10 Sep 2010 11:32:10 +0000 (04:32 -0700)]
am
a926fcfd: Cherry-pick security fix in WebKit change 61709
Merge commit '
a926fcfd627808c13994eb22aa991c82fd57673a' into gingerbread-plus-aosp
* commit '
a926fcfd627808c13994eb22aa991c82fd57673a':
Cherry-pick security fix in WebKit change 61709
Steve Block [Thu, 9 Sep 2010 10:55:43 +0000 (11:55 +0100)]
Cherry-pick security fix in WebKit change 66052
See http://trac.webkit.org/changeset/66052
Bug:
2986936
Change-Id: I42d1b546b328e28d8dd817c5904fa1d0ee0b759c
Steve Block [Thu, 9 Sep 2010 10:56:25 +0000 (11:56 +0100)]
Cherry-pick security fix in WebKit change 65826
See http://trac.webkit.org/changeset/65826
Bug:
2986936
Change-Id: Ie69df8dfa6314d46e5dbf51663ebb207995b8d3b
Steve Block [Thu, 9 Sep 2010 10:55:57 +0000 (11:55 +0100)]
Cherry-pick security fix in WebKit change 65748
See http://trac.webkit.org/changeset/65748
Bug:
2986936
Change-Id: Idd9927f39d49b8eadd589f1513cf5210cd9dfee0
Steve Block [Thu, 9 Sep 2010 10:52:21 +0000 (11:52 +0100)]
Cherry-pick security fix in WebKit change 65329
See http://trac.webkit.org/changeset/65329
Bug:
2986936
Change-Id: I664cc00bba4cdd68cc5e23d2566279de614f5f64
Steve Block [Thu, 9 Sep 2010 10:17:57 +0000 (11:17 +0100)]
Cherry-pick security fix in WebKit change 65280
See http://trac.webkit.org/changeset/65280
Bug:
2986936
Change-Id: Ia70edaa46747536a9e7adc05493ef70a9baec610
Steve Block [Thu, 9 Sep 2010 10:18:29 +0000 (11:18 +0100)]
Cherry-pick security fix in WebKit change 65090
See http://trac.webkit.org/changeset/65090
Note that this required a manual merge due to our not having
http://trac.webkit.org/changeset/60251
Bug:
2986936
Change-Id: I035ec5d92c4e31cc8f7667dfc46e22d2a02cda97
Steve Block [Thu, 9 Sep 2010 10:17:44 +0000 (11:17 +0100)]
Cherry-pick security fix in WebKit change 64293
See http://trac.webkit.org/changeset/64293
Bug:
2986936
Change-Id: I2b4e9d218909872260e031032356b02038b73ced
Steve Block [Thu, 9 Sep 2010 10:17:13 +0000 (11:17 +0100)]
Cherry-pick security fix in WebKit change 64077
See http://trac.webkit.org/changeset/64077
Bug:
2986936
Change-Id: Ic3e825e880f2094f274758af93a0949b0b9278f0
Steve Block [Thu, 9 Sep 2010 10:16:44 +0000 (11:16 +0100)]
Cherry-pick security fix in WebKit change 63773
See http://trac.webkit.org/changeset/63773
Bug:
2986936
Change-Id: I5536ceeee25b07476a92e4531862c7c9d7beb6c8
Steve Block [Thu, 9 Sep 2010 10:20:02 +0000 (11:20 +0100)]
Cherry-pick security fix in WebKit change 63772
See http://trac.webkit.org/changeset/63772
Note that this is only a partial cherry-pick. I don't think that the
fix to RenderBlock::canMergeContiguousAnonymousBlocks() is required as
we don't have this method in our version of WebKit. The method was
added in http://trac.webkit.org/changeset/60201). Attempting to make
the fix without this change, or cherry-picking this change too, would
be too high risk.
Bug:
2986936
Change-Id: I8d9f1924611e693e340dcb2f05a43d5673ef23b1
Steve Block [Thu, 9 Sep 2010 11:00:30 +0000 (12:00 +0100)]
Cherry-pick security fix in WebKit change 62873
See http://trac.webkit.org/changeset/62873
Bug:
2986936
Change-Id: I8353bade3fb14aedeaa517e6bc8331cd05ee3fd8
Steve Block [Thu, 9 Sep 2010 10:53:31 +0000 (11:53 +0100)]
Cherry-pick security fix in WebKit change 62271
See http://trac.webkit.org/changeset/62271
Bug:
2986936
Change-Id: I368b10ff368aef5317c01b18524f1e0521df056e
Steve Block [Thu, 9 Sep 2010 10:53:17 +0000 (11:53 +0100)]
Cherry-pick security fix in WebKit change 62134
See http://trac.webkit.org/changeset/62134
Bug:
2986936
Change-Id: Ie5c1698e58b9183519aae5dfa8cf5fb8f158feb1
Steve Block [Thu, 9 Sep 2010 11:00:49 +0000 (12:00 +0100)]
Cherry-pick security fix in WebKit change 61709
See http://trac.webkit.org/changeset/61709
Bug:
2986936
Change-Id: Ib2be95d12bb89c57b6f30d57cd6422bbbf364fc6
Melanie Clements [Tue, 31 Aug 2010 16:10:30 +0000 (09:10 -0700)]
am
ff93a851: Bug fix
2337042 <base> URL + <img> URL = URL that starts with "/."
Merge commit '
ff93a851c578d0b570c84b3a83a41a4930e7107c' into gingerbread-plus-aosp
* commit '
ff93a851c578d0b570c84b3a83a41a4930e7107c':
Bug fix
2337042 <base> URL + <img> URL = URL that starts with "/."
Melanie Clements [Fri, 20 Aug 2010 18:19:20 +0000 (14:19 -0400)]
Bug fix
2337042 <base> URL + <img> URL = URL that starts with "/."
The Android browser inserts "/." at the beginning of the URL path
when processing an <img> in an HTML document with a <base> tag.
This does not cause any errors but should be fixed to comply with
RFC 3986 section 5.4.
This only happens at the first pass of the URL parsing, at the second
pass where the base and path are parsed together this is dealt with
correctly. I am therefore fixing it by modifying the parse() method
in KURL to check for a trailing '.' at the end of the base segment.
Change-Id: I0d641c8619e00aa2b08a33e271ef863cee5ed7ad
Cary Clark [Fri, 27 Aug 2010 15:19:11 +0000 (08:19 -0700)]
am
90fa57cd: DO NOT MERGE make the text selection easier to hit
Merge commit '
90fa57cd8b940ab1b46a85da92d950392a77e9da' into gingerbread-plus-aosp
* commit '
90fa57cd8b940ab1b46a85da92d950392a77e9da':
DO NOT MERGE make the text selection easier to hit
Cary Clark [Thu, 26 Aug 2010 21:47:21 +0000 (17:47 -0400)]
DO NOT MERGE make the text selection easier to hit
Change-Id: I47b7aa04ebc2a8f0bf2c6b4399ef65e5f4c58d4e
http://b/
2626451
Cary Clark [Tue, 24 Aug 2010 13:46:50 +0000 (06:46 -0700)]
am
21ed5a45: Merge "check for null pictures when selecting text" into gingerbread
Merge commit '
21ed5a4502b3ce76875505aa220f187d165f47b1' into gingerbread-plus-aosp
* commit '
21ed5a4502b3ce76875505aa220f187d165f47b1':
check for null pictures when selecting text
Cary Clark [Tue, 24 Aug 2010 13:44:55 +0000 (06:44 -0700)]
Merge "check for null pictures when selecting text" into gingerbread
Cary Clark [Mon, 23 Aug 2010 21:06:50 +0000 (17:06 -0400)]
check for null pictures when selecting text
The LayerAndroid supplied to SelectText may have no picture
associated with it. If that's the case, ignore it.
This change was original uploaded as
https://android-git.corp.google.com/g/#change,62627
in master, but then I realized it should go into
gingerbread as well, and get merged into master automagically.
http://b/
2930142
Change-Id: If6332d81f1f9baba804131caae124dd18e0b0799
Jean-Baptiste Queru [Tue, 24 Aug 2010 06:37:10 +0000 (23:37 -0700)]
am
828ef22d: merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward
Merge commit '
828ef22db863664b8e992adf15ddf92ef570f4f8' into gingerbread-plus-aosp
* commit '
828ef22db863664b8e992adf15ddf92ef570f4f8':
Cherry-pick WebKit change 61921 to fix exploitable memory corruption in RenderBoxModelObject
Cherry-pick WebKit change 60984 to fix an exploitable crash when focus is changed
Jean-Baptiste Queru [Tue, 24 Aug 2010 02:08:20 +0000 (19:08 -0700)]
merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward
Change-Id: I5e13be05f736290ca88772aaca51273d3996c6c2
Cary Clark [Fri, 20 Aug 2010 16:28:25 +0000 (09:28 -0700)]
am
e4be1fd5: DO NOT MERGE Refactor find and select dialogs
Merge commit '
e4be1fd5f14137de249ee66c000f9dadfb2862d7' into gingerbread-plus-aosp
* commit '
e4be1fd5f14137de249ee66c000f9dadfb2862d7':
DO NOT MERGE Refactor find and select dialogs
Cary Clark [Thu, 19 Aug 2010 22:31:48 +0000 (18:31 -0400)]
DO NOT MERGE Refactor find and select dialogs
(Change imported by hand from master, based on
https://android-git.corp.google.com/g/#change,53489 )
SelectText now permits incremental extension of the selection
using either touch or trackball data. SelectText adds word selection
and select all interfaces.
SelectText has been rewritten to do a better job of finding space
characters and selecting text outside of the visible window.
Companion changes in frameworks/base and packages/apps/Browser
Change-Id: I28a815375345d842f79464edbf0cb3a2019b7fe8
http://b/
2626451
Steve Block [Thu, 5 Aug 2010 11:12:56 +0000 (12:12 +0100)]
Cherry-pick WebKit change 61921 to fix exploitable memory corruption in RenderBoxModelObject
Bug:
2895569
Change-Id: Iea09dc4fdc35e68ccad36deed2132f02e3778e34
Steve Block [Thu, 5 Aug 2010 11:10:12 +0000 (12:10 +0100)]
Cherry-pick WebKit change 60984 to fix an exploitable crash when focus is changed
Bug:
2895569
Change-Id: I76f48ca7d6ddee996127254c5f1f00e355318527
Henrik Baard [Tue, 17 Aug 2010 14:51:05 +0000 (07:51 -0700)]
am
5dc34a85: activeDocumentLoader() causes crash in WebCoreFrameBridge.cpp
Merge commit '
5dc34a8555dde1ae4a2c174870c4296cc44f8a22' into gingerbread-plus-aosp
* commit '
5dc34a8555dde1ae4a2c174870c4296cc44f8a22':
activeDocumentLoader() causes crash in WebCoreFrameBridge.cpp
Henrik Baard [Fri, 13 Aug 2010 15:02:46 +0000 (17:02 +0200)]
activeDocumentLoader() causes crash in WebCoreFrameBridge.cpp
This is a fix for a crash found in real phones, there is cases when
activeDocumentLoader() can return null, probably related to closing of a
frame or canceling of a request.
Change-Id: Id340ab006b6e40e396645a4e668dcb58824a63e7
Steve Block [Sat, 7 Aug 2010 01:59:56 +0000 (18:59 -0700)]
am
e9ee2d86: am
a4279478: Cherry-pick WebKit change 61921 to fix exploitable memory corruption in RenderBoxModelObject
Merge commit '
e9ee2d864ded6c57c02ebc2ff6e41a0711d099d3' into gingerbread-plus-aosp
* commit '
e9ee2d864ded6c57c02ebc2ff6e41a0711d099d3':
Cherry-pick WebKit change 61921 to fix exploitable memory corruption in RenderBoxModelObject
Steve Block [Sat, 7 Aug 2010 01:59:53 +0000 (18:59 -0700)]
am
7162fe0e: am
2b6ea029: Cherry-pick WebKit change 60984 to fix an exploitable crash when focus is changed
Merge commit '
7162fe0e3c5886b6c35f42c5cd9d9e83aa3785cf' into gingerbread-plus-aosp
* commit '
7162fe0e3c5886b6c35f42c5cd9d9e83aa3785cf':
Cherry-pick WebKit change 60984 to fix an exploitable crash when focus is changed
Steve Block [Sat, 7 Aug 2010 01:55:12 +0000 (18:55 -0700)]
am
a4279478: Cherry-pick WebKit change 61921 to fix exploitable memory corruption in RenderBoxModelObject
Merge commit '
a42794783dfec7f142845611dc0f20bfe2657c49' into gingerbread
* commit '
a42794783dfec7f142845611dc0f20bfe2657c49':
Cherry-pick WebKit change 61921 to fix exploitable memory corruption in RenderBoxModelObject
Steve Block [Sat, 7 Aug 2010 01:55:10 +0000 (18:55 -0700)]
am
2b6ea029: Cherry-pick WebKit change 60984 to fix an exploitable crash when focus is changed
Merge commit '
2b6ea0299b0340ff815b7beab6e7491ff5e4d6c0' into gingerbread
* commit '
2b6ea0299b0340ff815b7beab6e7491ff5e4d6c0':
Cherry-pick WebKit change 60984 to fix an exploitable crash when focus is changed
Brian Carlstrom [Thu, 5 Aug 2010 17:41:06 +0000 (10:41 -0700)]
am
71b088a0: Tracking merge of dalvik-dev to gingerbread
Merge commit '
71b088a040027130a502f60e6f953c08a194b11e' into gingerbread-plus-aosp
* commit '
71b088a040027130a502f60e6f953c08a194b11e':
Tracking merge of dalvik-dev to gingerbread
Steve Block [Thu, 5 Aug 2010 11:12:56 +0000 (12:12 +0100)]
Cherry-pick WebKit change 61921 to fix exploitable memory corruption in RenderBoxModelObject
Bug:
2895569
Change-Id: Iea09dc4fdc35e68ccad36deed2132f02e3778e34
Steve Block [Thu, 5 Aug 2010 11:10:12 +0000 (12:10 +0100)]
Cherry-pick WebKit change 60984 to fix an exploitable crash when focus is changed
Bug:
2895569
Change-Id: I76f48ca7d6ddee996127254c5f1f00e355318527
Brian Carlstrom [Thu, 5 Aug 2010 06:24:52 +0000 (23:24 -0700)]
Tracking merge of dalvik-dev to gingerbread
git cherry-pick --no-commit
a2350cae81d07b024de06d0508f8cbd317dad3b7
Change-Id: I52ae486a58ed5bdc79390525179092a5a930c0e7
The Android Open Source Project [Fri, 16 Jul 2010 18:52:51 +0000 (11:52 -0700)]
am
ae583467: add meta-files about 3rd party projects
Merge commit '
ae583467c6ceda8b918b6d3e38cceca26d0715eb' into gingerbread-plus-aosp
* commit '
ae583467c6ceda8b918b6d3e38cceca26d0715eb':
add meta-files about 3rd party projects
The Android Open Source Project [Fri, 16 Jul 2010 18:41:36 +0000 (11:41 -0700)]
add meta-files about 3rd party projects
Change-Id: I1cc3b4d6e2165285a27b5d848c39d3965553382a