diff options
| author | Steve Block <steveblock@google.com> | 2010-02-02 14:57:50 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-04 15:06:55 +0000 |
| commit | d0825bca7fe65beaee391d30da42e937db621564 (patch) | |
| tree | 7461c49eb5844ffd1f35d1ba2c8b7584c1620823 /WebCore/rendering/style/StyleInheritedData.cpp | |
| parent | 3db770bd97c5a59b6c7574ca80a39e5a51c1defd (diff) | |
| download | external_webkit-d0825bca7fe65beaee391d30da42e937db621564.zip external_webkit-d0825bca7fe65beaee391d30da42e937db621564.tar.gz external_webkit-d0825bca7fe65beaee391d30da42e937db621564.tar.bz2 | |
Merge webkit.org at r54127 : Initial merge by git
Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
Diffstat (limited to 'WebCore/rendering/style/StyleInheritedData.cpp')
| -rw-r--r-- | WebCore/rendering/style/StyleInheritedData.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/WebCore/rendering/style/StyleInheritedData.cpp b/WebCore/rendering/style/StyleInheritedData.cpp index f59c0c2..c73497f 100644 --- a/WebCore/rendering/style/StyleInheritedData.cpp +++ b/WebCore/rendering/style/StyleInheritedData.cpp @@ -37,7 +37,6 @@ StyleInheritedData::StyleInheritedData() , vertical_border_spacing(RenderStyle::initialVerticalBorderSpacing()) , widows(RenderStyle::initialWidows()) , orphans(RenderStyle::initialOrphans()) - , page_break_inside(RenderStyle::initialPageBreak()) { } @@ -58,7 +57,6 @@ StyleInheritedData::StyleInheritedData(const StyleInheritedData& o) , vertical_border_spacing(o.vertical_border_spacing) , widows(o.widows) , orphans(o.orphans) - , page_break_inside(o.page_break_inside) { } @@ -84,8 +82,7 @@ bool StyleInheritedData::operator==(const StyleInheritedData& o) const horizontal_border_spacing == o.horizontal_border_spacing && vertical_border_spacing == o.vertical_border_spacing && widows == o.widows && - orphans == o.orphans && - page_break_inside == o.page_break_inside; + orphans == o.orphans; } } // namespace WebCore |