| d8024ab0a038fddb82e77aed15fe14c253321b56 |
|
17-Sep-2014 |
boliu <boliu@chromium.org> |
Cherry-pick: Handle context loss in WebMediaPlayerPlayer in-process
Cherry-pick with conflict of chromium
crrev.com/7a2b1cb83546418638417fc4d3c9aa6172fe02e9
Conflicts:
content/browser/android/in_process/synchronous_compositor_factory_impl.h
content/renderer/media/android/stream_texture_factory_synchronous_impl.cc
content/renderer/media/android/webmediaplayer_android.cc
Note this by itself does not compile.
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
Change-Id: I143678de1ddf6cd66e3c49c1f1f8615d904dfcf5
Cr-Commit-Position: refs/heads/master@{#295219}
/external/chromium_org/content/browser/android/in_process/synchronous_compositor_factory_impl.cc
|
| 2a6da4ffc49248e4a2eae83fe580bb35a53ecf9c |
|
23-Aug-2014 |
boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> |
Cherry-pick: aw: Avoid uncontrolled video context destruction
Clean cherry-pick of chromium crrev.com/291527
BUG: 17177416
Original description:
Since r289474, the sync factory nulls out the video context
which means the destruction is uncontrolled. Context
destruction is synchronous, so can cause deadlocks if there
are not webviews attached to view tree to run GL.
This is a rewrite of r289474 that just returns null
VideoContextProvider if no webview is ready to use it. But
still hold on to the reference to the context to avoid
destruction.
Change-Id: Ia5b855dd579dcdafd4ace1d2557414188d440d97
/external/chromium_org/content/browser/android/in_process/synchronous_compositor_factory_impl.cc
|
| 929504d64b38e05de7355e162311d6791ad6f54d |
|
19-Aug-2014 |
Bo Liu <boliu@google.com> |
Merge from Chromium at DEPS revision 37.0.2062.95
This commit was generated by merge_to_master.py.
Change-Id: I3f9f26ef388c68b51c867e1f7d1565494e623c61
/external/chromium_org/content/browser/android/in_process/synchronous_compositor_factory_impl.cc
|
| 08fd22434aed8d58d4e04bbbc0df2a942440bcc5 |
|
22-Jul-2014 |
Bo Liu <boliu@google.com> |
Merge from Chromium at DEPS revision 37.0.2062.34
This commit was generated by merge_to_master.py.
Change-Id: Iace2841ff698138e27700e5b50490b4b5c5f5ab9
/external/chromium_org/content/browser/android/in_process/synchronous_compositor_factory_impl.cc
|
| bee9932bab44713b74b422b4b759b49f5a222977 |
|
15-Jul-2014 |
Bo Liu <boliu@google.com> |
Merge from Chromium at DEPS revision 37.0.2062.21
This commit was generated by merge_to_master.py.
Change-Id: Ibf049855ef0d7f5eb48fc2ce2f8e3ccae49356d6
/external/chromium_org/content/browser/android/in_process/synchronous_compositor_factory_impl.cc
|
| f8ee788a64d60abd8f2d742a5fdedde054ecd910 |
|
20-Jun-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 278205
This commit was generated by merge_to_master.py.
Change-Id: I23f1e7ea8c154ba72e7fb594436216f861f868ab
/external/chromium_org/content/browser/android/in_process/synchronous_compositor_factory_impl.cc
|
| cedac228d2dd51db4b79ea1e72c7f249408ee061 |
|
03-Jun-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 273901
This commit was generated by merge_to_master.py.
Change-Id: I45745444894df927ffc1045ab8de88b9e52636a3
/external/chromium_org/content/browser/android/in_process/synchronous_compositor_factory_impl.cc
|
| 5c02ac1a9c1b504631c0a3d2b6e737b5d738bae1 |
|
01-May-2014 |
Bo Liu <boliu@google.com> |
Merge from Chromium at DEPS revision 267519
This commit was generated by merge_to_master.py.
Change-Id: I6002987b71e09742c68bad9c834ae800ff531f25
/external/chromium_org/content/browser/android/in_process/synchronous_compositor_factory_impl.cc
|
| c5cede9ae108bb15f6b7a8aea21c7e1fefa2834c |
|
10-Apr-2014 |
Ben Murdoch <benm@google.com> |
Merge from Chromium at DEPS revision 262940
This commit was generated by merge_to_master.py.
Change-Id: I9a3fddbb29857fa8f68a18c6a0115862b65f84d1
/external/chromium_org/content/browser/android/in_process/synchronous_compositor_factory_impl.cc
|
| e5d81f57cb97b3b6b7fccc9c5610d21eb81db09d |
|
03-Apr-2014 |
Ben Murdoch <benm@google.com> |
Merge from Chromium at DEPS revision 261286
This commit was generated by merge_to_master.py.
Change-Id: Iea9643ce91618057f128e9a5b62c07be152f2b89
/external/chromium_org/content/browser/android/in_process/synchronous_compositor_factory_impl.cc
|
| 23730a6e56a168d1879203e4b3819bb36e3d8f1f |
|
21-Mar-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 258528
This commit was generated by merge_to_master.py.
Change-Id: Id197cbdde2c2881915f096c0426c741416884783
/external/chromium_org/content/browser/android/in_process/synchronous_compositor_factory_impl.cc
|
| a1401311d1ab56c4ed0a474bd38c108f75cb0cd9 |
|
18-Mar-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 257591
This commit was generated by merge_to_master.py.
Change-Id: I0010df2ec3fbb5d4947cd026de2feb150ce7a6b5
/external/chromium_org/content/browser/android/in_process/synchronous_compositor_factory_impl.cc
|
| 5d1f7b1de12d16ceb2c938c56701a3e8bfa558f7 |
|
21-Feb-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 251904
This commit was generated by merge_to_master.py.
Change-Id: I1f9543259d7d2a57d81aa41a1b84f85837439d21
/external/chromium_org/content/browser/android/in_process/synchronous_compositor_factory_impl.cc
|