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

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

Issue 235933002: Defer updateCompositingRequirementsState until the compositing update (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 8 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 326 matching lines...) Expand 10 before | Expand all | Expand 10 after
337 bool RenderLayerCompositor::hasUnresolvedDirtyBits() 337 bool RenderLayerCompositor::hasUnresolvedDirtyBits()
338 { 338 {
339 return m_needsToRecomputeCompositingRequirements || m_compositingLayersNeedR ebuild || m_needsUpdateCompositingRequirementsState || m_pendingUpdateType > Com positingUpdateNone; 339 return m_needsToRecomputeCompositingRequirements || m_compositingLayersNeedR ebuild || m_needsUpdateCompositingRequirementsState || m_pendingUpdateType > Com positingUpdateNone;
340 } 340 }
341 341
342 void RenderLayerCompositor::updateIfNeeded() 342 void RenderLayerCompositor::updateIfNeeded()
343 { 343 {
344 if (m_forceCompositingMode && !m_compositing) 344 if (m_forceCompositingMode && !m_compositing)
345 enableCompositingMode(true); 345 enableCompositingMode(true);
346 346
347 updateCompositingRequirementsState();
348
347 if (!m_needsToRecomputeCompositingRequirements && !m_compositing) 349 if (!m_needsToRecomputeCompositingRequirements && !m_compositing)
348 return; 350 return;
349 351
350 CompositingUpdateType updateType = m_pendingUpdateType; 352 CompositingUpdateType updateType = m_pendingUpdateType;
351 353
352 bool needCompositingRequirementsUpdate = m_needsToRecomputeCompositingRequir ements; 354 bool needCompositingRequirementsUpdate = m_needsToRecomputeCompositingRequir ements;
353 bool needHierarchyAndGeometryUpdate = m_compositingLayersNeedRebuild; 355 bool needHierarchyAndGeometryUpdate = m_compositingLayersNeedRebuild;
354 bool needsToUpdateScrollingCoordinator = scrollingCoordinator() ? scrollingC oordinator()->needsToUpdateAfterCompositingChange() : false; 356 bool needsToUpdateScrollingCoordinator = scrollingCoordinator() ? scrollingC oordinator()->needsToUpdateAfterCompositingChange() : false;
355 357
356 if (updateType == CompositingUpdateNone && !needCompositingRequirementsUpdat e && !needHierarchyAndGeometryUpdate && !needsToUpdateScrollingCoordinator) 358 if (updateType == CompositingUpdateNone && !needCompositingRequirementsUpdat e && !needHierarchyAndGeometryUpdate && !needsToUpdateScrollingCoordinator)
(...skipping 1341 matching lines...) Expand 10 before | Expand all | Expand 10 after
1698 } else if (graphicsLayer == m_scrollLayer.get()) { 1700 } else if (graphicsLayer == m_scrollLayer.get()) {
1699 name = "LocalFrame Scrolling Layer"; 1701 name = "LocalFrame Scrolling Layer";
1700 } else { 1702 } else {
1701 ASSERT_NOT_REACHED(); 1703 ASSERT_NOT_REACHED();
1702 } 1704 }
1703 1705
1704 return name; 1706 return name;
1705 } 1707 }
1706 1708
1707 } // namespace WebCore 1709 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698