OSDN Git Service
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 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: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: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: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: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: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: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 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.
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
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
Teng-Hui Zhu [Mon, 10 Jan 2011 00:30:39 +0000 (16:30 -0800)]
Add Null check to the root layer
bug:
3284834
Change-Id: If537400333a6884f92d688481ff4efe3ae5796a3
Nicolas Roard [Mon, 10 Jan 2011 22:49:33 +0000 (14:49 -0800)]
Merge "Enable fixed layers for all websites" into honeycomb
Nicolas Roard [Mon, 10 Jan 2011 21:11:35 +0000 (13:11 -0800)]
Enable fixed layers for all websites
bug:
2797422
Change-Id: Ide0867a06d61a7ee92af751ae824fe6c3b23c41f
Nicolas Roard [Mon, 10 Jan 2011 22:38:07 +0000 (14:38 -0800)]
Merge "Change the transition from cross-fading to simple fading of only one of the TiledPage." into honeycomb
Cary Clark [Mon, 10 Jan 2011 21:33:00 +0000 (16:33 -0500)]
layer or save push/pop should start new rect
In computing cursor rings, consecutive rectangles
from the picture may be combined. If the picture
pushes or pops a canvas context, the rects
should no longer be combined, because they come
from different DOM nodes.
bug:
3336522
Change-Id: I2b09220d84238873f209528bf822b9c203de9ce8
Nicolas Roard [Mon, 10 Jan 2011 19:08:13 +0000 (11:08 -0800)]
Change the transition from cross-fading to simple fading of only one of
the TiledPage.
bug:
3335076
Change-Id: Ia2a0de24e7c13d7cf3bbae8b17e9db1e377aa8a4
Cary Clark [Mon, 10 Jan 2011 19:03:38 +0000 (11:03 -0800)]
Merge "selectBestAt missing another null check" into honeycomb
Cary Clark [Mon, 10 Jan 2011 18:31:24 +0000 (13:31 -0500)]
selectBestAt missing another null check
bug:
3334943
Change-Id: I0183634bfbe64b145edafcc84f42e213509cbc2c
Kristian Monsen [Mon, 10 Jan 2011 16:27:55 +0000 (16:27 +0000)]
Fix a warning
Just changing the order so they are matched in the .h and .cpp
Change-Id: I88afbdded260a389da2134ccdc7946f649b8db37
Leon Scroggins [Mon, 10 Jan 2011 16:11:00 +0000 (08:11 -0800)]
Merge "Ensure that PopupReply does not take action after disconnection." into honeycomb
Leon Scroggins [Fri, 7 Jan 2011 22:01:37 +0000 (17:01 -0500)]
Ensure that PopupReply does not take action after disconnection.
Bug:
3326203
Change-Id: Ieec8765fae0af7d4f2b0f56167cb1b221fa73687
Cary Clark [Fri, 7 Jan 2011 21:05:17 +0000 (16:05 -0500)]
return the scrollable layer's content bounds
Compute and return the scrollable layer's bounds in
content space and return it to the java side.
The layer's bounds is used to determine if the
select text touch point is close to the edge and
should invoke scrolling.
Also, added a null check to selectBestAt
Requires a companion change in frameworks/base
bug:
3191699
bug:
3334943
Change-Id: Id066997f56da59f37350c14a4cc43fe4a7ce7312
Nicolas Roard [Fri, 7 Jan 2011 22:59:07 +0000 (14:59 -0800)]
Merge "Fix alpha compositing in the shaders to work with premultiplied alpha textures" into honeycomb
Shimeng (Simon) Wang [Fri, 7 Jan 2011 22:04:31 +0000 (14:04 -0800)]
Remove ANDROID_SCROLL_ON_GOTO_ANCHOR in WebCore/config.h
This helps scrolling to a page#anchor link as shown in the bug.
Not sure I understand the reason to have that setting at the first place.
issue:
3225233
Change-Id: If2960d3c77be94b150e138a534007708f025dbad
Svetoslav Ganov [Thu, 6 Jan 2011 02:52:54 +0000 (18:52 -0800)]
bug:
3325039 Making the cursor ring movement send accessibility events.
1. Added a mechanism to select the cursor ring content if accessibility is
enabled - This is achieved by sending an event to the WebCore thread
(if accessibility is enabled) to select the content of the cursor when
the latter moves. Added code in WebViewCore to select the given node
and notify the UI thread for the selection markup which is delivered
of the accessibility injector which manages sending accessibility
events. This is relevant for adding accessibility to WebView if
JavaScript is not enabled. (If JS is enabled we inject a screenreader
written in JS).
2. Fixed the event delegation to the accessibility injector since it
should be able to consume key events of interest and perform some
action which leads to sending appropriate accessibility event.
In the previous implementation it was possible that the injector
consumes the event but the latter was bubbled up.
3. Added function to scroll the selection into view while moving it
around based on user commands.
Note: This is a two project change.
Change-Id: Ica27f317e194474d4e38aba5d7a2c0acc9f05a33
Nicolas Roard [Fri, 7 Jan 2011 21:29:09 +0000 (13:29 -0800)]
Fix alpha compositing in the shaders to work with premultiplied alpha
textures
bug:
3332829
Change-Id: Iffce6322fca694e85dd51dbc4147f4309f350eca
Teng-Hui Zhu [Thu, 6 Jan 2011 00:42:38 +0000 (16:42 -0800)]
Add debug info
When we have such extra info in the log, it could lead to a root cause
more directly without manual adding and rebuilding.
bug:
3307016
Change-Id: I7699c554923d1cdc4ddeb9795ad9c89687b1f27a
Derek Sollenberger [Fri, 7 Jan 2011 18:41:51 +0000 (10:41 -0800)]
Merge "Add multi-touch plugin API." into honeycomb
Teng-Hui Zhu [Thu, 6 Jan 2011 19:56:00 +0000 (11:56 -0800)]
Redo the clippingRect calculation
Although the intersetcion is done correctly, but the clippingRect
should take the parents' matrix into account.
To make the code cleaner, we convert all the rects into screen
coordinate for intersection.
bug:
3304761
Change-Id: Ia3dc3e7b72f2e72eaab66ba8e017d89ab71dc468
Shimeng (Simon) Wang [Fri, 7 Jan 2011 18:01:03 +0000 (10:01 -0800)]
Merge "Not set max decoded image size in WebCore." into honeycomb
Derek Sollenberger [Fri, 7 Jan 2011 16:19:37 +0000 (11:19 -0500)]
Add multi-touch plugin API.
bug:
3302363
Change-Id: Iaaa5bdf8616043fdba47690fc130002d9fe57e8b
Derek Sollenberger [Fri, 7 Jan 2011 16:17:00 +0000 (08:17 -0800)]
Merge "Add additional debugging for plugins." into honeycomb
Derek Sollenberger [Fri, 7 Jan 2011 16:04:46 +0000 (11:04 -0500)]
Add additional debugging for plugins.
Change-Id: Ie4437e0b62a16ee7e9d1b6fc605554ecc161cc6c
Steve Block [Fri, 7 Jan 2011 16:03:56 +0000 (08:03 -0800)]
Merge "Update a WebCache comment" into honeycomb
Steve Block [Tue, 4 Jan 2011 15:58:40 +0000 (15:58 +0000)]
Update a WebCache comment
This should have been updated in
https://android-git.corp.google.com/g/82475
Change-Id: Ia4dee2458ebeb25bf9dc86a99b6f25f335be72dc
Steve Block [Fri, 7 Jan 2011 15:42:47 +0000 (07:42 -0800)]
Merge "Adds an optimization to cache the WebCache backend" into honeycomb
Iain Merrick [Fri, 7 Jan 2011 13:51:41 +0000 (05:51 -0800)]
Merge "Fix MIME type handling for badly-behaved servers." into honeycomb
Iain Merrick [Thu, 6 Jan 2011 16:31:24 +0000 (16:31 +0000)]
Fix MIME type handling for badly-behaved servers.
This fixes http://scrabb.ly, which is a particularly bad example as
there is no filename and no Content-Type header. This CL duplicates
the behaviour of the Apache HTTP stack by defaulting to text/html.
Bug:
3242012
Change-Id: Id0e131ee880466e1708367612ac0217d43db347b
Ben Murdoch [Thu, 6 Jan 2011 21:48:45 +0000 (21:48 +0000)]
Merge WebKit at Chromium 9.0.597.55: Update WebKit revision number
Note that we are tracking the Chromium 9.0.597 release branch, which is
WebKit r72805 + stability cherry picks.
Change-Id: I640ea1149a9e95b7e27169a298f2fc63b544a269
Ben Murdoch [Thu, 6 Jan 2011 21:47:36 +0000 (21:47 +0000)]
Merge WebKit at Chromium 9.0.597.55: RenderFrame docWidth method changed
See http://trac.webkit.org/changeset/72852
Change-Id: I8ab3171330e475bec7eade78b35b11304f74579a
Ben Murdoch [Thu, 6 Jan 2011 21:36:31 +0000 (21:36 +0000)]
Merge WebKit at Chromium 9.0.597.55: trivial merge by git
Change-Id: I2c6f2ebc4431d15ac82b5b1a9f08159e1731bc57
Shimeng (Simon) Wang [Fri, 7 Jan 2011 01:27:02 +0000 (17:27 -0800)]
Don't reflow if a RenderBlock has background color or image.
issue:
3313826
Change-Id: Ic9c87880eb6f41f72319f72123cc21cc2fe623f0
Shimeng (Simon) Wang [Thu, 6 Jan 2011 22:14:18 +0000 (14:14 -0800)]
Not set max decoded image size in WebCore.
Two reasons:
1. the image size will be limited in ImageSourceAndroid.cpp.
2. WebCore will do an estimation comparison against that max value, which
will limit some good cases.
For example, in the case of the following bug, the background image size is limited
and good, but its estimation value in WebCore will exceed the max.
issue:
3240499
Change-Id: I721c7565beb648dd83200d05e223012299997e04
Leon Scroggins [Thu, 6 Jan 2011 19:39:24 +0000 (11:39 -0800)]
Merge "When canceling <select> popup leave the value unchanged." into honeycomb
Leon Scroggins [Thu, 6 Jan 2011 18:50:23 +0000 (13:50 -0500)]
When canceling <select> popup leave the value unchanged.
Bug:
3328658
Change-Id: I70e7fa72a0f2df3957cb295efdf404fd91511610
Cary Clark [Thu, 6 Jan 2011 18:52:42 +0000 (10:52 -0800)]
Merge "add iframes to the types that want key events" into honeycomb
Cary Clark [Thu, 6 Jan 2011 18:43:34 +0000 (13:43 -0500)]
add iframes to the types that want key events
This is a companion change to frameworks/base, to
route the enter key to a webkit click only if the
cursor node does not want the key event.
bug:
3325093
Change-Id: I78ebcec42cc413f645c080dff7f38e75e7f09c7f