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

Side by Side Diff: Source/core/layout/compositing/DeprecatedPaintLayerCompositor.cpp

Issue 1109383002: [New Multicolumn] Never composite flow threads. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Never composite flow threads. Created 5 years, 7 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 | « LayoutTests/fast/multicol/nested-with-composited-and-multicol-crash-expected.txt ('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 734 matching lines...) Expand 10 before | Expand all | Expand 10 after
745 layer->setPotentialCompositingReasonsFromStyle(m_compositingReasonFinder.pot entialCompositingReasonsFromStyle(layer->layoutObject())); 745 layer->setPotentialCompositingReasonsFromStyle(m_compositingReasonFinder.pot entialCompositingReasonsFromStyle(layer->layoutObject()));
746 } 746 }
747 747
748 void DeprecatedPaintLayerCompositor::updateDirectCompositingReasons(DeprecatedPa intLayer* layer) 748 void DeprecatedPaintLayerCompositor::updateDirectCompositingReasons(DeprecatedPa intLayer* layer)
749 { 749 {
750 layer->setCompositingReasons(m_compositingReasonFinder.directReasons(layer), CompositingReasonComboAllDirectReasons); 750 layer->setCompositingReasons(m_compositingReasonFinder.directReasons(layer), CompositingReasonComboAllDirectReasons);
751 } 751 }
752 752
753 bool DeprecatedPaintLayerCompositor::canBeComposited(const DeprecatedPaintLayer* layer) const 753 bool DeprecatedPaintLayerCompositor::canBeComposited(const DeprecatedPaintLayer* layer) const
754 { 754 {
755 return m_hasAcceleratedCompositing && layer->isSelfPaintingLayer() && !layer ->subtreeIsInvisible(); 755 return m_hasAcceleratedCompositing && layer->isSelfPaintingLayer() && !layer ->subtreeIsInvisible() && !layer->layoutObject()->isLayoutFlowThread();
756 } 756 }
757 757
758 // Return true if the given layer is a stacking context and has compositing chil d 758 // Return true if the given layer is a stacking context and has compositing chil d
759 // layers that it needs to clip. In this case we insert a clipping GraphicsLayer 759 // layers that it needs to clip. In this case we insert a clipping GraphicsLayer
760 // into the hierarchy between this layer and its children in the z-order hierarc hy. 760 // into the hierarchy between this layer and its children in the z-order hierarc hy.
761 bool DeprecatedPaintLayerCompositor::clipsCompositingDescendants(const Deprecate dPaintLayer* layer) const 761 bool DeprecatedPaintLayerCompositor::clipsCompositingDescendants(const Deprecate dPaintLayer* layer) const
762 { 762 {
763 return layer->hasCompositingDescendant() && layer->layoutObject()->hasClipOr OverflowClip(); 763 return layer->hasCompositingDescendant() && layer->layoutObject()->hasClipOr OverflowClip();
764 } 764 }
765 765
(...skipping 413 matching lines...) Expand 10 before | Expand all | Expand 10 after
1179 } else if (graphicsLayer == m_scrollLayer.get()) { 1179 } else if (graphicsLayer == m_scrollLayer.get()) {
1180 name = "LocalFrame Scrolling Layer"; 1180 name = "LocalFrame Scrolling Layer";
1181 } else { 1181 } else {
1182 ASSERT_NOT_REACHED(); 1182 ASSERT_NOT_REACHED();
1183 } 1183 }
1184 1184
1185 return name; 1185 return name;
1186 } 1186 }
1187 1187
1188 } // namespace blink 1188 } // namespace blink
OLDNEW
« no previous file with comments | « LayoutTests/fast/multicol/nested-with-composited-and-multicol-crash-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698