OSDN Git Service
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
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
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
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
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
John Reck [Thu, 13 Jan 2011 20:12:12 +0000 (12:12 -0800)]
am
9d46b47d: (-s ours) am
05072627: DO NOT MERGE - Set 660 permissions on Geolocation cache DB
* commit '
9d46b47dc0b7cd67c7573299ec7f1e677e4b58f0':
DO NOT MERGE - Set 660 permissions on Geolocation cache DB
John Reck [Thu, 13 Jan 2011 20:12:10 +0000 (12:12 -0800)]
am
35676c5b: (-s ours) am
a9186f56: DO NOT MERGE - Set 660 permissions on Geolocation permissions DB
* commit '
35676c5b9dfa206aad700683a76c1f0c3a2c0253':
DO NOT MERGE - Set 660 permissions on Geolocation permissions DB
Steve Block [Thu, 13 Jan 2011 19:39:52 +0000 (11:39 -0800)]
am
ffbb7741: DO NOT MERGE - Set 660 permissions on Appcache database
* commit '
ffbb7741a62dd5c598ac92875ddac101bbc665c9':
DO NOT MERGE - Set 660 permissions on Appcache database
John Reck [Thu, 13 Jan 2011 19:39:50 +0000 (11:39 -0800)]
am
200de028: DO NOT MERGE - Fixes webicon permissions
* commit '
200de028bfb928c1a488fa48bcbe72400d9e1202':
DO NOT MERGE - Fixes webicon permissions
John Reck [Thu, 13 Jan 2011 19:39:47 +0000 (11:39 -0800)]
am
05072627: DO NOT MERGE - Set 660 permissions on Geolocation cache DB
* commit '
05072627b62c5e316b9970492f76ce353e8c30fa':
DO NOT MERGE - Set 660 permissions on Geolocation cache DB
John Reck [Thu, 13 Jan 2011 19:39:43 +0000 (11:39 -0800)]
am
a9186f56: DO NOT MERGE - Set 660 permissions on Geolocation permissions DB
* commit '
a9186f56580d978bfcb197fc1ac726a3a092ff01':
DO NOT MERGE - Set 660 permissions on Geolocation permissions DB
Teng-Hui Zhu [Thu, 13 Jan 2011 19:27:04 +0000 (11:27 -0800)]
Code clean up.
There should be no functionality change.
Change-Id: Ifc05a776ebb0a2a00b3aff194e138847ed1201cf
Patrick Scott [Thu, 13 Jan 2011 18:29:00 +0000 (10:29 -0800)]
Merge "Remove temporary work-around for auto login." into honeycomb
Patrick Scott [Thu, 13 Jan 2011 16:34:52 +0000 (11:34 -0500)]
Remove temporary work-around for auto login.
This is no longer needed as we are taking a different approach to auto login.
Change-Id: If665c740d958c4947527ce32e2b7f858736cac2b
Kristian Monsen [Thu, 13 Jan 2011 14:27:10 +0000 (14:27 +0000)]
Fix for bug
3347616, crash when closing browser with requests in flight
The problem is if a request is just started as the browser (or a tab)
is closed. That can give delete the scoped_refptr before the
refcount is increased on the IO thread.
Refcounted objects should not be passed as raw pointers between
threads.
Change-Id: I57a9b30f5fdfef3c6d45b81ea59a61f96b09e6ae
Kristian Monsen [Thu, 13 Jan 2011 10:57:20 +0000 (10:57 +0000)]
Use filename instead of file url for file uploads.
Part of fix for bug
2862096
Change-Id: Iabef7251b867b0c8bbf81147b08c76e7ef723d00
Steve Block [Tue, 21 Dec 2010 14:18:10 +0000 (14:18 +0000)]
DO NOT MERGE - Set 660 permissions on Appcache database
Bug:
3244281,
3258386
cherry pick
Change-Id: If4a90a68df50b8b977f7fb3be668132ce839f81f
John Reck [Tue, 7 Dec 2010 22:51:01 +0000 (14:51 -0800)]
DO NOT MERGE - Fixes webicon permissions
Bug:
3244281,
3258386
partial cherry pick
Change-Id: I30397effabe4b60d916f01f9b32bcfc3a6a402bc
Teng-Hui Zhu [Thu, 13 Jan 2011 00:56:10 +0000 (16:56 -0800)]
Merge "The fixed element layer should not inherit the parent matrix" into honeycomb
Teng-Hui Zhu [Thu, 13 Jan 2011 00:54:53 +0000 (16:54 -0800)]
Merge "The m_projectionMatrix in the ShaderProgram need to be updated" into honeycomb
Teng-Hui Zhu [Thu, 13 Jan 2011 00:31:51 +0000 (16:31 -0800)]
The fixed element layer should not inherit the parent matrix
The fixed element layer should start from an identity matrix.
And apply local transformation.
Change-Id: I9243f8c496bdbd5ee66e18b23715f9935e5574b6
b:
3344290
Teng-Hui Zhu [Wed, 12 Jan 2011 23:05:46 +0000 (15:05 -0800)]
The m_projectionMatrix in the ShaderProgram need to be updated
When there is only layers (no baseLayer), m_projectionMatrix
is not updated for every draw call, such that it doesn't reflect
the visibleRect info.
Change-Id: I527f86d6d16034e56c3215f011c20196b02b16c2
b:
3335132
Guang Zhu [Wed, 12 Jan 2011 22:39:32 +0000 (14:39 -0800)]
Revert "Only use the name part when opening files that start with file://"
This reverts commit
5bc439a352fa4a52aa5be1eab0dc72420f40d49f.
Leon Scroggins [Wed, 12 Jan 2011 19:12:28 +0000 (14:12 -0500)]
Do not open the keyboard if 'click' came from a keypress.
Bug:
3344162
Requires a change in frameworks/base.
Change-Id: Id6fddcb2f179695998ef9372b8bca36bebbb54a3
Leon Scroggins [Wed, 12 Jan 2011 18:54:47 +0000 (10:54 -0800)]
Merge "Make sure there is a focus before derefing it." into honeycomb
Cary Clark [Wed, 12 Jan 2011 18:38:54 +0000 (10:38 -0800)]
Merge "always compute cx, cy in select text" into honeycomb
Leon Scroggins [Wed, 12 Jan 2011 18:37:02 +0000 (13:37 -0500)]
Make sure there is a focus before derefing it.
Bug:
3344795
Change-Id: I8c4bb2aa3c105da1d08260daa9a9d11d39de7840
Patrick Scott [Wed, 12 Jan 2011 18:34:22 +0000 (10:34 -0800)]
Merge "Fix a ref count issue." into honeycomb
Patrick Scott [Wed, 12 Jan 2011 18:27:57 +0000 (13:27 -0500)]
Fix a ref count issue.
setBridge calls adoptRef on the bridge and the stack object deletes the bridge.
Deleted memory is no good.
Change-Id: I80c5f614da604c0362530a54ff04b892d96ef6b1
Cary Clark [Wed, 12 Jan 2011 18:14:29 +0000 (13:14 -0500)]
always compute cx, cy in select text
The cx, cy locals are later stored as part of the
best character found. They must always be computed
so that the best state can compare with the test
state.
bug:
3339016
Change-Id: I4cbb791dc8d3836b027c6a9088dc3a59031c40b9
Leon Scroggins [Wed, 12 Jan 2011 15:48:47 +0000 (07:48 -0800)]
Merge "Disable rounding hacks." into honeycomb
Leon Scroggins [Wed, 12 Jan 2011 15:34:43 +0000 (07:34 -0800)]
Merge "Remove the WebTextView always when moving off a textfield." into honeycomb
Leon Scroggins [Wed, 12 Jan 2011 15:33:44 +0000 (07:33 -0800)]
Merge "Fix <select> with size." into honeycomb
Kristian Monsen [Tue, 11 Jan 2011 21:00:47 +0000 (21:00 +0000)]
Only use the name part when opening files that start with file://
Part of fix for bug
2862096
Fix for bug
3280996
Change-Id: I82d872aff834524fb105f42e83eee580d6c98c0b
Leon Scroggins [Tue, 11 Jan 2011 22:46:17 +0000 (17:46 -0500)]
Fix <select> with size.
Bug:
3328480
Change-Id: I47a7df3e5ffb043e6162b661a6de3a837d141c88
Leon Scroggins [Tue, 11 Jan 2011 22:33:35 +0000 (17:33 -0500)]
Remove the WebTextView always when moving off a textfield.
Bug:
3341272
Change-Id: Ibf00b2cb5a2c34eed9e5ac0355b59f8507ade446
Leon Scroggins [Tue, 11 Jan 2011 21:16:27 +0000 (16:16 -0500)]
Disable rounding hacks.
Bug:
3085564
Change-Id: Ie570cbac6a445a337c72466598d5550c84d803ad
Teng-Hui Zhu [Tue, 11 Jan 2011 19:38:58 +0000 (11:38 -0800)]
Fix the invalidate on the layer
For each layer, if its content is dirty, it should tell the Java to redraw.
Change-Id: If1fe006c0777130083ddc84778104fff35435a1b
b:
3327600
Shimeng (Simon) Wang [Tue, 11 Jan 2011 18:55:22 +0000 (10:55 -0800)]
Merge "Use float to preserve scales' accuracy." into honeycomb
Shimeng (Simon) Wang [Fri, 7 Jan 2011 23:46:52 +0000 (15:46 -0800)]
Use float to preserve scales' accuracy.
This change helps page navigation, since the restored scale
is accurate.
This change has a corresponding change in frameworks/base.
https://android-git.corp.google.com/g/#change,88121
issue:
3225233
Change-Id: I7e5601e8412e8b81e7f32c9ffb9e6c114db95169
Patrick Scott [Tue, 11 Jan 2011 18:39:10 +0000 (10:39 -0800)]
Merge "Prevent a crash by caching overflow scrolling." into honeycomb
Patrick Scott [Tue, 11 Jan 2011 18:06:29 +0000 (13:06 -0500)]
Prevent a crash by caching overflow scrolling.
Use adoptRef when creating a new bridge item. Use
toRenderBoxModelObject instead of toRenderBox as RenderInlines have layers.
Bug:
3321493
Change-Id: I4283681eba961aedaa8d80bfdfb3d1a468aab1ac
Shimeng (Simon) Wang [Tue, 11 Jan 2011 17:59:32 +0000 (09:59 -0800)]
Merge "Remove ANDROID_SCROLL_ON_GOTO_ANCHOR in WebCore/config.h" into honeycomb
Ben Murdoch [Tue, 11 Jan 2011 15:50:44 +0000 (07:50 -0800)]
Merge changes Iad96314e,Ic978944b,Iea1a5a55,Id22f7f0c,Ia1a391a9,Ic4642c38,I561d89dc,Ia102dea1 into honeycomb
* changes:
Merge Chromium at 9.0.597.55: Move formsSeen call to IO thread.
Merge Chromium at 9.0.597.55: Remove URLRequest forward declaration.
Merge Chromium at 9.0.597.55: Merge 67599. (2/2)
Merge Chromium at 9.0.597.55: Merge r67599 (1/2)
Merge Chromium at 9.0.597.55: Merge r67192
Merge Chromium at 9.0.597.55: Add DnsCertChecker to constructor
Merge Chromium at 9.0.597.55: Autofill: Merge r66860
Merge Chromium at 9.0.597.55: Autofill: Merge r66850
Ben Murdoch [Mon, 10 Jan 2011 12:40:47 +0000 (12:40 +0000)]
Merge Chromium at 9.0.597.55: Move formsSeen call to IO thread.
When we search the document for forms to be autofilled, we make a URL
request to the AutoFill server to ask it for form field data. With
Chromium r67655, this URL request needs to be made on a Chrome thread.
This is a simple fix for the merge, which blocks until the call
completes.
See http://src.chromium.org/viewvc/chrome?view=rev&revision=67655
Change-Id: Iad96314e4ecb66ee7e65c1ef846709e9c41b0e2e
Ben Murdoch [Fri, 7 Jan 2011 16:05:19 +0000 (16:05 +0000)]
Merge Chromium at 9.0.597.55: Remove URLRequest forward declaration.
Change-Id: Ic978944b7a4e0bdda4ab09a18234456098ad26ca
Ben Murdoch [Fri, 7 Jan 2011 16:04:47 +0000 (16:04 +0000)]
Merge Chromium at 9.0.597.55: Merge 67599. (2/2)
This needed a bit of work so I've split into two commits.
This is part 2, where we now need to pass both the field that
was focussed and the form it belongs to. To achieve this I have
a new class that encapsulates the pointers.
Change-Id: Iea1a5a55696c63255bcc57b070116409a2195f4c
Ben Murdoch [Fri, 7 Jan 2011 14:59:53 +0000 (14:59 +0000)]
Merge Chromium at 9.0.597.55: Merge r67599 (1/2)
This is a slightly tricky merge. This first part is the easy bit.
See http://src.chromium.org/viewvc/chrome?view=rev&revision=67599
Change-Id: Id22f7f0ce0f0b7eca62f39d4e6ae65b9ea1bdcda
Ben Murdoch [Fri, 7 Jan 2011 15:15:00 +0000 (15:15 +0000)]
Merge Chromium at 9.0.597.55: Merge r67192
See http://src.chromium.org/viewvc/chrome?view=rev&revision=67192
Change-Id: Ia1a391a9e7634e86e5c3166349befc47841b570e
Ben Murdoch [Fri, 7 Jan 2011 16:20:24 +0000 (16:20 +0000)]
Merge Chromium at 9.0.597.55: Add DnsCertChecker to constructor
See http://src.chromium.org/viewvc/chrome?view=rev&revision=66985
Change-Id: Ic4642c38646b94fb6db9e839a671cd335f9d5c6b
Ben Murdoch [Fri, 7 Jan 2011 15:12:30 +0000 (15:12 +0000)]
Merge Chromium at 9.0.597.55: Autofill: Merge r66860
See http://src.chromium.org/viewvc/chrome?view=rev&revision=66860
Change-Id: I561d89dcc060af7f3e0b975e4a940c7de63d89d4
Ben Murdoch [Fri, 7 Jan 2011 14:58:10 +0000 (14:58 +0000)]
Merge Chromium at 9.0.597.55: Autofill: Merge r66850
Autofill: Prefer maxLength to size attribute for form filling
heuristics.
See http://src.chromium.org/viewvc/chrome?view=rev&revision=66850
Change-Id: Ia102dea1c861474e878639b91288e6845d7250ef
Cary Clark [Tue, 11 Jan 2011 14:02:25 +0000 (09:02 -0500)]
remove push/pop around bitmap
The algorithm that analyzes cursor rings in pictures
stores the changes to the canvas (e.g. push layer, pop)
but it turns out that bitmaps may have push/pop
pairs around them that don't represent a state change.
Remove the push/pop pairs around bitmaps when creating
the cursor region stack.
bug:
3299913
bug:
3329011
Change-Id: I14e0508285821e2723ff460e6b09faccb44f4565
Cary Clark [Tue, 11 Jan 2011 12:56:08 +0000 (04:56 -0800)]
Merge "layer or save push/pop should start new rect" into honeycomb
Kristian Monsen [Tue, 11 Jan 2011 10:29:00 +0000 (02:29 -0800)]
Merge "Fix a warning" into honeycomb
Leon Scroggins [Mon, 10 Jan 2011 22:51:51 +0000 (17:51 -0500)]
Remove nativeCursorMatchesFocus method.
Bug:
3335014
Change-Id: I55e60cec72f27ab2877455a7899a21cbd86a0efa
Derek Sollenberger [Fri, 7 Jan 2011 21:00:35 +0000 (16:00 -0500)]
Cherrypick of https://android-git.corp.google.com/g/#change,88039
Pass multiTouch events to plugins so Adobe could try it.
Change-Id: I2c1120a85ef15db0ce45161403d56843c0037abf