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

Side by Side Diff: Source/core/rendering/CompositedLayerMapping.cpp

Issue 26110004: Defer the real work in updateCompositingLayers until it's really needed. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: few more fixes Created 7 years, 2 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 732 matching lines...) Expand 10 before | Expand all | Expand 10 after
743 m_scrollingContentsLayer->setOffsetFromRenderer(scrollingContentsOffset, GraphicsLayer::DontSetNeedsDisplay); 743 m_scrollingContentsLayer->setOffsetFromRenderer(scrollingContentsOffset, GraphicsLayer::DontSetNeedsDisplay);
744 744
745 if (m_foregroundLayer) { 745 if (m_foregroundLayer) {
746 if (m_foregroundLayer->size() != m_scrollingContentsLayer->size()) 746 if (m_foregroundLayer->size() != m_scrollingContentsLayer->size())
747 m_foregroundLayer->setSize(m_scrollingContentsLayer->size()); 747 m_foregroundLayer->setSize(m_scrollingContentsLayer->size());
748 m_foregroundLayer->setNeedsDisplay(); 748 m_foregroundLayer->setNeedsDisplay();
749 m_foregroundLayer->setOffsetFromRenderer(m_scrollingContentsLayer->o ffsetFromRenderer()); 749 m_foregroundLayer->setOffsetFromRenderer(m_scrollingContentsLayer->o ffsetFromRenderer());
750 } 750 }
751 } 751 }
752 752
753 m_owningLayer->positionOverflowControls();
Ian Vollick 2013/10/17 01:30:25 What's the reason for this change?
shawnsingh 2013/10/17 01:44:04 Because we defer computing compositing, we may not
754
753 // If this layer was created just for clipping or to apply perspective, it d oesn't need its own backing store. 755 // If this layer was created just for clipping or to apply perspective, it d oesn't need its own backing store.
754 setRequiresOwnBackingStore(compositor()->requiresOwnBackingStore(m_owningLay er, compAncestor)); 756 setRequiresOwnBackingStore(compositor()->requiresOwnBackingStore(m_owningLay er, compAncestor));
755 757
756 updateContentsRect(isSimpleContainer); 758 updateContentsRect(isSimpleContainer);
757 updateBackgroundColor(isSimpleContainer); 759 updateBackgroundColor(isSimpleContainer);
758 updateDrawsContent(isSimpleContainer); 760 updateDrawsContent(isSimpleContainer);
759 updateContentsOpaque(); 761 updateContentsOpaque();
760 updateAfterWidgetResize(); 762 updateAfterWidgetResize();
761 registerScrollingLayers(); 763 registerScrollingLayers();
762 764
(...skipping 1201 matching lines...) Expand 10 before | Expand all | Expand 10 after
1964 } else if (graphicsLayer == m_scrollingContentsLayer.get()) { 1966 } else if (graphicsLayer == m_scrollingContentsLayer.get()) {
1965 name = "Scrolling Contents Layer"; 1967 name = "Scrolling Contents Layer";
1966 } else { 1968 } else {
1967 ASSERT_NOT_REACHED(); 1969 ASSERT_NOT_REACHED();
1968 } 1970 }
1969 1971
1970 return name; 1972 return name;
1971 } 1973 }
1972 1974
1973 } // namespace WebCore 1975 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698