← Back to branch summary

~ubuntu-branches/ubuntu/lucid/webkit/lucid-security

« back to all changes in this revision

Viewing changes to WebCore/rendering/RenderListItem.cpp

  • 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/RenderListItem.cpp
51
51
{
52
52
    RenderBlock::styleDidChange(diff, oldStyle);
53
53
 
54
 
    if (style()->listStyleType() != LNONE ||
55
 
        (style()->listStyleImage() && !style()->listStyleImage()->errorOccurred())) {
 
54
    if (style()->listStyleType() != NoneListStyle
 
55
        || (style()->listStyleImage() && !style()->listStyleImage()->errorOccurred())) {
56
56
        RefPtr<RenderStyle> newStyle = RenderStyle::create();
57
57
        // The marker always inherits from the list item, regardless of where it might end
58
58
        // up (e.g., in some deeply nested line box). See CSS3 spec.