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

Unified Diff: third_party/WebKit/Source/core/layout/LayoutTextControl.cpp

Issue 2701993002: DO NOT COMMIT: Results of running new (proposed) clang-format on Blink (Closed)
Patch Set: Created 3 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/layout/LayoutTextControl.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutTextControl.cpp b/third_party/WebKit/Source/core/layout/LayoutTextControl.cpp
index 405ec8ed26bcb40a429935678af58618593c03ba..1a9705ff93d8083cf897f6998ffd544a9ddb025c 100644
--- a/third_party/WebKit/Source/core/layout/LayoutTextControl.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutTextControl.cpp
@@ -287,21 +287,25 @@ void LayoutTextControl::computePreferredLogicalWidths() {
if (styleToUse.logicalMinWidth().isFixed() &&
styleToUse.logicalMinWidth().value() > 0) {
- m_maxPreferredLogicalWidth = std::max(
- m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(
- styleToUse.logicalMinWidth().value()));
- m_minPreferredLogicalWidth = std::max(
- m_minPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(
- styleToUse.logicalMinWidth().value()));
+ m_maxPreferredLogicalWidth =
+ std::max(m_maxPreferredLogicalWidth,
+ adjustContentBoxLogicalWidthForBoxSizing(
+ styleToUse.logicalMinWidth().value()));
+ m_minPreferredLogicalWidth =
+ std::max(m_minPreferredLogicalWidth,
+ adjustContentBoxLogicalWidthForBoxSizing(
+ styleToUse.logicalMinWidth().value()));
}
if (styleToUse.logicalMaxWidth().isFixed()) {
- m_maxPreferredLogicalWidth = std::min(
- m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(
- styleToUse.logicalMaxWidth().value()));
- m_minPreferredLogicalWidth = std::min(
- m_minPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(
- styleToUse.logicalMaxWidth().value()));
+ m_maxPreferredLogicalWidth =
+ std::min(m_maxPreferredLogicalWidth,
+ adjustContentBoxLogicalWidthForBoxSizing(
+ styleToUse.logicalMaxWidth().value()));
+ m_minPreferredLogicalWidth =
+ std::min(m_minPreferredLogicalWidth,
+ adjustContentBoxLogicalWidthForBoxSizing(
+ styleToUse.logicalMaxWidth().value()));
}
LayoutUnit toAdd = borderAndPaddingLogicalWidth();
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutTableSection.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutTextTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698