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

Side by Side Diff: third_party/WebKit/Source/core/style/StyleSurroundData.cpp

Issue 2824973002: Split StyleSurroundData::margin into four individual Lengths. (Closed)
Patch Set: Rebase Created 3 years, 8 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 Antti Koivisto (koivisto@kde.org) 2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 * Library General Public License for more details. 13 * Library General Public License for more details.
14 * 14 *
15 * You should have received a copy of the GNU Library General Public License 15 * You should have received a copy of the GNU Library General Public License
16 * along with this library; see the file COPYING.LIB. If not, write to 16 * along with this library; see the file COPYING.LIB. If not, write to
17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
18 * Boston, MA 02110-1301, USA. 18 * Boston, MA 02110-1301, USA.
19 * 19 *
20 */ 20 */
21 21
22 #include "core/style/StyleSurroundData.h" 22 #include "core/style/StyleSurroundData.h"
23 23
24 namespace blink { 24 namespace blink {
25 25
26 StyleSurroundData::StyleSurroundData() : margin_(kFixed), padding_(kFixed) {} 26 StyleSurroundData::StyleSurroundData()
27 : margin_left_(kFixed),
28 margin_right_(kFixed),
29 margin_top_(kFixed),
30 margin_bottom_(kFixed),
31 padding_(kFixed) {}
27 32
28 StyleSurroundData::StyleSurroundData(const StyleSurroundData& o) 33 StyleSurroundData::StyleSurroundData(const StyleSurroundData& o)
29 : RefCounted<StyleSurroundData>(), 34 : RefCounted<StyleSurroundData>(),
30 left_(o.left_), 35 left_(o.left_),
31 right_(o.right_), 36 right_(o.right_),
32 top_(o.top_), 37 top_(o.top_),
33 bottom_(o.bottom_), 38 bottom_(o.bottom_),
34 margin_(o.margin_), 39 margin_left_(o.margin_left_),
40 margin_right_(o.margin_right_),
41 margin_top_(o.margin_top_),
42 margin_bottom_(o.margin_bottom_),
35 padding_(o.padding_), 43 padding_(o.padding_),
36 border_(o.border_) {} 44 border_(o.border_) {}
37 45
38 bool StyleSurroundData::operator==(const StyleSurroundData& o) const { 46 bool StyleSurroundData::operator==(const StyleSurroundData& o) const {
39 return left_ == o.left_ && right_ == o.right_ && top_ == o.top_ && 47 return (left_ == o.left_ && right_ == o.right_ && top_ == o.top_ &&
40 bottom_ == o.bottom_ && margin_ == o.margin_ && 48 bottom_ == o.bottom_) &&
49 (margin_left_ == o.margin_left_ && margin_right_ == o.margin_right_ &&
50 margin_top_ == o.margin_top_ && margin_bottom_ == o.margin_bottom_) &&
41 padding_ == o.padding_ && border_ == o.border_; 51 padding_ == o.padding_ && border_ == o.border_;
42 } 52 }
43 53
44 } // namespace blink 54 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/style/StyleSurroundData.h ('k') | third_party/WebKit/Source/platform/LengthBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698