| b86c3127098f5d0040c6c12ced76a2591343dc47 |
|
27-Aug-2014 |
vmpstr <vmpstr@chromium.org> |
Cherry-pick: cc: Report only on active tiles in tracing.
Cherry-pick with conflict of chromium
crrev.com/d7de03c45e06e104e3ba022e240f7bc88315e753
Conflicts:
cc/layers/layer_impl.cc
cc/layers/layer_impl.h
cc/layers/picture_layer_impl.cc
cc/layers/picture_layer_impl.h
cc/resources/picture_layer_tiling.cc
cc/resources/picture_layer_tiling.h
cc/resources/tile_manager.cc
cc/resources/tile_manager.h
cc/trees/layer_tree_host_impl.cc
cc/trees/layer_tree_impl.cc
cc/trees/layer_tree_impl.h
BUG: 17315710
Original description:
This patch changes which tiles we report on. Previously, we logged
all of the available tiles. Now, we only log tiles that are active.
That is, only tiles that are on either active or pending trees are
logged.
The way this is done is as follows:
- Walk the tree, layers, tilings
- Insert all tiles from a tiling into a set
- Stuff those into a trace.
Change-Id: Ied16f30ee7e69873e12a2754054a39ecb7acc385
/external/chromium_org/cc/trees/layer_tree_host_impl.cc
|
| 3c71a2ada6364b6e0ae6346de714cbd5d87c1a16 |
|
28-Aug-2014 |
Ben Murdoch <benm@google.com> |
Cherry pick "Include tile manager state in lthi state dump"
Include tile manager state in lthi state dump
R=vmpstr,enne
BUG=401209
Review URL: https://codereview.chromium.org/463403002
Cr-Commit-Position: refs/heads/master@{#289451}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289451
0039d316-1c4b-4281-b951-d872f2087c98
Chromium revision: 0eded9ea3c713e1ce61b4f26c7a202c55f0302fe
Bug: 17315710
Change-Id: I5d47079abb36678a16d1fb245e4caa25c20c9067
/external/chromium_org/cc/trees/layer_tree_host_impl.cc
|
| c2bc7c74934f64e7d2125415f27a3803a4879085 |
|
26-Aug-2014 |
vmpstr <vmpstr@chromium.org> |
Cherry-pick: cc: Remove tiles from recycle tree that were deleted on active.
Cherry-pick with conflict of
crrev.com/7fceb77977afd9af22215eb9cd28ab667567668e
Conflicts:
cc/debug/rasterize_and_record_benchmark_impl.cc
cc/layers/picture_layer_impl_unittest.cc
cc/resources/picture_layer_tiling.cc
cc/resources/picture_layer_tiling_unittest.cc
cc/test/fake_picture_layer_tiling_client.cc
cc/test/fake_picture_layer_tiling_client.h
BUG: 16548433
Original description:
This patch removes tiles from the recycle tree that were deleted from
the active tree as a result of a shifting live tiles rect. It is
important to do this, since if the active tree then would recreate
the deleted tile (ie, live tiles rect shift back), we have to ensure
that this tile will be shared when the next pending tree is created.
If we don't do it, we can run into a situation in which we will
continuously raster the same tile.
The patch does the following:
- Adds a way to get a recycled tree twin tiling.
- During LiveTilesRect tile deletion, deletes tiles from the same
location from the recycle twin (if one exists).
Change-Id: I295cec01b476a97f68b0678d9d4322568662040f
/external/chromium_org/cc/trees/layer_tree_host_impl.cc
|
| f4933c2d2f8300a84cd1cd69e0ecb40f3b807f06 |
|
31-Jul-2014 |
Hui Shu <hush@google.com> |
Tile priority in Android WebView
Cherry pick of chromium r286731
Conflicts:
cc/layers/picture_layer_impl_unittest.cc
Original Description:
Tiling priorities in Android Webview.
Use the parent compositor's clip and transform for tile
priorities in child compositor.
When the transform matrix changes in parent compositor
(hardware_renderer.cc), it posts the matrix and the clip to
the child compositor. (The parent clip is in screen space
and the parent matrix transforms from webview space to
screen space) Child compositor will use them for tile
prioritization.
In child compositor during updating tile priority, the clip
from parent is transformed from screen space to view space,
then from view space to content space. Then the result rect
will intersect with content_bounds() and the intersection
is used as tile priority input.
BUG:15771042
Change-Id: I3d1625f46649f032215810729d24717e5faceff7
/external/chromium_org/cc/trees/layer_tree_host_impl.cc
|
| 8f6e4bda48b1f7e913c8b2f770559183fd98092b |
|
29-Jul-2014 |
Bo Liu <boliu@google.com> |
Merge from Chromium at DEPS revision 37.0.2062.52
This commit was generated by merge_to_master.py.
Change-Id: Id79fecbf12a48cc7a1916e0a244695cbc1d298cf
/external/chromium_org/cc/trees/layer_tree_host_impl.cc
|
| 88109bffdff235e691fea3aefa461782a195ed10 |
|
11-Jul-2014 |
boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> |
Cherry-pick: Pass resourceless software mode in SetExternalConstraints
Cherry-pick of chromium r282445
Conflicts:
cc/layers/picture_layer_impl.cc
cc/layers/picture_layer_impl_unittest.cc
Original description:
This fixes the bug that resourceless software mode not
dirtying the draw properties.
This allows OutputSurface::ForcedDrawToSoftwareDevice to be
removed. And merged the valid_for_tile_management parameter
into resourceless_software_draw. This effectively reverses
the last bool parameter on SetExternalDrawConstraints.
BUG: 15770662
Change-Id: I3c8895f7092ecbe9ebf79287f5721352ffb40312
/external/chromium_org/cc/trees/layer_tree_host_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/cc/trees/layer_tree_host_impl.cc
|
| 2f22f038970e0d1927c41b04bbf5589bd12c5316 |
|
01-Jul-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 37.0.2062.10
This commit was generated by merge_to_master.py.
Change-Id: I7a3a1838fe1d01e3d29886fc52aa980c2c3f2783
/external/chromium_org/cc/trees/layer_tree_host_impl.cc
|
| 6d86b77056ed63eb6871182f42a9fd5f07550f90 |
|
25-Jun-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 278856
This commit was generated by merge_to_master.py.
Change-Id: If3807744d3e5d3ee84b897bd2d099a2b7ed2e7a3
/external/chromium_org/cc/trees/layer_tree_host_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/cc/trees/layer_tree_host_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/cc/trees/layer_tree_host_impl.cc
|
| 010d83a9304c5a91596085d917d248abff47903a |
|
14-May-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 269336
This commit was generated by merge_to_master.py.
Change-Id: I8b9c77f10eccd2a8b4c7ce373ffda18568af54ff
/external/chromium_org/cc/trees/layer_tree_host_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/cc/trees/layer_tree_host_impl.cc
|
| 0529e5d033099cbfc42635f6f6183833b09dff6e |
|
24-Apr-2014 |
Ben Murdoch <benm@google.com> |
Merge from Chromium at DEPS revision 265802
This commit was generated by merge_to_master.py.
Change-Id: I6fac2dbbce472b18ca943b6e6f247835b0bd6281
/external/chromium_org/cc/trees/layer_tree_host_impl.cc
|
| a02191e04bc25c4935f804f2c080ae28663d096d |
|
16-Apr-2014 |
Ben Murdoch <benm@google.com> |
Merge from Chromium at DEPS revision 263965
This commit was generated by merge_to_master.py.
Change-Id: Ia1121eddd985123f160afde6372525c3d25975bf
/external/chromium_org/cc/trees/layer_tree_host_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/cc/trees/layer_tree_host_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/cc/trees/layer_tree_host_impl.cc
|
| effb81e5f8246d0db0270817048dc992db66e9fb |
|
31-Mar-2014 |
Ben Murdoch <benm@google.com> |
Merge from Chromium at DEPS revision 260458
This commit was generated by merge_to_master.py.
Change-Id: I140fa91b7f09c8efba4424e99ccb87b94a11d022
/external/chromium_org/cc/trees/layer_tree_host_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/cc/trees/layer_tree_host_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/cc/trees/layer_tree_host_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/cc/trees/layer_tree_host_impl.cc
|
| a3f6a49ab37290eeeb8db0f41ec0f1cb74a68be7 |
|
18-Dec-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 240154
This commit was generated by merge_to_master.py.
Change-Id: I8f2ba858cf0e7f413dddedc2ae91dc37f7136c2e
/external/chromium_org/cc/trees/layer_tree_host_impl.cc
|
| f2477e01787aa58f445919b809d89e252beef54f |
|
28-Nov-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 237746
This commit was generated by merge_to_master.py.
Change-Id: I8997af4cddfeb09a7c26f7e8e672c712cab461ea
/external/chromium_org/cc/trees/layer_tree_host_impl.cc
|
| 0f1bc08d4cfcc34181b0b5cbf065c40f687bf740 |
|
06-Nov-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 232870
This commit was generated by merge_to_master.py.
Change-Id: I9cd2139013538e8bcd17966e8ff30ca5651d1a3d
/external/chromium_org/cc/trees/layer_tree_host_impl.cc
|
| 1e9bf3e0803691d0a228da41fc608347b6db4340 |
|
31-Oct-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 232015
This commit was generated by merge_to_master.py.
Change-Id: If86767ad396b9e2e1a4c1e9df1427daea29703ef
/external/chromium_org/cc/trees/layer_tree_host_impl.cc
|
| 8bcbed890bc3ce4d7a057a8f32cab53fa534672e |
|
22-Oct-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 230120
This commit was generated by merge_to_master.py.
Change-Id: I54bc06b7ee8a07092e74ce3b68c6893508349042
/external/chromium_org/cc/trees/layer_tree_host_impl.cc
|
| 4e180b6a0b4720a9b8e9e959a882386f690f08ff |
|
18-Oct-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 228962
This commit was generated by merge_to_master.py.
Change-Id: I23bd7d7766f213fd52f28ae5e1ecc6ae9df905ea
/external/chromium_org/cc/trees/layer_tree_host_impl.cc
|
| 68043e1e95eeb07d5cae7aca370b26518b0867d6 |
|
26-Sep-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 225410
This commit was generated by merge_to_master.py.
Change-Id: Ifa1539ca216abb163295ee7a77f81bb67f52e178
/external/chromium_org/cc/trees/layer_tree_host_impl.cc
|
| d0247b1b59f9c528cb6df88b4f2b9afaf80d181e |
|
19-Sep-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 224184
This commit was generated by merge_to_master.py.
Change-Id: Ia3424df5abed9bea642c522b9e2358dceabd8423
/external/chromium_org/cc/trees/layer_tree_host_impl.cc
|
| 58537e28ecd584eab876aee8be7156509866d23a |
|
12-Sep-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 222756
This commit was generated by merge_to_master.py.
Change-Id: I40d7f32f195f328f005f230ea80d07092d48040e
/external/chromium_org/cc/trees/layer_tree_host_impl.cc
|
| 424c4d7b64af9d0d8fd9624f381f469654d5e3d2 |
|
30-Aug-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision r220549
This commit was generated by merge_to_master.py.
Change-Id: I8fcb82db764ec1eb0294280936c177bd9ba8a9e9
/external/chromium_org/cc/trees/layer_tree_host_impl.cc
|
| 3551c9c881056c480085172ff9840cab31610854 |
|
23-Aug-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision r219274
This commit was generated by merge_to_master.py.
Change-Id: Ibb7f41396cadf4071e89153e1913c986d126f65d
/external/chromium_org/cc/trees/layer_tree_host_impl.cc
|
| ba5b9a6411cb1792fd21f0a078d7a25cd1ceec16 |
|
12-Aug-2013 |
Ben Murdoch <benm@google.com> |
Merge from Chromium at DEPS revision r216972
This commit was generated by merge_to_master.py.
Change-Id: I01cb28d94e3fcf99e3624d75cafa50d929787ddd
/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
|