diff options
| author | Steve Block <steveblock@google.com> | 2009-12-17 10:00:51 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-17 10:00:51 -0800 |
| commit | bc0688665b65cce4fec4a58f289e8fbac55af976 (patch) | |
| tree | 36882563e661afd21008ad31d761f1e5a170f9eb /WebCore/rendering/style/StyleRareInheritedData.cpp | |
| parent | 9443700060dfd3b488a3bdf30cfa547135478a7f (diff) | |
| parent | b880d713c04257ca40abfef97c300afdead423b8 (diff) | |
| download | external_webkit-bc0688665b65cce4fec4a58f289e8fbac55af976.zip external_webkit-bc0688665b65cce4fec4a58f289e8fbac55af976.tar.gz external_webkit-bc0688665b65cce4fec4a58f289e8fbac55af976.tar.bz2 | |
am b880d713: am 643ca787: Merge webkit.org at r51976 : Initial merge by git.
Merge commit 'b880d713c04257ca40abfef97c300afdead423b8'
* commit 'b880d713c04257ca40abfef97c300afdead423b8':
Merge webkit.org at r51976 : Initial merge by git.
Diffstat (limited to 'WebCore/rendering/style/StyleRareInheritedData.cpp')
| -rw-r--r-- | WebCore/rendering/style/StyleRareInheritedData.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/WebCore/rendering/style/StyleRareInheritedData.cpp b/WebCore/rendering/style/StyleRareInheritedData.cpp index 0f3b7e7..ff626b7 100644 --- a/WebCore/rendering/style/StyleRareInheritedData.cpp +++ b/WebCore/rendering/style/StyleRareInheritedData.cpp @@ -42,6 +42,7 @@ StyleRareInheritedData::StyleRareInheritedData() , textSizeAdjust(RenderStyle::initialTextSizeAdjust()) , resize(RenderStyle::initialResize()) , userSelect(RenderStyle::initialUserSelect()) + , colorSpace(DeviceColorSpace) { } @@ -64,6 +65,7 @@ StyleRareInheritedData::StyleRareInheritedData(const StyleRareInheritedData& o) , textSizeAdjust(o.textSizeAdjust) , resize(o.resize) , userSelect(o.userSelect) + , colorSpace(o.colorSpace) { } @@ -90,7 +92,8 @@ bool StyleRareInheritedData::operator==(const StyleRareInheritedData& o) const && tapHighlightColor == o.tapHighlightColor #endif && resize == o.resize - && userSelect == o.userSelect; + && userSelect == o.userSelect + && colorSpace == o.colorSpace; } bool StyleRareInheritedData::shadowDataEquivalent(const StyleRareInheritedData& o) const |