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

Side by Side Diff: Source/core/rendering/compositing/CompositedLayerMapping.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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009, 2010, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2009, 2010, 2011 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 1830 matching lines...) Expand 10 before | Expand all | Expand 10 after
1841 if (paintsIntoCompositedAncestor() != previousPaintsIntoCompositedAncestor) 1841 if (paintsIntoCompositedAncestor() != previousPaintsIntoCompositedAncestor)
1842 paintsIntoCompositedAncestorChanged(); 1842 paintsIntoCompositedAncestorChanged();
1843 return m_requiresOwnBackingStoreForIntrinsicReasons != previousRequiresOwnBa ckingStoreForIntrinsicReasons; 1843 return m_requiresOwnBackingStoreForIntrinsicReasons != previousRequiresOwnBa ckingStoreForIntrinsicReasons;
1844 } 1844 }
1845 1845
1846 void CompositedLayerMapping::paintsIntoCompositedAncestorChanged() 1846 void CompositedLayerMapping::paintsIntoCompositedAncestorChanged()
1847 { 1847 {
1848 // The answer to paintsIntoCompositedAncestor() affects cached clip rects, s o when 1848 // The answer to paintsIntoCompositedAncestor() affects cached clip rects, s o when
1849 // it changes we have to clear clip rects on descendants. 1849 // it changes we have to clear clip rects on descendants.
1850 m_owningLayer.clipper().clearClipRectsIncludingDescendants(PaintingClipRects ); 1850 m_owningLayer.clipper().clearClipRectsIncludingDescendants(PaintingClipRects );
1851 m_owningLayer.repainter().computeRepaintRectsIncludingDescendants(); 1851 m_owningLayer.repainter().computeRepaintRectsIncludingNonCompositingDescenda nts();
1852 1852
1853 compositor()->repaintInCompositedAncestor(&m_owningLayer, compositedBounds() ); 1853 compositor()->repaintInCompositedAncestor(&m_owningLayer, compositedBounds() );
1854 } 1854 }
1855 1855
1856 void CompositedLayerMapping::setBlendMode(blink::WebBlendMode blendMode) 1856 void CompositedLayerMapping::setBlendMode(blink::WebBlendMode blendMode)
1857 { 1857 {
1858 if (m_ancestorClippingLayer) { 1858 if (m_ancestorClippingLayer) {
1859 m_ancestorClippingLayer->setBlendMode(blendMode); 1859 m_ancestorClippingLayer->setBlendMode(blendMode);
1860 m_graphicsLayer->setBlendMode(blink::WebBlendModeNormal); 1860 m_graphicsLayer->setBlendMode(blink::WebBlendModeNormal);
1861 } else { 1861 } else {
(...skipping 393 matching lines...) Expand 10 before | Expand all | Expand 10 after
2255 } else if (graphicsLayer == m_scrollingContentsLayer.get()) { 2255 } else if (graphicsLayer == m_scrollingContentsLayer.get()) {
2256 name = "Scrolling Contents Layer"; 2256 name = "Scrolling Contents Layer";
2257 } else { 2257 } else {
2258 ASSERT_NOT_REACHED(); 2258 ASSERT_NOT_REACHED();
2259 } 2259 }
2260 2260
2261 return name; 2261 return name;
2262 } 2262 }
2263 2263
2264 } // namespace WebCore 2264 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderLayerRepainter.cpp ('k') | Source/core/rendering/compositing/RenderLayerCompositor.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698