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

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

Issue 1060973003: compositor-worker: Force elements to grow a layer when a CompositorProxy is created. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: tot-merge Created 5 years, 8 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 | « Source/core/dom/StyleChangeReason.cpp ('k') | Source/core/layout/LayoutInline.h » ('j') | 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) 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 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 , m_maxPreferredLogicalWidth(-1) 105 , m_maxPreferredLogicalWidth(-1)
106 { 106 {
107 setIsBox(); 107 setIsBox();
108 } 108 }
109 109
110 DeprecatedPaintLayerType LayoutBox::layerTypeRequired() const 110 DeprecatedPaintLayerType LayoutBox::layerTypeRequired() const
111 { 111 {
112 // hasAutoZIndex only returns true if the element is positioned or a flex-it em since 112 // hasAutoZIndex only returns true if the element is positioned or a flex-it em since
113 // position:static elements that are not flex-items get their z-index coerce d to auto. 113 // position:static elements that are not flex-items get their z-index coerce d to auto.
114 if (isPositioned() || createsGroup() || hasClipPath() || hasTransformRelated Property() 114 if (isPositioned() || createsGroup() || hasClipPath() || hasTransformRelated Property()
115 || hasHiddenBackface() || hasReflection() || style()->specifiesColumns() 115 || style()->hasCompositorProxy() || hasHiddenBackface() || hasReflection () || style()->specifiesColumns()
116 || !style()->hasAutoZIndex() || style()->shouldCompositeForCurrentAnimat ions()) 116 || !style()->hasAutoZIndex() || style()->shouldCompositeForCurrentAnimat ions())
117 return NormalDeprecatedPaintLayer; 117 return NormalDeprecatedPaintLayer;
118 118
119 // Ensure that explicit use of scroll-blocks-on creates a Layer (since we mi ght need 119 // Ensure that explicit use of scroll-blocks-on creates a Layer (since we mi ght need
120 // it to be composited). 120 // it to be composited).
121 if (style()->hasScrollBlocksOn()) { 121 if (style()->hasScrollBlocksOn()) {
122 if (isDocumentElement()) { 122 if (isDocumentElement()) {
123 ASSERT(style()->scrollBlocksOn() == view()->style()->scrollBlocksOn( )); 123 ASSERT(style()->scrollBlocksOn() == view()->style()->scrollBlocksOn( ));
124 return NoDeprecatedPaintLayer; 124 return NoDeprecatedPaintLayer;
125 } 125 }
(...skipping 4518 matching lines...) Expand 10 before | Expand all | Expand 10 after
4644 computedValues.m_margins.m_end = marginEnd(); 4644 computedValues.m_margins.m_end = marginEnd();
4645 4645
4646 setLogicalTop(oldLogicalTop); 4646 setLogicalTop(oldLogicalTop);
4647 setLogicalWidth(oldLogicalWidth); 4647 setLogicalWidth(oldLogicalWidth);
4648 setLogicalLeft(oldLogicalLeft); 4648 setLogicalLeft(oldLogicalLeft);
4649 setMarginLeft(oldMarginLeft); 4649 setMarginLeft(oldMarginLeft);
4650 setMarginRight(oldMarginRight); 4650 setMarginRight(oldMarginRight);
4651 } 4651 }
4652 4652
4653 } // namespace blink 4653 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/dom/StyleChangeReason.cpp ('k') | Source/core/layout/LayoutInline.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698