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

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

Issue 2014483003: Rename OwnPtr::clear() to reset() in core/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2000 Dirk Mueller (mueller@kde.org) 3 * Copyright (C) 2000 Dirk Mueller (mueller@kde.org)
4 * Copyright (C) 2004, 2006, 2007 Apple Inc. All rights reserved. 4 * Copyright (C) 2004, 2006, 2007 Apple Inc. All rights reserved.
5 * Copyright (C) Research In Motion Limited 2011-2012. All rights reserved. 5 * Copyright (C) Research In Motion Limited 2011-2012. All rights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 ASSERT(needsLayout()); 84 ASSERT(needsLayout());
85 LayoutAnalyzer::Scope analyzer(*this); 85 LayoutAnalyzer::Scope analyzer(*this);
86 86
87 LayoutRect oldContentRect = replacedContentRect(); 87 LayoutRect oldContentRect = replacedContentRect();
88 88
89 setHeight(minimumReplacedHeight()); 89 setHeight(minimumReplacedHeight());
90 90
91 updateLogicalWidth(); 91 updateLogicalWidth();
92 updateLogicalHeight(); 92 updateLogicalHeight();
93 93
94 m_overflow.clear(); 94 m_overflow.reset();
95 addVisualEffectOverflow(); 95 addVisualEffectOverflow();
96 updateLayerTransformAfterLayout(); 96 updateLayerTransformAfterLayout();
97 invalidateBackgroundObscurationStatus(); 97 invalidateBackgroundObscurationStatus();
98 98
99 clearNeedsLayout(); 99 clearNeedsLayout();
100 100
101 if (!RuntimeEnabledFeatures::slimmingPaintV2Enabled() && replacedContentRect () != oldContentRect) 101 if (!RuntimeEnabledFeatures::slimmingPaintV2Enabled() && replacedContentRect () != oldContentRect)
102 setShouldDoFullPaintInvalidation(); 102 setShouldDoFullPaintInvalidation();
103 } 103 }
104 104
(...skipping 648 matching lines...) Expand 10 before | Expand all | Expand 10 after
753 } 753 }
754 754
755 void LayoutReplaced::IntrinsicSizingInfo::transpose() 755 void LayoutReplaced::IntrinsicSizingInfo::transpose()
756 { 756 {
757 size = size.transposedSize(); 757 size = size.transposedSize();
758 aspectRatio = aspectRatio.transposedSize(); 758 aspectRatio = aspectRatio.transposedSize();
759 std::swap(hasWidth, hasHeight); 759 std::swap(hasWidth, hasHeight);
760 } 760 }
761 761
762 } // namespace blink 762 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698