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

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

Issue 307713002: Refactor repainting logic to abstract away the specific repaint container. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix. 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/RenderReplaced.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 604 matching lines...) Expand 10 before | Expand all | Expand 10 after
615 if (options == UseChickenEggHacks) 615 if (options == UseChickenEggHacks)
616 applyUpdateLayerCompositingStateChickenEggHacks(layer, compositedLayerUp date); 616 applyUpdateLayerCompositingStateChickenEggHacks(layer, compositedLayerUp date);
617 } 617 }
618 618
619 void RenderLayerCompositor::repaintOnCompositingChange(RenderLayer* layer) 619 void RenderLayerCompositor::repaintOnCompositingChange(RenderLayer* layer)
620 { 620 {
621 // If the renderer is not attached yet, no need to repaint. 621 // If the renderer is not attached yet, no need to repaint.
622 if (layer->renderer() != &m_renderView && !layer->renderer()->parent()) 622 if (layer->renderer() != &m_renderView && !layer->renderer()->parent())
623 return; 623 return;
624 624
625 const RenderLayerModelObject* repaintContainer = layer->renderer()->containe rForRepaint(); 625 layer->repainter().repaintIncludingNonCompositingDescendants();
626 ASSERT(repaintContainer);
627 layer->repainter().repaintIncludingNonCompositingDescendants(repaintContaine r);
628 } 626 }
629 627
630 // This method assumes that layout is up-to-date, unlike repaintOnCompositingCha nge(). 628 // This method assumes that layout is up-to-date, unlike repaintOnCompositingCha nge().
631 void RenderLayerCompositor::repaintInCompositedAncestor(RenderLayer* layer, cons t LayoutRect& rect) 629 void RenderLayerCompositor::repaintInCompositedAncestor(RenderLayer* layer, cons t LayoutRect& rect)
632 { 630 {
633 RenderLayer* compositedAncestor = layer->enclosingCompositingLayerForRepaint (ExcludeSelf); 631 RenderLayer* compositedAncestor = layer->enclosingCompositingLayerForRepaint (ExcludeSelf);
634 if (!compositedAncestor) 632 if (!compositedAncestor)
635 return; 633 return;
636 ASSERT(compositedAncestor->compositingState() == PaintsIntoOwnBacking || com positedAncestor->compositingState() == PaintsIntoGroupedBacking); 634 ASSERT(compositedAncestor->compositingState() == PaintsIntoOwnBacking || com positedAncestor->compositingState() == PaintsIntoGroupedBacking);
637 635
(...skipping 784 matching lines...) Expand 10 before | Expand all | Expand 10 after
1422 } else if (graphicsLayer == m_scrollLayer.get()) { 1420 } else if (graphicsLayer == m_scrollLayer.get()) {
1423 name = "LocalFrame Scrolling Layer"; 1421 name = "LocalFrame Scrolling Layer";
1424 } else { 1422 } else {
1425 ASSERT_NOT_REACHED(); 1423 ASSERT_NOT_REACHED();
1426 } 1424 }
1427 1425
1428 return name; 1426 return name;
1429 } 1427 }
1430 1428
1431 } // namespace WebCore 1429 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderReplaced.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698