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

Side by Side Diff: Source/core/layout/LayoutBox.cpp

Issue 1287623002: Delete blink code for scroll-blocks-on (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Merge with trunk (no changes from previous patch) Created 5 years, 4 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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) 4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed. 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed.
7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. 7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 100
101 DeprecatedPaintLayerType LayoutBox::layerTypeRequired() const 101 DeprecatedPaintLayerType LayoutBox::layerTypeRequired() const
102 { 102 {
103 // hasAutoZIndex only returns true if the element is positioned or a flex-it em since 103 // hasAutoZIndex only returns true if the element is positioned or a flex-it em since
104 // position:static elements that are not flex-items get their z-index coerce d to auto. 104 // position:static elements that are not flex-items get their z-index coerce d to auto.
105 if (isPositioned() || createsGroup() || hasClipPath() || hasTransformRelated Property() 105 if (isPositioned() || createsGroup() || hasClipPath() || hasTransformRelated Property()
106 || style()->hasCompositorProxy() || hasHiddenBackface() || hasReflection () || style()->specifiesColumns() 106 || style()->hasCompositorProxy() || hasHiddenBackface() || hasReflection () || style()->specifiesColumns()
107 || !style()->hasAutoZIndex() || style()->shouldCompositeForCurrentAnimat ions()) 107 || !style()->hasAutoZIndex() || style()->shouldCompositeForCurrentAnimat ions())
108 return NormalDeprecatedPaintLayer; 108 return NormalDeprecatedPaintLayer;
109 109
110 // Ensure that explicit use of scroll-blocks-on creates a Layer (since we mi ght need
111 // it to be composited).
112 if (style()->hasScrollBlocksOn()) {
113 if (isDocumentElement()) {
114 ASSERT(style()->scrollBlocksOn() == view()->style()->scrollBlocksOn( ));
115 return NoDeprecatedPaintLayer;
116 }
117 return NormalDeprecatedPaintLayer;
118 }
119 if (hasOverflowClip()) 110 if (hasOverflowClip())
120 return OverflowClipDeprecatedPaintLayer; 111 return OverflowClipDeprecatedPaintLayer;
121 112
122 return NoDeprecatedPaintLayer; 113 return NoDeprecatedPaintLayer;
123 } 114 }
124 115
125 void LayoutBox::willBeDestroyed() 116 void LayoutBox::willBeDestroyed()
126 { 117 {
127 clearOverrideSize(); 118 clearOverrideSize();
128 clearContainingBlockOverrideSize(); 119 clearContainingBlockOverrideSize();
(...skipping 4613 matching lines...) Expand 10 before | Expand all | Expand 10 after
4742 StyleImage* borderImage = style()->borderImage().image(); 4733 StyleImage* borderImage = style()->borderImage().image();
4743 return borderImage && borderImage->canRender(*this, style()->effectiveZoom() ) && borderImage->isLoaded(); 4734 return borderImage && borderImage->canRender(*this, style()->effectiveZoom() ) && borderImage->isLoaded();
4744 } 4735 }
4745 4736
4746 ShapeOutsideInfo* LayoutBox::shapeOutsideInfo() const 4737 ShapeOutsideInfo* LayoutBox::shapeOutsideInfo() const
4747 { 4738 {
4748 return ShapeOutsideInfo::isEnabledFor(*this) ? ShapeOutsideInfo::info(*this) : nullptr; 4739 return ShapeOutsideInfo::isEnabledFor(*this) ? ShapeOutsideInfo::info(*this) : nullptr;
4749 } 4740 }
4750 4741
4751 } // namespace blink 4742 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/frame/UseCounter.cpp ('k') | Source/core/layout/compositing/CompositedDeprecatedPaintLayerMapping.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698