← Back to branch summary

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

« back to all changes in this revision

Viewing changes to WebCore/rendering/style/RenderStyle.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/RenderStyle.h
89
89
#include "BindingURI.h"
90
90
#endif
91
91
 
 
92
#if COMPILER(WINSCW)
 
93
#define compareEqual(t, u)      ((t) == (u))
 
94
#else
92
95
template<typename T, typename U> inline bool compareEqual(const T& t, const U& u) { return t == static_cast<T>(u); }
 
96
#endif
93
97
 
94
98
#define SET_VAR(group, variable, value) \
95
99
    if (!compareEqual(group->variable, value)) \
1106
1110
    static EEmptyCell initialEmptyCells() { return SHOW; }
1107
1111
    static EFloat initialFloating() { return FNONE; }
1108
1112
    static EListStylePosition initialListStylePosition() { return OUTSIDE; }
1109
 
    static EListStyleType initialListStyleType() { return DISC; }
 
1113
    static EListStyleType initialListStyleType() { return Disc; }
1110
1114
    static EOverflow initialOverflowX() { return OVISIBLE; }
1111
1115
    static EOverflow initialOverflowY() { return OVISIBLE; }
1112
1116
    static EPageBreak initialPageBreak() { return PBAUTO; }