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/StyleRareNonInheritedData.h | |
| 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/StyleRareNonInheritedData.h')
| -rw-r--r-- | WebCore/rendering/style/StyleRareNonInheritedData.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/WebCore/rendering/style/StyleRareNonInheritedData.h b/WebCore/rendering/style/StyleRareNonInheritedData.h index 8dd22b3..452b273 100644 --- a/WebCore/rendering/style/StyleRareNonInheritedData.h +++ b/WebCore/rendering/style/StyleRareNonInheritedData.h @@ -29,6 +29,7 @@ #include "CursorData.h" #include "DataRef.h" #include "FillLayer.h" +#include "LineClampValue.h" #include "NinePieceImage.h" #include "StyleTransformData.h" #include <wtf/OwnPtr.h> @@ -77,7 +78,7 @@ public: bool animationDataEquivalent(const StyleRareNonInheritedData&) const; bool transitionDataEquivalent(const StyleRareNonInheritedData&) const; - int lineClamp; // An Apple extension. + LineClampValue lineClamp; // An Apple extension. #if ENABLE(DASHBOARD_SUPPORT) Vector<StyleDashboardRegion> m_dashboardRegions; #endif |