Chromium Code Reviews| Index: third_party/WebKit/Source/core/layout/ng/ng_units.h |
| diff --git a/third_party/WebKit/Source/core/layout/ng/ng_units.h b/third_party/WebKit/Source/core/layout/ng/ng_units.h |
| index ea2eec5c9f5680784eff244879edfede6d29768c..635e908238255c4f32d9dc9b30ea6f5e685b0be7 100644 |
| --- a/third_party/WebKit/Source/core/layout/ng/ng_units.h |
| +++ b/third_party/WebKit/Source/core/layout/ng/ng_units.h |
| @@ -99,6 +99,8 @@ struct NGPhysicalOffset { |
| NGPhysicalOffset operator+(const NGPhysicalOffset& other) const; |
| NGPhysicalOffset& operator+=(const NGPhysicalOffset& other); |
| + NGPhysicalOffset operator-(const NGPhysicalOffset& other) const; |
| + NGPhysicalOffset& operator-=(const NGPhysicalOffset& other); |
| }; |
| struct NGPhysicalSize { |
| @@ -304,7 +306,6 @@ struct CORE_EXPORT NGStaticPosition { |
| static NGStaticPosition Create(NGWritingMode, |
| TextDirection, |
| NGPhysicalOffset); |
| - |
|
cbiesinger
2016/12/21 21:38:50
Why did you delete this line?
atotic
2016/12/28 19:36:46
done. Probably a merge conflict artifact.
|
| // Left/Right/TopPosition functions map static position to |
| // left/right/top edge wrt container space. |
| // The function arguments are required to solve the equation: |