← Back to branch summary

~ubuntu-branches/ubuntu/lucid/webkit/lucid-updates

« back to all changes in this revision

Viewing changes to WebCore/rendering/style/RenderStyleConstants.h

  • Committer: Bazaar Package Importer
  • Author(s): Gustavo Noronha Silva
  • Date: 2010-01-06 21:25:06 UTC
  • mfrom: (1.2.6 upstream) (4.3.7 sid)
  • Revision ID: james.westby@ubuntu.com-20100106212506-gd0czn4zrwf1j19l
http://bugs.debian.org/529271
http://bugs.debian.org/559420
* New upstream release
- adds basic Content-Encoding support, thanks to soup
  (Closes: #529271)
- fixes over-advertising content types as supported by
  the media player (Closes: #559420)
* debian/control:
- updated libsoup build requirement (>= 2.28.2)
* debian/libwebkit-1.0-2.symbols:
- updated with new symbols
* debian/copyright:
- updated information since 1.1.17
* Imported patch from https://bugs.webkit.org/show_bug.cgi?id=30623
- I am shipping this patch because I believe it is correct, it is the
  way to go, it fixes a race, and it needs testing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
WebCore/rendering/style/RenderStyleConstants.h
73
73
    MEDIA_CONTROLS_SEEK_BACK_BUTTON, MEDIA_CONTROLS_SEEK_FORWARD_BUTTON, MEDIA_CONTROLS_FULLSCREEN_BUTTON, MEDIA_CONTROLS_REWIND_BUTTON, 
74
74
    MEDIA_CONTROLS_RETURN_TO_REALTIME_BUTTON, MEDIA_CONTROLS_TOGGLE_CLOSED_CAPTIONS_BUTTON,
75
75
    MEDIA_CONTROLS_STATUS_DISPLAY, SCROLLBAR_THUMB, SCROLLBAR_BUTTON, SCROLLBAR_TRACK, SCROLLBAR_TRACK_PIECE, SCROLLBAR_CORNER, RESIZER,
76
 
    INPUT_LIST_BUTTON,
 
76
    INPUT_LIST_BUTTON, INNER_SPIN_BUTTON, OUTER_SPIN_BUTTON,
77
77
 
78
78
    FIRST_INTERNAL_PSEUDOID = FILE_UPLOAD_BUTTON
79
79
};
204
204
};
205
205
 
206
206
enum EListStyleType {
207
 
     DISC, CIRCLE, SQUARE, LDECIMAL, DECIMAL_LEADING_ZERO,
208
 
     LOWER_ROMAN, UPPER_ROMAN, LOWER_GREEK,
209
 
     LOWER_ALPHA, LOWER_LATIN, UPPER_ALPHA, UPPER_LATIN,
210
 
     HEBREW, ARMENIAN, GEORGIAN, CJK_IDEOGRAPHIC,
211
 
     HIRAGANA, KATAKANA, HIRAGANA_IROHA, KATAKANA_IROHA, LNONE
 
207
     Disc, Circle, Square, DecimalListStyle, DecimalLeadingZero,
 
208
     LowerRoman, UpperRoman, LowerGreek,
 
209
     LowerAlpha, LowerLatin, UpperAlpha, UpperLatin,
 
210
     Hebrew, Armenian, Georgian, CJKIdeographic,
 
211
     Hiragana, Katakana, HiraganaIroha, KatakanaIroha, NoneListStyle
212
212
};
213
213
 
214
214
enum StyleContentType {