1. 19 Sep, 2014 4 commits
    • Bo Liu's avatar
      Compile fix for cherry-pick · dc1dfbb9
      Bo Liu authored
      Compile fixes for crrev.com/7a2b1cb83546418638417fc4d3c9aa6172fe02e9
      
      BUG: 17354106
      Change-Id: I49750d359f9ebdea493337d325bcae13ee82d64d
      dc1dfbb9
    • boliu's avatar
      Cherry-pick: Handle context loss in WebMediaPlayerPlayer in-process · eefdd1bf
      boliu authored
      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
      eefdd1bf
    • Torne (Richard Coles)'s avatar
      Record Chromium merge at DEPS revision 38.0.2125.69 · 257f9d82
      Torne (Richard Coles) authored
      This commit was generated by merge_to_master.py.
      
      Change-Id: I607d23d763c85ecb3e6ff24647fa40a5068c2348
      257f9d82
    • Torne (Richard Coles)'s avatar
      Merge from Chromium at DEPS revision 38.0.2125.69 · 21a33e99
      Torne (Richard Coles) authored
      This commit was generated by merge_to_master.py.
      
      Change-Id: Ic126b8244c70faf0de8c5d113d9b7f032d191b23
      21a33e99
  2. 17 Sep, 2014 1 commit
  3. 11 Sep, 2014 2 commits
  4. 05 Sep, 2014 1 commit
  5. 28 Aug, 2014 2 commits
  6. 27 Aug, 2014 1 commit
  7. 19 Aug, 2014 2 commits
  8. 12 Aug, 2014 2 commits
  9. 21 Jul, 2014 2 commits
  10. 19 Jul, 2014 1 commit
    • Ben Murdoch's avatar
      Cherry pick crrev.com/281310 · 1f14a451
      Ben Murdoch authored
      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
      1f14a451
  11. 01 Jul, 2014 1 commit
  12. 25 Jun, 2014 7 commits
  13. 23 Jun, 2014 1 commit
  14. 20 Jun, 2014 2 commits
  15. 09 Jun, 2014 2 commits
  16. 03 Jun, 2014 2 commits
  17. 15 May, 2014 2 commits
  18. 14 May, 2014 2 commits
  19. 08 May, 2014 1 commit
  20. 01 May, 2014 2 commits