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

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

Issue 46163008: Revert "Re-land deferred compositing updates with fixed assumptions" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 1 month 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 740 matching lines...) Expand 10 before | Expand all | Expand 10 after
751 m_scrollingContentsLayer->setOffsetFromRenderer(scrollingContentsOffset, GraphicsLayer::DontSetNeedsDisplay); 751 m_scrollingContentsLayer->setOffsetFromRenderer(scrollingContentsOffset, GraphicsLayer::DontSetNeedsDisplay);
752 752
753 if (m_foregroundLayer) { 753 if (m_foregroundLayer) {
754 if (m_foregroundLayer->size() != m_scrollingContentsLayer->size()) 754 if (m_foregroundLayer->size() != m_scrollingContentsLayer->size())
755 m_foregroundLayer->setSize(m_scrollingContentsLayer->size()); 755 m_foregroundLayer->setSize(m_scrollingContentsLayer->size());
756 m_foregroundLayer->setNeedsDisplay(); 756 m_foregroundLayer->setNeedsDisplay();
757 m_foregroundLayer->setOffsetFromRenderer(m_scrollingContentsLayer->o ffsetFromRenderer()); 757 m_foregroundLayer->setOffsetFromRenderer(m_scrollingContentsLayer->o ffsetFromRenderer());
758 } 758 }
759 } 759 }
760 760
761 if (m_owningLayer->scrollableArea())
762 m_owningLayer->scrollableArea()->positionOverflowControls();
763
764 // If this layer was created just for clipping or to apply perspective, it d oesn't need its own backing store. 761 // If this layer was created just for clipping or to apply perspective, it d oesn't need its own backing store.
765 setRequiresOwnBackingStore(compositor()->requiresOwnBackingStore(m_owningLay er, compAncestor)); 762 setRequiresOwnBackingStore(compositor()->requiresOwnBackingStore(m_owningLay er, compAncestor));
766 763
767 updateContentsRect(isSimpleContainer); 764 updateContentsRect(isSimpleContainer);
768 updateBackgroundColor(isSimpleContainer); 765 updateBackgroundColor(isSimpleContainer);
769 updateDrawsContent(isSimpleContainer); 766 updateDrawsContent(isSimpleContainer);
770 updateContentsOpaque(); 767 updateContentsOpaque();
771 updateAfterWidgetResize(); 768 updateAfterWidgetResize();
772 registerScrollingLayers(); 769 registerScrollingLayers();
773 770
(...skipping 1223 matching lines...) Expand 10 before | Expand all | Expand 10 after
1997 } else if (graphicsLayer == m_scrollingContentsLayer.get()) { 1994 } else if (graphicsLayer == m_scrollingContentsLayer.get()) {
1998 name = "Scrolling Contents Layer"; 1995 name = "Scrolling Contents Layer";
1999 } else { 1996 } else {
2000 ASSERT_NOT_REACHED(); 1997 ASSERT_NOT_REACHED();
2001 } 1998 }
2002 1999
2003 return name; 2000 return name;
2004 } 2001 }
2005 2002
2006 } // namespace WebCore 2003 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/page/scrolling/ScrollingCoordinator.cpp ('k') | Source/core/rendering/RenderGeometryMap.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698