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

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

Issue 319203003: Change repaintRectIncludingDescendants to repaintRectIncludingNonCompositingDescendants. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Merged. 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/CompositedLayerMapping.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 437 matching lines...) Expand 10 before | Expand all | Expand 10 after
448 448
449 ASSERT(updateRoot || !compositingLayersNeedRebuild()); 449 ASSERT(updateRoot || !compositingLayersNeedRebuild());
450 450
451 // The scrolling coordinator may realize that it needs updating while compos iting was being updated in this function. 451 // The scrolling coordinator may realize that it needs updating while compos iting was being updated in this function.
452 needsToUpdateScrollingCoordinator |= scrollingCoordinator() && scrollingCoor dinator()->needsToUpdateAfterCompositingChange(); 452 needsToUpdateScrollingCoordinator |= scrollingCoordinator() && scrollingCoor dinator()->needsToUpdateAfterCompositingChange();
453 if (needsToUpdateScrollingCoordinator && m_renderView.frame()->isMainFrame() && scrollingCoordinator() && inCompositingMode()) 453 if (needsToUpdateScrollingCoordinator && m_renderView.frame()->isMainFrame() && scrollingCoordinator() && inCompositingMode())
454 scrollingCoordinator()->updateAfterCompositingChange(); 454 scrollingCoordinator()->updateAfterCompositingChange();
455 455
456 for (unsigned i = 0; i < layersNeedingRepaint.size(); i++) { 456 for (unsigned i = 0; i < layersNeedingRepaint.size(); i++) {
457 RenderLayer* layer = layersNeedingRepaint[i]; 457 RenderLayer* layer = layersNeedingRepaint[i];
458 layer->repainter().computeRepaintRectsIncludingDescendants(); 458 layer->repainter().computeRepaintRectsIncludingNonCompositingDescendants ();
459 459
460 repaintOnCompositingChange(layer); 460 repaintOnCompositingChange(layer);
461 } 461 }
462 462
463 // Inform the inspector that the layer tree has changed. 463 // Inform the inspector that the layer tree has changed.
464 if (m_renderView.frame()->isMainFrame()) 464 if (m_renderView.frame()->isMainFrame())
465 InspectorInstrumentation::layerTreeDidChange(m_renderView.frame()); 465 InspectorInstrumentation::layerTreeDidChange(m_renderView.frame());
466 } 466 }
467 467
468 bool RenderLayerCompositor::allocateOrClearCompositedLayerMapping(RenderLayer* l ayer, const CompositingStateTransitionType compositedLayerUpdate) 468 bool RenderLayerCompositor::allocateOrClearCompositedLayerMapping(RenderLayer* l ayer, const CompositingStateTransitionType compositedLayerUpdate)
(...skipping 891 matching lines...) Expand 10 before | Expand all | Expand 10 after
1360 } else if (graphicsLayer == m_scrollLayer.get()) { 1360 } else if (graphicsLayer == m_scrollLayer.get()) {
1361 name = "LocalFrame Scrolling Layer"; 1361 name = "LocalFrame Scrolling Layer";
1362 } else { 1362 } else {
1363 ASSERT_NOT_REACHED(); 1363 ASSERT_NOT_REACHED();
1364 } 1364 }
1365 1365
1366 return name; 1366 return name;
1367 } 1367 }
1368 1368
1369 } // namespace WebCore 1369 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/compositing/CompositedLayerMapping.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698