← Back to branch summary

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

« back to all changes in this revision

Viewing changes to WebCore/platform/graphics/FloatRect.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/platform/graphics/FloatRect.h
33
33
typedef struct CGRect CGRect;
34
34
#endif
35
35
 
36
 
#if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && PLATFORM(DARWIN))
 
36
#if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))
37
37
#ifdef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
38
38
typedef struct CGRect NSRect;
39
39
#else
129
129
#endif
130
130
 
131
131
#if (PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)) \
132
 
        || (PLATFORM(CHROMIUM) && PLATFORM(DARWIN))
 
132
        || (PLATFORM(CHROMIUM) && OS(DARWIN))
133
133
    FloatRect(const NSRect&);
134
134
    operator NSRect() const;
135
135
#endif