OSDN Git Service
Patrick Scott [Tue, 25 Jan 2011 19:39:43 +0000 (11:39 -0800)]
Merge "Sync the parent layer's children." into honeycomb
Patrick Scott [Tue, 25 Jan 2011 19:28:50 +0000 (14:28 -0500)]
Sync the parent layer's children.
Since we are being removed from our parent, our children do not matter. Sync
the parent's children to show the right content.
Bug:
3353525
Change-Id: Id8ab4d0373d950362caa14d8fc558f753d5a7365
Derek Sollenberger [Tue, 25 Jan 2011 19:00:37 +0000 (14:00 -0500)]
Fix invalid draw events when the plugin is injected into a loaded page
Use WebViewCore's scale value instead of maintaining our own to
prevent getting out of sync and reporting the wrong zoom to the plugin.
bug:
3388258
Change-Id: I45f2b14c48442ab0211a9bafeb42b2216b706346
Derek Sollenberger [Tue, 25 Jan 2011 19:02:02 +0000 (11:02 -0800)]
Merge "Prevent timer from deleting itself twice." into honeycomb
Ben Murdoch [Tue, 25 Jan 2011 18:55:01 +0000 (10:55 -0800)]
Merge "Fix crash in LayerAndroid::addAnimation" into honeycomb
Ben Murdoch [Tue, 25 Jan 2011 18:35:36 +0000 (10:35 -0800)]
Merge "Merge WebKit at Chromium 9.0.597.83: Update WebKit revision number." into honeycomb
Ben Murdoch [Tue, 25 Jan 2011 18:35:29 +0000 (10:35 -0800)]
Merge "Merge WebKit at Chromium 9.0.597.83: Trivial merge by git." into honeycomb
Derek Sollenberger [Tue, 25 Jan 2011 18:02:16 +0000 (13:02 -0500)]
Prevent timer from deleting itself twice.
If a plugin attempts to delete itself as a result of a timer
firing, it currently crashes the browser. This CL defers the
deletion of the timer until after the timer's fire method completes.
bug:
3382772
Change-Id: I1b5f995f91c7a06767b2a3f68880d3e197a83124
John Reck [Tue, 25 Jan 2011 18:29:06 +0000 (10:29 -0800)]
Merge "Move localstorage into private folder" into honeycomb
Shimeng (Simon) Wang [Tue, 25 Jan 2011 18:27:36 +0000 (10:27 -0800)]
Merge "Use platform bridge to control high usage delta MB." into honeycomb
Leon Scroggins [Tue, 25 Jan 2011 14:23:26 +0000 (09:23 -0500)]
Use an integer to keep track of the blurring node.
Bug:
3387251
Rather than storing the actual pointer to the Node, since
the pointer may no longer be valid and it is only used for
comparison anyway.
Change-Id: Icc6aabfa66c4a40b40fb6a8673d7ad34346360b6
Ben Murdoch [Tue, 25 Jan 2011 12:23:52 +0000 (12:23 +0000)]
Fix crash in LayerAndroid::addAnimation
Transfer PassRefPtr to RefPtr. Credit to Jason Simmons for the fix.
Bug:
3385803
Change-Id: Id148923e95d5628a625c87fe093b85dd381e781e
Ben Murdoch [Tue, 25 Jan 2011 11:44:03 +0000 (11:44 +0000)]
Merge WebKit at Chromium 9.0.597.83: Update WebKit revision number.
Change-Id: Ie6cc93dc813c7014ab13015a904b7d9a1706e193
Ben Murdoch [Tue, 25 Jan 2011 11:33:58 +0000 (11:33 +0000)]
Merge WebKit at Chromium 9.0.597.83: Trivial merge by git.
Change-Id: I027931929980a55d4d5e883f659c116c77dbb2a9
Nicolas Roard [Tue, 25 Jan 2011 08:32:11 +0000 (00:32 -0800)]
Fix "jumpy" mode and textfield input
bug:
3382562
bug:
3384930
Change-Id: I55b97cacc9c50ae5a0b5dfc39658bb63c8aa9e87
Nicolas Roard [Tue, 25 Jan 2011 03:09:25 +0000 (19:09 -0800)]
Merge "Improve layers repaint mechanism" into honeycomb
Nicolas Roard [Mon, 24 Jan 2011 22:25:33 +0000 (14:25 -0800)]
Improve layers repaint mechanism
bug:
3375416
Change-Id: I9e86736c9f7910765bea739cdd0e04331b98f155
Leon Scroggins [Mon, 24 Jan 2011 23:02:40 +0000 (15:02 -0800)]
Merge "Wait until the focus changes to hide keyboard." into honeycomb
Leon Scroggins [Mon, 24 Jan 2011 22:36:03 +0000 (14:36 -0800)]
Merge "Only revealSelection if scale has not changed." into honeycomb
Leon Scroggins [Mon, 24 Jan 2011 20:21:12 +0000 (15:21 -0500)]
Wait until the focus changes to hide keyboard.
Bug:
3376680
Change-Id: Ib5636a27183fbd94aff6817e0a5641c40db28649
Bart Sears [Mon, 24 Jan 2011 21:58:08 +0000 (13:58 -0800)]
Merge "Fix for bug
3380288" into honeycomb
Leon Scroggins [Mon, 24 Jan 2011 21:50:32 +0000 (16:50 -0500)]
Only revealSelection if scale has not changed.
Bug:
3383787
The intent of calling revealSelection was to show the text field
when the IME is shown. If the scale changed, this was a zoom, not
an opening of the IME.
Change-Id: Idcb17c18eb7f90b79521da1ab1b48931808773d6
Nicolas Roard [Mon, 24 Jan 2011 21:27:17 +0000 (13:27 -0800)]
Merge "Work around for pure virtual layers crash." into honeycomb
Shimeng (Simon) Wang [Fri, 21 Jan 2011 23:09:09 +0000 (15:09 -0800)]
Use platform bridge to control high usage delta MB.
This change gives flexibility to change that value in Java side.
issue:
3317722
Change-Id: I71a548871783cc604e0daec63e6bbfb26ecc1e1f
John Reck [Tue, 11 Jan 2011 01:34:57 +0000 (17:34 -0800)]
Move localstorage into private folder
Bug:
3244281
Move all the localstorage databases into their own private
subfolder without global execute permission
Change-Id: I0fbd068365f8d2de3242e4e737f00649e321a92c
Chet Haase [Mon, 24 Jan 2011 00:15:31 +0000 (16:15 -0800)]
Optimize display lists by caching drawGL function pointer.
This is a change to help framework optimizations for display lists.
A display list can now cache a function pointer to the drawGL call
of webcore.
Change-Id: I9ba133d5a28f12b1c3626301414786a41c1d58b9
Kristian Monsen [Mon, 24 Jan 2011 11:11:57 +0000 (11:11 +0000)]
Fix for bug
3380288
Cannot create a WebRequestContext before we know if
we should use private mode or not.
Change-Id: I82b0dd67342a381ea1764c4d0457386ff7980be4
Ben Murdoch [Mon, 24 Jan 2011 11:50:25 +0000 (11:50 +0000)]
Work around for pure virtual layers crash.
TextureOwner can be left still owning a texture when we come to
delete that TextureOwner. Then later the texture it still owns tries to
access it's owner and we crash.
Work around by explicity releasing any owned textures when we delete
the texture owner.
Bug:
3367855
Change-Id: I38877b7088d27f51d98cfd182d937fe5cb3b9f8d
Nicolas Roard [Mon, 24 Jan 2011 01:13:22 +0000 (17:13 -0800)]
Remove logs
bug:
3379585
Change-Id: Ica133d128f940a71afdd44130735eab11e4daf4e
Nicolas Roard [Sun, 23 Jan 2011 23:01:19 +0000 (15:01 -0800)]
Implement tiles synchronization
When a tiledPage is painted, we want to avoid updating the base
layer. GLWebViewState and WebView.cpp are now refcounting the
base layer, delaying updating the base layer we use to paint
until we are done with a full tile paint.
bug:
3224744
Change-Id: Ica2b8f1db146a1e059fc0735dc53107fc40da07a
Leon Scroggins [Fri, 21 Jan 2011 16:57:40 +0000 (11:57 -0500)]
Line up text with WebTextView.
Bug:
3321608
Bug:
3085564
Scroll the UI layer for a <textarea> when scrolling the
WebTextView. When clicking on a <textarea>, send the scroll
point so the click happens properly.
Requires a change to frameworks/base.
Change-Id: I3b32a53db350b6c49fdbf8dd177c34854aae66b4
Derek Sollenberger [Fri, 21 Jan 2011 19:25:40 +0000 (14:25 -0500)]
Do not dismiss the keyboard if the plugin is the focused node.
bug:
3332478
Change-Id: I358ed2c828e39adc8d6e80eaaa0071854e03c655
Ben Murdoch [Fri, 21 Jan 2011 15:38:50 +0000 (15:38 +0000)]
Video doesn't use a layer as we hand it off to the fullscreen player.
Fix null pointer deref.
Bug:
3364538
Change-Id: Iafeecd81ec422de6e17ec8a0c36c29e4fcf7fc74
Derek Sollenberger [Thu, 20 Jan 2011 23:48:41 +0000 (18:48 -0500)]
relocate the glFinish to prevent it from needlessly executing.
bug:
3374501
Change-Id: Idb6836cb8e3919066d77cbcca8b09a6f261dae31
Nicolas Roard [Thu, 20 Jan 2011 21:19:34 +0000 (13:19 -0800)]
Merge "Fix deadlock in textures generator" into honeycomb
Nicolas Roard [Thu, 20 Jan 2011 21:02:46 +0000 (13:02 -0800)]
Fix deadlock in textures generator
bug:
3373656
Change-Id: If6428b88a135fe1184e92bf345ddbae349622c94
Cary Clark [Thu, 20 Jan 2011 19:52:40 +0000 (11:52 -0800)]
Merge "match the frame with the node" into honeycomb
Derek Sollenberger [Thu, 20 Jan 2011 19:20:28 +0000 (11:20 -0800)]
Merge "Send appropriate events when plugin is dynamically resized." into honeycomb
Cary Clark [Thu, 20 Jan 2011 19:09:55 +0000 (14:09 -0500)]
match the frame with the node
In a couple of places, the wrong frame is used
with the node, resulting in a crash if the
node is in a layer.
bug:
3373069
Change-Id: I0ff7a9d0aa07f742e95278c377b43ca77eb73212
Iain Merrick [Fri, 7 Jan 2011 10:50:51 +0000 (10:50 +0000)]
Report SSL certificates to WebView.
In the Apache HTTP stack, this is done by LoadListener. This CL
plumbs in the same logic for the Chrome HTTP stack. This fixes
the WebViewTest#testAccessCertificate CTS test.
Bug:
3242048
Change-Id: I69a4de46ded59bfdebdd391c4731c7c1a79744fb
Derek Sollenberger [Thu, 20 Jan 2011 15:57:24 +0000 (10:57 -0500)]
Send appropriate events when plugin is dynamically resized.
bug:
3372374
Change-Id: I51bb9fedaf4c941f45c068ad3e044cd771444392
Ben Murdoch [Thu, 20 Jan 2011 14:43:05 +0000 (06:43 -0800)]
Merge "Merge WebKit at Chromium 9.0.597.76: Update WebKit revision number" into honeycomb
Ben Murdoch [Thu, 20 Jan 2011 14:42:57 +0000 (06:42 -0800)]
Merge "Don't allow fullscreen video to play from the onload handler." into honeycomb
Kristian Monsen [Thu, 20 Jan 2011 14:40:29 +0000 (06:40 -0800)]
Merge "Prelinking libwebcore after making more space in the prelink map" into honeycomb
Leon Scroggins [Thu, 20 Jan 2011 13:56:12 +0000 (05:56 -0800)]
Merge "Do not reveal selection unless the focus controller is active." into honeycomb
Kristian Monsen [Mon, 17 Jan 2011 17:04:34 +0000 (17:04 +0000)]
Prelinking libwebcore after making more space in the prelink map
Depends on this CL in the build package:
https://android-git.corp.google.com/g/#change,90379
Fix for bug
2917906
Change-Id: I69ffa74de5341096012488648e8a0d72774421ca
Leon Scroggins [Thu, 20 Jan 2011 13:10:49 +0000 (08:10 -0500)]
Do not reveal selection unless the focus controller is active.
Bug:
3370821
Bug:
3073288
Also remove unnecessary callers to setUserInitiatedAction.
Change-Id: I682b9498bb48771a92e856e32e16072007c53f72
Ben Murdoch [Wed, 19 Jan 2011 13:01:33 +0000 (13:01 +0000)]
Merge WebKit at Chromium 9.0.597.76: Update WebKit revision number
No changes for this merge, just updating the tag.
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: I9ad6ece190bbbcb283d8d4c624d8baff5023c653
Teng-Hui Zhu [Wed, 19 Jan 2011 22:18:45 +0000 (14:18 -0800)]
Scroll Dimension need re-computed when size changed.
The scroll size will be used for layout and should respect the layer's
size change. Otherwise all the position info can be wrong.
bug:
3362888
Change-Id: I553ba01ca7e5960c7ec706d56710495fc5514db1
Ben Murdoch [Wed, 19 Jan 2011 12:12:35 +0000 (12:12 +0000)]
Don't allow fullscreen video to play from the onload handler.
Prevent fullscreen HTML5 video from playing if the play command
originates from the onload handler.
Change-Id: I2031d3785d5c27f88350df03d57fcbbbc8898e89
Nicolas Roard [Wed, 19 Jan 2011 19:55:49 +0000 (11:55 -0800)]
Merge "Fix "jump" bug" into honeycomb
David 'Digit' Turner [Wed, 19 Jan 2011 19:55:28 +0000 (11:55 -0800)]
Merge "Fix browser build on non-ARMv7 configurations." into honeycomb
Nicolas Roard [Wed, 19 Jan 2011 19:54:04 +0000 (11:54 -0800)]
Fix "jump" bug
bug:
3349970
Change-Id: I7e095c541bc8a106c94c14a70f121ea3b24f06f4
David 'Digit' Turner [Wed, 19 Jan 2011 19:36:30 +0000 (20:36 +0100)]
Fix browser build on non-ARMv7 configurations.
This is required to prevent the browser from crashing with a SIGILL
when running the full-eng product in the emulator.
Change-Id: I321130fe4d568c927999ae41503d2a5c24b3cbae
Derek Sollenberger [Wed, 19 Jan 2011 18:34:23 +0000 (13:34 -0500)]
Trigger OnScreen events when the page loads.
bug:
3368632
Change-Id: I13dbf1c809f32887f5d659e6fead60a61110eddd
Leon Scroggins [Wed, 19 Jan 2011 17:56:38 +0000 (12:56 -0500)]
Move selection on screen when size changes.
Bug:
3367446
Change-Id: Idad0fae69588fd6ce9602319385e165d7e2ff5dd
Kristian Monsen [Wed, 19 Jan 2011 18:04:18 +0000 (10:04 -0800)]
Merge "Passing WebSettings cacheMode to the chrome load_flags" into honeycomb
Russell Brenner [Wed, 19 Jan 2011 18:04:09 +0000 (10:04 -0800)]
Merge "Fix (or partial fix) for
3355185, crash on broken-ideograph-small-caps.html" into honeycomb
Russell Brenner [Wed, 19 Jan 2011 02:00:42 +0000 (18:00 -0800)]
Fix (or partial fix) for
3355185, crash on broken-ideograph-small-caps.html
Emptied platformDestroy(). It was deleting m_smallCapsFontData, but not
setting it to 0. The caller, ~SimpleFontData(), then went on to use the
deleted pointer and delete it again. This was changed for other
platforms with http://trac.webkit.org/changeset/71975.
Change-Id: Ie67f91559479a17519db7793c7349eb013235320
Kristian Monsen [Wed, 19 Jan 2011 16:02:50 +0000 (16:02 +0000)]
Passing WebSettings cacheMode to the chrome load_flags
Fixes a few CTS tests
Change-Id: I1b72813b828a6aa24522e9ffb2ff17a3e364f7bf
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: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:34:43 +0000 (07:34 -0800)]
Merge "Maintain the seek position for HTML5 Video" into honeycomb
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:28:14 +0000 (02:28 -0800)]
Merge "Fix occasional AutoFill crash" into honeycomb
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: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: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: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:33:39 +0000 (12:33 -0800)]
Merge " Implement re-scaling for layers" into honeycomb
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: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: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
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: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.