OSDN Git Service
Ben Murdoch [Tue, 25 Jan 2011 18:59:11 +0000 (10:59 -0800)]
am
1db201b5: am
68934d8f: Merge "Fix crash in LayerAndroid::addAnimation" into honeycomb
* commit '
1db201b556df89913e7b9d8261d0da1f7b8f491f':
Fix crash in LayerAndroid::addAnimation
Ben Murdoch [Tue, 25 Jan 2011 18:56:54 +0000 (10:56 -0800)]
am
68934d8f: Merge "Fix crash in LayerAndroid::addAnimation" into honeycomb
* commit '
68934d8facb223c3f0bc1f44f36554b3c39dc8ea':
Fix crash in LayerAndroid::addAnimation
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:40:20 +0000 (10:40 -0800)]
am
eda932f7: am
e5271873: Merge "Merge WebKit at Chromium 9.0.597.83: Update WebKit revision number." into honeycomb
* commit '
eda932f71949131a7a74f93f389852b59fc215fc':
Merge WebKit at Chromium 9.0.597.83: Update WebKit revision number.
Ben Murdoch [Tue, 25 Jan 2011 18:40:16 +0000 (10:40 -0800)]
am
5ed8337a: am
ca1b65e9: Merge "Merge WebKit at Chromium 9.0.597.83: Trivial merge by git." into honeycomb
* commit '
5ed8337ad416c304d4b4dc0db29fd7e9623ce98f':
Merge WebKit at Chromium 9.0.597.83: Trivial merge by git.
Ben Murdoch [Tue, 25 Jan 2011 18:38:07 +0000 (10:38 -0800)]
am
e5271873: Merge "Merge WebKit at Chromium 9.0.597.83: Update WebKit revision number." into honeycomb
* commit '
e5271873d9e1e31a104d4253395c333c67e26ab5':
Merge WebKit at Chromium 9.0.597.83: Update WebKit revision number.
Ben Murdoch [Tue, 25 Jan 2011 18:38:05 +0000 (10:38 -0800)]
am
ca1b65e9: Merge "Merge WebKit at Chromium 9.0.597.83: Trivial merge by git." into honeycomb
* commit '
ca1b65e9771b2d40725d48bad03aa74a5b5358c4':
Merge WebKit at Chromium 9.0.597.83: Trivial merge by git.
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
John Reck [Tue, 25 Jan 2011 18:35:02 +0000 (10:35 -0800)]
am
ad81e365: am
ec4d93f2: Merge "Move localstorage into private folder" into honeycomb
* commit '
ad81e36504acfa5b7dd78a7501a337e242928263':
Move localstorage into private folder
Shimeng (Simon) Wang [Tue, 25 Jan 2011 18:34:57 +0000 (10:34 -0800)]
am
f00896e5: am
47e08d2e: Merge "Use platform bridge to control high usage delta MB." into honeycomb
* commit '
f00896e5bff4c747965f4c12328f4768557788c6':
Use platform bridge to control high usage delta MB.
John Reck [Tue, 25 Jan 2011 18:32:51 +0000 (10:32 -0800)]
am
ec4d93f2: Merge "Move localstorage into private folder" into honeycomb
* commit '
ec4d93f279f4f14dd6bb178fc024c43eb6e992f5':
Move localstorage into private folder
Shimeng (Simon) Wang [Tue, 25 Jan 2011 18:30:41 +0000 (10:30 -0800)]
am
47e08d2e: Merge "Use platform bridge to control high usage delta MB." into honeycomb
* commit '
47e08d2ef91489605378dab64166163ceb454fc7':
Use platform bridge to control high usage delta MB.
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 15:53:40 +0000 (07:53 -0800)]
am
c02250ca: am
7cf14d75: Use an integer to keep track of the blurring node.
* commit '
c02250caf87c2901e746039f05d16d7f748d199d':
Use an integer to keep track of the blurring node.
Leon Scroggins [Tue, 25 Jan 2011 15:37:54 +0000 (07:37 -0800)]
am
7cf14d75: Use an integer to keep track of the blurring node.
* commit '
7cf14d751364973cc8ce88fe9b822008ef83d2a5':
Use an integer to keep track of the blurring node.
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:47:31 +0000 (00:47 -0800)]
am
266eaa01: am
3adf18ff: Fix "jumpy" mode and textfield input
* commit '
266eaa013468353d41eb84c49ab88539cdf3fb6a':
Fix "jumpy" mode and textfield input
Nicolas Roard [Tue, 25 Jan 2011 08:45:53 +0000 (00:45 -0800)]
am
3adf18ff: Fix "jumpy" mode and textfield input
* commit '
3adf18ff68c18ee48f402c702f321c93eca82915':
Fix "jumpy" mode and textfield input
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:16:40 +0000 (19:16 -0800)]
am
8c71321c: am
906025de: Merge "Improve layers repaint mechanism" into honeycomb
* commit '
8c71321cb84ecd1594388611b4732875c3024f91':
Improve layers repaint mechanism
Nicolas Roard [Tue, 25 Jan 2011 03:14:41 +0000 (19:14 -0800)]
am
906025de: Merge "Improve layers repaint mechanism" into honeycomb
* commit '
906025dec936136889f78fc35b8de36126febbfc':
Improve layers repaint mechanism
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 [Tue, 25 Jan 2011 00:22:01 +0000 (16:22 -0800)]
am
aa84968a: am
1ce076ca: Merge "Wait until the focus changes to hide keyboard." into honeycomb
* commit '
aa84968a70657ccdf4449d0c7971bd3405c1c04e':
Wait until the focus changes to hide keyboard.
Leon Scroggins [Mon, 24 Jan 2011 23:06:37 +0000 (15:06 -0800)]
am
1ce076ca: Merge "Wait until the focus changes to hide keyboard." into honeycomb
* commit '
1ce076ca4ba4164d5a583d26af05c0030f01afe8':
Wait until the focus changes to hide keyboard.
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:40:00 +0000 (14:40 -0800)]
am
503b8afd: am
2efa69dd: Merge "Only revealSelection if scale has not changed." into honeycomb
* commit '
503b8afd9b1d847cf29a1e10512ab9ec8d73f6bc':
Only revealSelection if scale has not changed.
Leon Scroggins [Mon, 24 Jan 2011 22:37:48 +0000 (14:37 -0800)]
am
2efa69dd: Merge "Only revealSelection if scale has not changed." into honeycomb
* commit '
2efa69dd571da1a0f2cbeaeba29685c8ed412416':
Only revealSelection if scale has not changed.
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 22:04:14 +0000 (14:04 -0800)]
am
63f58c40: am
87a9651a: Merge "Fix for bug
3380288" into honeycomb
* commit '
63f58c4017f2e907f802bf5567ab3790fdd823eb':
Fix for bug
3380288
Bart Sears [Mon, 24 Jan 2011 22:01:03 +0000 (14:01 -0800)]
am
87a9651a: Merge "Fix for bug
3380288" into honeycomb
* commit '
87a9651ac46abb34b2aa38d29ec39b78b381eba4':
Fix for bug
3380288
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:37:26 +0000 (13:37 -0800)]
am
33b5d1e9: am
73739bcd: Merge "Work around for pure virtual layers crash." into honeycomb
* commit '
33b5d1e98d00a957d83f1da6060841c1ce858284':
Work around for pure virtual layers crash.
Chet Haase [Mon, 24 Jan 2011 21:31:38 +0000 (13:31 -0800)]
am
004813d9: am
908703e4: Optimize display lists by caching drawGL function pointer.
* commit '
004813d9ff2e1295fb2ff1655513d03cc40aa89f':
Optimize display lists by caching drawGL function pointer.
Nicolas Roard [Mon, 24 Jan 2011 21:29:29 +0000 (13:29 -0800)]
am
73739bcd: Merge "Work around for pure virtual layers crash." into honeycomb
* commit '
73739bcddc87a2728056e52e5b48ec62ddccbd2b':
Work around for pure virtual layers crash.
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
Chet Haase [Mon, 24 Jan 2011 19:15:56 +0000 (11:15 -0800)]
am
908703e4: Optimize display lists by caching drawGL function pointer.
* commit '
908703e420f4931f74527aaeb3d5faabdd66c28a':
Optimize display lists by caching drawGL function pointer.
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:52:27 +0000 (17:52 -0800)]
Nicolas Roard [Mon, 24 Jan 2011 01:50:25 +0000 (17:50 -0800)]
Nicolas Roard [Mon, 24 Jan 2011 01:13:22 +0000 (17:13 -0800)]
Remove logs
bug:
3379585
Change-Id: Ica133d128f940a71afdd44130735eab11e4daf4e
Nicolas Roard [Mon, 24 Jan 2011 01:01:43 +0000 (17:01 -0800)]
am
65ef402e: am
245e0cdd: 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
* commit '
65ef402e920acae6b7561ce114d1f8a4f5d76c28':
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.
Nicolas Roard [Mon, 24 Jan 2011 00:52:16 +0000 (16:52 -0800)]
am
245e0cdd: 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 p
* commit '
245e0cdd9ea80915059080a2bedbb9ebb5cc646c':
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.
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 21:01:10 +0000 (13:01 -0800)]
am
e753e21c: am
f0425628: Line up text with WebTextView.
* commit '
e753e21c6a177d9d391c40f24bbe6fc4c4cb736a':
Line up text with WebTextView.
Leon Scroggins [Fri, 21 Jan 2011 20:59:07 +0000 (12:59 -0800)]
am
f0425628: Line up text with WebTextView.
* commit '
f0425628b4e83bf9e1c8275d809d433baeaf768c':
Line up text with WebTextView.
Derek Sollenberger [Fri, 21 Jan 2011 20:42:20 +0000 (12:42 -0800)]
am
977d16a0: am
7ab151a3: Do not dismiss the keyboard if the plugin is the focused node.
* commit '
977d16a0f5b5731f7fcb2f40af86c545b27e4073':
Do not dismiss the keyboard if the plugin is the focused node.
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 20:36:41 +0000 (12:36 -0800)]
am
7ab151a3: Do not dismiss the keyboard if the plugin is the focused node.
* commit '
7ab151a3c6a4efc42f6e3a4d09254c6767d13fec':
Do not dismiss the keyboard if the plugin is the focused node.
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 19:03:43 +0000 (11:03 -0800)]
am
a01ec6db: am
492fe962: Video doesn\'t use a layer as we hand it off to the fullscreen player.
* commit '
a01ec6db58644ca2f06807298fa51c859fb4154e':
Video doesn't use a layer as we hand it off to the fullscreen player.
Ben Murdoch [Fri, 21 Jan 2011 18:53:29 +0000 (10:53 -0800)]
am
492fe962: Video doesn\'t use a layer as we hand it off to the fullscreen player.
* commit '
492fe96285a5ba81e8ece3754ed6a8feb5bbeff5':
Video doesn't use a layer as we hand it off to the fullscreen player.
Derek Sollenberger [Fri, 21 Jan 2011 18:47:36 +0000 (10:47 -0800)]
am
84f01d0a: am
eb981e5d: relocate the glFinish to prevent it from needlessly executing.
* commit '
84f01d0afe0b91d7fccb8bf661b24eaf44664900':
relocate the glFinish to prevent it from needlessly executing.
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
Nicolas Roard [Fri, 21 Jan 2011 01:28:36 +0000 (17:28 -0800)]
am
3be90808: am
d6090519: Merge "Fix deadlock in textures generator" into honeycomb
* commit '
3be908081fce429e0eaf6025fd22a103f1adf3e3':
Fix deadlock in textures generator
Cary Clark [Fri, 21 Jan 2011 01:28:13 +0000 (17:28 -0800)]
am
2681732b: am
686b4616: Merge "match the frame with the node" into honeycomb
* commit '
2681732b6940a023b8a45ab928d455ab9bce5f50':
match the frame with the node
Derek Sollenberger [Fri, 21 Jan 2011 01:14:02 +0000 (17:14 -0800)]
am
eb981e5d: relocate the glFinish to prevent it from needlessly executing.
* commit '
eb981e5d8d451de7d22f63d89da7f533b53fa5f5':
relocate the glFinish to prevent it from needlessly executing.
Nicolas Roard [Fri, 21 Jan 2011 01:04:52 +0000 (17:04 -0800)]
am
d6090519: Merge "Fix deadlock in textures generator" into honeycomb
* commit '
d60905195ba2f0052976c6c92839a1bcaf3a7387':
Fix deadlock in textures generator
Cary Clark [Fri, 21 Jan 2011 01:04:46 +0000 (17:04 -0800)]
am
686b4616: Merge "match the frame with the node" into honeycomb
* commit '
686b4616074df77cc94f6801e6620255531ef6c9':
match the frame with the node
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:23:54 +0000 (11:23 -0800)]
am
69b89ebf: am
51c86253: Merge "Send appropriate events when plugin is dynamically resized." into honeycomb
* commit '
69b89ebf8e78b17802bf30e43dd9fed15057f160':
Send appropriate events when plugin is dynamically resized.
Derek Sollenberger [Thu, 20 Jan 2011 19:22:20 +0000 (11:22 -0800)]
am
51c86253: Merge "Send appropriate events when plugin is dynamically resized." into honeycomb
* commit '
51c86253a780f35f0978480390e6838169545172':
Send appropriate events when plugin is dynamically resized.
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 [Thu, 20 Jan 2011 16:57:07 +0000 (08:57 -0800)]
am
aa0c45ea: am
e777e766: Report SSL certificates to WebView.
* commit '
aa0c45eae757ea3f1ee949809d70d622aa4e5ef2':
Report SSL certificates to WebView.
Iain Merrick [Thu, 20 Jan 2011 16:55:07 +0000 (08:55 -0800)]
am
e777e766: Report SSL certificates to WebView.
* commit '
e777e7663bb6cecc72754dbf56e068f5b6ea30d5':
Report SSL certificates to WebView.
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:46:20 +0000 (06:46 -0800)]
am
f802dafb: am
f8833329: Merge "Merge WebKit at Chromium 9.0.597.76: Update WebKit revision number" into honeycomb
* commit '
f802dafb555e8c5a5ff1a77ca3c0fdc3f31aeca2':
Merge WebKit at Chromium 9.0.597.76: Update WebKit revision number
Ben Murdoch [Thu, 20 Jan 2011 14:46:17 +0000 (06:46 -0800)]
am
e624bc42: am
e84abe87: Merge "Don\'t allow fullscreen video to play from the onload handler." into honeycomb
* commit '
e624bc42969a3f11f20411d4cab79cae012cfb41':
Don't allow fullscreen video to play from the onload handler.
Ben Murdoch [Thu, 20 Jan 2011 14:44:33 +0000 (06:44 -0800)]
am
f8833329: Merge "Merge WebKit at Chromium 9.0.597.76: Update WebKit revision number" into honeycomb
* commit '
f8833329dde3a45999a9902459abed565896df14':
Merge WebKit at Chromium 9.0.597.76: Update WebKit revision number
Ben Murdoch [Thu, 20 Jan 2011 14:44:31 +0000 (06:44 -0800)]
am
e84abe87: Merge "Don\'t allow fullscreen video to play from the onload handler." into honeycomb
* commit '
e84abe877206b2456eda6c10b1f833e8643b3691':
Don't allow fullscreen video to play from the onload handler.
Kristian Monsen [Thu, 20 Jan 2011 14:44:24 +0000 (06:44 -0800)]
am
c0a093de: am
6e64c0b3: Merge "Prelinking libwebcore after making more space in the prelink map" into honeycomb
* commit '
c0a093de10d3bb153d3a0032fec2e4dd3aa8cc8f':
Prelinking libwebcore after making more space in the prelink map
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:42:37 +0000 (06:42 -0800)]
am
6e64c0b3: Merge "Prelinking libwebcore after making more space in the prelink map" into honeycomb
* commit '
6e64c0b309cbe9ff163ac1e4095128ba591a811b':
Prelinking libwebcore after making more space in the prelink map
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 14:00:16 +0000 (06:00 -0800)]
am
4e0dc37b: am
99b97464: Merge "Do not reveal selection unless the focus controller is active." into honeycomb
* commit '
4e0dc37ba746a42ec1191c94e232a88bb491871d':
Do not reveal selection unless the focus controller is active.
Leon Scroggins [Thu, 20 Jan 2011 13:57:37 +0000 (05:57 -0800)]
am
99b97464: Merge "Do not reveal selection unless the focus controller is active." into honeycomb
* commit '
99b97464aef3bb8aef2c0ae1fce59ec589782774':
Do not reveal selection unless the focus controller is active.
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 [Thu, 20 Jan 2011 00:26:02 +0000 (16:26 -0800)]
am
4bcbe7ac: am
b96d73a9: Scroll Dimension need re-computed when size changed.
* commit '
4bcbe7acc9f52f83e86bab252f3013bbd8d418ea':
Scroll Dimension need re-computed when size changed.
Teng-Hui Zhu [Thu, 20 Jan 2011 00:24:39 +0000 (16:24 -0800)]
am
b96d73a9: Scroll Dimension need re-computed when size changed.
* commit '
b96d73a95da0cb361595a6d46a1cddb605c0468c':
Scroll Dimension need re-computed when size changed.
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