Reconcile with ics-mr1-release

Change-Id: I70311b0055b3de172eeff58bc9d303cf43f89151
am 2ee79460: Merge "Reset framework inval when done zooming" into ics-mr1

* commit '2ee794607b1a21f2f9a0d19a43821d2fa6965470':
  Reset framework inval when done zooming
am c52e5656: Merge "Fix ANR when hitting very large layers" into ics-mr1

* commit 'c52e5656adae84b9be8d0e10f0e68bfca988fe9a':
  Fix ANR when hitting very large layers
Reconcile with ics-mr1-release

Change-Id: If96ef973d0b327a27a04f5d1a26302a73d7ce8bd
am 599c05f3: Merge "Revert "Put canvas on a layer"" into ics-mr1

* commit '599c05f3080acd1c99f4d925c333d8a2711c9bdf':
  Revert "Put canvas on a layer"
Reconcile with ics-mr1-release

Change-Id: I65c9c0150c80e206a26e9fec55d5cfc3b596fda1
external/webkit: use Cpu Upload path

Use Cpu Upload mode since the Gpu mode is not working
and expected to be slower.

Change-Id: Iacb6de4a4e054e4f6ebb07d8a8209228e78e5ee0
Only check ARCH_ARM_HAVE_ARMV7A if TARGET_ARCH is arm

It only makes sense to check ARCH_ARM_HAVE_ARMV7A if the arch is arm.

This patch is required to enable chrome http stack on x86.

Change-Id: Ie59fc1a0a44f79a403501be96766ed825f6a7e72
Changes to allow for dynamically shared library

Change-Id: Ia4540d509194371132c0da6172430a8328e8877b
Cherry-pick WebKit r100677 to fix a rendering crash

This fixes a crash from positioned generated content under run-in.
See http://trac.webkit.org/changeset/100677.

Bug: 6079158
Change-Id: I3d2012c58f47e71ae500e33551dfab5587b84534
MIMETypeRegistry.cpp: add support for the DASH mimetype
Return the tile generation thread to default priority.

With this partial revert of ececd484e5832707be4a73b70da37f862eb14c35 , single core devices can't have tile generation starved by javascript/plugins.

bug:5746432
Change-Id: I42b5799f4ba136e1c6f9812219824d21390bace2
When loading new content, reset zoom state - DO NOT MERGE

cherry-pick of https://android-git.corp.google.com/g/#/c/155121/2 into MR1 branch
bug:5757950
Change-Id: I34042e8b1f1adf1fc1826d7fde5500708bef3b60
When in singlesurfacemode, resist switching out - DO NOT MERGE

cherry-pick of https://android-git.corp.google.com/g/#/c/155078/ into MR1 branch
bug:5660814

We want to avoid swapping in and out of singlesurface mode when we have enough
textures to hold the content, but not while the content is updating.

Change-Id: I3c45f2b9f3c8e06b397b701fb53ac6ac5ff8efdd
Fix crash with composited layers - DO NOT MERGE

Cherry-pick from master

When we have composited layers inside iframes/frames, the layers
hierarchy is not always up to date at the time of the layerSync()
call. If some of those layers are scheduled to be repainted, the
repaint operation will triggers the update of the composited layers
tree -- possibly resulting in the deallocation of the very same
GraphicsLayer we were painting from, and thus leading to a crash.

The fix consist in gathering all the root RenderLayer (for each
frame containing composited layers) and explicitely asking
RenderLayerCompositor to check if the composited tree needs to be
updated, before we traverse the tree to paint the elements.

bug:5695185
Change-Id: I33a00b847eb19c9aa4b68f0ac3adbe36709ed00b
Enable History API. Do not merge.

Cherry pick Ic6b6860ca4bfe891e84fb0445d67c7ea728c6fe3

The HTML5 History API is disabled at runtime by default in WebKit.
Configure it to be enabled.

Bug: 5767904
Change-Id: Ib7374e0145c581588990baec6e67025c1b7ef693
Fully invalidate the pictureset when content size changes

bug:5759299

Webkit invals aren't correct when the content size changes (even simply growing
vertically), for now just repaint from scratch in that case.

Change-Id: I408b289bfee1139d6c8f3c7babd963d217cb5bc0
Prevent infinite loop when turning on then off composited mode

bug:5820635
Change-Id: I24b6eae6c76c29e44106b4ec87e74d945aad7b1b
Fix TilesManager race condition

 Issue: 26518
 Fixes a race condition when initializing TilesManager by
 removing the unnecessary waitForGenerator call entirely
 and giving TexturesGenerator a reference to the TilesManager in
 its ctor, removing all calls to TilesManager::instance from a non-UI thread

Change-Id: Ib1b60825275ef24f4733562ed1f6ecace0594c88

Conflicts:

	Source/WebCore/platform/graphics/android/TilesManager.cpp
webkit: Show last frame of streaming video when buffering. - CAF

VideoPlayer is modified to look for state "BUFFERING" and
present last video frame with progress animation (circle)
instead of previous behaviour where it presented grey
background with progress animation.