| 0aabc40ab6c782bed30450758afd0c2c71d9969f |
|
12-Oct-2013 |
boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> |
Cherry-pick: [Android] Retry create StreamTextureProxy on play
Cherry-pick of Chromium crrev.com/r228287
Note the conflict is in Google TV code and does not apply to webview.
Conflicts:
content/renderer/media/android/webmediaplayer_android.cc
BUG: 11158022
Original Description:
In android webview, StreamTextureProxy cannot be created until the page
has entered hardware accelerated mode. This can usually be racy between
when the WebMediaPlayerAndroid is first create. In this patch, retry to
create the StreamTextureProxy in play, to help reduce the possiblility
of this race.
Change-Id: I6e9b166f21979885056bd467838cb0406ae3a1a9
/external/chromium_org/content/browser/android/in_process/synchronous_compositor_impl.cc
|
| c8b71cd626fc487c13224048f64f27a2622e97eb |
|
08-Oct-2013 |
Martin Kosiba <mkosiba@google.com> |
Use total page scale in the LayerScrollOffsetDelegate.
Cherry-pick of http://crrev.com/26274003.
> Use total page scale in the LayerScrollOffsetDelegate.
>
> In order for the LayerScrollOffsetDelegate to see the most up to
> date pageScale we need to use the total page scale rather than
> just the value that was last synced with the main thread.
>
> BUG=None
> TEST=cc_unittests
BUG: 10806014
Change-Id: I6d0c7dad789bf799e3122e19dc70d522974cfb42
/external/chromium_org/content/browser/android/in_process/synchronous_compositor_impl.cc
|
| 74e8edfcf043ca9542cfaea3aa69e6bb2e1054ba |
|
20-Sep-2013 |
Alexandre Elias <aelias@chromium.org> |
Cherry-pick http://crrev.com/25233002 "Make Android WebView filtering depend on scrolling status."
This fixes an image quality regression which affects to some degree
almost every software WebView using an image, by introducing the same
workaround as classic WebView.
BUG: 10706494
Change-Id: I758257c5046b167780e5fcd07918f1855f08760c
/external/chromium_org/content/browser/android/in_process/synchronous_compositor_impl.cc
|
| 236b1775e10217fd9600a777418c23a521b55beb |
|
26-Sep-2013 |
boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> |
Cherry-pick: [Android WebView] Fix NPE in video when context creation fails
Cherry-pick of Chromium crrev.com/r225573
BUG: 10919326
Original description:
In Android WebView, software mode does not require a Context3D so we still
create the video player. However we were assuming that when we try to
create the Context3D, we always succeed, and when that fails, we get an
NPE.
Fix by falling back to software path if we fail to create context for
some reason.
Change-Id: I66dc2e0c8e0602c5e97f352aa1ff299597a4cee0
/external/chromium_org/content/browser/android/in_process/synchronous_compositor_impl.cc
|
| cd84519d1edac18225f4c58013254ee11d1a8eac |
|
25-Sep-2013 |
Martin Kosiba <mkosiba@google.com> |
[android_webview] Use a fraction to calculate scroll offset.
Cherry pick http://crrev.com/23533051
> android_webview/ has to expose scroll offset operations in physical
> pixels while cc/ stores scroll offsets in dip pixels.
> Unfortunately the physical pixel values android_webview/ exposes are
> rounded so there is no such combination of rounding operations that
> allows for scrolls to 'bottom' in one corrdinate space to always be
> 'flush' against the bottom edge in the other. The most natural
> solution is to convert the scroll offset to the fraction of the
> scroll range.
> By using the max_scroll_offset value obtained directly from the compositor
> we're also removing the need to delay scrolls since the content size
> is always as recent as the scroll offset update.
>
> BUG=261239
BUG: 10741603
Change-Id: Ic70ebb913de4513925aa4ab6f077ee5d0625458d
/external/chromium_org/content/browser/android/in_process/synchronous_compositor_impl.cc
|
| 747618dabf84fd26fcb0ca49c81219c7de49566e |
|
11-Sep-2013 |
boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> |
Cherry-pick: [Android WebView] First cut memory management
Upstream info:
https://chromiumcodereview.appspot.com/23572023
crbug.com/286026
Conflicts:
content/public/common/content_switches.h
BUG=10606165
Original CL description:
Based on simple algorithm of visible rect x constant.
Completely disregards the preferred allocation from based on
content of the page.
Constants extermined experimentally using current android
nexus devices.
Change-Id: I298f656be7fbab2bf4086f5b97bc4df9b92ab577
/external/chromium_org/content/browser/android/in_process/synchronous_compositor_impl.cc
|
| 4d476689bb589148ddf278a6fe754e4a1c44a04f |
|
09-Sep-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 30.0.1599.35
This commit was generated by merge_to_master.py.
Change-Id: Ie17d084a5c1c34971e8bf0e5a929b0a3428cd668
/external/chromium_org/content/browser/android/in_process/synchronous_compositor_impl.cc
|
| cf9d10eda488ea680e951eefbb409e07320ae391 |
|
04-Sep-2013 |
Bo Liu <boliu@chromium.org> |
Cherry-pick: Fix video in software mode
Cherry-pick of chromium r221843
BUG: 10584901
Original description:
First ensure that main thread offscreen context is created after
on-screen context by keeping count of the number of compositors
that are initialized for hardware draw. Also release the compositor
thread offscreen context when the last compositor releases hardware
draw. Freeing the main thread context is still a TODO.
In software mode, still create StreamTextureFactory, but skip creating
StreamTextureProxy. WebMediaPlayerAndroid already works in this
mode, and it just means in-line video does not work in this case.
But video playback is still successful and user is able to enter fullscreen
to get working playback.
Change-Id: Ife9a7f6ae9acba6bc2cd6f711e8e1f8f88cf7f0e
/external/chromium_org/content/browser/android/in_process/synchronous_compositor_impl.cc
|
| 438599f994082010ffd07abcbecb7a97956451e2 |
|
16-Aug-2013 |
Bo Liu <boliu@chromium.org> |
Cherry-pick "Use visible rect instead of clip to make tile management decisions."
Taken from upstream https://codereview.chromium.org/23171014/ PS4
Also add early out in PictureLayerImpl::UpdateTilePriorities and the
plumbing to support it.
BUG: b/10232753
Change-Id: I9418a70b18f3f9c2e44778e480afab53c4332061
/external/chromium_org/content/browser/android/in_process/synchronous_compositor_impl.cc
|
| b17bbf2f0f3441ae7ec7478ff8f77cb8fb21bcb8 |
|
22-Aug-2013 |
Jonathan Dixon <joth@google.com> |
Patch in https://codereview.chromium.org/23234003
Bug: 9982214
Took un-submitted patchset 5
https://codereview.chromium.org/download/issue23234003_29001.diff
Applied cleanly to klp-dev + crrev.com/23072008
Original description:
Support stream textures with the synchronous compositor
This adds a thread-safe StreamTextureManager for GLInProcessContext.
It further adds some plumbing for the webkit thread to be able
to create a StreamTextureFactory from the main thread (see render_view_impl.cc)
with the ability to extract the thread-safe SurfaceTexture(Bridge) for a given stream.
This is nothing but a crazy amount of plumbing to achieve this:
- StreamTexture::Update() i.e. SurfaceTexture::updateTexImage needs to happen on the GL thread
with a current context
- The StreamTextureFactory and Proxy are referenced from the WebmediaPlayer instance which lives on
the main thread
- The callback for invalidating the video is posted to the
compositor thread directly (here: UI thread) bypassing the main thread
BUG=239760
Change-Id: I2a5e86ed580af0c4659583f4deda96a51fd5ba0c
/external/chromium_org/content/browser/android/in_process/synchronous_compositor_impl.cc
|
| d75b0bf43bd0c2887d9afda36f94f97b4c208e44 |
|
22-Aug-2013 |
Jonathan Dixon <joth@google.com> |
patch in https://codereview.chromium.org/23072008
Bug: 9982214
Took patchset 3, applied cleanly to klp-dev.
Source https://codereview.chromium.org/download/issue23072008_27001.diff
Original description:
aura: Allow in process ContextProvider to hold onscreen contexts.
This will allow us to use them in an OutputSurface. For the
common offscreen context case, we want to still share code
so add a CreateOffscreen() method to the context provider
so we don't have to replicate the WGC3D::Attributes decisions
around the codebase.
R=piman@chromium.org
BUG=258625
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=217677
Change-Id: Ib2f598c08a66f3a1436a440736e2fe2a006744fe
/external/chromium_org/content/browser/android/in_process/synchronous_compositor_impl.cc
|
| 4311e82a78ceafbe0585f51d4c8a86df9f21aa0d |
|
11-Aug-2013 |
Ben Murdoch <benm@google.com> |
Merge from Chromium at DEPS revision r216896
This commit was generated by merge_to_master.py.
Change-Id: I595ee04895ccfeb752d5798668ae0cd67346dd2b
/external/chromium_org/content/browser/android/in_process/synchronous_compositor_impl.cc
|
| bb1529ce867d8845a77ec7cdf3e3003ef1771a40 |
|
08-Aug-2013 |
Ben Murdoch <benm@google.com> |
Merge from Chromium at DEPS revision r216370
This commit was generated by merge_to_master.py.
Change-Id: I739228187a6f1df6c28c5761160e593a49891113
/external/chromium_org/content/browser/android/in_process/synchronous_compositor_impl.cc
|
| fb250657ef40d7500f20882d5c9909c1013367d3 |
|
31-Jul-2013 |
Ben Murdoch <benm@google.com> |
Merge from Chromium at DEPS revision r214456
This commit was generated by merge_to_master.py.
Change-Id: If3f38c7966c2034e96c669968f72ea1e57f41964
/external/chromium_org/content/browser/android/in_process/synchronous_compositor_impl.cc
|
| ca12bfac764ba476d6cd062bf1dde12cc64c3f40 |
|
23-Jul-2013 |
Ben Murdoch <benm@google.com> |
Merge from Chromium at DEPS revision r213057
This commit was generated by merge_to_master.py.
Change-Id: I3e2e2506eb9b0080157e9c5f133559df3e600388
/external/chromium_org/content/browser/android/in_process/synchronous_compositor_impl.cc
|
| 9ab5563a3196760eb381d102cbb2bc0f7abc6a50 |
|
18-Jul-2013 |
Ben Murdoch <benm@google.com> |
Merge from Chromium at DEPS revision r212225
This commit was generated by merge_to_master.py.
Change-Id: I9b658b6bade7aff6166611a04fb26f4bcf0ca77c
/external/chromium_org/content/browser/android/in_process/synchronous_compositor_impl.cc
|
| 7dbb3d5cf0c15f500944d211057644d6a2f37371 |
|
17-Jul-2013 |
Ben Murdoch <benm@google.com> |
Merge from Chromium at DEPS revision r212014
This commit was generated by merge_to_master.py.
Change-Id: Ie0f261e9682cd8abea1eea1e51beab83d5eea21a
/external/chromium_org/content/browser/android/in_process/synchronous_compositor_impl.cc
|
| 7d4cd473f85ac64c3747c96c277f9e506a0d2246 |
|
19-Jun-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision r207203
This commit was generated by merge_to_master.py.
Change-Id: I5fbb6854d092096c4d39edc2865a48be1b53c418
/external/chromium_org/content/browser/android/in_process/synchronous_compositor_impl.cc
|
| 5e3f23d412006dc4db4e659864679f29341e113f |
|
11-Jun-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision r205548
This commit was generated by merge_to_master.py.
Change-Id: I6d3c83f1b6c91aecc6bd4bf93562314356dd44b9
/external/chromium_org/content/browser/android/in_process/synchronous_compositor_impl.cc
|
| 868fa2fe829687343ffae624259930155e16dbd8 |
|
11-Jun-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision r205460
This commit was generated by merge_to_master.py.
Change-Id: I4a744a5e426bd3bb378d887cfa56fe054742a540
/external/chromium_org/content/browser/android/in_process/synchronous_compositor_impl.cc
|