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

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

Issue 466193002: Disentangle blend mode from updateDescendantDependentFlags (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 4 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/RenderLayerCompositor.h ('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 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 if (!isLocalRoot) 277 if (!isLocalRoot)
278 return; 278 return;
279 279
280 m_rootContentLayer->removeAllChildren(); 280 m_rootContentLayer->removeAllChildren();
281 m_overflowControlsHostLayer->addChild(videoLayer); 281 m_overflowControlsHostLayer->addChild(videoLayer);
282 if (GraphicsLayer* backgroundLayer = fixedRootBackgroundLayer()) 282 if (GraphicsLayer* backgroundLayer = fixedRootBackgroundLayer())
283 backgroundLayer->removeFromParent(); 283 backgroundLayer->removeFromParent();
284 m_inOverlayFullscreenVideo = true; 284 m_inOverlayFullscreenVideo = true;
285 } 285 }
286 286
287 void RenderLayerCompositor::updateWithoutAcceleratedCompositing(CompositingUpdat eType updateType)
288 {
289 ASSERT(!hasAcceleratedCompositing());
290
291 if (updateType >= CompositingUpdateAfterCompositingInputChange)
292 CompositingInputsUpdater(rootRenderLayer()).update();
293
294 #if ENABLE(ASSERT)
295 CompositingInputsUpdater::assertNeedsCompositingInputsUpdateBitsCleared(root RenderLayer());
296 #endif
297 }
298
287 void RenderLayerCompositor::updateIfNeeded() 299 void RenderLayerCompositor::updateIfNeeded()
288 { 300 {
289 CompositingUpdateType updateType = m_pendingUpdateType; 301 CompositingUpdateType updateType = m_pendingUpdateType;
290 m_pendingUpdateType = CompositingUpdateNone; 302 m_pendingUpdateType = CompositingUpdateNone;
291 303
292 if (!hasAcceleratedCompositing() || updateType == CompositingUpdateNone) 304 if (!hasAcceleratedCompositing()) {
305 updateWithoutAcceleratedCompositing(updateType);
306 return;
307 }
308
309 if (updateType == CompositingUpdateNone)
293 return; 310 return;
294 311
295 RenderLayer* updateRoot = rootRenderLayer(); 312 RenderLayer* updateRoot = rootRenderLayer();
296 313
297 Vector<RenderLayer*> layersNeedingRepaint; 314 Vector<RenderLayer*> layersNeedingRepaint;
298 315
299 if (updateType >= CompositingUpdateAfterCompositingInputChange) { 316 if (updateType >= CompositingUpdateAfterCompositingInputChange) {
300 CompositingInputsUpdater(updateRoot).update(); 317 CompositingInputsUpdater(updateRoot).update();
301 318
302 #if ENABLE(ASSERT) 319 #if ENABLE(ASSERT)
(...skipping 846 matching lines...) Expand 10 before | Expand all | Expand 10 after
1149 } else if (graphicsLayer == m_scrollLayer.get()) { 1166 } else if (graphicsLayer == m_scrollLayer.get()) {
1150 name = "LocalFrame Scrolling Layer"; 1167 name = "LocalFrame Scrolling Layer";
1151 } else { 1168 } else {
1152 ASSERT_NOT_REACHED(); 1169 ASSERT_NOT_REACHED();
1153 } 1170 }
1154 1171
1155 return name; 1172 return name;
1156 } 1173 }
1157 1174
1158 } // namespace blink 1175 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/rendering/compositing/RenderLayerCompositor.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698