ff02a5906993e65f5c8bf12b09245e7a673d8283 |
|
11-Oct-2013 |
boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> |
Cherry-pick with modifications: cc: Fix HeadsUpDisplayLayerImpl NPE after resource loss Cherry-pick of Chromium crrev.com/r228222 Removed the new test file to avoid unnecessary gyp change. Conflicts: cc/trees/layer_tree_host_impl.cc BUG: 11164012 Original description: Currently will NPE in HeadsUpDisplayLayerImpl::UpdateHudTexture immediately after a DidLoseOutputSurface call that throws away the resource. Resource loss can happen quite frequently under normal usage in Android WebView. Also fixed a condition WillDraw as writing the test for issue above. Fix for internal bug b/11164012. TEST=HeadsUpDisplayLayerImplTest.UpdateAfterResourceLoss Change-Id: Ia0c12f8357f4e5e0ed6e63a5058a940241696466
/external/chromium_org/cc/trees/layer_tree_host_impl.cc
|
fbc84d90c9b42fb02bb9d81bada128d638b942e0 |
|
09-Oct-2013 |
Jonathan Dixon <joth@google.com> |
Merge "Cherry-pick "Add --disable-compositor-touch-hit-testing flag"" into klp-dev
|
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/cc/trees/layer_tree_host_impl.cc
|
a163e21641001dda3882a4a9036c2353dea0146f |
|
08-Oct-2013 |
rbyers@chromium.org <rbyers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> |
Cherry-pick "Add --disable-compositor-touch-hit-testing flag" Bug 11070366 Taken from https://src.chromium.org/viewvc/chrome?revision=227511&view=revision and straight-forward reolve (new setting was added amonst other settings that didn't exist back in M30) Original description: Plumb the flag to blink and the compositor. Disable by default in Android webview for now. Depends on blink CL: https://src.chromium.org/viewvc/blink?view=rev&revision=158956 BUG=303945 Review URL: https://codereview.chromium.org/25904004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227511 0039d316-1c4b-4281-b951-d872f2087c98 Conflicts: cc/base/switches.cc cc/base/switches.h cc/trees/layer_tree_settings.cc content/renderer/web_preferences.cc webkit/common/webpreferences.cc webkit/common/webpreferences.h Change-Id: I140594e9b280f408c7b237ee5f17c569911f5b85
/external/chromium_org/cc/trees/layer_tree_host_impl.cc
|
331ba8b17b62dfe7ec9544bbfc1203a2ba03c0c3 |
|
01-Oct-2013 |
primiano@chromium.org <primiano@chromium.org> |
Cherry-pick: CC: Fix call order of ScrollOffsetDelegate in ActivatePendingTree. Cherry-pick of chromium crrev.com/25496002 BUG: 10959756 Original description: When a full tree synchronization happens, the ScrollOffsetDelegate is called too early (i.e. before DidBecomeActive()) and sees always a 0x0 scroll offset. This CL swaps the call order of SetRootLayerScrollOffsetDelegate and DidBecomeActive during the active tree activation in LayerTreeHostImpl::ActivatePendingTree. Updating also the unit tests to prevent future regressions on the RootLayerScrollOffsetDelegate. BUG=b/10959756 TBR=mkosiba@chromium.org Review URL: https://codereview.chromium.org/25496002 Change-Id: Ib95bdb8403ae367490550dea0963a166cbc5a428
/external/chromium_org/cc/trees/layer_tree_host_impl.cc
|
58a2f6b8fd2c42a65d95955e071e72ca7f0ac9b5 |
|
28-Sep-2013 |
Alexandre Elias <aelias@google.com> |
Merge "Cherry-pick http://crrev.com/24280009" into klp-dev
|
52ebdf0d579a55c74b2fbf1111a990fc410b65a3 |
|
24-Sep-2013 |
Alexandre Elias <aelias@google.com> |
Cherry-pick http://crrev.com/24280009 > Move tile-free-software render surface disabling to UpdateDrawProperties. > > Currently when DrawProperties decides a subtree needs a render surface, > Android WebView software mode just drops it at CalculateRenderPasses > time and draws nothing. If we instead suppress the render surface > decision at an earlier stage, we're more likely to get a halfway > reasonable result. > > The motivating example was a page setting preserve-3d where the render > surface didn't affect the output result anyway. > > New test LayerTreeHostCommonTest.CanRenderToSeparateSurface. BUG: 10534015 Change-Id: Iea0cbfc13293a807583c72676157fdbc07007333
/external/chromium_org/cc/trees/layer_tree_host_impl.cc
|
e6cbc2f94a2f388b78abafebdd1ad870c96de2fd |
|
26-Sep-2013 |
Ben Murdoch <benm@google.com> |
Merge "Always send DidOverscroll callback for android_webview." into klp-dev
|
15d17fec7d7268c82d8cb86c963ce0d316ccb7b0 |
|
25-Sep-2013 |
Martin Kosiba <mkosiba@google.com> |
Always send DidOverscroll callback for android_webview. Cherry-pick of http://crrev.com/24600002 > Always send DidOverscroll callback for android_webview. > > Some WebView embedders depend on overscroll notifications coming in > even if the contents isn't otherwise scrollable. The WebView will > not draw the overscroll glow in these cases but the embedder might > chose to perform some action (like going to a different page) in > such a case. > > BUG=internal b/8207890 BUG: 8207890 Change-Id: I2714f4fdd07e9498c01fd7d330e5ed26b3b32d7e
/external/chromium_org/cc/trees/layer_tree_host_impl.cc
|
e591d623e77fe2d98bfee55d0463a658e1aa17e1 |
|
12-Sep-2013 |
enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> |
Cherry-pick: cc: Set needs update draw properties during renderer creation Cherry-pick of Chromium crrev.com/222796. BUG: 10460177 Conflicts: cc/layers/picture_layer_impl.cc cc/layers/picture_layer_impl.h cc/layers/picture_layer_impl_unittest.cc Original description: After releasing resources from the tree and recreating a renderer, it's required for trees to reupdate themselves. This is because layers drop resources during DidLoseOutputSurface and PictureLayerImpl in particular needs an UpdateDrawProperties to figure out which tilings it needs and which one is high res. (Without this, syncing a tiling from the twin layer and then calling UpdateTilePriorities will call MarkVisibleResourcesAsRequired, which may crash because there are tilings, but no high res ones.) This bug was missed in two places in LayerTreeHostImpl. InitializeRenderer properly called set_needs_update_draw_properties, but ReleaseGL and DeferredInitialize did not (although both recreate the renderer). As a sanity check, UpdateTilePriorities now CHECKs that CalculateContentsScale (aka UpdateDrawProperties) has been called on PictureLayerImpl between ctor/ResetRasterScale and UpdateTilePriorities. ReleaseGL path was caught by: LayerTreeHostTestDeferredInitialize.* DeferredInitialize path is tested by new: DeferredInitPictureLayerImplTest.PreventUpdateTilePrioritiesDuringLostContext Change-Id: Ib05a128499e9ce2d668f4d4b1a05953d641cc685
/external/chromium_org/cc/trees/layer_tree_host_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/cc/trees/layer_tree_host_impl.cc
|
f3ce491c3623b9924dccab3703a43e03157e988a |
|
22-Aug-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 30.0.1599.16 This commit was generated by merge_to_master.py. Change-Id: I57af2ea8229c40b5a2f5b282f2a800c63c0c99e8
/external/chromium_org/cc/trees/layer_tree_host_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/cc/trees/layer_tree_host_impl.cc
|
a36e5920737c6adbddd3e43b760e5de8431db6e0 |
|
05-Aug-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision r215573 This commit was generated by merge_to_master.py. Change-Id: Ib95814f98e5765b459dd32425f9bf9138edf2bca
/external/chromium_org/cc/trees/layer_tree_host_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/cc/trees/layer_tree_host_impl.cc
|
558790d6acca3451cf3a6b497803a5f07d0bec58 |
|
30-Jul-2013 |
Ben Murdoch <benm@google.com> |
Merge from Chromium at DEPS revision r214332 This commit was generated by merge_to_master.py. Change-Id: I82a7c38de906244dc882493568013be659aa65d1
/external/chromium_org/cc/trees/layer_tree_host_impl.cc
|
a3f7b4e666c476898878fa745f637129375cd889 |
|
24-Jul-2013 |
Ben Murdoch <benm@google.com> |
Merge from Chromium at DEPS revision r213371 This commit was generated by merge_to_master.py. Change-Id: I35a74205de4bff52a2dd6b15330f8a002a39efaf
/external/chromium_org/cc/trees/layer_tree_host_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/cc/trees/layer_tree_host_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/cc/trees/layer_tree_host_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/cc/trees/layer_tree_host_impl.cc
|
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/cc/trees/layer_tree_host_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/cc/trees/layer_tree_host_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/cc/trees/layer_tree_host_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/cc/trees/layer_tree_host_impl.cc
|
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/cc/trees/layer_tree_host_impl.cc
|
a93a17c8d99d686bd4a1511e5504e5e6cc9fcadf |
|
15-May-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision r200144 This commit was generated by merge_to_master.py. Change-Id: I85f3a249ae157fd8253431215fb2dfcd12ee9bf3
/external/chromium_org/cc/trees/layer_tree_host_impl.cc
|
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/cc/trees/layer_tree_host_impl.cc
|
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/cc/trees/layer_tree_host_impl.cc
|
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/cc/trees/layer_tree_host_impl.cc
|