OSDN Git Service
Cary Clark [Wed, 19 Jan 2011 17:36:37 +0000 (09:36 -0800)]
am
564c349a: am
94dc3aa7: Merge "don\'t draw buttons while they are created" into honeycomb
* commit '
564c349adc3778e7e9bfe5c07dd406663bcec236':
don't draw buttons while they are created
Cary Clark [Wed, 19 Jan 2011 17:35:06 +0000 (09:35 -0800)]
am
94dc3aa7: Merge "don\'t draw buttons while they are created" into honeycomb
* commit '
94dc3aa7e0a8ceab679c9a141bdafc51596e9ed3':
don't draw buttons while they are created
Cary Clark [Wed, 19 Jan 2011 17:33:42 +0000 (09:33 -0800)]
Merge "don't draw buttons while they are created" into honeycomb
Cary Clark [Wed, 19 Jan 2011 14:58:30 +0000 (09:58 -0500)]
don't draw buttons while they are created
There are three threads all hammering at the same resource.
The WebViewCore thread records the buttons on the page.
The WebView thread rerecords the button pictures to show selection and focus.
The GLWebViewState thread draws the picture containing the button pictures
into the tile.
Prevent drawing the picture while the buttons are recorded
by sharing the button mutext with the GL tile creation.
bug:
3354678
Change-Id: I245ed47ad5a6d1fe28ea870bd7c557937eed1164
Derek Sollenberger [Wed, 19 Jan 2011 16:45:41 +0000 (08:45 -0800)]
am
c71286ed: am
404eea56: Merge "Fix plugin crash when loading swf files." into honeycomb
* commit '
c71286ed41a309d670e569858e45380314435c66':
Fix plugin crash when loading swf files.
Derek Sollenberger [Wed, 19 Jan 2011 16:43:42 +0000 (08:43 -0800)]
am
404eea56: Merge "Fix plugin crash when loading swf files." into honeycomb
* commit '
404eea56f9b828804780824b55e4557df9b3f60e':
Fix plugin crash when loading swf files.
Derek Sollenberger [Wed, 19 Jan 2011 16:42:00 +0000 (08:42 -0800)]
Merge "Fix plugin crash when loading swf files." into honeycomb
Derek Sollenberger [Wed, 19 Jan 2011 16:05:27 +0000 (11:05 -0500)]
Fix plugin crash when loading swf files.
bug:
3368265
Change-Id: Ic0ab8702d40140983be4db105f179b8b5236e6e3
Ben Murdoch [Wed, 19 Jan 2011 15:43:14 +0000 (07:43 -0800)]
am
f12e8e2d: am
dfdc1161: Merge "Maintain the seek position for HTML5 Video" into honeycomb
* commit '
f12e8e2d33200dbbd09954418f8fe27148ffff35':
Maintain the seek position for HTML5 Video
Ben Murdoch [Wed, 19 Jan 2011 15:38:29 +0000 (07:38 -0800)]
am
dfdc1161: Merge "Maintain the seek position for HTML5 Video" into honeycomb
* commit '
dfdc11618f4880565489123e312150d531c690ed':
Maintain the seek position for HTML5 Video
Ben Murdoch [Wed, 19 Jan 2011 15:34:43 +0000 (07:34 -0800)]
Merge "Maintain the seek position for HTML5 Video" into honeycomb
Patrick Scott [Wed, 19 Jan 2011 12:52:50 +0000 (04:52 -0800)]
am
d8e9148b: am
07f392a5: Merge "Do not send empty data." into honeycomb
* commit '
d8e9148bab7068a796dd449a2d208afb863a20a9':
Do not send empty data.
Patrick Scott [Wed, 19 Jan 2011 12:51:21 +0000 (04:51 -0800)]
am
07f392a5: Merge "Do not send empty data." into honeycomb
* commit '
07f392a57e45b228e53dd45cb7bd464edde5e23d':
Do not send empty data.
Patrick Scott [Wed, 19 Jan 2011 12:50:58 +0000 (04:50 -0800)]
am
7b569391: am
1ff2438a: Merge "Fix some sites not responding." into honeycomb
* commit '
7b569391c40eddf3e1dcbead094de1f79b5fe7a0':
Fix some sites not responding.
Patrick Scott [Wed, 19 Jan 2011 12:49:29 +0000 (04:49 -0800)]
am
1ff2438a: Merge "Fix some sites not responding." into honeycomb
* commit '
1ff2438ab74668c3e80d2957db44214d79e099e0':
Fix some sites not responding.
Patrick Scott [Wed, 19 Jan 2011 12:48:23 +0000 (04:48 -0800)]
Merge "Do not send empty data." into honeycomb
Patrick Scott [Wed, 19 Jan 2011 12:47:36 +0000 (04:47 -0800)]
Merge "Fix some sites not responding." into honeycomb
Ben Murdoch [Mon, 17 Jan 2011 18:07:48 +0000 (18:07 +0000)]
Maintain the seek position for HTML5 Video
When the video is paused, remember where we got to so that
when the video is started again we can seek to the correct
position and continue where we left off.
Requires a change in frameworks/base.
(I6b92289d4ef36bba1e0429327917533a4101655d)
Bug:
3303721
Change-Id: I6001f45a362f491e9040c8b52260d0a08fb8504f
Ben Murdoch [Wed, 19 Jan 2011 10:31:25 +0000 (02:31 -0800)]
am
2d6ebae0: am
c1c6bc5b: Merge "Fix occasional AutoFill crash" into honeycomb
* commit '
2d6ebae08b0721bc66f3799d82e97fe46c146760':
Fix occasional AutoFill crash
Ben Murdoch [Wed, 19 Jan 2011 10:29:46 +0000 (02:29 -0800)]
am
c1c6bc5b: Merge "Fix occasional AutoFill crash" into honeycomb
* commit '
c1c6bc5bc9477cb924383e57f33d76e8f1ed1865':
Fix occasional AutoFill crash
Ben Murdoch [Wed, 19 Jan 2011 10:28:14 +0000 (02:28 -0800)]
Merge "Fix occasional AutoFill crash" into honeycomb
Nicolas Roard [Wed, 19 Jan 2011 05:52:36 +0000 (21:52 -0800)]
am
e8c2feea: am
3eee7f64: Merge "Implement partial layer rendering (support for large layers) Also fix a couple of potential ANRs" into honeycomb
* commit '
e8c2feea7bb3ae2c782e2772ca1debde5b6b060d':
Implement partial layer rendering (support for large layers) Also fix a couple of potential ANRs
Patrick Scott [Wed, 19 Jan 2011 05:52:34 +0000 (21:52 -0800)]
am
35abdd43: am
bca79c07: Merge "Layout before creating the base layer." into honeycomb
* commit '
35abdd43fecc35871b8cb6d9328c221771dd82a7':
Layout before creating the base layer.
Shimeng (Simon) Wang [Wed, 19 Jan 2011 05:51:34 +0000 (21:51 -0800)]
am
15532226: am
441bf4da: Merge "Fake some media player state change in media load time." into honeycomb
* commit '
15532226126c5db4bb5fccdac791773bee7e98ab':
Fake some media player state change in media load time.
Patrick Scott [Wed, 19 Jan 2011 05:51:24 +0000 (21:51 -0800)]
am
2e88af04: am
ed112c82: Merge "Set the local flag when compositing a fixed element." into honeycomb
* commit '
2e88af04d616fdd33377a9af57ae7cf1865350c1':
Set the local flag when compositing a fixed element.
Nicolas Roard [Wed, 19 Jan 2011 04:44:36 +0000 (20:44 -0800)]
am
7c3cc4ee: am
efb8822d: Merge " Implement re-scaling for layers" into honeycomb
* commit '
7c3cc4ee435517d31d2d99071e160b9ab9cccdba':
Implement re-scaling for layers
Patrick Scott [Tue, 18 Jan 2011 21:38:47 +0000 (16:38 -0500)]
Fix some sites not responding.
Enter compositing for iframes after all layout tasks have completed. Remember
the state of overflow scroll similar to RenderLayer so that it doesn't change
while updating the compositing state.
Return false in requiresAcceleratedCompositing if the iframe is hidden. I verified
that this fails on Safari and have submitted a bug.
Bug:
3325187
Change-Id: I20a9e1a595d14518f4c7a3e01fc1c4fa9035262c
Nicolas Roard [Tue, 18 Jan 2011 21:38:41 +0000 (13:38 -0800)]
am
3eee7f64: Merge "Implement partial layer rendering (support for large layers) Also fix a couple of potential ANRs" into honeycomb
* commit '
3eee7f647df0557a7c476e21afb08031736aac8c':
Implement partial layer rendering (support for large layers) Also fix a couple of potential ANRs
Patrick Scott [Tue, 18 Jan 2011 21:38:38 +0000 (13:38 -0800)]
am
bca79c07: Merge "Layout before creating the base layer." into honeycomb
* commit '
bca79c07f17d228a8cb759491451476b79a0a212':
Layout before creating the base layer.
Nicolas Roard [Tue, 18 Jan 2011 21:36:31 +0000 (13:36 -0800)]
Merge "Implement partial layer rendering (support for large layers) Also fix a couple of potential ANRs" into honeycomb
Patrick Scott [Tue, 18 Jan 2011 21:36:15 +0000 (13:36 -0800)]
Merge "Layout before creating the base layer." into honeycomb
Patrick Scott [Tue, 18 Jan 2011 21:24:08 +0000 (16:24 -0500)]
Layout before creating the base layer.
WebKit asserts during draw that the frame does not need a layout. Do the layout
to also get the most updated data.
Move the bridge assert after the parent check as some frames are never attached
and no history item is created.
Change-Id: If646d6ed2b409a3078d2f7a6793b7aed94ffecaf
Shimeng (Simon) Wang [Tue, 18 Jan 2011 21:21:37 +0000 (13:21 -0800)]
am
441bf4da: Merge "Fake some media player state change in media load time." into honeycomb
* commit '
441bf4dacdc212d82753d4d52fed6a1bc3096239':
Fake some media player state change in media load time.
Shimeng (Simon) Wang [Tue, 18 Jan 2011 21:19:40 +0000 (13:19 -0800)]
Merge "Fake some media player state change in media load time." into honeycomb
Patrick Scott [Tue, 18 Jan 2011 21:17:33 +0000 (13:17 -0800)]
am
ed112c82: Merge "Set the local flag when compositing a fixed element." into honeycomb
* commit '
ed112c8202e0f9900f12776e211bdca9241d22d9':
Set the local flag when compositing a fixed element.
Patrick Scott [Tue, 18 Jan 2011 21:17:21 +0000 (16:17 -0500)]
Do not send empty data.
WebKit asserts that the length of data is 0 and assumes that the length is
non-zero.
Change-Id: Ic1e62bcfaca5b875256216ed20013f1b4ad7e653
Patrick Scott [Tue, 18 Jan 2011 21:15:58 +0000 (13:15 -0800)]
Merge "Set the local flag when compositing a fixed element." into honeycomb
Patrick Scott [Tue, 18 Jan 2011 21:10:06 +0000 (16:10 -0500)]
Set the local flag when compositing a fixed element.
This fixes an assert and ensures that the compositor is in the correct state.
Change-Id: I7556ed998821bf2e09d89b79935e876869a584c6
Nicolas Roard [Mon, 17 Jan 2011 21:22:15 +0000 (13:22 -0800)]
Implement partial layer rendering (support for large layers)
Also fix a couple of potential ANRs
bug:
3333984
Change-Id: I28c02ef74f4c70507fcd7f5bbc893b0d0eae61c0
Nicolas Roard [Tue, 18 Jan 2011 20:35:47 +0000 (12:35 -0800)]
am
efb8822d: Merge " Implement re-scaling for layers" into honeycomb
* commit '
efb8822dda4a5e31ef2e6232640849a1f0736fe7':
Implement re-scaling for layers
Nicolas Roard [Tue, 18 Jan 2011 20:33:39 +0000 (12:33 -0800)]
Merge " Implement re-scaling for layers" into honeycomb
Shimeng (Simon) Wang [Tue, 18 Jan 2011 17:56:24 +0000 (09:56 -0800)]
am
be393de6: am
264c2ff3: Merge "Persist scrollPoint as part of the history item." into honeycomb
* commit '
be393de671322aa550e9f280ea79d62d1ba5f99e':
Persist scrollPoint as part of the history item.
Shimeng (Simon) Wang [Tue, 18 Jan 2011 17:54:56 +0000 (09:54 -0800)]
am
264c2ff3: Merge "Persist scrollPoint as part of the history item." into honeycomb
* commit '
264c2ff307988137482953b0001c14dbc62abcc5':
Persist scrollPoint as part of the history item.
Shimeng (Simon) Wang [Tue, 18 Jan 2011 17:52:21 +0000 (09:52 -0800)]
Merge "Persist scrollPoint as part of the history item." into honeycomb
Cary Clark [Tue, 18 Jan 2011 16:50:51 +0000 (08:50 -0800)]
am
efdf96d5: am
a27a9518: Merge "add interface to return if (x/y) is a plugin" into honeycomb
* commit '
efdf96d5d87a3e706152a840615a104b792a4fff':
add interface to return if (x/y) is a plugin
Kristian Monsen [Tue, 18 Jan 2011 16:50:48 +0000 (08:50 -0800)]
am
004f1235: am
319a1ceb: Try to guess content type if header is generic
* commit '
004f123535b7dee18ec4f2bc7674d07d8e56c72f':
Try to guess content type if header is generic
Cary Clark [Tue, 18 Jan 2011 16:29:31 +0000 (08:29 -0800)]
am
a27a9518: Merge "add interface to return if (x/y) is a plugin" into honeycomb
* commit '
a27a95188f8f778d90d69accb1b00e6b38879dbd':
add interface to return if (x/y) is a plugin
Kristian Monsen [Tue, 18 Jan 2011 16:29:24 +0000 (08:29 -0800)]
am
319a1ceb: Try to guess content type if header is generic
* commit '
319a1ceb63784aba2c0c94808707e1ce9ac90f71':
Try to guess content type if header is generic
Cary Clark [Tue, 18 Jan 2011 16:23:41 +0000 (08:23 -0800)]
Merge "add interface to return if (x/y) is a plugin" into honeycomb
Cary Clark [Tue, 11 Jan 2011 16:33:54 +0000 (11:33 -0500)]
add interface to return if (x/y) is a plugin
Use the nav cache to determine if a given
coordinate corresponds to a plugin.
Requires a companion change in frameworks/base
bug:
3331323
Change-Id: Ica8291bf0dfaaae7c0918b1a685c07fe756d9328
Kristian Monsen [Tue, 18 Jan 2011 15:56:59 +0000 (15:56 +0000)]
Try to guess content type if header is generic
Don't just use text/plain or application/octet-stream,
this matches the old stack.
Fix for bug
2981069
Change-Id: I1b5edf0e60e7c7012f4143906ec926227edcf927
Ben Murdoch [Tue, 18 Jan 2011 12:37:28 +0000 (12:37 +0000)]
Fix occasional AutoFill crash
Don't store a raw pointer to a refcounted type.
Change-Id: I444578e7cc601ef6402ea135982aedc7ca1f983c
Nicolas Roard [Mon, 17 Jan 2011 02:27:55 +0000 (18:27 -0800)]
Implement re-scaling for layers
Change-Id: I1f998387831207d00f27945ee4e456f81ff6f6e2
Change-Id: I7efcccfd9a4374061300058d4c48fa82a973829a
Kristian Monsen [Mon, 17 Jan 2011 16:26:19 +0000 (08:26 -0800)]
am
bc378706: am
f42f297f: Merge "Fixing cookie CTS tests." into honeycomb
* commit '
bc3787063546b0b754691167fe9367b2147571a9':
Fixing cookie CTS tests.
Kristian Monsen [Mon, 17 Jan 2011 16:23:03 +0000 (08:23 -0800)]
am
f42f297f: Merge "Fixing cookie CTS tests." into honeycomb
* commit '
f42f297f9d1e499b6b54e6c73ddb46dbb4745ede':
Fixing cookie CTS tests.
Kristian Monsen [Mon, 17 Jan 2011 16:20:51 +0000 (08:20 -0800)]
Merge "Fixing cookie CTS tests." into honeycomb
Kristian Monsen [Mon, 17 Jan 2011 15:14:16 +0000 (15:14 +0000)]
Fixing cookie CTS tests.
The old code would only return the correct value after a
background thread had been running.
Change-Id: I79c0be8606b005b6a18aa83f5b91891709d4e0f5
Ben Murdoch [Sun, 16 Jan 2011 18:46:44 +0000 (10:46 -0800)]
am
6d1d220e: am
2a72fb6c: Merge WebKit at Chromium 9.0.597.69: Update WebKit revision number
* commit '
6d1d220edfa8795c1b490facdf29d5a662fac2ce':
Merge WebKit at Chromium 9.0.597.69: Update WebKit revision number
Ben Murdoch [Sun, 16 Jan 2011 18:46:42 +0000 (10:46 -0800)]
am
c953cbb4: am
8a26975f: Merge WebKit at Chromium 9.0.597.69: Trivial merge by Git.
* commit '
c953cbb44334188620c553f07b63b5e0752dbbc7':
Merge WebKit at Chromium 9.0.597.69: Trivial merge by Git.
Ben Murdoch [Sun, 16 Jan 2011 16:29:39 +0000 (08:29 -0800)]
am
2a72fb6c: Merge WebKit at Chromium 9.0.597.69: Update WebKit revision number
* commit '
2a72fb6cf823503e177d0ff93ee6fac5df9f19f8':
Merge WebKit at Chromium 9.0.597.69: Update WebKit revision number
Ben Murdoch [Sun, 16 Jan 2011 16:29:36 +0000 (08:29 -0800)]
am
8a26975f: Merge WebKit at Chromium 9.0.597.69: Trivial merge by Git.
* commit '
8a26975f9657a07318a10d481d7f332dad759325':
Merge WebKit at Chromium 9.0.597.69: Trivial merge by Git.
Ben Murdoch [Sun, 16 Jan 2011 14:16:54 +0000 (14:16 +0000)]
Merge WebKit at Chromium 9.0.597.69: Update WebKit revision number
Note that we are tracking the Chromium 9.0.597 release branch,
which is WebKit r72805 + stability cherry picks.
See
http://svn.webkit.org/repository/webkit/branches/chromium/597/WebCore@75681
Change-Id: Iea0b5ca3d811fae101664eb561ab788e10c63ace
Ben Murdoch [Sun, 16 Jan 2011 13:59:45 +0000 (13:59 +0000)]
Merge WebKit at Chromium 9.0.597.69: Trivial merge by Git.
http://svn.webkit.org/repository/webkit/branches/chromium/597/WebCore@75681
Change-Id: Ibe552cf7af31f74b81e337eadf3d3b73a53daf60
Shimeng (Simon) Wang [Fri, 14 Jan 2011 22:07:16 +0000 (14:07 -0800)]
Persist scrollPoint as part of the history item.
Also record scroll point and view scales when webcore scroll offset
is changed.
This will help history navigation and browser restoration.
issue:
2819082
Change-Id: I3e59806d8110127ed9a2e32b917c4176ffa6bf73
Shimeng (Simon) Wang [Fri, 14 Jan 2011 19:07:53 +0000 (11:07 -0800)]
Fake some media player state change in media load time.
This helps the Window.onLoad fires at correct time. Since Android
implements the video playing using Java's full screen VideoView, nothing
happens before the user clicks the play button. So need to fake some
event change.
Current prepareToPlay also fakes event change before real video playing.
issue:
3346048
Change-Id: I5afa1a2ecf920b23f902d0ac3916223a6cf8ac0c
Cary Clark [Fri, 14 Jan 2011 18:45:40 +0000 (10:45 -0800)]
am
e9cb5a2d: am
e137c438: Merge "don\'t let contentEditable negate key handling" into honeycomb
* commit '
e9cb5a2d898b8d4719bc7c328fd4dfae1dc8b35d':
don't let contentEditable negate key handling
Cary Clark [Fri, 14 Jan 2011 18:43:49 +0000 (10:43 -0800)]
am
e137c438: Merge "don\'t let contentEditable negate key handling" into honeycomb
* commit '
e137c43847f22807f1276afc87027711cc3f4e77':
don't let contentEditable negate key handling
Cary Clark [Fri, 14 Jan 2011 18:41:34 +0000 (10:41 -0800)]
Merge "don't let contentEditable negate key handling" into honeycomb
Cary Clark [Fri, 14 Jan 2011 18:34:04 +0000 (13:34 -0500)]
don't let contentEditable negate key handling
If the eventHandler says the key was handled, don't
allow the contentEditable test to set handled to false.
bug:
3351951
Change-Id: I0dbe956e8983c16e738760e3b159d1353cc3eddd
Ben Murdoch [Fri, 14 Jan 2011 17:44:14 +0000 (09:44 -0800)]
am
c1aa6706: am
6d76559e: Merge changes I972bbdab,I31a640de into honeycomb
* commit '
c1aa670677a1c4a55696710efebfe569c6f505d1':
Resolve MIME types for CacheResult in the same way as WebResponse.
Hook up CacheManager for the Chromium HTTP stack
Ben Murdoch [Fri, 14 Jan 2011 17:41:47 +0000 (09:41 -0800)]
am
6d76559e: Merge changes I972bbdab,I31a640de into honeycomb
* commit '
6d76559e247a4834e0ed3a254e2385575a0ac094':
Resolve MIME types for CacheResult in the same way as WebResponse.
Hook up CacheManager for the Chromium HTTP stack
Ben Murdoch [Fri, 14 Jan 2011 17:40:11 +0000 (09:40 -0800)]
Merge changes I972bbdab,I31a640de into honeycomb
* changes:
Resolve MIME types for CacheResult in the same way as WebResponse.
Hook up CacheManager for the Chromium HTTP stack
Kristian Monsen [Fri, 14 Jan 2011 17:24:40 +0000 (09:24 -0800)]
Kristian Monsen [Fri, 14 Jan 2011 17:22:29 +0000 (09:22 -0800)]
Kristian Monsen [Fri, 14 Jan 2011 17:00:05 +0000 (17:00 +0000)]
Fix warning
Change-Id: I92ac985aba6780bc00f6dfbdca7e72f645b03580
Ben Murdoch [Thu, 13 Jan 2011 18:41:41 +0000 (18:41 +0000)]
Resolve MIME types for CacheResult in the same way as WebResponse.
Change-Id: I972bbdabc8491a94eabd676dd13f09fcccb6ba88
Steve Block [Thu, 6 Jan 2011 17:36:11 +0000 (17:36 +0000)]
Hook up CacheManager for the Chromium HTTP stack
Requires a corresponding change in frameworks/base
https://android-git.corp.google.com/g/87939
Bug:
3270236
Change-Id: I31a640de86d6fad00eb8b71784e0ee9136ab1174
Huahui Wu [Fri, 14 Jan 2011 01:07:23 +0000 (17:07 -0800)]
am
a94865d2: am
477950e0: Merge "b/
3133123 Pass touch point ids to WebKit" into honeycomb
* commit '
a94865d25181d5461d072c456fc71d39f2f7d200':
b/
3133123 Pass touch point ids to WebKit
Huahui Wu [Fri, 14 Jan 2011 01:04:41 +0000 (17:04 -0800)]
am
477950e0: Merge "b/
3133123 Pass touch point ids to WebKit" into honeycomb
* commit '
477950e01e53312a3b7c330e518dc9c8f65f7dc6':
b/
3133123 Pass touch point ids to WebKit
Huahui Wu [Fri, 14 Jan 2011 01:02:22 +0000 (17:02 -0800)]
Merge "b/
3133123 Pass touch point ids to WebKit" into honeycomb
Huahui Wu [Thu, 13 Jan 2011 23:57:11 +0000 (15:57 -0800)]
b/
3133123 Pass touch point ids to WebKit
This is the CL in WebKit side and it needs the framwork CL:
https://android-git.corp.google.com/g/#change,89630
Notice some changes touch open source WebKit's code, so b/
3351313 is filed
to keep track of that.
Change-Id: I0ac5d75c4a90f14afeb2e3fc2dc5b1c437c631f8
Teng-Hui Zhu [Thu, 13 Jan 2011 23:22:59 +0000 (15:22 -0800)]
am
a4207f2c: am
cea368a1: Merge changes Ie254e13d,I47261f19,Ifc05a776 into honeycomb
* commit '
a4207f2c42be90cb2f6b8ab864bbe3aa61a7e7b8':
More debug info for each layer
Revert a WAR.
Code clean up.
Teng-Hui Zhu [Thu, 13 Jan 2011 23:21:17 +0000 (15:21 -0800)]
am
cea368a1: Merge changes Ie254e13d,I47261f19,Ifc05a776 into honeycomb
* commit '
cea368a1db92930c6a82d22d7b5ec1e67d890b92':
More debug info for each layer
Revert a WAR.
Code clean up.
Teng-Hui Zhu [Thu, 13 Jan 2011 23:19:11 +0000 (15:19 -0800)]
Merge changes Ie254e13d,I47261f19,Ifc05a776 into honeycomb
* changes:
More debug info for each layer
Revert a WAR.
Code clean up.
Huahui Wu [Thu, 13 Jan 2011 23:19:00 +0000 (15:19 -0800)]
am
9e3bebad: am
70745dfb: Merge "Second try to send multi-touch events to Flash" into honeycomb
* commit '
9e3bebad7e551b23d07bc63acc5a3934b7b5a8b2':
Second try to send multi-touch events to Flash
Huahui Wu [Thu, 13 Jan 2011 23:17:19 +0000 (15:17 -0800)]
am
70745dfb: Merge "Second try to send multi-touch events to Flash" into honeycomb
* commit '
70745dfbcdcf2e8ca27010565b7c7fdbb61fa2ab':
Second try to send multi-touch events to Flash
Huahui Wu [Thu, 13 Jan 2011 23:15:33 +0000 (15:15 -0800)]
Merge "Second try to send multi-touch events to Flash" into honeycomb
Teng-Hui Zhu [Thu, 13 Jan 2011 22:52:40 +0000 (14:52 -0800)]
More debug info for each layer
The matrix info can help to determine the layer positioning issue.
Change-Id: Ie254e13d649c6a3aab820e8fe9553517ca42be72
Teng-Hui Zhu [Thu, 13 Jan 2011 19:35:07 +0000 (11:35 -0800)]
Revert a WAR.
Revert a WAR for issue
3215000.
https://android-git.corp.google.com/g/#change,81012
With the current fix, this WAR is not necessary.
b:
3215000
Change-Id: I47261f19fbd87864d6b41edfbdb50be1fbbfccc7
Huahui Wu [Thu, 13 Jan 2011 22:07:06 +0000 (14:07 -0800)]
Second try to send multi-touch events to Flash
This reverts commit
64e8dc02c3e8eb820e872e78c350a39293586877.
Most are from Derek's CL https://android-git.corp.google.com/g/#change,88039
But with an essential bug fix which change "evt.data.touch.action" to
"eve.data.multiTouch.action" in line 234.
Change-Id: I1dd81d69c51afbfb0066149bfb7a2bfcefb43a87
Huahui Wu [Thu, 13 Jan 2011 22:03:21 +0000 (14:03 -0800)]
am
1e47d180: am
4c1a1fd5: Merge "Revert "Cherrypick of https://android-git.corp.google.com/g/#change,88039"" into honeycomb
* commit '
1e47d180307d9d0cf08c239327a06f5ce9d0019f':
Revert "Cherrypick of https://android-git.corp.google.com/g/#change,88039"
Huahui Wu [Thu, 13 Jan 2011 22:01:39 +0000 (14:01 -0800)]
am
4c1a1fd5: Merge "Revert "Cherrypick of https://android-git.corp.google.com/g/#change,88039"" into honeycomb
* commit '
4c1a1fd51a44ffb24ac8773950c083fdbaae15fe':
Revert "Cherrypick of https://android-git.corp.google.com/g/#change,88039"
Huahui Wu [Thu, 13 Jan 2011 21:59:23 +0000 (13:59 -0800)]
Merge "Revert "Cherrypick of https://android-git.corp.google.com/g/#change,88039"" into honeycomb
Huahui Wu [Thu, 13 Jan 2011 21:17:07 +0000 (13:17 -0800)]
Revert "Cherrypick of https://android-git.corp.google.com/g/#change,88039"
This reverts commit
1b864edc9b9c6c024b308046085cdb26ba98e3fe.
Steve Block [Thu, 13 Jan 2011 20:14:49 +0000 (12:14 -0800)]
am
caa1c58f: (-s ours) am
32b1eebc: (-s ours) am
ffbb7741: DO NOT MERGE - Set 660 permissions on Appcache database
* commit '
caa1c58f3de7ee3c21e6e4a156066e757587bd75':
DO NOT MERGE - Set 660 permissions on Appcache database
John Reck [Thu, 13 Jan 2011 20:14:46 +0000 (12:14 -0800)]
am
32dc20e2: (-s ours) am
0b77bcc1: (-s ours) am
200de028: DO NOT MERGE - Fixes webicon permissions
* commit '
32dc20e2e86f72ca09ad7eaf2fdd49ae69a27e67':
DO NOT MERGE - Fixes webicon permissions
John Reck [Thu, 13 Jan 2011 20:14:44 +0000 (12:14 -0800)]
am
a823c7c9: (-s ours) am
9d46b47d: (-s ours) am
05072627: DO NOT MERGE - Set 660 permissions on Geolocation cache DB
* commit '
a823c7c9c135f61835e70a142654e958856bafbd':
DO NOT MERGE - Set 660 permissions on Geolocation cache DB
John Reck [Thu, 13 Jan 2011 20:14:36 +0000 (12:14 -0800)]
am
12a1448a: (-s ours) am
35676c5b: (-s ours) am
a9186f56: DO NOT MERGE - Set 660 permissions on Geolocation permissions DB
* commit '
12a1448a777099dea45ba09d3f86e06b585fe484':
DO NOT MERGE - Set 660 permissions on Geolocation permissions DB
Steve Block [Thu, 13 Jan 2011 20:12:17 +0000 (12:12 -0800)]
am
32b1eebc: (-s ours) am
ffbb7741: DO NOT MERGE - Set 660 permissions on Appcache database
* commit '
32b1eebcf86772d08786dbfb4e518fc2ddf00cc1':
DO NOT MERGE - Set 660 permissions on Appcache database
John Reck [Thu, 13 Jan 2011 20:12:15 +0000 (12:12 -0800)]
am
0b77bcc1: (-s ours) am
200de028: DO NOT MERGE - Fixes webicon permissions
* commit '
0b77bcc1e3f1198bd705c0efc11d6a8be0a3b9b4':
DO NOT MERGE - Fixes webicon permissions