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

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

Issue 2547053003: s/ passed(...) / WTF::passed(...) / to avoid future ambiguity w/ base::Passed. (Closed)
Patch Set: Rebasing... Created 4 years 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/LayoutBox.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutBox.cpp b/third_party/WebKit/Source/core/layout/LayoutBox.cpp
index 5435f01d1eced63d885011816c58de0d55287aaa..894f7d8e93f14ad42f8ad43f5a2f0513a35b4157 100644
--- a/third_party/WebKit/Source/core/layout/LayoutBox.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutBox.cpp
@@ -4900,8 +4900,10 @@ void LayoutBox::addLayoutOverflow(const LayoutRect& rect) {
return;
}
- if (!m_overflow)
- m_overflow = wrapUnique(new BoxOverflowModel(clientBox, borderBoxRect()));
+ if (!m_overflow) {
+ m_overflow =
+ WTF::wrapUnique(new BoxOverflowModel(clientBox, borderBoxRect()));
+ }
m_overflow->addLayoutOverflow(overflowRect);
}
@@ -4914,8 +4916,10 @@ void LayoutBox::addSelfVisualOverflow(const LayoutRect& rect) {
if (borderBox.contains(rect))
return;
- if (!m_overflow)
- m_overflow = wrapUnique(new BoxOverflowModel(noOverflowRect(), borderBox));
+ if (!m_overflow) {
+ m_overflow =
+ WTF::wrapUnique(new BoxOverflowModel(noOverflowRect(), borderBox));
+ }
m_overflow->addSelfVisualOverflow(rect);
}
@@ -4933,8 +4937,10 @@ void LayoutBox::addContentsVisualOverflow(const LayoutRect& rect) {
if (!hasOverflowClip() && borderBox.contains(rect))
return;
- if (!m_overflow)
- m_overflow = wrapUnique(new BoxOverflowModel(noOverflowRect(), borderBox));
+ if (!m_overflow) {
+ m_overflow =
+ WTF::wrapUnique(new BoxOverflowModel(noOverflowRect(), borderBox));
+ }
m_overflow->addContentsVisualOverflow(rect);
}
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutBox.h ('k') | third_party/WebKit/Source/core/layout/LayoutBoxModelObject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698