summaryrefslogtreecommitdiffstats
path: root/chromium/cc/layers/picture_layer.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2018-10-24 11:30:15 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2018-10-30 12:56:19 +0000
commit6036726eb981b6c4b42047513b9d3f4ac865daac (patch)
tree673593e70678e7789766d1f732eb51f613a2703b /chromium/cc/layers/picture_layer.cc
parent466052c4e7c052268fd931888cd58961da94c586 (diff)
BASELINE: Update Chromium to 70.0.3538.78
Change-Id: Ie634710bf039e26c1957f4ae45e101bd4c434ae7 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/cc/layers/picture_layer.cc')
-rw-r--r--chromium/cc/layers/picture_layer.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/chromium/cc/layers/picture_layer.cc b/chromium/cc/layers/picture_layer.cc
index 563de6586bd..50a0b87b9d4 100644
--- a/chromium/cc/layers/picture_layer.cc
+++ b/chromium/cc/layers/picture_layer.cc
@@ -49,7 +49,8 @@ std::unique_ptr<LayerImpl> PictureLayer::CreateLayerImpl(
void PictureLayer::PushPropertiesTo(LayerImpl* base_layer) {
Layer::PushPropertiesTo(base_layer);
- TRACE_EVENT0("cc", "PictureLayer::PushPropertiesTo");
+ TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("cc.debug"),
+ "PictureLayer::PushPropertiesTo");
PictureLayerImpl* layer_impl = static_cast<PictureLayerImpl*>(base_layer);
layer_impl->SetLayerMaskType(mask_type());
DropRecordingSourceContentIfInvalid();
@@ -102,8 +103,8 @@ bool PictureLayer::Update() {
!contents_opaque() &&
!picture_layer_inputs_.client->FillsBoundsCompletely());
- TRACE_EVENT1("cc", "PictureLayer::Update", "source_frame_number",
- layer_tree_host()->SourceFrameNumber());
+ TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("cc.debug"), "PictureLayer::Update",
+ "source_frame_number", layer_tree_host()->SourceFrameNumber());
devtools_instrumentation::ScopedLayerTreeTask update_layer(
devtools_instrumentation::kUpdateLayer, id(), layer_tree_host()->GetId());