Chromium Code Reviews| Index: third_party/WebKit/Source/core/layout/LayoutObject.cpp |
| diff --git a/third_party/WebKit/Source/core/layout/LayoutObject.cpp b/third_party/WebKit/Source/core/layout/LayoutObject.cpp |
| index 86d1e889b5fd5bd972f422ba3ca92380bb70160f..0522d54aebe099a891451fea9f5644672f865535 100644 |
| --- a/third_party/WebKit/Source/core/layout/LayoutObject.cpp |
| +++ b/third_party/WebKit/Source/core/layout/LayoutObject.cpp |
| @@ -1563,6 +1563,14 @@ void LayoutObject::setNeedsOverflowRecalcAfterStyleChange() |
| markAncestorsForOverflowRecalcIfNeeded(); |
| } |
| +void LayoutObject::setStyleFromNodeOrElement(PassRefPtr<ComputedStyle> computedStyle) |
|
Bugs Nash
2016/09/16 01:45:04
method name should describe what it does, not wher
|
| +{ |
| + if (m_style->hasImage() || computedStyle->hasImage() || isImage() || isVideo()) |
| + setStyle(std::move(computedStyle)); |
| + else |
| + setStyleInternal(std::move(computedStyle)); |
| +} |
| + |
| DISABLE_CFI_PERF |
| void LayoutObject::setStyle(PassRefPtr<ComputedStyle> style) |
| { |