History log of /external/chromium_org/content/public/android/java/src/org/chromium/content/browser/ContentView.java
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
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/public/android/java/src/org/chromium/content/browser/ContentView.java
810e1ddbe56b57afdcdf66369cbed8e1ec967838 23-Sep-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 30.0.1599.56

This commit was generated by merge_to_master.py.

Change-Id: Ifb253cb218578d4f063d51d6f83210e66a2993b5
/external/chromium_org/content/public/android/java/src/org/chromium/content/browser/ContentView.java
b32343c9b70645bd3e272fe2a92d87e22bc2cca8 18-Sep-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 30.0.1599.48

This commit was generated by merge_to_master.py.

Change-Id: I530c25717c29089baf732816eb19058ae3f03152
/external/chromium_org/content/public/android/java/src/org/chromium/content/browser/ContentView.java
4d551d56ad0f44a3bcc2b10614207fdae059b960 17-Sep-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 30.0.1599.46

This commit was generated by merge_to_master.py.

Change-Id: I01911ef63f1e267b7742804ba6fecda1780cda22
/external/chromium_org/content/public/android/java/src/org/chromium/content/browser/ContentView.java
68dded969729681d695306eb2b5a6e13c4f06498 23-Aug-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 30.0.1599.18

This commit was generated by merge_to_master.py.

Change-Id: I66bd7deb92b4f0bc822e0e444f03da83e30a4d8b
/external/chromium_org/content/public/android/java/src/org/chromium/content/browser/ContentView.java
a031efa9dbd9b321781674193e8ac7636d47eb1d 13-Aug-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r217092

This commit was generated by merge_to_master.py.

Change-Id: I91a8ab76ffb254434b2a39ea11e0b6a0e34b9159
/external/chromium_org/content/public/android/java/src/org/chromium/content/browser/ContentView.java
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/public/android/java/src/org/chromium/content/browser/ContentView.java
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/public/android/java/src/org/chromium/content/browser/ContentView.java
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/public/android/java/src/org/chromium/content/browser/ContentView.java
eb525c5499e34cc9c4b825d6d9e75bb07cc06ace 10-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r210036

This commit was generated by merge_to_master.py.

Change-Id: Ib0e33a83ad5dfa541481e83d7acfc6970e68f471
/external/chromium_org/content/public/android/java/src/org/chromium/content/browser/ContentView.java
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/public/android/java/src/org/chromium/content/browser/ContentView.java
90dce4d38c5ff5333bea97d859d4e484e27edf0c 29-May-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r202854

This commit was generated by merge_to_master.py.

Change-Id: Idca323f71ef844a9e04f454d4f070b1e398f2deb
/external/chromium_org/content/public/android/java/src/org/chromium/content/browser/ContentView.java
b2df76ea8fec9e32f6f3718986dba0d95315b29c 13-May-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r199464

This commit was generated by merge_to_master.py.

Change-Id: Ic3d1f97a4fb4edd1e6ed66a70b5040da1622b5a9
/external/chromium_org/content/public/android/java/src/org/chromium/content/browser/ContentView.java
c2e0dbddbe15c98d52c4786dac06cb8952a8ae6d 09-May-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r198571

This commit was generated by merge_to_master.py.

Change-Id: I951118a03836157090561764dd2627f0add8118f
/external/chromium_org/content/public/android/java/src/org/chromium/content/browser/ContentView.java
2a99a7e74a7f215066514fe81d2bfa6639d9eddd 28-Mar-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r190564

This commit was generated by merge_to_master.py.

Change-Id: Icadecbce29854b8fa25fd335b2c1949b5ca5d170
/external/chromium_org/content/public/android/java/src/org/chromium/content/browser/ContentView.java
5821806d5e7f356e8fa4b058a389a808ea183019 14-Nov-2012 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r167172

This commit was generated by merge_to_master.py.

Change-Id: Ib8d56fd5ae39a2d7e8c91dcd76cc6d13f25f2aab
/external/chromium_org/content/public/android/java/src/org/chromium/content/browser/ContentView.java