OSDN Git Service

android-x86/external-webkit.git
12 years agoMerge "Add support for Bengali and Tamil gpos/gsub tables" into ics-mr1
Russell Brenner [Wed, 9 Nov 2011 18:11:22 +0000 (10:11 -0800)]
Merge "Add support for Bengali and Tamil gpos/gsub tables" into ics-mr1

12 years agoAdd support for Bengali and Tamil gpos/gsub tables
Russell Brenner [Tue, 8 Nov 2011 00:10:32 +0000 (16:10 -0800)]
Add support for Bengali and Tamil gpos/gsub tables

HB_Script_Bengali and HB_Script_Tamil are now recognized in
FontAndroid.cpp and map to Lohit-Bengali.ttf and Lohit-Tamil.ttf,
allowing Harfbuzz to properly load the gpos/gsub tables for those
languages.

Bug: 5578901
Change-Id: I20ed542dd5a616535222dcb5c808f3716a062e80

12 years agoMerge "Revert crash on bad scale - do not merge" into ics-mr1
Bart Sears [Wed, 9 Nov 2011 02:30:04 +0000 (18:30 -0800)]
Merge "Revert crash on bad scale - do not merge" into ics-mr1

12 years agoRevert crash on bad scale - do not merge
Bart Sears [Wed, 9 Nov 2011 01:11:44 +0000 (17:11 -0800)]
Revert crash on bad scale - do not merge

bug:5367327

Cherry pick of: dc193f393a845e88f55ecf0055386fc4e4204537

Change-Id: Iea6e4a564fc003d8e2ad8e1d6d9d9b64d016e43d

12 years agoMerge "Add necessary null pointer check to avoid crash on youtube video" into ics-mr1
Teng-Hui Zhu [Wed, 9 Nov 2011 00:20:56 +0000 (16:20 -0800)]
Merge "Add necessary null pointer check to avoid crash on youtube video" into ics-mr1

12 years agoAdd necessary null pointer check to avoid crash on youtube video
Teng-Hui Zhu [Tue, 8 Nov 2011 21:34:17 +0000 (13:34 -0800)]
Add necessary null pointer check to avoid crash on youtube video

bug:5562347
Change-Id: I9b53a58137d70955bde5334c7c8b581343a8c2ce

12 years agoFix font size handling for harfbuzz hack
Russell Brenner [Thu, 3 Nov 2011 23:22:00 +0000 (16:22 -0700)]
Fix font size handling for harfbuzz hack

Complex languages (Arabic, Thai, etc.) currently need to override the
base font (e.g. Roboto)  with an explicitly loaded copy of the right
fallback font (e.g. DroidNaskh). To keep from running out of file
descriptors, a caching mechanism was put in place, but the cached
data contained the font size, so the first size seen on the page was
applied to all subsequent renderings of that font, regardless of the
size requested. Size is now also considered in the cache.

Bug: 5509443
Change-Id: I616954980122e89da14ce86efe99d5e4343a40c2

12 years agoMerge "Fix extras clipping" into ics-mr1
John Reck [Tue, 8 Nov 2011 01:29:07 +0000 (17:29 -0800)]
Merge "Fix extras clipping" into ics-mr1

12 years agoFix extras clipping
John Reck [Mon, 7 Nov 2011 19:21:27 +0000 (11:21 -0800)]
Fix extras clipping

 Bug: 5556494

Change-Id: I82e8282271dfc623afa9b1ef0d0061ca9c3df5f4

12 years agoMerge "Change the default webView behavior to minimize the memory consumption" into...
Teng-Hui Zhu [Mon, 7 Nov 2011 23:53:51 +0000 (15:53 -0800)]
Merge "Change the default webView behavior to minimize the memory consumption" into ics-mr1

12 years agoRemove the global button lock
John Reck [Mon, 7 Nov 2011 21:53:18 +0000 (13:53 -0800)]
Remove the global button lock

 Bug: 5558699
 Bug: 5572238

Change-Id: Ic199ffda5bc4aa09d39ee54221c6fcce6a91ca05

12 years agoChange the default webView behavior to minimize the memory consumption
Teng-Hui Zhu [Mon, 7 Nov 2011 20:47:43 +0000 (12:47 -0800)]
Change the default webView behavior to minimize the memory consumption

For now, we just limit the expansion on x and y direction.
In the future, we need to dynamically allocate and deallocate the memory.

browser change is : c/148242

bug:5522175
Change-Id: I8562c39c55913ab89848afe8a36e8a2784c12727

12 years agoMerge "Doesn't lock the entire drawing..." into ics-mr1
Nicolas Roard [Mon, 7 Nov 2011 18:21:50 +0000 (10:21 -0800)]
Merge "Doesn't lock the entire drawing..." into ics-mr1

12 years agoReconcile with ics-mr0-release
The Android Open Source Project [Mon, 7 Nov 2011 16:22:50 +0000 (08:22 -0800)]
Reconcile with ics-mr0-release

Change-Id: If02ce708d74c5d627e4e6f83cfc5ee003fb42b58

12 years agoDoesn't lock the entire drawing...
Chris Craik [Tue, 25 Oct 2011 01:39:29 +0000 (18:39 -0700)]
Doesn't lock the entire drawing...

This caused us to potentially waiting on the completion of a tile
painting. On sites where skia struggle with, this had a large impact on
scrolling performances.

This is only part one of the solution -- we need to also get rid of the
global button lock.

We also lower the priority of the texture gneeration thread.

bug:5558699

Change-Id: I251354d6cabb2fd7ebfd665c30eff7fe90c3d316

12 years agomerge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Fri, 4 Nov 2011 22:39:42 +0000 (15:39 -0700)]
merge in ics-mr0-release history after reset to ics-mr0

12 years agoam 55b5da34: (-s ours) Merge "Don\'t force composited layers to be stacking contexts...
Bart Sears [Fri, 4 Nov 2011 11:59:22 +0000 (11:59 +0000)]
am 55b5da34: (-s ours) Merge "Don\'t force composited layers to be stacking contexts - DO NOT MERGE" into ics-mr0

* commit '55b5da341a376006b2e0ab9cc6dfba5a76c65c7c':
  Don't force composited layers to be stacking contexts - DO NOT MERGE

12 years agoam 209db4d4: (-s ours) Fix plugin rendering bug when video surface is not ready....
Derek Sollenberger [Fri, 4 Nov 2011 11:59:21 +0000 (11:59 +0000)]
am 209db4d4: (-s ours) Fix plugin rendering bug when video surface is not ready. do not merge

* commit '209db4d462bfff0c9f13896f72611a82c2c6639c':
  Fix plugin rendering bug when video surface is not ready. do not merge

12 years agoMerge "Don't force composited layers to be stacking contexts - DO NOT MERGE" into...
Bart Sears [Fri, 4 Nov 2011 03:57:38 +0000 (20:57 -0700)]
Merge "Don't force composited layers to be stacking contexts - DO NOT MERGE" into ics-mr0

12 years agoDon't force composited layers to be stacking contexts - DO NOT MERGE
Chris Craik [Fri, 21 Oct 2011 22:28:20 +0000 (15:28 -0700)]
Don't force composited layers to be stacking contexts - DO NOT MERGE

Cherry-pick of c0fb399b4644c319c15e0a6a7e0f6c29917d9099

bug:5264240

Was causing crashes, and layer ordering problems.

Change-Id: Ieecff6d64405f13b459ea013da2a309b00077d47

12 years agoFix plugin rendering bug when video surface is not ready. do not merge
Derek Sollenberger [Fri, 28 Oct 2011 17:11:02 +0000 (13:11 -0400)]
Fix plugin rendering bug when video surface is not ready. do not merge

cherry-pick of bf6900fe796a697400203ab777001716f3d83a0a

The browser incorrectly jumps out of the compositing step for a
plugin early if it detects a video surface is not ready. The
correct behavior is to skip rendering the video and proceed to
rendering the other plugin contents.

bug: 5525272
Change-Id: I12acb477890303d03c99ffa13729fd7e7eefc800

12 years agoFix crash in Autofill.
Ben Murdoch [Thu, 3 Nov 2011 12:30:30 +0000 (12:30 +0000)]
Fix crash in Autofill.

Fix a crash in autofill that can be caused by toggling the
setting on and off.

Bug: 5452927
Change-Id: I80ba0b823fd16cb4e2df3359be95f3d063a9b091

12 years agoReport a load error when network loads blocked. Do not merge
Ben Murdoch [Mon, 24 Oct 2011 11:42:19 +0000 (12:42 +0100)]
Report a load error when network loads blocked. Do not merge

Cherry pick from master.

When network loads are blocked, we should fail those
loads rather than leaving them dangling. In particular,
this fixes an issue where WebCore will wait to do the
first layout while CSS loads are pending. If network
loads are blocked, we need to tell WebCore they are never
going to complete.

To implement this, we make use of the Chromium stack's
load flags and move the code to a more suitable location.

Bug: 5416543
Change-Id: I4bd9987611364b29d3ccaa50437d418a5eb9a5cd

12 years agoReconcile with ics-mr0-release
The Android Open Source Project [Fri, 28 Oct 2011 20:05:22 +0000 (13:05 -0700)]
Reconcile with ics-mr0-release

Change-Id: I50da917e834f4ba4e0ba3e43e5af0ce523a706a4

12 years agoMerge "Fix plugin rendering bug when video surface is not ready." into ics-mr1
Derek Sollenberger [Fri, 28 Oct 2011 19:39:49 +0000 (12:39 -0700)]
Merge "Fix plugin rendering bug when video surface is not ready." into ics-mr1

12 years agoMerge "Don't discardQueue if the upload type didn't change" into ics-mr1
John Reck [Fri, 28 Oct 2011 19:16:34 +0000 (12:16 -0700)]
Merge "Don't discardQueue if the upload type didn't change" into ics-mr1

12 years agoFix plugin rendering bug when video surface is not ready.
Derek Sollenberger [Fri, 28 Oct 2011 17:11:02 +0000 (13:11 -0400)]
Fix plugin rendering bug when video surface is not ready.

The browser incorrectly jumps out of the compositing step for a
plugin early if it detects a video surface is not ready. The
correct behavior is to skip rendering the video and proceed to
rendering the other plugin contents.

bug: 5525272
Change-Id: Id838f6cef4913e817f58bf2b7e17d871f9f0250e

12 years agoDon't discardQueue if the upload type didn't change
John Reck [Fri, 28 Oct 2011 00:17:20 +0000 (17:17 -0700)]
Don't discardQueue if the upload type didn't change

 Bug: 5529012

Change-Id: I0b57c4cf9d295524f675f2cb7504d5a9c0363871

12 years agoMerge "Keep text handles in sync with native touch targets" into ics-mr1
John Reck [Thu, 27 Oct 2011 20:40:23 +0000 (13:40 -0700)]
Merge "Keep text handles in sync with native touch targets" into ics-mr1

12 years agoKeep text handles in sync with native touch targets
John Reck [Thu, 27 Oct 2011 16:07:40 +0000 (09:07 -0700)]
Keep text handles in sync with native touch targets

 Bug: 5522153
 Also add some slop to the handle targets, cleaned
 up the JNI and improved debugging.

Change-Id: I3b2c3c8b1543d4a1aa599ae2938fa78fe95e01bf

12 years agoAdd missing save/restore calls to GraphicsContext::fillRect
Ben Murdoch [Wed, 26 Oct 2011 14:14:51 +0000 (15:14 +0100)]
Add missing save/restore calls to GraphicsContext::fillRect

Android is missing some calls to GraphicsContext::save/restore
inside our GraphicsContext::fillRect implementations. The calls
were added to the Skia GraphicsContext in http://trac.webkit.org/changeset/63102

Bug: 5361502
Change-Id: Ifcbc116d997473e3a184561102dc5cb74f5aa5ec

12 years agoMerge remote branch 'goog/ics-mr0' into ics-mr1
Ed Heyl [Wed, 26 Oct 2011 12:47:43 +0000 (12:47 +0000)]
Merge remote branch 'goog/ics-mr0' into ics-mr1

12 years agoMerge "DO NOT MERGE Adjust text selection position" into ics-mr1
John Reck [Wed, 26 Oct 2011 02:14:04 +0000 (19:14 -0700)]
Merge "DO NOT MERGE Adjust text selection position" into ics-mr1

12 years agoMerge "DO NOT MERGE Fix SW extras for layers" into ics-mr1
John Reck [Wed, 26 Oct 2011 02:13:24 +0000 (19:13 -0700)]
Merge "DO NOT MERGE Fix SW extras for layers" into ics-mr1

12 years agoDO NOT MERGE Adjust text selection position
John Reck [Mon, 24 Oct 2011 23:49:45 +0000 (16:49 -0700)]
DO NOT MERGE Adjust text selection position

 Bug: 5507800

Change-Id: Icfcfdb9ff019fac7e3e40df679723594fab15dc6

12 years agoDO NOT MERGE Fix SW extras for layers
John Reck [Mon, 24 Oct 2011 22:10:04 +0000 (15:10 -0700)]
DO NOT MERGE Fix SW extras for layers

 Bug: 5507239
 Also remove all the old, unused layer setExtras stuff

Change-Id: Id1670010536712b7a9f50e74821c9fb7f708e851

12 years agoMerge "Don't draw prefetch page if not necessary" into ics-mr1
Chris Craik [Tue, 25 Oct 2011 22:27:26 +0000 (15:27 -0700)]
Merge "Don't draw prefetch page if not necessary" into ics-mr1

12 years agoDon't draw prefetch page if not necessary
Chris Craik [Fri, 21 Oct 2011 02:10:41 +0000 (19:10 -0700)]
Don't draw prefetch page if not necessary

bug:5494086

Also only try to draw visible tiles.

Change-Id: Ic850afab94309d9d4d031600a40dc889298fef24

12 years agoTake scale into account when greedily prefetching an entire layer
Chris Craik [Tue, 25 Oct 2011 01:39:29 +0000 (18:39 -0700)]
Take scale into account when greedily prefetching an entire layer

bug:5509149

Scale wasn't being taken into account when estimating layer tile consumption, so
zooming in on layer content could attempt to fetch and draw hundreds of layers
per tile, causing lots of missing content.

Change-Id: Ib26e203827ad93be12d29561b9d8094cb712f014

12 years agoSwapLayersTextures on all layer changes
Chris Craik [Tue, 25 Oct 2011 00:55:31 +0000 (17:55 -0700)]
SwapLayersTextures on all layer changes

bug:5507262

This restores behavior, and allows a single setBaseLayer to set content (such as
is used in browser saved pages).

Change-Id: Ifeda068ce5c22275553d0e1ec99ee74647806a6c

12 years agoMark layers as ready to swap if invisible
Chris Craik [Mon, 24 Oct 2011 22:40:09 +0000 (15:40 -0700)]
Mark layers as ready to swap if invisible

bug:5505364

This avoids the problem of waiting infinitely during initialization (when a
layer doesn't have content) for the layer to be ready.

Change-Id: I364eff66616ea304a68976d5ad06ce5fdb1a6d4b

12 years agoRemove unnecessary log
Nicolas Roard [Sun, 23 Oct 2011 23:26:12 +0000 (16:26 -0700)]
Remove unnecessary log

CL https://android-git.corp.google.com/g/#/c/144158/ introduced a debug
log that we don't need, spamming logcat

Change-Id: Iea8a1784153dd9f6f53e67f7cb62504440344c7c

12 years agoDon't force composited layers to be stacking contexts - DO NOT MERGE
Chris Craik [Fri, 21 Oct 2011 22:28:20 +0000 (15:28 -0700)]
Don't force composited layers to be stacking contexts - DO NOT MERGE

bug:5264240

Was causing crashes, and layer ordering problems.

Cherry-pick of b8c237486bcf299d8a04bdae8d8e35fd37866172

Change-Id: I1f76516d4e313101ea9c90759ee63d4cef2d6ced

12 years agomerge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Tue, 25 Oct 2011 03:28:04 +0000 (20:28 -0700)]
merge in ics-mr0-release history after reset to ics-mr0

12 years agoMerge "Take scale into account when greedily prefetching an entire layer" into ics-mr0
Chris Craik [Tue, 25 Oct 2011 01:50:07 +0000 (18:50 -0700)]
Merge "Take scale into account when greedily prefetching an entire layer" into ics-mr0

12 years agoTake scale into account when greedily prefetching an entire layer
Chris Craik [Tue, 25 Oct 2011 01:39:29 +0000 (18:39 -0700)]
Take scale into account when greedily prefetching an entire layer

bug:5509149

Scale wasn't being taken into account when estimating layer tile consumption, so
zooming in on layer content could attempt to fetch and draw hundreds of layers
per tile, causing lots of missing content.

Change-Id: Ib26e203827ad93be12d29561b9d8094cb712f014

12 years agoSwapLayersTextures on all layer changes
Chris Craik [Tue, 25 Oct 2011 00:55:31 +0000 (17:55 -0700)]
SwapLayersTextures on all layer changes

bug:5507262

This restores behavior, and allows a single setBaseLayer to set content (such as
is used in browser saved pages).

Change-Id: Ifeda068ce5c22275553d0e1ec99ee74647806a6c

12 years agoMerge "Mark layers as ready to swap if invisible" into ics-mr0
Chris Craik [Mon, 24 Oct 2011 22:49:43 +0000 (15:49 -0700)]
Merge "Mark layers as ready to swap if invisible" into ics-mr0

12 years agoMark layers as ready to swap if invisible
Chris Craik [Mon, 24 Oct 2011 22:40:09 +0000 (15:40 -0700)]
Mark layers as ready to swap if invisible

bug:5505364

This avoids the problem of waiting infinitely during initialization (when a
layer doesn't have content) for the layer to be ready.

Change-Id: I364eff66616ea304a68976d5ad06ce5fdb1a6d4b

12 years agomerge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Mon, 24 Oct 2011 19:55:54 +0000 (12:55 -0700)]
merge in ics-mr0-release history after reset to ics-mr0

12 years agoMerge "Remove unnecessary log" into ics-mr0
Bart Sears [Mon, 24 Oct 2011 18:11:45 +0000 (11:11 -0700)]
Merge "Remove unnecessary log" into ics-mr0

12 years agoReconcile with ics-mr0-release
The Android Open Source Project [Mon, 24 Oct 2011 13:32:14 +0000 (06:32 -0700)]
Reconcile with ics-mr0-release

Change-Id: If0751cf1dcf857e8e01b65bf347690292b4d0645

12 years agoRemove unnecessary log
Nicolas Roard [Sun, 23 Oct 2011 23:26:12 +0000 (16:26 -0700)]
Remove unnecessary log

CL https://android-git.corp.google.com/g/#/c/144158/ introduced a debug
log that we don't need, spamming logcat

Change-Id: Iea8a1784153dd9f6f53e67f7cb62504440344c7c

12 years agomerge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Fri, 21 Oct 2011 22:55:04 +0000 (15:55 -0700)]
merge in ics-mr0-release history after reset to ics-mr0

12 years agoam 5dee9ed2: Merge "Cherry pick 97075" into ics-mr0
John Reck [Fri, 21 Oct 2011 20:59:22 +0000 (13:59 -0700)]
am 5dee9ed2: Merge "Cherry pick 97075" into ics-mr0

* commit '5dee9ed228c914254062b62ae459884e3060a2ae':
  Cherry pick 97075

12 years agoam 5236e6a2: Merge "Cherry pick 94857" into ics-mr0
John Reck [Fri, 21 Oct 2011 20:59:21 +0000 (13:59 -0700)]
am 5236e6a2: Merge "Cherry pick 94857" into ics-mr0

* commit '5236e6a2f70997cf9dec9e93261867dd79b21738':
  Cherry pick 94857

12 years agoMerge "Cherry pick 97075" into ics-mr0
John Reck [Fri, 21 Oct 2011 17:06:58 +0000 (10:06 -0700)]
Merge "Cherry pick 97075" into ics-mr0

12 years agoMerge "Cherry pick 94857" into ics-mr0
John Reck [Fri, 21 Oct 2011 17:06:23 +0000 (10:06 -0700)]
Merge "Cherry pick 94857" into ics-mr0

12 years agoMerge "WebKit part of fix for bug 5307956"
Kristian Monsen [Fri, 21 Oct 2011 11:48:32 +0000 (04:48 -0700)]
Merge "WebKit part of fix for bug 5307956"

12 years agoam 6032fa42: Merge "Implement dual textures for layers to handle zooming correctly...
Nicolas Roard [Fri, 21 Oct 2011 00:53:57 +0000 (17:53 -0700)]
am 6032fa42: Merge "Implement dual textures for layers to handle zooming correctly." into ics-mr0

* commit '6032fa428d725097ea29fc85fc1b2c965094772b':
  Implement dual textures for layers to handle zooming correctly.

12 years agoMerge "Implement dual textures for layers to handle zooming correctly." into ics-mr0
Nicolas Roard [Fri, 21 Oct 2011 00:51:07 +0000 (17:51 -0700)]
Merge "Implement dual textures for layers to handle zooming correctly." into ics-mr0

12 years agoImplement dual textures for layers to handle zooming correctly.
Nicolas Roard [Thu, 20 Oct 2011 22:55:34 +0000 (15:55 -0700)]
Implement dual textures for layers to handle zooming correctly.

We add a new class, DualTiledTexture, that encapsulate two TiledTextures
and manage them according to the current scale factor.

bug:5492874

Change-Id: I4ba3ff539f9242ae5102189e9623e1535e9cc28f

12 years agomerge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Thu, 20 Oct 2011 22:49:05 +0000 (15:49 -0700)]
merge in ics-mr0-release history after reset to ics-mr0

12 years agoCherry pick 97075
John Reck [Thu, 20 Oct 2011 22:26:23 +0000 (15:26 -0700)]
Cherry pick 97075

 Bug: 5491444

Change-Id: If97d58a3d590e8e972bceec61e3ae16860a30088

12 years agoCherry pick 94857
John Reck [Thu, 20 Oct 2011 22:23:20 +0000 (15:23 -0700)]
Cherry pick 94857

 Bug: 5491573

Change-Id: I32666ca6abdc2e224e6b9727f65e62fd3bd10859

12 years agoam 458b4b11: Mark tiles dirty, even if repainting
Chris Craik [Thu, 20 Oct 2011 18:34:28 +0000 (11:34 -0700)]
am 458b4b11: Mark tiles dirty, even if repainting

* commit '458b4b11924c3bcc70dcdd3d69f64a855870e72d':
  Mark tiles dirty, even if repainting

12 years agoMark tiles dirty, even if repainting
Chris Craik [Thu, 20 Oct 2011 15:50:56 +0000 (08:50 -0700)]
Mark tiles dirty, even if repainting

bug:5484131

The current repainting tile could avoid being painted with the newest picture if
it was repainting, since markAsDirty wouldn't change its state

Change-Id: I4f3de909984d1ceb872bf294a1da211ad87c9bcc

12 years agoMerge "Cherry-pick WebKit change 89982 to allow secure pages to be loaded from the...
Steve Block [Thu, 20 Oct 2011 17:31:48 +0000 (10:31 -0700)]
Merge "Cherry-pick WebKit change 89982 to allow secure pages to be loaded from the cache on back navigation"

12 years agoReconcile with ics-mr0-release
The Android Open Source Project [Thu, 20 Oct 2011 16:17:07 +0000 (09:17 -0700)]
Reconcile with ics-mr0-release

Change-Id: I631833f425688ec28b521cf0c7ac05f5575b0997

12 years agomerge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Thu, 20 Oct 2011 13:27:48 +0000 (06:27 -0700)]
merge in ics-mr0-release history after reset to ics-mr0

12 years agoam 94cabcbd: Merge "Force a navcache update before requesting keyboard" into ics-mr0
John Reck [Thu, 20 Oct 2011 02:08:10 +0000 (19:08 -0700)]
am 94cabcbd: Merge "Force a navcache update before requesting keyboard" into ics-mr0

* commit '94cabcbdc194d4a28d31cfb82be98a287b8cf1c9':
  Force a navcache update before requesting keyboard

12 years agoMerge "Force a navcache update before requesting keyboard" into ics-mr0
John Reck [Thu, 20 Oct 2011 02:05:44 +0000 (19:05 -0700)]
Merge "Force a navcache update before requesting keyboard" into ics-mr0

12 years agomerge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Thu, 20 Oct 2011 02:00:23 +0000 (19:00 -0700)]
merge in ics-mr0-release history after reset to ics-mr0

12 years agoForce a navcache update before requesting keyboard
John Reck [Thu, 20 Oct 2011 01:10:34 +0000 (18:10 -0700)]
Force a navcache update before requesting keyboard

 Bug: 5453541

Change-Id: I209d96d6cd567f7d548549e3e9e5004df045226b

12 years agoam 81fab713: Merge "Mark tiles dirty when discarded from transfer queue" into ics-mr0
Chris Craik [Wed, 19 Oct 2011 22:34:48 +0000 (15:34 -0700)]
am 81fab713: Merge "Mark tiles dirty when discarded from transfer queue" into ics-mr0

* commit '81fab713750af480b451fbd9926b7d76b7017551':
  Mark tiles dirty when discarded from transfer queue

12 years agoam 1fa411c7: fix layer updates dropping invals
Chris Craik [Wed, 19 Oct 2011 22:34:46 +0000 (15:34 -0700)]
am 1fa411c7: fix layer updates dropping invals

* commit '1fa411c75dc305a99ec524101550a7f297402362':
  fix layer updates dropping invals

12 years agoMerge "Mark tiles dirty when discarded from transfer queue" into ics-mr0
Chris Craik [Wed, 19 Oct 2011 22:32:56 +0000 (15:32 -0700)]
Merge "Mark tiles dirty when discarded from transfer queue" into ics-mr0

12 years agoMark tiles dirty when discarded from transfer queue
Chris Craik [Wed, 19 Oct 2011 21:51:45 +0000 (14:51 -0700)]
Mark tiles dirty when discarded from transfer queue

bug:5409902

Tiles weren't always marked dirty, and could get out of the transfer queue
without being marked dirty.

Change-Id: Ia0fe71f00f61d7aede8ca7bc4a389ac417906d36

12 years agofix layer updates dropping invals
Chris Craik [Wed, 19 Oct 2011 00:49:58 +0000 (17:49 -0700)]
fix layer updates dropping invals

bug:5473272

Layer inval regions were being dropped, since calling setBaseLayer multiple
times in between drawGL() calls wouldn't call swapLayersTextures() on a layer
tree, and the invals in it were lost.

Change-Id: I36ebd419151613161a9a4fee858b9e97e83e61fd

12 years agoCherry-pick WebKit change 89982 to allow secure pages to be loaded from the cache...
Steve Block [Wed, 19 Oct 2011 15:56:27 +0000 (16:56 +0100)]
Cherry-pick WebKit change 89982 to allow secure pages to be loaded from the cache on back navigation

See http://trac.webkit.org/changeset/89982

Bug: 5480361
Change-Id: Ibaee251115eaa5c65e378d7ee9fe595fbf891c37

12 years agoReconcile with ics-mr0-release
The Android Open Source Project [Wed, 19 Oct 2011 14:22:59 +0000 (07:22 -0700)]
Reconcile with ics-mr0-release

Change-Id: Iaea853a76233c1f1b4c4df8dec02838f73e176fa

12 years agoWebKit part of fix for bug 5307956
Kristian Monsen [Wed, 19 Oct 2011 10:44:34 +0000 (11:44 +0100)]
WebKit part of fix for bug 5307956

If the cache directory is an empty string, create an in-memory
cache instead.

Also cleared up the storage directory logic. It should only
be called once for each app now, so removed the caching and
merged the two functions.

Change-Id: Id9f179b5722425d1808f7d784d1071dee7aec6bc

12 years agomerge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Tue, 18 Oct 2011 23:54:49 +0000 (16:54 -0700)]
merge in ics-mr0-release history after reset to ics-mr0

12 years agoam 8cc0fa17: Re-enable animations on the UI thread
Nicolas Roard [Tue, 18 Oct 2011 22:01:37 +0000 (15:01 -0700)]
am 8cc0fa17: Re-enable animations on the UI thread

* commit '8cc0fa17a42ae1dec75fe8ab00d5baa75e46499e':
  Re-enable animations on the UI thread

12 years agoMerge "Changed VerticalTextMap class to meet webkit coding style."
claireho [Tue, 18 Oct 2011 20:28:09 +0000 (13:28 -0700)]
Merge "Changed VerticalTextMap class to meet webkit coding style."

12 years agoRe-enable animations on the UI thread
Nicolas Roard [Tue, 18 Oct 2011 20:07:37 +0000 (13:07 -0700)]
Re-enable animations on the UI thread

Using webkit to compute animations is still slow in some cases.

When animating large elements, we seems to sometimes bogs the GPU,
which then makes the UI takes longer to render a frame. This in turn
slow the rate at which we can call into webkit (to update the position
of the animated layers), which results in perceived stuttering.

We previously had an implementation of CSS animations that could run
fully on the UI thread, without having to call back into webkit.
We turned it off because there was still some glitches, and calling
into webkit seemed to work well enough -- but as we can see, even
if that's the case in general, edge cases still benefit from running
the animations outside of webkit.

The CL fixes the remaining glitches we had (mostly, it was the
non support of fillMode) and re-enable our CSS animations implementation.

bug:5297559

Change-Id: I1f00bc060a76c9dfd55bd6d8ae85d5d6da68ddb5

12 years agoam a6d06cef: Be less aggressive with clippings layers tiles
Nicolas Roard [Tue, 18 Oct 2011 20:07:13 +0000 (13:07 -0700)]
am a6d06cef: Be less aggressive with clippings layers tiles

* commit 'a6d06cef38891b6e39dcbc455f7692f000309ba5':
  Be less aggressive with clippings layers tiles

12 years agoBe less aggressive with clippings layers tiles
Nicolas Roard [Tue, 18 Oct 2011 18:51:51 +0000 (11:51 -0700)]
Be less aggressive with clippings layers tiles

This also improves performances a bit when animating small layers.

bug:5472082 bug:5297559

Change-Id: I0b9fa0a9abf98ab53928f97f53c3134056b15889

12 years agoChanged VerticalTextMap class to meet webkit coding style.
claireho [Tue, 18 Oct 2011 00:41:52 +0000 (17:41 -0700)]
Changed VerticalTextMap class to meet webkit coding style.

Bug 5094208 : VerticalWring mode support for Books Japan.
Changed VerticalTextMap class to meet webkit coding style for
https://android-git.corp.google.com/g/#/c/141357/.

Change-Id: Ifce9968702b7ebe6d7a7da563645ec7d5e639438

12 years agoReconcile with ics-mr0-release
The Android Open Source Project [Tue, 18 Oct 2011 14:31:54 +0000 (07:31 -0700)]
Reconcile with ics-mr0-release

Change-Id: I21e5472086056b5ae9162cb9a6060a0cf08e96fa

12 years agoMerge "Part of fix for bug 5152544 Reduce the number of warnings"
Kristian Monsen [Tue, 18 Oct 2011 13:24:37 +0000 (06:24 -0700)]
Merge "Part of fix for bug 5152544 Reduce the number of warnings"

12 years agomerge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Tue, 18 Oct 2011 03:08:24 +0000 (20:08 -0700)]
merge in ics-mr0-release history after reset to ics-mr0

12 years agoam d76089f2: Merge "Prevent race condition in tile texture discard" into ics-mr0
Chris Craik [Tue, 18 Oct 2011 00:21:21 +0000 (17:21 -0700)]
am d76089f2: Merge "Prevent race condition in tile texture discard" into ics-mr0

* commit 'd76089f28a901fd7694a3574f0c8036febdb1103':
  Prevent race condition in tile texture discard

12 years agoMerge "Prevent race condition in tile texture discard" into ics-mr0
Chris Craik [Tue, 18 Oct 2011 00:18:54 +0000 (17:18 -0700)]
Merge "Prevent race condition in tile texture discard" into ics-mr0

12 years agoam e8798411: Don\'t paint/allocate off screen tiles
Chris Craik [Mon, 17 Oct 2011 23:21:52 +0000 (16:21 -0700)]
am e8798411: Don\'t paint/allocate off screen tiles

* commit 'e87984118d573b7e6eea5547eaa43ea98bbf5447':
  Don't paint/allocate off screen tiles

12 years agoPrevent race condition in tile texture discard
Chris Craik [Mon, 17 Oct 2011 19:18:09 +0000 (12:18 -0700)]
Prevent race condition in tile texture discard

bug:5461107

Tiles were being destroyed, and subsequently dereferenced in TransferQueue

Change-Id: I4fea289e5fda03a69f07554f57120c4c5bf7b016

12 years agoDon't paint/allocate off screen tiles
Chris Craik [Mon, 17 Oct 2011 21:29:04 +0000 (14:29 -0700)]
Don't paint/allocate off screen tiles

bug:5320471

Also, reduce prefetch distance

Change-Id: I9e677c16b5d0cdc16b87bd820591088ab10ab44b

12 years agoMerge "Reapply CL for "Vertical Writing Mode" support."
claireho [Mon, 17 Oct 2011 20:09:19 +0000 (13:09 -0700)]
Merge "Reapply CL for "Vertical Writing Mode" support."

12 years agoReconcile with ics-mr0-release
The Android Open Source Project [Mon, 17 Oct 2011 19:20:04 +0000 (12:20 -0700)]
Reconcile with ics-mr0-release

Change-Id: I1f0f2ab5c719f9c041cb621cd5e8f102a4a25250

12 years agoMerge "Fix crash in ImageBufferAndroid."
Ben Murdoch [Mon, 17 Oct 2011 18:37:06 +0000 (11:37 -0700)]
Merge "Fix crash in ImageBufferAndroid."