third_party/WebKit/Source/platform/graphics/paint/EffectPaintPropertyNode.cpp - Issue 2860293002: Change cc::ElementId to be a uint64_t

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/platform/graphics/paint/EffectPaintPropertyNode.cpp

Issue 2860293002: Change cc::ElementId to be a uint64_t (Closed)

Patch Set: Merge branch 'master' into secondaryid Created 3 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositorTest.cpp ('k') | third_party/WebKit/Source/platform/graphics/paint/PropertyTreeStateTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/graphics/paint/EffectPaintPropertyNode.cpp

diff --git a/third_party/WebKit/Source/platform/graphics/paint/EffectPaintPropertyNode.cpp b/third_party/WebKit/Source/platform/graphics/paint/EffectPaintPropertyNode.cpp

index 8ee5702ec6883ceaef2beca929d8d82f37607da1..85bfcede76ce1863ddf46ab1a0c1659dcc868d9b 100644

--- a/third_party/WebKit/Source/platform/graphics/paint/EffectPaintPropertyNode.cpp

+++ b/third_party/WebKit/Source/platform/graphics/paint/EffectPaintPropertyNode.cpp

@@ -36,12 +36,12 @@ cc::Layer* EffectPaintPropertyNode::EnsureDummyLayer() const {

String EffectPaintPropertyNode::ToString() const {

return String::Format(

"parent=%p localTransformSpace=%p outputClip=%p opacity=%f filter=%s "

- "blendMode=%s directCompositingReasons=%s compositorElementId=(%d, %d) "

+ "blendMode=%s directCompositingReasons=%s compositorElementId=%lu "

"paintOffset=%s",

parent_.Get(), local_transform_space_.Get(), output_clip_.Get(), opacity_,

filter_.ToString().Ascii().data(), SkBlendMode_Name(blend_mode_),

CompositingReasonsAsString(direct_compositing_reasons_).Ascii().data(),

- compositor_element_id_.primaryId, compositor_element_id_.secondaryId,

+ static_cast<unsigned long>(compositor_element_id_.id_),

paint_offset_.ToString().Ascii().data());

}