diff options
| author | Steve Block <steveblock@google.com> | 2011-05-25 19:08:45 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-08 13:51:31 +0100 |
| commit | 2bde8e466a4451c7319e3a072d118917957d6554 (patch) | |
| tree | 28f4a1b869a513e565c7760d0e6a06e7cf1fe95a /Source/WebCore/rendering/style/RenderStyleConstants.h | |
| parent | 6939c99b71d9372d14a0c74a772108052e8c48c8 (diff) | |
| download | external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.zip external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.gz external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.bz2 | |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
Diffstat (limited to 'Source/WebCore/rendering/style/RenderStyleConstants.h')
| -rw-r--r-- | Source/WebCore/rendering/style/RenderStyleConstants.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/WebCore/rendering/style/RenderStyleConstants.h b/Source/WebCore/rendering/style/RenderStyleConstants.h index 3c62dbe..08f2c15 100644 --- a/Source/WebCore/rendering/style/RenderStyleConstants.h +++ b/Source/WebCore/rendering/style/RenderStyleConstants.h @@ -51,6 +51,7 @@ enum StyleDifference { StyleDifferenceRepaint, StyleDifferenceRepaintLayer, StyleDifferenceLayoutPositionedMovementOnly, + StyleDifferenceSimplifiedLayout, StyleDifferenceLayout }; @@ -120,7 +121,7 @@ enum ETableLayout { }; enum EUnicodeBidi { - UBNormal, Embed, Override + UBNormal, Embed, Override, Isolate }; // CSS Text Layout Module Level 3: Vertical writing support @@ -318,7 +319,7 @@ enum EWhiteSpace { }; enum ETextAlign { - TAAUTO, LEFT, RIGHT, CENTER, JUSTIFY, WEBKIT_LEFT, WEBKIT_RIGHT, WEBKIT_CENTER + TAAUTO, LEFT, RIGHT, CENTER, JUSTIFY, WEBKIT_LEFT, WEBKIT_RIGHT, WEBKIT_CENTER, TASTART, TAEND, }; enum ETextTransform { |