Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(104)

Side by Side Diff: third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp

Issue 2860293002: Change cc::ElementId to be a uint64_t (Closed)
Patch Set: none 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009, 2010, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2009, 2010, 2011 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 2221 matching lines...) Expand 10 before | Expand all | Expand 10 after
2232 CompositorMutableProperty::kTransform) & 2232 CompositorMutableProperty::kTransform) &
2233 compositor_mutable_properties; 2233 compositor_mutable_properties;
2234 scroll_mutable_properties = (CompositorMutableProperty::kScrollLeft | 2234 scroll_mutable_properties = (CompositorMutableProperty::kScrollLeft |
2235 CompositorMutableProperty::kScrollTop) & 2235 CompositorMutableProperty::kScrollTop) &
2236 compositor_mutable_properties; 2236 compositor_mutable_properties;
2237 } 2237 }
2238 2238
2239 if (animating_style && animating_style->ShouldCompositeForCurrentAnimations()) 2239 if (animating_style && animating_style->ShouldCompositeForCurrentAnimations())
2240 element_id = DOMNodeIds::IdForNode(owning_node); 2240 element_id = DOMNodeIds::IdForNode(owning_node);
2241 2241
2242 CompositorElementId compositor_element_id; 2242 CompositorElementId compositor_element_id = kInvalidElementId;
2243 if (element_id) 2243 if (element_id)
2244 compositor_element_id = 2244 compositor_element_id =
2245 CreateCompositorElementId(element_id, CompositorSubElementId::kPrimary); 2245 CreateCompositorElementId(element_id, CompositorSubElementId::kPrimary);
2246 2246
2247 graphics_layer_->SetElementId(compositor_element_id); 2247 graphics_layer_->SetElementId(compositor_element_id);
2248 graphics_layer_->SetCompositorMutableProperties(primary_mutable_properties); 2248 graphics_layer_->SetCompositorMutableProperties(primary_mutable_properties);
2249 2249
2250 // We always set the elementId for m_scrollingContentsLayer since it can be 2250 // We always set the elementId for m_scrollingContentsLayer since it can be
2251 // animated for smooth scrolling, so we don't need to set it conditionally 2251 // animated for smooth scrolling, so we don't need to set it conditionally
2252 // here. 2252 // here.
(...skipping 1362 matching lines...) Expand 10 before | Expand all | Expand 10 after
3615 } else if (graphics_layer == decoration_outline_layer_.get()) { 3615 } else if (graphics_layer == decoration_outline_layer_.get()) {
3616 name = "Decoration Layer"; 3616 name = "Decoration Layer";
3617 } else { 3617 } else {
3618 NOTREACHED(); 3618 NOTREACHED();
3619 } 3619 }
3620 3620
3621 return name; 3621 return name;
3622 } 3622 }
3623 3623
3624 } // namespace blink 3624 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698