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

Side by Side Diff: third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp

Issue 2618323004: Don't force-update style and layout in Document::scrollingElement (Closed)
Patch Set: none Created 3 years, 11 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
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 2064 matching lines...) Expand 10 before | Expand all | Expand 10 after
2075 void CompositedLayerMapping::updateElementIdAndCompositorMutableProperties() { 2075 void CompositedLayerMapping::updateElementIdAndCompositorMutableProperties() {
2076 int elementId = 0; 2076 int elementId = 0;
2077 uint32_t primaryMutableProperties = CompositorMutableProperty::kNone; 2077 uint32_t primaryMutableProperties = CompositorMutableProperty::kNone;
2078 uint32_t scrollMutableProperties = CompositorMutableProperty::kNone; 2078 uint32_t scrollMutableProperties = CompositorMutableProperty::kNone;
2079 2079
2080 Node* owningNode = m_owningLayer.layoutObject()->node(); 2080 Node* owningNode = m_owningLayer.layoutObject()->node();
2081 Element* animatingElement = nullptr; 2081 Element* animatingElement = nullptr;
2082 const ComputedStyle* animatingStyle = nullptr; 2082 const ComputedStyle* animatingStyle = nullptr;
2083 if (owningNode) { 2083 if (owningNode) {
2084 Document& document = owningNode->document(); 2084 Document& document = owningNode->document();
2085 Element* scrollingElement = document.scrollingElement(); 2085 Element* scrollingElement = document.scrollingElementNoLayout();
2086 if (owningNode->isElementNode() && 2086 if (owningNode->isElementNode() &&
2087 (!RuntimeEnabledFeatures::rootLayerScrollingEnabled() || 2087 (!RuntimeEnabledFeatures::rootLayerScrollingEnabled() ||
2088 owningNode != scrollingElement)) { 2088 owningNode != scrollingElement)) {
2089 animatingElement = toElement(owningNode); 2089 animatingElement = toElement(owningNode);
2090 animatingStyle = m_owningLayer.layoutObject()->style(); 2090 animatingStyle = m_owningLayer.layoutObject()->style();
2091 } else if (owningNode->isDocumentNode() && 2091 } else if (owningNode->isDocumentNode() &&
2092 RuntimeEnabledFeatures::rootLayerScrollingEnabled()) { 2092 RuntimeEnabledFeatures::rootLayerScrollingEnabled()) {
2093 owningNode = animatingElement = scrollingElement; 2093 owningNode = animatingElement = scrollingElement;
2094 if (scrollingElement && scrollingElement->layoutObject()) 2094 if (scrollingElement && scrollingElement->layoutObject())
2095 animatingStyle = scrollingElement->layoutObject()->style(); 2095 animatingStyle = scrollingElement->layoutObject()->style();
(...skipping 1348 matching lines...) Expand 10 before | Expand all | Expand 10 after
3444 } else if (graphicsLayer == m_decorationOutlineLayer.get()) { 3444 } else if (graphicsLayer == m_decorationOutlineLayer.get()) {
3445 name = "Decoration Layer"; 3445 name = "Decoration Layer";
3446 } else { 3446 } else {
3447 ASSERT_NOT_REACHED(); 3447 ASSERT_NOT_REACHED();
3448 } 3448 }
3449 3449
3450 return name; 3450 return name;
3451 } 3451 }
3452 3452
3453 } // namespace blink 3453 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698