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

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

Issue 2890953002: [SPv1] Always set a CompositorElementId on main graphics layers; use PaintLayer id. (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 Apple Inc. All rights reserved. 2 * Copyright (C) 2009, 2010 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 1181 matching lines...) Expand 10 before | Expand all | Expand 10 after
1192 if (ScrollingCoordinator* scrolling_coordinator = 1192 if (ScrollingCoordinator* scrolling_coordinator =
1193 this->GetScrollingCoordinator()) 1193 this->GetScrollingCoordinator())
1194 scrolling_coordinator->SetLayerIsContainerForFixedPositionLayers( 1194 scrolling_coordinator->SetLayerIsContainerForFixedPositionLayers(
1195 scroll_layer_.get(), true); 1195 scroll_layer_.get(), true);
1196 1196
1197 // In RLS mode, LayoutView scrolling contents layer gets this element ID (in 1197 // In RLS mode, LayoutView scrolling contents layer gets this element ID (in
1198 // CompositedLayerMapping::updateElementIdAndCompositorMutableProperties). 1198 // CompositedLayerMapping::updateElementIdAndCompositorMutableProperties).
1199 if (!RuntimeEnabledFeatures::rootLayerScrollingEnabled()) { 1199 if (!RuntimeEnabledFeatures::rootLayerScrollingEnabled()) {
1200 scroll_layer_->SetElementId(CompositorElementIdFromDOMNodeId( 1200 scroll_layer_->SetElementId(CompositorElementIdFromDOMNodeId(
1201 DOMNodeIds::IdForNode(&layout_view_.GetDocument()), 1201 DOMNodeIds::IdForNode(&layout_view_.GetDocument()),
1202 CompositorElementIdNamespace::kScroll)); 1202 CompositorElementIdNamespace::kRootScroll));
1203 } 1203 }
1204 1204
1205 // Hook them up 1205 // Hook them up
1206 overflow_controls_host_layer_->AddChild(container_layer_.get()); 1206 overflow_controls_host_layer_->AddChild(container_layer_.get());
1207 container_layer_->AddChild(scroll_layer_.get()); 1207 container_layer_->AddChild(scroll_layer_.get());
1208 scroll_layer_->AddChild(root_content_layer_.get()); 1208 scroll_layer_->AddChild(root_content_layer_.get());
1209 1209
1210 FrameViewDidChangeSize(); 1210 FrameViewDidChangeSize();
1211 } 1211 }
1212 1212
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
1373 } else if (graphics_layer == scroll_layer_.get()) { 1373 } else if (graphics_layer == scroll_layer_.get()) {
1374 name = "Frame Scrolling Layer"; 1374 name = "Frame Scrolling Layer";
1375 } else { 1375 } else {
1376 NOTREACHED(); 1376 NOTREACHED();
1377 } 1377 }
1378 1378
1379 return name; 1379 return name;
1380 } 1380 }
1381 1381
1382 } // namespace blink 1382 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698