GitLab

This commit was generated by merge_to_master.py.

Change-Id: I3e771e85618ac76a1ec8645e567ecadf28beaf09

> The previous fix in r291050 fixed source compatibility but broke ABI
> compatibility with older versions of bionic instead. Since older
> versions of bionic only provide the POSIX version of strerror_r we
> should instead make sure we always use that version.
>
> BUG=
>
> Review URL: https://codereview.chromium.org/552753002
>
> Cr-Commit-Position: refs/heads/master@{#293894}

Bug: 17384482
Change-Id: I91b55784ec64145882d12119a70acde163ea97e3
(cherry picked from commit d74b8cc5)

Bug: 17644570

> Android's bionic C library is intending to adopt the same semantics as
> glibc for strerror_r: define the version that returns char* if the
> source is compiled with _GNU_SOURCE instead of the POSIX version which
> returns int. Add __BIONIC__ to the condition for
> USE_HISTORICAL_STRERRO_R so that Chromium will still work.
>
> BUG=
>
> Review URL: https://codereview.chromium.org/491893002
>
> Cr-Commit-Position: refs/heads/master@{#291050}
> git-svn-id: svn://svn.chromium.org/chrome/trunk/src@291050 0039d316-1c4b-4281-b951-d872f2087c98

Bug: 17384482
Change-Id: Ie80073df1327c8e415d83c1c9321cc3ca1beaf01
(cherry picked from commit 522d1de6)

Bug: 17644570

This commit was generated by merge_to_master.py.

Change-Id: I8686e8c41a08b4758a9132b9755c76295651e235

This commit was generated by merge_to_master.py.

Change-Id: I7dcf3a11a3af0acd287d1c604dccead3b209951f

This commit was generated by merge_to_master.py.

Change-Id: Ibf50c16d1d9f5c04bc4de8725bff1e70482e80d7

This commit was generated by merge_to_master.py.

Change-Id: I476bcbbda14078a7320852cf33a854eb1cb53de5

This commit was generated by merge_to_master.py.

Change-Id: Id3c5bfacde628db0b309b6d4a061682c170a8ac4

This commit was generated by merge_to_master.py.

Change-Id: Iad473a4d8547040a584b9f2b76af2da691cb1204

> Move the include of the Mac TargetConditionals.h file to after we've
> checked if we're building for Android. Apparently this file doesn't
> exist on all macs used to build android and the rest of android builds
> fine without it, so including it there causes the build to fail. It
> appears to only be used to test TARGET_OS_IPHONE which will never be
> true on android.
>
> BUG=
>
> Review URL: https://codereview.chromium.org/538563002
>
> Cr-Commit-Position: refs/heads/master@{#293495}

Bug: 17401514
(cherry picked from commit 8001123e)

Change-Id: I159d749f96b9564c4173c04d6ee572d2d23d1c90

When adding an account to an Android device we get a WebView crash
due to some removed null checks. This patch adds those check back.

BUG=415666

Change-Id: I21674b02310878959149e7015d665a5c5b848954

Cherry-pick of https://codereview.chromium.org/575293003/ PS2

BindToLoop need to set |loop_| synchronously to prevent delete from
destroying the object on the wrong thread.

BUG: 17354106
Change-Id: I3168bb9c27fa135e0c98eb018610218e65455f0a

Clean cherry-pick of chromium
crrev.com/bfb71fc03179ac0d88c6b6d188915cf0dd363071

BUG: 17354106

Review URL: https://codereview.chromium.org/581703002

Change-Id: I62059284e4ab126dbb3bfde32b248e7fb12bd842
Cr-Commit-Position: refs/heads/master@{#295295}

Compile fixes for crrev.com/7a2b1cb83546418638417fc4d3c9aa6172fe02e9

BUG: 17354106
Change-Id: I49750d359f9ebdea493337d325bcae13ee82d64d

Cherry-pick with conflict of chromium
crrev.com/7a2b1cb83546418638417fc4d3c9aa6172fe02e9

Conflicts:
	content/browser/android/in_process/synchronous_compositor_factory_impl.h

BUG: 17354106

Original description:

Add plumbing for a ResetStreamTextureProxy which should be
called on the event of a context loss. Only hooked up the
call for the in-process implementation in this CL when the
contex is restored.

ResetStreamTextureProxy currently handles "onContextLoss" as
well as "onContextRestored" concepts. It deletes the old
stream texture id, and recreates and binds a new
StreamTextureProxy.

Review URL: https://codereview.chromium.org/532993002

Cr-Commit-Position: refs/heads/master@{#295219}

Change-Id: I495ddac21f9066ef8555bf44c2461801e4f6b3aa

This commit was generated by merge_to_master.py.

Change-Id: I607d23d763c85ecb3e6ff24647fa40a5068c2348

This commit was generated by merge_to_master.py.

Change-Id: Ic126b8244c70faf0de8c5d113d9b7f032d191b23

When using a prebuilt libwebviewchromium, instead of skipping the entire
directory just include the makefiles needed to build V8 for
external/chromium-libpac to use.

Bug: 17228462
Change-Id: I0f543120265707d47674a85e059787a2c77611bd
(cherry picked from commit ebf434c9)

This commit was generated by merge_to_master.py.

Change-Id: If13619b8806f75ca169322e3da627f4aae2150d7

This commit was generated by merge_to_master.py.

Change-Id: Ie1b6887c9fab8b861e837a7c2b4805b7d8b5109a

BUG: 17403571
Change-Id: Ia2fab595694aa62578f3f771a322c2938662ba94
(cherry picked from commit c1b5f474)

This commit was generated by merge_to_master.py.

Change-Id: I8fe94ffc26fab8bafb87077f2459b6e9aca82f83

This commit was generated by merge_to_master.py.

Change-Id: I7deb2c4175ea2b0cbcf69db8b091dead60740f1a

The history branch got amended to deal with the chromium git transition;
update the SHA merged here to reflect the new history.

Change-Id: I2380086cef8af3865a5bdfc5c9f8a79dafc18e44

This commit was generated by merge_to_master.py.

Change-Id: I1de34a97f16c6affee8050fe1a7496f1a0d2cf78

This commit was generated by merge_to_master.py.

Change-Id: I694ec52d1e0b553f163c2faf4373d63270ab1aac

This commit was generated by merge_to_master.py.

Change-Id: I69c1c98fd1de188e46d4a787df25cbb57e27bce7

This commit was generated by merge_to_master.py.

Change-Id: I583602ff16d735199f1810565c9296e970ce2854

This commit was generated by merge_to_master.py.

Change-Id: I0623b8c250d66d05d70d1cc78c33efad8966c450

This commit was generated by merge_to_master.py.

Change-Id: I9a279485b02fe7ceddcd32d992a714ff132e99ae

Fix the build in master.

Original description:
[Android WebView] Supress focus change when temporarily detached.

The AwContents container view may be "temporarily detached" by the
view system during certain layout operations e.g. if it is a child
of a ListView. In this case, we should ignore changes to focus to
avoid unnecessary churn and loss of state, e.g. when text is selction
the focus toggle results in an action bar toggle and loss of the
text selection.

BUG=391282
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=281310

Change-Id: I1ccd6600da05c991a68256bf08d10448afdbb015

Cherrypick Chromium r280319 to fix constant rebuilds of
android_webview_java:

> LOCAL_ADDITIONAL_DEPENDENCIES works on the file level, not phony
> target level, so the current rule results in rebuilding the
> android_webview_java target whenever we run make.
>
> BUG=389534
> TEST=compile on android_aosp bot
> NOTRY=true
>
> Review URL: https://codereview.chromium.org/332343007
>
> git-svn-id: svn://svn.chromium.org/chrome/trunk/src@280319 0039d316-1c4b-4281-b951-d872f2087c98

Bug: 15598761
Change-Id: I6a1da1a1ee829e962ada76107fb0109aac0c8da5

Handle ResourceBusyException generically, as is being done
upstream, so the addition doesn't break mirror-aosp-master.

bug: 13792521
Change-Id: I0ee09f7e1274503bff8a3b17cdea0baf700c9343

Cherry-pick of chromium r279497

BUG: 15771111
Change-Id: I64ab8eb88df737ab5b9f40a6113efd9a20984c5b

Change-Id: I4b23ef54138d4fbbbf3568632e4c758a90f21e17

Change-Id: I903284c842b92ff0c41ba257d654f6c15037bb15

This commit was generated by merge_to_master.py.

Change-Id: Ie1194b85b7623586fb60c833079804a980ac4fe9

This commit was generated by merge_to_master.py.

Change-Id: If3807744d3e5d3ee84b897bd2d099a2b7ed2e7a3