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

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

Issue 210093005: Remove histogram from GraphicsLayerUpdater::rebuildTree (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fewer private fields 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
« 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 517 matching lines...) Expand 10 before | Expand all | Expand 10 after
528 528
529 if (layersChanged) 529 if (layersChanged)
530 needHierarchyAndGeometryUpdate = true; 530 needHierarchyAndGeometryUpdate = true;
531 } 531 }
532 532
533 if (needHierarchyAndGeometryUpdate) { 533 if (needHierarchyAndGeometryUpdate) {
534 // Update the hierarchy of the compositing layers. 534 // Update the hierarchy of the compositing layers.
535 GraphicsLayerVector childList; 535 GraphicsLayerVector childList;
536 { 536 {
537 TRACE_EVENT0("blink_rendering", "GraphicsLayerUpdater::rebuildTree") ; 537 TRACE_EVENT0("blink_rendering", "GraphicsLayerUpdater::rebuildTree") ;
538 GraphicsLayerUpdater(m_renderView).rebuildTree(*updateRoot, updateTy pe, childList, 0); 538 GraphicsLayerUpdater().rebuildTree(*updateRoot, updateType, childLis t);
539 } 539 }
540 540
541 // Host the document layer in the RenderView's root layer. 541 // Host the document layer in the RenderView's root layer.
542 if (RuntimeEnabledFeatures::overlayFullscreenVideoEnabled() && isMainFra me()) { 542 if (RuntimeEnabledFeatures::overlayFullscreenVideoEnabled() && isMainFra me()) {
543 RenderVideo* video = findFullscreenVideoRenderer(m_renderView.docume nt()); 543 RenderVideo* video = findFullscreenVideoRenderer(m_renderView.docume nt());
544 if (video && video->hasCompositedLayerMapping()) { 544 if (video && video->hasCompositedLayerMapping()) {
545 childList.clear(); 545 childList.clear();
546 childList.append(video->compositedLayerMapping()->mainGraphicsLa yer()); 546 childList.append(video->compositedLayerMapping()->mainGraphicsLa yer());
547 } 547 }
548 } 548 }
549 549
550 if (childList.isEmpty()) 550 if (childList.isEmpty())
551 destroyRootLayer(); 551 destroyRootLayer();
552 else 552 else
553 m_rootContentLayer->setChildren(childList); 553 m_rootContentLayer->setChildren(childList);
554 } else if (needGeometryUpdate) { 554 } else if (needGeometryUpdate) {
555 // We just need to do a geometry update. This is only used for position: fixed scrolling; 555 // We just need to do a geometry update. This is only used for position: fixed scrolling;
556 // most of the time, geometry is updated via RenderLayer::styleChanged() . 556 // most of the time, geometry is updated via RenderLayer::styleChanged() .
557 TRACE_EVENT0("blink_rendering", "GraphicsLayerUpdater::updateRecursive") ; 557 TRACE_EVENT0("blink_rendering", "GraphicsLayerUpdater::updateRecursive") ;
558 GraphicsLayerUpdater(m_renderView).updateRecursive(*updateRoot, updateTy pe); 558 GraphicsLayerUpdater().updateRecursive(*updateRoot, updateType);
559 } 559 }
560 560
561 ASSERT(updateRoot || !m_compositingLayersNeedRebuild); 561 ASSERT(updateRoot || !m_compositingLayersNeedRebuild);
562 562
563 if (!hasAcceleratedCompositing()) 563 if (!hasAcceleratedCompositing())
564 enableCompositingMode(false); 564 enableCompositingMode(false);
565 565
566 // The scrolling coordinator may realize that it needs updating while compos iting was being updated in this function. 566 // The scrolling coordinator may realize that it needs updating while compos iting was being updated in this function.
567 needsToUpdateScrollingCoordinator |= scrollingCoordinator() ? scrollingCoord inator()->needsToUpdateAfterCompositingChange() : false; 567 needsToUpdateScrollingCoordinator |= scrollingCoordinator() ? scrollingCoord inator()->needsToUpdateAfterCompositingChange() : false;
568 if (needsToUpdateScrollingCoordinator && isMainFrame() && scrollingCoordinat or() && inCompositingMode()) 568 if (needsToUpdateScrollingCoordinator && isMainFrame() && scrollingCoordinat or() && inCompositingMode())
(...skipping 1627 matching lines...) Expand 10 before | Expand all | Expand 10 after
2196 } else if (graphicsLayer == m_scrollLayer.get()) { 2196 } else if (graphicsLayer == m_scrollLayer.get()) {
2197 name = "LocalFrame Scrolling Layer"; 2197 name = "LocalFrame Scrolling Layer";
2198 } else { 2198 } else {
2199 ASSERT_NOT_REACHED(); 2199 ASSERT_NOT_REACHED();
2200 } 2200 }
2201 2201
2202 return name; 2202 return name;
2203 } 2203 }
2204 2204
2205 } // namespace WebCore 2205 } // 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