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

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

Issue 319183006: Move GraphicsLayerUpdater::rebuildTree into its own file (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebase Created 6 years, 6 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
« no previous file with comments | « Source/core/rendering/compositing/GraphicsLayerUpdater.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 29 matching lines...) Expand all
40 #include "core/page/Chrome.h" 40 #include "core/page/Chrome.h"
41 #include "core/page/Page.h" 41 #include "core/page/Page.h"
42 #include "core/page/scrolling/ScrollingCoordinator.h" 42 #include "core/page/scrolling/ScrollingCoordinator.h"
43 #include "core/rendering/RenderLayerStackingNode.h" 43 #include "core/rendering/RenderLayerStackingNode.h"
44 #include "core/rendering/RenderLayerStackingNodeIterator.h" 44 #include "core/rendering/RenderLayerStackingNodeIterator.h"
45 #include "core/rendering/RenderVideo.h" 45 #include "core/rendering/RenderVideo.h"
46 #include "core/rendering/RenderView.h" 46 #include "core/rendering/RenderView.h"
47 #include "core/rendering/compositing/CompositedLayerMapping.h" 47 #include "core/rendering/compositing/CompositedLayerMapping.h"
48 #include "core/rendering/compositing/CompositingLayerAssigner.h" 48 #include "core/rendering/compositing/CompositingLayerAssigner.h"
49 #include "core/rendering/compositing/CompositingRequirementsUpdater.h" 49 #include "core/rendering/compositing/CompositingRequirementsUpdater.h"
50 #include "core/rendering/compositing/GraphicsLayerTreeBuilder.h"
50 #include "core/rendering/compositing/GraphicsLayerUpdater.h" 51 #include "core/rendering/compositing/GraphicsLayerUpdater.h"
51 #include "platform/OverscrollTheme.h" 52 #include "platform/OverscrollTheme.h"
52 #include "platform/graphics/GraphicsLayer.h" 53 #include "platform/graphics/GraphicsLayer.h"
53 #include "public/platform/Platform.h" 54 #include "public/platform/Platform.h"
54 55
55 namespace WebCore { 56 namespace WebCore {
56 57
57 class DeprecatedDirtyCompositingDuringCompositingUpdate { 58 class DeprecatedDirtyCompositingDuringCompositingUpdate {
58 WTF_MAKE_NONCOPYABLE(DeprecatedDirtyCompositingDuringCompositingUpdate); 59 WTF_MAKE_NONCOPYABLE(DeprecatedDirtyCompositingDuringCompositingUpdate);
59 public: 60 public:
(...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after
397 #if !ASSERT_DISABLED 398 #if !ASSERT_DISABLED
398 // FIXME: Move this check to the end of the compositing update. 399 // FIXME: Move this check to the end of the compositing update.
399 GraphicsLayerUpdater::assertNeedsToUpdateGraphicsLayerBitsCleared(*updat eRoot); 400 GraphicsLayerUpdater::assertNeedsToUpdateGraphicsLayerBitsCleared(*updat eRoot);
400 #endif 401 #endif
401 } 402 }
402 403
403 if (needHierarchyAndGeometryUpdate) { 404 if (needHierarchyAndGeometryUpdate) {
404 // Update the hierarchy of the compositing layers. 405 // Update the hierarchy of the compositing layers.
405 GraphicsLayerVector childList; 406 GraphicsLayerVector childList;
406 { 407 {
407 TRACE_EVENT0("blink_rendering", "GraphicsLayerUpdater::rebuildTree") ; 408 TRACE_EVENT0("blink_rendering", "GraphicsLayerTreeBuilder::rebuild") ;
408 GraphicsLayerUpdater().rebuildTree(*updateRoot, childList); 409 GraphicsLayerTreeBuilder().rebuild(*updateRoot, childList);
409 } 410 }
410 411
411 if (childList.isEmpty()) 412 if (childList.isEmpty())
412 destroyRootLayer(); 413 destroyRootLayer();
413 else 414 else
414 m_rootContentLayer->setChildren(childList); 415 m_rootContentLayer->setChildren(childList);
415 416
416 if (RuntimeEnabledFeatures::overlayFullscreenVideoEnabled()) 417 if (RuntimeEnabledFeatures::overlayFullscreenVideoEnabled())
417 applyOverlayFullscreenVideoAdjustment(); 418 applyOverlayFullscreenVideoAdjustment();
418 } 419 }
(...skipping 917 matching lines...) Expand 10 before | Expand all | Expand 10 after
1336 } else if (graphicsLayer == m_scrollLayer.get()) { 1337 } else if (graphicsLayer == m_scrollLayer.get()) {
1337 name = "LocalFrame Scrolling Layer"; 1338 name = "LocalFrame Scrolling Layer";
1338 } else { 1339 } else {
1339 ASSERT_NOT_REACHED(); 1340 ASSERT_NOT_REACHED();
1340 } 1341 }
1341 1342
1342 return name; 1343 return name;
1343 } 1344 }
1344 1345
1345 } // namespace WebCore 1346 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/compositing/GraphicsLayerUpdater.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698