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

Side by Side Diff: Source/core/rendering/compositing/RenderLayerCompositor.cpp

Issue 202523004: Fully update compositing information for *layerTreeAsText calls (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 9 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 | Annotate | Revision Log
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 1322 matching lines...) Expand 10 before | Expand all | Expand 10 after
1333 1333
1334 bool RenderLayerCompositor::scrollingLayerDidChange(RenderLayer* layer) 1334 bool RenderLayerCompositor::scrollingLayerDidChange(RenderLayer* layer)
1335 { 1335 {
1336 if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator( )) 1336 if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator( ))
1337 return scrollingCoordinator->scrollableAreaScrollLayerDidChange(layer->s crollableArea()); 1337 return scrollingCoordinator->scrollableAreaScrollLayerDidChange(layer->s crollableArea());
1338 return false; 1338 return false;
1339 } 1339 }
1340 1340
1341 String RenderLayerCompositor::layerTreeAsText(LayerTreeFlags flags) 1341 String RenderLayerCompositor::layerTreeAsText(LayerTreeFlags flags)
1342 { 1342 {
1343 // Before dumping the layer tree, finish any pending compositing update. 1343 ASSERT(m_renderView.document().lifecycle().state() >= DocumentLifecycle::Com positingClean);
1344 updateCompositingLayers();
1345 1344
1346 if (!m_rootContentLayer) 1345 if (!m_rootContentLayer)
1347 return String(); 1346 return String();
1348 1347
1349 // We skip dumping the scroll and clip layers to keep layerTreeAsText output 1348 // We skip dumping the scroll and clip layers to keep layerTreeAsText output
1350 // similar between platforms (unless we explicitly request dumping from the 1349 // similar between platforms (unless we explicitly request dumping from the
1351 // root. 1350 // root.
1352 GraphicsLayer* rootLayer = m_rootContentLayer.get(); 1351 GraphicsLayer* rootLayer = m_rootContentLayer.get();
1353 if (flags & LayerTreeIncludesRootLayer) 1352 if (flags & LayerTreeIncludesRootLayer)
1354 rootLayer = rootGraphicsLayer(); 1353 rootLayer = rootGraphicsLayer();
(...skipping 888 matching lines...) Expand 10 before | Expand all | Expand 10 after
2243 } else if (graphicsLayer == m_scrollLayer.get()) { 2242 } else if (graphicsLayer == m_scrollLayer.get()) {
2244 name = "LocalFrame Scrolling Layer"; 2243 name = "LocalFrame Scrolling Layer";
2245 } else { 2244 } else {
2246 ASSERT_NOT_REACHED(); 2245 ASSERT_NOT_REACHED();
2247 } 2246 }
2248 2247
2249 return name; 2248 return name;
2250 } 2249 }
2251 2250
2252 } // namespace WebCore 2251 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698